From 3e2acf8aff6cf1385afa38b2a65df30ce0efd8d4 Mon Sep 17 00:00:00 2001 From: Default email Date: Thu, 20 May 2021 18:08:51 -0500 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: d42cd445dde587e9a993cd9434cb43da07c4c5de --- third_party/nixpkgs/.github/CODEOWNERS | 12 +- third_party/nixpkgs/.github/labeler.yml | 13 +- .../.github/workflows/merge-staging.yml | 4 +- .../doc/builders/special/mkshell.section.md | 10 +- .../doc/builders/trivial-builders.chapter.md | 47 + .../coding-conventions.chapter.md | 12 + .../doc/functions/library/attrsets.xml | 2 +- .../doc/languages-frameworks/beam.section.md | 6 + .../doc/languages-frameworks/dhall.section.md | 432 + .../languages-frameworks/dotnet.section.md | 4 +- .../doc/languages-frameworks/gnome.section.md | 6 +- .../doc/languages-frameworks/index.xml | 1 + .../languages-frameworks/python.section.md | 2 +- .../doc/languages-frameworks/ruby.section.md | 2 +- third_party/nixpkgs/lib/attrsets.nix | 4 + third_party/nixpkgs/lib/customisation.nix | 8 +- third_party/nixpkgs/lib/meta.nix | 12 + third_party/nixpkgs/lib/modules.nix | 16 +- third_party/nixpkgs/lib/strings.nix | 4 +- third_party/nixpkgs/lib/systems/parse.nix | 23 +- third_party/nixpkgs/lib/tests/modules.sh | 3 + .../modules/declare-submoduleWith-modules.nix | 4 +- third_party/nixpkgs/lib/types.nix | 27 +- .../nixpkgs/maintainers/maintainer-list.nix | 130 +- .../nixpkgs/maintainers/scripts/build.nix | 12 +- .../scripts/check-hydra-by-maintainer.nix | 1 + .../scripts/haskell/hydra-report.hs | 408 + .../scripts/haskell/mark-broken.sh | 45 + .../haskell/regenerate-hackage-packages.sh | 44 + .../regenerate-transitive-broken-packages.sh | 15 + .../haskell/transitive-broken-packages.nix | 16 + .../haskell/update-cabal2nix-unstable.sh | 17 + .../scripts/haskell/update-hackage.sh | 35 + .../scripts/haskell/update-stackage.sh | 68 + .../maintainers/scripts/pluginupdate.py | 18 + .../scripts/update-luarocks-shell.nix | 7 +- .../nixpkgs/maintainers/scripts/update.nix | 18 +- .../nixpkgs/maintainers/scripts/update.py | 3 + third_party/nixpkgs/maintainers/team-list.nix | 29 +- .../doc/manual/configuration/ipv6-config.xml | 8 +- .../doc/manual/configuration/x-windows.xml | 2 +- .../installing-from-other-distro.xml | 8 +- .../doc/manual/release-notes/rl-1909.xml | 8 +- .../doc/manual/release-notes/rl-2105.xml | 72 +- .../nixpkgs/nixos/doc/manual/shell.nix | 2 +- third_party/nixpkgs/nixos/lib/build-vms.nix | 7 + .../nixos/lib/test-driver/test-driver.py | 33 +- .../nixpkgs/nixos/lib/testing-python.nix | 25 +- .../nixpkgs/nixos/modules/config/console.nix | 3 +- .../nixos/modules/config/fonts/fontconfig.nix | 34 + .../nixpkgs/nixos/modules/config/malloc.nix | 7 + .../installation-cd-graphical-gnome.nix | 2 +- .../modules/installer/cd-dvd/iso-image.nix | 71 +- .../cd-dvd/sd-image-raspberrypi4.nix | 14 - .../installer/sd-card/sd-image-aarch64.nix | 7 - .../sd-image-raspberrypi4-installer.nix | 10 - .../sd-card/sd-image-raspberrypi4.nix | 8 - .../modules/installer/sd-card/sd-image.nix | 1 + .../installer/tools/nix-fallback-paths.nix | 8 +- .../modules/installer/virtualbox-demo.nix | 2 +- .../nixpkgs/nixos/modules/misc/ids.nix | 4 +- .../nixpkgs/nixos/modules/module-list.nix | 36 +- .../nixos/modules/profiles/all-hardware.nix | 60 +- .../nixos/modules/profiles/hardened.nix | 1 + .../modules/profiles/installation-device.nix | 8 + .../nixpkgs/nixos/modules/programs/atop.nix | 126 +- .../nixpkgs/nixos/modules/programs/dconf.nix | 2 + .../nixos/modules/programs/file-roller.nix | 4 +- .../nixpkgs/nixos/modules/programs/geary.nix | 6 +- .../nixos/modules/programs/gnome-disks.nix | 4 +- .../modules/programs/gnome-documents.nix | 10 +- .../nixos/modules/programs/gnome-terminal.nix | 6 +- .../nixpkgs/nixos/modules/programs/gpaste.nix | 8 +- .../nixos/modules/programs/noisetorch.nix | 25 + .../nixpkgs/nixos/modules/programs/phosh.nix | 14 +- .../nixos/modules/programs/seahorse.nix | 6 +- .../nixpkgs/nixos/modules/programs/sway.nix | 33 +- .../nixos/modules/security/apparmor-suid.nix | 49 - .../nixos/modules/security/apparmor.nix | 253 +- .../modules/security/apparmor/includes.nix | 317 + .../modules/security/apparmor/profiles.nix | 11 + .../nixpkgs/nixos/modules/security/ca.nix | 13 +- .../nixpkgs/nixos/modules/security/misc.nix | 4 + .../nixpkgs/nixos/modules/security/pam.nix | 81 +- .../nixpkgs/nixos/modules/security/sudo.nix | 28 +- .../modules/security/wrappers/default.nix | 8 + .../nixos/modules/services/audio/jack.nix | 2 +- .../nixos/modules/services/audio/mpd.nix | 13 +- .../modules/services/audio/mpdscribble.nix | 2 +- .../modules/services/backup/duplicity.nix | 91 +- .../services/backup/postgresql-backup.nix | 2 +- .../cluster/kubernetes/addon-manager.nix | 2 +- .../services/cluster/kubernetes/default.nix | 6 +- .../services/cluster/kubernetes/kubelet.nix | 2 +- .../computing/foldingathome/client.nix | 10 + .../buildbot/master.nix | 2 +- .../buildbot/worker.nix | 2 +- .../hercules-ci-agent/common.nix | 28 +- .../hercules-ci-agent/default.nix | 18 +- .../modules/services/databases/clickhouse.nix | 1 + .../modules/services/databases/couchdb.nix | 19 +- .../modules/services/databases/postgresql.nix | 2 +- .../modules/services/databases/redis.nix | 2 +- .../nixos/modules/services/desktops/bamf.nix | 2 +- .../modules/services/desktops/flatpak.nix | 14 +- .../modules/services/desktops/geoclue2.nix | 2 +- .../{gnome3 => gnome}/at-spi2-core.nix | 14 +- .../{gnome3 => gnome}/chrome-gnome-shell.nix | 12 +- .../evolution-data-server.nix | 22 +- .../{gnome3 => gnome}/glib-networking.nix | 12 +- .../{gnome3 => gnome}/gnome-initial-setup.nix | 16 +- .../{gnome3 => gnome}/gnome-keyring.nix | 20 +- .../gnome-online-accounts.nix | 12 +- .../{gnome3 => gnome}/gnome-online-miners.nix | 16 +- .../desktops/gnome/gnome-remote-desktop.nix | 32 + .../gnome-settings-daemon.nix | 16 +- .../{gnome3 => gnome}/gnome-user-share.nix | 16 +- .../desktops/{gnome3 => gnome}/rygel.nix | 20 +- .../desktops/{gnome3 => gnome}/sushi.nix | 16 +- .../{gnome3 => gnome}/tracker-miners.nix | 12 +- .../desktops/{gnome3 => gnome}/tracker.nix | 12 +- .../desktops/gnome3/gnome-remote-desktop.nix | 24 - .../nixos/modules/services/desktops/gvfs.nix | 2 +- .../modules/services/desktops/telepathy.nix | 2 +- .../modules/services/desktops/tumbler.nix | 2 +- .../modules/services/desktops/zeitgeist.nix | 2 +- .../services/development/jupyter/default.nix | 2 +- .../development/jupyterhub/default.nix | 2 +- .../nixos/modules/services/games/factorio.nix | 13 +- .../nixos/modules/services/games/terraria.nix | 13 + .../modules/services/hardware/brltty.nix | 57 +- .../modules/services/hardware/fancontrol.nix | 16 +- .../nixos/modules/services/misc/autorandr.nix | 2 +- .../{matrix-dendrite.nix => dendrite.nix} | 36 +- .../nixos/modules/services/misc/disnix.nix | 3 +- .../nixos/modules/services/misc/fstrim.nix | 2 +- .../nixos/modules/services/misc/gitlab.nix | 5 +- .../nixos/modules/services/misc/gitweb.nix | 2 +- .../modules/services/misc/home-assistant.nix | 5 +- .../nixos/modules/services/misc/jellyfin.nix | 4 +- .../nixos/modules/services/misc/mame.nix | 2 +- .../modules/services/misc/matrix-synapse.nix | 33 +- .../nixos/modules/services/misc/ssm-agent.nix | 15 +- .../modules/services/monitoring/grafana.nix | 59 +- .../modules/services/monitoring/netdata.nix | 28 +- .../monitoring/prometheus/default.nix | 4 +- .../monitoring/prometheus/exporters.nix | 1 + .../monitoring/prometheus/exporters/bind.nix | 12 +- .../prometheus/exporters/collectd.nix | 18 +- .../monitoring/prometheus/exporters/kea.nix | 38 + .../prometheus/exporters/rspamd.nix | 2 +- .../monitoring/prometheus/xmpp-alerts.nix | 26 +- .../services/network-filesystems/netatalk.nix | 135 +- .../network-filesystems/samba-wsdd.nix | 2 +- .../modules/services/networking/bind.nix | 23 +- .../modules/services/networking/cjdns.nix | 14 +- .../modules/services/networking/croc.nix | 4 +- .../services/networking/ghostunnel.nix | 242 + .../modules/services/networking/hans.nix | 2 +- .../modules/services/networking/libreswan.nix | 141 +- .../modules/services/networking/monero.nix | 20 +- .../nixos/modules/services/networking/nsd.nix | 22 +- .../modules/services/networking/radicale.nix | 200 +- .../services/networking/supplicant.nix | 13 +- .../modules/services/networking/unbound.nix | 4 +- .../services/networking/wpa_supplicant.nix | 28 +- .../modules/services/networking/yggdrasil.nix | 5 +- .../services/networking/znc/default.nix | 32 +- .../services/networking/znc/options.nix | 2 +- .../nixos/modules/services/scheduling/atd.nix | 11 +- .../services/security/hologram-agent.nix | 2 +- .../nixos/modules/services/security/tor.nix | 10 +- .../modules/services/system/self-deploy.nix | 170 + .../modules/services/torrent/transmission.nix | 124 +- .../modules/services/video/mirakurun.nix | 23 +- .../modules/services/web-apps/discourse.nix | 10 +- .../modules/services/web-apps/keycloak.nix | 6 +- .../modules/services/web-apps/shiori.nix | 5 +- .../web-servers/apache-httpd/default.nix | 16 +- .../modules/services/web-servers/caddy.nix | 33 +- .../services/web-servers/molly-brown.nix | 1 - .../services/web-servers/nginx/default.nix | 22 +- .../services/web-servers/nginx/gitweb.nix | 2 +- .../services/x11/desktop-managers/cde.nix | 2 +- .../x11/desktop-managers/cinnamon.nix | 18 +- .../services/x11/desktop-managers/default.nix | 2 +- .../{gnome3.nix => gnome.nix} | 239 +- .../services/x11/desktop-managers/gnome.xml | 276 + .../services/x11/desktop-managers/lxqt.nix | 2 +- .../services/x11/desktop-managers/mate.nix | 6 +- .../x11/desktop-managers/pantheon.nix | 24 +- .../services/x11/desktop-managers/xfce.nix | 8 +- .../display-managers/account-service-util.nix | 2 +- .../services/x11/display-managers/gdm.nix | 18 +- .../lightdm-greeters/enso-os.nix | 4 +- .../display-managers/lightdm-greeters/gtk.nix | 12 +- .../lightdm-greeters/pantheon.nix | 2 +- .../services/x11/display-managers/lightdm.nix | 2 +- .../services/x11/window-managers/metacity.nix | 6 +- .../modules/system/activation/top-level.nix | 4 +- .../nixos/modules/system/boot/kexec.nix | 2 +- .../nixos/modules/system/boot/networkd.nix | 10 + .../nixos/modules/system/boot/systemd.nix | 2 + .../nixos/modules/tasks/filesystems.nix | 34 +- .../nixos/modules/tasks/filesystems/zfs.nix | 1 + .../modules/tasks/network-interfaces.nix | 109 +- .../modules/virtualisation/containerd.nix | 11 +- .../nixos/modules/virtualisation/docker.nix | 4 + .../nixos/modules/virtualisation/kvmgt.nix | 2 +- .../nixos/modules/virtualisation/lxc.nix | 12 +- .../nixos/modules/virtualisation/lxd.nix | 16 +- .../virtualisation/qemu-guest-agent.nix | 5 +- .../nixpkgs/nixos/release-combined.nix | 6 +- third_party/nixpkgs/nixos/release.nix | 9 +- third_party/nixpkgs/nixos/tests/acme.nix | 2 +- third_party/nixpkgs/nixos/tests/all-tests.nix | 11 +- third_party/nixpkgs/nixos/tests/apparmor.nix | 82 + third_party/nixpkgs/nixos/tests/atop.nix | 213 + third_party/nixpkgs/nixos/tests/buildbot.nix | 2 +- third_party/nixpkgs/nixos/tests/cagebreak.nix | 76 +- third_party/nixpkgs/nixos/tests/chromium.nix | 3 +- .../nixpkgs/nixos/tests/clickhouse.nix | 1 + .../nixos/tests/containers-custom-pkgs.nix | 2 +- .../nixos/tests/containers-imperative.nix | 2 +- third_party/nixpkgs/nixos/tests/couchdb.nix | 38 - third_party/nixpkgs/nixos/tests/custom-ca.nix | 1 + third_party/nixpkgs/nixos/tests/dendrite.nix | 99 + .../nixos/tests/docker-tools-overlay.nix | 2 +- .../nixpkgs/nixos/tests/docker-tools.nix | 2 +- third_party/nixpkgs/nixos/tests/docker.nix | 3 + .../nixpkgs/nixos/tests/fancontrol.nix | 40 +- .../nixos/tests/fontconfig-default-fonts.nix | 1 - .../nixpkgs/nixos/tests/ghostunnel.nix | 104 + .../tests/{gnome3-xorg.nix => gnome-xorg.nix} | 6 +- .../nixos/tests/{gnome3.nix => gnome.nix} | 8 +- .../nixos/tests/installed-tests/default.nix | 1 + .../tests/installed-tests/gnome-photos.nix | 2 +- .../nixos/tests/installed-tests/libgdata.nix | 2 +- .../nixos/tests/installed-tests/librsvg.nix | 9 + third_party/nixpkgs/nixos/tests/ipv6.nix | 81 +- third_party/nixpkgs/nixos/tests/jellyfin.nix | 5 +- .../nixpkgs/nixos/tests/kernel-generic.nix | 1 + third_party/nixpkgs/nixos/tests/keymap.nix | 27 +- third_party/nixpkgs/nixos/tests/libreswan.nix | 134 + third_party/nixpkgs/nixos/tests/lightdm.nix | 2 +- .../nixpkgs/nixos/tests/minecraft-server.nix | 2 +- .../nixpkgs/nixos/tests/networking.nix | 6 +- .../nixpkgs/nixos/tests/nfs/kerberos.nix | 8 +- .../nixos/tests/nixos-generate-config.nix | 4 +- third_party/nixpkgs/nixos/tests/nsd.nix | 9 + .../nixpkgs/nixos/tests/oci-containers.nix | 2 +- .../nixpkgs/nixos/tests/opensmtpd-rspamd.nix | 142 + third_party/nixpkgs/nixos/tests/plotinus.nix | 2 +- third_party/nixpkgs/nixos/tests/printing.nix | 1 - .../nixos/tests/prometheus-exporters.nix | 59 +- third_party/nixpkgs/nixos/tests/radicale.nix | 199 +- third_party/nixpkgs/nixos/tests/shadow.nix | 24 +- .../nixpkgs/nixos/tests/signal-desktop.nix | 15 +- third_party/nixpkgs/nixos/tests/sudo.nix | 21 +- third_party/nixpkgs/nixos/tests/sway.nix | 106 + .../nixos/tests/systemd-confinement.nix | 3 +- .../nixpkgs/nixos/tests/systemd-networkd.nix | 1 - third_party/nixpkgs/nixos/tests/unbound.nix | 1 - third_party/nixpkgs/nixos/tests/v2ray.nix | 2 +- .../nixpkgs/nixos/tests/virtualbox.nix | 20 +- .../nixos/tests/web-servers/unit-php.nix | 2 +- third_party/nixpkgs/nixos/tests/wmderland.nix | 2 +- third_party/nixpkgs/nixos/tests/yggdrasil.nix | 2 +- .../accessibility/dasher/default.nix | 51 +- .../accessibility/mousetweaks/default.nix | 4 +- .../accessibility/squeekboard/default.nix | 12 +- .../applications/audio/adlplug/default.nix | 2 +- .../applications/audio/audacity/default.nix | 54 +- .../audio/bitwig-studio/bitwig-studio1.nix | 4 +- .../audio/bitwig-studio/bitwig-studio3.nix | 4 +- .../applications/audio/cadence/default.nix | 2 +- .../applications/audio/cantata/default.nix | 58 +- .../pkgs/applications/audio/cava/default.nix | 4 +- .../applications/audio/clementine/default.nix | 3 +- .../applications/audio/cmusfm/default.nix | 8 +- .../audio/cozy-audiobooks/default.nix | 4 +- .../applications/audio/deadbeef/default.nix | 6 +- .../audio/dragonfly-reverb/default.nix | 10 +- .../applications/audio/easytag/default.nix | 6 +- .../audio/gnome-podcasts/default.nix | 14 +- .../applications/audio/gpodder/default.nix | 4 +- .../applications/audio/gtkpod/default.nix | 4 +- .../applications/audio/guitarix/default.nix | 18 +- .../audio/helio-workstation/default.nix | 6 +- .../audio/kapitonov-plugins-pack/default.nix | 2 +- .../applications/audio/lollypop/default.nix | 2 +- .../pkgs/applications/audio/mamba/default.nix | 7 +- .../audio/midisheetmusic/default.nix | 2 +- .../audio/miniaudicle/default.nix | 59 + .../applications/audio/mousai/default.nix | 4 +- .../pkgs/applications/audio/munt/default.nix | 2 +- .../pkgs/applications/audio/muso/default.nix | 5 +- .../applications/audio/ncspot/default.nix | 6 +- .../applications/audio/openmpt123/default.nix | 6 +- .../applications/audio/orca-c/default.nix | 22 +- .../audio/pavucontrol/default.nix | 4 +- .../applications/audio/picard/default.nix | 43 +- .../applications/audio/pithos/default.nix | 4 +- .../applications/audio/quodlibet/default.nix | 8 +- .../applications/audio/rhythmbox/default.nix | 6 +- .../pkgs/applications/audio/sfizz/default.nix | 6 +- .../applications/audio/sonata/default.nix | 4 +- .../audio/sound-juicer/default.nix | 66 +- .../applications/audio/spotify-qt/default.nix | 4 +- .../applications/audio/spotify/default.nix | 4 +- .../audio/squeezelite/default.nix | 4 +- .../applications/audio/strawberry/default.nix | 4 - .../audio/sublime-music/default.nix | 19 +- .../applications/audio/sunvox/default.nix | 4 +- .../applications/audio/uade123/default.nix | 4 +- .../pkgs/applications/audio/vocal/default.nix | 2 +- .../applications/backup/deja-dup/default.nix | 8 +- .../backup/pika-backup/default.nix | 6 +- .../applications/backup/vorta/default.nix | 6 +- .../applications/blockchains/bitcoin-gold.nix | 6 +- .../blockchains/bitcoin-unlimited.nix | 4 +- .../pkgs/applications/blockchains/bitcoin.nix | 5 + .../blockchains/btcpayserver/default.nix | 4 +- .../blockchains/btcpayserver/deps.nix | 153 +- .../blockchains/btcpayserver/update.sh | 7 +- .../applications/blockchains/chia/default.nix | 69 + .../blockchains/chia/dependencies.patch | 13 + .../pkgs/applications/blockchains/electrs.nix | 2 +- .../applications/blockchains/ergo/default.nix | 4 +- .../pkgs/applications/blockchains/ethabi.nix | 23 - .../blockchains/ethabi/add-Cargo-lock.patch | 683 + .../blockchains/ethabi/default.nix | 27 + .../applications/blockchains/go-ethereum.nix | 6 +- .../ledger-live-desktop/default.nix | 4 +- .../blockchains/monero-gui/default.nix | 4 +- .../blockchains/mycrypto/default.nix | 6 +- .../blockchains/nbxplorer/default.nix | 4 +- .../blockchains/nbxplorer/deps.nix | 17 +- .../blockchains/nbxplorer/util/create-deps.sh | 2 +- .../nbxplorer/util/update-common.sh | 61 +- .../blockchains/openethereum/default.nix | 16 +- .../blockchains/polkadot/default.nix | 10 +- .../blockchains/trezor-suite/default.nix | 9 +- .../applications/blockchains/turbo-geth.nix | 11 +- .../display-managers/lightdm/default.nix | 6 +- .../editors/android-studio/common.nix | 2 +- .../editors/android-studio/default.nix | 16 +- .../editors/apostrophe/default.nix | 4 +- .../applications/editors/bless/default.nix | 55 +- .../applications/editors/bluefish/default.nix | 4 +- .../editors/emacs-modes/elpa-generated.nix | 166 +- .../editors/emacs-modes/emacs2nix.nix | 6 +- .../editors/emacs-modes/org-generated.nix | 12 +- .../emacs-modes/recipes-archive-melpa.json | 5456 +++--- .../emacs-modes/sunrise-commander/default.nix | 42 +- .../editors/emacs-modes/updater-emacs.nix | 2 +- .../applications/editors/emacs/generic.nix | 10 +- .../applications/editors/emacs/macport.nix | 8 +- .../applications/editors/emacs/site-start.el | 4 +- .../editors/ghostwriter/default.nix | 4 +- .../editors/gnome-builder/default.nix | 18 +- .../editors/gnome-inform7/default.nix | 117 + .../editors/gnome-latex/default.nix | 55 +- .../applications/editors/gobby/default.nix | 2 +- .../applications/editors/jove/default.nix | 4 +- .../applications/editors/jucipp/default.nix | 4 +- .../editors/kakoune/plugins/overrides.nix | 4 +- .../editors/kdevelop5/kdevelop.nix | 4 +- .../editors/neovim/neovide/Cargo.lock | 3292 ++++ .../editors/neovim/neovide/default.nix | 115 + .../neovim/neovide/skia-externals.json | 37 + .../applications/editors/neovim/utils.nix | 5 +- .../editors/rstudio/clang-location.patch | 2 +- .../applications/editors/rstudio/default.nix | 4 +- .../applications/editors/scite/default.nix | 8 +- .../editors/supertux-editor/default.nix | 2 +- .../applications/editors/vscode/vscode.nix | 10 +- .../applications/editors/vscode/vscodium.nix | 10 +- .../applications/editors/zile/default.nix | 4 +- .../pkgs/applications/gis/qgis/unwrapped.nix | 2 +- .../applications/graphics/ImageMagick/6.x.nix | 9 +- .../applications/graphics/ImageMagick/7.0.nix | 14 +- .../applications/graphics/avocode/default.nix | 8 +- .../graphics/darktable/default.nix | 4 +- .../graphics/emulsion/default.nix | 17 +- .../applications/graphics/fbida/default.nix | 4 +- .../applications/graphics/feh/default.nix | 4 +- .../applications/graphics/fondo/default.nix | 18 +- .../applications/graphics/freecad/default.nix | 7 +- .../applications/graphics/gimp/default.nix | 13 +- .../graphics/gimp/plugins/default.nix | 2 +- .../applications/graphics/gimp/wrapper.nix | 4 +- .../applications/graphics/glabels/default.nix | 6 +- .../applications/graphics/glimpse/wrapper.nix | 4 +- .../graphics/gnome-photos/default.nix | 30 +- .../graphics/gscan2pdf/default.nix | 14 +- .../applications/graphics/gthumb/default.nix | 11 +- .../applications/graphics/hydrus/default.nix | 4 +- .../graphics/inkscape/default.nix | 8 + .../graphics/jpeg-archive/default.nix | 3 +- .../graphics/kgraphviewer/default.nix | 2 +- .../applications/graphics/krita/default.nix | 6 +- .../graphics/lazpaint/default.nix | 2 +- .../graphics/megapixels/default.nix | 18 +- .../default.nix | 13 +- .../graphics/ocrfeeder/default.nix | 2 +- .../graphics/pick-colour-picker/default.nix | 7 +- .../applications/graphics/pqiv/default.nix | 8 +- .../graphics/renderdoc/default.nix | 4 +- .../graphics/shotwell/default.nix | 6 +- .../graphics/solvespace/default.nix | 4 +- .../graphics/synfigstudio/default.nix | 4 +- .../applications/graphics/tev/default.nix | 4 +- .../applications/graphics/vimiv/default.nix | 8 +- .../nixpkgs/pkgs/applications/kde/k3b.nix | 4 +- .../pkgs/applications/kde/kdeconnect-kde.nix | 3 + .../applications/misc/1password/default.nix | 12 +- .../misc/ArchiSteamFarm/default.nix | 2 +- .../applications/misc/almanah/default.nix | 4 +- .../pkgs/applications/misc/bemenu/default.nix | 4 +- .../applications/misc/blender/default.nix | 2 +- .../applications/misc/calibre/default.nix | 9 +- .../applications/misc/chrysalis/default.nix | 12 +- .../applications/misc/clipcat/default.nix | 2 +- .../applications/misc/cointop/default.nix | 4 +- .../applications/misc/corectrl/default.nix | 9 +- .../pkgs/applications/misc/cpu-x/default.nix | 2 +- .../misc/cura/lulzbot/default.nix | 4 +- .../misc/cura/lulzbot/libarcus.nix | 4 +- .../misc/cura/lulzbot/libsavitar.nix | 4 +- .../applications/misc/curaengine/default.nix | 4 +- .../pkgs/applications/misc/dasel/default.nix | 4 +- .../applications/misc/dbeaver/default.nix | 6 +- .../misc/devdocs-desktop/default.nix | 4 +- .../misc/djvulibre/CVE-2019-15142.patch | 72 - .../misc/djvulibre/CVE-2019-15143.patch | 39 - .../misc/djvulibre/CVE-2019-15144.patch | 111 - .../misc/djvulibre/CVE-2019-15145.patch | 28 - .../misc/djvulibre/CVE-2019-18804.patch | 32 - .../applications/misc/djvulibre/default.nix | 17 +- .../misc/djvulibre/fix_hongfuzz_crash.patch | 51 - .../applications/misc/dwmblocks/default.nix | 2 +- .../applications/misc/feedbackd/default.nix | 40 +- .../applications/misc/flavours/default.nix | 5 +- .../misc/font-manager/default.nix | 61 +- .../pkgs/applications/misc/free42/default.nix | 4 +- .../pkgs/applications/misc/fuzzel/default.nix | 4 +- .../applications/misc/gallery-dl/default.nix | 4 +- .../applications/misc/getxbook/default.nix | 12 +- .../pkgs/applications/misc/girara/default.nix | 4 +- .../pkgs/applications/misc/gksu/default.nix | 4 +- .../misc/gnome-multi-writer/default.nix | 8 +- .../misc/gnome-recipes/default.nix | 4 +- .../applications/misc/gnome-usage/default.nix | 6 +- .../applications/misc/gpsprune/default.nix | 4 +- .../applications/misc/gpx-viewer/default.nix | 4 +- .../misc/gremlin-console/default.nix | 6 +- .../pkgs/applications/misc/gummi/default.nix | 2 +- .../pkgs/applications/misc/gxkb/default.nix | 4 +- .../pkgs/applications/misc/heimer/default.nix | 4 +- .../pkgs/applications/misc/hello/default.nix | 10 +- .../pkgs/applications/misc/imag/default.nix | 2 +- .../applications/misc/index-fm/default.nix | 10 +- .../pkgs/applications/misc/jekyll/default.nix | 2 +- .../applications/misc/keepassx/community.nix | 23 +- .../applications/misc/kile-wl/default.nix | 1 + .../pkgs/applications/misc/kratos/default.nix | 42 + .../applications/misc/latte-dock/default.nix | 4 +- .../pkgs/applications/misc/lutris/fhsenv.nix | 4 +- .../applications/misc/makeself/default.nix | 4 +- .../applications/misc/mediaelch/default.nix | 4 +- .../applications/misc/megacmd/default.nix | 24 +- .../applications/misc/megasync/default.nix | 8 +- .../misc/moonlight-embedded/default.nix | 8 +- .../misc/moonlight-qt/default.nix | 4 +- .../pkgs/applications/misc/navi/default.nix | 6 +- .../pkgs/applications/misc/nimbo/default.nix | 28 + .../applications/misc/notejot/default.nix | 46 +- .../misc/notify-osd-customizable/default.nix | 4 +- .../misc/numberstation/default.nix | 68 + .../applications/misc/obsidian/default.nix | 11 +- .../applications/misc/olifant/default.nix | 6 +- .../misc/openbox-menu/default.nix | 7 + .../pkgs/applications/misc/openlp/lib.nix | 4 +- .../pkgs/applications/misc/orca/default.nix | 12 +- .../applications/misc/orca/fix-paths.patch | 26 +- .../applications/misc/overmind/default.nix | 11 +- .../pkgs/applications/misc/overmind/deps.nix | 129 - .../applications/misc/pcmanfm/default.nix | 4 +- .../pkgs/applications/misc/phoc/default.nix | 6 +- .../pkgs/applications/misc/plank/default.nix | 4 +- .../plasma-applet-volumewin7mixer/default.nix | 7 +- .../applications/misc/pytrainer/default.nix | 8 +- .../applications/misc/qdirstat/default.nix | 2 +- .../misc/remarkable/rmapi/default.nix | 8 +- .../applications/misc/safeeyes/default.nix | 6 +- .../pkgs/applications/misc/sc-im/default.nix | 17 +- .../pkgs/applications/misc/slade/git.nix | 30 +- .../applications/misc/snapper-gui/default.nix | 4 +- .../pkgs/applications/misc/solaar/default.nix | 57 +- .../misc/spacenav-cube-example/default.nix | 2 +- .../applications/misc/spnavcfg/default.nix | 2 + .../pkgs/applications/misc/stork/default.nix | 6 +- .../applications/misc/sunwait/default.nix | 2 + .../applications/misc/sweethome3d/default.nix | 21 +- .../applications/misc/sweethome3d/editors.nix | 50 +- .../misc/timew-sync-server/default.nix | 23 + .../pkgs/applications/misc/tootle/default.nix | 4 +- .../pkgs/applications/misc/tuir/default.nix | 2 +- .../applications/misc/ulauncher/default.nix | 10 +- .../pkgs/applications/misc/upwork/default.nix | 6 +- .../applications/misc/visidata/default.nix | 4 +- .../pkgs/applications/misc/xneur/default.nix | 10 +- .../pkgs/applications/misc/xplr/default.nix | 18 +- .../misc/zathura/core/default.nix | 2 +- .../pkgs/applications/misc/zettlr/default.nix | 4 +- .../networking/3proxy/default.nix | 6 +- .../networking/appgate-sdp/default.nix | 13 +- .../networking/browsers/brave/default.nix | 12 +- .../networking/browsers/chromium/common.nix | 36 +- .../networking/browsers/chromium/default.nix | 8 +- .../browsers/chromium/upstream-info.json | 34 +- .../networking/browsers/eolie/default.nix | 6 +- .../browsers/firefox-bin/default.nix | 4 +- .../browsers/firefox-bin/release_sources.nix | 778 +- .../networking/browsers/firefox/common.nix | 6 +- .../networking/browsers/firefox/packages.nix | 8 +- .../networking/browsers/firefox/wrapper.nix | 4 +- .../browsers/google-chrome/default.nix | 4 +- .../networking/browsers/lagrange/default.nix | 7 +- .../networking/browsers/palemoon/default.nix | 4 +- .../networking/browsers/surf/default.nix | 7 +- .../tor-browser-bundle-bin/default.nix | 4 +- .../networking/browsers/vieb/default.nix | 8 +- .../networking/browsers/vieb/package.json | 33 +- .../networking/browsers/vieb/yarn.lock | 1116 +- .../networking/browsers/vieb/yarn.nix | 1032 +- .../networking/browsers/vivaldi/default.nix | 4 +- .../applications/networking/calls/default.nix | 6 +- .../networking/cawbird/default.nix | 16 +- .../networking/cloudflared/default.nix | 4 +- .../networking/cluster/argo/default.nix | 4 +- .../networking/cluster/fluxcd/default.nix | 6 +- .../networking/cluster/hadoop/default.nix | 15 +- .../networking/cluster/helmfile/default.nix | 6 +- .../networking/cluster/helmsman/default.nix | 6 +- .../cluster/hetzner-kube/default.nix | 9 + .../cluster/hetzner-kube/fix-home.patch | 53 + .../networking/cluster/istioctl/default.nix | 6 +- .../networking/cluster/k3s/default.nix | 28 +- .../networking/cluster/k9s/default.nix | 6 +- .../networking/cluster/kops/default.nix | 9 +- .../networking/cluster/kube3d/default.nix | 4 +- .../networking/cluster/kubecfg/default.nix | 4 +- .../networking/cluster/kubernetes/default.nix | 4 +- .../networking/cluster/kubeseal/default.nix | 4 +- .../networking/cluster/kubetail/default.nix | 4 +- .../networking/cluster/lens/default.nix | 4 +- .../networking/cluster/linkerd/default.nix | 1 + .../networking/cluster/minikube/default.nix | 9 +- .../networking/cluster/nerdctl/default.nix | 6 +- .../networking/cluster/nixops/shell.nix | 4 +- .../networking/cluster/nomad/0.12.nix | 4 +- .../networking/cluster/nomad/1.0.nix | 4 +- .../networking/cluster/octant/default.nix | 12 +- .../networking/cluster/octant/desktop.nix | 6 +- .../networking/cluster/popeye/default.nix | 11 +- .../networking/cluster/ssm-agent/default.nix | 18 + .../cluster/terraform-docs/default.nix | 6 +- .../terraform-providers/providers.json | 35 +- .../networking/cluster/terraform/default.nix | 6 +- .../terraform/provider-path-0_15.patch | 6 +- .../networking/cluster/terragrunt/default.nix | 4 +- .../networking/cluster/waypoint/default.nix | 30 +- .../networking/davmail/default.nix | 10 +- .../networking/dnscontrol/default.nix | 6 +- .../applications/networking/dropbox/cli.nix | 4 +- .../feedreaders/feedreader/default.nix | 6 +- .../feedreaders/newsflash/default.nix | 6 +- .../applications/networking/flent/default.nix | 4 +- .../networking/flexget/default.nix | 5 +- .../networking/ftp/taxi/default.nix | 49 +- .../pkgs/applications/networking/gns3/gui.nix | 2 +- .../networking/gopher/sacc/default.nix | 4 + .../networking/hydroxide/default.nix | 6 +- .../instant-messengers/baresip/default.nix | 4 +- .../instant-messengers/coyim/default.nix | 4 +- .../instant-messengers/dino/default.nix | 4 +- .../instant-messengers/discord/default.nix | 4 +- .../element/element-desktop-package.json | 7 +- .../element/element-desktop-yarndeps.nix | 184 +- .../element/element-desktop.nix | 7 +- .../element/element-web.nix | 4 +- .../instant-messengers/ferdi/default.nix | 6 +- .../instant-messengers/fractal/default.nix | 2 +- .../instant-messengers/franz/generic.nix | 2 + .../instant-messengers/gajim/default.nix | 15 +- .../instant-messengers/jackline/default.nix | 6 +- .../instant-messengers/kdeltachat/default.nix | 43 + .../mattermost-desktop/default.nix | 14 +- .../pantalaimon/default.nix | 14 +- .../pidgin-plugins/sipe/default.nix | 16 +- .../instant-messengers/pidgin/default.nix | 7 +- .../instant-messengers/psi-plus/default.nix | 20 +- .../instant-messengers/rambox/default.nix | 2 +- .../signal-desktop/db-reencryption-wrapper.py | 92 + .../signal-desktop/default.nix | 26 +- .../skypeforlinux/default.nix | 4 +- .../telepathy/salut/default.nix | 2 +- .../instant-messengers/tensor/default.nix | 13 +- .../instant-messengers/torchat/default.nix | 12 +- .../vk-messenger/default.nix | 2 +- .../whatsapp-for-linux/default.nix | 6 +- .../wire-desktop/default.nix | 9 +- .../instant-messengers/zulip-term/default.nix | 5 + .../instant-messengers/zulip/default.nix | 4 +- .../networking/irc/communi/default.nix | 18 +- .../mailreaders/astroid/default.nix | 4 +- .../evolution/evolution-ews/default.nix | 22 +- .../evolution/evolution/default.nix | 17 +- .../evolution/moduledir_from_env.patch | 21 - .../evolution/evolution/wrapper.nix | 12 +- .../mailreaders/himalaya/default.nix | 10 +- .../networking/mailreaders/mutt/default.nix | 4 +- .../mailreaders/thunderbird-bin/68.nix | 184 - .../thunderbird-bin/68_sources.nix | 615 - .../mailreaders/thunderbird-bin/default.nix | 4 +- .../thunderbird-bin/release_sources.nix | 530 +- .../networking/mailreaders/thunderbird/68.nix | 343 - .../mailreaders/thunderbird/default.nix | 6 +- .../thunderbird/no-buildconfig-68.patch | 36 - .../networking/mullvad-vpn/default.nix | 4 +- .../networking/nextdns/default.nix | 4 +- .../applications/networking/nym/default.nix | 27 +- .../nym/ignore-networking-tests.patch | 123 + .../networking/p2p/opentracker/default.nix | 6 +- .../networking/p2p/retroshare/default.nix | 59 - .../networking/p2p/transmission/default.nix | 33 + .../networking/p2p/xd/default.nix | 29 + .../networking/pcloud/default.nix | 4 +- .../networking/remote/anydesk/default.nix | 10 +- .../remote/citrix-workspace/generic.nix | 4 +- .../networking/remote/rdesktop/default.nix | 6 +- .../networking/remote/remmina/default.nix | 4 +- .../networking/seafile-client/default.nix | 13 +- .../networking/seaweedfs/default.nix | 8 +- .../networking/shellhub-agent/default.nix | 11 +- .../shellhub-agent/fix-go-mod-deps.patch | 128 - .../networking/sniffers/etherape/default.nix | 4 +- .../applications/networking/soju/default.nix | 38 + .../soulseek/nicotine-plus/default.nix | 39 +- .../networking/ssb-patchwork/default.nix | 6 +- .../networking/sync/onedrive/default.nix | 4 +- .../networking/syncthing-gtk/default.nix | 4 +- .../networking/vnstat/default.nix | 19 +- .../networking/weather/meteo/default.nix | 2 +- .../applications/office/abiword/default.nix | 4 +- .../office/beamerpresenter/default.nix | 45 +- .../office/elementary-planner/default.nix | 2 + .../applications/office/gnucash/default.nix | 14 +- .../applications/office/gnumeric/default.nix | 7 +- .../applications/office/grisbi/default.nix | 4 +- .../pkgs/applications/office/gtg/default.nix | 4 +- .../applications/office/homebank/default.nix | 8 +- .../applications/office/kmymoney/default.nix | 4 +- .../office/ledger-autosync/default.nix | 16 +- .../fix-ofxparse-dependency.patch | 13 + .../office/libreoffice/default.nix | 4 +- .../office/libreoffice/src-fresh/download.nix | 8 +- .../office/libreoffice/src-fresh/primary.nix | 8 +- .../applications/office/mytetra/default.nix | 2 +- .../applications/office/notes-up/default.nix | 2 +- .../office/paperwork/paperwork-gtk.nix | 10 +- .../applications/office/timeline/default.nix | 89 + .../applications/office/tryton/default.nix | 4 +- .../applications/office/watson/default.nix | 4 +- .../pkgs/applications/office/zim/default.nix | 4 +- .../applications/office/zotero/default.nix | 8 +- .../radio/ebook2cw/Makefile.patch | 12 - .../applications/radio/ebook2cw/default.nix | 16 +- .../applications/radio/gnuradio/wrapper.nix | 6 +- .../applications/radio/rtl_433/default.nix | 6 +- .../science/astronomy/kstars/default.nix | 15 +- .../science/astronomy/kstars/fs-fixes.patch | 59 - .../science/astronomy/siril/default.nix | 12 +- .../science/biology/bowtie2/default.nix | 4 +- .../science/biology/cd-hit/default.nix | 8 +- .../science/biology/est-sfs/default.nix | 4 + .../science/biology/octopus/default.nix | 18 +- .../science/biology/samblaster/default.nix | 2 + .../science/chemistry/gwyddion/default.nix | 4 +- .../science/chemistry/jmol/default.nix | 4 +- .../science/chemistry/openmolcas/default.nix | 15 +- .../science/electronics/gnucap/default.nix | 1 + .../science/electronics/gtkwave/default.nix | 4 +- .../science/electronics/kicad/base.nix | 122 +- .../science/electronics/kicad/default.nix | 50 +- .../science/electronics/kicad/i18n.nix | 4 +- .../science/electronics/kicad/libraries.nix | 3 +- .../science/electronics/kicad/versions.nix | 32 +- .../science/electronics/pulseview/default.nix | 11 +- .../science/logic/coq/default.nix | 4 +- .../science/logic/coq2html/default.nix | 25 +- .../science/logic/elan/default.nix | 5 +- .../science/logic/key/default.nix | 13 +- .../science/logic/petrinizer/default.nix | 13 +- .../science/logic/petrinizer/sbv-7.13.nix | 26 - .../science/logic/petrinizer/z3.nix | 24 - .../science/logic/poly/default.nix | 4 +- .../science/logic/tamarin-prover/default.nix | 4 + .../machine-learning/labelimg/default.nix | 2 +- .../machine-learning/starspace/default.nix | 5 + .../applications/science/math/R/default.nix | 4 +- .../science/math/bcal/default.nix | 26 +- .../science/math/cntk/default.nix | 5 +- .../science/math/eukleides/default.nix | 57 +- .../science/math/eukleides/use-CC.patch | 11 + .../applications/science/math/gap/default.nix | 26 +- .../mark-genstackfuncbags-as-noinline.patch | 13 - .../science/math/glsurf/default.nix | 12 +- .../science/math/gmsh/default.nix | 4 +- .../science/math/gretl/default.nix | 4 +- .../0001-ion-linux-makerules.patch | 12 + .../science/math/numworks-epsilon/default.nix | 16 +- .../science/math/pari/default.nix | 17 +- .../science/math/pari/rnfdisc.patch | 51 + .../science/math/pynac/default.nix | 35 +- .../science/math/sage/sage-src.nix | 16 +- .../science/math/singular/default.nix | 29 +- .../science/math/wxmaxima/default.nix | 4 +- .../science/misc/rink/default.nix | 6 +- .../science/misc/root/default.nix | 2 +- .../science/robotics/mavproxy/default.nix | 6 +- .../robotics/mission-planner/default.nix | 6 +- .../robotics/qgroundcontrol/default.nix | 4 +- .../terminal-emulators/alacritty/default.nix | 8 +- .../terminal-emulators/eterm/default.nix | 44 +- .../terminal-emulators/foot/default.nix | 4 +- .../terminal-emulators/kgx/default.nix | 4 +- .../terminal-emulators/kitty/default.nix | 4 +- .../terminal-emulators/mlterm/default.nix | 2 +- .../terminal-emulators/mrxvt/default.nix | 3 + .../rxvt-unicode/default.nix | 4 +- .../terminal-emulators/rxvt/default.nix | 3 + .../terminal-emulators/terminator/default.nix | 4 +- ...nction-for-getting-the-selected-text.patch | 2 +- .../terminal-emulators/tilix/default.nix | 2 +- .../terminal-emulators/wayst/default.nix | 7 +- .../terminal-emulators/wezterm/default.nix | 8 +- .../git-and-tools/gh/default.nix | 6 +- .../git-and-tools/git-cola/default.nix | 4 +- .../git-and-tools/git-secret/default.nix | 4 +- .../git-and-tools/git-workspace/default.nix | 5 +- .../git-and-tools/git/default.nix | 4 + .../git-and-tools/gitweb/default.nix | 2 +- .../git-and-tools/glab/default.nix | 6 +- .../git-and-tools/lefthook/default.nix | 6 +- .../radicle-upstream/default.nix | 4 +- .../git-and-tools/stgit/default.nix | 7 +- .../version-management/git-repo/default.nix | 4 +- .../version-management/gitea/default.nix | 4 +- .../version-management/gitkraken/default.nix | 8 +- .../version-management/gitoxide/default.nix | 16 +- .../version-management/meld/default.nix | 7 +- .../version-management/mercurial/4.9.nix | 4 +- .../version-management/monotone/default.nix | 40 +- .../version-management/smartgithg/default.nix | 8 +- .../version-management/sourcehut/builds.nix | 32 +- .../version-management/sourcehut/core.nix | 45 +- .../version-management/sourcehut/default.nix | 13 +- .../version-management/sourcehut/dispatch.nix | 22 +- .../version-management/sourcehut/git.nix | 52 +- .../version-management/sourcehut/hg.nix | 18 +- .../version-management/sourcehut/hub.nix | 16 +- .../version-management/sourcehut/lists.nix | 26 +- .../version-management/sourcehut/man.nix | 21 +- .../version-management/sourcehut/meta.nix | 55 +- .../version-management/sourcehut/paste.nix | 21 +- .../version-management/sourcehut/scm.nix | 21 +- .../version-management/sourcehut/todo.nix | 24 +- .../applications/video/aegisub/default.nix | 18 + .../video/aegisub/update-ffms2.patch | 105 + .../applications/video/avxsynth/default.nix | 43 - .../applications/video/byzanz/default.nix | 4 +- .../applications/video/celluloid/default.nix | 52 +- .../applications/video/clipgrab/default.nix | 14 +- .../applications/video/devede/default.nix | 6 +- .../applications/video/droidcam/default.nix | 4 +- .../applications/video/dvdstyler/default.nix | 8 + .../applications/video/filebot/default.nix | 4 +- .../applications/video/gnomecast/default.nix | 4 +- .../video/hdhomerun-config-gui/default.nix | 6 +- .../video/jellyfin-media-player/default.nix | 9 +- .../pkgs/applications/video/jftui/default.nix | 4 +- .../pkgs/applications/video/kino/default.nix | 95 - .../video/kino/kino-1.3.4-libav-0.7.patch | 60 - .../video/kino/kino-1.3.4-libav-0.8.patch | 57 - .../kino-1.3.4-libavcodec-pkg-config.patch | 11 - .../video/kino/kino-1.3.4-v4l1.patch | 21 - .../inputstream-ffmpegdirect/default.nix | 4 +- .../video/kodi-packages/netflix/default.nix | 4 +- .../video/kodi-packages/osmc-skin/default.nix | 2 +- .../kodi-packages/pvr-iptvsimple/default.nix | 4 +- .../applications/video/kodi/unwrapped.nix | 6 +- .../pkgs/applications/video/kooha/default.nix | 4 +- .../pkgs/applications/video/manim/default.nix | 6 +- .../applications/video/mplayer/default.nix | 2 + .../mplayer/svn-r38199-ffmpeg44fix.patch | 22 + .../video/openshot-qt/default.nix | 2 +- .../pkgs/applications/video/peek/default.nix | 8 +- .../applications/video/pitivi/default.nix | 14 +- .../pkgs/applications/video/prism/default.nix | 22 + .../video/qmediathekview/default.nix | 18 +- .../applications/video/recapp/default.nix | 81 + .../pkgs/applications/video/vdr/default.nix | 8 +- .../applications/video/xine-ui/default.nix | 2 - .../applications/video/xscast/default.nix | 4 +- .../bochs_fix_narrowing_conv_warning.patch | 29 + .../virtualization/bochs/default.nix | 6 +- .../virtualization/conmon/default.nix | 4 +- .../virtualization/containerd/default.nix | 4 +- .../virtualization/firecracker/default.nix | 4 +- .../virtualization/open-vm-tools/default.nix | 14 +- .../virtualization/podman-compose/default.nix | 17 +- .../virtualization/qemu/default.nix | 3 + .../virtualization/runc/default.nix | 4 +- .../virtualization/spice-vdagent/default.nix | 4 + .../virtualization/virt-manager/default.nix | 4 +- .../virtualization/virt-manager/qt.nix | 11 +- .../virtualization/virtualbox/default.nix | 6 +- .../virtualization/virtualbox/extpack.nix | 2 +- .../virtualbox/guest-additions/default.nix | 2 +- .../virtualbox/linux-5-11.patch | 12 - .../window-managers/cagebreak/default.nix | 24 +- .../window-managers/cardboard/default.nix | 118 + .../window-managers/dwl/default.nix | 22 +- .../window-managers/dwm/dwm-status.nix | 9 +- .../window-managers/herbstluftwm/default.nix | 7 +- .../window-managers/i3/default.nix | 4 +- .../window-managers/i3/status-rust.nix | 18 +- .../window-managers/icewm/default.nix | 10 +- .../window-managers/kbdd/default.nix | 8 +- .../window-managers/phosh/default.nix | 16 +- .../window-managers/river/default.nix | 61 +- .../window-managers/stumpwm/default.nix | 103 - .../stumpwm/fix-module-path.patch | 16 - .../window-managers/sway/default.nix | 9 + .../window-managers/sway/wrapper.nix | 14 +- .../window-managers/taffybar/default.nix | 20 +- .../window-managers/waybox/default.nix | 6 +- .../window-managers/windowmaker/default.nix | 4 +- .../window-managers/wio/default.nix | 5 + .../window-managers/wio/wlroots-0.13.patch | 254 + .../xmonad/log-applet/default.nix | 4 +- .../pkgs/build-support/agda/default.nix | 2 +- .../pkgs/build-support/appimage/default.nix | 2 +- .../build-support/cc-wrapper/cc-wrapper.sh | 28 +- .../pkgs/build-support/cc-wrapper/default.nix | 4 +- .../pkgs/build-support/emacs/wrapper.nix | 4 +- .../build-support/fetchgit/nix-prefetch-git | 1 + .../pkgs/build-support/mkshell/default.nix | 24 +- .../replace-secret/replace-secret.nix | 35 + .../replace-secret/replace-secret.py | 28 + .../replace-secret/test/expected_long_output | 30 + .../replace-secret/test/expected_short_output | 4 + .../replace-secret/test/input_file | 4 + .../build-support/replace-secret/test/passwd | 1 + .../build-support/replace-secret/test/rsa | 27 + .../rust/default-crate-overrides.nix | 2 +- .../pkgs/build-support/trivial-builders.nix | 62 + .../build-support/trivial-builders/test.nix | 53 + .../build-support/trivial-builders/test.sh | 56 + .../invoke-writeDirectReferencesToFile.nix | 4 + .../test/invoke-writeReferencesToFile.nix | 4 + .../trivial-builders/test/sample.nix | 15 + .../documentation/gnome-user-docs/default.nix | 10 +- .../data/fonts/cantarell-fonts/default.nix | 16 +- .../nixpkgs/pkgs/data/fonts/inter/default.nix | 4 +- .../pkgs/data/fonts/julia-mono/default.nix | 19 +- .../pkgs/data/fonts/open-sans/default.nix | 2 +- .../pkgs/data/fonts/stix-two/default.nix | 4 +- .../data/icons/arc-icon-theme/default.nix | 4 +- .../elementary-xfce-icon-theme/default.nix | 4 +- .../icons/humanity-icon-theme/default.nix | 4 +- .../data/icons/paper-icon-theme/default.nix | 4 +- .../data/icons/pop-icon-theme/default.nix | 4 +- .../pkgs/data/misc/ddccontrol-db/default.nix | 4 +- .../data/misc/fedora-backgrounds/default.nix | 11 + .../f34-fix-xfce-path.patch | 13 + .../nixpkgs/pkgs/data/misc/graphs/default.nix | 4 +- .../pkgs/data/misc/hackage/default.nix | 10 +- .../nixpkgs/pkgs/data/misc/hackage/pin.json | 6 + .../default.nix | 13 +- .../pkgs/data/themes/adapta/default.nix | 4 +- .../pkgs/data/themes/adwaita-qt/default.nix | 25 +- .../pkgs/data/themes/amber/default.nix | 4 +- .../nixpkgs/pkgs/data/themes/arc/default.nix | 34 +- .../pkgs/data/themes/canta/default.nix | 4 +- .../pkgs/data/themes/cdetheme/default.nix | 2 +- .../data/themes/equilux-theme/default.nix | 6 +- .../pkgs/data/themes/jade1/default.nix | 4 +- .../nixpkgs/pkgs/data/themes/kde2/default.nix | 2 +- .../pkgs/data/themes/lounge/default.nix | 4 +- .../data/themes/marwaita-manjaro/default.nix | 4 +- .../pkgs/data/themes/marwaita/default.nix | 7 +- .../data/themes/materia-theme/default.nix | 6 +- .../pkgs/data/themes/plano/default.nix | 4 +- .../pkgs/data/themes/qtcurve/default.nix | 2 +- .../pkgs/data/themes/stilo/default.nix | 4 +- .../data/themes/ubuntu-themes/default.nix | 4 +- .../nixpkgs/pkgs/data/themes/yaru/default.nix | 4 +- .../pkgs/desktops/cdesktopenv/default.nix | 2 +- .../cinnamon/cinnamon-common/default.nix | 4 +- .../cinnamon-control-center/default.nix | 2 +- .../cinnamon/cinnamon-screensaver/default.nix | 4 +- .../pkgs/desktops/cinnamon/cjs/default.nix | 8 +- .../cinnamon/mint-x-icons/default.nix | 4 +- .../cinnamon/mint-y-icons/default.nix | 4 +- .../pkgs/desktops/cinnamon/muffin/default.nix | 4 +- .../gnome-getting-started-docs/default.nix | 25 - .../gnome-3/apps/gnome-todo/default.nix | 89 - .../desktops/gnome-3/core/baobab/default.nix | 34 - .../gnome-3/core/dconf-editor/default.nix | 36 - .../core/gnome-backgrounds/default.nix | 22 - .../gnome-3/core/gnome-bluetooth/default.nix | 52 - .../gnome-3/core/gnome-calculator/default.nix | 46 - .../gnome-3/core/gnome-desktop/default.nix | 53 - .../core/gnome-disk-utility/default.nix | 45 - .../gnome-3/core/gvc-with-ucm-prePatch.nix | 17 - .../fix-desktop-file-paths.patch | 50 - .../gnome-3/games/gnome-chess/default.nix | 35 - .../gnome-3/games/gnome-nibbles/default.nix | 39 - .../gnome-3/games/gnome-robots/default.nix | 38 - .../gnome-3/games/gnome-taquin/default.nix | 35 - .../gnome-3/games/swell-foop/default.nix | 37 - .../Bump-client-test-timeout-to-300s.patch | 10 - .../apps/accerciser/default.nix | 7 +- .../apps/cheese/default.nix | 52 +- .../apps/file-roller/default.nix | 21 +- .../{gnome-3 => gnome}/apps/gedit/default.nix | 12 +- .../{gnome-3 => gnome}/apps/ghex/default.nix | 6 +- .../apps/gnome-books/default.nix | 17 +- .../apps/gnome-boxes/default.nix | 20 +- .../apps/gnome-calendar/default.nix | 25 +- .../gtk_image_reset_crash.patch | 17 + .../apps/gnome-characters/default.nix | 21 +- .../apps/gnome-clocks/default.nix | 12 +- .../apps/gnome-connections/default.nix | 50 +- .../apps/gnome-documents/default.nix | 8 +- .../apps/gnome-logs/default.nix | 8 +- .../apps/gnome-maps/default.nix | 19 +- .../apps/gnome-music/default.nix | 14 +- .../apps/gnome-nettool/default.nix | 8 +- .../apps/gnome-notes/default.nix | 25 +- .../apps/gnome-power-manager/default.nix | 8 +- .../apps/gnome-sound-recorder/default.nix | 12 +- .../gnome/apps/gnome-todo/default.nix | 85 + .../apps/gnome-weather/default.nix | 50 +- .../apps/polari/default.nix | 6 +- .../polari/make-thumbnailer-wrappable.patch | 0 .../apps/seahorse/default.nix | 14 +- .../apps/vinagre/default.nix | 8 +- .../core/adwaita-icon-theme/default.nix | 12 +- .../desktops/gnome/core/baobab/default.nix | 64 + .../core/caribou/default.nix | 6 +- .../gnome/core/dconf-editor/default.nix | 69 + .../core/empathy/default.nix | 6 +- .../{gnome-3 => gnome}/core/eog/default.nix | 12 +- .../core/epiphany/default.nix | 26 +- .../core/evince/default.nix | 12 +- .../core/evolution-data-server/default.nix | 9 +- .../evolution-data-server/fix-paths.patch | 0 .../hardcode-gsettings.patch | 0 .../{gnome-3 => gnome}/core/gdm/default.nix | 21 +- .../core/gdm/fix-paths.patch | 0 .../gdm/gdm-session-worker_forward-vars.patch | 0 .../core/gdm/gdm-x-session_extra_args.patch | 0 .../gdm/gdm-x-session_session-wrapper.patch | 0 .../org.gnome.login-screen.gschema.override | 0 .../core/gdm/reset-environment.patch | 0 .../gnome/core/gnome-backgrounds/default.nix | 22 + .../gnome/core/gnome-bluetooth/default.nix | 86 + .../gnome/core/gnome-calculator/default.nix | 89 + .../core/gnome-color-manager/default.nix | 6 +- .../core/gnome-common/default.nix | 4 +- .../core/gnome-contacts/default.nix | 16 +- .../core/gnome-control-center/default.nix | 51 +- .../core/gnome-control-center/paths.patch | 94 +- .../core/gnome-desktop/bubblewrap-paths.patch | 0 .../gnome/core/gnome-desktop/default.nix | 96 + .../core/gnome-dictionary/default.nix | 24 +- .../gnome/core/gnome-disk-utility/default.nix | 85 + .../core/gnome-font-viewer/default.nix | 16 +- .../gnome-initial-setup/0001-fix-paths.patch | 21 +- .../core/gnome-initial-setup/default.nix | 30 +- .../core/gnome-initial-setup/vendor.conf | 0 .../core/gnome-keyring/default.nix | 81 +- .../core/gnome-online-miners/default.nix | 6 +- .../core/gnome-remote-desktop/default.nix | 18 +- .../core/gnome-screenshot/default.nix | 14 +- .../core/gnome-session/ctl.nix | 9 +- .../core/gnome-session/default.nix | 29 +- .../core/gnome-session/fix-paths.patch | 0 .../core/gnome-settings-daemon/default.nix | 12 +- .../gnome-settings-daemon/fix-paths.patch | 0 .../global-backlight-helper.patch | 0 .../core/gnome-shell-extensions/default.nix | 53 +- .../gnome-shell-extensions/fix_gmenu.patch | 0 .../core/gnome-shell/default.nix | 29 +- .../core/gnome-shell/fix-paths.patch | 0 .../core/gnome-shell/shew-gir-path.patch | 2 +- .../core/gnome-shell/wrap-services.patch | 0 .../core/gnome-software/default.nix | 19 +- .../core/gnome-software/fix-paths.patch | 0 .../core/gnome-system-monitor/default.nix | 63 +- .../core/gnome-terminal/default.nix | 14 +- .../core/gnome-themes-extra/default.nix | 6 +- .../core/gnome-tour/default.nix | 10 +- .../core/gnome-user-share/default.nix | 6 +- .../core/gucharmap/default.nix | 4 +- .../core/libgnome-keyring/default.nix | 9 +- .../0001-EGL-Include-EGL-eglmesaext.h.patch | 0 .../mutter/3.34/0002-drop-inheritable.patch | 0 .../3.34/0003-Fix-glitches-in-gala.patch | 0 ...er-track-changes-in-GLib-and-Sysprof.patch | 0 ...isplay.h-to-meta-workspace-manager.h.patch | 0 ...-build-bump-ABI-to-sysprof-capture-4.patch | 0 .../core/mutter/3.34/0007-fix-paths.patch | 0 .../core/mutter/3.34/default.nix | 2 +- .../core/mutter/default.nix | 20 +- .../core/mutter/drop-inheritable.patch | 0 .../core/mutter/fix-paths.patch | 0 .../core/nautilus/default.nix | 18 +- .../core/nautilus/extension_dir.patch | 0 .../core/nautilus/fix-paths.patch | 0 ...d-option-for-installation-sysconfdir.patch | 0 .../{gnome-3 => gnome}/core/rygel/default.nix | 7 +- .../core/simple-scan/default.nix | 14 +- .../{gnome-3 => gnome}/core/sushi/default.nix | 13 +- .../{gnome-3 => gnome}/core/totem/default.nix | 10 +- .../core/yelp-xsl/default.nix | 12 +- .../{gnome-3 => gnome}/core/yelp/default.nix | 14 +- .../core/zenity/default.nix | 6 +- .../desktops/{gnome-3 => gnome}/default.nix | 14 +- .../devtools/anjuta/default.nix | 4 +- .../devtools/devhelp/default.nix | 14 +- .../devtools/gnome-devel-docs/default.nix | 10 +- .../extensions/EasyScreenCast/default.nix | 4 +- .../EasyScreenCast/fix-gi-path.patch | 0 .../extensions/appindicator/default.nix | 8 +- .../extensions/arcmenu/default.nix | 4 +- .../extensions/arcmenu/fix_gmenu.patch | 0 .../extensions/caffeine/default.nix | 8 +- .../extensions/chrome-gnome-shell/default.nix | 8 +- .../clipboard-indicator/default.nix | 20 +- .../extensions/clock-override/default.nix | 4 +- .../extensions/dash-to-dock/default.nix | 0 .../extensions/dash-to-panel/default.nix | 0 .../extensions/disable-unredirect/default.nix | 6 +- .../draw-on-your-screen/default.nix | 4 +- .../extensions/drop-down-terminal/default.nix | 2 +- .../drop-down-terminal/fix_vte_and_gjs.patch | 0 .../dynamic-panel-transparency/default.nix | 10 +- .../extensions/emoji-selector/default.nix | 0 .../extensions/freon/default.nix | 0 .../extensions/fuzzy-app-search/default.nix | 12 +- .../extensions/gsconnect/default.nix | 10 +- .../extensions/gsconnect/fix-paths.patch | 0 .../gsconnect/installed-tests-path.patch | 0 .../gnome/extensions/hot-edge/default.nix | 33 + .../extensions/icon-hider/default.nix | 6 +- .../extensions/impatience/default.nix | 0 .../extensions/material-shell/default.nix | 4 +- .../mpris-indicator-button/default.nix | 8 +- .../night-theme-switcher/default.nix | 4 +- .../extensions/no-title-bar/default.nix | 0 .../extensions/no-title-bar/fix-paths.patch | 0 .../extensions/noannoyance/default.nix | 0 .../extensions/paperwm/default.nix | 0 .../pidgin-im-integration/default.nix | 4 +- .../remove-dropdown-arrows/default.nix | 0 .../sound-output-device-chooser/default.nix | 16 +- .../fix-paths.patch | 0 .../extensions/system-monitor/default.nix | 10 +- .../paths_and_nonexisting_dirs.patch | 0 .../extensions/taskwhisperer/default.nix | 0 .../extensions/taskwhisperer/fix-paths.patch | 0 .../extensions/tilingnome/default.nix | 4 +- .../extensions/timepp/default.nix | 2 +- .../extensions/topicons-plus/default.nix | 0 .../extensions/unite/default.nix | 4 +- .../window-corner-preview/default.nix | 4 +- .../window-is-ready-remover/default.nix | 0 .../extensions/workspace-matrix/default.nix | 0 .../{gnome-3 => gnome}/find-latest-version.py | 39 +- .../games/aisleriot/default.nix | 11 +- .../games/atomix/default.nix | 8 +- .../games/five-or-more/default.nix | 8 +- .../games/four-in-a-row/default.nix | 8 +- .../gnome/games/gnome-chess/default.nix | 68 + .../games/gnome-klotski/default.nix | 12 +- .../games/gnome-mahjongg/default.nix | 8 +- .../games/gnome-mines/default.nix | 14 +- .../gnome/games/gnome-nibbles/default.nix | 84 + .../gnome/games/gnome-robots/default.nix | 73 + .../games/gnome-sudoku/default.nix | 12 +- .../gnome/games/gnome-taquin/default.nix | 75 + .../games/gnome-tetravex/default.nix | 6 +- .../games/hitori/default.nix | 6 +- .../games/iagno/default.nix | 22 +- .../games/lightsoff/default.nix | 14 +- .../games/quadrapassel/default.nix | 8 +- .../gnome/games/swell-foop/default.nix | 72 + .../{gnome-3 => gnome}/games/tali/default.nix | 12 +- .../desktops/{gnome-3 => gnome}/installer.nix | 0 .../{gnome-3 => gnome}/misc/geary/default.nix | 43 +- .../{gnome-3 => gnome}/misc/gitg/default.nix | 48 +- .../misc/gnome-applets/default.nix | 14 +- .../misc/gnome-autoar/default.nix | 8 +- .../misc/gnome-flashback/default.nix | 11 +- .../misc/gnome-packagekit/default.nix | 6 +- .../misc/gnome-panel/default.nix | 11 +- .../fix-dbus-service-dir.patch | 0 .../misc/gnome-tweaks/default.nix | 30 +- .../misc/gpaste/default.nix | 4 +- .../misc/gpaste/fix-paths.patch | 2 +- .../misc/gtkhtml/default.nix | 6 +- .../misc/libgnome-games-support/default.nix | 11 +- .../misc/metacity/default.nix | 11 +- .../misc/metacity/fix-paths.patch | 0 .../misc/nautilus-python/default.nix | 7 +- .../misc/pomodoro/default.nix | 6 +- .../desktops/{gnome-3 => gnome}/update.nix | 4 +- .../pkgs/desktops/gnustep/base/default.nix | 4 +- .../nixpkgs/pkgs/desktops/gnustep/default.nix | 3 +- .../pkgs/desktops/gnustep/make/default.nix | 4 +- .../lxqt/lxqt-build-tools/default.nix | 8 + .../pkgs/desktops/mate/marco/default.nix | 4 +- .../desktops/mate/mate-applets/default.nix | 4 +- .../desktops/mate/mate-desktop/default.nix | 2 +- .../mate/mate-power-manager/default.nix | 4 +- .../pkgs/desktops/mate/pluma/default.nix | 4 +- .../pantheon/apps/appcenter/default.nix | 11 +- .../apps/elementary-calculator/default.nix | 4 +- .../apps/elementary-calendar/default.nix | 2 + .../pantheon/apps/elementary-code/default.nix | 9 + .../apps/elementary-music/default.nix | 9 + .../apps/elementary-photos/default.nix | 9 + .../switchboard-plugs/printers/default.nix | 8 + .../security-privacy/default.nix | 9 + .../pkgs/desktops/pantheon/default.nix | 16 +- .../wingpanel-indicators/datetime/default.nix | 2 + .../desktops/pantheon/granite/default.nix | 4 +- .../elementary-settings-daemon/default.nix | 19 +- .../pkgs/desktops/plasma-5/default.nix | 1 + .../nixpkgs/pkgs/desktops/plasma-5/fetch.sh | 2 +- .../pkgs/desktops/plasma-5/plasma-sdk.nix | 41 + .../nixpkgs/pkgs/desktops/plasma-5/srcs.nix | 416 +- .../xfce/applications/mousepad/default.nix | 13 +- .../desktops/xfce/core/thunar/default.nix | 4 +- .../xfce/core/xfce4-panel/default.nix | 10 +- .../nixpkgs/pkgs/desktops/xfce/default.nix | 4 +- .../xfce4-clipman-plugin/default.nix | 9 +- .../arduino/arduino-cli/default.nix | 25 +- .../development/arduino/platformio/core.nix | 53 +- .../arduino/platformio/default.nix | 4 +- .../use-local-spdx-license-list.patch | 10 +- .../development/beam-modules/build-mix.nix | 85 + .../development/beam-modules/build-rebar3.nix | 32 +- .../pkgs/development/beam-modules/default.nix | 6 +- .../beam-modules/erlang-ls/default.nix | 34 + .../beam-modules/erlang-ls/rebar-deps.nix | 90 + .../development/beam-modules/pc/default.nix | 4 +- .../beam-modules/rebar3-nix/default.nix | 18 + .../adoptopenjdk-bin/jdk-darwin-base.nix | 5 + .../adoptopenjdk-bin/jdk-linux-base.nix | 5 + .../development/compilers/avian/default.nix | 43 - .../development/compilers/cc65/default.nix | 5 +- .../compilers/compcert/default.nix | 27 + .../development/compilers/copper/default.nix | 1 + .../development/compilers/crystal/default.nix | 2 +- .../development/compilers/dale/default.nix | 2 +- .../development/compilers/elm/default.nix | 4 +- .../compilers/elm/packages/elm-instrument.nix | 11 +- .../compilers/elm/packages/elm-json.nix | 10 +- .../compilers/elm/packages/elm-json.patch | 47 +- .../development/compilers/gcc/10/default.nix | 14 +- .../development/compilers/gcc/11/default.nix | 4 +- .../development/compilers/gcc/4.8/default.nix | 10 +- .../development/compilers/gcc/4.9/default.nix | 10 +- .../development/compilers/gcc/6/default.nix | 10 +- .../development/compilers/gcc/7/default.nix | 10 +- .../development/compilers/gcc/8/default.nix | 10 +- .../development/compilers/gcc/9/default.nix | 10 +- .../compilers/gcc/common/configure-flags.nix | 15 + .../compilers/gcc/common/pre-configure.nix | 9 +- .../compilers/gcc/gnat-cflags-11.patch | 35 + .../compilers/ghc/8.10.2-binary.nix | 15 +- .../pkgs/development/compilers/ghc/8.10.4.nix | 2 +- .../compilers/ghc/8.6.5-binary.nix | 17 +- .../pkgs/development/compilers/ghc/8.8.4.nix | 2 +- .../pkgs/development/compilers/ghc/9.0.1.nix | 2 +- .../pkgs/development/compilers/ghc/head.nix | 17 +- .../development/compilers/ghdl/default.nix | 2 +- .../development/compilers/gleam/default.nix | 6 +- .../pkgs/development/compilers/go/1.15.nix | 4 +- .../pkgs/development/compilers/go/1.16.nix | 4 +- .../pkgs/development/compilers/go/2-dev.nix | 6 +- .../development/compilers/inform6/default.nix | 5 +- .../intel-graphics-compiler/default.nix | 4 +- .../development/compilers/ispc/default.nix | 6 +- .../development/compilers/julia/1.0-bin.nix | 80 + .../development/compilers/julia/1.6-bin.nix | 73 + ...ip-tests-that-require-network-access.patch | 87 + ...Skip-tempname-test-broken-in-sandbox.patch | 28 + ...x-Skip-chown-tests-broken-in-sandbox.patch | 27 + ...able-parallel-unit-tests-for-sandbox.patch | 30 + .../development/compilers/kotlin/default.nix | 8 +- .../development/compilers/ldc/generic.nix | 2 +- .../compilers/llvm/10/clang/default.nix | 23 +- .../llvm/10/clang/gnu-install-dirs.patch | 248 + .../compilers/llvm/10/compiler-rt/default.nix | 3 +- .../10/compiler-rt/gnu-install-dirs.patch | 129 + .../development/compilers/llvm/10/default.nix | 35 +- .../compilers/llvm/10/libc++/default.nix | 6 +- .../llvm/10/libc++/gnu-install-dirs.patch | 99 + .../compilers/llvm/10/libc++abi/default.nix | 33 +- .../llvm/10/libc++abi/gnu-install-dirs.patch | 34 + .../compilers/llvm/10/libunwind/default.nix | 6 + .../llvm/10/libunwind/gnu-install-dirs.patch | 34 + .../compilers/llvm/10/lld/default.nix | 20 +- .../llvm/10/lld/gnu-install-dirs.patch | 68 + .../compilers/llvm/10/lldb/default.nix | 47 +- .../llvm/10/lldb/gnu-install-dirs.patch | 65 + .../compilers/llvm/10/llvm/default.nix | 49 +- .../llvm/10/llvm/gnu-install-dirs-polly.patch | 106 + .../llvm/10/llvm/gnu-install-dirs.patch | 416 + .../compilers/llvm/11/clang/default.nix | 23 +- .../llvm/11/clang/gnu-install-dirs.patch | 235 + .../compilers/llvm/11/compiler-rt/default.nix | 14 +- .../11/compiler-rt/gnu-install-dirs.patch | 129 + .../llvm/11/compiler-rt/normalize-var.patch | 16 + .../development/compilers/llvm/11/default.nix | 34 +- .../compilers/llvm/11/libc++/default.nix | 3 + .../llvm/11/libc++/gnu-install-dirs.patch | 100 + .../compilers/llvm/11/libc++abi/default.nix | 33 +- .../llvm/11/libc++abi/gnu-install-dirs.patch | 34 + .../compilers/llvm/11/libunwind/default.nix | 6 + .../llvm/11/libunwind/gnu-install-dirs.patch | 34 + .../compilers/llvm/11/lld/default.nix | 20 +- .../llvm/11/lld/gnu-install-dirs.patch | 68 + .../compilers/llvm/11/lldb/default.nix | 47 +- .../llvm/11/lldb/gnu-install-dirs.patch | 65 + .../compilers/llvm/11/llvm/default.nix | 51 +- .../llvm/11/llvm/gnu-install-dirs-polly.patch | 106 + .../llvm/11/llvm/gnu-install-dirs.patch | 417 + .../compilers/llvm/12/clang/default.nix | 23 +- .../llvm/12/clang/gnu-install-dirs.patch | 235 + ...sion.patch => X86-support-extension.patch} | 0 ...{compiler-rt-armv7l.patch => armv7l.patch} | 0 ...piler-rt-codesign.patch => codesign.patch} | 0 .../compilers/llvm/12/compiler-rt/default.nix | 19 +- .../12/compiler-rt/gnu-install-dirs.patch | 129 + .../llvm/12/compiler-rt/normalize-var.patch | 16 + .../development/compilers/llvm/12/default.nix | 32 +- .../compilers/llvm/12/libcxxabi/default.nix | 2 +- .../{libcxxabi-wasm.patch => wasm.patch} | 0 .../compilers/llvm/12/libunwind/default.nix | 6 + .../llvm/12/libunwind/gnu-install-dirs.patch | 34 + .../compilers/llvm/12/lld/default.nix | 24 +- .../llvm/12/lld/gnu-install-dirs.patch | 68 + .../compilers/llvm/12/lldb/default.nix | 35 +- .../llvm/12/lldb/gnu-install-dirs.patch | 65 + .../lldb/{lldb-procfs.patch => procfs.patch} | 0 .../compilers/llvm/12/lldb/resource-dir.patch | 13 + .../compilers/llvm/12/llvm/default.nix | 54 +- .../llvm/12/llvm/gnu-install-dirs-polly.patch | 105 + .../llvm/12/llvm/gnu-install-dirs.patch | 417 + .../{llvm-outputs.patch => outputs.patch} | 0 .../compilers/llvm/5/clang/default.nix | 25 +- .../llvm/5/clang/gnu-install-dirs.patch | 242 + .../compilers/llvm/5/compiler-rt/default.nix | 3 +- .../llvm/5/compiler-rt/gnu-install-dirs.patch | 103 + .../development/compilers/llvm/5/default.nix | 26 +- .../compilers/llvm/5/libc++/default.nix | 6 +- .../llvm/5/libc++/gnu-install-dirs.patch | 72 + .../compilers/llvm/5/libc++abi/default.nix | 10 +- .../llvm/5/libc++abi/gnu-install-dirs.patch | 28 + .../compilers/llvm/5/lld/default.nix | 20 +- .../llvm/5/lld/gnu-install-dirs.patch | 68 + .../compilers/llvm/5/lldb/default.nix | 35 +- .../llvm/5/lldb/gnu-install-dirs.patch | 76 + .../compilers/llvm/5/llvm/default.nix | 60 +- .../llvm/5/llvm/gnu-install-dirs-polly.patch | 106 + .../llvm/5/llvm/gnu-install-dirs.patch | 386 + .../compilers/llvm/6/clang/default.nix | 25 +- .../llvm/6/clang/gnu-install-dirs.patch | 258 + .../compilers/llvm/6/compiler-rt/default.nix | 3 +- .../llvm/6/compiler-rt/gnu-install-dirs.patch | 107 + .../development/compilers/llvm/6/default.nix | 26 +- .../compilers/llvm/6/libc++/default.nix | 6 +- .../llvm/6/libc++/gnu-install-dirs.patch | 72 + .../compilers/llvm/6/libc++abi/default.nix | 10 +- .../llvm/6/libc++abi/gnu-install-dirs.patch | 28 + .../compilers/llvm/6/lld/default.nix | 20 +- .../llvm/6/lld/gnu-install-dirs.patch | 68 + .../compilers/llvm/6/lldb/default.nix | 35 +- .../llvm/6/lldb/gnu-install-dirs.patch | 76 + .../compilers/llvm/6/llvm/default.nix | 51 +- .../llvm/6/llvm/gnu-install-dirs-polly.patch | 106 + .../llvm/6/llvm/gnu-install-dirs.patch | 386 + .../compilers/llvm/7/clang/default.nix | 24 +- .../llvm/7/clang/gnu-install-dirs.patch | 281 + .../compilers/llvm/7/clang/unwindlib.patch | 227 + .../compilers/llvm/7/compiler-rt/default.nix | 3 +- .../llvm/7/compiler-rt/gnu-install-dirs.patch | 117 + .../development/compilers/llvm/7/default.nix | 46 +- .../compilers/llvm/7/libc++/default.nix | 9 +- .../llvm/7/libc++/gnu-install-dirs.patch | 72 + .../compilers/llvm/7/libc++abi/default.nix | 22 +- .../llvm/7/libc++abi/gnu-install-dirs.patch | 28 + .../compilers/llvm/7/libunwind/default.nix | 35 + .../llvm/7/libunwind/gnu-install-dirs.patch | 28 + .../compilers/llvm/7/lld/default.nix | 20 +- .../llvm/7/lld/gnu-install-dirs.patch | 68 + .../compilers/llvm/7/lldb/default.nix | 45 +- .../llvm/7/lldb/gnu-install-dirs.patch | 76 + .../compilers/llvm/7/llvm/default.nix | 46 +- .../llvm/7/llvm/gnu-install-dirs-polly.patch | 106 + .../llvm/7/llvm/gnu-install-dirs.patch | 386 + .../compilers/llvm/8/clang/default.nix | 23 +- .../llvm/8/clang/gnu-install-dirs.patch | 290 + .../8/clang/{clang-xpc.patch => xpc.patch} | 0 .../compilers/llvm/8/compiler-rt/default.nix | 3 +- .../llvm/8/compiler-rt/gnu-install-dirs.patch | 117 + .../development/compilers/llvm/8/default.nix | 40 +- .../compilers/llvm/8/libc++/default.nix | 6 +- .../llvm/8/libc++/gnu-install-dirs.patch | 72 + .../compilers/llvm/8/libc++abi/default.nix | 33 +- .../llvm/8/libc++abi/gnu-install-dirs.patch | 28 + .../compilers/llvm/8/libunwind/default.nix | 11 +- .../llvm/8/libunwind/gnu-install-dirs.patch | 28 + .../compilers/llvm/8/lld/default.nix | 20 +- .../llvm/8/lld/gnu-install-dirs.patch | 68 + .../compilers/llvm/8/lldb/default.nix | 42 +- .../llvm/8/lldb/gnu-install-dirs.patch | 81 + .../compilers/llvm/8/llvm/default.nix | 46 +- .../llvm/8/llvm/gnu-install-dirs-polly.patch | 106 + .../llvm/8/llvm/gnu-install-dirs.patch | 394 + .../compilers/llvm/9/clang/default.nix | 21 +- .../llvm/9/clang/gnu-install-dirs.patch | 278 + .../compilers/llvm/9/compiler-rt/default.nix | 3 +- .../llvm/9/compiler-rt/gnu-install-dirs.patch | 117 + .../development/compilers/llvm/9/default.nix | 40 +- .../compilers/llvm/9/libc++/default.nix | 6 +- .../llvm/9/libc++/gnu-install-dirs.patch | 99 + .../compilers/llvm/9/libc++abi/default.nix | 33 +- .../llvm/9/libc++abi/gnu-install-dirs.patch | 34 + .../compilers/llvm/9/libunwind/default.nix | 6 + .../llvm/9/libunwind/gnu-install-dirs.patch | 34 + .../compilers/llvm/9/lld/default.nix | 20 +- .../llvm/9/lld/gnu-install-dirs.patch | 68 + .../compilers/llvm/9/lldb/default.nix | 43 +- .../llvm/9/lldb/gnu-install-dirs.patch | 65 + .../compilers/llvm/9/llvm/default.nix | 47 +- .../llvm/9/llvm/gnu-install-dirs-polly.patch | 106 + .../llvm/9/llvm/gnu-install-dirs.patch | 395 + .../compilers/llvm/rocm/default.nix | 5 +- .../compilers/llvm/rocm/lld/default.nix | 12 +- .../compilers/llvm/rocm/llvm/default.nix | 2 +- .../pkgs/development/compilers/mono/5.nix | 4 +- .../compilers/mrustc/bootstrap.nix | 2 +- .../pkgs/development/compilers/openjdk/15.nix | 4 +- .../compilers/openjdk/openjfx/11.nix | 4 +- .../development/compilers/pakcs/default.nix | 2 +- .../compilers/ponyc/pony-corral.nix | 4 +- .../pkgs/development/compilers/rust/1_45.nix | 6 +- .../pkgs/development/compilers/rust/1_51.nix | 6 +- .../development/compilers/rust/default.nix | 1 + .../pkgs/development/compilers/rust/rustc.nix | 6 +- .../pkgs/development/compilers/solc/0.7.nix | 78 - .../development/compilers/solc/default.nix | 3 +- .../spirv-llvm-translator/default.nix | 3 +- .../compilers/swi-prolog/default.nix | 2 +- .../development/compilers/vala/default.nix | 17 +- .../development/compilers/z88dk/default.nix | 6 +- .../development/compilers/zig/default.nix | 30 +- .../development/coq-modules/CoLoR/default.nix | 2 + .../development/coq-modules/VST/default.nix | 6 +- .../coq-modules/aac-tactics/default.nix | 46 + .../0001-changes-to-work-with-Coq-8.6.patch | 134 - .../coq-modules/autosubst/default.nix | 27 +- .../coq-modules/coqprime/default.nix | 2 +- .../coq-modules/goedel/default.nix | 24 + .../coq-modules/hydra-battles/default.nix | 29 + .../coq-modules/interval/default.nix | 8 +- .../coq-modules/mathcomp-zify/default.nix | 22 + .../coq-modules/metalib/default.nix | 2 +- .../coq-modules/pocklington/default.nix | 22 + .../coq-modules/relation-algebra/default.nix | 35 + .../python-language-server/create_deps.sh | 6 +- .../python-language-server/default.nix | 14 +- .../python-language-server/deps.nix | 124 +- .../python-language-server/manual_deps.txt | 16 +- .../haskell-modules/cabal2nix-unstable.nix | 40 + .../haskell-modules/configuration-arm.nix | 96 + .../haskell-modules/configuration-common.nix | 330 +- .../haskell-modules/configuration-darwin.nix | 171 + .../configuration-ghc-9.0.x.nix | 6 + .../configuration-ghc-head.nix | 3 +- .../configuration-hackage2nix.yaml | 12004 -------------- .../configuration-hackage2nix/broken.yaml | 5263 ++++++ .../configuration-hackage2nix/main.yaml | 483 + .../configuration-hackage2nix/stackage.yaml | 2698 +++ .../transitive-broken.yaml | 3302 ++++ .../haskell-modules/configuration-nix.nix | 249 +- .../development/haskell-modules/default.nix | 29 +- .../haskell-modules/generic-builder.nix | 7 +- .../haskell-modules/hackage-packages.nix | 7737 +++------ .../pkgs/development/haskell-modules/lib.nix | 10 + .../haskell-modules/make-package-set.nix | 2 +- .../haskell-modules/non-hackage-packages.nix | 4 + .../patches/jsaddle-webkit2gtk.patch | 65 + .../haskell-modules/with-packages-wrapper.nix | 2 +- .../pkgs/development/idris-modules/data.nix | 25 - .../development/idris-modules/default.nix | 2 - .../pkgs/development/idris-modules/sdl2.nix | 7 +- .../acl2/libipasirglucose4/default.nix | 14 +- .../interpreters/angelscript/default.nix | 29 +- .../interpreters/cling/default.nix | 9 +- .../interpreters/clojure/babashka.nix | 4 +- .../interpreters/clojure/default.nix | 4 +- .../development/interpreters/erlang/R21.nix | 4 +- .../development/interpreters/erlang/R23.nix | 4 +- .../development/interpreters/erlang/R24.nix | 8 + .../interpreters/erlang/generic-builder.nix | 3 +- .../interpreters/evcxr/default.nix | 13 +- .../interpreters/falcon/default.nix | 18 +- .../interpreters/gnu-apl/default.nix | 2 + .../interpreters/jruby/default.nix | 4 +- .../interpreters/lfe/fix-rebar-config.patch | 29 + .../interpreters/lfe/generic-builder.nix | 2 +- .../interpreters/lfe/no-test-deps.patch | 13 - .../interpreters/lua-5/5.4.darwin.patch | 48 + .../interpreters/lua-5/default.nix | 30 +- .../interpreters/lua-5/interpreter.nix | 37 +- .../interpreters/lua-5/liblua.so.patch | 60 - .../lua-5/{lua-5.3-dso.make => lua-dso.make} | 6 +- .../pkgs/development/interpreters/php/7.3.nix | 4 +- .../pkgs/development/interpreters/php/7.4.nix | 4 +- .../pkgs/development/interpreters/php/8.0.nix | 4 +- .../development/interpreters/pure/default.nix | 8 +- .../interpreters/python/default.nix | 2 + .../interpreters/renpy/default.nix | 6 +- .../development/interpreters/ruby/default.nix | 30 +- .../interpreters/ruby/rubygems/default.nix | 11 +- .../interpreters/spidermonkey/1.8.5.nix | 79 - .../interpreters/spidermonkey/68.nix | 2 +- .../interpreters/wasmer/default.nix | 2 +- .../interpreters/wasmtime/default.nix | 2 +- .../libraries/SDL2_image/default.nix | 4 +- .../libraries/SDL_image/default.nix | 4 +- .../development/libraries/ace/default.nix | 4 +- .../development/libraries/alembic/default.nix | 4 +- .../development/libraries/amtk/default.nix | 21 +- .../libraries/apache-activemq/default.nix | 4 +- .../applet-window-buttons/default.nix | 50 + .../libraries/appstream-glib/default.nix | 2 +- .../libraries/appstream/default.nix | 70 +- .../development/libraries/aravis/default.nix | 6 +- .../libraries/at-spi2-atk/default.nix | 5 +- .../libraries/at-spi2-core/default.nix | 13 +- .../development/libraries/atk/default.nix | 5 +- .../development/libraries/atkmm/default.nix | 5 +- .../development/libraries/avahi/default.nix | 6 + .../libraries/aws-c-cal/default.nix | 4 +- .../libraries/aws-c-io/default.nix | 5 +- .../libraries/aws-sdk-cpp/default.nix | 5 +- .../development/libraries/bamf/default.nix | 4 +- .../libraries/bctoolbox/default.nix | 4 +- .../development/libraries/beignet/default.nix | 10 +- .../libraries/belle-sip/default.nix | 4 +- .../development/libraries/bzrtp/default.nix | 4 +- .../development/libraries/cairomm/1.16.nix | 74 + .../libraries/clutter-gst/default.nix | 7 +- .../libraries/clutter-gtk/default.nix | 7 +- .../development/libraries/clutter/default.nix | 7 +- .../development/libraries/cogl/default.nix | 5 +- .../libraries/coordgenlibs/default.nix | 4 +- .../libraries/cpp-utilities/default.nix | 13 +- .../development/libraries/ctpl/default.nix | 2 +- .../development/libraries/cxxopts/default.nix | 8 +- .../development/libraries/dbus/default.nix | 2 +- .../development/libraries/dconf/default.nix | 9 +- .../development/libraries/dee/default.nix | 2 +- .../development/libraries/embree/default.nix | 4 +- .../development/libraries/ethash/default.nix | 2 +- .../development/libraries/fcl/default.nix | 45 + .../libraries/ffmpeg-full/default.nix | 26 +- .../pkgs/development/libraries/ffmpeg/2.8.nix | 3 + .../pkgs/development/libraries/ffmpeg/3.4.nix | 5 +- .../pkgs/development/libraries/ffmpeg/4.nix | 13 +- .../development/libraries/ffmpeg/generic.nix | 7 +- ...toolboxenc-define-TARGET_CPU_ARM64-t.patch | 35 + .../development/libraries/flint/default.nix | 5 +- .../development/libraries/folks/default.nix | 37 +- .../libraries/fontconfig/default.nix | 2 +- .../libraries/freeimage/default.nix | 10 +- .../development/libraries/freetds/default.nix | 4 +- .../development/libraries/fstrm/default.nix | 4 +- .../development/libraries/gcab/default.nix | 4 +- .../development/libraries/gcr/default.nix | 11 +- .../pkgs/development/libraries/gdal/2.4.nix | 3 +- .../libraries/gdk-pixbuf/default.nix | 50 +- .../development/libraries/gdl/default.nix | 4 +- .../pkgs/development/libraries/gegl/4.0.nix | 11 +- .../development/libraries/gensio/default.nix | 4 +- .../libraries/geocode-glib/default.nix | 4 +- .../development/libraries/geos/default.nix | 4 +- .../development/libraries/gexiv2/default.nix | 5 +- .../libraries/gfbgraph/default.nix | 5 +- .../libraries/ghc_filesystem/default.nix | 22 + .../development/libraries/giflib/libungif.nix | 17 - .../development/libraries/gjs/default.nix | 38 +- .../pkgs/development/libraries/glfw/3.x.nix | 4 +- .../libraries/glib-networking/default.nix | 9 +- .../development/libraries/glib/default.nix | 24 +- .../libraries/glibc/2.32-master.patch.gz | Bin 58063 -> 65492 bytes .../development/libraries/glibc/common.nix | 4 +- .../development/libraries/glibmm/2.68.nix | 59 + .../development/libraries/glibmm/default.nix | 5 +- .../libraries/gnome-menus/default.nix | 4 +- .../gnome-online-accounts/default.nix | 9 +- .../libraries/gnome-video-effects/default.nix | 4 +- .../absolute_gir_path.patch | 6 +- .../absolute_shlib_path.patch | 15 +- .../gobject-introspection/default.nix | 9 +- .../development/libraries/goffice/default.nix | 5 +- .../development/libraries/gom/default.nix | 5 +- .../libraries/goocanvas/default.nix | 4 +- .../libraries/goocanvasmm/default.nix | 5 +- ...-options-for-tests-installation-dirs.patch | 42 +- .../libraries/graphene/default.nix | 23 +- .../libraries/grilo-plugins/default.nix | 8 +- .../development/libraries/grilo/default.nix | 4 +- .../gsettings-desktop-schemas/default.nix | 10 +- .../libraries/gsignond/default.nix | 2 +- .../libraries/gsignond/plugins/lastfm.nix | 2 +- .../libraries/gsignond/plugins/mail.nix | 2 +- .../libraries/gsignond/plugins/oauth.nix | 2 +- .../libraries/gsignond/plugins/sasl.nix | 2 +- .../development/libraries/gsound/default.nix | 5 +- .../development/libraries/gspell/default.nix | 4 +- .../development/libraries/gssdp/default.nix | 4 +- .../libraries/gstreamer/bad/default.nix | 10 + .../libraries/gstreamer/base/default.nix | 4 +- .../libraries/gstreamer/core/default.nix | 4 +- .../libraries/gstreamer/devtools/default.nix | 4 +- .../libraries/gstreamer/ges/default.nix | 4 +- .../libraries/gstreamer/good/default.nix | 4 +- .../gstreamer/gstreamermm/default.nix | 8 +- .../libraries/gstreamer/libav/default.nix | 4 +- .../gstreamer/rtsp-server/default.nix | 4 +- .../libraries/gstreamer/ugly/default.nix | 4 +- .../libraries/gstreamer/vaapi/default.nix | 4 +- .../gtk-engine-bluecurve/default.nix | 2 +- .../libraries/gtk-frdp/default.nix | 54 + .../development/libraries/gtk-sharp/2.0.nix | 8 + .../development/libraries/gtk-sharp/3.0.nix | 6 + .../pkgs/development/libraries/gtk/2.x.nix | 5 +- .../pkgs/development/libraries/gtk/3.x.nix | 8 +- .../pkgs/development/libraries/gtk/4.x.nix | 69 +- .../development/libraries/gtkd/default.nix | 2 +- .../pkgs/development/libraries/gtkmm/2.x.nix | 2 +- .../pkgs/development/libraries/gtkmm/3.x.nix | 11 +- .../pkgs/development/libraries/gtkmm/4.x.nix | 91 + .../libraries/gtksourceview/3.x.nix | 4 +- .../libraries/gtksourceview/4.x.nix | 90 +- .../libraries/gtksourceview/5.x.nix | 99 + .../libraries/gtksourceviewmm/4.x.nix | 4 +- .../libraries/gtksourceviewmm/default.nix | 4 +- .../libraries/gupnp-av/default.nix | 5 +- .../libraries/gupnp-dlna/default.nix | 5 +- .../libraries/gupnp-igd/default.nix | 5 +- .../development/libraries/gupnp/default.nix | 4 +- .../development/libraries/gvfs/default.nix | 13 +- .../development/libraries/herqq/default.nix | 4 +- .../development/libraries/hivex/default.nix | 4 +- .../libraries/hotpatch/default.nix | 2 +- .../libraries/hunspell/dictionaries.nix | 4 +- .../pkgs/development/libraries/icu/69.nix | 4 + .../development/libraries/igraph/default.nix | 12 +- .../development/libraries/imlib/default.nix | 18 +- .../libraries/intel-media-sdk/default.nix | 4 +- .../libraries/irrlicht/default.nix | 3 +- .../development/libraries/irrlicht/mac.nix | 4 +- .../libraries/json-glib/default.nix | 26 +- .../development/libraries/jsoncpp/default.nix | 2 +- .../libraries/jsonrpc-glib/default.nix | 5 +- .../development/libraries/jxrlib/default.nix | 4 +- .../libraries/keybinder/default.nix | 4 +- .../libraries/keybinder3/default.nix | 4 +- .../development/libraries/kmsxx/default.nix | 2 +- .../libraries/kronosnet/default.nix | 4 +- .../development/libraries/l-smash/default.nix | 5 + .../development/libraries/lasem/default.nix | 5 +- .../libraries/libAfterImage/default.nix | 55 +- .../libraries/libadwaita/default.nix | 4 +- .../libraries/libamqpcpp/default.nix | 4 +- .../development/libraries/libaom/default.nix | 12 +- .../development/libraries/libass/default.nix | 4 +- .../libraries/libblockdev/default.nix | 9 +- .../development/libraries/libccd/default.nix | 23 + .../libraries/libchamplain/default.nix | 5 +- .../libraries/libchardet/default.nix | 4 +- .../development/libraries/libcint/default.nix | 4 +- .../libraries/libcommuni/default.nix | 4 +- .../libraries/libcrafter/default.nix | 2 +- .../libraries/libcryptui/default.nix | 5 +- .../libraries/libdazzle/default.nix | 10 +- .../libraries/libdeltachat/default.nix | 55 + .../libraries/libdigidocpp/default.nix | 4 +- .../libraries/libdivecomputer/default.nix | 4 +- .../development/libraries/libepc/default.nix | 5 +- .../libraries/libextractor/default.nix | 6 +- .../libraries/libfido2/default.nix | 30 +- .../development/libraries/libfive/default.nix | 16 +- .../pkgs/development/libraries/libgda/6.x.nix | 5 +- .../development/libraries/libgda/default.nix | 5 +- .../libraries/libgdamm/default.nix | 5 +- .../libraries/libgdata/default.nix | 6 +- .../development/libraries/libgee/default.nix | 9 +- .../libraries/libgepub/default.nix | 4 +- .../development/libraries/libgig/default.nix | 4 +- .../libraries/libgit2-glib/default.nix | 4 +- .../development/libraries/libgksu/default.nix | 4 +- .../libraries/libglvnd/default.nix | 4 +- .../libraries/libgnomekbd/default.nix | 13 +- .../development/libraries/libgrss/default.nix | 4 +- .../development/libraries/libgsf/default.nix | 5 +- .../development/libraries/libgtop/default.nix | 5 +- .../libraries/libgudev/default.nix | 31 +- .../libraries/libgweather/default.nix | 64 +- .../development/libraries/libgxps/default.nix | 4 +- .../development/libraries/libhandy/0.x.nix | 8 +- .../libraries/libhandy/default.nix | 48 +- .../libraries/libhdhomerun/default.nix | 4 +- .../development/libraries/libheif/default.nix | 4 +- .../libraries/libhttpseverywhere/default.nix | 5 +- .../development/libraries/libical/default.nix | 16 +- .../development/libraries/libjcat/default.nix | 6 +- .../development/libraries/libjwt/default.nix | 4 +- .../libraries/liblinphone/default.nix | 4 +- .../libraries/libmanette/default.nix | 5 +- .../libraries/libmaxminddb/default.nix | 4 +- .../libraries/libmediaart/default.nix | 4 +- .../libraries/libmodulemd/default.nix | 4 +- .../development/libraries/libmwaw/default.nix | 8 +- .../development/libraries/libndp/default.nix | 2 +- .../libraries/libnixxml/default.nix | 40 +- .../libraries/libnotify/default.nix | 4 +- .../development/libraries/libofx/default.nix | 4 +- .../development/libraries/libow/default.nix | 43 +- .../development/libraries/libpeas/default.nix | 9 +- .../libraries/libplacebo/default.nix | 4 +- .../libraries/libportal/default.nix | 21 +- .../development/libraries/libpst/default.nix | 7 +- .../libraries/librealsense/default.nix | 7 +- .../py_pybind11_no_external_download.patch | 39 + .../development/libraries/librest/default.nix | 33 +- .../development/libraries/librsvg/default.nix | 91 +- .../libraries/libsecret/default.nix | 6 +- .../development/libraries/libsigcxx/3.0.nix | 42 + .../libraries/libsigcxx/default.nix | 11 +- .../libraries/libsignon-glib/default.nix | 2 +- .../libraries/libslirp/default.nix | 7 +- .../development/libraries/libsolv/default.nix | 4 +- .../development/libraries/libsoup/default.nix | 5 +- .../libraries/libspnav/default.nix | 4 +- .../libraries/libthreadar/default.nix | 4 +- .../libraries/libtomcrypt/default.nix | 8 +- .../libraries/libunique/default.nix | 8 +- .../libraries/libunity/default.nix | 24 +- .../libraries/libunity/fix-vala.patch | 46 +- .../libraries/libvdpau-va-gl/default.nix | 4 +- .../libraries/libvirt-glib/default.nix | 44 +- .../development/libraries/libvirt/default.nix | 4 + .../libraries/libvncserver/default.nix | 9 +- .../development/libraries/libwnck/3.x.nix | 7 +- .../development/libraries/libwpe/default.nix | 4 +- .../development/libraries/libxc/default.nix | 4 +- .../libraries/libxkbcommon/default.nix | 30 +- .../libraries/libxlsxwriter/default.nix | 4 +- .../development/libraries/libxmlb/default.nix | 4 +- .../libraries/libxmlxx/default.nix | 5 +- .../libraries/libzapojit/default.nix | 5 +- .../development/libraries/lime/default.nix | 4 +- .../development/libraries/lmdbxx/default.nix | 2 +- .../development/libraries/mapnik/default.nix | 37 +- .../development/libraries/matio/default.nix | 4 +- .../mauikit-filebrowsing/default.nix | 40 + .../development/libraries/mauikit/default.nix | 14 +- .../development/libraries/md4c/default.nix | 4 +- .../development/libraries/mesa/default.nix | 2 +- .../libraries/microsoft_gsl/default.nix | 3 +- .../libraries/mm-common/default.nix | 4 +- .../development/libraries/mpich/default.nix | 13 +- .../development/libraries/mpir/default.nix | 3 +- .../development/libraries/mutest/default.nix | 2 +- .../development/libraries/mygui/default.nix | 4 +- .../pkgs/development/libraries/nss/3.44.nix | 144 - .../libraries/nss/85_security_load-3.44.patch | 81 - .../development/libraries/nss/default.nix | 4 +- .../libraries/nss_wrapper/default.nix | 3 +- .../development/libraries/octomap/default.nix | 24 + .../libraries/opencl-clang/default.nix | 19 +- .../pkgs/development/libraries/opencv/3.x.nix | 4 +- .../pkgs/development/libraries/opencv/4.x.nix | 4 +- .../development/libraries/opencv/default.nix | 4 +- .../development/libraries/openexr/default.nix | 1 - .../libraries/openexrid-unstable/default.nix | 3 +- .../development/libraries/openfx/default.nix | 4 +- .../libraries/openldap/default.nix | 9 +- .../libraries/openslide/default.nix | 28 + .../development/libraries/openssl/default.nix | 8 +- .../development/libraries/openvdb/default.nix | 3 +- .../libraries/openvino/default.nix | 2 +- .../oracle-instantclient/default.nix | 2 +- .../libraries/osm-gps-map/default.nix | 4 +- .../development/libraries/pango/default.nix | 18 +- .../development/libraries/pangomm/2.48.nix | 65 + .../development/libraries/pangomm/default.nix | 5 +- .../development/libraries/physfs/default.nix | 5 +- .../{fastnlo => fastnlo_toolkit}/default.nix | 30 +- .../libraries/physics/pythia/default.nix | 17 +- .../libraries/physics/yoda/default.nix | 20 +- .../libraries/pipewire/default.nix | 4 +- .../plasma-wayland-protocols/default.nix | 6 +- .../development/libraries/pmdk/default.nix | 8 +- .../development/libraries/polkit/default.nix | 2 +- .../development/libraries/poppler/default.nix | 17 +- .../development/libraries/presage/default.nix | 69 + .../presage/fixed-cppunit-detection.patch | 46 + .../development/libraries/protobuf/3.15.nix | 4 +- .../development/libraries/protobuf/3.16.nix | 6 + .../development/libraries/pslib/default.nix | 4 +- .../development/libraries/qca-qt5/default.nix | 4 - .../libraries/qca-qt5/move-project.patch | 17 - .../libraries/qgnomeplatform/default.nix | 2 +- .../libraries/qt-4.x/4.8/default.nix | 2 +- .../libraries/qt-5/5.12/default.nix | 5 + .../libraries/qt-5/5.14/default.nix | 5 + .../libraries/qt-5/5.15/default.nix | 5 + .../libraries/qt-5/modules/qtwebengine.nix | 10 +- .../development/libraries/qt-5/qtModule.nix | 11 +- .../libraries/qtstyleplugins/default.nix | 2 +- .../development/libraries/rarian/default.nix | 8 +- .../development/libraries/re2/default.nix | 8 +- .../libraries/readline/{8.0.nix => 8.1.nix} | 12 +- .../readline/readline-8.0-patches.nix | 8 - .../readline/readline-8.1-patches.nix | 4 + .../astronomy/stellarsolver/default.nix | 2 +- .../libraries/sofia-sip/default.nix | 6 +- .../pkgs/development/libraries/spandsp/3.nix | 4 +- .../development/libraries/speechd/default.nix | 8 + .../development/libraries/sqlite/sqlar.nix | 18 +- .../development/libraries/sqlite/tools.nix | 2 +- .../libraries/tachyon/darwin.patch | 31 - .../development/libraries/tachyon/default.nix | 10 +- .../libraries/taglib-extras/default.nix | 4 +- .../development/libraries/taglib/default.nix | 39 +- .../development/libraries/tbb/default.nix | 65 +- .../libraries/tbb/glibc-struct-mallinfo.patch | 43 - .../libraries/template-glib/default.nix | 5 +- .../development/libraries/tepl/default.nix | 11 +- .../pkgs/development/libraries/tk/generic.nix | 6 + .../libraries/totem-pl-parser/default.nix | 5 +- .../libraries/tracker-miners/default.nix | 8 +- .../development/libraries/tracker/default.nix | 38 +- .../libraries/tracker/fix-docs.patch | 28 + .../libraries/tracker/i686-tracker-fix.patch | 13 - .../development/libraries/ucx/default.nix | 10 +- .../libraries/umockdev/default.nix | 43 +- .../development/libraries/usrsctp/default.nix | 23 + .../pkgs/development/libraries/v8/default.nix | 30 +- .../pkgs/development/libraries/vte/2.90.nix | 2 +- .../development/libraries/vte/default.nix | 45 +- .../development/libraries/wayland/default.nix | 18 +- .../libraries/wayland/protocols.nix | 12 +- .../libraries/webkitgtk/default.nix | 39 +- .../webkitgtk/fix-bubblewrap-paths.patch | 14 +- .../development/libraries/wiiuse/default.nix | 15 +- .../libraries/wiredtiger/default.nix | 2 +- .../development/libraries/wlroots/0.12.nix | 2 + .../pkgs/development/libraries/wt/default.nix | 8 +- .../xdg-desktop-portal-gtk/default.nix | 8 +- .../xdg-desktop-portal-wlr/default.nix | 4 +- .../development/libraries/xgboost/default.nix | 40 +- .../libraries/xine-lib/default.nix | 13 +- .../libraries/zeitgeist/default.nix | 12 +- .../pkgs/development/lisp-modules/README.txt | 2 +- .../lisp-modules/lisp-packages.nix | 22 +- .../_3bmd-ext-code-blocks.nix | 14 +- .../quicklisp-to-nix-output/_3bmd.nix | 14 +- .../quicklisp-to-nix-output/agutil.nix | 42 + .../quicklisp-to-nix-output/alexandria.nix | 14 +- .../quicklisp-to-nix-output/arrows.nix | 31 + .../quicklisp-to-nix-output/cffi-grovel.nix | 14 +- .../cffi-toolchain.nix | 14 +- .../cffi-uffi-compat.nix | 14 +- .../quicklisp-to-nix-output/cffi.nix | 14 +- .../quicklisp-to-nix-output/chanl.nix | 14 +- .../cl-change-case.nix | 14 +- .../quicklisp-to-nix-output/cl-colors2.nix | 14 +- .../cl-environments.nix | 44 + .../cl-gobject-introspection.nix | 32 + .../quicklisp-to-nix-output/cl-postgres.nix | 14 +- .../cl-typesetting.nix | 14 +- .../quicklisp-to-nix-output/cl-webkit2.nix | 14 +- .../quicklisp-to-nix-output/cl_plus_ssl.nix | 14 +- .../clack-handler-hunchentoot.nix | 14 +- .../quicklisp-to-nix-output/clack-socket.nix | 14 +- .../quicklisp-to-nix-output/clack-test.nix | 14 +- .../clack-v1-compat.nix | 14 +- .../quicklisp-to-nix-output/clack.nix | 22 +- .../quicklisp-to-nix-output/closer-mop.nix | 14 +- .../quicklisp-to-nix-output/dexador.nix | 14 +- .../file-attributes.nix | 14 +- .../quicklisp-to-nix-output/generic-cl.nix | 56 + .../quicklisp-to-nix-output/ironclad.nix | 14 +- .../quicklisp-to-nix-output/marshal.nix | 14 +- .../quicklisp-to-nix-output/mgl-pax.nix | 14 +- .../quicklisp-to-nix-output/plump.nix | 14 +- .../quicklisp-to-nix-output/postmodern.nix | 14 +- .../quicklisp-to-nix-output/quri.nix | 14 +- .../quicklisp-to-nix-output/s-sql.nix | 14 +- .../quicklisp-to-nix-output/serapeum.nix | 14 +- .../quicklisp-to-nix-output/simple-date.nix | 14 +- .../static-dispatch.nix | 55 + .../quicklisp-to-nix-output/str.nix | 14 +- .../quicklisp-to-nix-output/stumpwm.nix | 14 +- .../quicklisp-to-nix-output/trivia.nix | 14 +- .../trivia_dot_balland2006.nix | 14 +- .../trivia_dot_level0.nix | 14 +- .../trivia_dot_level1.nix | 14 +- .../trivia_dot_level2.nix | 14 +- .../trivia_dot_quasiquote.nix | 14 +- .../trivia_dot_trivial.nix | 14 +- .../trivial-arguments.nix | 27 + .../trivial-features.nix | 14 +- .../utilities_dot_print-items.nix | 14 +- .../quicklisp-to-nix-overrides.nix | 3 + .../lisp-modules/quicklisp-to-nix-systems.txt | 3 + .../lisp-modules/quicklisp-to-nix.nix | 244 +- .../pkgs/development/lisp-modules/shell.nix | 2 +- .../hercules-ci-optparse-applicative.nix | 5 +- .../development/misc/msp430/mspds/binary.nix | 35 + .../misc/msp430/mspds/bsl430.patch | 51 + .../development/misc/msp430/mspds/default.nix | 56 + .../pkgs/development/misc/umr/default.nix | 2 +- .../development/misc/yelp-tools/default.nix | 36 +- .../mobile/androidenv/examples/shell.nix | 2 +- .../development/node-packages/default.nix | 25 +- .../development/ocaml-modules/atd/default.nix | 6 +- .../development/ocaml-modules/awa/default.nix | 4 +- .../development/ocaml-modules/bap/default.nix | 2 +- .../ocaml-modules/ca-certs-nss/default.nix | 55 + .../ocaml-modules/ca-certs/default.nix | 12 +- .../ocaml-modules/camlimages/4.0.nix | 41 - .../ocaml-modules/camlimages/4.1.2.nix | 37 + .../ocaml-modules/carton/default.nix | 6 +- .../ocaml-modules/checkseum/default.nix | 39 +- .../checkseum/makefile-no-opam.patch | 12 + .../ocaml-modules/cohttp/async.nix | 72 +- .../ocaml-modules/cohttp/default.nix | 13 +- .../ocaml-modules/cohttp/lwt-unix.nix | 25 +- .../development/ocaml-modules/cohttp/lwt.nix | 25 +- .../ocaml-modules/cohttp/mirage.nix | 3 + .../ocaml-modules/conduit/async.nix | 18 +- .../ocaml-modules/conduit/default.nix | 10 +- .../ocaml-modules/conduit/lwt-unix.nix | 27 +- .../ocaml-modules/conduit/mirage.nix | 7 +- .../ocaml-modules/containers/default.nix | 4 +- .../ocaml-modules/curly/default.nix | 6 +- .../ocaml-modules/decompress/default.nix | 4 +- .../development/ocaml-modules/dns/certify.nix | 4 +- .../development/ocaml-modules/dns/default.nix | 4 +- .../ocaml-modules/eigen/default.nix | 2 +- .../ocaml-modules/git/cohttp-mirage.nix | 18 - .../development/ocaml-modules/git/default.nix | 13 +- .../development/ocaml-modules/git/paf.nix | 49 + .../development/ocaml-modules/git/unix.nix | 11 +- .../ocaml-modules/irmin/containers.nix | 4 +- .../development/ocaml-modules/irmin/git.nix | 4 +- .../ocaml-modules/irmin/graphql.nix | 3 +- .../development/ocaml-modules/irmin/http.nix | 5 +- .../ocaml-modules/irmin/mirage-git.nix | 4 +- .../development/ocaml-modules/irmin/ppx.nix | 4 +- .../development/ocaml-modules/irmin/unix.nix | 6 +- .../ocaml-modules/letsencrypt/default.nix | 4 +- .../ocaml-modules/llvm/default.nix | 14 +- .../development/ocaml-modules/luv/default.nix | 4 +- .../ocaml-modules/mimic/default.nix | 14 +- .../ocaml-modules/mirage/runtime.nix | 4 +- .../ocaml-modules/optint/default.nix | 6 +- .../development/ocaml-modules/paf/default.nix | 6 +- .../development/ocaml-modules/tls/default.nix | 12 +- .../development/ocaml-modules/tls/mirage.nix | 5 +- .../ocaml-modules/x509/default.nix | 4 +- .../TextBibTeX-use-lib-on-aarch64.patch | 11 + .../development/pharo/vm/build-vm-legacy.nix | 3 +- .../nixpkgs/pkgs/development/pharo/vm/vms.nix | 1 + .../php-packages/apcu_bc/default.nix | 1 + .../php-packages/deployer/default.nix | 28 + .../php-packages/phpcbf/default.nix | 4 +- .../php-packages/phpcs/default.nix | 4 +- .../php-packages/psysh/default.nix | 4 +- .../python-modules/Babel/default.nix | 29 +- .../python-modules/Markups/default.nix | 3 +- .../python-modules/Nikola/default.nix | 139 +- .../python-modules/PyRMVtransport/default.nix | 4 +- .../python-modules/accuweather/default.nix | 6 +- .../adafruit-platformdetect/default.nix | 4 +- .../python-modules/adb-shell/default.nix | 4 +- .../python-modules/agate-excel/default.nix | 11 +- .../aioamqp/compat-pamqp-3.patch | 498 + .../python-modules/aioamqp/default.nix | 2 + .../python-modules/aioasuswrt/default.nix | 8 +- .../python-modules/aiobotocore/default.nix | 10 +- .../python-modules/aiodiscover/default.nix | 12 +- .../python-modules/aioesphomeapi/default.nix | 4 +- .../python-modules/aiohttp-socks/default.nix | 8 +- .../python-modules/aiohue/default.nix | 29 +- .../python-modules/aiomysql/default.nix | 9 + .../python-modules/aiopg/default.nix | 42 + .../python-modules/aiopvpc/default.nix | 66 + .../python-modules/aioshelly/default.nix | 4 +- .../python-modules/aioymaps/default.nix | 33 + .../python-modules/amqtt/default.nix | 64 + .../python-modules/androidtv/default.nix | 4 +- .../python-modules/aniso8601/default.nix | 39 +- .../python-modules/ansible-lint/default.nix | 87 +- .../python-modules/ansible/base.nix | 78 + .../python-modules/ansible/collections.nix | 77 + .../ansible/{default.nix => legacy.nix} | 4 +- .../python-modules/anytree/default.nix | 2 +- .../python-modules/apispec/default.nix | 11 +- .../python-modules/aplpy/default.nix | 17 +- .../python-modules/apprise/default.nix | 4 +- .../python-modules/astroid/1.6.nix | 2 +- .../python-modules/astroid/default.nix | 2 +- .../astropy-healpix/default.nix | 33 +- .../async-upnp-client/default.nix | 4 +- .../python-modules/asyncssh/default.nix | 2 +- .../python-modules/asyncstdlib/default.nix | 38 + .../atlassian-python-api/default.nix | 22 +- .../python-modules/autobahn/default.nix | 80 +- .../python-modules/autopep8/default.nix | 4 +- .../python-modules/awkward/default.nix | 4 +- .../python-modules/awscrt/default.nix | 33 + .../python-modules/azure-common/default.nix | 4 +- .../python-modules/azure-core/default.nix | 6 +- .../azure-datalake-store/default.nix | 4 +- .../azure-eventgrid/default.nix | 4 +- .../azure-mgmt-apimanagement/default.nix | 4 +- .../python-modules/azure-mgmt-cdn/default.nix | 4 +- .../azure-mgmt-compute/default.nix | 4 +- .../azure-mgmt-containerservice/default.nix | 4 +- .../azure-mgmt-cosmosdb/default.nix | 4 +- .../azure-mgmt-databoxedge/default.nix | 6 +- .../azure-mgmt-datamigration/default.nix | 6 +- .../python-modules/azure-mgmt-dns/default.nix | 8 +- .../azure-mgmt-hanaonazure/default.nix | 6 +- .../azure-mgmt-keyvault/default.nix | 4 +- .../azure-mgmt-kusto/default.nix | 4 +- .../azure-mgmt-loganalytics/default.nix | 4 +- .../azure-mgmt-managedservices/default.nix | 12 +- .../azure-mgmt-maps/default.nix | 8 +- .../azure-mgmt-privatedns/default.nix | 12 +- .../azure-mgmt-resource/default.nix | 4 +- .../default.nix | 40 + .../azure-mgmt-storage/default.nix | 4 +- .../azure-mgmt-synapse/default.nix | 4 +- .../azure-servicebus/default.nix | 4 +- .../azure-servicefabric/default.nix | 4 +- .../azure-storage-blob/default.nix | 4 +- .../azure-storage-file-share/default.nix | 4 +- .../python-modules/azure-storage/default.nix | 3 +- .../azure-synapse-artifacts/default.nix | 4 +- .../python-modules/b2sdk/default.nix | 55 +- .../backports-zoneinfo/default.nix | 39 + .../batchgenerators/default.nix | 4 +- .../bayesian-optimization/default.nix | 4 +- .../python-modules/behave/default.nix | 6 + .../python-modules/blist/default.nix | 6 + .../python-modules/blspy/default.nix | 58 + .../blspy/dont_fetch_dependencies.patch | 38 + .../python-modules/bpython/default.nix | 22 +- .../python-modules/breezy/default.nix | 4 +- .../python-modules/brother/default.nix | 17 +- .../python-modules/buildbot/default.nix | 6 +- .../python-modules/buildbot/pkg.nix | 4 +- .../python-modules/buildbot/plugins.nix | 18 +- .../python-modules/buildbot/worker.nix | 10 +- .../python-modules/cartopy/default.nix | 21 +- .../cassandra-driver/default.nix | 14 +- .../python-modules/castepxbin/default.nix | 37 + .../python-modules/catalogue/default.nix | 7 +- .../python-modules/certbot/default.nix | 4 +- .../python-modules/cffi/default.nix | 12 +- .../python-modules/chalice/default.nix | 2 + .../python-modules/chiabip158/default.nix | 38 + .../python-modules/chiapos/default.nix | 48 + .../chiapos/dont_fetch_dependencies.patch | 31 + .../python-modules/chiavdf/default.nix | 53 + .../chiavdf/dont_fetch_dependencies.patch | 14 + .../python-modules/cirq-core/default.nix | 98 + .../python-modules/cirq-google/default.nix | 29 + .../python-modules/cirq/default.nix | 112 +- .../clickhouse-driver/default.nix | 36 +- .../python-modules/clvm-rs/default.nix | 47 + .../python-modules/clvm-tools/default.nix | 51 + .../python-modules/clvm/default.nix | 52 + .../python-modules/cnvkit/default.nix | 4 +- .../colored-traceback/default.nix | 29 + .../concurrent-log-handler/default.nix | 32 + .../python-modules/connexion/default.nix | 79 +- .../python-modules/cookiecutter/default.nix | 4 +- .../python-modules/coqpit/default.nix | 37 + .../python-modules/crate/default.nix | 3 + .../python-modules/csvw/default.nix | 14 +- .../python-modules/curtsies/default.nix | 16 +- .../python-modules/cvxpy/default.nix | 2 +- .../python-modules/cwcwidth/default.nix | 34 + .../python-modules/cxxfilt/default.nix | 7 +- .../python-modules/dask-glm/default.nix | 12 +- .../python-modules/dask-image/default.nix | 29 +- .../python-modules/dask-ml/default.nix | 9 +- .../python-modules/dask/default.nix | 5 +- .../python-modules/databases/default.nix | 27 +- .../python-modules/datatable/default.nix | 2 +- .../python-modules/dawg-python/default.nix | 24 + .../python-modules/debugpy/default.nix | 7 +- .../debugpy/fix-test-pythonpath.patch | 4 +- .../python-modules/debut/default.nix | 38 - .../python-modules/decopatch/default.nix | 37 + .../python-modules/deltachat/default.nix | 59 + .../python-modules/dendropy/default.nix | 40 +- .../python-modules/denonavr/default.nix | 40 +- .../dependency-injector/default.nix | 60 +- .../python-modules/dftfit/default.nix | 4 +- .../python-modules/discordpy/default.nix | 6 +- .../python-modules/distro/default.nix | 2 +- .../django-pipeline/default.nix | 37 - .../development/python-modules/django/2.nix | 4 +- .../development/python-modules/django/3.nix | 4 +- .../python-modules/dnspython/1.nix | 14 +- .../python-modules/dnspython/default.nix | 14 +- .../python-modules/dogtail/default.nix | 4 +- .../python-modules/dotmap/default.nix | 30 + .../drf-nested-routers/default.nix | 4 +- .../python-modules/elmax/default.nix | 15 +- .../python-modules/enaml/default.nix | 4 +- .../python-modules/eve/default.nix | 5 + .../python-modules/exchangelib/default.nix | 8 +- .../python-modules/execnet/default.nix | 2 +- .../python-modules/fastapi/default.nix | 6 +- .../python-modules/fastpair/default.nix | 19 +- .../flask-appbuilder/default.nix | 32 +- .../python-modules/fpyutils/default.nix | 46 + .../fritzconnection/default.nix | 4 +- .../python-modules/gensim/default.nix | 4 +- .../python-modules/glcontext/default.nix | 49 + .../python-modules/globus-sdk/default.nix | 5 + .../python-modules/glymur/default.nix | 19 +- .../python-modules/gpapi/default.nix | 18 +- .../python-modules/graphite-web/default.nix | 6 + .../python-modules/graspologic/default.nix | 4 +- .../python-modules/gremlinpython/default.nix | 50 +- .../python-modules/gst-python/default.nix | 4 +- .../python-modules/gtimelog/default.nix | 6 +- .../python-modules/ha-philipsjs/default.nix | 45 + .../python-modules/hatasmota/default.nix | 4 +- .../python-modules/hdate/default.nix | 63 + .../python-modules/hdbscan/default.nix | 10 +- .../python-modules/hickle/default.nix | 2 + .../python-modules/hidapi/default.nix | 24 +- .../python-modules/hmmlearn/default.nix | 4 +- .../python-modules/hsluv/default.nix | 32 + .../python-modules/httpcore/default.nix | 22 +- .../python-modules/httpx/default.nix | 4 +- .../python-modules/humblewx/default.nix | 42 + .../python-modules/hyperlink/default.nix | 11 +- .../python-modules/hyppo/default.nix | 14 +- .../python-modules/i2c-tools/default.nix | 21 + .../python-modules/ics/default.nix | 36 +- .../python-modules/ignite/default.nix | 4 +- .../python-modules/imageio-ffmpeg/default.nix | 45 +- .../imageio-ffmpeg/ffmpeg-path.patch | 39 + .../python-modules/imageio/default.nix | 39 +- .../python-modules/imap-tools/default.nix | 4 +- .../python-modules/imbalanced-learn/0.4.nix | 4 +- .../imbalanced-learn/default.nix | 4 +- .../python-modules/img2pdf/default.nix | 4 +- .../python-modules/incremental/default.nix | 2 +- .../python-modules/infoqscraper/default.nix | 33 - .../python-modules/ipydatawidgets/default.nix | 4 +- .../python-modules/ipympl/default.nix | 10 +- .../python-modules/isbnlib/default.nix | 12 +- .../python-modules/iso8601/default.nix | 19 +- .../development/python-modules/isort/4.nix | 2 +- .../python-modules/isort/default.nix | 2 +- .../johnnycanencrypt/default.nix | 2 +- .../development/python-modules/jq/default.nix | 9 +- .../python-modules/jq/jq-py-setup.patch | 33 +- .../python-modules/json-logging/default.nix | 6 +- .../python-modules/jsonref/default.nix | 2 +- .../python-modules/jupytext/default.nix | 45 +- .../python-modules/jxmlease/default.nix | 33 + .../karton-asciimagic/default.nix | 9 +- .../karton-autoit-ripper/default.nix | 5 +- .../karton-classifier/default.nix | 5 +- .../karton-config-extractor/default.nix | 6 +- .../karton-dashboard/default.nix | 7 +- .../karton-mwdb-reporter/default.nix | 7 +- .../karton-yaramatcher/default.nix | 10 +- .../keyrings-cryptfile/default.nix | 59 + .../keyrings-cryptfile/fix-testsuite.patch | 14 + .../python-modules/kiwisolver/1_1.nix | 2 +- .../python-modules/kiwisolver/default.nix | 2 +- .../python-modules/kmapper/default.nix | 22 +- .../python-modules/labelbox/default.nix | 65 +- .../python-modules/lark-parser/default.nix | 27 +- .../development/python-modules/ldaptor/19.nix | 36 + .../python-modules/libarcus/default.nix | 4 +- .../python-modules/liblarch/default.nix | 4 +- .../python-modules/librosa/default.nix | 4 +- .../python-modules/libsavitar/default.nix | 4 +- .../python-modules/lightgbm/default.nix | 4 +- .../python-modules/linkify-it-py/default.nix | 34 + .../python-modules/liquidctl/default.nix | 33 +- .../python-modules/llvmlite/default.nix | 2 +- .../python-modules/localzone/default.nix | 4 +- .../locationsharinglib/default.nix | 59 + .../python-modules/mail-parser/default.nix | 10 - .../python-modules/markdown-it-py/default.nix | 31 +- .../python-modules/matplotlib/2.nix | 19 +- .../python-modules/matplotlib/default.nix | 38 +- .../matplotlib/setup-darwin.cfg | 7 - .../python-modules/matplotlib/setup.cfg | 5 - .../python-modules/matrix-nio/default.nix | 31 +- .../python-modules/mcstatus/default.nix | 4 +- .../python-modules/md-toc/default.nix | 43 + .../python-modules/mdformat/default.nix | 49 + .../mdit-py-plugins/default.nix | 35 + .../python-modules/meshtastic/default.nix | 57 + .../python-modules/midiutil/default.nix | 2 +- .../python-modules/mlrose/default.nix | 36 +- .../python-modules/mlxtend/default.nix | 6 +- .../python-modules/mne-python/default.nix | 4 +- .../python-modules/moderngl/default.nix | 3 +- .../moderngl_window/default.nix | 3 +- .../python-modules/monty/default.nix | 35 +- .../motioneye-client/default.nix | 52 + .../python-modules/moviepy/default.nix | 6 +- .../python-modules/mox3/default.nix | 2 +- .../python-modules/msal/default.nix | 12 +- .../python-modules/mutesync/default.nix | 42 + .../python-modules/mwoauth/default.nix | 22 +- .../python-modules/myjwt/default.nix | 21 +- .../python-modules/myjwt/pinning.patch | 21 - .../mypy-boto3-builder/default.nix | 49 + .../python-modules/mypy-boto3-s3/default.nix | 35 + .../python-modules/nassl/default.nix | 25 +- .../python-modules/nbxmpp/default.nix | 29 +- .../python-modules/netdisco/default.nix | 17 +- .../python-modules/nilearn/default.nix | 4 +- .../python-modules/nmigen/default.nix | 5 +- .../python-modules/numba/default.nix | 2 +- .../python-modules/oauthenticator/default.nix | 20 +- .../python-modules/ofxparse/default.nix | 14 +- .../python-modules/ondilo/default.nix | 4 +- .../python-modules/openrazer/common.nix | 6 +- .../python-modules/osmnx/default.nix | 4 +- .../python-modules/ovoenergy/default.nix | 37 + .../development/python-modules/pandas/2.nix | 2 +- .../python-modules/pandas/default.nix | 2 +- .../python-modules/pathy/default.nix | 44 + .../python-modules/peewee/default.nix | 4 +- .../python-modules/persim/default.nix | 4 +- .../python-modules/pg8000/default.nix | 4 +- .../python-modules/pgpy/default.nix | 18 +- .../python-modules/pgspecial/default.nix | 25 +- .../python-modules/phonemizer/default.nix | 2 +- .../python-modules/pika/default.nix | 33 +- .../python-modules/pillow-simd/default.nix | 9 +- .../python-modules/pip-tools/default.nix | 51 +- .../python-modules/pipx/default.nix | 5 +- .../python-modules/plexapi/default.nix | 4 +- .../python-modules/plugwise/default.nix | 23 +- .../python-modules/pomegranate/default.nix | 30 +- .../python-modules/poppler-qt5/default.nix | 6 +- .../python-modules/ppscore/default.nix | 4 +- .../prayer-times-calculator/default.nix | 35 + .../python-modules/prettytable/default.nix | 8 +- .../python-modules/prison/default.nix | 4 +- .../python-modules/privacyidea/default.nix | 8 +- .../python-modules/pulsectl/default.nix | 12 +- .../python-modules/pushbullet/default.nix | 26 +- .../python-modules/pwntools/default.nix | 35 +- .../python-modules/py-canary/default.nix | 41 + .../python-modules/py-cpuinfo/default.nix | 32 +- .../python-modules/py-dmidecode/default.nix | 25 + .../python-modules/py-ubjson/default.nix | 32 + .../python-modules/py3exiv2/default.nix | 2 +- .../python-modules/pyaftership/default.nix | 24 +- .../python-modules/pyatmo/default.nix | 4 +- .../python-modules/pyatspi/default.nix | 9 +- .../python-modules/pybrowserid/default.nix | 2 +- .../python-modules/pycflow2dot/default.nix | 41 + .../python-modules/pychannels/default.nix | 4 +- .../python-modules/pyclimacell/default.nix | 4 +- .../python-modules/pycm/default.nix | 4 +- .../python-modules/pycurl/default.nix | 64 +- .../python-modules/pydbus/default.nix | 2 +- .../python-modules/pydelijn/default.nix | 37 + .../python-modules/pydicom/default.nix | 4 + .../python-modules/pyexcel-xls/default.nix | 6 +- .../python-modules/pyflume/default.nix | 20 +- .../python-modules/pyfuse3/default.nix | 16 +- .../python-modules/pygatt/default.nix | 48 + .../python-modules/pygbm/default.nix | 4 +- .../python-modules/pygmt/default.nix | 15 +- .../python-modules/pygobject/3.36.nix | 9 +- .../python-modules/pygobject/3.nix | 53 +- .../python-modules/pyhaversion/default.nix | 4 +- .../python-modules/pyialarm/default.nix | 37 + .../python-modules/pyicu/default.nix | 10 +- .../python-modules/pyinsteon/default.nix | 4 +- .../development/python-modules/pyjwt/1.nix | 38 + .../python-modules/pyjwt/default.nix | 41 +- .../python-modules/pykdl/default.nix | 4 +- .../python-modules/pykerberos/default.nix | 5 +- .../python-modules/pykmtronic/default.nix | 4 +- .../python-modules/pykoplenti/default.nix | 41 + .../python-modules/pylast/default.nix | 4 +- .../python-modules/pylint-django/default.nix | 10 +- .../development/python-modules/pylint/1.9.nix | 2 +- .../python-modules/pylint/default.nix | 2 +- .../python-modules/pymavlink/default.nix | 2 +- .../python-modules/pymeteireann/default.nix | 39 + .../python-modules/pymodbus/default.nix | 4 +- .../python-modules/pymorphy2/default.nix | 35 + .../python-modules/pymorphy2/dicts-ru.nix | 23 + .../python-modules/pynest2d/default.nix | 4 +- .../python-modules/pynetbox/default.nix | 49 + .../python-modules/pynndescent/default.nix | 4 +- .../python-modules/pyobihai/default.nix | 34 + .../python-modules/pyopencl/default.nix | 9 +- .../python-modules/pyqt-builder/default.nix | 4 +- .../development/python-modules/pyqt/4.x.nix | 8 +- .../development/python-modules/pyqt/5.x.nix | 4 +- .../python-modules/pysmf/default.nix | 10 +- .../python-modules/pysonos/default.nix | 18 +- .../python-modules/pystray/default.nix | 4 +- .../python-modules/pysvg-py3/default.nix | 33 + .../python-modules/pytaglib/default.nix | 51 +- .../pytest-annotate/default.nix | 1 + .../python-modules/pytest-bdd/default.nix | 23 +- .../python-modules/pytest-cases/default.nix | 51 + .../pytest-doctestplus/default.nix | 16 +- .../python-modules/pytest-httpx/default.nix | 4 +- .../python-modules/pytest-mock/2.nix | 2 +- .../python-modules/pytest-mock/default.nix | 2 +- .../pytest-ordering/default.nix | 1 + .../pytest-regressions/default.nix | 59 + .../pytest-server-fixtures/default.nix | 2 +- .../python-modules/python-binance/default.nix | 56 +- .../python-modules/python-engineio/3.nix | 2 + .../python-fontconfig/default.nix | 2 +- .../python-modules/python-mapnik/default.nix | 6 + .../find-pycairo-with-pkg-config.patch | 18 + .../python-modules/python-miio/default.nix | 7 +- .../python-redis-lock/default.nix | 21 +- .../python-simple-hipchat/default.nix | 5 +- .../python-modules/python-snap7/default.nix | 1 - .../python-modules/python-socks/default.nix | 22 + .../python-telegram-bot/default.nix | 4 +- .../python-modules/python-toolbox/default.nix | 11 +- .../python-modules/python-vlc/default.nix | 19 +- .../python-modules/pythonnet/default.nix | 62 +- .../python-modules/pytomlpp/default.nix | 53 + .../pytorch-metric-learning/default.nix | 10 +- .../python-modules/pytorch/bin.nix | 3 +- .../python-modules/pytorch/binary-hashes.nix | 15 +- .../python-modules/pytube/default.nix | 4 +- .../python-modules/pyupgrade/default.nix | 4 +- .../python-modules/pyvesync/default.nix | 4 +- .../python-modules/pyvex/default.nix | 1 + .../python-modules/pywebview/default.nix | 4 +- .../python-modules/pyxb/default.nix | 31 + .../python-modules/pyxnat/default.nix | 7 +- .../python-modules/qiskit-aqua/default.nix | 4 +- .../python-modules/qiskit-ignis/default.nix | 4 +- .../python-modules/qscintilla-qt5/default.nix | 4 +- .../python-modules/radio_beam/default.nix | 20 +- .../python-modules/ramlfications/default.nix | 2 +- .../python-modules/random2/default.nix | 9 + .../requests-http-signature/default.nix | 27 +- .../python-modules/respx/default.nix | 4 +- .../rfc3339-validator/default.nix | 5 +- .../python-modules/rich/default.nix | 22 +- .../python-modules/ripser/default.nix | 4 +- .../python-modules/roombapy/default.nix | 31 +- .../python-modules/rst2ansi/default.nix | 20 + .../python-modules/rtoml/default.nix | 48 + .../python-modules/runway-python/default.nix | 50 +- .../python-modules/sanic-testing/default.nix | 6 + .../python-modules/sanic/default.nix | 8 +- .../python-modules/scikit-bio/default.nix | 4 +- .../{scikitlearn => scikit-learn}/0.20.nix | 0 .../{scikitlearn => scikit-learn}/default.nix | 28 +- .../scikit-optimize/default.nix | 4 +- .../python-modules/scikit-tda/default.nix | 4 +- .../python-modules/seabreeze/default.nix | 41 +- .../python-modules/segments/default.nix | 2 +- .../python-modules/selenium/default.nix | 5 + .../python-modules/sentry-sdk/default.nix | 4 +- .../python-modules/seqeval/default.nix | 4 +- .../setuptoolstrial/default.nix | 2 +- .../python-modules/shap/default.nix | 4 +- .../simple-salesforce/default.nix | 17 +- .../development/python-modules/sip/4.x.nix | 44 + .../development/python-modules/sip/5.x.nix | 40 - .../python-modules/sip/default.nix | 56 +- .../python-modules/sklearn-deap/default.nix | 4 +- .../python-modules/skorch/default.nix | 4 +- .../python-modules/slimit/default.nix | 36 - .../python-modules/slixmpp/default.nix | 4 +- .../snowflake-connector-python/default.nix | 34 +- .../spacy-alignments/default.nix | 60 + .../python-modules/spacy-pkuseg/default.nix | 38 + .../annotation-test/annotate.py | 68 + .../annotation-test/default.nix | 23 + .../spacy-transformers/default.nix | 42 + .../spacy/annotation-test/annotate.py | 10 +- .../python-modules/spacy/default.nix | 23 +- .../python-modules/spacy/legacy.nix | 26 + .../python-modules/spacy/models.json | 596 +- .../python-modules/spacy/models.nix | 20 +- .../python-modules/spectral-cube/default.nix | 18 +- .../sphinx-autobuild/default.nix | 8 +- .../python-modules/sphinx-jinja/default.nix | 2 +- .../development/python-modules/sphinx/2.nix | 2 +- .../python-modules/sphinx/default.nix | 102 +- .../sphinxcontrib-actdiag/default.nix | 28 + .../sphinxcontrib-blockdiag/default.nix | 2 +- .../sphinxcontrib-nwdiag/default.nix | 28 + .../sphinxcontrib-seqdiag/default.nix | 28 + .../sphinxcontrib-spelling/default.nix | 2 +- .../python-modules/spidev/default.nix | 1 + .../python-modules/srsly/default.nix | 13 +- .../python-modules/sslyze/default.nix | 39 +- .../python-modules/stem/default.nix | 2 + .../python-modules/stytra/default.nix | 4 +- .../python-modules/sumo/default.nix | 33 +- .../python-modules/sunpy/default.nix | 2 + .../python-modules/surepy/default.nix | 9 +- .../python-modules/tablib/default.nix | 2 + .../python-modules/tappy/default.nix | 29 + .../python-modules/telfhash/default.nix | 2 + .../telfhash/telfhash-new-tlsh-hash.patch | 30 + ...-Replace-debut-with-debian-inspector.patch | 40 + .../python-modules/tern/default.nix | 12 +- .../python-modules/textacy/default.nix | 4 +- .../python-modules/thinc/default.nix | 4 +- .../python-modules/timeago/default.nix | 32 + .../python-modules/tld/default.nix | 6 + .../python-modules/tls-parser/default.nix | 6 +- .../python-modules/torchvision/bin.nix | 59 + .../torchvision/binary-hashes.nix | 22 + .../python-modules/treq/default.nix | 2 +- .../python-modules/ttp/default.nix | 93 + .../python-modules/ttp/templates.nix | 31 + .../python-modules/txaio/default.nix | 53 +- .../python-modules/txgithub/default.nix | 2 +- .../python-modules/txrequests/default.nix | 2 +- .../python-modules/uamqp/default.nix | 4 +- .../python-modules/uc-micro-py/default.nix | 31 + .../python-modules/umap-learn/default.nix | 4 +- .../python-modules/unpaddedbase64/default.nix | 10 +- .../python-modules/userpath/default.nix | 7 +- .../python-modules/uvloop/default.nix | 9 +- .../python-modules/vdirsyncer/default.nix | 9 + .../python-modules/vowpalwabbit/default.nix | 4 +- .../python-modules/watchdog/default.nix | 4 +- .../python-modules/webssh/default.nix | 22 + .../python-modules/whoosh/default.nix | 2 +- .../python-modules/word2vec/default.nix | 4 +- .../python-modules/wordfreq/default.nix | 35 +- .../python-modules/xdot/default.nix | 4 +- .../python-modules/xgboost/default.nix | 60 +- .../xgboost/lib-path-for-python.patch | 38 - .../python-modules/xknx/default.nix | 4 +- .../python-modules/yangson/default.nix | 44 + .../python-modules/ytmusicapi/default.nix | 4 +- .../python-modules/zeroconf/default.nix | 5 +- .../python-modules/zigpy-znp/default.nix | 27 +- .../python-modules/zulip/default.nix | 4 +- .../zwave-js-server-python/default.nix | 4 +- .../pkgs/development/r-modules/default.nix | 1 + .../development/r-modules/generic-builder.nix | 8 +- .../ruby-modules/solargraph/default.nix | 2 +- .../tools/altair-graphql-client/default.nix | 38 + .../tools/analysis/codeql/default.nix | 4 +- .../tools/analysis/flow/default.nix | 4 +- .../analysis/include-what-you-use/default.nix | 6 +- .../analysis/massif-visualizer/default.nix | 2 +- .../tools/analysis/nix-linter/default.nix | 12 +- .../tools/analysis/tflint/default.nix | 6 +- .../0001-Fix-darwin-build.patch | 27 + .../tools/async-profiler/default.nix | 5 + .../development/tools/ats-acc/default.nix | 22 + .../tools/backblaze-b2/default.nix | 32 +- .../pkgs/development/tools/bacon/default.nix | 24 + .../development/tools/bazelisk/default.nix | 4 +- .../development/tools/boomerang/default.nix | 12 +- .../boost-build/darwin-default-toolset.patch | 12 + .../development/tools/boost-build/default.nix | 5 + .../bazel/bazel-remote/default.nix | 78 +- .../build-managers/bazel/bazel_3/default.nix | 2 +- .../build-managers/bazel/bazel_4/default.nix | 2 +- .../tools/build-managers/conan/default.nix | 11 + .../build-managers/leiningen/default.nix | 6 +- .../tools/build-managers/rebar3/default.nix | 245 +- .../rebar3/global-plugins.patch | 14 + .../build-managers/rebar3/rebar-deps.nix | 59 + .../rebar3/rebar3-nix-bootstrap | 267 - .../build-managers/rebar3/skip-plugins.patch | 54 + .../tools/build-managers/tup/default.nix | 12 +- .../development/tools/buildah/default.nix | 8 +- .../development/tools/castxml/default.nix | 7 +- .../development/tools/clang-tools/default.nix | 12 +- .../development/tools/clang-tools/wrapper | 19 +- .../development/tools/cloud-nuke/default.nix | 4 +- .../pkgs/development/tools/clpm/default.nix | 4 +- .../development/tools/conftest/default.nix | 6 +- .../buildkite-agent/default.nix | 7 +- .../hercules-ci-agent/default.nix | 16 +- .../jenkins/default.nix | 4 +- .../tools/database/liquibase/default.nix | 4 +- .../tools/database/webdis/default.nix | 4 +- .../pkgs/development/tools/delve/default.nix | 4 +- .../pkgs/development/tools/doctl/default.nix | 4 +- .../documentation/gnome-doc-utils/default.nix | 4 +- .../tools/documentation/gtk-doc/default.nix | 11 +- .../development/tools/earthly/default.nix | 28 + .../pkgs/development/tools/ecpdap/default.nix | 5 +- .../development/tools/electron/default.nix | 44 +- .../development/tools/electron/generic.nix | 4 +- .../tools/electron/print-hashes.sh | 7 +- .../development/tools/esbuild/default.nix | 6 +- .../pkgs/development/tools/evans/default.nix | 24 + .../development/tools/flip-link/default.nix | 4 +- .../pkgs/development/tools/frugal/default.nix | 4 +- .../pkgs/development/tools/ginkgo/default.nix | 4 +- .../pkgs/development/tools/gir/default.nix | 9 +- .../pkgs/development/tools/glade/default.nix | 6 +- .../development/tools/go-mockery/default.nix | 4 +- .../development/tools/go-toml/default.nix | 4 +- .../tools/gojsontoyaml/default.nix | 6 +- .../tools/golangci-lint/default.nix | 6 +- .../tools/haskell/hyper-haskell/default.nix | 24 +- .../tools/haskell/ihaskell/wrapper.nix | 5 +- .../tools/irony-server/default.nix | 2 +- .../tools/kustomize/kustomize-sops.nix | 6 +- .../tools/luaformatter/default.nix | 4 +- .../pkgs/development/tools/metals/default.nix | 4 +- .../development/tools/misc/act/default.nix | 6 +- .../tools/misc/binutils/default.nix | 17 +- .../development/tools/misc/ccache/default.nix | 23 +- .../misc/ccache/env-instead-of-compgen.patch | 18 - .../development/tools/misc/ccls/default.nix | 4 +- .../development/tools/misc/cli11/default.nix | 2 +- .../tools/misc/creduce/default.nix | 6 +- .../development/tools/misc/cvise/default.nix | 6 +- .../development/tools/misc/d-feet/default.nix | 10 +- .../development/tools/misc/distcc/default.nix | 12 +- .../development/tools/misc/gdb/default.nix | 10 +- .../development/tools/misc/global/default.nix | 4 +- .../development/tools/misc/gob2/default.nix | 4 +- .../development/tools/misc/jiq/default.nix | 31 + .../tools/misc/jscoverage/default.nix | 4 +- .../tools/misc/msitools/default.nix | 4 +- .../development/tools/misc/nimlsp/default.nix | 4 +- .../tools/misc/opengrok/default.nix | 2 +- .../tools/misc/terraform-ls/default.nix | 6 +- .../development/tools/misc/texlab/default.nix | 19 +- .../development/tools/mix2nix/default.nix | 25 + .../development/tools/nemiver/default.nix | 4 +- .../pkgs/development/tools/nwjs/default.nix | 4 +- .../pkgs/development/tools/ocaml/dune/1.nix | 2 +- .../pkgs/development/tools/ocaml/dune/2.nix | 2 +- .../tools/omnisharp-roslyn/default.nix | 4 +- .../development/tools/pactorio/default.nix | 3 +- .../tools/parinfer-rust/default.nix | 2 +- .../tools/parsing/re2c/default.nix | 40 +- .../tools/poetry2nix/poetry2nix/overrides.nix | 2 +- .../tools/profiling/sysprof/capture.nix | 1 + .../tools/profiling/sysprof/default.nix | 25 +- .../tools/protoc-gen-twirp/default.nix | 4 +- .../tools/purescript/spago/spago.nix | 38 +- .../tools/purescript/spago/update.sh | 7 +- .../development/tools/pypi2nix/default.nix | 2 + .../development/tools/qtcreator/default.nix | 2 +- .../tools/react-native-debugger/default.nix | 2 +- .../pkgs/development/tools/rq/default.nix | 11 +- .../pkgs/development/tools/rtags/default.nix | 4 +- .../tools/rust/bindgen/default.nix | 4 +- .../tools/rust/cargo-binutils/default.nix | 31 +- .../tools/rust/cargo-c/default.nix | 2 +- .../tools/rust/cargo-cache/default.nix | 6 +- .../tools/rust/cargo-crev/default.nix | 6 +- .../tools/rust/cargo-embed/default.nix | 12 +- .../tools/rust/cargo-expand/default.nix | 4 +- .../tools/rust/cargo-feature/default.nix | 4 +- .../tools/rust/cargo-flash/default.nix | 19 +- .../tools/rust/cargo-fuzz/default.nix | 10 +- .../tools/rust/cargo-insta/default.nix | 15 +- .../cargo-insta/ignore-rustfmt-test.patch | 10 - .../tools/rust/cargo-limit/default.nix | 4 + .../tools/rust/cargo-make/default.nix | 6 +- .../tools/rust/cargo-msrv/default.nix | 13 +- .../tools/rust/cargo-udeps/default.nix | 6 +- .../tools/rust/cargo-watch/default.nix | 10 +- .../tools/rust/cbindgen/default.nix | 2 +- .../tools/rust/maturin/pyo3-test/generic.nix | 2 +- .../tools/rust/probe-run/default.nix | 12 +- .../development/tools/rust/racer/default.nix | 6 +- .../tools/rust/rust-analyzer/default.nix | 24 +- .../0001-dynamically-patchelf-binaries.patch | 61 + .../default.nix | 56 + .../tools/rust/sqlx-cli/default.nix | 4 +- .../tools/rust/svd2rust/default.nix | 4 +- .../tools/scenebuilder/default.nix | 11 +- .../pkgs/development/tools/skopeo/default.nix | 4 +- .../pkgs/development/tools/sqsh/default.nix | 14 +- .../development/tools/treefmt/default.nix | 6 +- .../pkgs/development/tools/trunk/default.nix | 7 +- .../tools/vala-language-server/default.nix | 2 +- .../development/tools/vala-lint/default.nix | 12 +- .../development/tools/vultr-cli/default.nix | 4 +- .../tools/yarn2nix-moretea/fetch-source.nix | 10 - .../tools/yarn2nix-moretea/generate.sh | 40 - .../yarn2nix/lib/urlToName.js | 4 +- .../tools/yarn2nix-moretea/yarn2nix/yarn.lock | 1380 +- .../tools/yarn2nix-moretea/yarn2nix/yarn.nix | 1298 +- .../pkgs/development/web/cog/default.nix | 8 +- .../pkgs/development/web/cypress/default.nix | 4 +- .../pkgs/development/web/deno/default.nix | 15 +- .../pkgs/development/web/deno/librusty_v8.nix | 10 +- .../pkgs/development/web/flyctl/default.nix | 6 +- .../pkgs/development/web/insomnia/default.nix | 4 +- .../pkgs/development/web/nodejs/v12.nix | 4 +- .../pkgs/development/web/nodejs/v14.nix | 8 +- .../pkgs/development/web/nodejs/v15.nix | 4 +- .../pkgs/development/web/nodejs/v16.nix | 4 +- .../pkgs/development/web/postman/default.nix | 8 +- .../web/twitter-bootstrap/default.nix | 4 +- .../pkgs/development/web/valum/default.nix | 2 +- third_party/nixpkgs/pkgs/games/0ad/data.nix | 1 + third_party/nixpkgs/pkgs/games/0ad/game.nix | 11 +- .../nixpkgs/pkgs/games/0ad/rootdir_env.patch | 39 + .../nixpkgs/pkgs/games/0verkill/default.nix | 4 +- .../nixpkgs/pkgs/games/alephone/default.nix | 6 +- .../pkgs/games/alephone/infinity/default.nix | 4 +- third_party/nixpkgs/pkgs/games/anki/bin.nix | 6 +- .../pkgs/games/assaultcube/default.nix | 2 +- .../nixpkgs/pkgs/games/cataclysm-dda/git.nix | 6 +- .../nixpkgs/pkgs/games/colobot/default.nix | 11 +- .../nixpkgs/pkgs/games/cutemaze/default.nix | 4 +- .../nixpkgs/pkgs/games/freeorion/default.nix | 72 +- .../nixpkgs/pkgs/games/freeorion/fix-paths.sh | 2 +- .../nixpkgs/pkgs/games/frotz/default.nix | 3 + .../nixpkgs/pkgs/games/gnuchess/default.nix | 4 +- .../nixpkgs/pkgs/games/gscrabble/default.nix | 4 +- .../nixpkgs/pkgs/games/gweled/default.nix | 14 +- .../nixpkgs/pkgs/games/hedgewars/default.nix | 6 +- third_party/nixpkgs/pkgs/games/iortcw/sp.nix | 2 +- .../nixpkgs/pkgs/games/megaglest/default.nix | 4 +- .../nixpkgs/pkgs/games/minetest/default.nix | 6 +- .../nixpkgs/pkgs/games/opendune/default.nix | 2 +- .../nixpkgs/pkgs/games/openjk/default.nix | 2 +- .../nixpkgs/pkgs/games/openmw/default.nix | 38 +- .../nixpkgs/pkgs/games/openmw/tes3mp.nix | 192 +- .../nixpkgs/pkgs/games/openra/default.nix | 2 +- .../nixpkgs/pkgs/games/openra/packages.nix | 2 +- .../nixpkgs/pkgs/games/openttd/default.nix | 4 +- .../nixpkgs/pkgs/games/openxray/default.nix | 25 +- .../nixpkgs/pkgs/games/osu-lazer/default.nix | 4 +- .../nixpkgs/pkgs/games/osu-lazer/deps.nix | 247 +- .../0001-fix-VSFile-constructor.patch | 25 - .../nixpkgs/pkgs/games/privateer/default.nix | 44 - .../nixpkgs/pkgs/games/quakespasm/vulkan.nix | 2 +- .../nixpkgs/pkgs/games/r2mod_cli/default.nix | 4 +- .../nixpkgs/pkgs/games/steam-tui/default.nix | 45 + .../nixpkgs/pkgs/games/steam/fhsenv.nix | 3 +- .../pkgs/games/super-tux-kart/default.nix | 46 +- .../pkgs/games/terraria-server/default.nix | 6 +- .../pkgs/games/ultrastardx/default.nix | 35 +- .../0002-add-scaling-factor-to-source.patch | 161 + .../nixpkgs/pkgs/games/zod/default.nix | 148 +- .../pkgs/misc/drivers/foo2zjs/default.nix | 3 +- .../pkgs/misc/drivers/hplip/3.18.5.nix | 2 +- .../pkgs/misc/drivers/hplip/default.nix | 6 +- .../pkgs/misc/drivers/spacenavd/default.nix | 17 +- .../pkgs/misc/emulators/atari800/default.nix | 4 +- .../pkgs/misc/emulators/caprice32/default.nix | 5 + .../misc/emulators/caprice32/string.patch | 12 + .../pkgs/misc/emulators/cdemu/analyzer.nix | 4 +- .../nixpkgs/pkgs/misc/emulators/cdemu/gui.nix | 4 +- .../pkgs/misc/emulators/mame/default.nix | 2 +- .../pkgs/misc/emulators/nestopia/default.nix | 4 +- .../pkgs/misc/emulators/retroarch/default.nix | 4 +- .../pkgs/misc/emulators/rpcs3/default.nix | 31 +- .../pkgs/misc/emulators/ruffle/default.nix | 6 +- .../pkgs/misc/emulators/vbam/default.nix | 10 + .../pkgs/misc/emulators/yapesdl/default.nix | 2 + .../nixpkgs/pkgs/misc/frescobaldi/default.nix | 2 +- .../nixpkgs/pkgs/misc/jackaudio/default.nix | 2 +- .../nixpkgs/pkgs/misc/jackaudio/jack1.nix | 2 +- .../nixpkgs/pkgs/misc/lilypond/default.nix | 4 +- .../screensavers/electricsheep/default.nix | 2 +- .../pkgs/misc/screensavers/vlock/default.nix | 2 +- .../nixpkgs/pkgs/misc/sndio/default.nix | 12 +- .../nixpkgs/pkgs/misc/t-rec/default.nix | 37 + .../nixpkgs/pkgs/misc/uboot/default.nix | 4 +- .../nixpkgs/pkgs/misc/vim-plugins/aliases.nix | 11 +- .../nixpkgs/pkgs/misc/vim-plugins/default.nix | 17 +- .../pkgs/misc/vim-plugins/generated.nix | 1003 +- .../pkgs/misc/vim-plugins/overrides.nix | 18 +- .../nixpkgs/pkgs/misc/vim-plugins/update.py | 9 +- .../pkgs/misc/vim-plugins/vim-plugin-names | 24 +- .../pkgs/misc/vscode-extensions/default.nix | 51 +- .../ms-dotnettools-csharp/default.nix | 7 +- .../ms-vsliveshare-vsliveshare/default.nix | 6 +- .../misc/vscode-extensions/python/default.nix | 4 +- .../vscode-extensions/remote-ssh/default.nix | 12 +- .../vscode-extensions/terraform/default.nix | 4 +- .../terraform/fix-terraform-ls.patch | 10 +- .../vscode-extensions/wakatime/default.nix | 4 +- .../nixpkgs/pkgs/os-specific/bsd/default.nix | 5 - .../pkgs/os-specific/bsd/netbsd/default.nix | 473 +- .../bsd/{netbsd/builder.sh => setup-hook.sh} | 24 +- .../os-specific/darwin/apple-sdk/default.nix | 16 +- .../darwin/apple-source-releases/default.nix | 49 +- .../os-specific/darwin/maloader/default.nix | 2 +- .../os-specific/darwin/spacebar/default.nix | 4 +- .../pkgs/os-specific/linux/anbox/kmod.nix | 11 +- .../linux/android-udev-rules/default.nix | 4 +- .../os-specific/linux/apparmor/default.nix | 86 +- .../apparmor/fix-rc.apparmor.functions.sh | 32 + .../os-specific/linux/ati-drivers/builder.sh | 302 - .../os-specific/linux/ati-drivers/default.nix | 140 - .../ati-drivers/patches/15.12-xstate-fp.patch | 26 - .../ati-drivers/patches/15.9-kcl_str.patch | 14 - .../linux/ati-drivers/patches/15.9-mtrr.patch | 27 - .../ati-drivers/patches/15.9-preempt.patch | 103 - .../ati-drivers/patches/15.9-sep_printf.patch | 11 - .../patches/4.7-arch-cpu_has_pge-v2.patch | 70 - .../patches/4.9-get_user_pages.patch | 28 - .../patches/kernel-4.6-get_user_pages.patch | 25 - ...rnel-4.6-page_cache_release-put_page.patch | 16 - .../ati-drivers/patches/patch-samples.patch | 26 - .../os-specific/linux/atop/atop.service.patch | 10 + .../linux/atop/atopacct.service.patch | 7 + .../pkgs/os-specific/linux/atop/default.nix | 63 +- .../os-specific/linux/atop/fix-paths.patch | 48 + .../os-specific/linux/batman-adv/default.nix | 10 +- .../pkgs/os-specific/linux/bcc/default.nix | 8 +- .../os-specific/linux/bpftrace/default.nix | 8 +- .../os-specific/linux/cryptodev/default.nix | 5 +- .../os-specific/linux/dbus-broker/default.nix | 6 +- .../pkgs/os-specific/linux/ell/default.nix | 4 +- .../pkgs/os-specific/linux/ena/default.nix | 4 +- .../os-specific/linux/eventstat/default.nix | 4 +- .../os-specific/linux/fatrace/default.nix | 4 +- .../firmware-linux-nonfree/default.nix | 6 +- .../pkgs/os-specific/linux/gradm/default.nix | 8 +- .../pkgs/os-specific/linux/hdparm/default.nix | 4 +- .../linux/hid-nintendo/default.nix | 38 + .../os-specific/linux/i2c-tools/default.nix | 19 +- .../os-specific/linux/iproute/default.nix | 4 +- .../os-specific/linux/iputils/default.nix | 23 + .../pkgs/os-specific/linux/iwd/default.nix | 6 +- .../pkgs/os-specific/linux/kbd/default.nix | 42 +- .../pkgs/os-specific/linux/kbd/keymaps.nix | 36 - .../os-specific/linux/kbd/search-paths.patch | 71 - .../linux/kernel-headers/default.nix | 4 +- .../linux/kernel/common-config.nix | 10 +- .../linux/kernel/hardened/patches.json | 30 +- .../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 | 7 +- .../os-specific/linux/kernel/linux-4.9.nix | 7 +- .../os-specific/linux/kernel/linux-5.10.nix | 4 +- .../os-specific/linux/kernel/linux-5.11.nix | 4 +- .../os-specific/linux/kernel/linux-5.12.nix | 20 + .../os-specific/linux/kernel/linux-5.4.nix | 4 +- .../os-specific/linux/kernel/linux-libre.nix | 4 +- .../os-specific/linux/kernel/linux-lqx.nix | 4 +- .../linux/kernel/linux-rt-5.10.nix | 6 +- .../os-specific/linux/kernel/linux-rt-5.4.nix | 6 +- .../pkgs/os-specific/linux/klibc/default.nix | 4 +- .../os-specific/linux/libselinux/default.nix | 5 + .../linux/logitech-udev-rules/default.nix | 2 +- .../pkgs/os-specific/linux/lsscsi/default.nix | 6 +- .../pkgs/os-specific/linux/lxc/default.nix | 4 +- .../mbp2018-bridge-drv/default.nix | 7 +- .../os-specific/linux/mmc-utils/default.nix | 6 +- .../os-specific/linux/netatop/default.nix | 18 +- .../os-specific/linux/netatop/fix-paths.patch | 11 + .../linux/netatop/netatop.service.patch | 7 + .../linux/nixos-rebuild/default.nix | 1 + .../linux/nixos-rebuild/nixos-rebuild.sh | 61 +- .../os-specific/linux/nvidia-x11/default.nix | 37 - .../os-specific/linux/openrazer/driver.nix | 8 +- .../pkgs/os-specific/linux/piper/default.nix | 4 +- .../os-specific/linux/rtl8192eu/default.nix | 23 +- .../os-specific/linux/rtl8812au/default.nix | 27 +- .../os-specific/linux/rtl8814au/default.nix | 19 +- .../os-specific/linux/rtl8821au/default.nix | 18 +- .../os-specific/linux/rtl8821ce/default.nix | 1 + .../os-specific/linux/rtl8821cu/default.nix | 17 +- .../os-specific/linux/rtl88x2bu/default.nix | 16 +- .../os-specific/linux/systemd/default.nix | 10 +- .../os-specific/linux/tiscamera/default.nix | 31 +- .../linux/tuxedo-keyboard/default.nix | 12 +- .../os-specific/linux/wireguard/default.nix | 4 +- ...1-Implement-read-only-mode-for-ssids.patch | 130 + .../linux/wpa_supplicant/default.nix | 7 +- .../pkgs/os-specific/linux/zfs/default.nix | 16 +- .../nixpkgs/pkgs/servers/adminer/default.nix | 12 +- .../pkgs/servers/asterisk/sccp/default.nix | 4 +- .../pkgs/servers/atlassian/confluence.nix | 4 +- .../nixpkgs/pkgs/servers/atlassian/jira.nix | 4 +- .../nixpkgs/pkgs/servers/bazarr/default.nix | 4 +- .../pkgs/servers/beanstalkd/default.nix | 6 +- .../pkgs/servers/blockbook/default.nix | 8 + .../nixpkgs/pkgs/servers/caddy/default.nix | 6 +- .../pkgs/servers/calibre-web/default.nix | 2 + .../pkgs/servers/clickhouse/default.nix | 21 +- .../pkgs/servers/computing/slurm/default.nix | 4 +- .../{matrix-dendrite => dendrite}/default.nix | 6 +- .../nixpkgs/pkgs/servers/dex/default.nix | 6 +- .../nixpkgs/pkgs/servers/dns/bind/default.nix | 4 +- .../pkgs/servers/dns/dnsdist/default.nix | 4 +- .../pkgs/servers/dns/knot-dns/default.nix | 4 +- .../servers/dns/knot-resolver/default.nix | 6 +- .../servers/dns/pdns-recursor/default.nix | 6 +- third_party/nixpkgs/pkgs/servers/etcd/3.4.nix | 6 +- .../nixpkgs/pkgs/servers/fcgiwrap/default.nix | 2 +- .../nixpkgs/pkgs/servers/firebird/default.nix | 149 +- .../pkgs/servers/ftp/bftpd/default.nix | 4 +- .../pkgs/servers/ftp/pure-ftpd/default.nix | 2 +- .../pkgs/servers/ftp/vsftpd/default.nix | 6 +- .../pkgs/servers/gemini/agate/default.nix | 4 +- .../nixpkgs/pkgs/servers/gerbera/default.nix | 128 +- .../nixpkgs/pkgs/servers/gonic/default.nix | 13 +- .../home-assistant/component-packages.nix | 80 +- .../pkgs/servers/home-assistant/default.nix | 376 +- .../pkgs/servers/home-assistant/frontend.nix | 4 +- .../pkgs/servers/http/apache-httpd/2.4.nix | 8 +- .../http/apache-modules/mod_dnssd/default.nix | 2 +- .../apache-modules/mod_python/default.nix | 10 +- .../servers/http/apt-cacher-ng/default.nix | 4 +- .../pkgs/servers/http/couchdb/2.0.0.nix | 57 - .../pkgs/servers/http/couchdb/default.nix | 39 - .../pkgs/servers/http/couchdb/jsapi.patch | 60 - .../servers/http/gitlab-pages/default.nix | 6 +- .../pkgs/servers/http/jboss/default.nix | 4 +- .../pkgs/servers/http/nginx/generic.nix | 1 + .../servers/http/trafficserver/default.nix | 2 +- .../pkgs/servers/hylafaxplus/default.nix | 3 + .../servers/hylafaxplus/libtiff-4.2.patch | 13 + .../pkgs/servers/irc/inspircd/default.nix | 8 +- .../pkgs/servers/irc/solanum/bandb.patch | 12 + .../pkgs/servers/irc/solanum/default.nix | 23 +- .../nixpkgs/pkgs/servers/jackett/default.nix | 4 +- .../nixpkgs/pkgs/servers/jellyfin/default.nix | 106 +- .../servers/jellyfin/node-composition.nix | 17 + .../pkgs/servers/jellyfin/node-deps.nix | 13659 ++++++++++++++++ .../pkgs/servers/jellyfin/nuget-deps.nix | 2268 +++ .../nixpkgs/pkgs/servers/jellyfin/update.sh | 52 + .../pkgs/servers/jellyfin/web-update.sh | 30 + .../nixpkgs/pkgs/servers/jellyfin/web.nix | 81 + .../pkgs/servers/jetbrains/youtrack.nix | 6 +- .../nixpkgs/pkgs/servers/keycloak/default.nix | 4 +- .../nixpkgs/pkgs/servers/lidarr/default.nix | 4 +- .../pkgs/servers/mail/exim/default.nix | 2 +- .../pkgs/servers/mail/opensmtpd/default.nix | 1 + .../servers/mail/opensmtpd/filter-rspamd.nix | 30 + .../pkgs/servers/matrix-synapse/default.nix | 6 +- .../matrix-appservice-slack/default.nix | 4 +- .../generate-dependencies.sh | 6 +- .../matrix-appservice-slack/node-packages.nix | 1154 +- .../pkgs/servers/mbtileserver/default.nix | 7 +- .../nixpkgs/pkgs/servers/minio/default.nix | 40 +- .../pkgs/servers/misc/gobgpd/default.nix | 6 +- .../pkgs/servers/misc/navidrome/default.nix | 10 +- .../servers/monitoring/do-agent/default.nix | 4 +- .../grafana-image-renderer/default.nix | 4 +- .../grafana-image-renderer/package.json | 17 +- .../grafana-image-renderer/yarn.lock | 2055 ++- .../grafana-image-renderer/yarn.nix | 1960 +-- .../servers/monitoring/grafana/default.nix | 15 +- .../servers/monitoring/icinga2/default.nix | 101 + .../monitoring/icinga2/etc-icinga2.patch | 13 + .../icinga2/no-systemd-service.patch | 15 + .../icinga2/no-var-directories.patch | 66 + .../prometheus/artifactory-exporter.nix | 6 +- .../monitoring/prometheus/aws-s3-exporter.nix | 4 +- .../monitoring/prometheus/bind-exporter.nix | 17 +- .../monitoring/prometheus/bird-exporter.nix | 8 +- .../prometheus/blackbox-exporter.nix | 13 +- .../prometheus/collectd-exporter.nix | 8 +- .../servers/monitoring/prometheus/default.nix | 24 +- .../monitoring/prometheus/domain-exporter.nix | 6 +- .../gitlab-ci-pipelines-exporter.nix | 16 +- .../gitlab-ci-pipelines-exporter_deps.nix | 390 - .../prometheus/haproxy-exporter.nix | 7 +- .../monitoring/prometheus/jmx-httpserver.nix | 4 +- .../monitoring/prometheus/json-exporter.nix | 6 +- .../monitoring/prometheus/kea-exporter.nix | 33 + .../monitoring/prometheus/mesos-exporter.nix | 11 +- .../prometheus/mesos-exporter_deps.nix | 83 - .../monitoring/prometheus/nginx-exporter.nix | 4 +- .../prometheus/nginxlog-exporter.nix | 6 +- .../monitoring/prometheus/node-exporter.nix | 18 +- .../prometheus/openvpn-exporter-deps.nix | 66 - .../prometheus/openvpn-exporter.nix | 15 +- .../prometheus/process-exporter.nix | 12 +- .../monitoring/prometheus/prom2json.nix | 15 +- .../monitoring/prometheus/prom2json_deps.nix | 38 - .../prometheus/rabbitmq-exporter.nix | 12 +- .../prometheus/rabbitmq-exporter_deps.nix | 793 - .../monitoring/prometheus/redis-exporter.nix | 15 +- .../prometheus/smokeping-prober.nix | 8 +- .../monitoring/prometheus/snmp-exporter.nix | 12 +- .../monitoring/prometheus/statsd-exporter.nix | 13 +- .../prometheus/unbound-exporter.nix | 5 +- .../prometheus/varnish-exporter.nix | 8 +- .../monitoring/prometheus/webui-package.json | 53 +- .../monitoring/prometheus/webui-yarndeps.nix | 2952 ++-- .../prometheus/wireguard-exporter.nix | 10 +- .../monitoring/prometheus/xmpp-alerts.nix | 31 +- .../servers/monitoring/zabbix/versions.nix | 4 +- .../nixpkgs/pkgs/servers/nas/default.nix | 2 +- .../pkgs/servers/nosql/influxdb2/default.nix | 23 +- .../nosql/influxdb2/influx-ui-package.json | 11 +- .../nosql/influxdb2/influx-ui-yarndeps.nix | 8 +- .../servers/nosql/victoriametrics/default.nix | 6 +- .../pkgs/servers/nzbhydra2/default.nix | 8 +- .../pkgs/servers/oauth2-proxy/default.nix | 2 +- third_party/nixpkgs/pkgs/servers/plex/raw.nix | 6 +- .../nixpkgs/pkgs/servers/radarr/default.nix | 8 +- .../nixpkgs/pkgs/servers/reproxy/default.nix | 36 + .../nixpkgs/pkgs/servers/rt/default.nix | 183 +- .../servers/rt/dont-check-users_groups.patch | 12 + .../pkgs/servers/search/groonga/default.nix | 4 +- .../nixpkgs/pkgs/servers/shishi/default.nix | 2 +- .../pkgs/servers/sickbeard/sickgear.nix | 4 +- .../servers/simple-http-server/default.nix | 4 +- .../servers/sql/mariadb/connector-c/3_1.nix | 4 +- .../sql/mariadb/connector-c/default.nix | 4 +- .../pkgs/servers/sql/mariadb/default.nix | 4 +- .../servers/sql/mariadb/galera/default.nix | 48 +- .../pkgs/servers/sql/postgresql/default.nix | 6 +- .../servers/sql/postgresql/ext/pgvector.nix | 6 +- .../servers/sql/postgresql/ext/pipelinedb.nix | 6 +- .../sql/postgresql/ext/timescaledb.nix | 8 +- .../pkgs/servers/sql/postgresql/packages.nix | 7 +- .../nixpkgs/pkgs/servers/squid/default.nix | 6 +- .../pkgs/servers/tailscale/default.nix | 6 +- .../nixpkgs/pkgs/servers/ttyd/default.nix | 4 +- .../nixpkgs/pkgs/servers/unfs3/default.nix | 3 + .../pkgs/servers/unpackerr/default.nix | 24 + .../servers/web-apps/bookstack/default.nix | 4 +- .../web-apps/bookstack/php-packages.nix | 114 +- .../pkgs/servers/web-apps/galene/default.nix | 6 +- .../servers/web-apps/hedgedoc/default.nix | 42 +- .../servers/web-apps/hedgedoc/package.json | 79 +- .../pkgs/servers/web-apps/hedgedoc/yarn.lock | 395 +- .../pkgs/servers/web-apps/hedgedoc/yarn.nix | 368 +- .../servers/web-apps/rss-bridge/default.nix | 8 +- .../servers/web-apps/wallabag/default.nix | 4 +- .../pkgs/servers/x11/xorg/overrides.nix | 6 + .../pkgs/servers/xmpp/prosody/default.nix | 8 +- .../pkgs/servers/zoneminder/default.nix | 6 +- third_party/nixpkgs/pkgs/shells/bash/5.1.nix | 6 +- .../nixpkgs/pkgs/shells/fish/default.nix | 10 +- .../nixpkgs/pkgs/shells/hilbish/default.nix | 26 + .../nixpkgs/pkgs/shells/nushell/default.nix | 9 +- .../nixpkgs/pkgs/shells/oil/default.nix | 6 +- .../pkgs/shells/powershell/default.nix | 6 +- .../pkgs/shells/zsh/antibody/default.nix | 2 +- .../nixpkgs/pkgs/stdenv/darwin/default.nix | 58 +- .../stdenv/darwin/make-bootstrap-tools.nix | 4 +- .../pkgs/stdenv/generic/make-derivation.nix | 2 +- .../nixpkgs/pkgs/stdenv/linux/default.nix | 4 + third_party/nixpkgs/pkgs/test/default.nix | 5 +- .../nixpkgs/pkgs/test/haskell/default.nix | 7 + .../documentationTarball}/default.nix | 0 .../pkgs/test/haskell/setBuildTarget/Bar.hs | 4 + .../pkgs/test/haskell/setBuildTarget/Foo.hs | 4 + .../pkgs/test/haskell/setBuildTarget/Setup.hs | 2 + .../test/haskell/setBuildTarget/default.nix | 38 + .../haskell-setBuildTarget.cabal | 16 + .../shellFor}/default.nix | 10 +- .../pkgs/tools/X11/find-cursor/default.nix | 4 +- .../pkgs/tools/X11/hsetroot/default.nix | 4 + .../tools/X11/opentabletdriver/default.nix | 6 +- .../pkgs/tools/X11/opentabletdriver/deps.nix | 8 +- .../pkgs/tools/X11/opentabletdriver/shell.nix | 4 +- .../pkgs/tools/X11/opentabletdriver/update.sh | 6 +- .../nixpkgs/pkgs/tools/X11/wpgtk/default.nix | 4 +- .../pkgs/tools/X11/xdg-user-dirs/default.nix | 2 +- .../nixpkgs/pkgs/tools/X11/xpra/default.nix | 19 +- .../pkgs/tools/admin/acme.sh/default.nix | 6 +- .../pkgs/tools/admin/ansible/default.nix | 26 +- .../pkgs/tools/admin/awscli2/default.nix | 30 +- .../pkgs/tools/admin/azure-cli/default.nix | 6 +- .../tools/admin/azure-cli/python-packages.nix | 102 +- .../pkgs/tools/admin/chamber/default.nix | 21 +- .../pkgs/tools/admin/clair/default.nix | 6 +- .../pkgs/tools/admin/eksctl/default.nix | 6 +- .../pkgs/tools/admin/exoscale-cli/default.nix | 4 +- .../pkgs/tools/admin/fioctl/default.nix | 4 +- .../tools/admin/google-cloud-sdk/default.nix | 6 +- .../pkgs/tools/admin/gtk-vnc/default.nix | 20 +- .../nixpkgs/pkgs/tools/admin/lxd/default.nix | 6 +- .../pkgs/tools/admin/oci-cli/default.nix | 3 +- .../pkgs/tools/admin/pebble/default.nix | 5 + .../pkgs/tools/admin/trivy/default.nix | 14 +- .../arc_unpacker/add-missing-import.patch | 22 + .../tools/archivers/arc_unpacker/default.nix | 17 +- .../pkgs/tools/archivers/bomutils/default.nix | 5 +- .../pkgs/tools/archivers/quickbms/default.nix | 23 + .../tools/archivers/xarchiver/default.nix | 10 +- .../pkgs/tools/archivers/zpaq/default.nix | 4 +- .../pkgs/tools/audio/abcmidi/default.nix | 4 +- .../audio/acoustid-fingerprinter/default.nix | 7 +- .../audio/acoustid-fingerprinter/ffmpeg.patch | 26 - .../pkgs/tools/audio/beets/default.nix | 6 +- .../pkgs/tools/audio/gvolicon/default.nix | 4 +- .../pkgs/tools/audio/liquidsoap/full.nix | 4 +- .../pkgs/tools/audio/mididings/default.nix | 2 +- .../tools/audio/opl3bankeditor/default.nix | 2 +- .../pkgs/tools/audio/pasystray/default.nix | 4 +- .../pkgs/tools/audio/spotdl/default.nix | 3 + .../nixpkgs/pkgs/tools/audio/tts/default.nix | 79 +- .../pkgs/tools/audio/video2midi/default.nix | 2 +- .../pkgs/tools/audio/volctl/default.nix | 4 +- .../pkgs/tools/backup/bacula/default.nix | 4 +- .../nixpkgs/pkgs/tools/backup/dar/default.nix | 4 +- .../pkgs/tools/backup/gamerbackup/default.nix | 18 +- .../pkgs/tools/backup/monolith/default.nix | 3 +- .../pkgs/tools/backup/rdedup/default.nix | 2 +- .../pkgs/tools/backup/s3ql/default.nix | 10 +- .../tools/bluetooth/blueberry/default.nix | 4 +- .../pkgs/tools/bluetooth/blueman/default.nix | 4 +- .../filesystems/bcachefs-tools/default.nix | 6 +- .../pkgs/tools/filesystems/bees/default.nix | 11 +- .../tools/filesystems/blobfuse/default.nix | 29 +- .../filesystems/blobfuse/install-adls.patch | 14 + .../tools/filesystems/btrfs-progs/default.nix | 4 +- .../pkgs/tools/filesystems/dduper/default.nix | 50 + .../tools/filesystems/gcsfuse/default.nix | 4 +- .../pkgs/tools/filesystems/irods/common.nix | 2 +- .../filesystems/squashfs-tools-ng/default.nix | 10 +- .../tools/filesystems/supertag/default.nix | 2 +- .../pkgs/tools/graphics/agi/default.nix | 4 +- .../pkgs/tools/graphics/cfdg/default.nix | 4 +- .../tools/graphics/dmtx-utils/default.nix | 4 +- .../pkgs/tools/graphics/fbv/default.nix | 21 +- .../pkgs/tools/graphics/flam3/default.nix | 2 +- .../pkgs/tools/graphics/glee/default.nix | 2 +- .../pkgs/tools/graphics/gmic/default.nix | 4 +- .../pkgs/tools/graphics/mangohud/combined.nix | 14 - .../pkgs/tools/graphics/mangohud/default.nix | 116 +- .../mangohud/hardcode-dependencies.patch | 57 + .../mangohud/opengl32-nix-workaround.patch | 12 + .../tools/graphics/perceptualdiff/default.nix | 2 +- .../pkgs/tools/graphics/pikchr/default.nix | 2 + .../graphics/snapdragon-profiler/default.nix | 91 + .../pkgs/tools/graphics/timg/default.nix | 4 +- .../pkgs/tools/graphics/twilight/default.nix | 2 +- .../pkgs/tools/graphics/vips/default.nix | 3 +- .../fcitx-engines/fcitx-anthy/default.nix | 4 +- .../inputmethods/fcitx/fcitx-configtool.nix | 4 +- .../tools/inputmethods/fcitx5/fcitx5-m17n.nix | 4 +- .../tools/inputmethods/fcitx5/fcitx5-qt.nix | 4 +- .../ibus-engines/ibus-m17n/default.nix | 4 +- .../pkgs/tools/inputmethods/kime/default.nix | 2 +- .../pkgs/tools/misc/apparix/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/atuin/default.nix | 31 + .../pkgs/tools/misc/bat-extras/default.nix | 3 + .../nixpkgs/pkgs/tools/misc/bat/default.nix | 6 +- .../pkgs/tools/misc/bibutils/default.nix | 22 +- .../pkgs/tools/misc/birdfont/default.nix | 4 +- .../misc/bottom-rs}/cargo-lock.patch | 893 +- .../pkgs/tools/misc/bottom-rs/default.nix | 23 + .../pkgs/tools/misc/brltty/default.nix | 81 +- .../nixpkgs/pkgs/tools/misc/broot/default.nix | 18 +- .../pkgs/tools/misc/castty/default.nix | 5 +- .../nixpkgs/pkgs/tools/misc/chafa/default.nix | 9 +- .../pkgs/tools/misc/chezmoi/default.nix | 6 +- .../pkgs/tools/misc/cicero-tui/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/cloc/default.nix | 6 +- .../pkgs/tools/misc/code-minimap/default.nix | 10 +- .../pkgs/tools/misc/cpulimit/default.nix | 4 +- .../pkgs/tools/misc/czkawka/default.nix | 6 +- .../pkgs/tools/misc/dateutils/default.nix | 11 +- .../pkgs/tools/misc/ddccontrol/default.nix | 6 +- .../tools/misc/debian-devscripts/default.nix | 4 +- .../pkgs/tools/misc/debootstrap/default.nix | 4 +- .../pkgs/tools/misc/diffoscope/default.nix | 8 +- .../pkgs/tools/misc/discocss/default.nix | 6 +- .../pkgs/tools/misc/dpt-rp1-py/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/dua/default.nix | 10 +- .../nixpkgs/pkgs/tools/misc/duc/default.nix | 2 +- .../pkgs/tools/misc/esphome/default.nix | 89 +- .../pkgs/tools/misc/etcher/default.nix | 36 +- .../pkgs/tools/misc/ethminer/default.nix | 2 +- .../pkgs/tools/misc/ffsend/default.nix | 6 +- .../pkgs/tools/misc/fluent-bit/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/foma/default.nix | 9 +- .../pkgs/tools/misc/fontforge/default.nix | 4 +- .../pkgs/tools/misc/fselect/default.nix | 6 +- .../pkgs/tools/misc/fx_cast/default.nix | 117 +- .../pkgs/tools/misc/fx_cast/node-env.nix | 567 + .../pkgs/tools/misc/fx_cast/node-packages.nix | 1706 ++ .../pkgs/tools/misc/fx_cast/package-lock.json | 1327 ++ .../pkgs/tools/misc/fx_cast/package.json | 41 + .../pkgs/tools/misc/gh-ost/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/goss/default.nix | 34 + .../pkgs/tools/misc/gparted/default.nix | 11 +- .../pkgs/tools/misc/gringo/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/grub/2.0x.nix | 10 + .../pkgs/tools/misc/gsmartcontrol/default.nix | 4 +- .../pkgs/tools/misc/handlr/default.nix | 3 +- .../nixpkgs/pkgs/tools/misc/hdf5/1.10.nix | 8 +- .../pkgs/tools/misc/heimdall/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/ipbt/default.nix | 4 +- .../pkgs/tools/misc/jdupes/default.nix | 4 +- .../pkgs/tools/misc/kodi-cli/default.nix | 4 +- .../pkgs/tools/misc/krapslog/default.nix | 4 +- .../tools/misc/librespeed-cli/default.nix | 4 +- .../pkgs/tools/misc/logtop/default.nix | 1 + .../nixpkgs/pkgs/tools/misc/lorri/default.nix | 8 +- .../pkgs/tools/misc/ltunify/default.nix | 19 +- .../pkgs/tools/misc/macchina/default.nix | 10 +- .../pkgs/tools/misc/mdbtools/default.nix | 18 +- .../pkgs/tools/misc/me_cleaner/default.nix | 2 +- .../pkgs/tools/misc/microplane/default.nix | 8 +- .../pkgs/tools/misc/minipro/default.nix | 35 + .../nixpkgs/pkgs/tools/misc/mmv/default.nix | 53 +- .../pkgs/tools/misc/nix-direnv/default.nix | 6 +- .../pkgs/tools/misc/pastebinit/default.nix | 2 +- .../pkgs/tools/misc/pistol/default.nix | 16 +- .../tools/misc/plantuml-server/default.nix | 26 +- .../nixpkgs/pkgs/tools/misc/rig/default.nix | 2 + .../pkgs/tools/misc/routino/default.nix | 7 +- .../pkgs/tools/misc/silicon/default.nix | 8 +- .../pkgs/tools/misc/starship/default.nix | 6 +- .../pkgs/tools/misc/svtplay-dl/default.nix | 4 +- .../pkgs/tools/misc/swaglyrics/default.nix | 3 +- .../nixpkgs/pkgs/tools/misc/tlp/default.nix | 2 +- .../pkgs/tools/misc/topgrade/default.nix | 6 +- .../pkgs/tools/misc/trash-cli/default.nix | 13 +- .../pkgs/tools/misc/tremor-rs/default.nix | 9 +- .../pkgs/tools/misc/vorbisgain/default.nix | 3 +- .../nixpkgs/pkgs/tools/misc/wagyu/default.nix | 4 +- .../pkgs/tools/misc/websocat/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/wlc/default.nix | 36 + .../pkgs/tools/misc/woeusb/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/xcd/default.nix | 29 + .../pkgs/tools/misc/xvfb-run/default.nix | 6 +- .../pkgs/tools/misc/yafetch/default.nix | 29 + .../pkgs/tools/misc/yle-dl/default.nix | 5 +- .../pkgs/tools/misc/youtube-dl/default.nix | 4 +- .../tools/misc/yubikey-manager-qt/default.nix | 52 +- .../pkgs/tools/misc/zellij/default.nix | 12 +- .../tools/networking/anevicon/default.nix | 6 +- .../pkgs/tools/networking/atinout/default.nix | 6 +- .../tools/networking/boundary/default.nix | 21 +- .../tools/networking/burpsuite/default.nix | 9 +- .../tools/networking/calendar-cli/default.nix | 34 + .../pkgs/tools/networking/chrony/default.nix | 4 +- .../pkgs/tools/networking/clash/default.nix | 6 +- .../pkgs/tools/networking/croc/default.nix | 6 +- .../curl/7.74.0-CVE-2021-22876.patch | 139 - .../curl/7.74.0-CVE-2021-22890.patch | 473 - .../pkgs/tools/networking/curl/default.nix | 9 +- .../pkgs/tools/networking/dnsmasq/default.nix | 8 +- .../tools/networking/dnsproxy/default.nix | 4 +- .../tools/networking/findomain/default.nix | 9 +- .../tools/networking/getmail6/default.nix | 4 +- .../tools/networking/ghostunnel/default.nix | 29 + .../pkgs/tools/networking/gobgp/default.nix | 4 +- .../pkgs/tools/networking/gping/default.nix | 4 + .../tools/networking/gupnp-tools/default.nix | 7 +- .../pkgs/tools/networking/haproxy/default.nix | 1 + .../pkgs/tools/networking/httperf/default.nix | 2 +- .../pkgs/tools/networking/i2pd/default.nix | 4 +- .../tools/networking/inetutils/default.nix | 23 +- .../tools/networking/innernet/default.nix | 2 +- .../pkgs/tools/networking/ipinfo/default.nix | 25 + .../pkgs/tools/networking/kea/default.nix | 4 +- .../tools/networking/libreswan/default.nix | 144 +- .../pkgs/tools/networking/lldpd/default.nix | 4 +- .../tools/networking/miniupnpd/default.nix | 5 + .../networking/modem-manager/default.nix | 4 +- .../networkmanager/applet/default.nix | 11 +- .../networking/networkmanager/default.nix | 10 +- .../networkmanager/fortisslvpn/default.nix | 5 +- .../networkmanager/iodine/default.nix | 4 +- .../networkmanager/libnma/default.nix | 5 +- .../networkmanager/openconnect/default.nix | 5 +- .../networkmanager/openvpn/default.nix | 5 +- .../networkmanager/sstp/default.nix | 4 +- .../networkmanager/strongswan/default.nix | 2 +- .../networkmanager/vpnc/default.nix | 5 +- .../tools/networking/nfstrace/default.nix | 6 + .../pkgs/tools/networking/ofono/default.nix | 4 +- .../openapi-generator-cli/default.nix | 19 +- .../openapi-generator-cli/example.nix | 31 + .../openapi-generator-cli/unstable.nix | 14 +- .../pkgs/tools/networking/openssh/common.nix | 5 + .../pkgs/tools/networking/openssh/default.nix | 4 +- .../p2p/libtorrent-jesec/default.nix | 28 + .../networking/p2p/rtorrent-jesec/default.nix | 57 + .../pkgs/tools/networking/phodav/default.nix | 2 +- .../tools/networking/polygraph/default.nix | 2 +- .../pkgs/tools/networking/qrcp/default.nix | 4 +- .../pkgs/tools/networking/siege/default.nix | 7 +- .../tools/networking/slirp4netns/default.nix | 7 +- .../tools/networking/sniffglue/default.nix | 6 +- .../tools/networking/tcpreplay/default.nix | 12 +- .../networking/telepresence2/default.nix | 28 + .../tools/networking/tinyproxy/default.nix | 44 +- .../pkgs/tools/networking/tnat64/default.nix | 37 + .../tools/networking/tracebox/default.nix | 2 +- .../pkgs/tools/networking/unbound/default.nix | 5 + .../pkgs/tools/networking/v2ray/default.nix | 14 +- .../networking/wireguard-tools/default.nix | 4 +- .../tools/nix/nixos-install-tools/default.nix | 67 + .../package-management/auditwheel/default.nix | 56 + .../cargo-about/default.nix | 4 +- .../package-management/cargo-deb/default.nix | 3 +- .../cargo-release/default.nix | 6 +- .../createrepo_c/default.nix | 20 +- .../fix-bash-completion-path.patch | 22 +- .../fix-python-install-path.patch | 14 +- .../disnix/DisnixWebService/default.nix | 6 +- .../package-management/disnix/default.nix | 10 +- .../disnix/disnixos/default.nix | 6 +- .../disnix/dydisnix/default.nix | 17 +- .../disnix/dysnomia/default.nix | 36 +- .../tools/package-management/dpkg/default.nix | 4 +- .../package-management/libdnf/default.nix | 4 +- .../tools/package-management/nix/default.nix | 28 +- .../nix/enable-all-experimental.patch | 14 + .../nix/enable-flakes.patch | 14 + .../tools/package-management/nvd/default.nix | 32 + .../protontricks/default.nix | 11 +- .../protontricks/steam-run.patch | 101 +- .../pkgs/tools/security/afl/default.nix | 2 +- .../tools/security/bitwarden_rs/default.nix | 4 +- .../pkgs/tools/security/crunch/default.nix | 2 +- .../pkgs/tools/security/doppler/default.nix | 4 +- .../pkgs/tools/security/expliot/default.nix | 4 +- .../pkgs/tools/security/fido2luks/default.nix | 2 +- .../pkgs/tools/security/gencfsm/default.nix | 36 +- .../pkgs/tools/security/gitleaks/default.nix | 4 +- .../pkgs/tools/security/hashcat/default.nix | 6 +- .../pkgs/tools/security/hcxtools/default.nix | 4 +- .../pkgs/tools/security/hologram/default.nix | 2 +- .../pkgs/tools/security/httpx/default.nix | 6 +- .../pkgs/tools/security/ipscan/default.nix | 4 +- .../pkgs/tools/security/kbs2/default.nix | 10 +- .../pkgs/tools/security/libacr38u/default.nix | 5 +- .../pkgs/tools/security/metasploit/Gemfile | 2 +- .../tools/security/metasploit/Gemfile.lock | 57 +- .../tools/security/metasploit/default.nix | 4 +- .../pkgs/tools/security/metasploit/gemset.nix | 88 +- .../pkgs/tools/security/nuclei/default.nix | 6 +- .../tools/security/onioncircuits/default.nix | 4 +- .../pkgs/tools/security/sequoia/default.nix | 10 +- .../tools/security/sheesy-cli/default.nix | 37 + .../pkgs/tools/security/sudo/default.nix | 4 +- .../pkgs/tools/security/terrascan/default.nix | 6 +- .../pkgs/tools/security/vault/vault-bin.nix | 2 +- .../pkgs/tools/system/bottom/default.nix | 25 +- .../pkgs/tools/system/fakeroot/default.nix | 12 + .../pkgs/tools/system/fancy-motd/default.nix | 47 + .../nixpkgs/pkgs/tools/system/gdu/default.nix | 16 +- .../pkgs/tools/system/gptman/default.nix | 4 +- .../pkgs/tools/system/netdata/default.nix | 14 +- .../pkgs/tools/system/netdata/go.d.plugin.nix | 8 +- .../netdata/no-files-in-etc-and-var.patch | 58 +- .../pkgs/tools/system/ps_mem/default.nix | 2 +- .../pkgs/tools/text/chroma/default.nix | 2 +- .../nixpkgs/pkgs/tools/text/dcs/default.nix | 6 +- .../pkgs/tools/text/diffutils/default.nix | 5 +- .../pkgs/tools/text/fastmod/default.nix | 3 +- .../pkgs/tools/text/gtranslator/default.nix | 12 +- .../pkgs/tools/text/highlight/default.nix | 4 +- .../pkgs/tools/text/jumanpp/default.nix | 10 +- .../pkgs/tools/text/poedit/default.nix | 14 +- .../nixpkgs/pkgs/tools/text/shfmt/default.nix | 6 +- .../nixpkgs/pkgs/tools/text/wrap/default.nix | 36 + .../tools/text/xml/html-xml-utils/default.nix | 4 +- .../tools/typesetting/pdf2djvu/default.nix | 10 + .../tools/typesetting/skribilo/default.nix | 83 +- .../pkgs/tools/typesetting/ted/default.nix | 4 +- .../tools/typesetting/tex/auctex/default.nix | 20 +- .../tools/typesetting/tex/texlive/bin.nix | 8 +- .../pkgs/tools/video/gopro/default.nix | 4 +- .../pkgs/tools/video/rav1e/default.nix | 2 +- .../pkgs/tools/video/swftools/default.nix | 26 +- .../google-compute-engine-oslogin/default.nix | 8 +- .../nixpkgs/pkgs/top-level/aliases.nix | 25 + .../nixpkgs/pkgs/top-level/all-packages.nix | 1165 +- .../nixpkgs/pkgs/top-level/beam-packages.nix | 16 + .../nixpkgs/pkgs/top-level/coq-packages.nix | 16 +- .../pkgs/top-level/darwin-packages.nix | 67 +- .../pkgs/top-level/dotnet-packages.nix | 3 - .../pkgs/top-level/haskell-packages.nix | 8 +- .../nixpkgs/pkgs/top-level/ocaml-packages.nix | 13 +- .../nixpkgs/pkgs/top-level/perl-packages.nix | 206 +- .../nixpkgs/pkgs/top-level/php-packages.nix | 2 + .../pkgs/top-level/python-packages.nix | 210 +- .../pkgs/top-level/python2-packages.nix | 8 +- .../nixpkgs/pkgs/top-level/qt5-packages.nix | 4 + .../pkgs/top-level/release-haskell.nix | 279 + third_party/nixpkgs/pkgs/top-level/static.nix | 2 +- 3247 files changed, 98787 insertions(+), 50318 deletions(-) create mode 100644 third_party/nixpkgs/doc/languages-frameworks/dhall.section.md create mode 100755 third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs create mode 100755 third_party/nixpkgs/maintainers/scripts/haskell/mark-broken.sh create mode 100755 third_party/nixpkgs/maintainers/scripts/haskell/regenerate-hackage-packages.sh create mode 100755 third_party/nixpkgs/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh create mode 100644 third_party/nixpkgs/maintainers/scripts/haskell/transitive-broken-packages.nix create mode 100755 third_party/nixpkgs/maintainers/scripts/haskell/update-cabal2nix-unstable.sh create mode 100755 third_party/nixpkgs/maintainers/scripts/haskell/update-hackage.sh create mode 100755 third_party/nixpkgs/maintainers/scripts/haskell/update-stackage.sh delete mode 100644 third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix delete mode 100644 third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image-raspberrypi4-installer.nix delete mode 100644 third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix create mode 100644 third_party/nixpkgs/nixos/modules/programs/noisetorch.nix delete mode 100644 third_party/nixpkgs/nixos/modules/security/apparmor-suid.nix create mode 100644 third_party/nixpkgs/nixos/modules/security/apparmor/includes.nix create mode 100644 third_party/nixpkgs/nixos/modules/security/apparmor/profiles.nix rename third_party/nixpkgs/nixos/modules/services/desktops/{gnome3 => gnome}/at-spi2-core.nix (72%) rename third_party/nixpkgs/nixos/modules/services/desktops/{gnome3 => gnome}/chrome-gnome-shell.nix (74%) rename third_party/nixpkgs/nixos/modules/services/desktops/{gnome3 => gnome}/evolution-data-server.nix (67%) rename third_party/nixpkgs/nixos/modules/services/desktops/{gnome3 => gnome}/glib-networking.nix (61%) rename third_party/nixpkgs/nixos/modules/services/desktops/{gnome3 => gnome}/gnome-initial-setup.nix (83%) rename third_party/nixpkgs/nixos/modules/services/desktops/{gnome3 => gnome}/gnome-keyring.nix (55%) rename third_party/nixpkgs/nixos/modules/services/desktops/{gnome3 => gnome}/gnome-online-accounts.nix (66%) rename third_party/nixpkgs/nixos/modules/services/desktops/{gnome3 => gnome}/gnome-online-miners.nix (50%) create mode 100644 third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix rename third_party/nixpkgs/nixos/modules/services/desktops/{gnome3 => gnome}/gnome-settings-daemon.nix (74%) rename third_party/nixpkgs/nixos/modules/services/desktops/{gnome3 => gnome}/gnome-user-share.nix (51%) rename third_party/nixpkgs/nixos/modules/services/desktops/{gnome3 => gnome}/rygel.nix (53%) rename third_party/nixpkgs/nixos/modules/services/desktops/{gnome3 => gnome}/sushi.nix (52%) rename third_party/nixpkgs/nixos/modules/services/desktops/{gnome3 => gnome}/tracker-miners.nix (68%) rename third_party/nixpkgs/nixos/modules/services/desktops/{gnome3 => gnome}/tracker.nix (69%) delete mode 100644 third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix rename third_party/nixpkgs/nixos/modules/services/misc/{matrix-dendrite.nix => dendrite.nix} (81%) create mode 100644 third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/ghostunnel.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/system/self-deploy.nix rename third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/{gnome3.nix => gnome.nix} (67%) create mode 100644 third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.xml create mode 100644 third_party/nixpkgs/nixos/tests/apparmor.nix create mode 100644 third_party/nixpkgs/nixos/tests/atop.nix create mode 100644 third_party/nixpkgs/nixos/tests/dendrite.nix create mode 100644 third_party/nixpkgs/nixos/tests/ghostunnel.nix rename third_party/nixpkgs/nixos/tests/{gnome3-xorg.nix => gnome-xorg.nix} (94%) rename third_party/nixpkgs/nixos/tests/{gnome3.nix => gnome.nix} (93%) create mode 100644 third_party/nixpkgs/nixos/tests/installed-tests/librsvg.nix create mode 100644 third_party/nixpkgs/nixos/tests/libreswan.nix create mode 100644 third_party/nixpkgs/nixos/tests/opensmtpd-rspamd.nix create mode 100644 third_party/nixpkgs/nixos/tests/sway.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/chia/dependencies.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/ethabi.nix create mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/ethabi/add-Cargo-lock.patch create mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/ethabi/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/skia-externals.json rename third_party/nixpkgs/pkgs/applications/graphics/{meme => meme-image-generator}/default.nix (62%) delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15142.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15143.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15144.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15145.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-18804.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/djvulibre/fix_hongfuzz_crash.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/nimbo/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/overmind/deps.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/timew-sync-server/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/fix-home.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix create mode 100755 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/db-reencryption-wrapper.py delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/nym/ignore-networking-tests.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/fix-go-mod-deps.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/soju/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/ledger-autosync/fix-ofxparse-dependency.patch create mode 100644 third_party/nixpkgs/pkgs/applications/office/timeline/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/radio/ebook2cw/Makefile.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/fs-fixes.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/science/logic/petrinizer/z3.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/math/eukleides/use-CC.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/math/pari/rnfdisc.patch create mode 100644 third_party/nixpkgs/pkgs/applications/video/aegisub/update-ffms2.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/video/avxsynth/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/video/kino/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-v4l1.patch create mode 100644 third_party/nixpkgs/pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch create mode 100644 third_party/nixpkgs/pkgs/applications/video/prism/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/recapp/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/linux-5-11.patch create mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/cardboard/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/stumpwm/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/stumpwm/fix-module-path.patch create mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/wio/wlroots-0.13.patch create mode 100644 third_party/nixpkgs/pkgs/build-support/replace-secret/replace-secret.nix create mode 100755 third_party/nixpkgs/pkgs/build-support/replace-secret/replace-secret.py create mode 100644 third_party/nixpkgs/pkgs/build-support/replace-secret/test/expected_long_output create mode 100644 third_party/nixpkgs/pkgs/build-support/replace-secret/test/expected_short_output create mode 100644 third_party/nixpkgs/pkgs/build-support/replace-secret/test/input_file create mode 100644 third_party/nixpkgs/pkgs/build-support/replace-secret/test/passwd create mode 100644 third_party/nixpkgs/pkgs/build-support/replace-secret/test/rsa create mode 100644 third_party/nixpkgs/pkgs/build-support/trivial-builders/test.nix create mode 100755 third_party/nixpkgs/pkgs/build-support/trivial-builders/test.sh create mode 100644 third_party/nixpkgs/pkgs/build-support/trivial-builders/test/invoke-writeDirectReferencesToFile.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/trivial-builders/test/invoke-writeReferencesToFile.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/trivial-builders/test/sample.nix create mode 100644 third_party/nixpkgs/pkgs/data/misc/fedora-backgrounds/f34-fix-xfce-path.patch create mode 100644 third_party/nixpkgs/pkgs/data/misc/hackage/pin.json delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/core/baobab/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix delete mode 100755 third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-chess/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-robots/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/games/swell-foop/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/accerciser/default.nix (91%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/cheese/default.nix (77%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/file-roller/default.nix (65%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/gedit/default.nix (82%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/ghex/default.nix (94%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/gnome-books/default.nix (76%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/gnome-boxes/default.nix (84%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/gnome-calendar/default.nix (65%) create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/gnome-characters/default.nix (80%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/gnome-clocks/default.nix (85%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/gnome-connections/default.nix (66%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/gnome-documents/default.nix (95%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/gnome-logs/default.nix (92%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/gnome-maps/default.nix (74%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/gnome-music/default.nix (84%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/gnome-nettool/default.nix (82%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/gnome-notes/default.nix (73%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/gnome-power-manager/default.nix (89%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/gnome-sound-recorder/default.nix (79%) create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-todo/default.nix rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/gnome-weather/default.nix (58%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/polari/default.nix (91%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/polari/make-thumbnailer-wrappable.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/seahorse/default.nix (77%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/apps/vinagre/default.nix (76%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/adwaita-icon-theme/default.nix (72%) create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/core/baobab/default.nix rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/caribou/default.nix (90%) create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/core/dconf-editor/default.nix rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/empathy/default.nix (96%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/eog/default.nix (83%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/epiphany/default.nix (82%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/evince/default.nix (90%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/evolution-data-server/default.nix (88%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/evolution-data-server/fix-paths.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/evolution-data-server/hardcode-gsettings.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gdm/default.nix (86%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gdm/fix-paths.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gdm/gdm-session-worker_forward-vars.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gdm/gdm-x-session_extra_args.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gdm/gdm-x-session_session-wrapper.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gdm/org.gnome.login-screen.gschema.override (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gdm/reset-environment.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-color-manager/default.nix (92%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-common/default.nix (80%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-contacts/default.nix (81%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-control-center/default.nix (82%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-control-center/paths.patch (80%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-desktop/bubblewrap-paths.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/default.nix rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-dictionary/default.nix (50%) create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-font-viewer/default.nix (73%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-initial-setup/0001-fix-paths.patch (79%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-initial-setup/default.nix (78%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-initial-setup/vendor.conf (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-keyring/default.nix (63%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-online-miners/default.nix (96%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-remote-desktop/default.nix (72%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-screenshot/default.nix (72%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-session/ctl.nix (79%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-session/default.nix (73%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-session/fix-paths.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-settings-daemon/default.nix (90%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-settings-daemon/fix-paths.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-settings-daemon/global-backlight-helper.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-shell-extensions/default.nix (65%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-shell-extensions/fix_gmenu.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-shell/default.nix (85%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-shell/fix-paths.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-shell/shew-gir-path.patch (87%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-shell/wrap-services.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-software/default.nix (86%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-software/fix-paths.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-system-monitor/default.nix (53%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-terminal/default.nix (74%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-themes-extra/default.nix (78%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-tour/default.nix (81%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gnome-user-share/default.nix (96%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/gucharmap/default.nix (97%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/libgnome-keyring/default.nix (85%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/mutter/3.34/0002-drop-inheritable.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/mutter/3.34/0003-Fix-glitches-in-gala.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/mutter/3.34/0007-fix-paths.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/mutter/3.34/default.nix (99%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/mutter/default.nix (88%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/mutter/drop-inheritable.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/mutter/fix-paths.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/nautilus/default.nix (83%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/nautilus/extension_dir.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/nautilus/fix-paths.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/rygel/add-option-for-installation-sysconfdir.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/rygel/default.nix (94%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/simple-scan/default.nix (83%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/sushi/default.nix (89%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/totem/default.nix (95%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/yelp-xsl/default.nix (74%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/yelp/default.nix (67%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/core/zenity/default.nix (90%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/default.nix (96%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/devtools/anjuta/default.nix (84%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/devtools/devhelp/default.nix (79%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/devtools/gnome-devel-docs/default.nix (58%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/EasyScreenCast/default.nix (89%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/EasyScreenCast/fix-gi-path.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/appindicator/default.nix (85%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/arcmenu/default.nix (90%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/arcmenu/fix_gmenu.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/caffeine/default.nix (83%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/chrome-gnome-shell/default.nix (91%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/clipboard-indicator/default.nix (65%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/clock-override/default.nix (90%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/dash-to-dock/default.nix (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/dash-to-panel/default.nix (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/disable-unredirect/default.nix (82%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/draw-on-your-screen/default.nix (88%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/drop-down-terminal/default.nix (93%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/drop-down-terminal/fix_vte_and_gjs.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/dynamic-panel-transparency/default.nix (77%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/emoji-selector/default.nix (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/freon/default.nix (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/fuzzy-app-search/default.nix (67%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/gsconnect/default.nix (93%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/gsconnect/fix-paths.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/gsconnect/installed-tests-path.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/extensions/hot-edge/default.nix rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/icon-hider/default.nix (81%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/impatience/default.nix (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/material-shell/default.nix (91%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/mpris-indicator-button/default.nix (84%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/night-theme-switcher/default.nix (89%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/no-title-bar/default.nix (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/no-title-bar/fix-paths.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/noannoyance/default.nix (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/paperwm/default.nix (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/pidgin-im-integration/default.nix (87%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/remove-dropdown-arrows/default.nix (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/sound-output-device-chooser/default.nix (76%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/sound-output-device-chooser/fix-paths.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/system-monitor/default.nix (80%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/system-monitor/paths_and_nonexisting_dirs.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/taskwhisperer/default.nix (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/taskwhisperer/fix-paths.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/tilingnome/default.nix (90%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/timepp/default.nix (95%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/topicons-plus/default.nix (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/unite/default.nix (89%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/window-corner-preview/default.nix (86%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/window-is-ready-remover/default.nix (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/extensions/workspace-matrix/default.nix (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/find-latest-version.py (63%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/games/aisleriot/default.nix (85%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/games/atomix/default.nix (84%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/games/five-or-more/default.nix (80%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/games/four-in-a-row/default.nix (81%) create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-chess/default.nix rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/games/gnome-klotski/default.nix (75%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/games/gnome-mahjongg/default.nix (82%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/games/gnome-mines/default.nix (67%) create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-nibbles/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-robots/default.nix rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/games/gnome-sudoku/default.nix (76%) create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-taquin/default.nix rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/games/gnome-tetravex/default.nix (78%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/games/hitori/default.nix (92%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/games/iagno/default.nix (59%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/games/lightsoff/default.nix (67%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/games/quadrapassel/default.nix (84%) create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/games/swell-foop/default.nix rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/games/tali/default.nix (66%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/installer.nix (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/misc/geary/default.nix (78%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/misc/gitg/default.nix (87%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/misc/gnome-applets/default.nix (84%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/misc/gnome-autoar/default.nix (77%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/misc/gnome-flashback/default.nix (96%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/misc/gnome-packagekit/default.nix (90%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/misc/gnome-panel/default.nix (88%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/misc/gnome-screensaver/fix-dbus-service-dir.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/misc/gnome-tweaks/default.nix (66%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/misc/gpaste/default.nix (95%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/misc/gpaste/fix-paths.patch (97%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/misc/gtkhtml/default.nix (73%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/misc/libgnome-games-support/default.nix (80%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/misc/metacity/default.nix (84%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/misc/metacity/fix-paths.patch (100%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/misc/nautilus-python/default.nix (90%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/misc/pomodoro/default.nix (89%) rename third_party/nixpkgs/pkgs/desktops/{gnome-3 => gnome}/update.nix (88%) create mode 100644 third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-sdk.nix create mode 100644 third_party/nixpkgs/pkgs/development/beam-modules/build-mix.nix create mode 100644 third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix create mode 100644 third_party/nixpkgs/pkgs/development/beam-modules/rebar3-nix/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/avian/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/gcc/gnat-cflags-11.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/julia/1.0-bin.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0003-nix-Skip-chown-tests-broken-in-sandbox.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/10/clang/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++abi/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/10/libunwind/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/10/lld/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/10/lldb/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/gnu-install-dirs-polly.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt/normalize-var.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/libunwind/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/gnu-install-dirs-polly.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/gnu-install-dirs.patch rename third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/{compiler-rt-X86-support-extension.patch => X86-support-extension.patch} (100%) rename third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/{compiler-rt-armv7l.patch => armv7l.patch} (100%) rename third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/{compiler-rt-codesign.patch => codesign.patch} (100%) create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/normalize-var.patch rename third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/{libcxxabi-wasm.patch => wasm.patch} (100%) create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/12/libunwind/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/12/lld/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch rename third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/{lldb-procfs.patch => procfs.patch} (100%) create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/resource-dir.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/gnu-install-dirs-polly.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/gnu-install-dirs.patch rename third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/{llvm-outputs.patch => outputs.patch} (100%) create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/5/clang/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/5/lld/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/5/lldb/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs-polly.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/6/clang/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/6/lld/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/6/lldb/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/gnu-install-dirs-polly.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/7/clang/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/7/clang/unwindlib.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/7/libunwind/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/7/libunwind/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/7/lld/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/7/lldb/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs-polly.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/gnu-install-dirs.patch rename third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/{clang-xpc.patch => xpc.patch} (100%) create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/8/libunwind/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/8/lld/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/gnu-install-dirs-polly.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/9/clang/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++abi/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/9/libunwind/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/9/lld/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/gnu-install-dirs-polly.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/gnu-install-dirs.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/solc/0.7.nix create mode 100644 third_party/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/coq-modules/autosubst/0001-changes-to-work-with-Coq-8.6.patch create mode 100644 third_party/nixpkgs/pkgs/development/coq-modules/goedel/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/coq-modules/hydra-battles/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/coq-modules/pocklington/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/coq-modules/relation-algebra/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix create mode 100644 third_party/nixpkgs/pkgs/development/haskell-modules/configuration-arm.nix create mode 100644 third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix delete mode 100644 third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml create mode 100644 third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml create mode 100644 third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml create mode 100644 third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml create mode 100644 third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml create mode 100644 third_party/nixpkgs/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch delete mode 100644 third_party/nixpkgs/pkgs/development/idris-modules/data.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/erlang/R24.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/lfe/fix-rebar-config.patch delete mode 100644 third_party/nixpkgs/pkgs/development/interpreters/lfe/no-test-deps.patch create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/lua-5/5.4.darwin.patch delete mode 100644 third_party/nixpkgs/pkgs/development/interpreters/lua-5/liblua.so.patch rename third_party/nixpkgs/pkgs/development/interpreters/lua-5/{lua-5.3-dso.make => lua-dso.make} (50%) delete mode 100644 third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/applet-window-buttons/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/cairomm/1.16.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/fcl/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/ffmpeg/v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/ghc_filesystem/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/giflib/libungif.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/icu/69.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libccd/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/mauikit-filebrowsing/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/nss/3.44.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/nss/85_security_load-3.44.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/octomap/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/openslide/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/pangomm/2.48.nix rename third_party/nixpkgs/pkgs/development/libraries/physics/{fastnlo => fastnlo_toolkit}/default.nix (69%) create mode 100644 third_party/nixpkgs/pkgs/development/libraries/presage/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/presage/fixed-cppunit-detection.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/protobuf/3.16.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qca-qt5/move-project.patch rename third_party/nixpkgs/pkgs/development/libraries/readline/{8.0.nix => 8.1.nix} (85%) delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/readline/readline-8.0-patches.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/readline/readline-8.1-patches.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/tachyon/darwin.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/tracker/fix-docs.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/tracker/i686-tracker-fix.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/usrsctp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/agutil.nix create mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/arrows.nix create mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-environments.nix create mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-gobject-introspection.nix create mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl.nix create mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-dispatch.nix create mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-arguments.nix create mode 100644 third_party/nixpkgs/pkgs/development/misc/msp430/mspds/binary.nix create mode 100644 third_party/nixpkgs/pkgs/development/misc/msp430/mspds/bsl430.patch create mode 100644 third_party/nixpkgs/pkgs/development/misc/msp430/mspds/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs-nss/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.0.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.1.2.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/makefile-no-opam.patch delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/git/cohttp-mirage.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/git/paf.nix create mode 100644 third_party/nixpkgs/pkgs/development/perl-modules/TextBibTeX-use-lib-on-aarch64.patch create mode 100644 third_party/nixpkgs/pkgs/development/php-packages/deployer/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aioamqp/compat-pamqp-3.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aiopg/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aioymaps/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ansible/base.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ansible/collections.nix rename third_party/nixpkgs/pkgs/development/python-modules/ansible/{default.nix => legacy.nix} (92%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/castepxbin/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/chiabip158/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/clvm-tools/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/clvm/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/colored-traceback/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/concurrent-log-handler/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/coqpit/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dawg-python/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/debut/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/decopatch/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/deltachat/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/django-pipeline/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dotmap/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/fpyutils/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/glcontext/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ha-philipsjs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/hdate/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/hsluv/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/humblewx/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/i2c-tools/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/jxmlease/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/fix-testsuite.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ldaptor/19.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/linkify-it-py/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/matplotlib/setup-darwin.cfg delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/matplotlib/setup.cfg create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/md-toc/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mdit-py-plugins/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/motioneye-client/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mutesync/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/myjwt/pinning.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ovoenergy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pathy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/prayer-times-calculator/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/py-canary/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/py-dmidecode/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/py-ubjson/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pycflow2dot/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pydelijn/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pygatt/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyialarm/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyjwt/1.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pykoplenti/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pymeteireann/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pymorphy2/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pymorphy2/dicts-ru.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyobihai/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pysvg-py3/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/find-pycairo-with-pkg-config.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytomlpp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyxb/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/rst2ansi/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/rtoml/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{scikitlearn => scikit-learn}/0.20.nix (100%) rename third_party/nixpkgs/pkgs/development/python-modules/{scikitlearn => scikit-learn}/default.nix (80%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sip/4.x.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sip/5.x.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/slimit/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/spacy-pkuseg/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/annotate.py create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tappy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/telfhash/telfhash-new-tlsh-hash.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/timeago/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ttp/templates.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/uc-micro-py/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/webssh/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/xgboost/lib-path-for-python.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/async-profiler/0001-Fix-darwin-build.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/ats-acc/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/bacon/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/boost-build/darwin-default-toolset.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/global-plugins.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix delete mode 100755 third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap create mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/skip-plugins.patch mode change 100644 => 100755 third_party/nixpkgs/pkgs/development/tools/clang-tools/wrapper create mode 100644 third_party/nixpkgs/pkgs/development/tools/earthly/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/evans/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/ccache/env-instead-of-compgen.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/jiq/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/mix2nix/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/ignore-rustfmt-test.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/rustup-toolchain-install-master/0001-dynamically-patchelf-binaries.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/fetch-source.nix delete mode 100755 third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/generate.sh create mode 100644 third_party/nixpkgs/pkgs/games/0ad/rootdir_env.patch delete mode 100644 third_party/nixpkgs/pkgs/games/privateer/0001-fix-VSFile-constructor.patch delete mode 100644 third_party/nixpkgs/pkgs/games/privateer/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/steam-tui/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/zod/0002-add-scaling-factor-to-source.patch create mode 100644 third_party/nixpkgs/pkgs/misc/emulators/caprice32/string.patch create mode 100644 third_party/nixpkgs/pkgs/misc/t-rec/default.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/default.nix rename third_party/nixpkgs/pkgs/os-specific/bsd/{netbsd/builder.sh => setup-hook.sh} (89%) create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/apparmor/fix-rc.apparmor.functions.sh delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/builder.sh delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/default.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.12-xstate-fp.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-kcl_str.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-mtrr.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-preempt.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-sep_printf.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-page_cache_release-put_page.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/patch-samples.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/atop/atop.service.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/atop/atopacct.service.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/atop/fix-paths.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/hid-nintendo/default.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kbd/search-paths.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.12.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/netatop/fix-paths.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/netatop/netatop.service.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch rename third_party/nixpkgs/pkgs/servers/{matrix-dendrite => dendrite}/default.nix (83%) delete mode 100644 third_party/nixpkgs/pkgs/servers/http/couchdb/2.0.0.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/http/couchdb/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/http/couchdb/jsapi.patch create mode 100644 third_party/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.2.patch create mode 100644 third_party/nixpkgs/pkgs/servers/irc/solanum/bandb.patch create mode 100644 third_party/nixpkgs/pkgs/servers/jellyfin/node-composition.nix create mode 100644 third_party/nixpkgs/pkgs/servers/jellyfin/node-deps.nix create mode 100644 third_party/nixpkgs/pkgs/servers/jellyfin/nuget-deps.nix create mode 100755 third_party/nixpkgs/pkgs/servers/jellyfin/update.sh create mode 100755 third_party/nixpkgs/pkgs/servers/jellyfin/web-update.sh create mode 100644 third_party/nixpkgs/pkgs/servers/jellyfin/web.nix create mode 100644 third_party/nixpkgs/pkgs/servers/mail/opensmtpd/filter-rspamd.nix create mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/icinga2/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/icinga2/etc-icinga2.patch create mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/icinga2/no-systemd-service.patch create mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/icinga2/no-var-directories.patch delete mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix create mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/prometheus/kea-exporter.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json_deps.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix create mode 100644 third_party/nixpkgs/pkgs/servers/reproxy/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/rt/dont-check-users_groups.patch create mode 100644 third_party/nixpkgs/pkgs/servers/unpackerr/default.nix create mode 100644 third_party/nixpkgs/pkgs/shells/hilbish/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/haskell/default.nix rename third_party/nixpkgs/pkgs/test/{haskell-documentationTarball => haskell/documentationTarball}/default.nix (100%) create mode 100644 third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/Bar.hs create mode 100644 third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/Foo.hs create mode 100644 third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/Setup.hs create mode 100644 third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal rename third_party/nixpkgs/pkgs/test/{haskell-shellFor => haskell/shellFor}/default.nix (67%) create mode 100644 third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/add-missing-import.patch create mode 100644 third_party/nixpkgs/pkgs/tools/archivers/quickbms/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch create mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/install-adls.patch create mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/graphics/mangohud/combined.nix create mode 100644 third_party/nixpkgs/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch create mode 100644 third_party/nixpkgs/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch create mode 100644 third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/atuin/default.nix rename third_party/nixpkgs/pkgs/{development/tools/rust/cargo-insta => tools/misc/bottom-rs}/cargo-lock.patch (53%) create mode 100644 third_party/nixpkgs/pkgs/tools/misc/bottom-rs/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/fx_cast/node-env.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/fx_cast/node-packages.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/fx_cast/package-lock.json create mode 100644 third_party/nixpkgs/pkgs/tools/misc/fx_cast/package.json create mode 100644 third_party/nixpkgs/pkgs/tools/misc/goss/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/minipro/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/wlc/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/xcd/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/yafetch/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/calendar-cli/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/curl/7.74.0-CVE-2021-22876.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/curl/7.74.0-CVE-2021-22890.patch create mode 100644 third_party/nixpkgs/pkgs/tools/networking/ghostunnel/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/ipinfo/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/example.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/tnat64/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/package-management/auditwheel/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/package-management/nix/enable-all-experimental.patch create mode 100644 third_party/nixpkgs/pkgs/tools/package-management/nix/enable-flakes.patch create mode 100644 third_party/nixpkgs/pkgs/tools/package-management/nvd/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/sheesy-cli/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/system/fancy-motd/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/wrap/default.nix create mode 100644 third_party/nixpkgs/pkgs/top-level/release-haskell.nix diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index fc116b32d5..256abac7b4 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -79,11 +79,13 @@ /pkgs/development/tools/poetry2nix @adisbladis # Haskell -/pkgs/development/compilers/ghc @cdepillabout @sternenseemann -/pkgs/development/haskell-modules @cdepillabout @sternenseemann -/pkgs/development/haskell-modules/default.nix @cdepillabout @sternenseemann -/pkgs/development/haskell-modules/generic-builder.nix @cdepillabout @sternenseemann -/pkgs/development/haskell-modules/hoogle.nix @cdepillabout @sternenseemann +/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn +/maintainers/scripts/haskell @cdepillabout @sternenseemann @maralorn +/pkgs/development/compilers/ghc @cdepillabout @sternenseemann @maralorn +/pkgs/development/haskell-modules @cdepillabout @sternenseemann @maralorn +/pkgs/test/haskell @cdepillabout @sternenseemann @maralorn +/pkgs/top-level/release-haskell.nix @cdepillabout @sternenseemann @maralorn +/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn # Perl /pkgs/development/interpreters/perl @volth @stigtsp diff --git a/third_party/nixpkgs/.github/labeler.yml b/third_party/nixpkgs/.github/labeler.yml index 1b0392692e..5dd885552d 100644 --- a/third_party/nixpkgs/.github/labeler.yml +++ b/third_party/nixpkgs/.github/labeler.yml @@ -36,11 +36,11 @@ "6.topic: GNOME": - doc/languages-frameworks/gnome.section.md - - nixos/modules/services/desktops/gnome3/**/* - - nixos/modules/services/x11/desktop-managers/gnome3.nix - - nixos/tests/gnome3-xorg.nix - - nixos/tests/gnome3.nix - - pkgs/desktops/gnome-3/**/* + - nixos/modules/services/desktops/gnome/**/* + - nixos/modules/services/x11/desktop-managers/gnome.nix + - nixos/tests/gnome-xorg.nix + - nixos/tests/gnome.nix + - pkgs/desktops/gnome/**/* "6.topic: golang": - doc/languages-frameworks/go.section.md @@ -50,10 +50,13 @@ "6.topic: haskell": - doc/languages-frameworks/haskell.section.md + - maintainers/scripts/haskell/**/* - pkgs/development/compilers/ghc/**/* - pkgs/development/haskell-modules/**/* - pkgs/development/tools/haskell/**/* + - pkgs/test/haskell/**/* - pkgs/top-level/haskell-packages.nix + - pkgs/top-level/release-haskell.nix "6.topic: kernel": - pkgs/build-support/kernel/**/* diff --git a/third_party/nixpkgs/.github/workflows/merge-staging.yml b/third_party/nixpkgs/.github/workflows/merge-staging.yml index 1aadef1632..f28c2ddfc7 100644 --- a/third_party/nixpkgs/.github/workflows/merge-staging.yml +++ b/third_party/nixpkgs/.github/workflows/merge-staging.yml @@ -14,6 +14,7 @@ jobs: - uses: actions/checkout@v2 - name: Merge master into staging-next + id: staging_next uses: devmasx/merge-branch@v1.3.1 with: type: now @@ -22,6 +23,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} - name: Merge staging-next into staging + id: staging uses: devmasx/merge-branch@v1.3.1 with: type: now @@ -35,5 +37,5 @@ jobs: with: issue-number: 105153 body: | - An automatic merge [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). + An automatic merge${{ (steps.staging_next.outcome == 'failure' && ' from master to staging-next') || ((steps.staging.outcome == 'failure' && ' from staging-next to staging') || '') }} [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). diff --git a/third_party/nixpkgs/doc/builders/special/mkshell.section.md b/third_party/nixpkgs/doc/builders/special/mkshell.section.md index 1feb75cbd6..8a62c50e17 100644 --- a/third_party/nixpkgs/doc/builders/special/mkshell.section.md +++ b/third_party/nixpkgs/doc/builders/special/mkshell.section.md @@ -1,15 +1,17 @@ # pkgs.mkShell {#sec-pkgs-mkShell} -`pkgs.mkShell` is a special kind of derivation that is only useful when using it combined with `nix-shell`. It will in fact fail to instantiate when invoked with `nix-build`. +`pkgs.mkShell` is a special kind of derivation that is only useful when using +it combined with `nix-shell`. It will in fact fail to instantiate when invoked +with `nix-build`. ## Usage {#sec-pkgs-mkShell-usage} ```nix { pkgs ? import {} }: pkgs.mkShell { - # this will make all the build inputs from hello and gnutar - # available to the shell environment + # specify which packages to add to the shell environment + packages = [ pkgs.gnumake ]; + # add all the dependencies, of the given packages, to the shell environment inputsFrom = with pkgs; [ hello gnutar ]; - buildInputs = [ pkgs.gnumake ]; } ``` diff --git a/third_party/nixpkgs/doc/builders/trivial-builders.chapter.md b/third_party/nixpkgs/doc/builders/trivial-builders.chapter.md index 32944567c0..bc1317cc49 100644 --- a/third_party/nixpkgs/doc/builders/trivial-builders.chapter.md +++ b/third_party/nixpkgs/doc/builders/trivial-builders.chapter.md @@ -50,3 +50,50 @@ Many more commands wrap `writeTextFile` including `writeText`, `writeTextDir`, ` ## `symlinkJoin` {#trivial-builder-symlinkJoin} This can be used to put many derivations into the same directory structure. It works by creating a new derivation and adding symlinks to each of the paths listed. It expects two arguments, `name`, and `paths`. `name` is the name used in the Nix store path for the created derivation. `paths` is a list of paths that will be symlinked. These paths can be to Nix store derivations or any other subdirectory contained within. + +## `writeReferencesToFile` {#trivial-builder-writeReferencesToFile} + +Writes the closure of transitive dependencies to a file. + +This produces the equivalent of `nix-store -q --requisites`. + +For example, + +```nix +writeReferencesToFile (writeScriptBin "hi" ''${hello}/bin/hello'') +``` + +produces an output path `/nix/store/-runtime-deps` containing + +```nix +/nix/store/-hello-2.10 +/nix/store/-hi +/nix/store/-libidn2-2.3.0 +/nix/store/-libunistring-0.9.10 +/nix/store/-glibc-2.32-40 +``` + +You can see that this includes `hi`, the original input path, +`hello`, which is a direct reference, but also +the other paths that are indirectly required to run `hello`. + +## `writeDirectReferencesToFile` {#trivial-builder-writeDirectReferencesToFile} + +Writes the set of references to the output file, that is, their immediate dependencies. + +This produces the equivalent of `nix-store -q --references`. + +For example, + +```nix +writeDirectReferencesToFile (writeScriptBin "hi" ''${hello}/bin/hello'') +``` + +produces an output path `/nix/store/-runtime-references` containing + +```nix +/nix/store/-hello-2.10 +``` + +but none of `hello`'s dependencies, because those are not referenced directly +by `hi`'s output. diff --git a/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md index e12db53ee3..6076460b89 100644 --- a/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md +++ b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md @@ -169,6 +169,18 @@ }) ``` +- Unnecessary string conversions should be avoided. Do + + ```nix + rev = version; + ``` + + instead of + + ```nix + rev = "${version}"; + ``` + - Arguments should be listed in the order they are used, with the exception of `lib`, which always goes first. - The top-level `lib` must be used in the master and 21.05 branch over its alias `stdenv.lib` as it now causes evaluation errors when aliases are disabled which is the case for ofborg. diff --git a/third_party/nixpkgs/doc/functions/library/attrsets.xml b/third_party/nixpkgs/doc/functions/library/attrsets.xml index de8414249a..912d6d4779 100644 --- a/third_party/nixpkgs/doc/functions/library/attrsets.xml +++ b/third_party/nixpkgs/doc/functions/library/attrsets.xml @@ -855,7 +855,7 @@ lib.attrsets.mapAttrs' (name: value: lib.attrsets.nameValuePair ("foo_" + name) <function>lib.attrsets.mapAttrsToList</function> mapAttrsToList :: (String -> Any -> Any) -> - AttrSet -> Any + AttrSet -> [Any] diff --git a/third_party/nixpkgs/doc/languages-frameworks/beam.section.md b/third_party/nixpkgs/doc/languages-frameworks/beam.section.md index b5d39595c1..2a4753a119 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/beam.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/beam.section.md @@ -24,12 +24,18 @@ Many Erlang/OTP distributions available in `beam.interpreters` have versions wit We provide a version of Rebar3, under `rebar3`. We also provide a helper to fetch Rebar3 dependencies from a lockfile under `fetchRebar3Deps`. +We also provide a version on Rebar3 with plugins included, under `rebar3WithPlugins`. This package is a function which takes two arguments: `plugins`, a list of nix derivations to include as plugins (loaded only when specified in `rebar.config`), and `globalPlugins`, which should always be loaded by rebar3. Example: `rebar3WithPlugins { globalPlugins = [beamPackages.pc]; }`. + +When adding a new plugin it is important that the `packageName` attribute is the same as the atom used by rebar3 to refer to the plugin. + ### Mix & Erlang.mk {#build-tools-other} Erlang.mk works exactly as expected. There is a bootstrap process that needs to be run, which is supported by the `buildErlangMk` derivation. For Elixir applications use `mixRelease` to make a release. See examples for more details. +There is also a `buildMix` helper, whose behavior is closer to that of `buildErlangMk` and `buildRebar3`. The primary difference is that mixRelease makes a release, while buildMix only builds the package, making it useful for libraries and other dependencies. + ## How to Install BEAM Packages {#how-to-install-beam-packages} BEAM builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users. To install any of those builders into your profile, refer to them by their attribute path `beamPackages.rebar3`: diff --git a/third_party/nixpkgs/doc/languages-frameworks/dhall.section.md b/third_party/nixpkgs/doc/languages-frameworks/dhall.section.md new file mode 100644 index 0000000000..d1adcbf736 --- /dev/null +++ b/third_party/nixpkgs/doc/languages-frameworks/dhall.section.md @@ -0,0 +1,432 @@ +# Dhall {#sec-language-dhall} + +The Nixpkgs support for Dhall assumes some familiarity with Dhall's language +support for importing Dhall expressions, which is documented here: + +* [`dhall-lang.org` - Installing packages](https://docs.dhall-lang.org/tutorials/Language-Tour.html#installing-packages) + +## Remote imports {#ssec-dhall-remote-imports} + +Nixpkgs bypasses Dhall's support for remote imports using Dhall's +semantic integrity checks. Specifically, any Dhall import can be protected by +an integrity check like: + +```dhall +https://prelude.dhall-lang.org/v20.1.0/package.dhall + sha256:26b0ef498663d269e4dc6a82b0ee289ec565d683ef4c00d0ebdd25333a5a3c98 +``` + +… and if the import is cached then the interpreter will load the import from +cache instead of fetching the URL. + +Nixpkgs uses this trick to add all of a Dhall expression's dependencies into the +cache so that the Dhall interpreter never needs to resolve any remote URLs. In +fact, Nixpkgs uses a Dhall interpreter with remote imports disabled when +packaging Dhall expressions to enforce that the interpreter never resolves a +remote import. This means that Nixpkgs only supports building Dhall expressions +if all of their remote imports are protected by semantic integrity checks. + +Instead of remote imports, Nixpkgs uses Nix to fetch remote Dhall code. For +example, the Prelude Dhall package uses `pkgs.fetchFromGitHub` to fetch the +`dhall-lang` repository containing the Prelude. Relying exclusively on Nix +to fetch Dhall code ensures that Dhall packages built using Nix remain pure and +also behave well when built within a sandbox. + +## Packaging a Dhall expression from scratch {#ssec-dhall-packaging-expression} + +We can illustrate how Nixpkgs integrates Dhall by beginning from the following +trivial Dhall expression with one dependency (the Prelude): + +```dhall +-- ./true.dhall + +let Prelude = https://prelude.dhall-lang.org/v20.1.0/package.dhall + +in Prelude.Bool.not False +``` + +As written, this expression cannot be built using Nixpkgs because the +expression does not protect the Prelude import with a semantic integrity +check, so the first step is to freeze the expression using `dhall freeze`, +like this: + +```bash +$ dhall freeze --inplace ./true.dhall +``` + +… which gives us: + +```dhall +-- ./true.dhall + +let Prelude = + https://prelude.dhall-lang.org/v20.1.0/package.dhall + sha256:26b0ef498663d269e4dc6a82b0ee289ec565d683ef4c00d0ebdd25333a5a3c98 + +in Prelude.Bool.not False +``` + +To package that expression, we create a `./true.nix` file containing the +following specification for the Dhall package: + +```nix +# ./true.nix + +{ buildDhallPackage, Prelude }: + +buildDhallPackage { + name = "true"; + code = ./true.dhall; + dependencies = [ Prelude ]; + source = true; +} +``` + +… and we complete the build by incorporating that Dhall package into the +`pkgs.dhallPackages` hierarchy using an overlay, like this: + +```nix +# ./example.nix + +let + nixpkgs = builtins.fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/94b2848559b12a8ed1fe433084686b2a81123c99.tar.gz"; + sha256 = "1pbl4c2dsaz2lximgd31m96jwbps6apn3anx8cvvhk1gl9rkg107"; + }; + + dhallOverlay = self: super: { + true = self.callPackage ./true.nix { }; + }; + + overlay = self: super: { + dhallPackages = super.dhallPackages.override (old: { + overrides = + self.lib.composeExtensions (old.overrides or (_: _: {})) dhallOverlay; + }); + }; + + pkgs = import nixpkgs { config = {}; overlays = [ overlay ]; }; + +in + pkgs +``` + +… which we can then build using this command: + +```bash +$ nix build --file ./example.nix dhallPackages.true +``` + +## Contents of a Dhall package {#ssec-dhall-package-contents} + +The above package produces the following directory tree: + +```bash +$ tree -a ./result +result +├── .cache +│   └── dhall +│   └── 122027abdeddfe8503496adeb623466caa47da5f63abd2bc6fa19f6cfcb73ecfed70 +├── binary.dhall +└── source.dhall +``` + +… where: + +* `source.dhall` contains the result of interpreting our Dhall package: + + ```bash + $ cat ./result/source.dhall + True + ``` + +* The `.cache` subdirectory contains one binary cache product encoding the + same result as `source.dhall`: + + ```bash + $ dhall decode < ./result/.cache/dhall/122027abdeddfe8503496adeb623466caa47da5f63abd2bc6fa19f6cfcb73ecfed70 + True + ``` + +* `binary.dhall` contains a Dhall expression which handles fetching and decoding + the same cache product: + + ```bash + $ cat ./result/binary.dhall + missing sha256:27abdeddfe8503496adeb623466caa47da5f63abd2bc6fa19f6cfcb73ecfed70 + $ cp -r ./result/.cache .cache + + $ chmod -R u+w .cache + + $ XDG_CACHE_HOME=.cache dhall --file ./result/binary.dhall + True + ``` + +The `source.dhall` file is only present for packages that specify +`source = true;`. By default, Dhall packages omit the `source.dhall` in order +to conserve disk space when they are used exclusively as dependencies. For +example, if we build the Prelude package it will only contain the binary +encoding of the expression: + +```bash +$ nix build --file ./example.nix dhallPackages.Prelude + +$ tree -a result +result +├── .cache +│   └── dhall +│   └── 122026b0ef498663d269e4dc6a82b0ee289ec565d683ef4c00d0ebdd25333a5a3c98 +└── binary.dhall + +2 directories, 2 files +``` + +Typically, you only specify `source = true;` for the top-level Dhall expression +of interest (such as our example `true.nix` Dhall package). However, if you +wish to specify `source = true` for all Dhall packages, then you can amend the +Dhall overlay like this: + +```nix + dhallOverrides = self: super: { + # Enable source for all Dhall packages + buildDhallPackage = + args: super.buildDhallPackage (args // { source = true; }); + + true = self.callPackage ./true.nix { }; + }; +``` + +… and now the Prelude will contain the fully decoded result of interpreting +the Prelude: + +```bash +$ nix build --file ./example.nix dhallPackages.Prelude + +$ tree -a result +result +├── .cache +│   └── dhall +│   └── 122026b0ef498663d269e4dc6a82b0ee289ec565d683ef4c00d0ebdd25333a5a3c98 +├── binary.dhall +└── source.dhall + +$ cat ./result/source.dhall +{ Bool = + { and = + \(_ : List Bool) -> + List/fold Bool _ Bool (\(_ : Bool) -> \(_ : Bool) -> _@1 && _) True + , build = \(_ : Type -> _ -> _@1 -> _@2) -> _ Bool True False + , even = + \(_ : List Bool) -> + List/fold Bool _ Bool (\(_ : Bool) -> \(_ : Bool) -> _@1 == _) True + , fold = + \(_ : Bool) -> +… +``` + +## Packaging functions {#ssec-dhall-packaging-functions} + +We already saw an example of using `buildDhallPackage` to create a Dhall +package from a single file, but most Dhall packages consist of more than one +file and there are two derived utilities that you may find more useful when +packaging multiple files: + +* `buildDhallDirectoryPackage` - build a Dhall package from a local directory + +* `buildDhallGitHubPackage` - build a Dhall package from a GitHub repository + +The `buildDhallPackage` is the lowest-level function and accepts the following +arguments: + +* `name`: The name of the derivation + +* `dependencies`: Dhall dependencies to build and cache ahead of time + +* `code`: The top-level expression to build for this package + + Note that the `code` field accepts an arbitrary Dhall expression. You're + not limited to just a file. + +* `source`: Set to `true` to include the decoded result as `source.dhall` in the + build product, at the expense of requiring more disk space + +* `documentationRoot`: Set to the root directory of the package if you want + `dhall-docs` to generate documentation underneath the `docs` subdirectory of + the build product + +The `buildDhallDirectoryPackage` is a higher-level function implemented in terms +of `buildDhallPackage` that accepts the following arguments: + +* `name`: Same as `buildDhallPackage` + +* `dependencies`: Same as `buildDhallPackage` + +* `source`: Same as `buildDhallPackage` + +* `src`: The directory containing Dhall code that you want to turn into a Dhall + package + +* `file`: The top-level file (`package.dhall` by default) that is the entrypoint + to the rest of the package + +* `document`: Set to `true` to generate documentation for the package + +The `buildDhallGitHubPackage` is another higher-level function implemented in +terms of `buildDhallPackage` that accepts the following arguments: + +* `name`: Same as `buildDhallPackage` + +* `dependencies`: Same as `buildDhallPackage` + +* `source`: Same as `buildDhallPackage` + +* `owner`: The owner of the repository + +* `repo`: The repository name + +* `rev`: The desired revision (or branch, or tag) + +* `directory`: The subdirectory of the Git repository to package (if a + directory other than the root of the repository) + +* `file`: The top-level file (`${directory}/package.dhall` by default) that is + the entrypoint to the rest of the package + +* `document`: Set to `true` to generate documentation for the package + +Additionally, `buildDhallGitHubPackage` accepts the same arguments as +`fetchFromGitHub`, such as `sha256` or `fetchSubmodules`. + +## `dhall-to-nixpkgs` {#ssec-dhall-dhall-to-nixpkgs} + +You can use the `dhall-to-nixpkgs` command-line utility to automate +packaging Dhall code. For example: + +```bash +$ nix-env --install --attr haskellPackages.dhall-nixpkgs + +$ nix-env --install --attr nix-prefetch-git # Used by dhall-to-nixpkgs + +$ dhall-to-nixpkgs github https://github.com/Gabriel439/dhall-semver.git +{ buildDhallGitHubPackage, Prelude }: + buildDhallGitHubPackage { + name = "dhall-semver"; + githubBase = "github.com"; + owner = "Gabriel439"; + repo = "dhall-semver"; + rev = "2d44ae605302ce5dc6c657a1216887fbb96392a4"; + fetchSubmodules = false; + sha256 = "0y8shvp8srzbjjpmnsvz9c12ciihnx1szs0yzyi9ashmrjvd0jcz"; + directory = ""; + file = "package.dhall"; + source = false; + document = false; + dependencies = [ (Prelude.overridePackage { file = "package.dhall"; }) ]; + } +``` + +The utility takes care of automatically detecting remote imports and converting +them to package dependencies. You can also use the utility on local +Dhall directories, too: + +```bash +$ dhall-to-nixpkgs directory ~/proj/dhall-semver +{ buildDhallDirectoryPackage, Prelude }: + buildDhallDirectoryPackage { + name = "proj"; + src = /Users/gabriel/proj/dhall-semver; + file = "package.dhall"; + source = false; + document = false; + dependencies = [ (Prelude.overridePackage { file = "package.dhall"; }) ]; + } +``` + +## Overriding dependency versions {#ssec-dhall-overriding-dependency-versions} + +Suppose that we change our `true.dhall` example expression to depend on an older +version of the Prelude (19.0.0): + +```dhall +-- ./true.dhall + +let Prelude = + https://prelude.dhall-lang.org/v19.0.0/package.dhall + sha256:eb693342eb769f782174157eba9b5924cf8ac6793897fc36a31ccbd6f56dafe2 + +in Prelude.Bool.not False +``` + +If we try to rebuild that expression the build will fail: + +``` +$ nix build --file ./example.nix dhallPackages.true +builder for '/nix/store/0f1hla7ff1wiaqyk1r2ky4wnhnw114fi-true.drv' failed with exit code 1; last 10 log lines: + + Dhall was compiled without the 'with-http' flag. + + The requested URL was: https://prelude.dhall-lang.org/v19.0.0/package.dhall + + + 4│ https://prelude.dhall-lang.org/v19.0.0/package.dhall + 5│ sha256:eb693342eb769f782174157eba9b5924cf8ac6793897fc36a31ccbd6f56dafe2 + + /nix/store/rsab4y99h14912h4zplqx2iizr5n4rc2-true.dhall:4:7 +[1 built (1 failed), 0.0 MiB DL] +error: build of '/nix/store/0f1hla7ff1wiaqyk1r2ky4wnhnw114fi-true.drv' failed +``` + +… because the default Prelude selected by Nixpkgs revision +`94b2848559b12a8ed1fe433084686b2a81123c99is` is version 20.1.0, which doesn't +have the same integrity check as version 19.0.0. This means that version +19.0.0 is not cached and the interpreter is not allowed to fall back to +importing the URL. + +However, we can override the default Prelude version by using `dhall-to-nixpkgs` +to create a Dhall package for our desired Prelude: + +```bash +$ dhall-to-nixpkgs github https://github.com/dhall-lang/dhall-lang.git \ + --name Prelude \ + --directory Prelude \ + --rev v19.0.0 \ + > Prelude.nix +``` + +… and then referencing that package in our Dhall overlay, by either overriding +the Prelude globally for all packages, like this: + +```bash + dhallOverrides = self: super: { + true = self.callPackage ./true.nix { }; + + Prelude = self.callPackage ./Prelude.nix { }; + }; +``` + +… or selectively overriding the Prelude dependency for just the `true` package, +like this: + +```bash + dhallOverrides = self: super: { + true = self.callPackage ./true.nix { + Prelude = self.callPackage ./Prelude.nix { }; + }; + }; +``` + +## Overrides {#ssec-dhall-overrides} + +You can override any of the arguments to `buildDhallGitHubPackage` or +`buildDhallDirectoryPackage` using the `overridePackage` attribute of a package. +For example, suppose we wanted to selectively enable `source = true` just for the Prelude. We can do that like this: + +```nix + dhallOverrides = self: super: { + Prelude = super.Prelude.overridePackage { source = true; }; + + … + }; +``` + +[semantic-integrity-checks]: https://docs.dhall-lang.org/tutorials/Language-Tour.html#installing-packages diff --git a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md index 36369fd4e6..725ffd4bec 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md @@ -10,7 +10,7 @@ with import {}; mkShell { name = "dotnet-env"; - buildInputs = [ + packages = [ dotnet-sdk_3 ]; } @@ -25,7 +25,7 @@ with import {}; mkShell { name = "dotnet-env"; - buildInputs = [ + packages = [ (with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_3_0 diff --git a/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md b/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md index 00bd524b0c..732b529cc2 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md @@ -68,7 +68,7 @@ preFixup = '' Fortunately, there is [`wrapGAppsHook`]{#ssec-gnome-hooks-wrapgappshook}. It works in conjunction with other setup hooks that populate environment variables, and it will then wrap all executables in `bin` and `libexec` directories using said variables. -For convenience, it also adds `dconf.lib` for a GIO module implementing a GSettings backend using `dconf`, `gtk3` for GSettings schemas, and `librsvg` for GdkPixbuf loader to the closure. In case you are packaging a program without a graphical interface, you might want to use [`wrapGAppsNoGuiHook`]{#ssec-gnome-hooks-wrapgappsnoguihook}, which runs the same script as `wrapGAppsHook` but does not bring `gtk3` and `librsvg` into the closure. +For convenience, it also adds `dconf.lib` for a GIO module implementing a GSettings backend using `dconf`, `gtk3` for GSettings schemas, and `librsvg` for GdkPixbuf loader to the closure. There is also [`wrapGAppsHook4`]{#ssec-gnome-hooks-wrapgappshook4}, which replaces GTK 3 with GTK 4. And in case you are packaging a program without a graphical interface, you might want to use [`wrapGAppsNoGuiHook`]{#ssec-gnome-hooks-wrapgappsnoguihook}, which runs the same script as `wrapGAppsHook` but does not bring `gtk3` and `librsvg` into the closure. - `wrapGAppsHook` itself will add the package’s `share` directory to `XDG_DATA_DIRS`. @@ -88,7 +88,7 @@ For convenience, it also adds `dconf.lib` for a GIO module implementing a GSetti The setup hook [currently](https://github.com/NixOS/nixpkgs/issues/56943) does not work in expressions with `strictDeps` enabled, like Python packages. In those cases, you will need to disable it with `strictDeps = false;`. ::: -- []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `gnome3.grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGAppsHook`. +- []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGAppsHook`. You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs` in `preFixup` hook: @@ -105,7 +105,7 @@ preFixup = '' ## Updating GNOME packages {#ssec-gnome-updating} -Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is therefore possible to update to latest source tarball by running `nix-shell maintainers/scripts/update.nix --argstr package gnome3.nautilus` or even en masse with `nix-shell maintainers/scripts/update.nix --argstr path gnome3`. Read the package’s `NEWS` file to see what changed. +Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is therefore possible to update to latest source tarball by running `nix-shell maintainers/scripts/update.nix --argstr package gnome.nautilus` or even en masse with `nix-shell maintainers/scripts/update.nix --argstr path gnome`. Read the package’s `NEWS` file to see what changed. ## Frequently encountered issues {#ssec-gnome-common-issues} diff --git a/third_party/nixpkgs/doc/languages-frameworks/index.xml b/third_party/nixpkgs/doc/languages-frameworks/index.xml index 4d07d2b524..791afce6f5 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/index.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/index.xml @@ -11,6 +11,7 @@ + diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md index 96ac61ab54..b466748f54 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md @@ -245,7 +245,7 @@ let ps.toolz ]); in mkShell { - buildInputs = [ + packages = [ pythonEnv black diff --git a/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md b/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md index c519d79d3d..b8fc19eb6b 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md @@ -106,7 +106,7 @@ let name = "gems-for-some-project"; gemdir = ./.; }; -in mkShell { buildInputs = [ gems gems.wrappedRuby ]; } +in mkShell { packages = [ gems gems.wrappedRuby ]; } ``` With this file in your directory, you can run `nix-shell` to build and use the gems. The important parts here are `bundlerEnv` and `wrappedRuby`. diff --git a/third_party/nixpkgs/lib/attrsets.nix b/third_party/nixpkgs/lib/attrsets.nix index 0ce3aaeca4..5c787940cb 100644 --- a/third_party/nixpkgs/lib/attrsets.nix +++ b/third_party/nixpkgs/lib/attrsets.nix @@ -243,6 +243,10 @@ rec { /* Call a function for each attribute in the given set and return the result in a list. + Type: + mapAttrsToList :: + (String -> a -> b) -> AttrSet -> [b] + Example: mapAttrsToList (name: value: name + value) { x = "a"; y = "b"; } diff --git a/third_party/nixpkgs/lib/customisation.nix b/third_party/nixpkgs/lib/customisation.nix index 37a7951896..c17cb0d0f8 100644 --- a/third_party/nixpkgs/lib/customisation.nix +++ b/third_party/nixpkgs/lib/customisation.nix @@ -219,16 +219,17 @@ rec { /* Like the above, but aims to support cross compilation. It's still ugly, but hopefully it helps a little bit. */ - makeScopeWithSplicing = splicePackages: newScope: otherSplices: keep: f: + makeScopeWithSplicing = splicePackages: newScope: otherSplices: keep: extra: f: let - spliced = splicePackages { + spliced0 = splicePackages { pkgsBuildBuild = otherSplices.selfBuildBuild; pkgsBuildHost = otherSplices.selfBuildHost; pkgsBuildTarget = otherSplices.selfBuildTarget; pkgsHostHost = otherSplices.selfHostHost; pkgsHostTarget = self; # Not `otherSplices.selfHostTarget`; pkgsTargetTarget = otherSplices.selfTargetTarget; - } // keep self; + }; + spliced = extra spliced0 // spliced0 // keep self; self = f self // { newScope = scope: newScope (spliced // scope); callPackage = newScope spliced; # == self.newScope {}; @@ -239,6 +240,7 @@ rec { newScope otherSplices keep + extra (lib.fixedPoints.extends g f); packages = f; }; diff --git a/third_party/nixpkgs/lib/meta.nix b/third_party/nixpkgs/lib/meta.nix index 2e83c4247d..bc04394dcf 100644 --- a/third_party/nixpkgs/lib/meta.nix +++ b/third_party/nixpkgs/lib/meta.nix @@ -87,4 +87,16 @@ rec { then { system = elem; } else { parsed = elem; }; in lib.matchAttrs pattern platform; + + /* Check if a package is available on a given platform. + + A package is available on a platform if both + + 1. One of `meta.platforms` pattern matches the given platform. + + 2. None of `meta.badPlatforms` pattern matches the given platform. + */ + availableOn = platform: pkg: + lib.any (platformMatch platform) pkg.meta.platforms && + lib.all (elem: !platformMatch platform elem) (pkg.meta.badPlatforms or []); } diff --git a/third_party/nixpkgs/lib/modules.nix b/third_party/nixpkgs/lib/modules.nix index d515ee24d1..99b9a8a31e 100644 --- a/third_party/nixpkgs/lib/modules.nix +++ b/third_party/nixpkgs/lib/modules.nix @@ -23,6 +23,7 @@ let isAttrs isBool isFunction + isList isString length mapAttrs @@ -127,7 +128,7 @@ rec { let collected = collectModules (specialArgs.modulesPath or "") (modules ++ [ internalModule ]) - ({ inherit lib options config; } // specialArgs); + ({ inherit lib options config specialArgs; } // specialArgs); in mergeModules prefix (reverseList collected); options = merged.matchedOptions; @@ -188,6 +189,9 @@ rec { loadModule = args: fallbackFile: fallbackKey: m: if isFunction m || isAttrs m then unifyModuleSyntax fallbackFile fallbackKey (applyIfFunction fallbackKey m args) + else if isList m then + let defs = [{ file = fallbackFile; value = m; }]; in + throw "Module imports can't be nested lists. Perhaps you meant to remove one level of lists? Definitions: ${showDefs defs}" else unifyModuleSyntax (toString m) (toString m) (applyIfFunction (toString m) (import m) args); /* @@ -295,13 +299,11 @@ rec { # a module will resolve strictly the attributes used as argument but # not their values. The values are forwarding the result of the # evaluation of the option. - requiredArgs = builtins.attrNames (lib.functionArgs f); context = name: ''while evaluating the module argument `${name}' in "${key}":''; - extraArgs = builtins.listToAttrs (map (name: { - inherit name; - value = builtins.addErrorContext (context name) - (args.${name} or config._module.args.${name}); - }) requiredArgs); + extraArgs = builtins.mapAttrs (name: _: + builtins.addErrorContext (context name) + (args.${name} or config._module.args.${name}) + ) (lib.functionArgs f); # Note: we append in the opposite order such that we can add an error # context on the explicited arguments of "args" too. This update diff --git a/third_party/nixpkgs/lib/strings.nix b/third_party/nixpkgs/lib/strings.nix index 2e502588bf..49fa0196a0 100644 --- a/third_party/nixpkgs/lib/strings.nix +++ b/third_party/nixpkgs/lib/strings.nix @@ -659,7 +659,7 @@ rec { Example: isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11/bin/python" => false - isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11/" + isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11" => true isStorePath pkgs.python => true @@ -667,7 +667,7 @@ rec { => false */ isStorePath = x: - if isCoercibleToString x then + if !(isList x) && isCoercibleToString x then let str = toString x; in substring 0 1 str == "/" && dirOf str == storeDir diff --git a/third_party/nixpkgs/lib/systems/parse.nix b/third_party/nixpkgs/lib/systems/parse.nix index a06ac0d11f..accaeb652d 100644 --- a/third_party/nixpkgs/lib/systems/parse.nix +++ b/third_party/nixpkgs/lib/systems/parse.nix @@ -121,15 +121,20 @@ rec { js = { bits = 32; significantByte = littleEndian; family = "js"; }; }; - # Determine where two CPUs are compatible with each other. That is, - # can we run code built for system b on system a? For that to - # happen, then the set of all possible possible programs that system - # b accepts must be a subset of the set of all programs that system - # a accepts. This compatibility relation forms a category where each - # CPU is an object and each arrow from a to b represents - # compatibility. CPUs with multiple modes of Endianness are - # isomorphic while all CPUs are endomorphic because any program - # built for a CPU can run on that CPU. + # Determine when two CPUs are compatible with each other. That is, + # can code built for system B run on system A? For that to happen, + # the programs that system B accepts must be a subset of the + # programs that system A accepts. + # + # We have the following properties of the compatibility relation, + # which must be preserved when adding compatibility information for + # additional CPUs. + # - (reflexivity) + # Every CPU is compatible with itself. + # - (transitivity) + # If A is compatible with B and B is compatible with C then A is compatible with C. + # - (compatible under multiple endianness) + # CPUs with multiple modes of endianness are pairwise compatible. isCompatible = a: b: with cpuTypes; lib.any lib.id [ # x86 (b == i386 && isCompatible a i486) diff --git a/third_party/nixpkgs/lib/tests/modules.sh b/third_party/nixpkgs/lib/tests/modules.sh index 2eddeec07b..2e57c2f8e2 100755 --- a/third_party/nixpkgs/lib/tests/modules.sh +++ b/third_party/nixpkgs/lib/tests/modules.sh @@ -175,6 +175,9 @@ checkConfigOutput "true" config.submodule.config ./declare-submoduleWith-noshort ## submoduleWith should merge all modules in one swoop checkConfigOutput "true" config.submodule.inner ./declare-submoduleWith-modules.nix checkConfigOutput "true" config.submodule.outer ./declare-submoduleWith-modules.nix +# Should also be able to evaluate the type name (which evaluates freeformType, +# which evaluates all the modules defined by the type) +checkConfigOutput "submodule" options.submodule.type.description ./declare-submoduleWith-modules.nix ## Paths should be allowed as values and work as expected checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.nix diff --git a/third_party/nixpkgs/lib/tests/modules/declare-submoduleWith-modules.nix b/third_party/nixpkgs/lib/tests/modules/declare-submoduleWith-modules.nix index 4736ab4175..a8b82d1768 100644 --- a/third_party/nixpkgs/lib/tests/modules/declare-submoduleWith-modules.nix +++ b/third_party/nixpkgs/lib/tests/modules/declare-submoduleWith-modules.nix @@ -8,9 +8,6 @@ default = false; }; } - { - outer = true; - } ]; }; default = {}; @@ -25,6 +22,7 @@ }) { inner = true; + outer = true; } ]; } diff --git a/third_party/nixpkgs/lib/types.nix b/third_party/nixpkgs/lib/types.nix index 31ce440bcb..f47a1f92de 100644 --- a/third_party/nixpkgs/lib/types.nix +++ b/third_party/nixpkgs/lib/types.nix @@ -147,9 +147,13 @@ rec { , # The deprecation message to display when this type is used by an option # If null, the type isn't deprecated deprecationMessage ? null + , # The types that occur in the definition of this type. This is used to + # issue deprecation warnings recursively. Can also be used to reuse + # nested types + nestedTypes ? {} }: { _type = "option-type"; - inherit name check merge emptyValue getSubOptions getSubModules substSubModules typeMerge functor deprecationMessage; + inherit name check merge emptyValue getSubOptions getSubModules substSubModules typeMerge functor deprecationMessage nestedTypes; description = if description == null then name else description; }; @@ -256,14 +260,14 @@ rec { }; u8 = unsign 8 256; u16 = unsign 16 65536; - # the biggest int a 64-bit Nix accepts is 2^63 - 1 (9223372036854775808), for a 32-bit Nix it is 2^31 - 1 (2147483647) - # the smallest int a 64-bit Nix accepts is -2^63 (-9223372036854775807), for a 32-bit Nix it is -2^31 (-2147483648) - # u32 = unsign 32 4294967296; + # the biggest int Nix accepts is 2^63 - 1 (9223372036854775808) + # the smallest int Nix accepts is -2^63 (-9223372036854775807) + u32 = unsign 32 4294967296; # u64 = unsign 64 18446744073709551616; s8 = sign 8 256; s16 = sign 16 65536; - # s32 = sign 32 4294967296; + s32 = sign 32 4294967296; }; # Alias of u16 for a port number @@ -365,6 +369,7 @@ rec { getSubModules = elemType.getSubModules; substSubModules = m: listOf (elemType.substSubModules m); functor = (defaultFunctor name) // { wrapped = elemType; }; + nestedTypes.elemType = elemType; }; nonEmptyListOf = elemType: @@ -389,6 +394,7 @@ rec { getSubModules = elemType.getSubModules; substSubModules = m: attrsOf (elemType.substSubModules m); functor = (defaultFunctor name) // { wrapped = elemType; }; + nestedTypes.elemType = elemType; }; # A version of attrsOf that's lazy in its values at the expense of @@ -413,6 +419,7 @@ rec { getSubModules = elemType.getSubModules; substSubModules = m: lazyAttrsOf (elemType.substSubModules m); functor = (defaultFunctor name) // { wrapped = elemType; }; + nestedTypes.elemType = elemType; }; # TODO: drop this in the future: @@ -421,6 +428,7 @@ rec { deprecationMessage = "Mixing lists with attribute values is no longer" + " possible; please use `types.attrsOf` instead. See" + " https://github.com/NixOS/nixpkgs/issues/1800 for the motivation."; + nestedTypes.elemType = elemType; }; # Value of given type but with no merging (i.e. `uniq list`s are not concatenated). @@ -433,6 +441,7 @@ rec { getSubModules = elemType.getSubModules; substSubModules = m: uniq (elemType.substSubModules m); functor = (defaultFunctor name) // { wrapped = elemType; }; + nestedTypes.elemType = elemType; }; # Null or value of ... @@ -451,6 +460,7 @@ rec { getSubModules = elemType.getSubModules; substSubModules = m: nullOr (elemType.substSubModules m); functor = (defaultFunctor name) // { wrapped = elemType; }; + nestedTypes.elemType = elemType; }; functionTo = elemType: mkOptionType { @@ -535,6 +545,9 @@ rec { substSubModules = m: submoduleWith (attrs // { modules = m; }); + nestedTypes = lib.optionalAttrs (freeformType != null) { + freeformType = freeformType; + }; functor = defaultFunctor name // { type = types.submoduleWith; payload = { @@ -596,6 +609,8 @@ rec { then functor.type mt1 mt2 else null; functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; }; + nestedTypes.left = t1; + nestedTypes.right = t2; }; # Any of the types in the given list @@ -627,6 +642,8 @@ rec { substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m); typeMerge = t1: t2: null; functor = (defaultFunctor name) // { wrapped = finalType; }; + nestedTypes.coercedType = coercedType; + nestedTypes.finalType = finalType; }; # Obsolete alternative to configOf. It takes its option diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index e9d5e81114..cfd8a8918d 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -428,6 +428,12 @@ githubId = 782180; name = "Alex Vorobiev"; }; + alex-eyre = { + email = "A.Eyre@sms.ed.ac.uk"; + github = "alex-eyre"; + githubId = 38869148; + name = "Alex Eyre"; + }; algorith = { email = "dries_van_daele@telenet.be"; name = "Dries Van Daele"; @@ -1316,6 +1322,12 @@ github = "bmilanov"; githubId = 30090366; }; + bmwalters = { + name = "Bradley Walters"; + email = "oss@walters.app"; + github = "bmwalters"; + githubId = 4380777; + }; bobakker = { email = "bobakk3r@gmail.com"; github = "bobakker"; @@ -1382,12 +1394,6 @@ githubId = 302429; name = "Marton Boros"; }; - branwright1 = { - email = "branwright@protonmail.com"; - github = "branwright1"; - githubId = 71175207; - name = "Brandon Wright"; - }; bramd = { email = "bram@bramd.nl"; github = "bramd"; @@ -2505,6 +2511,12 @@ githubId = 1316469; name = "Naomi Morse"; }; + dlesl = { + email = "dlesl@dlesl.com"; + github = "dlesl"; + githubId = 28980797; + name = "David Leslie"; + }; dmalikov = { email = "malikov.d.y@gmail.com"; github = "dmalikov"; @@ -3345,6 +3357,12 @@ githubId = 10799507; name = "Karl Fischer"; }; + fitzgibbon = { + name = "Niall FitzGibbon"; + email = "fitzgibbon.niall@gmail.com"; + github = "fitzgibbon"; + githubId = 617048; + }; Flakebi = { email = "flakebi@t-online.de"; github = "Flakebi"; @@ -3579,6 +3597,12 @@ githubId = 606000; name = "Gabriel Adomnicai"; }; + Gabriel439 = { + email = "Gabriel439@gmail.com"; + github = "Gabriel439"; + githubId = 1313787; + name = "Gabriel Gonzalez"; + }; gal_bolle = { email = "florent.becker@ens-lyon.org"; github = "FlorentBecker"; @@ -3703,12 +3727,6 @@ githubId = 1447245; name = "Robin Gloster"; }; - gnidorah = { - email = "gnidorah@users.noreply.github.com"; - github = "gnidorah"; - githubId = 12064730; - name = "gnidorah"; - }; gnxlxnxx = { email = "gnxlxnxx@web.de"; github = "gnxlxnxx"; @@ -4133,6 +4151,12 @@ githubId = 12491746; name = "Masato Yonekawa"; }; + hyzual = { + email = "hyzual@gmail.com"; + github = "Hyzual"; + githubId = 2051507; + name = "Joris Masson"; + }; hzeller = { email = "h.zeller@acm.org"; github = "hzeller"; @@ -4753,12 +4777,6 @@ githubId = 1102396; name = "Jussi Maki"; }; - joaquinito2051 = { - email = "joaquinito2051@gmail.com"; - github = "heroku-miraheze"; - githubId = 61781343; - name = "Joaquín Rufo Gutierrez"; - }; jobojeha = { email = "jobojeha@jeppener.de"; github = "jobojeha"; @@ -4999,7 +5017,7 @@ name = "Julien Dehos"; }; julm = { - email = "julm+nix@sourcephile.fr"; + email = "julm+nixpkgs@sourcephile.fr"; github = "ju1m"; githubId = 21160136; name = "Julien Moutinho"; @@ -5874,6 +5892,12 @@ githubId = 10626; name = "Andreas Wagner"; }; + lromor = { + email = "leonardo.romor@gmail.com"; + github = "lromor"; + githubId = 1597330; + name = "Leonardo Romor"; + }; lrworth = { email = "luke@worth.id.au"; name = "Luke Worth"; @@ -6080,6 +6104,12 @@ githubId = 2914269; name = "Malo Bourgon"; }; + malvo = { + email = "malte@malvo.org"; + github = "malte-v"; + githubId = 34393802; + name = "Malte Voos"; + }; malyn = { email = "malyn@strangeGizmo.com"; github = "malyn"; @@ -6374,6 +6404,12 @@ fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; }]; }; + mdsp = { + github = "Mdsp9070"; + githubId = 44469426; + name = "Matheus de Souza Pessanha"; + email = "matheus_pessanha2001@outlook.com"; + }; meatcar = { email = "nixpkgs@denys.me"; github = "meatcar"; @@ -7013,12 +7049,6 @@ githubId = 1222539; name = "Roman Naumann"; }; - nand0p = { - email = "nando@hex7.com"; - github = "nand0p"; - githubId = 1916245; - name = "Fernando Jose Pando"; - }; nasirhm = { email = "nasirhussainm14@gmail.com"; github = "nasirhm"; @@ -7195,6 +7225,16 @@ githubId = 16385648; name = "Niko Pavlinek"; }; + nixbitcoin = { + email = "nixbitcoin@i2pmail.org"; + github = "nixbitcoin"; + githubId = 45737139; + name = "nixbitcoindev"; + keys = [{ + longkeyid = "rsa4096/0xDD11F9AD5308B3BA"; + fingerprint = "577A 3452 7F3E 2A85 E80F E164 DD11 F9AD 5308 B3BA"; + }]; + }; nixinator = { email = "33lockdown33@protonmail.com"; github = "nixinator"; @@ -7249,6 +7289,12 @@ githubId = 40049608; name = "Andy Chun"; }; + noreferences = { + email = "norkus@norkus.net"; + github = "noreferences"; + githubId = 13085275; + name = "Juozas Norkus"; + }; norfair = { email = "syd@cs-syd.eu"; github = "NorfairKing"; @@ -7301,6 +7347,12 @@ githubId = 1839979; name = "Niklas Thörne"; }; + nullx76 = { + email = "nix@xirion.net"; + github = "NULLx76"; + githubId = 1809198; + name = "Victor Roest"; + }; numinit = { email = "me@numin.it"; github = "numinit"; @@ -7417,6 +7469,12 @@ githubId = 1538622; name = "Michael Reilly"; }; + onsails = { + email = "andrey@onsails.com"; + github = "onsails"; + githubId = 107261; + name = "Andrey Kuznetsov"; + }; onny = { email = "onny@project-insanity.org"; github = "onny"; @@ -7679,12 +7737,6 @@ githubId = 152312; name = "Periklis Tsirakidis"; }; - pesterhazy = { - email = "pesterhazy@gmail.com"; - github = "pesterhazy"; - githubId = 106328; - name = "Paulus Esterhazy"; - }; petabyteboy = { email = "milan@petabyte.dev"; github = "petabyteboy"; @@ -11425,6 +11477,16 @@ github = "pulsation"; githubId = 1838397; }; + ydlr = { + name = "ydlr"; + email = "ydlr@ydlr.io"; + github = "ydlr"; + githubId = 58453832; + keys = [{ + longkeyid = "rsa4096/0x43AB44130A29AD9D"; + fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; + }]; + }; zane = { name = "Zane van Iperen"; email = "zane@zanevaniperen.com"; @@ -11435,6 +11497,12 @@ fingerprint = "61AE D40F 368B 6F26 9DAE 3892 6861 6B2D 8AC4 DCC5"; }]; }; + zeri = { + name = "zeri"; + email = "68825133+zeri42@users.noreply.github.com"; + github = "zeri42"; + githubId = 68825133; + }; zseri = { name = "zseri"; email = "zseri.devel@ytrizja.de"; diff --git a/third_party/nixpkgs/maintainers/scripts/build.nix b/third_party/nixpkgs/maintainers/scripts/build.nix index bc4355d0aa..ca401700b4 100644 --- a/third_party/nixpkgs/maintainers/scripts/build.nix +++ b/third_party/nixpkgs/maintainers/scripts/build.nix @@ -1,10 +1,18 @@ -{ maintainer }: +{ maintainer +, localSystem ? { system = args.system or builtins.currentSystem; } +, system ? localSystem.system +, crossSystem ? localSystem +, ... +}@args: # based on update.nix # nix-build build.nix --argstr maintainer +# to build for aarch64-linux using boot.binfmt.emulatedSystems: +# nix-build build.nix --argstr maintainer --argstr system aarch64-linux + let - pkgs = import ./../../default.nix {}; + pkgs = import ./../../default.nix (removeAttrs args [ "maintainer" ]); maintainer_ = pkgs.lib.maintainers.${maintainer}; packagesWith = cond: return: set: (pkgs.lib.flatten diff --git a/third_party/nixpkgs/maintainers/scripts/check-hydra-by-maintainer.nix b/third_party/nixpkgs/maintainers/scripts/check-hydra-by-maintainer.nix index cecf65ec66..326aae47f8 100644 --- a/third_party/nixpkgs/maintainers/scripts/check-hydra-by-maintainer.nix +++ b/third_party/nixpkgs/maintainers/scripts/check-hydra-by-maintainer.nix @@ -48,6 +48,7 @@ let in pkgs.stdenv.mkDerivation { name = "nixpkgs-update-script"; + buildInputs = [ pkgs.hydra-check ]; buildCommand = '' echo "" echo "----------------------------------------------------------------" diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs b/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs new file mode 100755 index 0000000000..fd6430d43c --- /dev/null +++ b/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs @@ -0,0 +1,408 @@ +#! /usr/bin/env nix-shell +#! nix-shell -p "haskellPackages.ghcWithPackages (p: [p.aeson p.req])" +#! nix-shell -p hydra-unstable +#! nix-shell -i runhaskell + +{- + +The purpose of this script is + +1) download the state of the nixpkgs/haskell-updates job from hydra (with get-report) +2) print a summary of the state suitable for pasting into a github comment (with ping-maintainers) +3) print a list of broken packages suitable for pasting into configuration-hackage2nix.yaml + +Because step 1) is quite expensive and takes roughly ~5 minutes the result is cached in a json file in XDG_CACHE. + +-} +{-# LANGUAGE BlockArguments #-} +{-# LANGUAGE DeriveAnyClass #-} +{-# LANGUAGE DeriveGeneric #-} +{-# LANGUAGE DerivingStrategies #-} +{-# LANGUAGE DuplicateRecordFields #-} +{-# LANGUAGE LambdaCase #-} +{-# LANGUAGE MultiWayIf #-} +{-# LANGUAGE NamedFieldPuns #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE TupleSections #-} +{-# OPTIONS_GHC -Wall #-} + +import Control.Monad (forM_, (<=<)) +import Control.Monad.Trans (MonadIO (liftIO)) +import Data.Aeson ( + FromJSON, + ToJSON, + decodeFileStrict', + eitherDecodeStrict', + encodeFile, + ) +import Data.Foldable (Foldable (toList), foldl') +import Data.List.NonEmpty (NonEmpty, nonEmpty) +import qualified Data.List.NonEmpty as NonEmpty +import Data.Map.Strict (Map) +import qualified Data.Map.Strict as Map +import Data.Maybe (fromMaybe, mapMaybe) +import Data.Monoid (Sum (Sum, getSum)) +import Data.Sequence (Seq) +import qualified Data.Sequence as Seq +import Data.Set (Set) +import qualified Data.Set as Set +import Data.Text (Text) +import qualified Data.Text as Text +import Data.Text.Encoding (encodeUtf8) +import Data.Time (defaultTimeLocale, formatTime, getCurrentTime) +import Data.Time.Clock (UTCTime) +import GHC.Generics (Generic) +import Network.HTTP.Req ( + GET (GET), + NoReqBody (NoReqBody), + defaultHttpConfig, + header, + https, + jsonResponse, + req, + responseBody, + responseTimeout, + runReq, + (/:), + ) +import System.Directory (XdgDirectory (XdgCache), getXdgDirectory) +import System.Environment (getArgs) +import System.Process (readProcess) +import Prelude hiding (id) + +newtype JobsetEvals = JobsetEvals + { evals :: Seq Eval + } + deriving (Generic, ToJSON, FromJSON, Show) + +newtype Nixpkgs = Nixpkgs {revision :: Text} + deriving (Generic, ToJSON, FromJSON, Show) + +newtype JobsetEvalInputs = JobsetEvalInputs {nixpkgs :: Nixpkgs} + deriving (Generic, ToJSON, FromJSON, Show) + +data Eval = Eval + { id :: Int + , jobsetevalinputs :: JobsetEvalInputs + } + deriving (Generic, ToJSON, FromJSON, Show) + +data Build = Build + { job :: Text + , buildstatus :: Maybe Int + , finished :: Int + , id :: Int + , nixname :: Text + , system :: Text + , jobsetevals :: Seq Int + } + deriving (Generic, ToJSON, FromJSON, Show) + +main :: IO () +main = do + args <- getArgs + case args of + ["get-report"] -> getBuildReports + ["ping-maintainers"] -> printMaintainerPing + ["mark-broken-list"] -> printMarkBrokenList + _ -> putStrLn "Usage: get-report | ping-maintainers | mark-broken-list" + +reportFileName :: IO FilePath +reportFileName = getXdgDirectory XdgCache "haskell-updates-build-report.json" + +showT :: Show a => a -> Text +showT = Text.pack . show + +getBuildReports :: IO () +getBuildReports = runReq defaultHttpConfig do + evalMay <- Seq.lookup 0 . evals <$> myReq (https "hydra.nixos.org" /: "jobset" /: "nixpkgs" /: "haskell-updates" /: "evals") mempty + eval@Eval{id} <- maybe (liftIO $ fail "No Evalution found") pure evalMay + liftIO . putStrLn $ "Fetching evaluation " <> show id <> " from Hydra. This might take a few minutes..." + buildReports :: Seq Build <- myReq (https "hydra.nixos.org" /: "eval" /: showT id /: "builds") (responseTimeout 600000000) + liftIO do + fileName <- reportFileName + putStrLn $ "Finished fetching all builds from Hydra, saving report as " <> fileName + now <- getCurrentTime + encodeFile fileName (eval, now, buildReports) + where + myReq query option = responseBody <$> req GET query NoReqBody jsonResponse (header "User-Agent" "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell)" <> option) + +hydraEvalCommand :: FilePath +hydraEvalCommand = "hydra-eval-jobs" + +hydraEvalParams :: [String] +hydraEvalParams = ["-I", ".", "pkgs/top-level/release-haskell.nix"] + +handlesCommand :: FilePath +handlesCommand = "nix-instantiate" + +handlesParams :: [String] +handlesParams = ["--eval", "--strict", "--json", "-"] + +handlesExpression :: String +handlesExpression = "with import ./. {}; with lib; zipAttrsWith (_: builtins.head) (mapAttrsToList (_: v: if v ? github then { \"${v.email}\" = v.github; } else {}) (import maintainers/maintainer-list.nix))" + +-- | This newtype is used to parse a Hydra job output from @hydra-eval-jobs@. +-- The only field we are interested in is @maintainers@, which is why this +-- is just a newtype. +-- +-- Note that there are occassionally jobs that don't have a maintainers +-- field, which is why this has to be @Maybe Text@. +newtype Maintainers = Maintainers { maintainers :: Maybe Text } + deriving stock (Generic, Show) + deriving anyclass (FromJSON, ToJSON) + +-- | This is a 'Map' from Hydra job name to maintainer email addresses. +-- +-- It has values similar to the following: +-- +-- @@ +-- fromList +-- [ ("arion.aarch64-linux", Maintainers (Just "robert@example.com")) +-- , ("bench.x86_64-linux", Maintainers (Just "")) +-- , ("conduit.x86_64-linux", Maintainers (Just "snoy@man.com, web@ber.com")) +-- , ("lens.x86_64-darwin", Maintainers (Just "ek@category.com")) +-- ] +-- @@ +-- +-- Note that Hydra jobs without maintainers will have an empty string for the +-- maintainer list. +type HydraJobs = Map Text Maintainers + +-- | Map of email addresses to GitHub handles. +-- This is built from the file @../../maintainer-list.nix@. +-- +-- It has values similar to the following: +-- +-- @@ +-- fromList +-- [ ("robert@example.com", "rob22") +-- , ("ek@category.com", "edkm") +-- ] +-- @@ +type EmailToGitHubHandles = Map Text Text + +-- | Map of Hydra jobs to maintainer GitHub handles. +-- +-- It has values similar to the following: +-- +-- @@ +-- fromList +-- [ ("arion.aarch64-linux", ["rob22"]) +-- , ("conduit.x86_64-darwin", ["snoyb", "webber"]) +-- ] +-- @@ +type MaintainerMap = Map Text (NonEmpty Text) + +-- | Generate a mapping of Hydra job names to maintainer GitHub handles. +getMaintainerMap :: IO MaintainerMap +getMaintainerMap = do + hydraJobs :: HydraJobs <- + readJSONProcess hydraEvalCommand hydraEvalParams "" "Failed to decode hydra-eval-jobs output: " + handlesMap :: EmailToGitHubHandles <- + readJSONProcess handlesCommand handlesParams handlesExpression "Failed to decode nix output for lookup of github handles: " + pure $ Map.mapMaybe (splitMaintainersToGitHubHandles handlesMap) hydraJobs + where + -- Split a comma-spearated string of Maintainers into a NonEmpty list of + -- GitHub handles. + splitMaintainersToGitHubHandles + :: EmailToGitHubHandles -> Maintainers -> Maybe (NonEmpty Text) + splitMaintainersToGitHubHandles handlesMap (Maintainers maint) = + nonEmpty . mapMaybe (`Map.lookup` handlesMap) . Text.splitOn ", " $ fromMaybe "" maint + +-- | Run a process that produces JSON on stdout and and decode the JSON to a +-- data type. +-- +-- If the JSON-decoding fails, throw the JSON-decoding error. +readJSONProcess + :: FromJSON a + => FilePath -- ^ Filename of executable. + -> [String] -- ^ Arguments + -> String -- ^ stdin to pass to the process + -> String -- ^ String to prefix to JSON-decode error. + -> IO a +readJSONProcess exe args input err = do + output <- readProcess exe args input + let eitherDecodedOutput = eitherDecodeStrict' . encodeUtf8 . Text.pack $ output + case eitherDecodedOutput of + Left decodeErr -> error $ err <> decodeErr <> "\nRaw: '" <> take 1000 output <> "'" + Right decodedOutput -> pure decodedOutput + +-- BuildStates are sorted by subjective importance/concerningness +data BuildState + = Failed + | DependencyFailed + | OutputLimitExceeded + | Unknown (Maybe Int) + | TimedOut + | Canceled + | HydraFailure + | Unfinished + | Success + deriving stock (Show, Eq, Ord) + +icon :: BuildState -> Text +icon = \case + Failed -> ":x:" + DependencyFailed -> ":heavy_exclamation_mark:" + OutputLimitExceeded -> ":warning:" + Unknown x -> "unknown code " <> showT x + TimedOut -> ":hourglass::no_entry_sign:" + Canceled -> ":no_entry_sign:" + Unfinished -> ":hourglass_flowing_sand:" + HydraFailure -> ":construction:" + Success -> ":heavy_check_mark:" + +platformIcon :: Platform -> Text +platformIcon (Platform x) = case x of + "x86_64-linux" -> ":penguin:" + "aarch64-linux" -> ":iphone:" + "x86_64-darwin" -> ":apple:" + _ -> x + +data BuildResult = BuildResult {state :: BuildState, id :: Int} deriving (Show, Eq, Ord) +newtype Platform = Platform {platform :: Text} deriving (Show, Eq, Ord) +newtype Table row col a = Table (Map (row, col) a) +type StatusSummary = Map Text (Table Text Platform BuildResult, Set Text) + +instance (Ord row, Ord col, Semigroup a) => Semigroup (Table row col a) where + Table l <> Table r = Table (Map.unionWith (<>) l r) +instance (Ord row, Ord col, Semigroup a) => Monoid (Table row col a) where + mempty = Table Map.empty +instance Functor (Table row col) where + fmap f (Table a) = Table (fmap f a) +instance Foldable (Table row col) where + foldMap f (Table a) = foldMap f a + +buildSummary :: MaintainerMap -> Seq Build -> StatusSummary +buildSummary maintainerMap = foldl (Map.unionWith unionSummary) Map.empty . fmap toSummary + where + unionSummary (Table l, l') (Table r, r') = (Table $ Map.union l r, l' <> r') + toSummary Build{finished, buildstatus, job, id, system} = Map.singleton name (Table (Map.singleton (set, Platform system) (BuildResult state id)), maintainers) + where + state :: BuildState + state = case (finished, buildstatus) of + (0, _) -> Unfinished + (_, Just 0) -> Success + (_, Just 1) -> Failed + (_, Just 2) -> DependencyFailed + (_, Just 3) -> HydraFailure + (_, Just 4) -> Canceled + (_, Just 7) -> TimedOut + (_, Just 11) -> OutputLimitExceeded + (_, i) -> Unknown i + packageName = fromMaybe job (Text.stripSuffix ("." <> system) job) + splitted = nonEmpty $ Text.splitOn "." packageName + name = maybe packageName NonEmpty.last splitted + set = maybe "" (Text.intercalate "." . NonEmpty.init) splitted + maintainers = maybe mempty (Set.fromList . toList) (Map.lookup job maintainerMap) + +readBuildReports :: IO (Eval, UTCTime, Seq Build) +readBuildReports = do + file <- reportFileName + fromMaybe (error $ "Could not decode " <> file) <$> decodeFileStrict' file + +sep :: Text +sep = " | " +joinTable :: [Text] -> Text +joinTable t = sep <> Text.intercalate sep t <> sep + +type NumSummary = Table Platform BuildState Int + +printTable :: (Ord rows, Ord cols) => Text -> (rows -> Text) -> (cols -> Text) -> (entries -> Text) -> Table rows cols entries -> [Text] +printTable name showR showC showE (Table mapping) = joinTable <$> (name : map showC cols) : replicate (length cols + sepsInName + 1) "---" : map printRow rows + where + sepsInName = Text.count "|" name + printRow row = showR row : map (\col -> maybe "" showE (Map.lookup (row, col) mapping)) cols + rows = toList $ Set.fromList (fst <$> Map.keys mapping) + cols = toList $ Set.fromList (snd <$> Map.keys mapping) + +printJob :: Int -> Text -> (Table Text Platform BuildResult, Text) -> [Text] +printJob evalId name (Table mapping, maintainers) = + if length sets <= 1 + then map printSingleRow sets + else ["- [ ] " <> makeJobSearchLink "" name <> " " <> maintainers] <> map printRow sets + where + printRow set = " - " <> printState set <> " " <> makeJobSearchLink set (if Text.null set then "toplevel" else set) + printSingleRow set = "- [ ] " <> printState set <> " " <> makeJobSearchLink set (makePkgName set) <> " " <> maintainers + makePkgName set = (if Text.null set then "" else set <> ".") <> name + printState set = Text.intercalate " " $ map (\pf -> maybe "" (label pf) $ Map.lookup (set, pf) mapping) platforms + makeJobSearchLink set linkLabel= makeSearchLink evalId linkLabel (makePkgName set) + sets = toList $ Set.fromList (fst <$> Map.keys mapping) + platforms = toList $ Set.fromList (snd <$> Map.keys mapping) + label pf (BuildResult s i) = "[[" <> platformIcon pf <> icon s <> "]](https://hydra.nixos.org/build/" <> showT i <> ")" + +makeSearchLink :: Int -> Text -> Text -> Text +makeSearchLink evalId linkLabel query = "[" <> linkLabel <> "](" <> "https://hydra.nixos.org/eval/" <> showT evalId <> "?filter=" <> query <> ")" + +statusToNumSummary :: StatusSummary -> NumSummary +statusToNumSummary = fmap getSum . foldMap (fmap Sum . jobTotals) + +jobTotals :: (Table Text Platform BuildResult, a) -> Table Platform BuildState Int +jobTotals (Table mapping, _) = getSum <$> Table (Map.foldMapWithKey (\(_, platform) (BuildResult buildstate _) -> Map.singleton (platform, buildstate) (Sum 1)) mapping) + +details :: Text -> [Text] -> [Text] +details summary content = ["
" <> summary <> " ", ""] <> content <> ["
", ""] + +printBuildSummary :: Eval -> UTCTime -> StatusSummary -> Text +printBuildSummary + Eval{id, jobsetevalinputs = JobsetEvalInputs{nixpkgs = Nixpkgs{revision}}} + fetchTime + summary = + Text.unlines $ + headline <> totals + <> optionalList "#### Maintained packages with build failure" (maintainedList fails) + <> optionalList "#### Maintained packages with failed dependency" (maintainedList failedDeps) + <> optionalList "#### Maintained packages with unknown error" (maintainedList unknownErr) + <> optionalHideableList "#### Unmaintained packages with build failure" (unmaintainedList fails) + <> optionalHideableList "#### Unmaintained packages with failed dependency" (unmaintainedList failedDeps) + <> optionalHideableList "#### Unmaintained packages with unknown error" (unmaintainedList unknownErr) + <> footer + where + footer = ["*Report generated with [maintainers/scripts/haskell/hydra-report.hs](https://github.com/NixOS/nixpkgs/blob/haskell-updates/maintainers/scripts/haskell/hydra-report.sh)*"] + totals = + [ "#### Build summary" + , "" + ] + <> printTable "Platform" (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) (\x -> showT x <> " " <> icon x) showT (statusToNumSummary summary) + headline = + [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)" + , "*evaluation [" + <> showT id + <> "](https://hydra.nixos.org/eval/" + <> showT id + <> ") of nixpkgs commit [" + <> Text.take 7 revision + <> "](https://github.com/NixOS/nixpkgs/commits/" + <> revision + <> ") as of " + <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime) + <> "*" + ] + jobsByState predicate = Map.filter (predicate . foldl' min Success . fmap state . fst) summary + fails = jobsByState (== Failed) + failedDeps = jobsByState (== DependencyFailed) + unknownErr = jobsByState (\x -> x > DependencyFailed && x < TimedOut) + withMaintainer = Map.mapMaybe (\(x, m) -> (x,) <$> nonEmpty (Set.toList m)) + withoutMaintainer = Map.mapMaybe (\(x, m) -> if Set.null m then Just x else Nothing) + optionalList heading list = if null list then mempty else [heading] <> list + optionalHideableList heading list = if null list then mempty else [heading] <> details (showT (length list) <> " job(s)") list + maintainedList = showMaintainedBuild <=< Map.toList . withMaintainer + unmaintainedList = showBuild <=< Map.toList . withoutMaintainer + showBuild (name, table) = printJob id name (table, "") + showMaintainedBuild (name, (table, maintainers)) = printJob id name (table, Text.intercalate " " (fmap ("@" <>) (toList maintainers))) + +printMaintainerPing :: IO () +printMaintainerPing = do + maintainerMap <- getMaintainerMap + (eval, fetchTime, buildReport) <- readBuildReports + putStrLn (Text.unpack (printBuildSummary eval fetchTime (buildSummary maintainerMap buildReport))) + +printMarkBrokenList :: IO () +printMarkBrokenList = do + (_, _, buildReport) <- readBuildReports + forM_ buildReport \Build{buildstatus, job} -> + case (buildstatus, Text.splitOn "." job) of + (Just 1, ["haskellPackages", name, "x86_64-linux"]) -> putStrLn $ " - " <> Text.unpack name + _ -> pure () diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/mark-broken.sh b/third_party/nixpkgs/maintainers/scripts/haskell/mark-broken.sh new file mode 100755 index 0000000000..ddf2b1243b --- /dev/null +++ b/third_party/nixpkgs/maintainers/scripts/haskell/mark-broken.sh @@ -0,0 +1,45 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils git -I nixpkgs=. + +# This script uses the data pulled with +# maintainers/scripts/haskell/hydra-report.hs get-report to produce a list of +# failing builds that get written to the hackage2nix config. Then +# hackage-packages.nix gets regenerated and transitive-broken packages get +# marked as dont-distribute in the config as well. +# This should disable builds for most failing jobs in the haskell-updates jobset. + +set -euo pipefail + +broken_config="pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml" + +tmpfile=$(mktemp) +trap "rm ${tmpfile}" 0 + +echo "Remember that you need to manually run 'maintainers/scripts/haskell/hydra-report.hs get-report' sometime before running this script." +echo "Generating a list of broken builds and displaying for manual confirmation ..." +maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > $tmpfile + +$EDITOR $tmpfile + +tail -n +3 "$broken_config" >> "$tmpfile" + +cat > "$broken_config" << EOF +broken-packages: + # These packages don't compile. +EOF + +sort -iu "$tmpfile" >> "$broken_config" +maintainers/scripts/haskell/regenerate-hackage-packages.sh +maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +maintainers/scripts/haskell/regenerate-hackage-packages.sh + +if [[ "${1:-}" == "--do-commit" ]]; then +git add $broken_config +git add pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +git add pkgs/development/haskell-modules/hackage-packages.nix +git commit -F - << EOF +hackage2nix: Mark failing builds broken + +This commit has been generated by maintainers/scripts/haskell/mark-broken.sh +EOF +fi diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/third_party/nixpkgs/maintainers/scripts/haskell/regenerate-hackage-packages.sh new file mode 100755 index 0000000000..1effa5e259 --- /dev/null +++ b/third_party/nixpkgs/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -0,0 +1,44 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable git nix -I nixpkgs=. + +# This script is used to regenerate nixpkgs' Haskell package set, using the +# tool hackage2nix from the nixos/cabal2nix repo. hackage2nix looks at the +# config files in pkgs/development/haskell-modules/configuration-hackage2nix +# and generates a Nix expression for package version specified there, using the +# Cabal files from the Hackage database (available under all-cabal-hashes) and +# its companion tool cabal2nix. +# +# Related scripts are update-hackage.sh, for updating the snapshot of the +# Hackage database used by hackage2nix, and update-cabal2nix-unstable.sh, +# for updating the version of hackage2nix used to perform this task. + +set -euo pipefail + +# To prevent hackage2nix fails because of encoding. +# See: https://github.com/NixOS/nixpkgs/pull/122023 +export LC_ALL=C.UTF-8 + +extraction_derivation='with import ./. {}; runCommand "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"' +unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)" +config_dir=pkgs/development/haskell-modules/configuration-hackage2nix + +echo "Starting hackage2nix to regenerate pkgs/development/haskell-modules/hackage-packages.nix ..." +hackage2nix \ + --hackage "$unpacked_hackage" \ + --preferred-versions <(for n in "$unpacked_hackage"/*/preferred-versions; do cat "$n"; echo; done) \ + --nixpkgs "$PWD" \ + --config "$config_dir/main.yaml" \ + --config "$config_dir/stackage.yaml" \ + --config "$config_dir/broken.yaml" \ + --config "$config_dir/transitive-broken.yaml" + +if [[ "${1:-}" == "--do-commit" ]]; then +git add pkgs/development/haskell-modules/hackage-packages.nix +git commit -F - << EOF +hackage-packages.nix: Regenerate based on current config + +This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh +EOF +fi + +echo "Regeneration of hackage-packages.nix finished." diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh b/third_party/nixpkgs/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh new file mode 100755 index 0000000000..64ec998bf6 --- /dev/null +++ b/third_party/nixpkgs/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh @@ -0,0 +1,15 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils nix gnused -I nixpkgs=. + +config_file=pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml + +cat > $config_file << EOF +# This file is automatically generated by +# maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +# It is supposed to list all haskellPackages that cannot evaluate because they +# depend on a dependency marked as broken. +dont-distribute-packages: +EOF + +echo "Regenerating list of transitive broken packages ..." +echo -e $(nix-instantiate --eval --strict maintainers/scripts/haskell/transitive-broken-packages.nix) | sed 's/\"//' | sort -i >> $config_file diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/transitive-broken-packages.nix b/third_party/nixpkgs/maintainers/scripts/haskell/transitive-broken-packages.nix new file mode 100644 index 0000000000..d4ddaa9576 --- /dev/null +++ b/third_party/nixpkgs/maintainers/scripts/haskell/transitive-broken-packages.nix @@ -0,0 +1,16 @@ +let + nixpkgs = import ../../..; + inherit (nixpkgs {}) pkgs lib; + getEvaluating = x: + builtins.attrNames ( + lib.filterAttrs ( + _: v: (builtins.tryEval (v.outPath or null)).success && lib.isDerivation v && !v.meta.broken + ) x + ); + brokenDeps = lib.subtractLists + (getEvaluating pkgs.haskellPackages) + (getEvaluating (nixpkgs { config.allowBroken = true; }).haskellPackages); +in +'' + ${lib.concatMapStringsSep "\n" (x: " - ${x}") brokenDeps} +'' diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/update-cabal2nix-unstable.sh b/third_party/nixpkgs/maintainers/scripts/haskell/update-cabal2nix-unstable.sh new file mode 100755 index 0000000000..4158370456 --- /dev/null +++ b/third_party/nixpkgs/maintainers/scripts/haskell/update-cabal2nix-unstable.sh @@ -0,0 +1,17 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable -I nixpkgs=. + +# Updates cabal2nix-unstable to the latest master of the nixos/cabal2nix repository. +# See regenerate-hackage-packages.sh for details on the purpose of this script. + +set -euo pipefail + +# fetch current master HEAD from Github +head_info="$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/NixOS/cabal2nix/branches/master)" +# extract commit hash +commit="$(jq -r .commit.sha <<< "$head_info")" +# extract commit timestamp and convert to date +date="$(date "--date=$(jq -r .commit.commit.committer.date <<< "$head_info")" +%F)" +# generate nix expression from cabal file, replacing the version with the commit date +echo '# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > pkgs/development/haskell-modules/cabal2nix-unstable.nix +cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-unstable.nix diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/update-hackage.sh b/third_party/nixpkgs/maintainers/scripts/haskell/update-hackage.sh new file mode 100755 index 0000000000..a7cfecbbb0 --- /dev/null +++ b/third_party/nixpkgs/maintainers/scripts/haskell/update-hackage.sh @@ -0,0 +1,35 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused -I nixpkgs=. + +# See regenerate-hackage-packages.sh for details on the purpose of this script. + +set -euo pipefail + +pin_file=pkgs/data/misc/hackage/pin.json +current_commit="$(jq -r .commit $pin_file)" +old_date="$(jq -r .msg $pin_file | sed 's/Update from Hackage at //')" +git_info="$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/commercialhaskell/all-cabal-hashes/branches/hackage)" +head_commit="$(echo "$git_info" | jq -r .commit.sha)" +commit_msg="$(echo "$git_info" | jq -r .commit.commit.message)" +new_date="$(echo "$commit_msg" | sed 's/Update from Hackage at //')" + +if [ "$current_commit" != "$head_commit" ]; then + url="https://github.com/commercialhaskell/all-cabal-hashes/archive/$head_commit.tar.gz" + hash="$(nix-prefetch-url "$url")" + jq -n \ + --arg commit "$head_commit" \ + --arg hash "$hash" \ + --arg url "$url" \ + --arg commit_msg "$commit_msg" \ + '{commit: $commit, url: $url, sha256: $hash, msg: $commit_msg}' \ + > $pin_file +fi + +if [[ "${1:-}" == "--do-commit" ]]; then +git add pkgs/data/misc/hackage/pin.json +git commit -F - << EOF +all-cabal-hashes: $old_date -> $new_date + +This commit has been generated by maintainers/scripts/haskell/update-hackage.sh +EOF +fi diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/update-stackage.sh b/third_party/nixpkgs/maintainers/scripts/haskell/update-stackage.sh new file mode 100755 index 0000000000..db336bf12d --- /dev/null +++ b/third_party/nixpkgs/maintainers/scripts/haskell/update-stackage.sh @@ -0,0 +1,68 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused gnugrep -I nixpkgs=. + +set -eu -o pipefail + +tmpfile=$(mktemp "update-stackage.XXXXXXX") +# shellcheck disable=SC2064 + +stackage_config="pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml" + +trap "rm ${tmpfile} ${tmpfile}.new" 0 +touch "$tmpfile" "$tmpfile.new" # Creating files here so that trap creates no errors. + +curl -L -s "https://stackage.org/nightly/cabal.config" >"$tmpfile" +old_version=$(grep "# Stackage Nightly" $stackage_config | sed -E 's/.*([0-9]{4}-[0-9]{2}-[0-9]{2}).*/\1/') +version=$(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.nightly-//p" "$tmpfile") + +if [[ "$old_version" == "$version" ]]; then + echo "No new stackage version" + exit 0 # Nothing to do +fi + +# Create a simple yaml version of the file. +sed -r \ + -e '/^--/d' \ + -e 's|^constraints:||' \ + -e 's|^ +| - |' \ + -e 's|,$||' \ + -e '/installed$/d' \ + -e '/^$/d' \ + < "${tmpfile}" | sort --ignore-case >"${tmpfile}.new" + +cat > $stackage_config << EOF +# Stackage Nightly $version +# This file is auto-generated by +# maintainers/scripts/haskell/update-stackage.sh +default-package-overrides: +EOF + +# Drop restrictions on some tools where we always want the latest version. +sed -r \ + -e '/ cabal-install /d' \ + -e '/ cabal2nix /d' \ + -e '/ cabal2spec /d' \ + -e '/ distribution-nixpkgs /d' \ + -e '/ git-annex /d' \ + -e '/ hindent /d' \ + -e '/ hledger/d' \ + -e '/ hlint /d' \ + -e '/ hoogle /d' \ + -e '/ hopenssl /d' \ + -e '/ jailbreak-cabal /d' \ + -e '/ json-autotype/d' \ + -e '/ language-nix /d' \ + -e '/ shake /d' \ + -e '/ ShellCheck /d' \ + -e '/ stack /d' \ + -e '/ weeder /d' \ + < "${tmpfile}.new" >> $stackage_config + +if [[ "${1:-}" == "--do-commit" ]]; then +git add $stackage_config +git commit -F - << EOF +Stackage Nightly: $old_version -> $version + +This commit has been generated by maintainers/scripts/haskell/update-stackage.sh +EOF +fi diff --git a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py index e7a183952b..91c5214d15 100644 --- a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py +++ b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py @@ -13,6 +13,7 @@ import http import json import os import subprocess +import logging import sys import time import traceback @@ -34,6 +35,14 @@ ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry" # " vim gets confused here ATOM_LINK = "{http://www.w3.org/2005/Atom}link" # " ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" # " +LOG_LEVELS = { + logging.getLevelName(level): level for level in [ + logging.DEBUG, logging.INFO, logging.WARN, logging.ERROR ] +} + +log = logging.getLogger() +log.addHandler(logging.StreamHandler()) + def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2): """Retry calling the decorated function using an exponential backoff. @@ -235,6 +244,7 @@ def prefetch_plugin( alias: Optional[str], cache: "Optional[Cache]" = None, ) -> Tuple[Plugin, Dict[str, str]]: + log.info("Prefetching plugin %s", repo_name) repo = Repo(user, repo_name, branch, alias) commit, date = repo.latest_commit() has_submodules = repo.has_submodules() @@ -464,6 +474,11 @@ def parse_args(editor: Editor): "--no-commit", "-n", action="store_true", default=False, help="Whether to autocommit changes" ) + parser.add_argument( + "--debug", "-d", choices=LOG_LEVELS.keys(), + default=logging.getLevelName(logging.WARN), + help="Adjust log level" + ) return parser.parse_args() @@ -503,6 +518,9 @@ def update_plugins(editor: Editor): """The main entry function of this module. All input arguments are grouped in the `Editor`.""" args = parse_args(editor) + log.setLevel(LOG_LEVELS[args.debug]) + + log.info("Start updating plugins") nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) update = get_update(args.input_file, args.outfile, args.proc, editor) diff --git a/third_party/nixpkgs/maintainers/scripts/update-luarocks-shell.nix b/third_party/nixpkgs/maintainers/scripts/update-luarocks-shell.nix index 23a940b369..d3f342b07a 100644 --- a/third_party/nixpkgs/maintainers/scripts/update-luarocks-shell.nix +++ b/third_party/nixpkgs/maintainers/scripts/update-luarocks-shell.nix @@ -2,8 +2,11 @@ }: with nixpkgs; mkShell { - buildInputs = [ - bash luarocks-nix nix-prefetch-scripts parallel + packages = [ + bash + luarocks-nix + nix-prefetch-scripts + parallel ]; LUAROCKS_NIXPKGS_PATH = toString nixpkgs.path; } diff --git a/third_party/nixpkgs/maintainers/scripts/update.nix b/third_party/nixpkgs/maintainers/scripts/update.nix index 1305e0947c..7435cf6442 100755 --- a/third_party/nixpkgs/maintainers/scripts/update.nix +++ b/third_party/nixpkgs/maintainers/scripts/update.nix @@ -1,5 +1,6 @@ { package ? null , maintainer ? null +, predicate ? null , path ? null , max-workers ? null , include-overlays ? false @@ -69,6 +70,11 @@ let */ packagesWith = packagesWithPath []; + /* Recursively find all packages in `pkgs` with updateScript matching given predicate. + */ + packagesWithUpdateScriptMatchingPredicate = cond: + packagesWith (path: pkg: builtins.hasAttr "updateScript" pkg && cond path pkg); + /* Recursively find all packages in `pkgs` with updateScript by given maintainer. */ packagesWithUpdateScriptAndMaintainer = maintainer': @@ -79,7 +85,7 @@ let else builtins.getAttr maintainer' lib.maintainers; in - packagesWith (path: pkg: builtins.hasAttr "updateScript" pkg && + packagesWithUpdateScriptMatchingPredicate (path: pkg: (if builtins.hasAttr "maintainers" pkg.meta then (if builtins.isList pkg.meta.maintainers then builtins.elem maintainer pkg.meta.maintainers @@ -120,6 +126,8 @@ let packages = if package != null then [ (packageByName package pkgs) ] + else if predicate != null then + packagesWithUpdateScriptMatchingPredicate predicate pkgs else if maintainer != null then packagesWithUpdateScriptAndMaintainer maintainer pkgs else if path != null then @@ -135,11 +143,15 @@ let to run all update scripts for all packages that lists \`garbas\` as a maintainer and have \`updateScript\` defined, or: - % nix-shell maintainers/scripts/update.nix --argstr package gnome3.nautilus + % nix-shell maintainers/scripts/update.nix --argstr package gnome.nautilus to run update script for specific package, or - % nix-shell maintainers/scripts/update.nix --argstr path gnome3 + % nix-shell maintainers/scripts/update.nix --arg predicate '(path: pkg: builtins.isList pkg.updateScript && builtins.length pkg.updateScript >= 1 && (let script = builtins.head pkg.updateScript; in builtins.isAttrs script && script.name == "gnome-update-script"))' + + to run update script for all packages matching given predicate, or + + % nix-shell maintainers/scripts/update.nix --argstr path gnome to run update script for all package under an attribute path. diff --git a/third_party/nixpkgs/maintainers/scripts/update.py b/third_party/nixpkgs/maintainers/scripts/update.py index 8cc2bcbd67..eb26a472e9 100644 --- a/third_party/nixpkgs/maintainers/scripts/update.py +++ b/third_party/nixpkgs/maintainers/scripts/update.py @@ -39,6 +39,9 @@ async def run_update_script(nixpkgs_root: str, merge_lock: asyncio.Lock, temp_di if temp_dir is not None: worktree, _branch = temp_dir + # Ensure the worktree is clean before update. + await check_subprocess('git', 'reset', '--hard', '--quiet', 'HEAD', cwd=worktree) + # 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) diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index 66cddb966d..0e2baa9e75 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -48,6 +48,14 @@ with lib.maintainers; { scope = "Maintain Cinnamon desktop environment and applications made by the LinuxMint team."; }; + chia = { + members = [ + atemu + lourkeur + ]; + scope = "Maintain the Chia blockchain and its dependencies"; + }; + deshaw = { # Verify additions to this team with at least one already existing member of the team. members = [ @@ -66,7 +74,7 @@ with lib.maintainers; { }; freedesktop = { - members = [ jtojnar worldofpeace ]; + members = [ jtojnar ]; scope = "Maintain Freedesktop.org packages for graphical desktop."; }; @@ -89,13 +97,21 @@ with lib.maintainers; { members = [ hedning jtojnar - worldofpeace dasj19 maxeaubrey ]; scope = "Maintain GNOME desktop environment and platform."; }; + haskell = { + members = [ + maralorn + cdepillabout + sternenseemann + ]; + scope = "Maintain Haskell packages and infrastructure."; + }; + home-assistant = { members = [ fab @@ -170,4 +186,13 @@ with lib.maintainers; { ]; scope = "Maintain SageMath and the dependencies that are likely to break it."; }; + + serokell = { + # Verify additions by approval of an already existing member of the team. + members = [ + balsoft + mkaito + ]; + scope = "Group registration for Serokell employees who collectively maintain packages."; + }; } diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/ipv6-config.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/ipv6-config.xml index 7b89b4092b..45e85dbf3d 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/ipv6-config.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/ipv6-config.xml @@ -7,8 +7,12 @@ IPv6 is enabled by default. Stateless address autoconfiguration is used to - automatically assign IPv6 addresses to all interfaces. You can disable IPv6 - support globally by setting: + automatically assign IPv6 addresses to all interfaces, and Privacy + Extensions (RFC 4946) are enabled by default. You can adjust the default + for this by setting . + This option may be overridden on a per-interface basis by + . + You can disable IPv6 support globally by setting: = false; diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml index 757174c526..e721938970 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml @@ -25,7 +25,7 @@ = true; = true; - = true; + = true; = true; = true; = true; 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 43f69b923d..63d1d52b01 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 @@ -84,12 +84,12 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable You'll need nixos-generate-config and - nixos-install and we'll throw in some man pages and - nixos-enter just in case you want to chroot into your - NixOS partition. They are installed by default on NixOS, but you don't have + nixos-install, but this also makes some man pages + and nixos-enter available, just in case you want to chroot into your + NixOS partition. NixOS installs these by default, but you don't have NixOS yet.. -$ nix-env -f '<nixpkgs/nixos>' --arg configuration {} -iA config.system.build.{nixos-generate-config,nixos-install,nixos-enter,manual.manpages} + $ nix-env -f '<nixpkgs>' -iA nixos-install-tools diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml index 4102fe206e..0dae49c636 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml @@ -83,10 +83,10 @@ like games. This can be achieved with the following options which the desktop manager default enables, excluding games. - - - - + + + + With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually disable options or use which only excluded the optional applications. diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml index e3e6dc4843..753ceacb76 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml @@ -27,7 +27,7 @@ The default Linux kernel was updated to the 5.10 LTS series, coming from the 5.4 LTS series. - GNOME desktop environment was upgraded to 3.38, see its release notes. + GNOME desktop environment was upgraded to 40, see the release notes for 40.0 and 3.38. The gnome3 attribute set has been renamed to gnome and so have been the NixOS options. @@ -78,7 +78,7 @@ - Kodi has been updated to version 19.0 "Matrix". See + Kodi has been updated to version 19.1 "Matrix". See the announcement for further details. @@ -100,6 +100,19 @@ Now nginx uses the zlib-ng library by default. + + + Libreswan has been updated + to version 4.4. The package now includes example configurations and manual + pages by default. The NixOS module has been changed to use the upstream + systemd units and write the configuration in the /etc/ipsec.d/ + directory. In addition, two new options have been added to + specify connection policies + () + and disable send/receive redirects + (). + + @@ -145,6 +158,11 @@ section of the NixOS manual for more information. + + + Nebula VPN + + @@ -697,6 +715,17 @@ environment.systemPackages = [ All CUDA toolkit versions prior to CUDA 10 have been removed. + + + The kbdKeymaps package was removed since dvp and neo + are now included in kbd. + + If you want to use the Programmer Dvorak Keyboard Layout, you have to use + dvorak-programmer in + now instead of dvp. + In it's still dvp. + + The babeld service is now being run as an unprivileged user. To achieve that the module configures @@ -715,6 +744,20 @@ environment.systemPackages = [ The yadm dotfile manager has been updated from 2.x to 3.x, which has new (XDG) default locations for some data/state files. Most yadm commands will fail and print a legacy path warning (which describes how to upgrade/migrate your repository). If you have scripts, daemons, scheduled jobs, shell profiles, etc. that invoke yadm, expect them to fail or misbehave until you perform this migration and prepare accordingly. + + + Instead of determining + automatically based on , the latest + version is always used because old versions are not officially supported. + + + Furthermore, Radicale's systemd unit was hardened which might break some + deployments. In particular, a non-default + filesystem_folder has to be added to + if + the deprecated is used. + + @@ -909,9 +952,26 @@ environment.systemPackages = [ Note that users defined with an explicit UID below 500 are exempted from this check, as has no effect for those. + + + The security.apparmor module, + for the AppArmor + Mandatory Access Control system, + has been substantialy improved along with related tools, + so that module maintainers can now more easily write AppArmor profiles for NixOS. + The most notable change on the user-side is the new option , + replacing the previous profiles option + to provide a way to disable a profile + and to select whether to confine in enforce mode (default) + or in complain mode (see journalctl -b --grep apparmor). + Security-minded users may also want to enable , + at the cost of having some of their processes killed + when updating to a NixOS version introducing new AppArmor profiles. + + - The GNOME desktop manager once again installs gnome3.epiphany by default. + The GNOME desktop manager once again installs gnome.epiphany by default. @@ -1035,6 +1095,12 @@ environment.systemPackages = [ + + + The newly enabled systemd-pstore.service now automatically evacuates crashdumps and panic logs from the persistent storage to /var/lib/systemd/pstore. + This prevents NVRAM from filling up, which ensures the latest diagnostic data is always stored and alleviates problems with writing new boot configurations. + + diff --git a/third_party/nixpkgs/nixos/doc/manual/shell.nix b/third_party/nixpkgs/nixos/doc/manual/shell.nix index cc3609d750..e5ec9b8f97 100644 --- a/third_party/nixpkgs/nixos/doc/manual/shell.nix +++ b/third_party/nixpkgs/nixos/doc/manual/shell.nix @@ -4,5 +4,5 @@ in pkgs.mkShell { name = "nixos-manual"; - buildInputs = with pkgs; [ xmlformat jing xmloscopy ruby ]; + packages = with pkgs; [ xmlformat jing xmloscopy ruby ]; } diff --git a/third_party/nixpkgs/nixos/lib/build-vms.nix b/third_party/nixpkgs/nixos/lib/build-vms.nix index ebbb0296be..064e44f643 100644 --- a/third_party/nixpkgs/nixos/lib/build-vms.nix +++ b/third_party/nixpkgs/nixos/lib/build-vms.nix @@ -36,6 +36,13 @@ rec { [ ../modules/virtualisation/qemu-vm.nix ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs { key = "no-manual"; documentation.nixos.enable = false; } + { key = "no-revision"; + # Make the revision metadata constant, in order to avoid needless retesting. + # The human version (e.g. 21.05-pre) is left as is, because it is useful + # for external modules that test with e.g. nixosTest and rely on that + # version number. + config.system.nixos.revision = "constant-nixos-revision"; + } { key = "nodes"; _module.args.nodes = nodes; } ] ++ optional minimal ../modules/testing/minimal-kernel.nix; }; diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py index 270a5969cd..6b868366e9 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py @@ -3,6 +3,7 @@ from contextlib import contextmanager, _GeneratorContextManager from queue import Queue, Empty from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List, Iterable from xml.sax.saxutils import XMLGenerator +from colorama import Style import queue import io import _thread @@ -151,6 +152,8 @@ class Logger: self.xml.startDocument() self.xml.startElement("logfile", attrs={}) + self._print_serial_logs = True + def close(self) -> None: self.xml.endElement("logfile") self.xml.endDocument() @@ -174,15 +177,21 @@ class Logger: self.drain_log_queue() self.log_line(message, attributes) - def enqueue(self, message: Dict[str, str]) -> None: - self.queue.put(message) + def log_serial(self, message: str, machine: str) -> None: + self.enqueue({"msg": message, "machine": machine, "type": "serial"}) + if self._print_serial_logs: + eprint(Style.DIM + "{} # {}".format(machine, message) + Style.RESET_ALL) + + def enqueue(self, item: Dict[str, str]) -> None: + self.queue.put(item) def drain_log_queue(self) -> None: try: while True: item = self.queue.get_nowait() - attributes = {"machine": item["machine"], "type": "serial"} - self.log_line(self.sanitise(item["msg"]), attributes) + msg = self.sanitise(item["msg"]) + del item["msg"] + self.log_line(msg, item) except Empty: pass @@ -327,6 +336,9 @@ class Machine: def log(self, msg: str) -> None: self.logger.log(msg, {"machine": self.name}) + def log_serial(self, msg: str) -> None: + self.logger.log_serial(msg, self.name) + def nested(self, msg: str, attrs: Dict[str, str] = {}) -> _GeneratorContextManager: my_attrs = {"machine": self.name} my_attrs.update(attrs) @@ -784,8 +796,7 @@ class Machine: # Ignore undecodable bytes that may occur in boot menus line = _line.decode(errors="ignore").replace("\r", "").rstrip() self.last_lines.put(line) - eprint("{} # {}".format(self.name, line)) - self.logger.enqueue({"msg": line, "machine": self.name}) + self.log_serial(line) _thread.start_new_thread(process_serial_output, ()) @@ -927,6 +938,16 @@ def run_tests() -> None: machine.execute("sync") +def serial_stdout_on() -> None: + global log + log._print_serial_logs = True + + +def serial_stdout_off() -> None: + global log + log._print_serial_logs = False + + @contextmanager def subtest(name: str) -> Iterator[None]: with log.nested(name): diff --git a/third_party/nixpkgs/nixos/lib/testing-python.nix b/third_party/nixpkgs/nixos/lib/testing-python.nix index 6497b897ea..c9d4f0f086 100644 --- a/third_party/nixpkgs/nixos/lib/testing-python.nix +++ b/third_party/nixpkgs/nixos/lib/testing-python.nix @@ -25,13 +25,21 @@ rec { name = "nixos-test-driver"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ (python3.withPackages (p: [ p.ptpython ])) ]; + buildInputs = [ (python3.withPackages (p: [ p.ptpython p.colorama ])) ]; checkInputs = with python3Packages; [ pylint black mypy ]; dontUnpack = true; preferLocalBuild = true; + buildPhase = '' + python < $out/test-script ${lib.optionalString (!skipLint) '' - ${python3Packages.black}/bin/black --check --diff $out/test-script + PYFLAKES_BUILTINS="$( + echo -n ${lib.escapeShellArg (lib.concatStringsSep "," nodeHostNames)}, + < ${lib.escapeShellArg "${testDriver}/nix-support/driver-exports"} + )" ${python3Packages.pyflakes}/bin/pyflakes $out/test-script ''} ln -s ${testDriver}/bin/nixos-test-driver $out/bin/ @@ -193,6 +208,8 @@ rec { (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null) nodeNames; + nodeHostNames = map (c: c.config.system.name) (lib.attrValues driver.nodes); + in if lib.length invalidNodeNames > 0 then throw '' diff --git a/third_party/nixpkgs/nixos/modules/config/console.nix b/third_party/nixpkgs/nixos/modules/config/console.nix index 84ad76246f..5be7f06c05 100644 --- a/third_party/nixpkgs/nixos/modules/config/console.nix +++ b/third_party/nixpkgs/nixos/modules/config/console.nix @@ -82,8 +82,7 @@ in packages = mkOption { type = types.listOf types.package; - default = with pkgs.kbdKeymaps; [ dvp neo ]; - defaultText = "with pkgs.kbdKeymaps; [ dvp neo ]"; + default = [ ]; description = '' List of additional packages that provide console fonts, keymaps and other resources for virtual consoles use. diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix index 6e7b8c4b88..72827c5aba 100644 --- a/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix +++ b/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix @@ -448,6 +448,40 @@ in (mkIf cfg.enable { environment.systemPackages = [ pkgs.fontconfig ]; environment.etc.fonts.source = "${fontconfigEtc}/etc/fonts/"; + security.apparmor.includes."abstractions/fonts" = '' + # fonts.conf + r ${pkg.out}/etc/fonts/fonts.conf, + + # fontconfig default config files + r ${pkg.out}/etc/fonts/conf.d/*.conf, + + # 00-nixos-cache.conf + r ${cacheConf}, + + # 10-nixos-rendering.conf + r ${renderConf}, + + # 50-user.conf + ${optionalString cfg.includeUserConf '' + r ${pkg.out}/etc/fonts/conf.d.bak/50-user.conf, + ''} + + # local.conf (indirect priority 51) + ${optionalString (cfg.localConf != "") '' + r ${localConf}, + ''} + + # 52-nixos-default-fonts.conf + r ${defaultFontsConf}, + + # 53-no-bitmaps.conf + r ${rejectBitmaps}, + + ${optionalString (!cfg.allowType1) '' + # 53-nixos-reject-type1.conf + r ${rejectType1}, + ''} + ''; }) (mkIf cfg.enable { fonts.fontconfig.confPackages = [ confPkg ]; diff --git a/third_party/nixpkgs/nixos/modules/config/malloc.nix b/third_party/nixpkgs/nixos/modules/config/malloc.nix index a3eb55d8a4..fc35993b5a 100644 --- a/third_party/nixpkgs/nixos/modules/config/malloc.nix +++ b/third_party/nixpkgs/nixos/modules/config/malloc.nix @@ -87,5 +87,12 @@ in environment.etc."ld-nix.so.preload".text = '' ${providerLibPath} ''; + security.apparmor.includes = { + "abstractions/base" = '' + r /etc/ld-nix.so.preload, + r ${config.environment.etc."ld-nix.so.preload".source}, + mr ${providerLibPath}, + ''; + }; }; } diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 803bae4212..12ad8a4ae0 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -9,7 +9,7 @@ with lib; isoImage.edition = "gnome"; - services.xserver.desktopManager.gnome3 = { + services.xserver.desktopManager.gnome = { # Add firefox to favorite-apps favoriteAppsOverride = '' [org.gnome.shell] diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix index 1418420afc..324b38070e 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix @@ -162,12 +162,14 @@ let isolinuxCfg = concatStringsSep "\n" ([ baseIsolinuxCfg ] ++ optional config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); + refindBinary = if targetArch == "x64" || targetArch == "aa64" then "refind_${targetArch}.efi" else null; + # Setup instructions for rEFInd. refind = - if targetArch == "x64" then + if refindBinary != null then '' # Adds rEFInd to the ISO. - cp -v ${pkgs.refind}/share/refind/refind_x64.efi $out/EFI/boot/ + cp -v ${pkgs.refind}/share/refind/${refindBinary} $out/EFI/boot/ '' else "# No refind for ${targetArch}" @@ -186,7 +188,10 @@ let # Fonts can be loaded? # (This font is assumed to always be provided as a fallback by NixOS) - if loadfont (hd0)/EFI/boot/unicode.pf2; then + if loadfont /EFI/boot/unicode.pf2; then + set with_fonts=true + fi + if [ "\$textmode" != "true" -a "\$with_fonts" == "true" ]; then # Use graphical term, it can be either with background image or a theme. # input is "console", while output is "gfxterm". # This enables "serial" input and output only when possible. @@ -207,11 +212,11 @@ let ${ # When there is a theme configured, use it, otherwise use the background image. if config.isoImage.grubTheme != null then '' # Sets theme. - set theme=(hd0)/EFI/boot/grub-theme/theme.txt + set theme=/EFI/boot/grub-theme/theme.txt # Load theme fonts - $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (hd0)/EFI/boot/grub-theme/%P\n") + $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont /EFI/boot/grub-theme/%P\n") '' else '' - if background_image (hd0)/EFI/boot/efi-background.png; then + if background_image /EFI/boot/efi-background.png; then # Black background means transparent background when there # is a background image set... This seems undocumented :( set color_normal=black/black @@ -228,7 +233,10 @@ let # Notes about grub: # * Yes, the grubMenuCfg has to be repeated in all submenus. Otherwise you # will get white-on-black console-like text on sub-menus. *sigh* - efiDir = pkgs.runCommand "efi-directory" {} '' + efiDir = pkgs.runCommand "efi-directory" { + nativeBuildInputs = [ pkgs.buildPackages.grub2_efi ]; + strictDeps = true; + } '' mkdir -p $out/EFI/boot/ # ALWAYS required modules. @@ -258,12 +266,14 @@ let # Make our own efi program, we can't rely on "grub-install" since it seems to # probe for devices, even with --skip-fs-probe. - ${grubPkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/boot${targetArch}.efi -p /EFI/boot -O ${grubPkgs.grub2_efi.grubTarget} \ + grub-mkimage --directory=${grubPkgs.grub2_efi}/lib/grub/${grubPkgs.grub2_efi.grubTarget} -o $out/EFI/boot/boot${targetArch}.efi -p /EFI/boot -O ${grubPkgs.grub2_efi.grubTarget} \ $MODULES cp ${grubPkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/ cat < $out/EFI/boot/grub.cfg + set with_fonts=false + set textmode=false # If you want to use serial for "terminal_*" commands, you need to set one up: # Example manual configuration: # → serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1 @@ -273,8 +283,28 @@ let export with_serial clear set timeout=10 + + # This message will only be viewable when "gfxterm" is not used. + echo "" + echo "Loading graphical boot menu..." + echo "" + echo "Press 't' to use the text boot menu on this console..." + echo "" + ${grubMenuCfg} + hiddenentry 'Text mode' --hotkey 't' { + loadfont /EFI/boot/unicode.pf2 + set textmode=true + terminal_output gfxterm console + } + hiddenentry 'GUI mode' --hotkey 'g' { + $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont /EFI/boot/grub-theme/%P\n") + set textmode=false + terminal_output gfxterm + } + + # If the parameter iso_path is set, append the findiso parameter to the kernel # line. We need this to allow the nixos iso to be booted from grub directly. if [ \''${iso_path} ] ; then @@ -337,11 +367,15 @@ let } } - menuentry 'rEFInd' --class refind { - # UUID is hard-coded in the derivation. - search --set=root --no-floppy --fs-uuid 1234-5678 - chainloader (\$root)/EFI/boot/refind_x64.efi - } + ${lib.optionalString (refindBinary != null) '' + # GRUB apparently cannot do "chainloader" operations on "CD". + if [ "\$root" != "cd0" ]; then + menuentry 'rEFInd' --class refind { + # \$root defaults to the drive the EFI is found on. + chainloader (\$root)/EFI/boot/${refindBinary} + } + fi + ''} menuentry 'Firmware Setup' --class settings { fwsetup clear @@ -357,7 +391,10 @@ let ${refind} ''; - efiImg = pkgs.runCommand "efi-image_eltorito" { buildInputs = [ pkgs.mtools pkgs.libfaketime ]; } + efiImg = pkgs.runCommand "efi-image_eltorito" { + nativeBuildInputs = [ pkgs.buildPackages.mtools pkgs.buildPackages.libfaketime pkgs.buildPackages.dosfstools ]; + strictDeps = true; + } # Be careful about determinism: du --apparent-size, # dates (cp -p, touch, mcopy -m, faketime for label), IDs (mkfs.vfat -i) '' @@ -377,10 +414,10 @@ let echo "Usage size: $usage_size" echo "Image size: $image_size" truncate --size=$image_size "$out" - ${pkgs.libfaketime}/bin/faketime "2000-01-01 00:00:00" ${pkgs.dosfstools}/sbin/mkfs.vfat -i 12345678 -n EFIBOOT "$out" + faketime "2000-01-01 00:00:00" mkfs.vfat -i 12345678 -n EFIBOOT "$out" mcopy -psvm -i "$out" ./EFI ./boot :: # Verify the FAT partition. - ${pkgs.dosfstools}/sbin/fsck.vfat -vn "$out" + fsck.vfat -vn "$out" ''; # */ # Name used by UEFI for architectures. @@ -389,6 +426,8 @@ let "ia32" else if pkgs.stdenv.isx86_64 then "x64" + else if pkgs.stdenv.isAarch32 then + "arm" else if pkgs.stdenv.isAarch64 then "aa64" else diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix deleted file mode 100644 index 79db1fa29b..0000000000 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, ... }: -{ - imports = [ - ../sd-card/sd-image-raspberrypi4-installer.nix - ]; - config = { - warnings = [ - '' - .../cd-dvd/sd-image-raspberrypi4.nix is deprecated and will eventually be removed. - Please switch to .../sd-card/sd-image-raspberrypi4-installer.nix, instead. - '' - ]; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image-aarch64.nix b/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image-aarch64.nix index 96ebb7537d..165e2aac27 100644 --- a/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image-aarch64.nix +++ b/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image-aarch64.nix @@ -18,13 +18,6 @@ # - ttyAMA0: for QEMU's -machine virt boot.kernelParams = ["console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; - boot.initrd.availableKernelModules = [ - # Allows early (earlier) modesetting for the Raspberry Pi - "vc4" "bcm2835_dma" "i2c_bcm2835" - # Allows early (earlier) modesetting for Allwinner SoCs - "sun4i_drm" "sun8i_drm_hdmi" "sun8i_mixer" - ]; - sdImage = { populateFirmwareCommands = let configTxt = pkgs.writeText "config.txt" '' diff --git a/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image-raspberrypi4-installer.nix b/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image-raspberrypi4-installer.nix deleted file mode 100644 index 59423e40b6..0000000000 --- a/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image-raspberrypi4-installer.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - imports = [ - ../../profiles/installation-device.nix - ./sd-image-raspberrypi4.nix - ]; - - # the installation media is also the installation target, - # so we don't want to provide the installation configuration.nix. - installer.cloneConfig = false; -} diff --git a/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix b/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix deleted file mode 100644 index 35a12c5382..0000000000 --- a/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix +++ /dev/null @@ -1,8 +0,0 @@ -# To build, use: -# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix -A config.system.build.sdImage -{ config, lib, pkgs, ... }: - -{ - imports = [ ./sd-image-aarch64.nix ]; - boot.kernelPackages = pkgs.linuxPackages_rpi4; -} diff --git a/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image.nix b/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image.nix index 45c8c67169..d0fe79903d 100644 --- a/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image.nix +++ b/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image.nix @@ -29,6 +29,7 @@ in imports = [ (mkRemovedOptionModule [ "sdImage" "bootPartitionID" ] "The FAT partition for SD image now only holds the Raspberry Pi firmware files. Use firmwarePartitionID to configure that partition's ID.") (mkRemovedOptionModule [ "sdImage" "bootSize" ] "The boot files for SD image have been moved to the main ext4 partition. The FAT partition now only holds the Raspberry Pi firmware files. Changing its size may not be required.") + ../../profiles/all-hardware.nix ]; options.sdImage = { diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix index 6b1f54beee..801e28cec4 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/iwfs2bfcy7lqwhri94p2i6jc87ih55zk-nix-2.3.10"; - i686-linux = "/nix/store/a3ccfvy9i5n418d5v0bir330kbcz3vj8-nix-2.3.10"; - aarch64-linux = "/nix/store/bh5g6cv7bv35iz853d3xv2sphn51ybmb-nix-2.3.10"; - x86_64-darwin = "/nix/store/8c98r6zlwn2d40qm7jnnrr2rdlqviszr-nix-2.3.10"; + x86_64-linux = "/nix/store/d1ppfhjhdwcsb4npfzyifv5z8i00fzsk-nix-2.3.11"; + i686-linux = "/nix/store/c6ikndcrzwpfn2sb5b9xb1f17p9b8iga-nix-2.3.11"; + aarch64-linux = "/nix/store/fb0lfrn0m8s197d264jzd64vhz9c8zbx-nix-2.3.11"; + x86_64-darwin = "/nix/store/qvb86ffv08q3r66qbd6nqifz425lyyhf-nix-2.3.11"; } diff --git a/third_party/nixpkgs/nixos/modules/installer/virtualbox-demo.nix b/third_party/nixpkgs/nixos/modules/installer/virtualbox-demo.nix index af3e1aecca..2768e17590 100644 --- a/third_party/nixpkgs/nixos/modules/installer/virtualbox-demo.nix +++ b/third_party/nixpkgs/nixos/modules/installer/virtualbox-demo.nix @@ -44,7 +44,7 @@ with lib; # Enable GDM/GNOME by uncommenting above two lines and two lines below. # services.xserver.displayManager.gdm.enable = true; - # services.xserver.desktopManager.gnome3.enable = true; + # services.xserver.desktopManager.gnome.enable = true; # Set your time zone. # time.timeZone = "Europe/Amsterdam"; diff --git a/third_party/nixpkgs/nixos/modules/misc/ids.nix b/third_party/nixpkgs/nixos/modules/misc/ids.nix index 1fd56adfe1..05cc5002aa 100644 --- a/third_party/nixpkgs/nixos/modules/misc/ids.nix +++ b/third_party/nixpkgs/nixos/modules/misc/ids.nix @@ -315,7 +315,7 @@ in restya-board = 284; mighttpd2 = 285; hass = 286; - monero = 287; + #monero = 287; # dynamically allocated as of 2021-05-08 ceph = 288; duplicati = 289; monetdb = 290; @@ -617,7 +617,7 @@ in restya-board = 284; mighttpd2 = 285; hass = 286; - monero = 287; + # monero = 287; # dynamically allocated as of 2021-05-08 ceph = 288; duplicati = 289; monetdb = 290; diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 0c0935a799..dea0ca1356 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -163,6 +163,7 @@ ./programs/neovim.nix ./programs/nm-applet.nix ./programs/npm.nix + ./programs/noisetorch.nix ./programs/oblogout.nix ./programs/partition-manager.nix ./programs/plotinus.nix @@ -211,7 +212,6 @@ ./rename.nix ./security/acme.nix ./security/apparmor.nix - ./security/apparmor-suid.nix ./security/audit.nix ./security/auditd.nix ./security/ca.nix @@ -339,21 +339,21 @@ ./services/desktops/malcontent.nix ./services/desktops/pipewire/pipewire.nix ./services/desktops/pipewire/pipewire-media-session.nix - ./services/desktops/gnome3/at-spi2-core.nix - ./services/desktops/gnome3/chrome-gnome-shell.nix - ./services/desktops/gnome3/evolution-data-server.nix - ./services/desktops/gnome3/glib-networking.nix - ./services/desktops/gnome3/gnome-initial-setup.nix - ./services/desktops/gnome3/gnome-keyring.nix - ./services/desktops/gnome3/gnome-online-accounts.nix - ./services/desktops/gnome3/gnome-online-miners.nix - ./services/desktops/gnome3/gnome-remote-desktop.nix - ./services/desktops/gnome3/gnome-settings-daemon.nix - ./services/desktops/gnome3/gnome-user-share.nix - ./services/desktops/gnome3/rygel.nix - ./services/desktops/gnome3/sushi.nix - ./services/desktops/gnome3/tracker.nix - ./services/desktops/gnome3/tracker-miners.nix + ./services/desktops/gnome/at-spi2-core.nix + ./services/desktops/gnome/chrome-gnome-shell.nix + ./services/desktops/gnome/evolution-data-server.nix + ./services/desktops/gnome/glib-networking.nix + ./services/desktops/gnome/gnome-initial-setup.nix + ./services/desktops/gnome/gnome-keyring.nix + ./services/desktops/gnome/gnome-online-accounts.nix + ./services/desktops/gnome/gnome-online-miners.nix + ./services/desktops/gnome/gnome-remote-desktop.nix + ./services/desktops/gnome/gnome-settings-daemon.nix + ./services/desktops/gnome/gnome-user-share.nix + ./services/desktops/gnome/rygel.nix + ./services/desktops/gnome/sushi.nix + ./services/desktops/gnome/tracker.nix + ./services/desktops/gnome/tracker-miners.nix ./services/desktops/neard.nix ./services/desktops/profile-sync-daemon.nix ./services/desktops/system-config-printer.nix @@ -472,6 +472,7 @@ ./services/misc/cgminer.nix ./services/misc/confd.nix ./services/misc/couchpotato.nix + ./services/misc/dendrite.nix ./services/misc/devmon.nix ./services/misc/dictd.nix ./services/misc/duckling.nix @@ -514,7 +515,6 @@ ./services/misc/mame.nix ./services/misc/matrix-appservice-discord.nix ./services/misc/matrix-appservice-irc.nix - ./services/misc/matrix-dendrite.nix ./services/misc/matrix-synapse.nix ./services/misc/mautrix-telegram.nix ./services/misc/mbpfan.nix @@ -690,6 +690,7 @@ ./services/networking/gale.nix ./services/networking/gateone.nix ./services/networking/gdomap.nix + ./services/networking/ghostunnel.nix ./services/networking/git-daemon.nix ./services/networking/gnunet.nix ./services/networking/go-neb.nix @@ -896,6 +897,7 @@ ./services/system/kerberos/default.nix ./services/system/nscd.nix ./services/system/saslauthd.nix + ./services/system/self-deploy.nix ./services/system/uptimed.nix ./services/torrent/deluge.nix ./services/torrent/flexget.nix diff --git a/third_party/nixpkgs/nixos/modules/profiles/all-hardware.nix b/third_party/nixpkgs/nixos/modules/profiles/all-hardware.nix index d460c52dbe..797fcddb8c 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/all-hardware.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/all-hardware.nix @@ -37,6 +37,9 @@ in # drives. "uas" + # SD cards. + "sdhci_pci" + # Firewire support. Not tested. "ohci1394" "sbp2" @@ -46,11 +49,66 @@ in # VMware support. "mptspi" "vmxnet3" "vsock" ] ++ lib.optional platform.isx86 "vmw_balloon" - ++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing + ++ lib.optionals (!platform.isAarch64 && !platform.isAarch32) [ # not sure where else they're missing "vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport" # Hyper-V support. "hv_storvsc" + ] ++ lib.optionals (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [ + # Most of the following falls into two categories: + # - early KMS / early display + # - early storage (e.g. USB) support + + # Allows using framebuffer configured by the initial boot firmware + "simplefb" + + # Allwinner support + + # Required for early KMS + "sun4i-drm" + "sun8i-mixer" # Audio, but required for kms + + # PWM for the backlight + "pwm-sun4i" + + # Broadcom + + "vc4" + ] ++ lib.optionals pkgs.stdenv.isAarch64 [ + # Most of the following falls into two categories: + # - early KMS / early display + # - early storage (e.g. USB) support + + # Broadcom + + "pcie-brcmstb" + + # Rockchip + "dw-hdmi" + "dw-mipi-dsi" + "rockchipdrm" + "rockchip-rga" + "phy-rockchip-pcie" + "pcie-rockchip-host" + + # Misc. uncategorized hardware + + # Used for some platform's integrated displays + "panel-simple" + "pwm-bl" + + # Power supply drivers, some platforms need them for USB + "axp20x-ac-power" + "axp20x-battery" + "pinctrl-axp209" + "mp8859" + + # USB drivers + "xhci-pci-renesas" + + # Misc "weak" dependencies + "analogix-dp" + "analogix-anx6345" # For DP or eDP (e.g. integrated display) ]; # Include lots of firmware. diff --git a/third_party/nixpkgs/nixos/modules/profiles/hardened.nix b/third_party/nixpkgs/nixos/modules/profiles/hardened.nix index 00aafc6831..3f8f78f012 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/hardened.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/hardened.nix @@ -36,6 +36,7 @@ with lib; security.virtualisation.flushL1DataCache = mkDefault "always"; security.apparmor.enable = mkDefault true; + security.apparmor.killUnconfinedConfinables = mkDefault true; boot.kernelParams = [ # Slab/slub sanity checks, redzoning, and poisoning diff --git a/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix b/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix index 7dc493fb49..8e3aa20daa 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix @@ -99,5 +99,13 @@ with lib; # because we have the firewall enabled. This makes installs from the # console less cumbersome if the machine has a public IP. networking.firewall.logRefusedConnections = mkDefault false; + + # Prevent installation media from evacuating persistent storage, as their + # var directory is not persistent and it would thus result in deletion of + # those entries. + environment.etc."systemd/pstore.conf".text = '' + [PStore] + Unlink=no + ''; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/atop.nix b/third_party/nixpkgs/nixos/modules/programs/atop.nix index 7ef8d687ca..47597a0a4d 100644 --- a/third_party/nixpkgs/nixos/modules/programs/atop.nix +++ b/third_party/nixpkgs/nixos/modules/programs/atop.nix @@ -1,6 +1,6 @@ # Global configuration for atop. -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -12,11 +12,83 @@ in options = { - programs.atop = { + programs.atop = rec { + enable = mkEnableOption "Atop"; + + package = mkOption { + type = types.package; + default = pkgs.atop; + description = '' + Which package to use for Atop. + ''; + }; + + netatop = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to install and enable the netatop kernel module. + Note: this sets the kernel taint flag "O" for loading out-of-tree modules. + ''; + }; + package = mkOption { + type = types.package; + default = config.boot.kernelPackages.netatop; + description = '' + Which package to use for netatop. + ''; + }; + }; + + atopgpu.enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to install and enable the atopgpud daemon to get information about + NVIDIA gpus. + ''; + }; + + setuidWrapper.enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to install a setuid wrapper for Atop. This is required to use some of + the features as non-root user (e.g.: ipc information, netatop, atopgpu). + Atop tries to drop the root privileges shortly after starting. + ''; + }; + + atopService.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable the atop service responsible for storing statistics for + long-term analysis. + ''; + }; + atopRotateTimer.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable the atop-rotate timer, which restarts the atop service + daily to make sure the data files are rotate. + ''; + }; + atopacctService.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable the atopacct service which manages process accounting. + This allows Atop to gather data about processes that disappeared in between + two refresh intervals. + ''; + }; settings = mkOption { type = types.attrs; - default = {}; + default = { }; example = { flags = "a1f"; interval = 5; @@ -25,12 +97,50 @@ in Parameters to be written to /etc/atoprc. ''; }; - }; }; - config = mkIf (cfg.settings != {}) { - environment.etc.atoprc.text = - concatStrings (mapAttrsToList (n: v: "${n} ${toString v}\n") cfg.settings); - }; + config = mkIf cfg.enable ( + let + atop = + if cfg.atopgpu.enable then + (cfg.package.override { withAtopgpu = true; }) + else + cfg.package; + in + { + environment.etc = mkIf (cfg.settings != { }) { + atoprc.text = concatStrings + (mapAttrsToList + (n: v: '' + ${n} ${toString v} + '') + cfg.settings); + }; + environment.systemPackages = [ atop (lib.mkIf cfg.netatop.enable cfg.netatop.package) ]; + boot.extraModulePackages = [ (lib.mkIf cfg.netatop.enable cfg.netatop.package) ]; + systemd = + let + mkSystemd = type: cond: name: restartTriggers: { + ${name} = lib.mkIf cond { + inherit restartTriggers; + wantedBy = [ (if type == "services" then "multi-user.target" else if type == "timers" then "timers.target" else null) ]; + }; + }; + mkService = mkSystemd "services"; + mkTimer = mkSystemd "timers"; + in + { + packages = [ atop (lib.mkIf cfg.netatop.enable cfg.netatop.package) ]; + services = + mkService cfg.atopService.enable "atop" [ atop ] + // mkService cfg.atopacctService.enable "atopacct" [ atop ] + // mkService cfg.netatop.enable "netatop" [ cfg.netatop.package ] + // mkService cfg.atopgpu.enable "atopgpu" [ atop ]; + timers = mkTimer cfg.atopRotateTimer.enable "atop-rotate" [ atop ]; + }; + security.wrappers = + lib.mkIf cfg.setuidWrapper.enable { atop = { source = "${atop}/bin/atop"; }; }; + } + ); } diff --git a/third_party/nixpkgs/nixos/modules/programs/dconf.nix b/third_party/nixpkgs/nixos/modules/programs/dconf.nix index ec85cb9d18..298abac8af 100644 --- a/third_party/nixpkgs/nixos/modules/programs/dconf.nix +++ b/third_party/nixpkgs/nixos/modules/programs/dconf.nix @@ -54,6 +54,8 @@ in services.dbus.packages = [ pkgs.dconf ]; + systemd.packages = [ pkgs.dconf ]; + # For dconf executable environment.systemPackages = [ pkgs.dconf ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/file-roller.nix b/third_party/nixpkgs/nixos/modules/programs/file-roller.nix index 64f6a94e76..b939d59909 100644 --- a/third_party/nixpkgs/nixos/modules/programs/file-roller.nix +++ b/third_party/nixpkgs/nixos/modules/programs/file-roller.nix @@ -30,9 +30,9 @@ with lib; config = mkIf config.programs.file-roller.enable { - environment.systemPackages = [ pkgs.gnome3.file-roller ]; + environment.systemPackages = [ pkgs.gnome.file-roller ]; - services.dbus.packages = [ pkgs.gnome3.file-roller ]; + services.dbus.packages = [ pkgs.gnome.file-roller ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/geary.nix b/third_party/nixpkgs/nixos/modules/programs/geary.nix index 5e441a75cb..407680c30d 100644 --- a/third_party/nixpkgs/nixos/modules/programs/geary.nix +++ b/third_party/nixpkgs/nixos/modules/programs/geary.nix @@ -15,10 +15,10 @@ in { }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.gnome3.geary ]; + environment.systemPackages = [ pkgs.gnome.geary ]; programs.dconf.enable = true; - services.gnome3.gnome-keyring.enable = true; - services.gnome3.gnome-online-accounts.enable = true; + services.gnome.gnome-keyring.enable = true; + services.gnome.gnome-online-accounts.enable = true; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/gnome-disks.nix b/third_party/nixpkgs/nixos/modules/programs/gnome-disks.nix index 80dc2983ea..4b128b4712 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gnome-disks.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gnome-disks.nix @@ -41,9 +41,9 @@ with lib; config = mkIf config.programs.gnome-disks.enable { - environment.systemPackages = [ pkgs.gnome3.gnome-disk-utility ]; + environment.systemPackages = [ pkgs.gnome.gnome-disk-utility ]; - services.dbus.packages = [ pkgs.gnome3.gnome-disk-utility ]; + services.dbus.packages = [ pkgs.gnome.gnome-disk-utility ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/gnome-documents.nix b/third_party/nixpkgs/nixos/modules/programs/gnome-documents.nix index 9dd5348305..43ad3163ef 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gnome-documents.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gnome-documents.nix @@ -13,7 +13,7 @@ with lib; # Added 2019-08-09 imports = [ (mkRenamedOptionModule - [ "services" "gnome3" "gnome-documents" "enable" ] + [ "services" "gnome" "gnome-documents" "enable" ] [ "programs" "gnome-documents" "enable" ]) ]; @@ -41,13 +41,13 @@ with lib; config = mkIf config.programs.gnome-documents.enable { - environment.systemPackages = [ pkgs.gnome3.gnome-documents ]; + environment.systemPackages = [ pkgs.gnome.gnome-documents ]; - services.dbus.packages = [ pkgs.gnome3.gnome-documents ]; + services.dbus.packages = [ pkgs.gnome.gnome-documents ]; - services.gnome3.gnome-online-accounts.enable = true; + services.gnome.gnome-online-accounts.enable = true; - services.gnome3.gnome-online-miners.enable = true; + services.gnome.gnome-online-miners.enable = true; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/gnome-terminal.nix b/third_party/nixpkgs/nixos/modules/programs/gnome-terminal.nix index f2617e5bc0..71a6b21788 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gnome-terminal.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gnome-terminal.nix @@ -28,9 +28,9 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.gnome3.gnome-terminal ]; - services.dbus.packages = [ pkgs.gnome3.gnome-terminal ]; - systemd.packages = [ pkgs.gnome3.gnome-terminal ]; + environment.systemPackages = [ pkgs.gnome.gnome-terminal ]; + services.dbus.packages = [ pkgs.gnome.gnome-terminal ]; + systemd.packages = [ pkgs.gnome.gnome-terminal ]; programs.bash.vteIntegration = true; programs.zsh.vteIntegration = true; diff --git a/third_party/nixpkgs/nixos/modules/programs/gpaste.nix b/third_party/nixpkgs/nixos/modules/programs/gpaste.nix index 8bc52c28d8..cff2fb8d00 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gpaste.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gpaste.nix @@ -27,10 +27,10 @@ with lib; ###### implementation config = mkIf config.programs.gpaste.enable { - environment.systemPackages = [ pkgs.gnome3.gpaste ]; - services.dbus.packages = [ pkgs.gnome3.gpaste ]; - systemd.packages = [ pkgs.gnome3.gpaste ]; + environment.systemPackages = [ pkgs.gnome.gpaste ]; + services.dbus.packages = [ pkgs.gnome.gpaste ]; + systemd.packages = [ pkgs.gnome.gpaste ]; # gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas. - services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.gnome3.gpaste ]; + services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gnome.gpaste ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/noisetorch.nix b/third_party/nixpkgs/nixos/modules/programs/noisetorch.nix new file mode 100644 index 0000000000..5f3b0c8f5d --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/noisetorch.nix @@ -0,0 +1,25 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let cfg = config.programs.noisetorch; +in { + options.programs.noisetorch = { + enable = mkEnableOption "noisetorch + setcap wrapper"; + + package = mkOption { + type = types.package; + default = pkgs.noisetorch; + description = '' + The noisetorch package to use. + ''; + }; + }; + + config = mkIf cfg.enable { + security.wrappers.noisetorch = { + source = "${cfg.package}/bin/noisetorch"; + capabilities = "cap_sys_resource=+ep"; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/phosh.nix b/third_party/nixpkgs/nixos/modules/programs/phosh.nix index f6faf7990d..1f50065f78 100644 --- a/third_party/nixpkgs/nixos/modules/programs/phosh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/phosh.nix @@ -145,18 +145,10 @@ in { programs.feedbackd.enable = true; - # https://source.puri.sm/Librem5/phosh/-/issues/303 - security.pam.services.phosh = { - text = '' - auth requisite pam_nologin.so - auth required pam_succeed_if.so user != root quiet_success - auth required pam_securetty.so - auth requisite pam_nologin.so - ''; - }; + security.pam.services.phosh = {}; - services.gnome3.core-shell.enable = true; - services.gnome3.core-os-services.enable = true; + services.gnome.core-shell.enable = true; + services.gnome.core-os-services.enable = true; services.xserver.displayManager.sessionPackages = [ pkgs.phosh ]; environment.etc."phosh/phoc.ini".source = diff --git a/third_party/nixpkgs/nixos/modules/programs/seahorse.nix b/third_party/nixpkgs/nixos/modules/programs/seahorse.nix index b229d2a2c0..c0a356bff5 100644 --- a/third_party/nixpkgs/nixos/modules/programs/seahorse.nix +++ b/third_party/nixpkgs/nixos/modules/programs/seahorse.nix @@ -31,14 +31,14 @@ with lib; config = mkIf config.programs.seahorse.enable { - programs.ssh.askPassword = mkDefault "${pkgs.gnome3.seahorse}/libexec/seahorse/ssh-askpass"; + programs.ssh.askPassword = mkDefault "${pkgs.gnome.seahorse}/libexec/seahorse/ssh-askpass"; environment.systemPackages = [ - pkgs.gnome3.seahorse + pkgs.gnome.seahorse ]; services.dbus.packages = [ - pkgs.gnome3.seahorse + pkgs.gnome.seahorse ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/sway.nix b/third_party/nixpkgs/nixos/modules/programs/sway.nix index 107e783c0c..3c09d9f00f 100644 --- a/third_party/nixpkgs/nixos/modules/programs/sway.nix +++ b/third_party/nixpkgs/nixos/modules/programs/sway.nix @@ -31,6 +31,7 @@ let extraOptions = cfg.extraOptions; withBaseWrapper = cfg.wrapperFeatures.base; withGtkWrapper = cfg.wrapperFeatures.gtk; + isNixOS = true; }; in { options.programs.sway = { @@ -38,9 +39,8 @@ in { Sway, the i3-compatible tiling Wayland compositor. You can manually launch Sway by executing "exec sway" on a TTY. Copy /etc/sway/config to ~/.config/sway/config to modify the default configuration. See - https://github.com/swaywm/sway/wiki and "man 5 sway" for more information. - Please have a look at the "extraSessionCommands" example for running - programs natively under Wayland''; + and + "man 5 sway" for more information''; wrapperFeatures = mkOption { type = wrapperOptions; @@ -55,16 +55,20 @@ in { type = types.lines; default = ""; example = '' + # SDL: export SDL_VIDEODRIVER=wayland - # needs qt5.qtwayland in systemPackages - export QT_QPA_PLATFORM=wayland + # QT (needs qt5.qtwayland in systemPackages): + export QT_QPA_PLATFORM=wayland-egl export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" # Fix for some Java AWT applications (e.g. Android Studio), # use this if they aren't displayed properly: export _JAVA_AWT_WM_NONREPARENTING=1 ''; description = '' - Shell commands executed just before Sway is started. + Shell commands executed just before Sway is started. See + + and + for some useful environment variables. ''; }; @@ -94,13 +98,15 @@ in { ''; example = literalExample '' with pkgs; [ - xwayland i3status i3status-rust termite rofi light ] ''; description = '' - Extra packages to be installed system wide. + Extra packages to be installed system wide. See + and + + for a list of useful software. ''; }; @@ -120,8 +126,11 @@ in { systemPackages = [ swayPackage ] ++ cfg.extraPackages; etc = { "sway/config".source = mkOptionDefault "${swayPackage}/etc/sway/config"; - #"sway/security.d".source = mkOptionDefault "${swayPackage}/etc/sway/security.d/"; - #"sway/config.d".source = mkOptionDefault "${swayPackage}/etc/sway/config.d/"; + "sway/config.d/nixos.conf".source = pkgs.writeText "nixos.conf" '' + # Import the most important environment variables into the D-Bus and systemd + # user environments (e.g. required for screen sharing and Pinentry prompts): + exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP + ''; }; }; security.pam.services.swaylock = {}; @@ -131,7 +140,9 @@ in { # To make a Sway session available if a display manager like SDDM is enabled: services.xserver.displayManager.sessionPackages = [ swayPackage ]; programs.xwayland.enable = mkDefault true; + # For screen sharing (this option only has an effect with xdg.portal.enable): + xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr ]; }; - meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ]; + meta.maintainers = with lib.maintainers; [ primeos colemickens ]; } diff --git a/third_party/nixpkgs/nixos/modules/security/apparmor-suid.nix b/third_party/nixpkgs/nixos/modules/security/apparmor-suid.nix deleted file mode 100644 index 6c479e070e..0000000000 --- a/third_party/nixpkgs/nixos/modules/security/apparmor-suid.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.security.apparmor; -in -with lib; -{ - imports = [ - (mkRenamedOptionModule [ "security" "virtualization" "flushL1DataCache" ] [ "security" "virtualisation" "flushL1DataCache" ]) - ]; - - options.security.apparmor.confineSUIDApplications = mkOption { - type = types.bool; - default = true; - description = '' - Install AppArmor profiles for commonly-used SUID application - to mitigate potential privilege escalation attacks due to bugs - in such applications. - - Currently available profiles: ping - ''; - }; - - config = mkIf (cfg.confineSUIDApplications) { - security.apparmor.profiles = [ (pkgs.writeText "ping" '' - #include - /run/wrappers/bin/ping { - #include - #include - #include - - capability net_raw, - capability setuid, - network inet raw, - - ${pkgs.stdenv.cc.libc.out}/lib/*.so mr, - ${pkgs.libcap.lib}/lib/libcap.so* mr, - ${pkgs.attr.out}/lib/libattr.so* mr, - - ${pkgs.iputils}/bin/ping mixr, - - #/etc/modules.conf r, - - ## Site-specific additions and overrides. See local/README for details. - ##include - } - '') ]; - }; - -} diff --git a/third_party/nixpkgs/nixos/modules/security/apparmor.nix b/third_party/nixpkgs/nixos/modules/security/apparmor.nix index cfc65b347b..be1b0362fc 100644 --- a/third_party/nixpkgs/nixos/modules/security/apparmor.nix +++ b/third_party/nixpkgs/nixos/modules/security/apparmor.nix @@ -1,59 +1,216 @@ { config, lib, pkgs, ... }: +with lib; + let - inherit (lib) mkIf mkOption types concatMapStrings; + inherit (builtins) attrNames head map match readFile; + inherit (lib) types; + inherit (config.environment) etc; cfg = config.security.apparmor; + mkDisableOption = name: mkEnableOption name // { + default = true; + example = false; + }; + enabledPolicies = filterAttrs (n: p: p.enable) cfg.policies; in { - options = { - security.apparmor = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable the AppArmor Mandatory Access Control system."; - }; - profiles = mkOption { - type = types.listOf types.path; - default = []; - description = "List of files containing AppArmor profiles."; - }; - packages = mkOption { - type = types.listOf types.package; - default = []; - description = "List of packages to be added to apparmor's include path"; - }; - }; - }; + imports = [ + (mkRemovedOptionModule [ "security" "apparmor" "confineSUIDApplications" ] "Please use the new options: `security.apparmor.policies..enable'.") + (mkRemovedOptionModule [ "security" "apparmor" "profiles" ] "Please use the new option: `security.apparmor.policies'.") + apparmor/includes.nix + apparmor/profiles.nix + ]; - config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.apparmor-utils ]; + options = { + security.apparmor = { + enable = mkEnableOption '' + the AppArmor Mandatory Access Control system. - boot.kernelParams = [ "apparmor=1" "security=apparmor" ]; + If you're enabling this module on a running system, + note that a reboot will be required to activate AppArmor in the kernel. - systemd.services.apparmor = let - paths = concatMapStrings (s: " -I ${s}/etc/apparmor.d") - ([ pkgs.apparmor-profiles ] ++ cfg.packages); - in { - after = [ "local-fs.target" ]; - before = [ "sysinit.target" ]; - wantedBy = [ "multi-user.target" ]; - unitConfig = { - DefaultDependencies = "no"; - }; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = "yes"; - ExecStart = map (p: - ''${pkgs.apparmor-parser}/bin/apparmor_parser -rKv ${paths} "${p}"'' - ) cfg.profiles; - ExecStop = map (p: - ''${pkgs.apparmor-parser}/bin/apparmor_parser -Rv "${p}"'' - ) cfg.profiles; - ExecReload = map (p: - ''${pkgs.apparmor-parser}/bin/apparmor_parser --reload ${paths} "${p}"'' - ) cfg.profiles; - }; - }; - }; + Also, beware that enabling this module privileges stability over security + by not trying to kill unconfined but newly confinable running processes by default, + though it would be needed because AppArmor can only confine new + or already confined processes of an executable. + This killing would for instance be necessary when upgrading to a NixOS revision + introducing for the first time an AppArmor profile for the executable + of a running process. + + Enable + if you want this service to do such killing + by sending a SIGTERM to those running processes''; + policies = mkOption { + description = '' + AppArmor policies. + ''; + type = types.attrsOf (types.submodule ({ name, config, ... }: { + options = { + enable = mkDisableOption "loading of the profile into the kernel"; + enforce = mkDisableOption "enforcing of the policy or only complain in the logs"; + profile = mkOption { + description = "The policy of the profile."; + type = types.lines; + apply = pkgs.writeText name; + }; + }; + })); + default = {}; + }; + includes = mkOption { + type = types.attrsOf types.lines; + default = {}; + description = '' + List of paths to be added to AppArmor's searched paths + when resolving include directives. + ''; + apply = mapAttrs pkgs.writeText; + }; + packages = mkOption { + type = types.listOf types.package; + default = []; + description = "List of packages to be added to AppArmor's include path"; + }; + enableCache = mkEnableOption '' + caching of AppArmor policies + in /var/cache/apparmor/. + + Beware that AppArmor policies almost always contain Nix store paths, + and thus produce at each change of these paths + a new cached version accumulating in the cache''; + killUnconfinedConfinables = mkEnableOption '' + killing of processes which have an AppArmor profile enabled + (in ) + but are not confined (because AppArmor can only confine new processes). + + This is only sending a gracious SIGTERM signal to the processes, + not a SIGKILL. + + Beware that due to a current limitation of AppArmor, + only profiles with exact paths (and no name) can enable such kills''; + }; + }; + + config = mkIf cfg.enable { + assertions = map (policy: + { assertion = match ".*/.*" policy == null; + message = "`security.apparmor.policies.\"${policy}\"' must not contain a slash."; + # Because, for instance, aa-remove-unknown uses profiles_names_list() in rc.apparmor.functions + # which does not recurse into sub-directories. + } + ) (attrNames cfg.policies); + + environment.systemPackages = [ + pkgs.apparmor-utils + pkgs.apparmor-bin-utils + ]; + environment.etc."apparmor.d".source = pkgs.linkFarm "apparmor.d" ( + # It's important to put only enabledPolicies here and not all cfg.policies + # because aa-remove-unknown reads profiles from all /etc/apparmor.d/* + mapAttrsToList (name: p: { inherit name; path = p.profile; }) enabledPolicies ++ + mapAttrsToList (name: path: { inherit name path; }) cfg.includes + ); + environment.etc."apparmor/parser.conf".text = '' + ${if cfg.enableCache then "write-cache" else "skip-cache"} + cache-loc /var/cache/apparmor + Include /etc/apparmor.d + '' + + concatMapStrings (p: "Include ${p}/etc/apparmor.d\n") cfg.packages; + # For aa-logprof + environment.etc."apparmor/apparmor.conf".text = '' + ''; + # For aa-logprof + environment.etc."apparmor/severity.db".source = pkgs.apparmor-utils + "/etc/apparmor/severity.db"; + environment.etc."apparmor/logprof.conf".source = pkgs.runCommand "logprof.conf" { + header = '' + [settings] + # /etc/apparmor.d/ is read-only on NixOS + profiledir = /var/cache/apparmor/logprof + inactive_profiledir = /etc/apparmor.d/disable + # Use: journalctl -b --since today --grep audit: | aa-logprof + logfiles = /dev/stdin + + parser = ${pkgs.apparmor-parser}/bin/apparmor_parser + ldd = ${pkgs.glibc.bin}/bin/ldd + logger = ${pkgs.util-linux}/bin/logger + + # customize how file ownership permissions are presented + # 0 - off + # 1 - default of what ever mode the log reported + # 2 - force the new permissions to be user + # 3 - force all perms on the rule to be user + default_owner_prompt = 1 + + custom_includes = /etc/apparmor.d ${concatMapStringsSep " " (p: "${p}/etc/apparmor.d") cfg.packages} + + [qualifiers] + ${pkgs.runtimeShell} = icnu + ${pkgs.bashInteractive}/bin/sh = icnu + ${pkgs.bashInteractive}/bin/bash = icnu + ${config.users.defaultUserShell} = icnu + ''; + footer = "${pkgs.apparmor-utils}/etc/apparmor/logprof.conf"; + passAsFile = [ "header" ]; + } '' + cp $headerPath $out + sed '1,/\[qualifiers\]/d' $footer >> $out + ''; + + boot.kernelParams = [ "apparmor=1" "security=apparmor" ]; + + systemd.services.apparmor = { + after = [ + "local-fs.target" + "systemd-journald-audit.socket" + ]; + before = [ "sysinit.target" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig = { + Description="Load AppArmor policies"; + DefaultDependencies = "no"; + ConditionSecurity = "apparmor"; + }; + # Reloading instead of restarting enables to load new AppArmor profiles + # without necessarily restarting all services which have Requires=apparmor.service + reloadIfChanged = true; + restartTriggers = [ + etc."apparmor/parser.conf".source + etc."apparmor.d".source + ]; + serviceConfig = let + killUnconfinedConfinables = pkgs.writeShellScript "apparmor-kill" '' + set -eu + ${pkgs.apparmor-bin-utils}/bin/aa-status --json | + ${pkgs.jq}/bin/jq --raw-output '.processes | .[] | .[] | select (.status == "unconfined") | .pid' | + xargs --verbose --no-run-if-empty --delimiter='\n' \ + kill + ''; + commonOpts = p: "--verbose --show-cache ${optionalString (!p.enforce) "--complain "}${p.profile}"; + in { + Type = "oneshot"; + RemainAfterExit = "yes"; + ExecStartPre = "${pkgs.apparmor-utils}/bin/aa-teardown"; + ExecStart = mapAttrsToList (n: p: "${pkgs.apparmor-parser}/bin/apparmor_parser --add ${commonOpts p}") enabledPolicies; + ExecStartPost = optional cfg.killUnconfinedConfinables killUnconfinedConfinables; + ExecReload = + # Add or replace into the kernel profiles in enabledPolicies + # (because AppArmor can do that without stopping the processes already confined). + mapAttrsToList (n: p: "${pkgs.apparmor-parser}/bin/apparmor_parser --replace ${commonOpts p}") enabledPolicies ++ + # Remove from the kernel any profile whose name is not + # one of the names within the content of the profiles in enabledPolicies + # (indirectly read from /etc/apparmor.d/*, without recursing into sub-directory). + # Note that this does not remove profiles dynamically generated by libvirt. + [ "${pkgs.apparmor-utils}/bin/aa-remove-unknown" ] ++ + # Optionaly kill the processes which are unconfined but now have a profile loaded + # (because AppArmor can only start to confine new processes). + optional cfg.killUnconfinedConfinables killUnconfinedConfinables; + ExecStop = "${pkgs.apparmor-utils}/bin/aa-teardown"; + CacheDirectory = [ "apparmor" "apparmor/logprof" ]; + CacheDirectoryMode = "0700"; + }; + }; + }; + + meta.maintainers = with maintainers; [ julm ]; } diff --git a/third_party/nixpkgs/nixos/modules/security/apparmor/includes.nix b/third_party/nixpkgs/nixos/modules/security/apparmor/includes.nix new file mode 100644 index 0000000000..e3dd410b3b --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/security/apparmor/includes.nix @@ -0,0 +1,317 @@ +{ config, lib, pkgs, ... }: +let + inherit (builtins) attrNames hasAttr isAttrs; + inherit (lib) getLib; + inherit (config.environment) etc; + # Utility to generate an AppArmor rule + # only when the given path exists in config.environment.etc + etcRule = arg: + let go = { path ? null, mode ? "r", trail ? "" }: + lib.optionalString (hasAttr path etc) + "${mode} ${config.environment.etc.${path}.source}${trail},"; + in if isAttrs arg + then go arg + else go { path = arg; }; +in +{ +# FIXME: most of the etcRule calls below have been +# written systematically by converting from apparmor-profiles's profiles +# without testing nor deep understanding of their uses, +# and thus may need more rules or can have less rules; +# this remains to be determined case by case, +# some may even be completely useless. +config.security.apparmor.includes = { + # This one is included by + # which is usualy included before any profile. + "abstractions/tunables/alias" = '' + alias /bin -> /run/current-system/sw/bin, + alias /lib/modules -> /run/current-system/kernel/lib/modules, + alias /sbin -> /run/current-system/sw/sbin, + alias /usr -> /run/current-system/sw, + ''; + "abstractions/audio" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/audio" + '' + lib.concatMapStringsSep "\n" etcRule [ + "asound.conf" + "esound/esd.conf" + "libao.conf" + { path = "pulse"; trail = "/"; } + { path = "pulse"; trail = "/**"; } + { path = "sound"; trail = "/"; } + { path = "sound"; trail = "/**"; } + { path = "alsa/conf.d"; trail = "/"; } + { path = "alsa/conf.d"; trail = "/*"; } + "openal/alsoft.conf" + "wildmidi/wildmidi.conf" + ]; + "abstractions/authentication" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/authentication" + # Defined in security.pam + include + '' + lib.concatMapStringsSep "\n" etcRule [ + "nologin" + "securetty" + { path = "security"; trail = "/*"; } + "shadow" + "gshadow" + "pwdb.conf" + "default/passwd" + "login.defs" + ]; + "abstractions/base" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/base" + r ${pkgs.stdenv.cc.libc}/share/locale/**, + r ${pkgs.stdenv.cc.libc}/share/locale.alias, + ${lib.optionalString (pkgs.glibcLocales != null) "r ${pkgs.glibcLocales}/lib/locale/locale-archive,"} + ${etcRule "localtime"} + r ${pkgs.tzdata}/share/zoneinfo/**, + r ${pkgs.stdenv.cc.libc}/share/i18n/**, + ''; + "abstractions/bash" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/bash" + + # bash inspects filesystems at startup + # and /etc/mtab is linked to /proc/mounts + @{PROC}/mounts + + # system-wide bash configuration + '' + lib.concatMapStringsSep "\n" etcRule [ + "profile.dos" + "profile" + "profile.d" + { path = "profile.d"; trail = "/*"; } + "bashrc" + "bash.bashrc" + "bash.bashrc.local" + "bash_completion" + "bash_completion.d" + { path = "bash_completion.d"; trail = "/*"; } + # bash relies on system-wide readline configuration + "inputrc" + # run out of /etc/bash.bashrc + "DIR_COLORS" + ]; + "abstractions/consoles" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/consoles" + ''; + "abstractions/cups-client" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/cpus-client" + ${etcRule "cups/cups-client.conf"} + ''; + "abstractions/dbus-session-strict" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/dbus-session-strict" + ${etcRule "machine-id"} + ''; + "abstractions/dconf" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/dconf" + ${etcRule { path = "dconf"; trail = "/**"; }} + ''; + "abstractions/dri-common" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/dri-common" + ${etcRule "drirc"} + ''; + # The config.fonts.fontconfig NixOS module adds many files to /etc/fonts/ + # by symlinking them but without exporting them outside of its NixOS module, + # those are therefore added there to this "abstractions/fonts". + "abstractions/fonts" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/fonts" + ${etcRule { path = "fonts"; trail = "/**"; }} + ''; + "abstractions/gnome" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/gnome" + include + '' + lib.concatMapStringsSep "\n" etcRule [ + { path = "gnome"; trail = "/gtkrc*"; } + { path = "gtk"; trail = "/*"; } + { path = "gtk-2.0"; trail = "/*"; } + { path = "gtk-3.0"; trail = "/*"; } + "orbitrc" + { path = "pango"; trail = "/*"; } + { path = "/etc/gnome-vfs-2.0"; trail = "/modules/"; } + { path = "/etc/gnome-vfs-2.0"; trail = "/modules/*"; } + "papersize" + { path = "cups"; trail = "/lpoptions"; } + { path = "gnome"; trail = "/defaults.list"; } + { path = "xdg"; trail = "/{,*-}mimeapps.list"; } + "xdg/mimeapps.list" + ]; + "abstractions/kde" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/kde" + '' + lib.concatMapStringsSep "\n" etcRule [ + { path = "qt3"; trail = "/kstylerc"; } + { path = "qt3"; trail = "/qt_plugins_3.3rc"; } + { path = "qt3"; trail = "/qtrc"; } + "kderc" + { path = "kde3"; trail = "/*"; } + "kde4rc" + { path = "xdg"; trail = "/kdeglobals"; } + { path = "xdg"; trail = "/Trolltech.conf"; } + ]; + "abstractions/kerberosclient" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/kerberosclient" + '' + lib.concatMapStringsSep "\n" etcRule [ + { path = "krb5.keytab"; mode="rk"; } + "krb5.conf" + "krb5.conf.d" + { path = "krb5.conf.d"; trail = "/*"; } + + # config files found via strings on libs + "krb.conf" + "krb.realms" + "srvtab" + ]; + "abstractions/ldapclient" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/ldapclient" + '' + lib.concatMapStringsSep "\n" etcRule [ + "ldap.conf" + "ldap.secret" + { path = "openldap"; trail = "/*"; } + { path = "openldap"; trail = "/cacerts/*"; } + { path = "sasl2"; trail = "/*"; } + ]; + "abstractions/likewise" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/likewise" + ''; + "abstractions/mdns" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/mdns" + ${etcRule "nss_mdns.conf"} + ''; + "abstractions/nameservice" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nameservice" + + # Many programs wish to perform nameservice-like operations, such as + # looking up users by name or id, groups by name or id, hosts by name + # or IP, etc. These operations may be performed through files, dns, + # NIS, NIS+, LDAP, hesiod, wins, etc. Allow them all here. + mr ${getLib pkgs.nss}/lib/libnss_*.so*, + mr ${getLib pkgs.nss}/lib64/libnss_*.so*, + '' + lib.concatMapStringsSep "\n" etcRule [ + "group" + "host.conf" + "hosts" + "nsswitch.conf" + "gai.conf" + "passwd" + "protocols" + + # libtirpc (used for NIS/YP login) needs this + "netconfig" + + "resolv.conf" + + { path = "samba"; trail = "/lmhosts"; } + "services" + + "default/nss" + + # libnl-3-200 via libnss-gw-name + { path = "libnl"; trail = "/classid"; } + { path = "libnl-3"; trail = "/classid"; } + ]; + "abstractions/nis" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nis" + ''; + "abstractions/nvidia" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nvidia" + ${etcRule "vdpau_wrapper.cfg"} + ''; + "abstractions/opencl-common" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/opencl-common" + ${etcRule { path = "OpenCL"; trail = "/**"; }} + ''; + "abstractions/opencl-mesa" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/opencl-mesa" + ${etcRule "default/drirc"} + ''; + "abstractions/openssl" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/openssl" + ${etcRule { path = "ssl"; trail = "/openssl.cnf"; }} + ''; + "abstractions/p11-kit" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/p11-kit" + '' + lib.concatMapStringsSep "\n" etcRule [ + { path = "pkcs11"; trail = "/"; } + { path = "pkcs11"; trail = "/pkcs11.conf"; } + { path = "pkcs11"; trail = "/modules/"; } + { path = "pkcs11"; trail = "/modules/*"; } + ]; + "abstractions/perl" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/perl" + ${etcRule { path = "perl"; trail = "/**"; }} + ''; + "abstractions/php" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/php" + '' + lib.concatMapStringsSep "\n" etcRule [ + { path = "php"; trail = "/**/"; } + { path = "php5"; trail = "/**/"; } + { path = "php7"; trail = "/**/"; } + { path = "php"; trail = "/**.ini"; } + { path = "php5"; trail = "/**.ini"; } + { path = "php7"; trail = "/**.ini"; } + ]; + "abstractions/postfix-common" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/postfix-common" + '' + lib.concatMapStringsSep "\n" etcRule [ + "mailname" + { path = "postfix"; trail = "/*.cf"; } + "postfix/main.cf" + "postfix/master.cf" + ]; + "abstractions/python" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/python" + ''; + "abstractions/qt5" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/qt5" + '' + lib.concatMapStringsSep "\n" etcRule [ + { path = "xdg"; trail = "/QtProject/qtlogging.ini"; } + { path = "xdg/QtProject"; trail = "/qtlogging.ini"; } + "xdg/QtProject/qtlogging.ini" + ]; + "abstractions/samba" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/samba" + ${etcRule { path = "samba"; trail = "/*"; }} + ''; + "abstractions/ssl_certs" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/ssl_certs" + + # For the NixOS module: security.acme + r /var/lib/acme/*/cert.pem, + r /var/lib/acme/*/chain.pem, + r /var/lib/acme/*/fullchain.pem, + + '' + lib.concatMapStringsSep "\n" etcRule [ + "ssl/certs/ca-certificates.crt" + "ssl/certs/ca-bundle.crt" + "pki/tls/certs/ca-bundle.crt" + + { path = "ssl/trust"; trail = "/"; } + { path = "ssl/trust"; trail = "/*"; } + { path = "ssl/trust/anchors"; trail = "/"; } + { path = "ssl/trust/anchors"; trail = "/**"; } + { path = "pki/trust"; trail = "/"; } + { path = "pki/trust"; trail = "/*"; } + { path = "pki/trust/anchors"; trail = "/"; } + { path = "pki/trust/anchors"; trail = "/**"; } + ]; + "abstractions/ssl_keys" = '' + # security.acme NixOS module + r /var/lib/acme/*/full.pem, + r /var/lib/acme/*/key.pem, + ''; + "abstractions/vulkan" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/vulkan" + ${etcRule { path = "vulkan/icd.d"; trail = "/"; }} + ${etcRule { path = "vulkan/icd.d"; trail = "/*.json"; }} + ''; + "abstractions/winbind" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/winbind" + ${etcRule { path = "samba"; trail = "/smb.conf"; }} + ${etcRule { path = "samba"; trail = "/dhcp.conf"; }} + ''; + "abstractions/X" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/X" + ${etcRule { path = "X11/cursors"; trail = "/"; }} + ${etcRule { path = "X11/cursors"; trail = "/**"; }} + ''; +}; +} diff --git a/third_party/nixpkgs/nixos/modules/security/apparmor/profiles.nix b/third_party/nixpkgs/nixos/modules/security/apparmor/profiles.nix new file mode 100644 index 0000000000..8eb630b5a4 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/security/apparmor/profiles.nix @@ -0,0 +1,11 @@ +{ config, lib, pkgs, ... }: +let apparmor = config.security.apparmor; in +{ +config.security.apparmor.packages = [ pkgs.apparmor-profiles ]; +config.security.apparmor.policies."bin.ping".profile = lib.mkIf apparmor.policies."bin.ping".enable '' + include "${pkgs.iputils.apparmor}/bin.ping" + include "${pkgs.inetutils.apparmor}/bin.ping" + # Note that including those two profiles in the same profile + # would not work if the second one were to re-include . +''; +} diff --git a/third_party/nixpkgs/nixos/modules/security/ca.nix b/third_party/nixpkgs/nixos/modules/security/ca.nix index 1c4ee421fc..7df86e7142 100644 --- a/third_party/nixpkgs/nixos/modules/security/ca.nix +++ b/third_party/nixpkgs/nixos/modules/security/ca.nix @@ -10,15 +10,10 @@ let blacklist = cfg.caCertificateBlacklist; }; - caCertificates = pkgs.runCommand "ca-certificates.crt" - { files = - cfg.certificateFiles ++ - [ (builtins.toFile "extra.crt" (concatStringsSep "\n" cfg.certificates)) ]; - preferLocalBuild = true; - } - '' - cat $files > $out - ''; + caCertificates = pkgs.runCommand "ca-certificates.crt" { + files = cfg.certificateFiles ++ [ (builtins.toFile "extra.crt" (concatStringsSep "\n" cfg.certificates)) ]; + preferLocalBuild = true; + } "awk 1 $files > $out"; # awk ensures a newline between each pair of consecutive files in diff --git a/third_party/nixpkgs/nixos/modules/security/misc.nix b/third_party/nixpkgs/nixos/modules/security/misc.nix index d51dbbb77f..e7abc1e0d5 100644 --- a/third_party/nixpkgs/nixos/modules/security/misc.nix +++ b/third_party/nixpkgs/nixos/modules/security/misc.nix @@ -7,6 +7,10 @@ with lib; maintainers = [ maintainers.joachifm ]; }; + imports = [ + (lib.mkRenamedOptionModule [ "security" "virtualization" "flushL1DataCache" ] [ "security" "virtualisation" "flushL1DataCache" ]) + ]; + options = { security.allowUserNamespaces = mkOption { type = types.bool; diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index 103cf20501..b5bd22f6ba 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -433,7 +433,7 @@ let ("auth optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")} ${optionalString cfg.enableGnomeKeyring - "auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so"} + "auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"} ${optionalString cfg.gnupg.enable "auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so" + optionalString cfg.gnupg.storeOnly " store-only" @@ -471,7 +471,7 @@ let ${optionalString config.krb5.enable "password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"} ${optionalString cfg.enableGnomeKeyring - "password optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok"} + "password optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok"} # Session management. ${optionalString cfg.setEnvironment '' @@ -512,7 +512,7 @@ let ("session optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")} ${optionalString (cfg.enableGnomeKeyring) - "session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"} + "session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"} ${optionalString cfg.gnupg.enable "session optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so" + optionalString cfg.gnupg.noAutostart " no-autostart" @@ -895,6 +895,81 @@ in runuser-l = { rootOK = true; unixAuth = false; }; }; + security.apparmor.includes."abstractions/pam" = let + isEnabled = test: fold or false (map test (attrValues config.security.pam.services)); + in + lib.concatMapStringsSep "\n" + (name: "r ${config.environment.etc."pam.d/${name}".source},") + (attrNames config.security.pam.services) + + '' + mr ${getLib pkgs.pam}/lib/security/pam_filter/*, + mr ${getLib pkgs.pam}/lib/security/pam_*.so, + r ${getLib pkgs.pam}/lib/security/, + '' + + optionalString use_ldap '' + mr ${pam_ldap}/lib/security/pam_ldap.so, + '' + + optionalString config.services.sssd.enable '' + mr ${pkgs.sssd}/lib/security/pam_sss.so, + '' + + optionalString config.krb5.enable '' + mr ${pam_krb5}/lib/security/pam_krb5.so, + mr ${pam_ccreds}/lib/security/pam_ccreds.so, + '' + + optionalString (isEnabled (cfg: cfg.googleOsLoginAccountVerification)) '' + mr ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so, + mr ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_admin.so, + '' + + optionalString (isEnabled (cfg: cfg.googleOsLoginAuthentication)) '' + mr ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so, + '' + + optionalString (config.security.pam.enableSSHAgentAuth + && isEnabled (cfg: cfg.sshAgentAuth)) '' + mr ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so, + '' + + optionalString (isEnabled (cfg: cfg.fprintAuth)) '' + mr ${pkgs.fprintd}/lib/security/pam_fprintd.so, + '' + + optionalString (isEnabled (cfg: cfg.u2fAuth)) '' + mr ${pkgs.pam_u2f}/lib/security/pam_u2f.so, + '' + + optionalString (isEnabled (cfg: cfg.usbAuth)) '' + mr ${pkgs.pam_usb}/lib/security/pam_usb.so, + '' + + optionalString (isEnabled (cfg: cfg.oathAuth)) '' + "mr ${pkgs.oathToolkit}/lib/security/pam_oath.so, + '' + + optionalString (isEnabled (cfg: cfg.yubicoAuth)) '' + mr ${pkgs.yubico-pam}/lib/security/pam_yubico.so, + '' + + optionalString (isEnabled (cfg: cfg.duoSecurity.enable)) '' + mr ${pkgs.duo-unix}/lib/security/pam_duo.so, + '' + + optionalString (isEnabled (cfg: cfg.otpwAuth)) '' + mr ${pkgs.otpw}/lib/security/pam_otpw.so, + '' + + optionalString config.security.pam.enableEcryptfs '' + mr ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so, + '' + + optionalString (isEnabled (cfg: cfg.pamMount)) '' + mr ${pkgs.pam_mount}/lib/security/pam_mount.so, + '' + + optionalString (isEnabled (cfg: cfg.enableGnomeKeyring)) '' + mr ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so, + '' + + optionalString (isEnabled (cfg: cfg.startSession)) '' + mr ${pkgs.systemd}/lib/security/pam_systemd.so, + '' + + optionalString (isEnabled (cfg: cfg.enableAppArmor) + && config.security.apparmor.enable) '' + mr ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so, + '' + + optionalString (isEnabled (cfg: cfg.enableKwallet)) '' + mr ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so, + '' + + optionalString config.virtualisation.lxc.lxcfs.enable '' + mr ${pkgs.lxc}/lib/security/pam_cgfs.so + ''; }; } diff --git a/third_party/nixpkgs/nixos/modules/security/sudo.nix b/third_party/nixpkgs/nixos/modules/security/sudo.nix index cc3ff3d11b..2e73f8f4f3 100644 --- a/third_party/nixpkgs/nixos/modules/security/sudo.nix +++ b/third_party/nixpkgs/nixos/modules/security/sudo.nix @@ -61,6 +61,17 @@ in ''; }; + security.sudo.execWheelOnly = mkOption { + type = types.bool; + default = false; + description = '' + Only allow members of the wheel group to execute sudo by + setting the executable's permissions accordingly. + This prevents users that are not members of wheel from + exploiting vulnerabilities in sudo such as CVE-2021-3156. + ''; + }; + security.sudo.configFile = mkOption { type = types.lines; # Note: if syntax errors are detected in this file, the NixOS @@ -216,9 +227,20 @@ in ${cfg.extraConfig} ''; - security.wrappers = { - sudo.source = "${cfg.package.out}/bin/sudo"; - sudoedit.source = "${cfg.package.out}/bin/sudoedit"; + security.wrappers = let + owner = "root"; + group = if cfg.execWheelOnly then "wheel" else "root"; + setuid = true; + permissions = if cfg.execWheelOnly then "u+rx,g+x" else "u+rx,g+x,o+x"; + in { + sudo = { + source = "${cfg.package.out}/bin/sudo"; + inherit owner group setuid permissions; + }; + sudoedit = { + source = "${cfg.package.out}/bin/sudoedit"; + inherit owner group setuid permissions; + }; }; 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 3cbf22fea7..1e65f45151 100644 --- a/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix +++ b/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix @@ -171,6 +171,14 @@ in export PATH="${wrapperDir}:$PATH" ''; + security.apparmor.includes."nixos/security.wrappers" = '' + include "${pkgs.apparmorRulesFromClosure { name="security.wrappers"; } [ + securityWrapper + pkgs.stdenv.cc.cc + pkgs.stdenv.cc.libc + ]}" + ''; + ###### setcap activation script system.activationScripts.wrappers = lib.stringAfter [ "specialfs" "users" ] diff --git a/third_party/nixpkgs/nixos/modules/services/audio/jack.nix b/third_party/nixpkgs/nixos/modules/services/audio/jack.nix index bee97dbfc6..f341b432f7 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/jack.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/jack.nix @@ -290,5 +290,5 @@ in { ]; - meta.maintainers = [ maintainers.gnidorah ]; + meta.maintainers = [ ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix b/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix index eee6c5f423..e33e860d88 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix @@ -233,14 +233,15 @@ in { { User = "${cfg.user}"; ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /run/mpd/mpd.conf"; - ExecStartPre = pkgs.writeShellScript "mpd-start-pre" '' + ExecStartPre = pkgs.writeShellScript "mpd-start-pre" ('' set -euo pipefail install -m 600 ${mpdConf} /run/mpd/mpd.conf - ${optionalString (cfg.credentials != []) - "${pkgs.replace}/bin/replace-literal -fe ${ - concatStringsSep " -a " (imap0 (i: c: "\"{{password-${toString i}}}\" \"$(cat ${c.passwordFile})\"") cfg.credentials) - } /run/mpd/mpd.conf"} - ''; + '' + optionalString (cfg.credentials != []) + (concatStringsSep "\n" + (imap0 + (i: c: ''${pkgs.replace-secret}/bin/replace-secret '{{password-${toString i}}}' '${c.passwordFile}' /run/mpd/mpd.conf'') + cfg.credentials)) + ); RuntimeDirectory = "mpd"; Type = "notify"; LimitRTPRIO = 50; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/mpdscribble.nix b/third_party/nixpkgs/nixos/modules/services/audio/mpdscribble.nix index 642d874393..1368543ae1 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/mpdscribble.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/mpdscribble.nix @@ -59,7 +59,7 @@ let replaceSecret = secretFile: placeholder: targetFile: optionalString (secretFile != null) '' - ${pkgs.replace}/bin/replace-literal -ef ${placeholder} "$(cat ${secretFile})" ${targetFile}''; + ${pkgs.replace-secret}/bin/replace-secret '${placeholder}' '${secretFile}' '${targetFile}' ''; preStart = pkgs.writeShellScript "mpdscribble-pre-start" '' cp -f "${cfgTemplate}" "${cfgFile}" diff --git a/third_party/nixpkgs/nixos/modules/services/backup/duplicity.nix b/third_party/nixpkgs/nixos/modules/services/backup/duplicity.nix index a8d5642486..1f6883ed02 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/duplicity.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/duplicity.nix @@ -1,16 +1,17 @@ -{ config, lib, pkgs, ...}: +{ config, lib, pkgs, ... }: with lib; - let cfg = config.services.duplicity; stateDirectory = "/var/lib/duplicity"; - localTarget = if hasPrefix "file://" cfg.targetUrl + localTarget = + if hasPrefix "file://" cfg.targetUrl then removePrefix "file://" cfg.targetUrl else null; -in { +in +{ options.services.duplicity = { enable = mkEnableOption "backups with duplicity"; @@ -24,7 +25,7 @@ in { include = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; example = [ "/home" ]; description = '' List of paths to include into the backups. See the FILE SELECTION @@ -35,7 +36,7 @@ in { exclude = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; description = '' List of paths to exclude from backups. See the FILE SELECTION section in duplicity @@ -82,14 +83,60 @@ in { extraFlags = mkOption { type = types.listOf types.str; - default = []; - example = [ "--full-if-older-than" "1M" ]; + default = [ ]; + example = [ "--backend-retry-delay" "100" ]; description = '' Extra command-line flags passed to duplicity. See duplicity 1. ''; }; + + fullIfOlderThan = mkOption { + type = types.str; + default = "never"; + example = "1M"; + description = '' + If "never" (the default) always do incremental + backups (the first backup will be a full backup, of course). If + "always" always do full backups. Otherwise, this + must be a string representing a duration. Full backups will be made + when the latest full backup is older than this duration. If this is not + the case, an incremental backup is performed. + ''; + }; + + cleanup = { + maxAge = mkOption { + type = types.nullOr types.str; + default = null; + example = "6M"; + description = '' + If non-null, delete all backup sets older than the given time. Old backup sets + will not be deleted if backup sets newer than time depend on them. + ''; + }; + maxFull = mkOption { + type = types.nullOr types.int; + default = null; + example = 2; + description = '' + If non-null, delete all backups sets that are older than the count:th last full + backup (in other words, keep the last count full backups and + associated incremental sets). + ''; + }; + maxIncr = mkOption { + type = types.nullOr types.int; + default = null; + example = 1; + description = '' + If non-null, delete incremental sets of all backups sets that are + older than the count:th last full backup (in other words, keep only + old full backups and not their increments). + ''; + }; + }; }; config = mkIf cfg.enable { @@ -99,18 +146,26 @@ in { environment.HOME = stateDirectory; - serviceConfig = { - ExecStart = '' - ${pkgs.duplicity}/bin/duplicity ${escapeShellArgs ( - [ - cfg.root - cfg.targetUrl - "--archive-dir" stateDirectory - ] + script = + let + target = escapeShellArg cfg.targetUrl; + extra = escapeShellArgs ([ "--archive-dir" stateDirectory ] ++ cfg.extraFlags); + dup = "${pkgs.duplicity}/bin/duplicity"; + in + '' + set -x + ${dup} cleanup ${target} --force ${extra} + ${lib.optionalString (cfg.cleanup.maxAge != null) "${dup} remove-older-than ${lib.escapeShellArg cfg.cleanup.maxAge} ${target} --force ${extra}"} + ${lib.optionalString (cfg.cleanup.maxFull != null) "${dup} remove-all-but-n-full ${toString cfg.cleanup.maxFull} ${target} --force ${extra}"} + ${lib.optionalString (cfg.cleanup.maxIncr != null) "${dup} remove-all-incr-but-n-full ${toString cfg.cleanup.maxIncr} ${target} --force ${extra}"} + exec ${dup} ${if cfg.fullIfOlderThan == "always" then "full" else "incr"} ${lib.escapeShellArgs ( + [ cfg.root cfg.targetUrl ] ++ concatMap (p: [ "--include" p ]) cfg.include ++ concatMap (p: [ "--exclude" p ]) cfg.exclude - ++ cfg.extraFlags)} + ++ (lib.optionals (cfg.fullIfOlderThan != "never" && cfg.fullIfOlderThan != "always") [ "--full-if-older-than" cfg.fullIfOlderThan ]) + )} ${extra} ''; + serviceConfig = { PrivateTmp = true; ProtectSystem = "strict"; ProtectHome = "read-only"; @@ -130,7 +185,7 @@ in { assertions = singleton { # Duplicity will fail if the last file selection option is an include. It # is not always possible to detect but this simple case can be caught. - assertion = cfg.include != [] -> cfg.exclude != [] || cfg.extraFlags != []; + assertion = cfg.include != [ ] -> cfg.exclude != [ ] || cfg.extraFlags != [ ]; message = '' Duplicity will fail if you only specify included paths ("Because the default is to include all files, the expression is redundant. Exiting diff --git a/third_party/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix b/third_party/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix index f4bd3aa447..9da2d522a6 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix @@ -48,7 +48,7 @@ in { startAt = mkOption { default = "*-*-* 01:15:00"; - type = types.str; + type = with types; either (listOf str) str; description = '' This option defines (see systemd.time for format) when the databases should be dumped. diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix index f55079300b..1378b5ccfb 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix @@ -62,7 +62,7 @@ in ''; }; - enable = mkEnableOption "Whether to enable Kubernetes addon manager."; + enable = mkEnableOption "Kubernetes addon manager."; }; ###### implementation diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix index 19edc338bb..0dc3649237 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix @@ -7,12 +7,12 @@ let defaultContainerdConfigFile = pkgs.writeText "containerd.toml" '' version = 2 - root = "/var/lib/containerd/daemon" - state = "/var/run/containerd/daemon" + root = "/var/lib/containerd" + state = "/run/containerd" oom_score = 0 [grpc] - address = "/var/run/containerd/containerd.sock" + address = "/run/containerd/containerd.sock" [plugins."io.containerd.grpc.v1.cri"] sandbox_image = "pause:latest" diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix index a428a60800..fcfcc84354 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -134,7 +134,7 @@ in containerRuntimeEndpoint = mkOption { description = "Endpoint at which to find the container runtime api interface/socket"; type = str; - default = "unix:///var/run/containerd/containerd.sock"; + default = "unix:///run/containerd/containerd.sock"; }; enable = mkEnableOption "Kubernetes kubelet."; diff --git a/third_party/nixpkgs/nixos/modules/services/computing/foldingathome/client.nix b/third_party/nixpkgs/nixos/modules/services/computing/foldingathome/client.nix index 9f99af48c4..fbef6a04b1 100644 --- a/third_party/nixpkgs/nixos/modules/services/computing/foldingathome/client.nix +++ b/third_party/nixpkgs/nixos/modules/services/computing/foldingathome/client.nix @@ -49,6 +49,15 @@ in ''; }; + daemonNiceLevel = mkOption { + type = types.ints.between (-20) 19; + default = 0; + description = '' + Daemon process priority for FAHClient. + 0 is the default Unix process priority, 19 is the lowest. + ''; + }; + extraArgs = mkOption { type = types.listOf types.str; default = []; @@ -70,6 +79,7 @@ in serviceConfig = { DynamicUser = true; StateDirectory = "foldingathome"; + Nice = cfg.daemonNiceLevel; WorkingDirectory = "%S/foldingathome"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix index a49f5f8100..f668e69e5d 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -283,5 +283,5 @@ in { '') ]; - meta.maintainers = with lib.maintainers; [ nand0p mic92 lopsided98 ]; + meta.maintainers = with lib.maintainers; [ mic92 lopsided98 ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix index 7b8a35f54b..708b3e1cc1 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -191,6 +191,6 @@ in { }; }; - meta.maintainers = with lib.maintainers; [ nand0p ]; + meta.maintainers = with lib.maintainers; [ ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix index 9f9b86ee61..2f0b573e87 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix @@ -37,15 +37,22 @@ let description = '' Number of tasks to perform simultaneously. - A task is a single derivation build or an evaluation. + A task is a single derivation build, an evaluation or an effect run. At minimum, you need 2 concurrent tasks for x86_64-linux in your cluster, to allow for import from derivation. concurrentTasks can be around the CPU core count or lower if memory is the bottleneck. + + The optimal value depends on the resource consumption characteristics of your workload, + including memory usage and in-task parallelism. This is typically determined empirically. + + When scaling, it is generally better to have a double-size machine than two machines, + because each split of resources causes inefficiencies; particularly with regards + to build latency because of extra downloads. ''; - type = types.int; - default = 4; + type = types.either types.ints.positive (types.enum [ "auto" ]); + default = "auto"; }; workDirectory = mkOption { description = '' @@ -186,7 +193,18 @@ in # even shortly after the previous lookup. This *also* applies to the daemon. narinfo-cache-negative-ttl = 0 ''; - services.hercules-ci-agent.tomlFile = - format.generate "hercules-ci-agent.toml" cfg.settings; + services.hercules-ci-agent = { + tomlFile = + format.generate "hercules-ci-agent.toml" cfg.settings; + + settings.labels = { + agent.source = + if options.services.hercules-ci-agent.package.highestPrio == (lib.modules.mkOptionDefault { }).priority + then "nixpkgs" + else lib.mkOptionDefault "override"; + pkgs.version = pkgs.lib.version; + lib.version = lib.version; + }; + }; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix index e8a42e59de..06c174e7d3 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix @@ -68,7 +68,23 @@ in # Trusted user allows simplified configuration and better performance # when operating in a cluster. nix.trustedUsers = [ config.systemd.services.hercules-ci-agent.serviceConfig.User ]; - services.hercules-ci-agent.settings.nixUserIsTrusted = true; + services.hercules-ci-agent = { + settings = { + nixUserIsTrusted = true; + labels = + let + mkIfNotNull = x: mkIf (x != null) x; + in + { + nixos.configurationRevision = mkIfNotNull config.system.configurationRevision; + nixos.release = config.system.nixos.release; + nixos.label = mkIfNotNull config.system.nixos.label; + nixos.codeName = config.system.nixos.codeName; + nixos.tags = config.system.nixos.tags; + nixos.systemName = mkIfNotNull config.system.name; + }; + }; + }; users.users.hercules-ci-agent = { home = cfg.settings.baseDirectory; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/clickhouse.nix b/third_party/nixpkgs/nixos/modules/services/databases/clickhouse.nix index 27440fec4e..f2f4e9d255 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/clickhouse.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/clickhouse.nix @@ -42,6 +42,7 @@ with lib; User = "clickhouse"; Group = "clickhouse"; ConfigurationDirectory = "clickhouse-server"; + AmbientCapabilities = "CAP_SYS_NICE"; StateDirectory = "clickhouse"; LogsDirectory = "clickhouse"; ExecStart = "${pkgs.clickhouse}/bin/clickhouse-server --config-file=${pkgs.clickhouse}/etc/clickhouse-server/config.xml"; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix index c99a752921..6cc29cd717 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix @@ -4,24 +4,17 @@ with lib; let cfg = config.services.couchdb; - useVersion2 = strings.versionAtLeast (strings.getVersion cfg.package) "2.0"; configFile = pkgs.writeText "couchdb.ini" ( '' [couchdb] database_dir = ${cfg.databaseDir} uri_file = ${cfg.uriFile} view_index_dir = ${cfg.viewIndexDir} - '' + (if cfg.adminPass != null then - '' + '' + (optionalString (cfg.adminPass != null) '' [admins] ${cfg.adminUser} = ${cfg.adminPass} - '' else - "") + (if useVersion2 then - '' + '' + '' [chttpd] - '' else - '' - [httpd] '') + '' port = ${toString cfg.port} @@ -30,8 +23,7 @@ let [log] file = ${cfg.logFile} ''); - executable = if useVersion2 then "${cfg.package}/bin/couchdb" - else ''${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} -a ${cfg.configFile}''; + executable = "${cfg.package}/bin/couchdb"; in { @@ -177,8 +169,7 @@ in { environment.systemPackages = [ cfg.package ]; - services.couchdb.configFile = mkDefault - (if useVersion2 then "/var/lib/couchdb/local.ini" else "/var/lib/couchdb/couchdb.ini"); + services.couchdb.configFile = mkDefault "/var/lib/couchdb/local.ini"; systemd.tmpfiles.rules = [ "d '${dirOf cfg.uriFile}' - ${cfg.user} ${cfg.group} - -" @@ -195,7 +186,7 @@ in { touch ${cfg.configFile} ''; - environment = mkIf useVersion2 { + environment = { # we are actually specifying 4 configuration files: # 1. the preinstalled default.ini # 2. the module configuration diff --git a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix index fdc05312ec..effc918247 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix @@ -159,7 +159,7 @@ in For more information on how to specify the target and on which privileges exist, see the GRANT syntax. - The attributes are used as GRANT ''${attrName} ON ''${attrValue}. + The attributes are used as GRANT ''${attrValue} ON ''${attrName}. ''; example = literalExample '' { diff --git a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix index 7ec10c0eb5..c4d51958e2 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix @@ -331,7 +331,7 @@ in { PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @privileged @raw-io @reboot @resources @setuid @swap"; + SystemCallFilter = "~@cpu-emulation @debug @keyring @memlock @mount @obsolete @privileged @resources @setuid"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/bamf.nix b/third_party/nixpkgs/nixos/modules/services/desktops/bamf.nix index 4b35146d08..37121c219a 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/bamf.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/bamf.nix @@ -6,7 +6,7 @@ with lib; { meta = { - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; ###### interface diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.nix b/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.nix index d0f6b66328..7da92cc9f2 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.nix @@ -15,18 +15,6 @@ in { options = { services.flatpak = { enable = mkEnableOption "flatpak"; - - guiPackages = mkOption { - internal = true; - type = types.listOf types.package; - default = []; - example = literalExample "[ pkgs.gnome3.gnome-software ]"; - description = '' - Packages that provide an interface for flatpak - (like gnome-software) that will be automatically available - to all users when flatpak is enabled. - ''; - }; }; }; @@ -40,7 +28,7 @@ in { } ]; - environment.systemPackages = [ pkgs.flatpak ] ++ cfg.guiPackages; + environment.systemPackages = [ pkgs.flatpak ]; services.dbus.packages = [ pkgs.flatpak ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix b/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix index 0dc0643afb..e9ec787e5a 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix @@ -266,5 +266,5 @@ in } // mapAttrs' appConfigToINICompatible cfg.appConfig); }; - meta.maintainers = with lib.maintainers; [ worldofpeace ]; + meta.maintainers = with lib.maintainers; [ ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/at-spi2-core.nix similarity index 72% rename from third_party/nixpkgs/nixos/modules/services/desktops/gnome3/at-spi2-core.nix rename to third_party/nixpkgs/nixos/modules/services/desktops/gnome/at-spi2-core.nix index 492242e329..1268a9d49b 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/at-spi2-core.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/at-spi2-core.nix @@ -12,9 +12,17 @@ with lib; ###### interface + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "at-spi2-core" "enable" ] + [ "services" "gnome" "at-spi2-core" "enable" ] + ) + ]; + options = { - services.gnome3.at-spi2-core = { + services.gnome.at-spi2-core = { enable = mkOption { type = types.bool; @@ -36,13 +44,13 @@ with lib; ###### implementation config = mkMerge [ - (mkIf config.services.gnome3.at-spi2-core.enable { + (mkIf config.services.gnome.at-spi2-core.enable { environment.systemPackages = [ pkgs.at-spi2-core ]; services.dbus.packages = [ pkgs.at-spi2-core ]; systemd.packages = [ pkgs.at-spi2-core ]; }) - (mkIf (!config.services.gnome3.at-spi2-core.enable) { + (mkIf (!config.services.gnome.at-spi2-core.enable) { environment.variables.NO_AT_BRIDGE = "1"; }) ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/chrome-gnome-shell.nix similarity index 74% rename from third_party/nixpkgs/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix rename to third_party/nixpkgs/nixos/modules/services/desktops/gnome/chrome-gnome-shell.nix index 3c7f217b18..15c5bfbd82 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/chrome-gnome-shell.nix @@ -8,9 +8,17 @@ with lib; maintainers = teams.gnome.members; }; + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "chrome-gnome-shell" "enable" ] + [ "services" "gnome" "chrome-gnome-shell" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.chrome-gnome-shell.enable = mkEnableOption '' + services.gnome.chrome-gnome-shell.enable = mkEnableOption '' Chrome GNOME Shell native host connector, a DBus service allowing to install GNOME Shell extensions from a web browser. ''; @@ -18,7 +26,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.chrome-gnome-shell.enable { + config = mkIf config.services.gnome.chrome-gnome-shell.enable { environment.etc = { "chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json"; "opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json"; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix similarity index 67% rename from third_party/nixpkgs/nixos/modules/services/desktops/gnome3/evolution-data-server.nix rename to third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix index 749f12b86b..ef5ad797c2 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/evolution-data-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix @@ -10,11 +10,23 @@ with lib; maintainers = teams.gnome.members; }; + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "evolution-data-server" "enable" ] + [ "services" "gnome" "evolution-data-server" "enable" ] + ) + (mkRenamedOptionModule + [ "services" "gnome3" "evolution-data-server" "plugins" ] + [ "services" "gnome" "evolution-data-server" "plugins" ] + ) + ]; + ###### interface options = { - services.gnome3.evolution-data-server = { + services.gnome.evolution-data-server = { enable = mkEnableOption "Evolution Data Server, a collection of services for storing addressbooks and calendars."; plugins = mkOption { type = types.listOf types.package; @@ -38,10 +50,10 @@ with lib; config = let - bundle = pkgs.evolutionWithPlugins.override { inherit (config.services.gnome3.evolution-data-server) plugins; }; + bundle = pkgs.evolutionWithPlugins.override { inherit (config.services.gnome.evolution-data-server) plugins; }; in mkMerge [ - (mkIf config.services.gnome3.evolution-data-server.enable { + (mkIf config.services.gnome.evolution-data-server.enable { environment.systemPackages = [ bundle ]; services.dbus.packages = [ bundle ]; @@ -49,11 +61,11 @@ with lib; systemd.packages = [ bundle ]; }) (mkIf config.programs.evolution.enable { - services.gnome3.evolution-data-server = { + services.gnome.evolution-data-server = { enable = true; plugins = [ pkgs.evolution ] ++ config.programs.evolution.plugins; }; - services.gnome3.gnome-keyring.enable = true; + services.gnome.gnome-keyring.enable = true; }) ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/glib-networking.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/glib-networking.nix similarity index 61% rename from third_party/nixpkgs/nixos/modules/services/desktops/gnome3/glib-networking.nix rename to third_party/nixpkgs/nixos/modules/services/desktops/gnome/glib-networking.nix index 7e667b6b1f..4288b6b5de 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/glib-networking.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/glib-networking.nix @@ -10,11 +10,19 @@ with lib; maintainers = teams.gnome.members; }; + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "glib-networking" "enable" ] + [ "services" "gnome" "glib-networking" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.glib-networking = { + services.gnome.glib-networking = { enable = mkEnableOption "network extensions for GLib"; @@ -24,7 +32,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.glib-networking.enable { + config = mkIf config.services.gnome.glib-networking.enable { services.dbus.packages = [ pkgs.glib-networking ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix similarity index 83% rename from third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix rename to third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix index c391ad9694..9e9771cf54 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix @@ -48,11 +48,19 @@ in maintainers = teams.gnome.members; }; + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-initial-setup" "enable" ] + [ "services" "gnome" "gnome-initial-setup" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.gnome-initial-setup = { + services.gnome.gnome-initial-setup = { enable = mkEnableOption "GNOME Initial Setup, a Simple, easy, and safe way to prepare a new system"; @@ -63,16 +71,16 @@ in ###### implementation - config = mkIf config.services.gnome3.gnome-initial-setup.enable { + config = mkIf config.services.gnome.gnome-initial-setup.enable { environment.systemPackages = [ - pkgs.gnome3.gnome-initial-setup + pkgs.gnome.gnome-initial-setup ] ++ optional (versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart ; systemd.packages = [ - pkgs.gnome3.gnome-initial-setup + pkgs.gnome.gnome-initial-setup ]; systemd.user.targets."gnome-session".wants = [ diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-keyring.nix similarity index 55% rename from third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-keyring.nix rename to third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-keyring.nix index 2916a3c82b..cda44bab8b 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-keyring.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-keyring.nix @@ -10,11 +10,19 @@ with lib; maintainers = teams.gnome.members; }; + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-keyring" "enable" ] + [ "services" "gnome" "gnome-keyring" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.gnome-keyring = { + services.gnome.gnome-keyring = { enable = mkOption { type = types.bool; @@ -33,18 +41,18 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.gnome-keyring.enable { + config = mkIf config.services.gnome.gnome-keyring.enable { - environment.systemPackages = [ pkgs.gnome3.gnome-keyring ]; + environment.systemPackages = [ pkgs.gnome.gnome-keyring ]; - services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gcr ]; + services.dbus.packages = [ pkgs.gnome.gnome-keyring pkgs.gcr ]; - xdg.portal.extraPortals = [ pkgs.gnome3.gnome-keyring ]; + xdg.portal.extraPortals = [ pkgs.gnome.gnome-keyring ]; security.pam.services.login.enableGnomeKeyring = true; security.wrappers.gnome-keyring-daemon = { - source = "${pkgs.gnome3.gnome-keyring}/bin/gnome-keyring-daemon"; + source = "${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon"; capabilities = "cap_ipc_lock=ep"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix similarity index 66% rename from third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix rename to third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix index 3f9ced5e86..01f7e3695c 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix @@ -10,11 +10,19 @@ with lib; maintainers = teams.gnome.members; }; + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-online-accounts" "enable" ] + [ "services" "gnome" "gnome-online-accounts" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.gnome-online-accounts = { + services.gnome.gnome-online-accounts = { enable = mkOption { type = types.bool; @@ -32,7 +40,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.gnome-online-accounts.enable { + config = mkIf config.services.gnome.gnome-online-accounts.enable { environment.systemPackages = [ pkgs.gnome-online-accounts ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-miners.nix similarity index 50% rename from third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix rename to third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-miners.nix index 39d669e8b3..5f9039f68c 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-miners.nix @@ -10,11 +10,19 @@ with lib; maintainers = teams.gnome.members; }; + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-online-miners" "enable" ] + [ "services" "gnome" "gnome-online-miners" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.gnome-online-miners = { + services.gnome.gnome-online-miners = { enable = mkOption { type = types.bool; @@ -32,11 +40,11 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.gnome-online-miners.enable { + config = mkIf config.services.gnome.gnome-online-miners.enable { - environment.systemPackages = [ pkgs.gnome3.gnome-online-miners ]; + environment.systemPackages = [ pkgs.gnome.gnome-online-miners ]; - services.dbus.packages = [ pkgs.gnome3.gnome-online-miners ]; + services.dbus.packages = [ pkgs.gnome.gnome-online-miners ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix new file mode 100644 index 0000000000..b5573d2fc2 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix @@ -0,0 +1,32 @@ +# Remote desktop daemon using Pipewire. +{ config, lib, pkgs, ... }: + +with lib; + +{ + meta = { + maintainers = teams.gnome.members; + }; + + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-remote-desktop" "enable" ] + [ "services" "gnome" "gnome-remote-desktop" "enable" ] + ) + ]; + + ###### interface + options = { + services.gnome.gnome-remote-desktop = { + enable = mkEnableOption "Remote Desktop support using Pipewire"; + }; + }; + + ###### implementation + config = mkIf config.services.gnome.gnome-remote-desktop.enable { + services.pipewire.enable = true; + + systemd.packages = [ pkgs.gnome.gnome-remote-desktop ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix similarity index 74% rename from third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix rename to third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix index 1c33ed064a..05b5c86ddc 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix @@ -6,7 +6,7 @@ with lib; let - cfg = config.services.gnome3.gnome-settings-daemon; + cfg = config.services.gnome.gnome-settings-daemon; in @@ -20,13 +20,19 @@ in (mkRemovedOptionModule ["services" "gnome3" "gnome-settings-daemon" "package"] "") + + # Added 2021-05-07 + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-settings-daemon" "enable" ] + [ "services" "gnome" "gnome-settings-daemon" "enable" ] + ) ]; ###### interface options = { - services.gnome3.gnome-settings-daemon = { + services.gnome.gnome-settings-daemon = { enable = mkEnableOption "GNOME Settings Daemon"; @@ -40,15 +46,15 @@ in config = mkIf cfg.enable { environment.systemPackages = [ - pkgs.gnome3.gnome-settings-daemon + pkgs.gnome.gnome-settings-daemon ]; services.udev.packages = [ - pkgs.gnome3.gnome-settings-daemon + pkgs.gnome.gnome-settings-daemon ]; systemd.packages = [ - pkgs.gnome3.gnome-settings-daemon + pkgs.gnome.gnome-settings-daemon ]; systemd.user.targets."gnome-session-initialized".wants = [ diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-user-share.nix similarity index 51% rename from third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-user-share.nix rename to third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-user-share.nix index f2fe8b41a9..38256af309 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-user-share.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-user-share.nix @@ -10,11 +10,19 @@ with lib; maintainers = teams.gnome.members; }; + imports = [ + # Added 2021-05-07 + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-user-share" "enable" ] + [ "services" "gnome" "gnome-user-share" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.gnome-user-share = { + services.gnome.gnome-user-share = { enable = mkEnableOption "GNOME User Share, a user-level file sharing service for GNOME"; @@ -25,14 +33,14 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.gnome-user-share.enable { + config = mkIf config.services.gnome.gnome-user-share.enable { environment.systemPackages = [ - pkgs.gnome3.gnome-user-share + pkgs.gnome.gnome-user-share ]; systemd.packages = [ - pkgs.gnome3.gnome-user-share + pkgs.gnome.gnome-user-share ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/rygel.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/rygel.nix similarity index 53% rename from third_party/nixpkgs/nixos/modules/services/desktops/gnome3/rygel.nix rename to third_party/nixpkgs/nixos/modules/services/desktops/gnome/rygel.nix index 917a1d6541..7ea9778fc4 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/rygel.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/rygel.nix @@ -8,9 +8,17 @@ with lib; maintainers = teams.gnome.members; }; + imports = [ + # Added 2021-05-07 + (mkRenamedOptionModule + [ "services" "gnome3" "rygel" "enable" ] + [ "services" "gnome" "rygel" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.rygel = { + services.gnome.rygel = { enable = mkOption { default = false; description = '' @@ -24,13 +32,13 @@ with lib; }; ###### implementation - config = mkIf config.services.gnome3.rygel.enable { - environment.systemPackages = [ pkgs.gnome3.rygel ]; + config = mkIf config.services.gnome.rygel.enable { + environment.systemPackages = [ pkgs.gnome.rygel ]; - services.dbus.packages = [ pkgs.gnome3.rygel ]; + services.dbus.packages = [ pkgs.gnome.rygel ]; - systemd.packages = [ pkgs.gnome3.rygel ]; + systemd.packages = [ pkgs.gnome.rygel ]; - environment.etc."rygel.conf".source = "${pkgs.gnome3.rygel}/etc/rygel.conf"; + environment.etc."rygel.conf".source = "${pkgs.gnome.rygel}/etc/rygel.conf"; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/sushi.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/sushi.nix similarity index 52% rename from third_party/nixpkgs/nixos/modules/services/desktops/gnome3/sushi.nix rename to third_party/nixpkgs/nixos/modules/services/desktops/gnome/sushi.nix index 83b17365d5..3133a3a0d9 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/sushi.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/sushi.nix @@ -10,11 +10,19 @@ with lib; maintainers = teams.gnome.members; }; + imports = [ + # Added 2021-05-07 + (mkRenamedOptionModule + [ "services" "gnome3" "sushi" "enable" ] + [ "services" "gnome" "sushi" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.sushi = { + services.gnome.sushi = { enable = mkOption { type = types.bool; @@ -31,11 +39,11 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.sushi.enable { + config = mkIf config.services.gnome.sushi.enable { - environment.systemPackages = [ pkgs.gnome3.sushi ]; + environment.systemPackages = [ pkgs.gnome.sushi ]; - services.dbus.packages = [ pkgs.gnome3.sushi ]; + services.dbus.packages = [ pkgs.gnome.sushi ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/tracker-miners.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker-miners.nix similarity index 68% rename from third_party/nixpkgs/nixos/modules/services/desktops/gnome3/tracker-miners.nix rename to third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker-miners.nix index f2af402492..c9101f0caa 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/tracker-miners.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker-miners.nix @@ -10,11 +10,19 @@ with lib; maintainers = teams.gnome.members; }; + imports = [ + # Added 2021-05-07 + (mkRenamedOptionModule + [ "services" "gnome3" "tracker-miners" "enable" ] + [ "services" "gnome" "tracker-miners" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.tracker-miners = { + services.gnome.tracker-miners = { enable = mkOption { type = types.bool; @@ -31,7 +39,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.tracker-miners.enable { + config = mkIf config.services.gnome.tracker-miners.enable { environment.systemPackages = [ pkgs.tracker-miners ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/tracker.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker.nix similarity index 69% rename from third_party/nixpkgs/nixos/modules/services/desktops/gnome3/tracker.nix rename to third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker.nix index cd196e3855..29d9662b0b 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/tracker.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker.nix @@ -10,11 +10,19 @@ with lib; maintainers = teams.gnome.members; }; + imports = [ + # Added 2021-05-07 + (mkRenamedOptionModule + [ "services" "gnome3" "tracker" "enable" ] + [ "services" "gnome" "tracker" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.tracker = { + services.gnome.tracker = { enable = mkOption { type = types.bool; @@ -32,7 +40,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.tracker.enable { + config = mkIf config.services.gnome.tracker.enable { environment.systemPackages = [ pkgs.tracker ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix deleted file mode 100644 index 164a0a44f8..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix +++ /dev/null @@ -1,24 +0,0 @@ -# Remote desktop daemon using Pipewire. -{ config, lib, pkgs, ... }: - -with lib; - -{ - meta = { - maintainers = teams.gnome.members; - }; - - ###### interface - options = { - services.gnome3.gnome-remote-desktop = { - enable = mkEnableOption "Remote Desktop support using Pipewire"; - }; - }; - - ###### implementation - config = mkIf config.services.gnome3.gnome-remote-desktop.enable { - services.pipewire.enable = true; - - systemd.packages = [ pkgs.gnome3.gnome-remote-desktop ]; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix index 250ea6d457..966a4d3866 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix @@ -34,7 +34,7 @@ in # gvfs can be built with multiple configurations package = mkOption { type = types.package; - default = pkgs.gnome3.gvfs; + default = pkgs.gnome.gvfs; description = "Which GVfs package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/telepathy.nix b/third_party/nixpkgs/nixos/modules/services/desktops/telepathy.nix index 8c50d860e5..b5f6a5fcbc 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/telepathy.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/telepathy.nix @@ -39,7 +39,7 @@ with lib; services.dbus.packages = [ pkgs.telepathy-mission-control ]; # Enable runtime optional telepathy in gnome-shell - services.xserver.desktopManager.gnome3.sessionPath = with pkgs; [ + services.xserver.desktopManager.gnome.sessionPath = with pkgs; [ telepathy-glib telepathy-logger ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/tumbler.nix b/third_party/nixpkgs/nixos/modules/services/desktops/tumbler.nix index a09079517f..8d9248cb98 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/tumbler.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/tumbler.nix @@ -19,7 +19,7 @@ in ]; meta = { - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; ###### interface diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/zeitgeist.nix b/third_party/nixpkgs/nixos/modules/services/desktops/zeitgeist.nix index cf7dd5fe3a..fb0218da30 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/zeitgeist.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/zeitgeist.nix @@ -7,7 +7,7 @@ with lib; { meta = { - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; ###### interface diff --git a/third_party/nixpkgs/nixos/modules/services/development/jupyter/default.nix b/third_party/nixpkgs/nixos/modules/services/development/jupyter/default.nix index 6a5fd6b294..21b84b3bcd 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/jupyter/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/jupyter/default.nix @@ -131,7 +131,7 @@ in { env = (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ ipykernel pandas - scikitlearn + scikit-learn ])); in { displayName = "Python 3 for machine learning"; diff --git a/third_party/nixpkgs/nixos/modules/services/development/jupyterhub/default.nix b/third_party/nixpkgs/nixos/modules/services/development/jupyterhub/default.nix index f1dcab68b0..a1df4468cf 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/jupyterhub/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/jupyterhub/default.nix @@ -117,7 +117,7 @@ in { env = (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ ipykernel pandas - scikitlearn + scikit-learn ])); in { displayName = "Python 3 for machine learning"; diff --git a/third_party/nixpkgs/nixos/modules/services/games/factorio.nix b/third_party/nixpkgs/nixos/modules/services/games/factorio.nix index a1aa5739d0..3cb1427579 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/factorio.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/factorio.nix @@ -35,10 +35,10 @@ let auto_pause = true; only_admins_can_pause_the_game = true; autosave_only_on_server = true; - admins = []; non_blocking_saving = cfg.nonBlockingSaving; } // cfg.extraSettings; serverSettingsFile = pkgs.writeText "server-settings.json" (builtins.toJSON (filterAttrsRecursive (n: v: v != null) serverSettings)); + serverAdminsFile = pkgs.writeText "server-adminlist.json" (builtins.toJSON cfg.admins); modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods; in { @@ -52,6 +52,16 @@ in The port to which the service should bind. ''; }; + + admins = mkOption { + type = types.listOf types.str; + default = []; + example = [ "username" ]; + description = '' + List of player names which will be admin. + ''; + }; + openFirewall = mkOption { type = types.bool; default = false; @@ -234,6 +244,7 @@ in "--start-server=${mkSavePath cfg.saveName}" "--server-settings=${serverSettingsFile}" (optionalString (cfg.mods != []) "--mod-directory=${modDir}") + (optionalString (cfg.admins != []) "--server-adminlist=${serverAdminsFile}") ]; # Sandboxing diff --git a/third_party/nixpkgs/nixos/modules/services/games/terraria.nix b/third_party/nixpkgs/nixos/modules/services/games/terraria.nix index 34c8ff137d..9e8e5ae875 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/terraria.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/terraria.nix @@ -111,6 +111,13 @@ in default = false; description = "Disables automatic Universal Plug and Play."; }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Wheter to open ports in the firewall"; + }; + dataDir = mkOption { type = types.str; default = "/var/lib/terraria"; @@ -151,5 +158,11 @@ in ${pkgs.coreutils}/bin/chgrp terraria ${cfg.dataDir}/terraria.sock ''; }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + allowedUDPPorts = [ cfg.port ]; + }; + }; } diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/brltty.nix b/third_party/nixpkgs/nixos/modules/services/hardware/brltty.nix index 1266e8f81e..7305601753 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/brltty.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/brltty.nix @@ -5,6 +5,19 @@ with lib; let cfg = config.services.brltty; + targets = [ + "default.target" "multi-user.target" + "rescue.target" "emergency.target" + ]; + + genApiKey = pkgs.writers.writeDash "generate-brlapi-key" '' + if ! test -f /etc/brlapi.key; then + echo -n generating brlapi key... + ${pkgs.brltty}/bin/brltty-genkey -f /etc/brlapi.key + echo done + fi + ''; + in { options = { @@ -18,33 +31,27 @@ in { }; config = mkIf cfg.enable { - - systemd.services.brltty = { - description = "Braille Device Support"; - unitConfig = { - Documentation = "http://mielke.cc/brltty/"; - DefaultDependencies = "no"; - RequiresMountsFor = "${pkgs.brltty}/var/lib/brltty"; - }; - serviceConfig = { - ExecStart = "${pkgs.brltty}/bin/brltty --no-daemon"; - Type = "notify"; - TimeoutStartSec = 5; - TimeoutStopSec = 10; - Restart = "always"; - RestartSec = 30; - Nice = -10; - OOMScoreAdjust = -900; - ProtectHome = "read-only"; - ProtectSystem = "full"; - SystemCallArchitectures = "native"; - }; - wants = [ "systemd-udev-settle.service" ]; - after = [ "local-fs.target" "systemd-udev-settle.service" ]; - before = [ "sysinit.target" ]; - wantedBy = [ "sysinit.target" ]; + users.users.brltty = { + description = "BRLTTY daemon user"; + group = "brltty"; + }; + users.groups = { + brltty = { }; + brlapi = { }; }; + systemd.services."brltty@".serviceConfig = + { ExecStartPre = "!${genApiKey}"; }; + + # Install all upstream-provided files + systemd.packages = [ pkgs.brltty ]; + systemd.tmpfiles.packages = [ pkgs.brltty ]; + services.udev.packages = [ pkgs.brltty ]; + environment.systemPackages = [ pkgs.brltty ]; + + # Add missing WantedBys (see issue #81138) + systemd.paths.brltty.wantedBy = targets; + systemd.paths."brltty@".wantedBy = targets; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/fancontrol.nix b/third_party/nixpkgs/nixos/modules/services/hardware/fancontrol.nix index e1ce11a5ae..5574c5a132 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/fancontrol.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/fancontrol.nix @@ -6,21 +6,21 @@ let cfg = config.hardware.fancontrol; configFile = pkgs.writeText "fancontrol.conf" cfg.config; -in{ +in +{ options.hardware.fancontrol = { enable = mkEnableOption "software fan control (requires fancontrol.config)"; config = mkOption { - default = null; - type = types.nullOr types.lines; - description = "Fancontrol configuration file content. See pwmconfig8 from the lm_sensors package."; + type = types.lines; + description = "Required fancontrol configuration file content. See pwmconfig8 from the lm_sensors package."; example = '' # Configuration file generated by pwmconfig INTERVAL=10 DEVPATH=hwmon3=devices/virtual/thermal/thermal_zone2 hwmon4=devices/platform/f71882fg.656 DEVNAME=hwmon3=soc_dts1 hwmon4=f71869a FCTEMPS=hwmon4/device/pwm1=hwmon3/temp1_input - FCFANS= hwmon4/device/pwm1=hwmon4/device/fan1_input + FCFANS=hwmon4/device/pwm1=hwmon4/device/fan1_input MINTEMP=hwmon4/device/pwm1=35 MAXTEMP=hwmon4/device/pwm1=65 MINSTART=hwmon4/device/pwm1=150 @@ -30,16 +30,18 @@ in{ }; config = mkIf cfg.enable { + systemd.services.fancontrol = { - unitConfig.Documentation = "man:fancontrol(8)"; + documentation = [ "man:fancontrol(8)" ]; description = "software fan control"; wantedBy = [ "multi-user.target" ]; after = [ "lm_sensors.service" ]; serviceConfig = { - Type = "simple"; ExecStart = "${pkgs.lm_sensors}/sbin/fancontrol ${configFile}"; }; }; }; + + meta.maintainers = [ maintainers.evils ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/autorandr.nix b/third_party/nixpkgs/nixos/modules/services/misc/autorandr.nix index dfb418af6e..95cee5046e 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/autorandr.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/autorandr.nix @@ -48,5 +48,5 @@ in { }; - meta.maintainers = with maintainers; [ gnidorah ]; + meta.maintainers = with maintainers; [ ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/matrix-dendrite.nix b/third_party/nixpkgs/nixos/modules/services/misc/dendrite.nix similarity index 81% rename from third_party/nixpkgs/nixos/modules/services/misc/matrix-dendrite.nix rename to third_party/nixpkgs/nixos/modules/services/misc/dendrite.nix index b719df29c5..c967fc3a36 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/matrix-dendrite.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/dendrite.nix @@ -1,12 +1,12 @@ { config, lib, pkgs, ... }: let - cfg = config.services.matrix-dendrite; + cfg = config.services.dendrite; settingsFormat = pkgs.formats.yaml { }; configurationYaml = settingsFormat.generate "dendrite.yaml" cfg.settings; - workingDir = "/var/lib/matrix-dendrite"; + workingDir = "/var/lib/dendrite"; in { - options.services.matrix-dendrite = { + options.services.dendrite = { enable = lib.mkEnableOption "matrix.org dendrite"; httpPort = lib.mkOption { type = lib.types.nullOr lib.types.port; @@ -24,31 +24,31 @@ in }; tlsCert = lib.mkOption { type = lib.types.nullOr lib.types.path; - example = "/var/lib/matrix-dendrite/server.cert"; + example = "/var/lib/dendrite/server.cert"; default = null; description = '' The path to the TLS certificate. - nix-shell -p matrix-dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key" + nix-shell -p dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key" ''; }; tlsKey = lib.mkOption { type = lib.types.nullOr lib.types.path; - example = "/var/lib/matrix-dendrite/server.key"; + example = "/var/lib/dendrite/server.key"; default = null; description = '' The path to the TLS key. - nix-shell -p matrix-dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key" + nix-shell -p dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key" ''; }; environmentFile = lib.mkOption { type = lib.types.nullOr lib.types.path; - example = "/var/lib/matrix-dendrite/registration_secret"; + example = "/var/lib/dendrite/registration_secret"; default = null; description = '' Environment file as defined in @@ -62,7 +62,7 @@ in # snippet of dendrite-related config - services.matrix-dendrite.settings.client_api.registration_shared_secret = "$REGISTRATION_SHARED_SECRET"; + services.dendrite.settings.client_api.registration_shared_secret = "$REGISTRATION_SHARED_SECRET"; @@ -95,7 +95,7 @@ in requests and events. - nix-shell -p matrix-dendrite --command "generate-keys --private-key matrix_key.pem" + nix-shell -p dendrite --command "generate-keys --private-key matrix_key.pem" ''; }; @@ -136,11 +136,11 @@ in message = '' If Dendrite is configured to use https, tlsCert and tlsKey must be provided. - nix-shell -p matrix-dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key" + nix-shell -p dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key" ''; }]; - systemd.services.matrix-dendrite = { + systemd.services.dendrite = { description = "Dendrite Matrix homeserver"; after = [ "network.target" @@ -149,22 +149,22 @@ in serviceConfig = { Type = "simple"; DynamicUser = true; - StateDirectory = "matrix-dendrite"; + StateDirectory = "dendrite"; WorkingDirectory = workingDir; - RuntimeDirectory = "matrix-dendrite"; + RuntimeDirectory = "dendrite"; RuntimeDirectoryMode = "0700"; EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; ExecStartPre = if (cfg.environmentFile != null) then '' ${pkgs.envsubst}/bin/envsubst \ -i ${configurationYaml} \ - -o /run/matrix-dendrite/dendrite.yaml + -o /run/dendrite/dendrite.yaml '' else '' - ${pkgs.coreutils}/bin/cp ${configurationYaml} /run/matrix-dendrite/dendrite.yaml + ${pkgs.coreutils}/bin/cp ${configurationYaml} /run/dendrite/dendrite.yaml ''; ExecStart = lib.strings.concatStringsSep " " ([ - "${pkgs.matrix-dendrite}/bin/dendrite-monolith-server" - "--config /run/matrix-dendrite/dendrite.yaml" + "${pkgs.dendrite}/bin/dendrite-monolith-server" + "--config /run/dendrite/dendrite.yaml" ] ++ lib.optionals (cfg.httpPort != null) [ "--http-bind-address :${builtins.toString cfg.httpPort}" ] ++ lib.optionals (cfg.httpsPort != null) [ diff --git a/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix b/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix index 41483d80a2..24a259bb4d 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix @@ -37,7 +37,7 @@ in enableProfilePath = mkEnableOption "exposing the Disnix profiles in the system's PATH"; profiles = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = [ "default" ]; example = [ "default" ]; description = "Names of the Disnix profiles to expose in the system's PATH"; @@ -53,6 +53,7 @@ in environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; environment.variables.PATH = lib.optionals cfg.enableProfilePath (map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin" ) cfg.profiles); + environment.variables.DISNIX_REMOTE_CLIENT = lib.optionalString (cfg.enableMultiUser) "disnix-client"; services.dbus.enable = true; services.dbus.packages = [ pkgs.disnix ]; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/fstrim.nix b/third_party/nixpkgs/nixos/modules/services/misc/fstrim.nix index 5258f5acb4..a9fc04b46f 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/fstrim.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/fstrim.nix @@ -42,5 +42,5 @@ in { }; - meta.maintainers = with maintainers; [ gnidorah ]; + meta.maintainers = with maintainers; [ ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix index 8153754af0..253d87537c 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix @@ -952,7 +952,7 @@ in { path = with pkgs; [ jq openssl - replace + replace-secret git ]; serviceConfig = { @@ -994,8 +994,7 @@ in { ${optionalString cfg.smtp.enable '' install -m u=rw ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb ${optionalString (cfg.smtp.passwordFile != null) '' - smtp_password=$(<'${cfg.smtp.passwordFile}') - replace-literal -e '@smtpPassword@' "$smtp_password" '${cfg.statePath}/config/initializers/smtp_settings.rb' + replace-secret '@smtpPassword@' '${cfg.smtp.passwordFile}' '${cfg.statePath}/config/initializers/smtp_settings.rb' ''} ''} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitweb.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitweb.nix index ca21366b77..13396bf2eb 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitweb.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitweb.nix @@ -54,6 +54,6 @@ in }; - meta.maintainers = with maintainers; [ gnidorah ]; + meta.maintainers = with maintainers; [ ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix b/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix index 1985f13088..1e33381de2 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix @@ -298,7 +298,7 @@ in { ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "invisible"; - ProcSubset = "pid"; + ProcSubset = "all"; ProtectSystem = "strict"; RemoveIPC = true; ReadWritePaths = let @@ -308,9 +308,10 @@ in { allowPaths = if isList value then value else singleton value; in [ "${cfg.configDir}" ] ++ allowPaths; RestrictAddressFamilies = [ - "AF_UNIX" "AF_INET" "AF_INET6" + "AF_NETLINK" + "AF_UNIX" ] ++ optionals (useComponent "bluetooth_tracker" || useComponent "bluetooth_le_tracker") [ "AF_BLUETOOTH" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix b/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix index c1b4586404..6d64acc029 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix @@ -92,9 +92,7 @@ in SystemCallErrorNumber = "EPERM"; SystemCallFilter = [ "@system-service" - - "~@chown" "~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@module" - "~@obsolete" "~@privileged" "~@setuid" + "~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@setuid" ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mame.nix b/third_party/nixpkgs/nixos/modules/services/misc/mame.nix index 34a471ea4f..4b9a04be7c 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mame.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mame.nix @@ -63,5 +63,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ gnidorah ]; + meta.maintainers = with lib.maintainers; [ ]; } 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 8e3fa60206..290b5af1d6 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix @@ -86,7 +86,9 @@ account_threepid_delegates: ${optionalString (cfg.account_threepid_delegates.email != null) "email: ${cfg.account_threepid_delegates.email}"} ${optionalString (cfg.account_threepid_delegates.msisdn != null) "msisdn: ${cfg.account_threepid_delegates.msisdn}"} -room_invite_state_types: ${builtins.toJSON cfg.room_invite_state_types} +room_prejoin_state: + disable_default_event_types: ${boolToString cfg.room_prejoin_state.disable_default_event_types} + additional_event_types: ${builtins.toJSON cfg.room_prejoin_state.additional_event_types} ${optionalString (cfg.macaroon_secret_key != null) '' macaroon_secret_key: "${cfg.macaroon_secret_key}" ''} @@ -577,11 +579,28 @@ in { Delegate SMS sending to this local process (https://localhost:8090) ''; }; - room_invite_state_types = mkOption { + room_prejoin_state.additional_event_types = mkOption { + default = []; type = types.listOf types.str; - default = ["m.room.join_rules" "m.room.canonical_alias" "m.room.avatar" "m.room.name"]; description = '' - A list of event types that will be included in the room_invite_state + Additional events to share with users who received an invite. + ''; + }; + room_prejoin_state.disable_default_event_types = mkOption { + default = false; + type = types.bool; + description = '' + Whether to disable the default state-event types for users invited to a room. + These are: + + + m.room.join_rules + m.room.canonical_alias + m.room.avatar + m.room.encryption + m.room.name + m.room.create + ''; }; macaroon_secret_key = mkOption { @@ -728,6 +747,12 @@ in { '') (mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "") + (mkRemovedOptionModule [ "services" "matrix-synapse" "room_invite_state_types" ] '' + You may add additional event types via + `services.matrix-synapse.room_prejoin_state.additional_event_types` and + disable the default events via + `services.matrix-synapse.room_prejoin_state.disable_default_event_types`. + '') ]; meta.doc = ./matrix-synapse.xml; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/ssm-agent.nix b/third_party/nixpkgs/nixos/modules/services/misc/ssm-agent.nix index e50b07e0b8..c29d03d199 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/ssm-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/ssm-agent.nix @@ -22,8 +22,8 @@ in { package = mkOption { type = types.path; description = "The SSM agent package to use"; - default = pkgs.ssm-agent; - defaultText = "pkgs.ssm-agent"; + default = pkgs.ssm-agent.override { overrideEtc = false; }; + defaultText = "pkgs.ssm-agent.override { overrideEtc = false; }"; }; }; @@ -37,8 +37,10 @@ in { serviceConfig = { ExecStart = "${cfg.package}/bin/amazon-ssm-agent"; KillMode = "process"; - Restart = "on-failure"; - RestartSec = "15min"; + # We want this restating pretty frequently. It could be our only means + # of accessing the instance. + Restart = "always"; + RestartSec = "1min"; }; }; @@ -62,5 +64,10 @@ in { isNormalUser = true; group = "ssm-user"; }; + + environment.etc."amazon/ssm/seelog.xml".source = "${cfg.package}/seelog.xml.template"; + + environment.etc."amazon/ssm/amazon-ssm-agent.json".source = "${cfg.package}/etc/amazon/ssm/amazon-ssm-agent.json.template"; + }; } diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix index 86e306ab40..4ebde6f9b1 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix @@ -42,6 +42,9 @@ let AUTH_ANONYMOUS_ENABLED = boolToString cfg.auth.anonymous.enable; AUTH_ANONYMOUS_ORG_NAME = cfg.auth.anonymous.org_name; AUTH_ANONYMOUS_ORG_ROLE = cfg.auth.anonymous.org_role; + AUTH_GOOGLE_ENABLED = boolToString cfg.auth.google.enable; + AUTH_GOOGLE_ALLOW_SIGN_UP = boolToString cfg.auth.google.allowSignUp; + AUTH_GOOGLE_CLIENT_ID = cfg.auth.google.clientId; ANALYTICS_REPORTING_ENABLED = boolToString cfg.analytics.reporting.enable; @@ -528,23 +531,46 @@ in { }; }; - auth.anonymous = { - enable = mkOption { - description = "Whether to allow anonymous access."; - default = false; - type = types.bool; + auth = { + anonymous = { + enable = mkOption { + description = "Whether to allow anonymous access."; + default = false; + type = types.bool; + }; + org_name = mkOption { + description = "Which organization to allow anonymous access to."; + default = "Main Org."; + type = types.str; + }; + org_role = mkOption { + description = "Which role anonymous users have in the organization."; + default = "Viewer"; + type = types.str; + }; }; - org_name = mkOption { - description = "Which organization to allow anonymous access to."; - default = "Main Org."; - type = types.str; + google = { + enable = mkOption { + description = "Whether to allow Google OAuth2."; + default = false; + type = types.bool; + }; + allowSignUp = mkOption { + description = "Whether to allow sign up with Google OAuth2."; + default = false; + type = types.bool; + }; + clientId = mkOption { + description = "Google OAuth2 client ID."; + default = ""; + type = types.str; + }; + clientSecretFile = mkOption { + description = "Google OAuth2 client secret."; + default = null; + type = types.nullOr types.path; + }; }; - org_role = mkOption { - description = "Which role anonymous users have in the organization."; - default = "Viewer"; - type = types.str; - }; - }; analytics.reporting = { @@ -609,6 +635,9 @@ in { QT_QPA_PLATFORM = "offscreen"; } // mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions; script = '' + ${optionalString (cfg.auth.google.clientSecretFile != null) '' + export GF_AUTH_GOOGLE_CLIENT_SECRET="$(cat ${escapeShellArg cfg.auth.google.clientSecretFile})" + ''} ${optionalString (cfg.database.passwordFile != null) '' export GF_DATABASE_PASSWORD="$(cat ${escapeShellArg cfg.database.passwordFile})" ''} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix index 007024c04c..561ce3eec6 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix @@ -8,6 +8,7 @@ let wrappedPlugins = pkgs.runCommand "wrapped-plugins" { preferLocalBuild = true; } '' mkdir -p $out/libexec/netdata/plugins.d ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin + ln -s /run/wrappers/bin/cgroup-network $out/libexec/netdata/plugins.d/cgroup-network ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin @@ -26,6 +27,10 @@ let "web files owner" = "root"; "web files group" = "root"; }; + "plugin:cgroups" = { + "script to get cgroup network interfaces" = "${wrappedPlugins}/libexec/netdata/plugins.d/cgroup-network"; + "use unified cgroups" = "yes"; + }; }; mkConfig = generators.toINI {} (recursiveUpdate localConfig cfg.config); configFile = pkgs.writeText "netdata.conf" (if cfg.configText != null then cfg.configText else mkConfig); @@ -149,8 +154,9 @@ in { description = "Real time performance monitoring"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = (with pkgs; [ curl gawk which ]) ++ lib.optional cfg.python.enable - (pkgs.python3.withPackages cfg.python.extraPackages); + path = (with pkgs; [ curl gawk iproute2 which ]) + ++ lib.optional cfg.python.enable (pkgs.python3.withPackages cfg.python.extraPackages) + ++ lib.optional config.virtualisation.libvirtd.enable (config.virtualisation.libvirtd.package); environment = { PYTHONPATH = "${cfg.package}/libexec/netdata/python.d/python_modules"; } // lib.optionalAttrs (!cfg.enableAnalyticsReporting) { @@ -191,6 +197,8 @@ in { "CAP_SYS_PTRACE" # is required for apps plugin "CAP_SYS_RESOURCE" # is required for ebpf plugin "CAP_NET_RAW" # is required for fping app + "CAP_SYS_CHROOT" # is required for cgroups plugin + "CAP_SETUID" # is required for cgroups and cgroups-network plugins ]; # Sandboxing ProtectSystem = "full"; @@ -208,7 +216,15 @@ in { capabilities = "cap_dac_read_search,cap_sys_ptrace+ep"; owner = cfg.user; group = cfg.group; - permissions = "u+rx,g+rx,o-rwx"; + permissions = "u+rx,g+x,o-rwx"; + }; + + security.wrappers."cgroup-network" = { + source = "${cfg.package}/libexec/netdata/plugins.d/cgroup-network.org"; + capabilities = "cap_setuid+ep"; + owner = cfg.user; + group = cfg.group; + permissions = "u+rx,g+x,o-rwx"; }; security.wrappers."freeipmi.plugin" = { @@ -216,7 +232,7 @@ in { capabilities = "cap_dac_override,cap_fowner+ep"; owner = cfg.user; group = cfg.group; - permissions = "u+rx,g+rx,o-rwx"; + permissions = "u+rx,g+x,o-rwx"; }; security.wrappers."perf.plugin" = { @@ -224,7 +240,7 @@ in { capabilities = "cap_sys_admin+ep"; owner = cfg.user; group = cfg.group; - permissions = "u+rx,g+rx,o-rx"; + permissions = "u+rx,g+x,o-rwx"; }; security.wrappers."slabinfo.plugin" = { @@ -232,7 +248,7 @@ in { capabilities = "cap_dac_override+ep"; owner = cfg.user; group = cfg.group; - permissions = "u+rx,g+rx,o-rx"; + permissions = "u+rx,g+x,o-rwx"; }; security.pam.loginLimits = [ 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 bd74e1a9cd..1d483627e9 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix @@ -112,7 +112,7 @@ let http://tools.ietf.org/html/rfc4366#section-3.1 ''; }; - name = mkOpt types.string '' + name = mkOpt types.str '' Name of the remote read config, which if specified must be unique among remote read configs. The name will be used in metrics and logging in place of a generated value to help users distinguish between remote read configs. @@ -174,7 +174,7 @@ let write_relabel_configs = mkOpt (types.listOf promTypes.relabel_config) '' List of remote write relabel configurations. ''; - name = mkOpt types.string '' + name = mkOpt types.str '' Name of the remote write config, which if specified must be unique among remote write configs. The name will be used in metrics and logging in place of a generated value to help users distinguish between remote write configs. 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 ce7c215fd1..8e8999e515 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -34,6 +34,7 @@ let "fritzbox" "json" "jitsi" + "kea" "keylight" "knot" "lnd" diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bind.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bind.nix index 972632b5a2..16c2920751 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bind.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bind.nix @@ -41,12 +41,12 @@ in serviceConfig = { ExecStart = '' ${pkgs.prometheus-bind-exporter}/bin/bind_exporter \ - -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ - -bind.pid-file /var/run/named/named.pid \ - -bind.timeout ${toString cfg.bindTimeout} \ - -bind.stats-url ${cfg.bindURI} \ - -bind.stats-version ${cfg.bindVersion} \ - -bind.stats-groups ${concatStringsSep "," cfg.bindGroups} \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --bind.pid-file /var/run/named/named.pid \ + --bind.timeout ${toString cfg.bindTimeout} \ + --bind.stats-url ${cfg.bindURI} \ + --bind.stats-version ${cfg.bindVersion} \ + --bind.stats-groups ${concatStringsSep "," cfg.bindGroups} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix index a3b2b92bc3..a7f4d3e096 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix @@ -41,11 +41,11 @@ in }; logFormat = mkOption { - type = types.str; - default = "logger:stderr"; - example = "logger:syslog?appname=bob&local=7 or logger:stdout?json=true"; + type = types.enum [ "logfmt" "json" ]; + default = "logfmt"; + example = "json"; description = '' - Set the log target and format. + Set the log format. ''; }; @@ -59,16 +59,16 @@ in }; serviceOpts = let collectSettingsArgs = if (cfg.collectdBinary.enable) then '' - -collectd.listen-address ${cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \ - -collectd.security-level ${cfg.collectdBinary.securityLevel} \ + --collectd.listen-address ${cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \ + --collectd.security-level ${cfg.collectdBinary.securityLevel} \ '' else ""; in { serviceConfig = { ExecStart = '' ${pkgs.prometheus-collectd-exporter}/bin/collectd_exporter \ - -log.format ${escapeShellArg cfg.logFormat} \ - -log.level ${cfg.logLevel} \ - -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --log.format ${escapeShellArg cfg.logFormat} \ + --log.level ${cfg.logLevel} \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ ${collectSettingsArgs} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix new file mode 100644 index 0000000000..b6cd89c386 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix @@ -0,0 +1,38 @@ +{ config +, lib +, pkgs +, options +}: + +with lib; + +let + cfg = config.services.prometheus.exporters.kea; +in { + port = 9547; + extraOpts = { + controlSocketPaths = mkOption { + type = types.listOf types.str; + example = literalExample '' + [ + "/run/kea/kea-dhcp4.socket" + "/run/kea/kea-dhcp6.socket" + ] + ''; + description = '' + Paths to kea control sockets + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-kea-exporter}/bin/kea-exporter \ + --address ${cfg.listenAddress} \ + --port ${toString cfg.port} \ + ${concatStringsSep " \\n" cfg.controlSocketPaths} + ''; + SupplementaryGroups = [ "kea" ]; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix index 78fe120e4d..d95e5ed9e8 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix @@ -13,7 +13,7 @@ let generateConfig = extraLabels: { metrics = (map (path: { name = "rspamd_${replaceStrings [ "." " " ] [ "_" "_" ] path}"; - path = "$.${path}"; + path = "{ .${path} }"; labels = extraLabels; }) [ "actions.'add header'" diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/xmpp-alerts.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/xmpp-alerts.nix index 44b15cb203..980c93c9c4 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/xmpp-alerts.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/xmpp-alerts.nix @@ -4,21 +4,29 @@ with lib; let cfg = config.services.prometheus.xmpp-alerts; - - configFile = pkgs.writeText "prometheus-xmpp-alerts.yml" (builtins.toJSON cfg.configuration); - + settingsFormat = pkgs.formats.yaml {}; + configFile = settingsFormat.generate "prometheus-xmpp-alerts.yml" cfg.settings; in - { - options.services.prometheus.xmpp-alerts = { + imports = [ + (mkRenamedOptionModule + [ "services" "prometheus" "xmpp-alerts" "configuration" ] + [ "services" "prometheus" "xmpp-alerts" "settings" ]) + ]; + options.services.prometheus.xmpp-alerts = { enable = mkEnableOption "XMPP Web hook service for Alertmanager"; - configuration = mkOption { - type = types.attrs; - description = "Configuration as attribute set which will be converted to YAML"; - }; + settings = mkOption { + type = settingsFormat.type; + default = {}; + description = '' + Configuration for prometheus xmpp-alerts, see + + for supported values. + ''; + }; }; config = mkIf cfg.enable { diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/netatalk.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/netatalk.nix index 33e851210b..06a36eb30c 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/netatalk.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/netatalk.nix @@ -3,43 +3,10 @@ with lib; let - cfg = config.services.netatalk; - - extmapFile = pkgs.writeText "extmap.conf" cfg.extmap; - - afpToString = x: if builtins.typeOf x == "bool" - then boolToString x - else toString x; - - volumeConfig = name: - let vol = getAttr name cfg.volumes; in - "[${name}]\n " + (toString ( - map - (key: "${key} = ${afpToString (getAttr key vol)}\n") - (attrNames vol) - )); - - afpConf = ''[Global] - extmap file = ${extmapFile} - afp port = ${toString cfg.port} - - ${cfg.extraConfig} - - ${if cfg.homes.enable then ''[Homes] - ${optionalString (cfg.homes.path != "") "path = ${cfg.homes.path}"} - basedir regex = ${cfg.homes.basedirRegex} - ${cfg.homes.extraConfig} - '' else ""} - - ${toString (map volumeConfig (attrNames cfg.volumes))} - ''; - - afpConfFile = pkgs.writeText "afp.conf" afpConf; - -in - -{ + settingsFormat = pkgs.formats.ini { }; + afpConfFile = settingsFormat.generate "afp.conf" cfg.settings; +in { options = { services.netatalk = { @@ -51,61 +18,24 @@ in description = "TCP port to be used for AFP."; }; - extraConfig = mkOption { - type = types.lines; - default = ""; - example = "uam list = uams_guest.so"; - description = '' - Lines of configuration to add to the [Global] section. - See man apf.conf for more information. - ''; - }; - - homes = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable sharing of the UNIX server user home directories."; - }; - - path = mkOption { - type = types.str; - default = ""; - example = "afp-data"; - description = "Share not the whole user home but this subdirectory path."; - }; - - basedirRegex = mkOption { - example = "/home"; - type = types.str; - description = "Regex which matches the parent directory of the user homes."; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Lines of configuration to add to the [Homes] section. - See man apf.conf for more information. - ''; - }; - }; - - volumes = mkOption { + settings = mkOption { + inherit (settingsFormat) type; default = { }; - type = types.attrsOf (types.attrsOf types.unspecified); - description = - '' - Set of AFP volumes to export. - See man apf.conf for more information. - ''; - example = literalExample '' - { srv = - { path = "/srv"; - "read only" = true; - "hosts allow" = "10.1.0.0/16 10.2.1.100 2001:0db8:1234::/48"; - }; - } + example = { + Global = { "uam list" = "uams_guest.so"; }; + Homes = { + path = "afp-data"; + "basedir regex" = "/home"; + }; + example-volume = { + path = "/srv/volume"; + "read only" = true; + }; + }; + description = '' + Configuration for Netatalk. See + afp.conf + 5. ''; }; @@ -114,18 +44,33 @@ in default = ""; description = '' File name extension mappings. - See man extmap.conf for more information. + See extmap.conf + 5. for more information. ''; }; }; }; + imports = (map (option: + mkRemovedOptionModule [ "services" "netatalk" option ] + "This option was removed in favor of `services.netatalk.settings`.") [ + "extraConfig" + "homes" + "volumes" + ]); + config = mkIf cfg.enable { + services.netatalk.settings.Global = { + "afp port" = toString cfg.port; + "extmap file" = "${pkgs.writeText "extmap.conf" cfg.extmap}"; + }; + systemd.services.netatalk = { description = "Netatalk AFP fileserver for Macintosh clients"; - unitConfig.Documentation = "man:afp.conf(5) man:netatalk(8) man:afpd(8) man:cnid_metad(8) man:cnid_dbd(8)"; + unitConfig.Documentation = + "man:afp.conf(5) man:netatalk(8) man:afpd(8) man:cnid_metad(8) man:cnid_dbd(8)"; after = [ "network.target" "avahi-daemon.service" ]; wantedBy = [ "multi-user.target" ]; @@ -135,12 +80,12 @@ in Type = "forking"; GuessMainPID = "no"; PIDFile = "/run/lock/netatalk"; - ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0755 -p /var/lib/netatalk/CNID"; - ExecStart = "${pkgs.netatalk}/sbin/netatalk -F ${afpConfFile}"; + ExecStart = "${pkgs.netatalk}/sbin/netatalk -F ${afpConfFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - ExecStop = "${pkgs.coreutils}/bin/kill -TERM $MAINPID"; + ExecStop = "${pkgs.coreutils}/bin/kill -TERM $MAINPID"; Restart = "always"; RestartSec = 1; + StateDirectory = [ "netatalk/CNID" ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix index c68039c79e..800ef448d3 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix @@ -117,7 +117,7 @@ in { PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = "~@clock @cpu-emulation @debug @module @mount @obsolete @privileged @raw-io @reboot @resources @swap"; + SystemCallFilter = "~@cpu-emulation @debug @mount @obsolete @privileged @resources"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bind.nix b/third_party/nixpkgs/nixos/modules/services/networking/bind.nix index b73b2b6268..20eef2c345 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/bind.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/bind.nix @@ -32,7 +32,7 @@ let slaves = mkOption { type = types.listOf types.str; description = "Addresses who may request zone transfers."; - default = []; + default = [ ]; }; extraConfig = mkOption { type = types.str; @@ -105,7 +105,7 @@ in enable = mkEnableOption "BIND domain name server"; cacheNetworks = mkOption { - default = ["127.0.0.0/24"]; + default = [ "127.0.0.0/24" ]; type = types.listOf types.str; description = " What networks are allowed to use us as a resolver. Note @@ -117,7 +117,7 @@ in }; blockedNetworks = mkOption { - default = []; + default = [ ]; type = types.listOf types.str; description = " What networks are just blocked. @@ -141,7 +141,7 @@ in }; listenOn = mkOption { - default = ["any"]; + default = [ "any" ]; type = types.listOf types.str; description = " Interfaces to listen on. @@ -149,7 +149,7 @@ in }; listenOnIpv6 = mkOption { - default = ["any"]; + default = [ "any" ]; type = types.listOf types.str; description = " Ipv6 interfaces to listen on. @@ -157,7 +157,7 @@ in }; zones = mkOption { - default = []; + default = [ ]; type = with types; coercedTo (listOf attrs) bindZoneCoerce (attrsOf (types.submodule bindZoneOptions)); description = " List of zones we claim authority over. @@ -166,8 +166,8 @@ in "example.com" = { master = false; file = "/var/dns/example.com"; - masters = ["192.168.0.1"]; - slaves = []; + masters = [ "192.168.0.1" ]; + slaves = [ ]; extraConfig = ""; }; }; @@ -212,7 +212,8 @@ in networking.resolvconf.useLocalResolver = mkDefault true; users.users.${bindUser} = - { uid = config.ids.uids.bind; + { + uid = config.ids.uids.bind; description = "BIND daemon user"; }; @@ -232,9 +233,9 @@ in ''; serviceConfig = { - ExecStart = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f"; + ExecStart = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f"; ExecReload = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' reload"; - ExecStop = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' stop"; + ExecStop = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' stop"; }; unitConfig.Documentation = "man:named(8)"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix b/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix index e9a0e5af1a..f1a504b3e3 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix @@ -12,8 +12,18 @@ let { ... }: { options = { password = mkOption { - type = types.str; - description = "Authorized password to the opposite end of the tunnel."; + type = types.str; + description = "Authorized password to the opposite end of the tunnel."; + }; + login = mkOption { + default = ""; + type = types.str; + description = "(optional) name your peer has for you"; + }; + peerName = mkOption { + default = ""; + type = types.str; + description = "(optional) human-readable name for peer"; }; publicKey = mkOption { type = types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/croc.nix b/third_party/nixpkgs/nixos/modules/services/networking/croc.nix index b218fab219..9466adf71d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/croc.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/croc.nix @@ -72,9 +72,7 @@ in RuntimeDirectoryMode = "700"; SystemCallFilter = [ "@system-service" - "~@aio" "~@chown" "~@keyring" "~@memlock" - "~@privileged" "~@resources" "~@setuid" - "~@sync" "~@timer" + "~@aio" "~@keyring" "~@memlock" "~@privileged" "~@resources" "~@setuid" "~@sync" "~@timer" ]; SystemCallArchitectures = "native"; SystemCallErrorNumber = "EPERM"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ghostunnel.nix b/third_party/nixpkgs/nixos/modules/services/networking/ghostunnel.nix new file mode 100644 index 0000000000..58a51df6cc --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/ghostunnel.nix @@ -0,0 +1,242 @@ +{ config, lib, pkgs, ... }: +let + inherit (lib) + attrValues + concatMap + concatStringsSep + escapeShellArg + literalExample + mapAttrs' + mkDefault + mkEnableOption + mkIf + mkOption + nameValuePair + optional + types + ; + + mainCfg = config.services.ghostunnel; + + module = { config, name, ... }: + { + options = { + + listen = mkOption { + description = '' + Address and port to listen on (can be HOST:PORT, unix:PATH). + ''; + type = types.str; + }; + + target = mkOption { + description = '' + Address to forward connections to (can be HOST:PORT or unix:PATH). + ''; + type = types.str; + }; + + keystore = mkOption { + description = '' + Path to keystore (combined PEM with cert/key, or PKCS12 keystore). + + NB: storepass is not supported because it would expose credentials via /proc/*/cmdline. + + Specify this or cert and key. + ''; + type = types.nullOr types.str; + default = null; + }; + + cert = mkOption { + description = '' + Path to certificate (PEM with certificate chain). + + Not required if keystore is set. + ''; + type = types.nullOr types.str; + default = null; + }; + + key = mkOption { + description = '' + Path to certificate private key (PEM with private key). + + Not required if keystore is set. + ''; + type = types.nullOr types.str; + default = null; + }; + + cacert = mkOption { + description = '' + Path to CA bundle file (PEM/X509). Uses system trust store if null. + ''; + type = types.nullOr types.str; + }; + + disableAuthentication = mkOption { + description = '' + Disable client authentication, no client certificate will be required. + ''; + type = types.bool; + default = false; + }; + + allowAll = mkOption { + description = '' + If true, allow all clients, do not check client cert subject. + ''; + type = types.bool; + default = false; + }; + + allowCN = mkOption { + description = '' + Allow client if common name appears in the list. + ''; + type = types.listOf types.str; + default = []; + }; + + allowOU = mkOption { + description = '' + Allow client if organizational unit name appears in the list. + ''; + type = types.listOf types.str; + default = []; + }; + + allowDNS = mkOption { + description = '' + Allow client if DNS subject alternative name appears in the list. + ''; + type = types.listOf types.str; + default = []; + }; + + allowURI = mkOption { + description = '' + Allow client if URI subject alternative name appears in the list. + ''; + type = types.listOf types.str; + default = []; + }; + + extraArguments = mkOption { + description = "Extra arguments to pass to ghostunnel server"; + type = types.separatedString " "; + default = ""; + }; + + unsafeTarget = mkOption { + description = '' + If set, does not limit target to localhost, 127.0.0.1, [::1], or UNIX sockets. + + This is meant to protect against accidental unencrypted traffic on + untrusted networks. + ''; + type = types.bool; + default = false; + }; + + # Definitions to apply at the root of the NixOS configuration. + atRoot = mkOption { + internal = true; + }; + }; + + # Clients should not be authenticated with the public root certificates + # (afaict, it doesn't make sense), so we only provide that default when + # client cert auth is disabled. + config.cacert = mkIf config.disableAuthentication (mkDefault null); + + config.atRoot = { + assertions = [ + { message = '' + services.ghostunnel.servers.${name}: At least one access control flag is required. + Set at least one of: + - services.ghostunnel.servers.${name}.disableAuthentication + - services.ghostunnel.servers.${name}.allowAll + - services.ghostunnel.servers.${name}.allowCN + - services.ghostunnel.servers.${name}.allowOU + - services.ghostunnel.servers.${name}.allowDNS + - services.ghostunnel.servers.${name}.allowURI + ''; + assertion = config.disableAuthentication + || config.allowAll + || config.allowCN != [] + || config.allowOU != [] + || config.allowDNS != [] + || config.allowURI != [] + ; + } + ]; + + systemd.services."ghostunnel-server-${name}" = { + after = [ "network.target" ]; + wants = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Restart = "always"; + AmbientCapabilities = ["CAP_NET_BIND_SERVICE"]; + DynamicUser = true; + LoadCredential = optional (config.keystore != null) "keystore:${config.keystore}" + ++ optional (config.cert != null) "cert:${config.cert}" + ++ optional (config.key != null) "key:${config.key}" + ++ optional (config.cacert != null) "cacert:${config.cacert}"; + }; + script = concatStringsSep " " ( + [ "${mainCfg.package}/bin/ghostunnel" ] + ++ optional (config.keystore != null) "--keystore=$CREDENTIALS_DIRECTORY/keystore" + ++ optional (config.cert != null) "--cert=$CREDENTIALS_DIRECTORY/cert" + ++ optional (config.key != null) "--key=$CREDENTIALS_DIRECTORY/key" + ++ optional (config.cacert != null) "--cacert=$CREDENTIALS_DIRECTORY/cacert" + ++ [ + "server" + "--listen ${config.listen}" + "--target ${config.target}" + ] ++ optional config.allowAll "--allow-all" + ++ map (v: "--allow-cn=${escapeShellArg v}") config.allowCN + ++ map (v: "--allow-ou=${escapeShellArg v}") config.allowOU + ++ map (v: "--allow-dns=${escapeShellArg v}") config.allowDNS + ++ map (v: "--allow-uri=${escapeShellArg v}") config.allowURI + ++ optional config.disableAuthentication "--disable-authentication" + ++ optional config.unsafeTarget "--unsafe-target" + ++ [ config.extraArguments ] + ); + }; + }; + }; + +in +{ + + options = { + services.ghostunnel.enable = mkEnableOption "ghostunnel"; + + services.ghostunnel.package = mkOption { + description = "The ghostunnel package to use."; + type = types.package; + default = pkgs.ghostunnel; + defaultText = literalExample ''pkgs.ghostunnel''; + }; + + services.ghostunnel.servers = mkOption { + description = '' + Server mode ghostunnels (TLS listener -> plain TCP/UNIX target) + ''; + type = types.attrsOf (types.submodule module); + default = {}; + }; + }; + + config = mkIf mainCfg.enable { + assertions = lib.mkMerge (map (v: v.atRoot.assertions) (attrValues mainCfg.servers)); + systemd = lib.mkMerge (map (v: v.atRoot.systemd) (attrValues mainCfg.servers)); + }; + + meta.maintainers = with lib.maintainers; [ + roberth + ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/hans.nix b/third_party/nixpkgs/nixos/modules/services/networking/hans.nix index 8334dc68d6..84147db00f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/hans.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/hans.nix @@ -141,5 +141,5 @@ in }; }; - meta.maintainers = with maintainers; [ gnidorah ]; + meta.maintainers = with maintainers; [ ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix b/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix index 81bc4e1cf9..1f0423ac3d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix @@ -9,21 +9,22 @@ let libexec = "${pkgs.libreswan}/libexec/ipsec"; ipsec = "${pkgs.libreswan}/sbin/ipsec"; - trim = chars: str: let - nonchars = filter (x : !(elem x.value chars)) - (imap0 (i: v: {ind = i; value = v;}) (stringToCharacters str)); - in - if length nonchars == 0 then "" - else substring (head nonchars).ind (add 1 (sub (last nonchars).ind (head nonchars).ind)) str; + trim = chars: str: + let + nonchars = filter (x : !(elem x.value chars)) + (imap0 (i: v: {ind = i; value = v;}) (stringToCharacters str)); + in + if length nonchars == 0 then "" + else substring (head nonchars).ind (add 1 (sub (last nonchars).ind (head nonchars).ind)) str; indent = str: concatStrings (concatMap (s: [" " (trim [" " "\t"] s) "\n"]) (splitString "\n" str)); configText = indent (toString cfg.configSetup); connectionText = concatStrings (mapAttrsToList (n: v: '' conn ${n} ${indent v} - '') cfg.connections); - configFile = pkgs.writeText "ipsec.conf" + + configFile = pkgs.writeText "ipsec-nixos.conf" '' config setup ${configText} @@ -31,6 +32,11 @@ let ${connectionText} ''; + policyFiles = mapAttrs' (name: text: + { name = "ipsec.d/policies/${name}"; + value.source = pkgs.writeText "ipsec-policy-${name}" text; + }) cfg.policies; + in { @@ -41,41 +47,71 @@ in services.libreswan = { - enable = mkEnableOption "libreswan ipsec service"; + enable = mkEnableOption "Libreswan IPsec service"; configSetup = mkOption { type = types.lines; default = '' protostack=netkey - nat_traversal=yes virtual_private=%v4:10.0.0.0/8,%v4:192.168.0.0/16,%v4:172.16.0.0/12,%v4:25.0.0.0/8,%v4:100.64.0.0/10,%v6:fd00::/8,%v6:fe80::/10 ''; example = '' secretsfile=/root/ipsec.secrets protostack=netkey - nat_traversal=yes virtual_private=%v4:10.0.0.0/8,%v4:192.168.0.0/16,%v4:172.16.0.0/12,%v4:25.0.0.0/8,%v4:100.64.0.0/10,%v6:fd00::/8,%v6:fe80::/10 ''; - description = "Options to go in the 'config setup' section of the libreswan ipsec configuration"; + description = "Options to go in the 'config setup' section of the Libreswan IPsec configuration"; }; connections = mkOption { type = types.attrsOf types.lines; default = {}; - example = { - myconnection = '' - auto=add - left=%defaultroute - leftid=@user + example = literalExample '' + { myconnection = ''' + auto=add + left=%defaultroute + leftid=@user - right=my.vpn.com + right=my.vpn.com - ikev2=no - ikelifetime=8h - ''; - }; - description = "A set of connections to define for the libreswan ipsec service"; + ikev2=no + ikelifetime=8h + '''; + } + ''; + description = "A set of connections to define for the Libreswan IPsec service"; }; + + policies = mkOption { + type = types.attrsOf types.lines; + default = {}; + example = literalExample '' + { private-or-clear = ''' + # Attempt opportunistic IPsec for the entire Internet + 0.0.0.0/0 + ::/0 + '''; + } + ''; + description = '' + A set of policies to apply to the IPsec connections. + + + The policy name must match the one of connection it needs to apply to. + + ''; + }; + + disableRedirects = mkOption { + type = types.bool; + default = true; + description = '' + Whether to disable send and accept redirects for all nework interfaces. + See the Libreswan + FAQ page for why this is recommended. + ''; + }; + }; }; @@ -85,43 +121,38 @@ in config = mkIf cfg.enable { + # Install package, systemd units, etc. environment.systemPackages = [ pkgs.libreswan pkgs.iproute2 ]; + systemd.packages = [ pkgs.libreswan ]; + systemd.tmpfiles.packages = [ pkgs.libreswan ]; + + # Install configuration files + environment.etc = { + "ipsec.secrets".source = "${pkgs.libreswan}/etc/ipsec.secrets"; + "ipsec.conf".source = "${pkgs.libreswan}/etc/ipsec.conf"; + "ipsec.d/01-nixos.conf".source = configFile; + } // policyFiles; + + # Create NSS database directory + systemd.tmpfiles.rules = [ "d /var/lib/ipsec/nss 755 root root -" ]; systemd.services.ipsec = { description = "Internet Key Exchange (IKE) Protocol Daemon for IPsec"; - path = [ - "${pkgs.libreswan}" - "${pkgs.iproute2}" - "${pkgs.procps}" - "${pkgs.nssTools}" - "${pkgs.iptables}" - "${pkgs.nettools}" - ]; - - wants = [ "network-online.target" ]; - after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; - - serviceConfig = { - Type = "simple"; - Restart = "always"; - EnvironmentFile = "-${pkgs.libreswan}/etc/sysconfig/pluto"; - ExecStartPre = [ - "${libexec}/addconn --config ${configFile} --checkconfig" - "${libexec}/_stackmanager start" - "${ipsec} --checknss" - "${ipsec} --checknflog" - ]; - ExecStart = "${libexec}/pluto --config ${configFile} --nofork \$PLUTO_OPTIONS"; - ExecStop = "${libexec}/whack --shutdown"; - ExecStopPost = [ - "${pkgs.iproute2}/bin/ip xfrm policy flush" - "${pkgs.iproute2}/bin/ip xfrm state flush" - "${ipsec} --stopnflog" - ]; - ExecReload = "${libexec}/whack --listen"; - }; - + restartTriggers = [ configFile ] ++ mapAttrsToList (n: v: v.source) policyFiles; + path = with pkgs; [ + libreswan + iproute2 + procps + nssTools + iptables + nettools + ]; + preStart = optionalString cfg.disableRedirects '' + # Disable send/receive redirects + echo 0 | tee /proc/sys/net/ipv4/conf/*/send_redirects + echo 0 | tee /proc/sys/net/ipv{4,6}/conf/*/accept_redirects + ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/monero.nix b/third_party/nixpkgs/nixos/modules/services/networking/monero.nix index fde3293fc1..952d1d47ca 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/monero.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/monero.nix @@ -4,7 +4,6 @@ with lib; let cfg = config.services.monero; - dataDir = "/var/lib/monero"; listToConf = option: list: concatMapStrings (value: "${option}=${value}\n") list; @@ -53,11 +52,19 @@ in enable = mkEnableOption "Monero node daemon"; + dataDir = mkOption { + type = types.str; + default = "/var/lib/monero"; + description = '' + The directory where Monero stores its data files. + ''; + }; + mining.enable = mkOption { type = types.bool; default = false; description = '' - Whether to mine moneroj. + Whether to mine monero. ''; }; @@ -198,15 +205,14 @@ in config = mkIf cfg.enable { users.users.monero = { - uid = config.ids.uids.monero; + isSystemUser = true; + group = "monero"; description = "Monero daemon user"; - home = dataDir; + home = cfg.dataDir; createHome = true; }; - users.groups.monero = { - gid = config.ids.gids.monero; - }; + users.groups.monero = { }; systemd.services.monero = { description = "monero daemon"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix b/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix index f33c350a25..2ac0a8c792 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix @@ -20,6 +20,15 @@ let mkZoneFileName = name: if name == "." then "root" else name; + # replaces include: directives for keys with fake keys for nsd-checkconf + injectFakeKeys = keys: concatStrings + (mapAttrsToList + (keyName: keyOptions: '' + fakeKey="$(${pkgs.bind}/bin/tsig-keygen -a ${escapeShellArgs [ keyOptions.algorithm keyName ]} | grep -oP "\s*secret \"\K.*(?=\";)")" + sed "s@^\s*include:\s*\"${stateDir}/private/${keyName}\"\$@secret: $fakeKey@" -i $out/nsd.conf + '') + keys); + nsdEnv = pkgs.buildEnv { name = "nsd-env"; @@ -34,9 +43,9 @@ let echo "|- checking zone '$out/zones/$zoneFile'" ${nsdPkg}/sbin/nsd-checkzone "$zoneFile" "$zoneFile" || { if grep -q \\\\\\$ "$zoneFile"; then - echo zone "$zoneFile" contains escaped dollar signes \\\$ - echo Escaping them is not needed any more. Please make shure \ - to unescape them where they prefix a variable name + echo zone "$zoneFile" contains escaped dollar signs \\\$ + echo Escaping them is not needed any more. Please make sure \ + to unescape them where they prefix a variable name. fi exit 1 @@ -44,7 +53,14 @@ let done echo "checking configuration file" + # Save original config file including key references... + cp $out/nsd.conf{,.orig} + # ...inject mock keys into config + ${injectFakeKeys cfg.keys} + # ...do the checkconf ${nsdPkg}/sbin/nsd-checkconf $out/nsd.conf + # ... and restore original config file. + mv $out/nsd.conf{.orig,} ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix b/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix index 5af035fd59..8c632c319d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix @@ -3,56 +3,103 @@ with lib; let - cfg = config.services.radicale; - confFile = pkgs.writeText "radicale.conf" cfg.config; - - defaultPackage = if versionAtLeast config.system.stateVersion "20.09" then { - pkg = pkgs.radicale3; - text = "pkgs.radicale3"; - } else if versionAtLeast config.system.stateVersion "17.09" then { - pkg = pkgs.radicale2; - text = "pkgs.radicale2"; - } else { - pkg = pkgs.radicale1; - text = "pkgs.radicale1"; + format = pkgs.formats.ini { + listToValue = concatMapStringsSep ", " (generators.mkValueStringDefault { }); }; -in -{ + pkg = if isNull cfg.package then + pkgs.radicale + else + cfg.package; - options = { - services.radicale.enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable Radicale CalDAV and CardDAV server. - ''; + confFile = if cfg.settings == { } then + pkgs.writeText "radicale.conf" cfg.config + else + format.generate "radicale.conf" cfg.settings; + + rightsFile = format.generate "radicale.rights" cfg.rights; + + bindLocalhost = cfg.settings != { } && !hasAttrByPath [ "server" "hosts" ] cfg.settings; + +in { + options.services.radicale = { + enable = mkEnableOption "Radicale CalDAV and CardDAV server"; + + package = mkOption { + description = "Radicale package to use."; + # Default cannot be pkgs.radicale because non-null values suppress + # warnings about incompatible configuration and storage formats. + type = with types; nullOr package // { inherit (package) description; }; + default = null; + defaultText = "pkgs.radicale"; }; - services.radicale.package = mkOption { - type = types.package; - default = defaultPackage.pkg; - defaultText = defaultPackage.text; - description = '' - Radicale package to use. This defaults to version 1.x if - system.stateVersion < 17.09, version 2.x if - 17.09 ≤ system.stateVersion < 20.09, and - version 3.x otherwise. - ''; - }; - - services.radicale.config = mkOption { + config = mkOption { type = types.str; default = ""; description = '' Radicale configuration, this will set the service configuration file. + This option is mutually exclusive with . + This option is deprecated. Use instead. ''; }; - services.radicale.extraArgs = mkOption { + settings = mkOption { + type = format.type; + default = { }; + description = '' + Configuration for Radicale. See + . + This option is mutually exclusive with . + ''; + example = literalExample '' + server = { + hosts = [ "0.0.0.0:5232" "[::]:5232" ]; + }; + auth = { + type = "htpasswd"; + htpasswd_filename = "/etc/radicale/users"; + htpasswd_encryption = "bcrypt"; + }; + storage = { + filesystem_folder = "/var/lib/radicale/collections"; + }; + ''; + }; + + rights = mkOption { + type = format.type; + description = '' + Configuration for Radicale's rights file. See + . + This option only works in conjunction with . + Setting this will also set and + to approriate values. + ''; + default = { }; + example = literalExample '' + root = { + user = ".+"; + collection = ""; + permissions = "R"; + }; + principal = { + user = ".+"; + collection = "{user}"; + permissions = "RW"; + }; + calendars = { + user = ".+"; + collection = "{user}/[^/]+"; + permissions = "rw"; + }; + ''; + }; + + extraArgs = mkOption { type = types.listOf types.str; default = []; description = "Extra arguments passed to the Radicale daemon."; @@ -60,33 +107,94 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; + assertions = [ + { + assertion = cfg.settings == { } || cfg.config == ""; + message = '' + The options services.radicale.config and services.radicale.settings + are mutually exclusive. + ''; + } + ]; - users.users.radicale = - { uid = config.ids.uids.radicale; - description = "radicale user"; - home = "/var/lib/radicale"; - createHome = true; - }; + warnings = optional (isNull cfg.package && versionOlder config.system.stateVersion "17.09") '' + The configuration and storage formats of your existing Radicale + installation might be incompatible with the newest version. + For upgrade instructions see + https://radicale.org/2.1.html#documentation/migration-from-1xx-to-2xx. + Set services.radicale.package to suppress this warning. + '' ++ optional (isNull cfg.package && versionOlder config.system.stateVersion "20.09") '' + The configuration format of your existing Radicale installation might be + incompatible with the newest version. For upgrade instructions see + https://github.com/Kozea/Radicale/blob/3.0.6/NEWS.md#upgrade-checklist. + Set services.radicale.package to suppress this warning. + '' ++ optional (cfg.config != "") '' + The option services.radicale.config is deprecated. + Use services.radicale.settings instead. + ''; - users.groups.radicale = - { gid = config.ids.gids.radicale; }; + services.radicale.settings.rights = mkIf (cfg.rights != { }) { + type = "from_file"; + file = toString rightsFile; + }; + + environment.systemPackages = [ pkg ]; + + users.users.radicale.uid = config.ids.uids.radicale; + + users.groups.radicale.gid = config.ids.gids.radicale; systemd.services.radicale = { description = "A Simple Calendar and Contact Server"; after = [ "network.target" ]; + requires = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = concatStringsSep " " ([ - "${cfg.package}/bin/radicale" "-C" confFile + "${pkg}/bin/radicale" "-C" confFile ] ++ ( map escapeShellArg cfg.extraArgs )); User = "radicale"; Group = "radicale"; + StateDirectory = "radicale/collections"; + StateDirectoryMode = "0750"; + # Hardening + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ "/dev/stdin" ]; + DevicePolicy = "strict"; + IPAddressAllow = mkIf bindLocalhost "localhost"; + IPAddressDeny = mkIf bindLocalhost "any"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ReadWritePaths = lib.optional + (hasAttrByPath [ "storage" "filesystem_folder" ] cfg.settings) + cfg.settings.storage.filesystem_folder; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + UMask = "0027"; }; }; }; - meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ]; + meta.maintainers = with lib.maintainers; [ aneeshusa infinisil dotlambda ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/supplicant.nix b/third_party/nixpkgs/nixos/modules/services/networking/supplicant.nix index 20704be9b3..4f4b5cef37 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/supplicant.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/supplicant.nix @@ -44,19 +44,10 @@ let preStart = '' ${optionalString (suppl.configFile.path!=null) '' - touch -a ${suppl.configFile.path} - chmod 600 ${suppl.configFile.path} + (umask 077 && touch -a "${suppl.configFile.path}") ''} ${optionalString suppl.userControlled.enable '' - if ! test -e ${suppl.userControlled.socketDir}; then - mkdir -m 0770 -p ${suppl.userControlled.socketDir} - chgrp ${suppl.userControlled.group} ${suppl.userControlled.socketDir} - fi - - if test "$(stat --printf '%G' ${suppl.userControlled.socketDir})" != "${suppl.userControlled.group}"; then - echo "ERROR: bad ownership on ${suppl.userControlled.socketDir}" >&2 - exit 1 - fi + install -dm770 -g "${suppl.userControlled.group}" "${suppl.userControlled.socketDir}" ''} ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix b/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix index a8747e244a..09aef9a1dc 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix @@ -102,8 +102,8 @@ in { freeformType = let validSettingsPrimitiveTypes = oneOf [ int str bool float ]; validSettingsTypes = oneOf [ validSettingsPrimitiveTypes (listOf validSettingsPrimitiveTypes) ]; - settingsType = (attrsOf validSettingsTypes); - in attrsOf (oneOf [ string settingsType (listOf settingsType) ]) + settingsType = oneOf [ str (attrsOf validSettingsTypes) ]; + in attrsOf (oneOf [ settingsType (listOf settingsType) ]) // { description = '' unbound.conf configuration type. The format consist of an attribute set of settings. Each settings can be either one value, a list of diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix index 6148259676..8a0685c3d9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix @@ -3,6 +3,10 @@ with lib; let + package = if cfg.allowAuxiliaryImperativeNetworks + then pkgs.wpa_supplicant_ro_ssids + else pkgs.wpa_supplicant; + cfg = config.networking.wireless; configFile = if cfg.networks != {} || cfg.extraConfig != "" || cfg.userControlled.enable then pkgs.writeText "wpa_supplicant.conf" '' ${optionalString cfg.userControlled.enable '' @@ -47,6 +51,16 @@ in { description = "Force a specific wpa_supplicant driver."; }; + allowAuxiliaryImperativeNetworks = mkEnableOption "support for imperative & declarative networks" // { + description = '' + Whether to allow configuring networks "imperatively" (e.g. via + wpa_supplicant_gui) and declaratively via + . + + Please note that this adds a custom patch to wpa_supplicant. + ''; + }; + networks = mkOption { type = types.attrsOf (types.submodule { options = { @@ -211,9 +225,9 @@ in { message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive''; }); - environment.systemPackages = [ pkgs.wpa_supplicant ]; + environment.systemPackages = [ package ]; - services.dbus.packages = [ pkgs.wpa_supplicant ]; + services.dbus.packages = [ package ]; services.udev.packages = [ pkgs.crda ]; # FIXME: start a separate wpa_supplicant instance per interface. @@ -230,13 +244,17 @@ in { wantedBy = [ "multi-user.target" ]; stopIfChanged = false; - path = [ pkgs.wpa_supplicant ]; + path = [ package ]; - script = '' + script = let + configStr = if cfg.allowAuxiliaryImperativeNetworks + then "-c /etc/wpa_supplicant.conf -I ${configFile}" + else "-c ${configFile}"; + in '' if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ] then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." fi - iface_args="-s -u -D${cfg.driver} -c ${configFile}" + iface_args="-s -u -D${cfg.driver} ${configStr}" ${if ifaces == [] then '' for i in $(cd /sys/class/net && echo *); do DEVTYPE= diff --git a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix index a71c635c9f..47a7152f6f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix @@ -64,7 +64,7 @@ in { type = types.str; default = "root"; example = "wheel"; - description = "Group to grant acces to the Yggdrasil control socket."; + description = "Group to grant access to the Yggdrasil control socket."; }; openMulticastPort = mkOption { @@ -122,12 +122,11 @@ in { system.activationScripts.yggdrasil = mkIf cfg.persistentKeys '' if [ ! -e ${keysPath} ] then - mkdir -p ${builtins.dirOf keysPath} + mkdir --mode=700 -p ${builtins.dirOf keysPath} ${binYggdrasil} -genconf -json \ | ${pkgs.jq}/bin/jq \ 'to_entries|map(select(.key|endswith("Key")))|from_entries' \ > ${keysPath} - chmod 600 ${keysPath} fi ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/znc/default.nix b/third_party/nixpkgs/nixos/modules/services/networking/znc/default.nix index a7315896c5..938d217c94 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/znc/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/znc/default.nix @@ -103,8 +103,8 @@ in }; dataDir = mkOption { - default = "/var/lib/znc/"; - example = "/home/john/.znc/"; + default = "/var/lib/znc"; + example = "/home/john/.znc"; type = types.path; description = '' The state directory for ZNC. The config and the modules will be linked @@ -258,6 +258,34 @@ in ExecStart = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${escapeShellArgs cfg.extraFlags}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID"; + # Hardening + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ReadWritePaths = [ cfg.dataDir ]; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + UMask = "0027"; }; preStart = '' mkdir -p ${cfg.dataDir}/configs diff --git a/third_party/nixpkgs/nixos/modules/services/networking/znc/options.nix b/third_party/nixpkgs/nixos/modules/services/networking/znc/options.nix index 048dbd7386..7a43b45fab 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/znc/options.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/znc/options.nix @@ -44,7 +44,7 @@ let modules = mkOption { type = types.listOf types.str; default = [ "simple_away" ]; - example = literalExample "[ simple_away sasl ]"; + example = literalExample ''[ "simple_away" "sasl" ]''; description = '' ZNC network modules to load. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/scheduling/atd.nix b/third_party/nixpkgs/nixos/modules/services/scheduling/atd.nix index cefe72b0e9..37f6651ec4 100644 --- a/third_party/nixpkgs/nixos/modules/services/scheduling/atd.nix +++ b/third_party/nixpkgs/nixos/modules/services/scheduling/atd.nix @@ -81,14 +81,9 @@ in jobdir=/var/spool/atjobs etcdir=/etc/at - for dir in "$spooldir" "$jobdir" "$etcdir"; do - if [ ! -d "$dir" ]; then - mkdir -p "$dir" - chown atd:atd "$dir" - fi - done - chmod 1770 "$spooldir" "$jobdir" - ${if cfg.allowEveryone then ''chmod a+rwxt "$spooldir" "$jobdir" '' else ""} + install -dm755 -o atd -g atd "$etcdir" + spool_and_job_dir_perms=${if cfg.allowEveryone then "1777" else "1770"} + install -dm"$spool_and_job_dir_perms" -o atd -g atd "$spooldir" "$jobdir" if [ ! -f "$etcdir"/at.deny ]; then touch "$etcdir"/at.deny chown root:atd "$etcdir"/at.deny diff --git a/third_party/nixpkgs/nixos/modules/services/security/hologram-agent.nix b/third_party/nixpkgs/nixos/modules/services/security/hologram-agent.nix index e37334b3cf..e29267e500 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/hologram-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/hologram-agent.nix @@ -54,5 +54,5 @@ in { }; - meta.maintainers = with lib.maintainers; [ nand0p ]; + meta.maintainers = with lib.maintainers; [ ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/security/tor.nix b/third_party/nixpkgs/nixos/modules/services/security/tor.nix index 54c2c2dea2..9e8f18e93c 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/tor.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/tor.nix @@ -170,7 +170,7 @@ let else if k == "ServerTransportPlugin" then optionalString (v.transports != []) "${concatStringsSep "," v.transports} exec ${v.exec}" else if k == "HidServAuth" then - concatMapStringsSep "\n${k} " (settings: settings.onion + " " settings.auth) v + v.onion + " " + v.auth else generators.mkValueStringDefault {} v; genTorrc = settings: generators.toKeyValue { @@ -715,7 +715,7 @@ in (submodule { options = { onion = mkOption { - type = strMatching "[a-z2-7]{16}(\\.onion)?"; + type = strMatching "[a-z2-7]{16}\\.onion"; description = "Onion address."; example = "xxxxxxxxxxxxxxxx.onion"; }; @@ -726,6 +726,12 @@ in }; }) ]); + example = [ + { + onion = "xxxxxxxxxxxxxxxx.onion"; + auth = "xxxxxxxxxxxxxxxxxxxxxx"; + } + ]; }; options.HiddenServiceNonAnonymousMode = optionBool "HiddenServiceNonAnonymousMode"; options.HiddenServiceStatistics = optionBool "HiddenServiceStatistics"; diff --git a/third_party/nixpkgs/nixos/modules/services/system/self-deploy.nix b/third_party/nixpkgs/nixos/modules/services/system/self-deploy.nix new file mode 100644 index 0000000000..3c82ed4fc5 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/system/self-deploy.nix @@ -0,0 +1,170 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.self-deploy; + + workingDirectory = "/var/lib/nixos-self-deploy"; + repositoryDirectory = "${workingDirectory}/repo"; + outPath = "${workingDirectory}/system"; + + gitWithRepo = "git -C ${repositoryDirectory}"; + + renderNixArgs = args: + let + toArg = key: value: + if builtins.isString value + then " --argstr ${lib.escapeShellArg key} ${lib.escapeShellArg value}" + else " --arg ${lib.escapeShellArg key} ${lib.escapeShellArg (toString value)}"; + in + lib.concatStrings (lib.mapAttrsToList toArg args); + + isPathType = x: lib.strings.isCoercibleToString x && builtins.substring 0 1 (toString x) == "/"; + +in +{ + options.services.self-deploy = { + enable = lib.mkEnableOption "self-deploy"; + + nixFile = lib.mkOption { + type = lib.types.path; + + default = "/default.nix"; + + description = '' + Path to nix file in repository. Leading '/' refers to root of + git repository. + ''; + }; + + nixAttribute = lib.mkOption { + type = lib.types.str; + + description = '' + Attribute of `nixFile` that builds the current system. + ''; + }; + + nixArgs = lib.mkOption { + type = lib.types.attrs; + + default = { }; + + description = '' + Arguments to `nix-build` passed as `--argstr` or `--arg` depending on + the type. + ''; + }; + + switchCommand = lib.mkOption { + type = lib.types.enum [ "boot" "switch" "dry-activate" "test" ]; + + default = "switch"; + + description = '' + The `switch-to-configuration` subcommand used. + ''; + }; + + repository = lib.mkOption { + type = with lib.types; oneOf [ path str ]; + + description = '' + The repository to fetch from. Must be properly formatted for git. + + If this value is set to a path (must begin with `/`) then it's + assumed that the repository is local and the resulting service + won't wait for the network to be up. + + If the repository will be fetched over SSH, you must add an + entry to `programs.ssh.knownHosts` for the SSH host for the fetch + to be successful. + ''; + }; + + sshKeyFile = lib.mkOption { + type = with lib.types; nullOr path; + + default = null; + + description = '' + Path to SSH private key used to fetch private repositories over + SSH. + ''; + }; + + branch = lib.mkOption { + type = lib.types.str; + + default = "master"; + + description = '' + Branch to track + + Technically speaking any ref can be specified here, as this is + passed directly to a `git fetch`, but for the use-case of + continuous deployment you're likely to want to specify a branch. + ''; + }; + + startAt = lib.mkOption { + type = with lib.types; either str (listOf str); + + default = "hourly"; + + description = '' + The schedule on which to run the `self-deploy` service. Format + specified by `systemd.time 7`. + + This value can also be a list of `systemd.time 7` formatted + strings, in which case the service will be started on multiple + schedules. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.self-deploy = { + wantedBy = [ "multi-user.target" ]; + + requires = lib.mkIf (!(isPathType cfg.repository)) [ "network-online.target" ]; + + environment.GIT_SSH_COMMAND = lib.mkIf (!(isNull cfg.sshKeyFile)) + "${pkgs.openssh}/bin/ssh -i ${lib.escapeShellArg cfg.sshKeyFile}"; + + restartIfChanged = false; + + path = with pkgs; [ + git + nix + systemd + ]; + + script = '' + if [ ! -e ${repositoryDirectory} ]; then + mkdir --parents ${repositoryDirectory} + git init ${repositoryDirectory} + fi + + ${gitWithRepo} fetch ${lib.escapeShellArg cfg.repository} ${lib.escapeShellArg cfg.branch} + + ${gitWithRepo} checkout FETCH_HEAD + + nix-build${renderNixArgs cfg.nixArgs} ${lib.cli.toGNUCommandLineShell { } { + attr = cfg.nixAttribute; + out-link = outPath; + }} ${lib.escapeShellArg "${repositoryDirectory}${cfg.nixFile}"} + + ${lib.optionalString (cfg.switchCommand != "test") + "nix-env --profile /nix/var/nix/profiles/system --set ${outPath}"} + + ${outPath}/bin/switch-to-configuration ${cfg.switchCommand} + + rm ${outPath} + + ${gitWithRepo} gc --prune=all + + ${lib.optionalString (cfg.switchCommand == "boot") "systemctl reboot"} + ''; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix b/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix index 7bec073e26..34a5219c95 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.transmission; inherit (config.environment) etc; - apparmor = config.security.apparmor.enable; + apparmor = config.security.apparmor; rootDir = "/run/transmission"; homeDir = "/var/lib/transmission"; settingsDir = ".config/transmission-daemon"; @@ -184,8 +184,8 @@ in systemd.services.transmission = { description = "Transmission BitTorrent Service"; - after = [ "network.target" ] ++ optional apparmor "apparmor.service"; - requires = optional apparmor "apparmor.service"; + after = [ "network.target" ] ++ optional apparmor.enable "apparmor.service"; + requires = optional apparmor.enable "apparmor.service"; wantedBy = [ "multi-user.target" ]; environment.CURL_CA_BUNDLE = etc."ssl/certs/ca-certificates.crt".source; @@ -358,95 +358,39 @@ in }) ]; - security.apparmor.profiles = mkIf apparmor [ - (pkgs.writeText "apparmor-transmission-daemon" '' - include + security.apparmor.policies."bin.transmission-daemon".profile = '' + include "${pkgs.transmission.apparmor}/bin.transmission-daemon" + ''; + security.apparmor.includes."local/bin.transmission-daemon" = '' + r ${config.systemd.services.transmission.environment.CURL_CA_BUNDLE}, - ${pkgs.transmission}/bin/transmission-daemon { - include - include + owner rw ${cfg.home}/${settingsDir}/**, + rw ${cfg.settings.download-dir}/**, + ${optionalString cfg.settings.incomplete-dir-enabled '' + rw ${cfg.settings.incomplete-dir}/**, + ''} + ${optionalString cfg.settings.watch-dir-enabled '' + rw ${cfg.settings.watch-dir}/**, + ''} + profile dirs { + rw ${cfg.settings.download-dir}/**, + ${optionalString cfg.settings.incomplete-dir-enabled '' + rw ${cfg.settings.incomplete-dir}/**, + ''} + ${optionalString cfg.settings.watch-dir-enabled '' + rw ${cfg.settings.watch-dir}/**, + ''} + } - # NOTE: https://github.com/NixOS/nixpkgs/pull/93457 - # will remove the need for these by fixing - r ${etc."hosts".source}, - r /etc/ld-nix.so.preload, - ${lib.optionalString (builtins.hasAttr "ld-nix.so.preload" etc) '' - r ${etc."ld-nix.so.preload".source}, - ${concatMapStrings (p: optionalString (p != "") ("mr ${p},\n")) - (splitString "\n" config.environment.etc."ld-nix.so.preload".text)} - ''} - r ${etc."ssl/certs/ca-certificates.crt".source}, - r ${pkgs.tzdata}/share/zoneinfo/**, - r ${pkgs.stdenv.cc.libc}/share/i18n/**, - r ${pkgs.stdenv.cc.libc}/share/locale/**, - - mr ${getLib pkgs.stdenv.cc.cc}/lib/*.so*, - mr ${getLib pkgs.stdenv.cc.libc}/lib/*.so*, - mr ${getLib pkgs.attr}/lib/libattr*.so*, - mr ${getLib pkgs.c-ares}/lib/libcares*.so*, - mr ${getLib pkgs.curl}/lib/libcurl*.so*, - mr ${getLib pkgs.keyutils}/lib/libkeyutils*.so*, - mr ${getLib pkgs.libcap}/lib/libcap*.so*, - mr ${getLib pkgs.libevent}/lib/libevent*.so*, - mr ${getLib pkgs.libgcrypt}/lib/libgcrypt*.so*, - mr ${getLib pkgs.libgpgerror}/lib/libgpg-error*.so*, - mr ${getLib pkgs.libkrb5}/lib/lib*.so*, - mr ${getLib pkgs.libssh2}/lib/libssh2*.so*, - mr ${getLib pkgs.lz4}/lib/liblz4*.so*, - mr ${getLib pkgs.nghttp2}/lib/libnghttp2*.so*, - mr ${getLib pkgs.openssl}/lib/libcrypto*.so*, - mr ${getLib pkgs.openssl}/lib/libssl*.so*, - mr ${getLib pkgs.systemd}/lib/libsystemd*.so*, - mr ${getLib pkgs.util-linuxMinimal.out}/lib/libblkid.so*, - mr ${getLib pkgs.util-linuxMinimal.out}/lib/libmount.so*, - mr ${getLib pkgs.util-linuxMinimal.out}/lib/libuuid.so*, - mr ${getLib pkgs.xz}/lib/liblzma*.so*, - mr ${getLib pkgs.zlib}/lib/libz*.so*, - - r @{PROC}/sys/kernel/random/uuid, - r @{PROC}/sys/vm/overcommit_memory, - # @{pid} is not a kernel variable yet but a regexp - #r @{PROC}/@{pid}/environ, - r @{PROC}/@{pid}/mounts, - rwk /tmp/tr_session_id_*, - r /run/systemd/resolve/stub-resolv.conf, - - r ${pkgs.openssl.out}/etc/**, - r ${config.systemd.services.transmission.environment.CURL_CA_BUNDLE}, - r ${pkgs.transmission}/share/transmission/**, - - owner rw ${cfg.home}/${settingsDir}/**, - rw ${cfg.settings.download-dir}/**, - ${optionalString cfg.settings.incomplete-dir-enabled '' - rw ${cfg.settings.incomplete-dir}/**, - ''} - ${optionalString cfg.settings.watch-dir-enabled '' - rw ${cfg.settings.watch-dir}/**, - ''} - profile dirs { - rw ${cfg.settings.download-dir}/**, - ${optionalString cfg.settings.incomplete-dir-enabled '' - rw ${cfg.settings.incomplete-dir}/**, - ''} - ${optionalString cfg.settings.watch-dir-enabled '' - rw ${cfg.settings.watch-dir}/**, - ''} - } - - ${optionalString (cfg.settings.script-torrent-done-enabled && - cfg.settings.script-torrent-done-filename != "") '' - # Stack transmission_directories profile on top of - # any existing profile for script-torrent-done-filename - # FIXME: to be tested as I'm not sure it works well with NoNewPrivileges= - # https://gitlab.com/apparmor/apparmor/-/wikis/AppArmorStacking#seccomp-and-no_new_privs - px ${cfg.settings.script-torrent-done-filename} -> &@{dirs}, - ''} - - # FIXME: enable customizing using https://github.com/NixOS/nixpkgs/pull/93457 - # include - } - '') - ]; + ${optionalString (cfg.settings.script-torrent-done-enabled && + cfg.settings.script-torrent-done-filename != "") '' + # Stack transmission_directories profile on top of + # any existing profile for script-torrent-done-filename + # FIXME: to be tested as I'm not sure it works well with NoNewPrivileges= + # https://gitlab.com/apparmor/apparmor/-/wikis/AppArmorStacking#seccomp-and-no_new_privs + px ${cfg.settings.script-torrent-done-filename} -> &@{dirs}, + ''} + ''; }; meta.maintainers = with lib.maintainers; [ julm ]; diff --git a/third_party/nixpkgs/nixos/modules/services/video/mirakurun.nix b/third_party/nixpkgs/nixos/modules/services/video/mirakurun.nix index ce1dabe6bf..6ea73fa5c6 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/mirakurun.nix +++ b/third_party/nixpkgs/nixos/modules/services/video/mirakurun.nix @@ -8,6 +8,18 @@ let username = config.users.users.mirakurun.name; groupname = config.users.users.mirakurun.group; settingsFmt = pkgs.formats.yaml {}; + + polkitRule = pkgs.writeTextDir "share/polkit-1/rules.d/10-mirakurun.rules" '' + polkit.addRule(function (action, subject) { + if ( + (action.id == "org.debian.pcsc-lite.access_pcsc" || + action.id == "org.debian.pcsc-lite.access_card") && + subject.user == "${username}" + ) { + return polkit.Result.YES; + } + }); + ''; in { options = { @@ -48,6 +60,15 @@ in ''; }; + allowSmartCardAccess = mkOption { + type = types.bool; + default = true; + description = '' + Install polkit rules to allow Mirakurun to access smart card readers + which is commonly used along with tuner devices. + ''; + }; + serverSettings = mkOption { type = settingsFmt.type; default = {}; @@ -110,7 +131,7 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ mirakurun ]; + environment.systemPackages = [ mirakurun ] ++ optional cfg.allowSmartCardAccess polkitRule; environment.etc = { "mirakurun/server.yml".source = settingsFmt.generate "server.yml" cfg.serverSettings; "mirakurun/tuners.yml" = mkIf (cfg.tunerSettings != null) { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix index 00b58d5025..0e2e182ffe 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix @@ -661,7 +661,7 @@ in ]; path = cfg.package.runtimeDeps ++ [ postgresqlPackage - pkgs.replace + pkgs.replace-secret cfg.package.rake ]; environment = cfg.package.runtimeEnv // { @@ -688,10 +688,7 @@ in mkSecretReplacement = file: lib.optionalString (file != null) '' - ( - password=$(<'${file}') - replace-literal -fe '${file}' "$password" /run/discourse/config/discourse.conf - ) + replace-secret '${file}' '${file}' /run/discourse/config/discourse.conf ''; in '' set -o errexit -o pipefail -o nounset -o errtrace @@ -713,11 +710,12 @@ in cfg.siteSettings "/run/discourse/config/nixos_site_settings.json" } - install -T -m 0400 -o discourse ${discourseConf} /run/discourse/config/discourse.conf + install -T -m 0600 -o discourse ${discourseConf} /run/discourse/config/discourse.conf ${mkSecretReplacement cfg.database.passwordFile} ${mkSecretReplacement cfg.mail.outgoing.passwordFile} ${mkSecretReplacement cfg.redis.passwordFile} ${mkSecretReplacement cfg.secretKeyBaseFile} + chmod 0400 /run/discourse/config/discourse.conf ) discourse-rake db:migrate >>/var/log/discourse/db_migration.log diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix index 5b578cd8c4..e2e6df41df 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix @@ -633,6 +633,9 @@ in after = databaseServices; bindsTo = databaseServices; wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ + replace-secret + ]; environment = { JBOSS_LOG_DIR = "/var/log/keycloak"; JBOSS_BASE_DIR = "/run/keycloak"; @@ -653,8 +656,7 @@ in install -m 0600 ${cfg.package}/standalone/configuration/*.properties /run/keycloak/configuration install -T -m 0600 ${keycloakConfig} /run/keycloak/configuration/standalone.xml - db_password="$( - security.acme.certs."example.com".allowKeysForGroup = true; systemd.services.molly-brown.serviceConfig.SupplementaryGroups = [ config.security.acme.certs."example.com".group ]; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index d811879b7b..0e99aabcfc 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -154,9 +154,9 @@ let ${optionalString (cfg.recommendedProxySettings) '' proxy_redirect off; - proxy_connect_timeout 60; - proxy_send_timeout 60; - proxy_read_timeout 60; + proxy_connect_timeout ${cfg.proxyTimeout}; + proxy_send_timeout ${cfg.proxyTimeout}; + proxy_read_timeout ${cfg.proxyTimeout}; proxy_http_version 1.1; include ${recommendedProxyConfig}; ''} @@ -401,6 +401,15 @@ in "; }; + proxyTimeout = mkOption { + type = types.str; + default = "60s"; + example = "20s"; + description = " + Change the proxy related timeouts in recommendedProxySettings. + "; + }; + package = mkOption { default = pkgs.nginxStable; defaultText = "pkgs.nginxStable"; @@ -850,7 +859,7 @@ in PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = "~@chown @cpu-emulation @debug @keyring @ipc @module @mount @obsolete @privileged @raw-io @reboot @setuid @swap"; + SystemCallFilter = "~@cpu-emulation @debug @keyring @ipc @mount @obsolete @privileged @setuid"; }; }; @@ -858,8 +867,9 @@ in source = configFile; }; - # postRun hooks on cert renew can't be used to restart Nginx since renewal - # runs as the unprivileged acme user. sslTargets are added to wantedBy + before + # This service waits for all certificates to be available + # before reloading nginx configuration. + # sslTargets are added to wantedBy + before # which allows the acme-finished-$cert.target to signify the successful updating # of certs end-to-end. systemd.services.nginx-config-reload = let diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/gitweb.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/gitweb.nix index f7fb07bb79..11bf2a309e 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/gitweb.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/gitweb.nix @@ -89,6 +89,6 @@ in }; - meta.maintainers = with maintainers; [ gnidorah ]; + meta.maintainers = with maintainers; [ ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix index 2d9504fb5f..3f1575a0ca 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix @@ -68,5 +68,5 @@ in { }]; }; - meta.maintainers = [ maintainers.gnidorah ]; + meta.maintainers = [ ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 14dcf009a7..43220e3c59 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -26,7 +26,7 @@ in sessionPath = mkOption { default = []; type = types.listOf types.package; - example = literalExample "[ pkgs.gnome3.gpaste ]"; + example = literalExample "[ pkgs.gnome.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart. @@ -94,8 +94,8 @@ in xapps ]; services.cinnamon.apps.enable = mkDefault true; - services.gnome3.glib-networking.enable = true; - services.gnome3.gnome-keyring.enable = true; + services.gnome.glib-networking.enable = true; + services.gnome.gnome-keyring.enable = true; services.gvfs.enable = true; services.udisks2.enable = true; services.upower.enable = mkDefault config.powerManagement.enable; @@ -110,7 +110,7 @@ in programs.dconf.enable = true; # Enable org.a11y.Bus - services.gnome3.at-spi2-core.enable = true; + services.gnome.at-spi2-core.enable = true; # Fix lockscreen security.pam.services = { @@ -135,19 +135,19 @@ in # session requirements cinnamon-screensaver # cinnamon-killer-daemon: provided by cinnamon-common - gnome3.networkmanagerapplet # session requirement - also nm-applet not needed + gnome.networkmanagerapplet # session requirement - also nm-applet not needed # packages nemo cinnamon-control-center cinnamon-settings-daemon - gnome3.libgnomekbd + gnome.libgnomekbd orca # theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme hicolor-icon-theme - gnome3.gnome-themes-extra + gnome.gnome-themes-extra gtk3.out mint-artwork mint-themes @@ -192,7 +192,7 @@ in programs.evince.enable = mkDefault true; programs.file-roller.enable = mkDefault true; - environment.systemPackages = (with pkgs // pkgs.gnome3 // pkgs.cinnamon; pkgs.gnome3.removePackagesByName [ + environment.systemPackages = (with pkgs // pkgs.gnome // pkgs.cinnamon; pkgs.gnome.removePackagesByName [ # cinnamon team apps blueberry warpinator diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix index f5559eb535..6ee5b0fc54 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,7 @@ in # E.g., if Plasma 5 is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix - ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix + ./lxqt.nix ./enlightenment.nix ./gnome.nix ./kodi.nix ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix ./cinnamon.nix ]; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix similarity index 67% rename from third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix rename to third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix index 99e6edfba2..bacada9cbe 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -4,8 +4,8 @@ with lib; let - cfg = config.services.xserver.desktopManager.gnome3; - serviceCfg = config.services.gnome3; + cfg = config.services.xserver.desktopManager.gnome; + serviceCfg = config.services.gnome; # Prioritize nautilus by default when opening directories mimeAppsList = pkgs.writeTextFile { @@ -23,7 +23,7 @@ let ''; nixos-gsettings-desktop-schemas = let - defaultPackages = with pkgs; [ gsettings-desktop-schemas gnome3.gnome-shell ]; + defaultPackages = with pkgs; [ gsettings-desktop-schemas gnome.gnome-shell ]; in pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } '' @@ -33,10 +33,10 @@ let (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") (defaultPackages ++ cfg.extraGSettingsOverridePackages)} - cp -f ${pkgs.gnome3.gnome-shell}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + cp -f ${pkgs.gnome.gnome-shell}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas ${optionalString flashbackEnabled '' - cp -f ${pkgs.gnome3.gnome-flashback}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + cp -f ${pkgs.gnome.gnome-flashback}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas ''} chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides @@ -57,19 +57,80 @@ let flashbackEnabled = cfg.flashback.enableMetacity || length cfg.flashback.customSessions > 0; - notExcluded = pkg: mkDefault (!(lib.elem pkg config.environment.gnome3.excludePackages)); + notExcluded = pkg: mkDefault (!(lib.elem pkg config.environment.gnome.excludePackages)); in { meta = { + doc = ./gnome.xml; maintainers = teams.gnome.members; }; + imports = [ + # Added 2021-05-07 + (mkRenamedOptionModule + [ "services" "gnome3" "core-os-services" "enable" ] + [ "services" "gnome" "core-os-services" "enable" ] + ) + (mkRenamedOptionModule + [ "services" "gnome3" "core-shell" "enable" ] + [ "services" "gnome" "core-shell" "enable" ] + ) + (mkRenamedOptionModule + [ "services" "gnome3" "core-utilities" "enable" ] + [ "services" "gnome" "core-utilities" "enable" ] + ) + (mkRenamedOptionModule + [ "services" "gnome3" "core-developer-tools" "enable" ] + [ "services" "gnome" "core-developer-tools" "enable" ] + ) + (mkRenamedOptionModule + [ "services" "gnome3" "games" "enable" ] + [ "services" "gnome" "games" "enable" ] + ) + (mkRenamedOptionModule + [ "services" "gnome3" "experimental-features" "realtime-scheduling" ] + [ "services" "gnome" "experimental-features" "realtime-scheduling" ] + ) + (mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome3" "enable" ] + [ "services" "xserver" "desktopManager" "gnome" "enable" ] + ) + (mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome3" "sessionPath" ] + [ "services" "xserver" "desktopManager" "gnome" "sessionPath" ] + ) + (mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome3" "favoriteAppsOverride" ] + [ "services" "xserver" "desktopManager" "gnome" "favoriteAppsOverride" ] + ) + (mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome3" "extraGSettingsOverrides" ] + [ "services" "xserver" "desktopManager" "gnome" "extraGSettingsOverrides" ] + ) + (mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome3" "extraGSettingsOverridePackages" ] + [ "services" "xserver" "desktopManager" "gnome" "extraGSettingsOverridePackages" ] + ) + (mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome3" "debug" ] + [ "services" "xserver" "desktopManager" "gnome" "debug" ] + ) + (mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome3" "flashback" ] + [ "services" "xserver" "desktopManager" "gnome" "flashback" ] + ) + (mkRenamedOptionModule + [ "environment" "gnome3" "excludePackages" ] + [ "environment" "gnome" "excludePackages" ] + ) + ]; + options = { - services.gnome3 = { + services.gnome = { core-os-services.enable = mkEnableOption "essential services for GNOME3"; core-shell.enable = mkEnableOption "GNOME Shell services"; core-utilities.enable = mkEnableOption "GNOME core utilities"; @@ -109,7 +170,7 @@ in }; }; - services.xserver.desktopManager.gnome3 = { + services.xserver.desktopManager.gnome = { enable = mkOption { type = types.bool; default = false; @@ -119,14 +180,14 @@ in sessionPath = mkOption { default = []; type = types.listOf types.package; - example = literalExample "[ pkgs.gnome3.gpaste ]"; + example = literalExample "[ pkgs.gnome.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GNOME Shell extensions or GSettings-conditional autostart. Note that this should be a last resort; patching the package is preferred (see GPaste). ''; - apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ]; + apply = list: list ++ [ pkgs.gnome.gnome-shell pkgs.gnome.gnome-shell-extensions ]; }; favoriteAppsOverride = mkOption { @@ -185,9 +246,9 @@ in }; }; - environment.gnome3.excludePackages = mkOption { + environment.gnome.excludePackages = mkOption { default = []; - example = literalExample "[ pkgs.gnome3.totem ]"; + example = literalExample "[ pkgs.gnome.totem ]"; type = types.listOf types.package; description = "Which packages gnome should exclude from the default environment"; }; @@ -200,14 +261,14 @@ in system.nixos-generate-config.desktopConfiguration = ['' # Enable the GNOME 3 Desktop Environment. services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome3.enable = true; + services.xserver.desktopManager.gnome.enable = true; '']; - services.gnome3.core-os-services.enable = true; - services.gnome3.core-shell.enable = true; - services.gnome3.core-utilities.enable = mkDefault true; + services.gnome.core-os-services.enable = true; + services.gnome.core-shell.enable = true; + services.gnome.core-utilities.enable = mkDefault true; - services.xserver.displayManager.sessionPackages = [ pkgs.gnome3.gnome-session.sessions ]; + services.xserver.displayManager.sessionPackages = [ pkgs.gnome.gnome-session.sessions ]; environment.extraInit = '' ${concatMapStrings (p: '' @@ -229,30 +290,25 @@ in # Override GSettings schemas environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; - # If gnome3 is installed, build vim for gtk3 too. + # If gnome is installed, build vim for gtk3 too. nixpkgs.config.vim.gui = "gtk3"; - - # Install gnome-software if flatpak is enabled - services.flatpak.guiPackages = [ - pkgs.gnome3.gnome-software - ]; }) (mkIf flashbackEnabled { services.xserver.displayManager.sessionPackages = map - (wm: pkgs.gnome3.gnome-flashback.mkSessionForWm { + (wm: pkgs.gnome.gnome-flashback.mkSessionForWm { inherit (wm) wmName wmLabel wmCommand; }) (optional cfg.flashback.enableMetacity { wmName = "metacity"; wmLabel = "Metacity"; - wmCommand = "${pkgs.gnome3.metacity}/bin/metacity"; + wmCommand = "${pkgs.gnome.metacity}/bin/metacity"; } ++ cfg.flashback.customSessions); security.pam.services.gnome-flashback = { enableGnomeKeyring = true; }; - systemd.packages = with pkgs.gnome3; [ + systemd.packages = with pkgs.gnome; [ gnome-flashback ] ++ (map (wm: gnome-flashback.mkSystemdTargetForWm { @@ -260,9 +316,9 @@ in }) cfg.flashback.customSessions); # gnome-panel needs these for menu applet - environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome3.gnome-flashback}/share" ]; + environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome.gnome-flashback}/share" ]; # TODO: switch to sessionVariables (resolve conflict) - environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome3.gnome-flashback}/etc/xdg" ]; + environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome.gnome-flashback}/etc/xdg" ]; }) (mkIf serviceCfg.core-os-services.enable { @@ -273,13 +329,14 @@ in services.accounts-daemon.enable = true; services.dleyna-renderer.enable = mkDefault true; services.dleyna-server.enable = mkDefault true; - services.gnome3.at-spi2-core.enable = true; - services.gnome3.evolution-data-server.enable = true; - services.gnome3.gnome-keyring.enable = true; - services.gnome3.gnome-online-accounts.enable = mkDefault true; - services.gnome3.gnome-online-miners.enable = true; - services.gnome3.tracker-miners.enable = mkDefault true; - services.gnome3.tracker.enable = mkDefault true; + services.power-profiles-daemon.enable = mkDefault true; + services.gnome.at-spi2-core.enable = true; + services.gnome.evolution-data-server.enable = true; + services.gnome.gnome-keyring.enable = true; + services.gnome.gnome-online-accounts.enable = mkDefault true; + services.gnome.gnome-online-miners.enable = true; + services.gnome.tracker-miners.enable = mkDefault true; + services.gnome.tracker.enable = mkDefault true; services.hardware.bolt.enable = mkDefault true; services.packagekit.enable = mkDefault true; services.udisks2.enable = true; @@ -307,23 +364,23 @@ in (mkIf serviceCfg.core-shell.enable { services.colord.enable = mkDefault true; - services.gnome3.chrome-gnome-shell.enable = mkDefault true; - services.gnome3.glib-networking.enable = true; - services.gnome3.gnome-initial-setup.enable = mkDefault true; - services.gnome3.gnome-remote-desktop.enable = mkDefault true; - services.gnome3.gnome-settings-daemon.enable = true; - services.gnome3.gnome-user-share.enable = mkDefault true; - services.gnome3.rygel.enable = mkDefault true; + services.gnome.chrome-gnome-shell.enable = mkDefault true; + services.gnome.glib-networking.enable = true; + services.gnome.gnome-initial-setup.enable = mkDefault true; + services.gnome.gnome-remote-desktop.enable = mkDefault true; + services.gnome.gnome-settings-daemon.enable = true; + services.gnome.gnome-user-share.enable = mkDefault true; + services.gnome.rygel.enable = mkDefault true; services.gvfs.enable = true; services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.telepathy.enable = mkDefault true; - systemd.packages = with pkgs.gnome3; [ + systemd.packages = with pkgs.gnome; [ gnome-session gnome-shell ]; - services.udev.packages = with pkgs.gnome3; [ + services.udev.packages = with pkgs.gnome; [ # Force enable KMS modifiers for devices that require them. # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443 mutter @@ -332,7 +389,7 @@ in services.avahi.enable = mkDefault true; xdg.portal.extraPortals = [ - pkgs.gnome3.gnome-shell + pkgs.gnome.gnome-shell ]; services.geoclue2.enable = mkDefault true; @@ -359,16 +416,16 @@ in ]; # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst - environment.systemPackages = with pkgs.gnome3; [ + environment.systemPackages = with pkgs.gnome; [ adwaita-icon-theme gnome-backgrounds gnome-bluetooth gnome-color-manager gnome-control-center - gnome-getting-started-docs gnome-shell gnome-shell-extensions gnome-themes-extra + pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in. pkgs.nixos-artwork.wallpapers.simple-dark-gray pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom pkgs.gnome-user-docs @@ -385,12 +442,12 @@ 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"; + source = "${pkgs.gnome.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" {} '' + gnomeShellRT = with pkgs.gnome; 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 @@ -405,43 +462,51 @@ in # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-utilities.bst (mkIf serviceCfg.core-utilities.enable { - environment.systemPackages = (with pkgs.gnome3; removePackagesByName [ - baobab - cheese - eog - epiphany - gedit - gnome-calculator - gnome-calendar - gnome-characters - gnome-clocks - gnome-contacts - gnome-font-viewer - gnome-logs - gnome-maps - gnome-music - pkgs.gnome-photos - gnome-screenshot - gnome-system-monitor - gnome-weather - nautilus - pkgs.gnome-connections - simple-scan - totem - yelp - ] config.environment.gnome3.excludePackages); + environment.systemPackages = + with pkgs.gnome; + removePackagesByName + ([ + baobab + cheese + eog + epiphany + gedit + gnome-calculator + gnome-calendar + gnome-characters + gnome-clocks + gnome-contacts + gnome-font-viewer + gnome-logs + gnome-maps + gnome-music + pkgs.gnome-photos + gnome-screenshot + gnome-system-monitor + gnome-weather + nautilus + pkgs.gnome-connections + simple-scan + totem + yelp + ] ++ lib.optionals config.services.flatpak.enable [ + # Since PackageKit Nix support is not there yet, + # only install gnome-software if flatpak is enabled. + gnome-software + ]) + config.environment.gnome.excludePackages; # 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; + # through `environment.gnome.excludePackages` + programs.evince.enable = notExcluded pkgs.gnome.evince; + programs.file-roller.enable = notExcluded pkgs.gnome.file-roller; + programs.geary.enable = notExcluded pkgs.gnome.geary; + programs.gnome-disks.enable = notExcluded pkgs.gnome.gnome-disk-utility; + programs.gnome-terminal.enable = notExcluded pkgs.gnome.gnome-terminal; + programs.seahorse.enable = notExcluded pkgs.gnome.seahorse; + services.gnome.sushi.enable = notExcluded pkgs.gnome.sushi; # Let nautilus find extensions # TODO: Create nautilus-with-extensions package @@ -456,7 +521,7 @@ in }) (mkIf serviceCfg.games.enable { - environment.systemPackages = (with pkgs.gnome3; removePackagesByName [ + environment.systemPackages = (with pkgs.gnome; removePackagesByName [ aisleriot atomix five-or-more @@ -476,12 +541,12 @@ in quadrapassel swell-foop tali - ] config.environment.gnome3.excludePackages); + ] config.environment.gnome.excludePackages); }) # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/3.38.0/elements/core/meta-gnome-core-developer-tools.bst (mkIf serviceCfg.core-developer-tools.enable { - environment.systemPackages = (with pkgs.gnome3; removePackagesByName [ + environment.systemPackages = (with pkgs.gnome; removePackagesByName [ dconf-editor devhelp pkgs.gnome-builder @@ -490,9 +555,9 @@ in # in default configurations. # https://github.com/NixOS/nixpkgs/issues/60908 /* gnome-boxes */ - ] config.environment.gnome3.excludePackages); + ] config.environment.gnome.excludePackages); - services.sysprof.enable = true; + services.sysprof.enable = notExcluded pkgs.sysprof; }) ]; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.xml b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.xml new file mode 100644 index 0000000000..624d5c894e --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.xml @@ -0,0 +1,276 @@ + + GNOME Desktop + + GNOME provides a simple, yet full-featured desktop environment with a focus on productivity. Its Mutter compositor supports both Wayland and X server, and the GNOME Shell user interface is fully customizable by extensions. + + +
+ Enabling GNOME + + + All of the core apps, optional apps, games, and core developer tools from GNOME are available. + + + + To enable the GNOME desktop use: + + + + = true; + = true; + + + + + While it is not strictly necessary to use GDM as the display manager with GNOME, it is recommended, as some features such as screen lock might not work without it. + + + + + The default applications used in NixOS are very minimal, inspired by the defaults used in gnome-build-meta. + + +
+ GNOME without the apps + + + If you’d like to only use the GNOME desktop and not the apps, you can disable them with: + + + + = false; + + + + and none of them will be installed. + + + + If you’d only like to omit a subset of the core utilities, you can use . + Note that this mechanism can only exclude core utilities, games and core developer tools. + +
+ +
+ Disabling GNOME services + + + It is also possible to disable many of the core services. For example, if you do not need indexing files, you can disable Tracker with: + + + + = false; + = false; + + + + Note, however, that doing so is not supported and might break some applications. Notably, GNOME Music cannot work without Tracker. + +
+ +
+ GNOME games + + + You can install all of the GNOME games with: + + + + = true; + +
+ +
+ GNOME core developer tools + + + You can install GNOME core developer tools with: + + + + = true; + +
+
+ +
+ Enabling GNOME Flashback + + + GNOME Flashback provides a desktop environment based on the classic GNOME 2 architecture. You can enable the default GNOME Flashback session, which uses the Metacity window manager, with: + + + + = true; + + + + It is also possible to create custom sessions that replace Metacity with a different window manager using . + + + + The following example uses xmonad window manager: + + + + = [ + { + wmName = "xmonad"; + wmLabel = "XMonad"; + wmCommand = "${pkgs.haskellPackages.xmonad}/bin/xmonad"; + } +]; + + +
+
+ GDM + + + If you want to use GNOME Wayland session on Nvidia hardware, you need to enable: + + + + = true; + + + + as the default configuration will forbid this. + +
+ +
+ Icons and GTK Themes + + + Icon themes and GTK themes don’t require any special option to install in NixOS. + + + + You can add them to and switch to them with GNOME Tweaks. + If you’d like to do this manually in dconf, change the values of the following keys: + + + +/org/gnome/desktop/interface/gtk-theme +/org/gnome/desktop/interface/icon-theme + + + + in dconf-editor + +
+ +
+ Shell Extensions + + + Most Shell extensions are packaged under the gnomeExtensions attribute. + Some packages that include Shell extensions, like gnome.gpaste, don’t have their extension decoupled under this attribute. + + + + You can install them like any other package: + + + + = [ + gnomeExtensions.dash-to-dock + gnomeExtensions.gsconnect + gnomeExtensions.mpris-indicator-button +]; + + + + Unfortunately, we lack a way for these to be managed in a completely declarative way. + So you have to enable them manually with an Extensions application. + It is possible to use a GSettings override for this on org.gnome.shell.enabled-extensions, but that will only influence the default value. + +
+ +
+ GSettings Overrides + + + Majority of software building on the GNOME platform use GLib’s GSettings system to manage runtime configuration. For our purposes, the system consists of XML schemas describing the individual configuration options, stored in the package, and a settings backend, where the values of the settings are stored. On NixOS, like on most Linux distributions, dconf database is used as the backend. + + + + GSettings vendor overrides can be used to adjust the default values for settings of the GNOME desktop and apps by replacing the default values specified in the XML schemas. Using overrides will allow you to pre-seed user settings before you even start the session. + + + + + Overrides really only change the default values for GSettings keys so if you or an application changes the setting value, the value set by the override will be ignored. Until NixOS’s dconf module implements changing values, you will either need to keep that in mind and clear the setting from the backend using dconf reset command when that happens, or use the module from home-manager. + + + + + You can override the default GSettings values using the option. + + + + Take note that whatever packages you want to override GSettings for, you need to add them to + . + + + + You can use dconf-editor tool to explore which GSettings you can set. + + +
+ Example + + +services.xserver.desktopManager.gnome = { + extraGSettingsOverrides = '' + # Change default background + [org.gnome.desktop.background] + picture-uri='file://${pkgs.nixos-artwork.wallpapers.mosaic-blue.gnomeFilePath}' + + # Favorite apps in gnome-shell + [org.gnome.shell] + favorite-apps=['org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop'] + ''; + + extraGSettingsOverridePackages = [ + pkgs.gsettings-desktop-schemas # for org.gnome.desktop + pkgs.gnome.gnome-shell # for org.gnome.shell + ]; +}; + +
+
+ +
+ Frequently Asked Questions + +
+ Can I use LightDM with GNOME? + + + Yes you can, and any other display-manager in NixOS. + + + + However, it doesn’t work correctly for the Wayland session of GNOME Shell yet, and + won’t be able to lock your screen. + + + + See this issue. + +
+ +
+ Why does <literal>nixos-rebuild switch</literal> sometimes kill my session? + + + This is a known issue without any workarounds. + If you are doing a fairly large upgrade, it is probably safer to use nixos-rebuild boot. + +
+
+ diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix index bf53082b26..7cb92030bb 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -51,7 +51,7 @@ in environment.systemPackages = pkgs.lxqt.preRequisitePackages ++ pkgs.lxqt.corePackages ++ - (pkgs.gnome3.removePackagesByName + (pkgs.gnome.removePackagesByName pkgs.lxqt.optionalPackages config.environment.lxqt.excludePackages); diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix index f236c14fcf..19ab9edb73 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix @@ -76,7 +76,7 @@ in environment.systemPackages = pkgs.mate.basePackages ++ - (pkgs.gnome3.removePackagesByName + (pkgs.gnome.removePackagesByName pkgs.mate.extraPackages config.environment.mate.excludePackages) ++ [ @@ -97,8 +97,8 @@ in # Mate uses this for printing programs.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); - services.gnome3.at-spi2-core.enable = true; - services.gnome3.gnome-keyring.enable = true; + services.gnome.at-spi2-core.enable = true; + services.gnome.gnome-keyring.enable = true; services.udev.packages = [ pkgs.mate.mate-settings-daemon ]; services.gvfs.enable = true; services.upower.enable = config.powerManagement.enable; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix index 195da75e74..e492073b80 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -43,7 +43,7 @@ in sessionPath = mkOption { default = []; type = types.listOf types.package; - example = literalExample "[ pkgs.gnome3.gpaste ]"; + example = literalExample "[ pkgs.gnome.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart. @@ -142,12 +142,12 @@ in ]; services.pantheon.apps.enable = mkDefault true; services.pantheon.contractor.enable = mkDefault true; - services.gnome3.at-spi2-core.enable = true; - services.gnome3.evolution-data-server.enable = true; - services.gnome3.glib-networking.enable = true; - services.gnome3.gnome-keyring.enable = true; + services.gnome.at-spi2-core.enable = true; + services.gnome.evolution-data-server.enable = true; + services.gnome.glib-networking.enable = true; + services.gnome.gnome-keyring.enable = true; services.gvfs.enable = true; - services.gnome3.rygel.enable = mkDefault true; + services.gnome.rygel.enable = mkDefault true; services.gsignond.enable = mkDefault true; services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ]; services.udisks2.enable = true; @@ -177,7 +177,7 @@ in desktop-file-utils glib gnome-menus - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gtk3.out hicolor-icon-theme lightlocker @@ -213,10 +213,10 @@ in elementary-settings-daemon pantheon-agent-geoclue2 pantheon-agent-polkit - ]) ++ (gnome3.removePackagesByName [ - gnome3.geary - gnome3.epiphany - gnome3.gnome-font-viewer + ]) ++ (gnome.removePackagesByName [ + gnome.geary + gnome.epiphany + gnome.gnome-font-viewer ] config.environment.pantheon.excludePackages); programs.evince.enable = mkDefault true; @@ -265,7 +265,7 @@ in }) (mkIf serviceCfg.apps.enable { - environment.systemPackages = (with pkgs.pantheon; pkgs.gnome3.removePackagesByName [ + environment.systemPackages = (with pkgs.pantheon; pkgs.gnome.removePackagesByName [ elementary-calculator elementary-calendar elementary-camera diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix index 7d2856939c..bbfdea2225 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -9,7 +9,7 @@ in { meta = { - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; imports = [ @@ -74,8 +74,8 @@ in glib # for gsettings gtk3.out # gtk-update-icon-cache - gnome3.gnome-themes-extra - gnome3.adwaita-icon-theme + gnome.gnome-themes-extra + gnome.adwaita-icon-theme hicolor-icon-theme tango-icon-theme xfce4-icon-theme @@ -149,7 +149,7 @@ in security.polkit.enable = true; services.accounts-daemon.enable = true; services.upower.enable = config.powerManagement.enable; - services.gnome3.glib-networking.enable = true; + services.gnome.glib-networking.enable = true; services.gvfs.enable = true; services.tumbler.enable = true; services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/account-service-util.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/account-service-util.nix index 2b08c62d0a..dec5c06cb3 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/account-service-util.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/account-service-util.nix @@ -39,6 +39,6 @@ python3.pkgs.buildPythonApplication { ''; meta = with lib; { - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix index f79eb64b5a..e1b9a21eb9 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.xserver.displayManager; - gdm = pkgs.gnome3.gdm; + gdm = pkgs.gnome.gdm; xSessionWrapper = if (cfg.setupCommands == "") then null else pkgs.writeScript "gdm-x-session-wrapper" '' @@ -154,14 +154,14 @@ in ] ++ optionals config.hardware.pulseaudio.enable [ "d /run/gdm/.config/pulse 0711 gdm gdm" "L+ /run/gdm/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}" - ] ++ optionals config.services.gnome3.gnome-initial-setup.enable [ + ] ++ optionals config.services.gnome.gnome-initial-setup.enable [ # Create stamp file for gnome-initial-setup to prevent it starting in GDM. "f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm - yes" ]; # Otherwise GDM will not be able to start correctly and display Wayland sessions - systemd.packages = with pkgs.gnome3; [ gdm gnome-session gnome-shell ]; - environment.systemPackages = [ pkgs.gnome3.adwaita-icon-theme ]; + systemd.packages = with pkgs.gnome; [ gdm gnome-session gnome-shell ]; + environment.systemPackages = [ pkgs.gnome.adwaita-icon-theme ]; systemd.services.display-manager.wants = [ # Because sd_login_monitor_new requires /run/systemd/machines @@ -208,7 +208,7 @@ in EnvironmentFile = "-/etc/locale.conf"; }; - systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ]; + systemd.services.display-manager.path = [ pkgs.gnome.gnome-session ]; # Allow choosing an user account services.accounts-daemon.enable = true; @@ -218,14 +218,14 @@ in # We duplicate upstream's udev rules manually to make wayland with nvidia configurable services.udev.extraRules = '' # disable Wayland on Cirrus chipsets - ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="${gdm}/libexec/gdm-disable-wayland" + ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false" # disable Wayland on Hi1710 chipsets - ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="${gdm}/libexec/gdm-disable-wayland" + ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false" ${optionalString (!cfg.gdm.nvidiaWayland) '' - DRIVER=="nvidia", RUN+="${gdm}/libexec/gdm-disable-wayland" + DRIVER=="nvidia", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false" ''} # disable Wayland when modesetting is disabled - IMPORT{cmdline}="nomodeset", RUN+="${gdm}/libexec/gdm-disable-wayland" + IMPORT{cmdline}="nomodeset", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false" ''; systemd.user.services.dbus.wantedBy = [ "default.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix index 129df139c6..ecd46a9ee6 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix @@ -34,8 +34,8 @@ in { theme = { package = mkOption { type = types.package; - default = pkgs.gnome3.gnome-themes-extra; - defaultText = "pkgs.gnome3.gnome-themes-extra"; + default = pkgs.gnome.gnome-themes-extra; + defaultText = "pkgs.gnome.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 9c1dc1d1c1..fe5a16bc60 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -47,8 +47,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome3.gnome-themes-extra; - defaultText = "pkgs.gnome3.gnome-themes-extra"; + default = pkgs.gnome.gnome-themes-extra; + defaultText = "pkgs.gnome.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; @@ -68,8 +68,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome3.adwaita-icon-theme; - defaultText = "pkgs.gnome3.adwaita-icon-theme"; + default = pkgs.gnome.adwaita-icon-theme; + defaultText = "pkgs.gnome.adwaita-icon-theme"; description = '' The package path that contains the icon theme given in the name option. ''; @@ -89,8 +89,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome3.adwaita-icon-theme; - defaultText = "pkgs.gnome3.adwaita-icon-theme"; + default = pkgs.gnome.adwaita-icon-theme; + defaultText = "pkgs.gnome.adwaita-icon-theme"; description = '' The package path that contains the cursor theme given in the name option. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix index 9bc9e2bf61..76f16646cf 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -11,7 +11,7 @@ let in { meta = { - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; options = { diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix index 2dafee9e36..3d497c9f25 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix @@ -70,7 +70,7 @@ let in { meta = { - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; # Note: the order in which lightdm greeter modules are imported diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/metacity.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/metacity.nix index 5175fd7f3b..600afe759b 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/metacity.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/metacity.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.xserver.windowManager.metacity; - inherit (pkgs) gnome3; + inherit (pkgs) gnome; in { @@ -18,12 +18,12 @@ in services.xserver.windowManager.session = singleton { name = "metacity"; start = '' - ${gnome3.metacity}/bin/metacity & + ${gnome.metacity}/bin/metacity & waitPID=$! ''; }; - environment.systemPackages = [ gnome3.metacity ]; + environment.systemPackages = [ gnome.metacity ]; }; diff --git a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix index 9dbca4e33f..6751ca3f2e 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, modules, baseModules, ... }: +{ config, lib, pkgs, modules, baseModules, specialArgs, ... }: with lib; @@ -13,7 +13,7 @@ let # !!! fix this children = mapAttrs (childName: childConfig: (import ../../../lib/eval-config.nix { - inherit baseModules; + inherit baseModules specialArgs; system = config.nixpkgs.initialSystem; modules = (optionals childConfig.inheritParentConfig modules) diff --git a/third_party/nixpkgs/nixos/modules/system/boot/kexec.nix b/third_party/nixpkgs/nixos/modules/system/boot/kexec.nix index 27a8e0217c..03312aa26e 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/kexec.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/kexec.nix @@ -1,7 +1,7 @@ { pkgs, lib, ... }: { - config = lib.mkIf (lib.any (lib.meta.platformMatch pkgs.stdenv.hostPlatform) pkgs.kexectools.meta.platforms) { + config = lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexectools) { environment.systemPackages = [ pkgs.kexectools ]; systemd.services.prepare-kexec = diff --git a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix index bbdd5a4070..1de58b3d2c 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix @@ -716,10 +716,17 @@ let "NTP" "EmitSIP" "SIP" + "EmitPOP3" + "POP3" + "EmitSMTP" + "SMTP" + "EmitLPR" + "LPR" "EmitRouter" "EmitTimezone" "Timezone" "SendOption" + "SendVendorOption" ]) (assertInt "PoolOffset") (assertMinimum "PoolOffset" 0) @@ -728,6 +735,9 @@ let (assertValueOneOf "EmitDNS" boolValues) (assertValueOneOf "EmitNTP" boolValues) (assertValueOneOf "EmitSIP" boolValues) + (assertValueOneOf "EmitPOP3" boolValues) + (assertValueOneOf "EmitSMTP" boolValues) + (assertValueOneOf "EmitLPR" boolValues) (assertValueOneOf "EmitRouter" boolValues) (assertValueOneOf "EmitTimezone" boolValues) ]; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index d4ae4c9346..6be7b7e684 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -90,6 +90,7 @@ let "systemd-fsck@.service" "systemd-fsck-root.service" "systemd-remount-fs.service" + "systemd-pstore.service" "local-fs.target" "local-fs-pre.target" "remote-fs.target" @@ -1183,6 +1184,7 @@ in systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; systemd.services.systemd-importd.environment = proxy_env; + systemd.services.systemd-pstore.wantedBy = [ "sysinit.target" ]; # see #81138 # Don't bother with certain units in containers. systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container"; diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix index e468cb8800..24f71d2942 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix @@ -272,10 +272,10 @@ in wants = [ "local-fs.target" "remote-fs.target" ]; }; - # Emit systemd services to format requested filesystems. systemd.services = - let + # Emit systemd services to format requested filesystems. + let formatDevice = fs: let mountPoint' = "${escapeSystemdPath fs.mountPoint}.mount"; @@ -302,8 +302,34 @@ in unitConfig.DefaultDependencies = false; # needed to prevent a cycle serviceConfig.Type = "oneshot"; }; - - in listToAttrs (map formatDevice (filter (fs: fs.autoFormat) fileSystems)); + in listToAttrs (map formatDevice (filter (fs: fs.autoFormat) fileSystems)) // { + # Mount /sys/fs/pstore for evacuating panic logs and crashdumps from persistent storage onto the disk using systemd-pstore. + # This cannot be done with the other special filesystems because the pstore module (which creates the mount point) is not loaded then. + # Since the pstore filesystem is usually empty right after mounting because the backend isn't registered yet, and a path unit cannot detect files inside of it, the same service waits for that to happen. systemd's restart mechanism can't be used here because the first failure also fails all dependent units. + "mount-pstore" = { + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.util-linux}/bin/mount -t pstore -o nosuid,noexec,nodev pstore /sys/fs/pstore"; + ExecStartPost = pkgs.writeShellScript "wait-for-pstore.sh" '' + set -eu + TRIES=0 + while [ $TRIES -lt 20 ] && [ "$(cat /sys/module/pstore/parameters/backend)" = "(null)" ]; do + sleep 0.1 + TRIES=$((TRIES+1)) + done + ''; + RemainAfterExit = true; + }; + unitConfig = { + ConditionVirtualization = "!container"; + DefaultDependencies = false; # needed to prevent a cycle + }; + after = [ "modprobe@pstore.service" ]; + requires = [ "modprobe@pstore.service" ]; + before = [ "systemd-pstore.service" ]; + wantedBy = [ "systemd-pstore.service" ]; + }; + }; systemd.tmpfiles.rules = [ "d /run/keys 0750 root ${toString config.ids.gids.keys}" diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix index 21c3030518..376d6530f3 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix @@ -103,6 +103,7 @@ in readOnly = true; type = types.package; default = if config.boot.zfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs; + defaultText = "if config.boot.zfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs"; description = "Configured ZFS userland tools package."; }; diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix index f501f85b2a..879f077332 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix @@ -144,33 +144,20 @@ let }; tempAddress = mkOption { - type = types.enum [ "default" "enabled" "disabled" ]; - default = if cfg.enableIPv6 then "default" else "disabled"; - defaultText = literalExample ''if cfg.enableIPv6 then "default" else "disabled"''; + type = types.enum (lib.attrNames tempaddrValues); + default = cfg.tempAddresses; + defaultText = literalExample ''config.networking.tempAddresses''; description = '' When IPv6 is enabled with SLAAC, this option controls the use of - temporary address (aka privacy extensions). This is used to reduce tracking. - The three possible values are: + temporary address (aka privacy extensions) on this + interface. This is used to reduce tracking. - - - - "default" to generate temporary addresses and use - them by default; - - - - - "enabled" to generate temporary addresses but keep - using the standard EUI-64 ones by default; - - - - - "disabled" to completely disable temporary addresses. - - - + See also the global option + , which + applies to all interfaces where this is not set. + + Possible values are: + ${tempaddrDoc} ''; }; @@ -366,6 +353,32 @@ let isHexString = s: all (c: elem c hexChars) (stringToCharacters (toLower s)); + tempaddrValues = { + disabled = { + sysctl = "0"; + description = "completely disable IPv6 temporary addresses"; + }; + enabled = { + sysctl = "1"; + description = "generate IPv6 temporary addresses but still use EUI-64 addresses as source addresses"; + }; + default = { + sysctl = "2"; + description = "generate IPv6 temporary addresses and use these as source addresses in routing"; + }; + }; + tempaddrDoc = '' + + ${concatStringsSep "\n" (mapAttrsToList (name: { description, ... }: '' + + + "${name}" to ${description}; + + + '') tempaddrValues)} + + ''; + in { @@ -1039,6 +1052,21 @@ in ''; }; + networking.tempAddresses = mkOption { + default = if cfg.enableIPv6 then "default" else "disabled"; + type = types.enum (lib.attrNames tempaddrValues); + description = '' + Whether to enable IPv6 Privacy Extensions for interfaces not + configured explicitly in + . + + This sets the ipv6.conf.*.use_tempaddr sysctl for all + interfaces. Possible values are: + + ${tempaddrDoc} + ''; + }; + }; @@ -1098,7 +1126,7 @@ in // listToAttrs (forEach interfaces (i: let opt = i.tempAddress; - val = { disabled = 0; enabled = 1; default = 2; }.${opt}; + val = tempaddrValues.${opt}.sysctl; in nameValuePair "net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr" val)); # Capabilities won't work unless we have at-least a 4.3 Linux @@ -1111,6 +1139,21 @@ in } else { ping.source = "${pkgs.iputils.out}/bin/ping"; }; + security.apparmor.policies."bin.ping".profile = lib.mkIf config.security.apparmor.policies."bin.ping".enable (lib.mkAfter '' + /run/wrappers/bin/ping { + include + include + rpx /run/wrappers/wrappers.*/ping, + } + /run/wrappers/wrappers.*/ping { + include + include + r /run/wrappers/wrappers.*/ping.real, + mrpx ${config.security.wrappers.ping.source}, + capability net_raw, + capability setpcap, + } + ''); # Set the host and domain names in the activation script. Don't # clear it if it's not configured in the NixOS configuration, @@ -1188,9 +1231,11 @@ in (pkgs.writeTextFile rec { name = "ipv6-privacy-extensions.rules"; destination = "/etc/udev/rules.d/98-${name}"; - text = '' + text = let + sysctl-value = tempaddrValues.${cfg.tempAddresses}.sysctl; + in '' # enable and prefer IPv6 privacy addresses by default - ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.bash}/bin/sh -c 'echo 2 > /proc/sys/net/ipv6/conf/%k/use_tempaddr'" + ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.bash}/bin/sh -c 'echo ${sysctl-value} > /proc/sys/net/ipv6/conf/%k/use_tempaddr'" ''; }) (pkgs.writeTextFile rec { @@ -1199,15 +1244,13 @@ in text = concatMapStrings (i: let opt = i.tempAddress; - val = if opt == "disabled" then 0 else 1; - msg = if opt == "disabled" - then "completely disable IPv6 privacy addresses" - else "enable IPv6 privacy addresses but prefer EUI-64 addresses"; + val = tempaddrValues.${opt}.sysctl; + msg = tempaddrValues.${opt}.description; in '' # override to ${msg} for ${i.name} - ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr=${toString val}" - '') (filter (i: i.tempAddress != "default") interfaces); + ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr=${val}" + '') (filter (i: i.tempAddress != cfg.tempAddresses) interfaces); }) ] ++ lib.optional (cfg.wlanInterfaces != {}) (pkgs.writeTextFile { diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/containerd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/containerd.nix index 194276d169..b554bc6ea2 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/containerd.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/containerd.nix @@ -44,9 +44,7 @@ in KillMode = "process"; Type = "notify"; Restart = "always"; - RestartSec = "5"; - StartLimitBurst = "8"; - StartLimitIntervalSec = "120s"; + RestartSec = "10"; # "limits" defined below are adopted from upstream: https://github.com/containerd/containerd/blob/master/containerd.service LimitNPROC = "infinity"; @@ -54,6 +52,13 @@ in LimitNOFILE = "infinity"; TasksMax = "infinity"; OOMScoreAdjust = "-999"; + + StateDirectory = "containerd"; + RuntimeDirectory = "containerd"; + }; + unitConfig = { + StartLimitBurst = "16"; + StartLimitIntervalSec = "120s"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix b/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix index 3eb0de3a85..29f133786d 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix @@ -150,6 +150,10 @@ in config = mkIf cfg.enable (mkMerge [{ boot.kernelModules = [ "bridge" "veth" ]; + boot.kernel.sysctl = { + "net.ipv4.conf.all.forwarding" = mkOverride 98 true; + "net.ipv4.conf.default.forwarding" = mkOverride 98 true; + }; environment.systemPackages = [ cfg.package ] ++ optional cfg.enableNvidia pkgs.nvidia-docker; users.groups.docker.gid = config.ids.gids.docker; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/kvmgt.nix b/third_party/nixpkgs/nixos/modules/virtualisation/kvmgt.nix index e08ad34462..72bd2c24e5 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/kvmgt.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/kvmgt.nix @@ -82,5 +82,5 @@ in { }; }; - meta.maintainers = with maintainers; [ gnidorah ]; + meta.maintainers = with maintainers; [ ]; } diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/lxc.nix b/third_party/nixpkgs/nixos/modules/virtualisation/lxc.nix index f484d5ee59..0f8b22a45d 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/lxc.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/lxc.nix @@ -74,9 +74,13 @@ in systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ]; security.apparmor.packages = [ pkgs.lxc ]; - security.apparmor.profiles = [ - "${pkgs.lxc}/etc/apparmor.d/lxc-containers" - "${pkgs.lxc}/etc/apparmor.d/usr.bin.lxc-start" - ]; + security.apparmor.policies = { + "bin.lxc-start".profile = '' + include ${pkgs.lxc}/etc/apparmor.d/usr.bin.lxc-start + ''; + "lxc-containers".profile = '' + include ${pkgs.lxc}/etc/apparmor.d/lxc-containers + ''; + }; }; } diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix index 96e8d68ae5..6b6f4b6e65 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix @@ -97,11 +97,17 @@ in { # does a bunch of unrelated things. systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ]; - security.apparmor.packages = [ cfg.lxcPackage ]; - security.apparmor.profiles = [ - "${cfg.lxcPackage}/etc/apparmor.d/lxc-containers" - "${cfg.lxcPackage}/etc/apparmor.d/usr.bin.lxc-start" - ]; + security.apparmor = { + packages = [ cfg.lxcPackage ]; + policies = { + "bin.lxc-start".profile = '' + include ${cfg.lxcPackage}/etc/apparmor.d/usr.bin.lxc-start + ''; + "lxc-containers".profile = '' + include ${cfg.lxcPackage}/etc/apparmor.d/lxc-containers + ''; + }; + }; # TODO: remove once LXD gets proper support for cgroupsv2 # (currently most of the e.g. CPU accounting stuff doesn't work) diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-guest-agent.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-guest-agent.nix index 6a735f451a..3824d0c168 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-guest-agent.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-guest-agent.nix @@ -30,9 +30,12 @@ in { systemd.services.qemu-guest-agent = { description = "Run the QEMU Guest Agent"; serviceConfig = { - ExecStart = "${cfg.package}/bin/qemu-ga"; + ExecStart = "${cfg.package}/bin/qemu-ga --statedir /run/qemu-ga"; Restart = "always"; RestartSec = 0; + # Runtime directory and mode + RuntimeDirectory = "qemu-ga"; + RuntimeDirectoryMode = "0755"; }; }; } diff --git a/third_party/nixpkgs/nixos/release-combined.nix b/third_party/nixpkgs/nixos/release-combined.nix index ea82adf09a..34183c0ba9 100644 --- a/third_party/nixpkgs/nixos/release-combined.nix +++ b/third_party/nixpkgs/nixos/release-combined.nix @@ -70,8 +70,8 @@ in rec { (onFullSupported "nixos.tests.firefox") (onFullSupported "nixos.tests.firewall") (onFullSupported "nixos.tests.fontconfig-default-fonts") - (onFullSupported "nixos.tests.gnome3") - (onFullSupported "nixos.tests.gnome3-xorg") + (onFullSupported "nixos.tests.gnome") + (onFullSupported "nixos.tests.gnome-xorg") (onSystems ["x86_64-linux"] "nixos.tests.hibernate") (onFullSupported "nixos.tests.i3wm") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple") @@ -90,7 +90,7 @@ in rec { (onFullSupported "nixos.tests.keymap.azerty") (onFullSupported "nixos.tests.keymap.colemak") (onFullSupported "nixos.tests.keymap.dvorak") - (onFullSupported "nixos.tests.keymap.dvp") + (onFullSupported "nixos.tests.keymap.dvorak-programmer") (onFullSupported "nixos.tests.keymap.neo") (onFullSupported "nixos.tests.keymap.qwertz") (onFullSupported "nixos.tests.latestKernel.login") diff --git a/third_party/nixpkgs/nixos/release.nix b/third_party/nixpkgs/nixos/release.nix index 746e4c9dc6..2367e79e4a 100644 --- a/third_party/nixpkgs/nixos/release.nix +++ b/third_party/nixpkgs/nixos/release.nix @@ -186,11 +186,6 @@ in rec { inherit system; }); - sd_image_raspberrypi4 = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage { - module = ./modules/installer/sd-card/sd-image-raspberrypi4-installer.nix; - inherit system; - }); - # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). ova = forMatchingSystems [ "x86_64-linux" ] (system: @@ -323,10 +318,10 @@ in rec { services.xserver.desktopManager.xfce.enable = true; }); - gnome3 = makeClosure ({ ... }: + gnome = makeClosure ({ ... }: { services.xserver.enable = true; services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome3.enable = true; + services.xserver.desktopManager.gnome.enable = true; }); pantheon = makeClosure ({ ... }: diff --git a/third_party/nixpkgs/nixos/tests/acme.nix b/third_party/nixpkgs/nixos/tests/acme.nix index 99dd8ec6fd..6f98b0da37 100644 --- a/third_party/nixpkgs/nixos/tests/acme.nix +++ b/third_party/nixpkgs/nixos/tests/acme.nix @@ -245,7 +245,7 @@ in import ./make-test-python.nix ({ lib, ... }: { ) for line in subject_data.lower().split("\n"): if "subject" in line: - print(f"First subject in fullchain.pem: ", line) + print(f"First subject in fullchain.pem: {line}") assert cert_name.lower() in line return diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index e39c525a60..420e6eaf2e 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -27,7 +27,9 @@ in airsonic = handleTest ./airsonic.nix {}; amazon-init-shell = handleTest ./amazon-init-shell.nix {}; ammonite = handleTest ./ammonite.nix {}; + apparmor = handleTest ./apparmor.nix {}; atd = handleTest ./atd.nix {}; + atop = handleTest ./atop.nix {}; avahi = handleTest ./avahi.nix {}; avahi-with-resolved = handleTest ./avahi.nix { networkd = true; }; awscli = handleTest ./awscli.nix { }; @@ -90,6 +92,7 @@ in custom-ca = handleTest ./custom-ca.nix {}; croc = handleTest ./croc.nix {}; deluge = handleTest ./deluge.nix {}; + dendrite = handleTest ./dendrite.nix {}; dhparams = handleTest ./dhparams.nix {}; discourse = handleTest ./discourse.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; @@ -132,14 +135,15 @@ in fsck = handleTest ./fsck.nix {}; ft2-clone = handleTest ./ft2-clone.nix {}; gerrit = handleTest ./gerrit.nix {}; + ghostunnel = handleTest ./ghostunnel.nix {}; gitdaemon = handleTest ./gitdaemon.nix {}; gitea = handleTest ./gitea.nix {}; gitlab = handleTest ./gitlab.nix {}; gitolite = handleTest ./gitolite.nix {}; gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {}; glusterfs = handleTest ./glusterfs.nix {}; - gnome3 = handleTest ./gnome3.nix {}; - gnome3-xorg = handleTest ./gnome3-xorg.nix {}; + gnome = handleTest ./gnome.nix {}; + gnome-xorg = handleTest ./gnome-xorg.nix {}; go-neb = handleTest ./go-neb.nix {}; gobgpd = handleTest ./gobgpd.nix {}; gocd-agent = handleTest ./gocd-agent.nix {}; @@ -214,6 +218,7 @@ in latestKernel.login = handleTest ./login.nix { latestKernel = true; }; leaps = handleTest ./leaps.nix {}; lidarr = handleTest ./lidarr.nix {}; + libreswan = handleTest ./libreswan.nix {}; lightdm = handleTest ./lightdm.nix {}; limesurvey = handleTest ./limesurvey.nix {}; locate = handleTest ./locate.nix {}; @@ -299,6 +304,7 @@ in openarena = handleTest ./openarena.nix {}; openldap = handleTest ./openldap.nix {}; opensmtpd = handleTest ./opensmtpd.nix {}; + opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix {}; openssh = handleTest ./openssh.nix {}; openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {}; openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; @@ -387,6 +393,7 @@ in sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; sudo = handleTest ./sudo.nix {}; + sway = handleTest ./sway.nix {}; switchTest = handleTest ./switch-test.nix {}; sympa = handleTest ./sympa.nix {}; syncthing = handleTest ./syncthing.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/apparmor.nix b/third_party/nixpkgs/nixos/tests/apparmor.nix new file mode 100644 index 0000000000..c6daa8e67d --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/apparmor.nix @@ -0,0 +1,82 @@ +import ./make-test-python.nix ({ pkgs, ... } : { + name = "apparmor"; + meta = with pkgs.lib.maintainers; { + maintainers = [ julm ]; + }; + + machine = + { lib, pkgs, config, ... }: + with lib; + { + security.apparmor.enable = mkDefault true; + }; + + testScript = + '' + machine.wait_for_unit("multi-user.target") + + with subtest("AppArmor profiles are loaded"): + machine.succeed("systemctl status apparmor.service") + + # AppArmor securityfs + with subtest("AppArmor securityfs is mounted"): + machine.succeed("mountpoint -q /sys/kernel/security") + machine.succeed("cat /sys/kernel/security/apparmor/profiles") + + # Test apparmorRulesFromClosure by: + # 1. Prepending a string of the relevant packages' name and version on each line. + # 2. Sorting according to those strings. + # 3. Removing those prepended strings. + # 4. Using `diff` against the expected output. + with subtest("apparmorRulesFromClosure"): + machine.succeed( + "${pkgs.diffutils}/bin/diff ${pkgs.writeText "expected.rules" '' + mr ${pkgs.bash}/lib/**.so*, + r ${pkgs.bash}, + r ${pkgs.bash}/etc/**, + r ${pkgs.bash}/lib/**, + r ${pkgs.bash}/share/**, + x ${pkgs.bash}/foo/**, + mr ${pkgs.glibc}/lib/**.so*, + r ${pkgs.glibc}, + r ${pkgs.glibc}/etc/**, + r ${pkgs.glibc}/lib/**, + r ${pkgs.glibc}/share/**, + x ${pkgs.glibc}/foo/**, + mr ${pkgs.libcap}/lib/**.so*, + r ${pkgs.libcap}, + r ${pkgs.libcap}/etc/**, + r ${pkgs.libcap}/lib/**, + r ${pkgs.libcap}/share/**, + x ${pkgs.libcap}/foo/**, + mr ${pkgs.libcap.lib}/lib/**.so*, + r ${pkgs.libcap.lib}, + r ${pkgs.libcap.lib}/etc/**, + r ${pkgs.libcap.lib}/lib/**, + r ${pkgs.libcap.lib}/share/**, + x ${pkgs.libcap.lib}/foo/**, + mr ${pkgs.libidn2.out}/lib/**.so*, + r ${pkgs.libidn2.out}, + r ${pkgs.libidn2.out}/etc/**, + r ${pkgs.libidn2.out}/lib/**, + r ${pkgs.libidn2.out}/share/**, + x ${pkgs.libidn2.out}/foo/**, + mr ${pkgs.libunistring}/lib/**.so*, + r ${pkgs.libunistring}, + r ${pkgs.libunistring}/etc/**, + r ${pkgs.libunistring}/lib/**, + r ${pkgs.libunistring}/share/**, + x ${pkgs.libunistring}/foo/**, + ''} ${pkgs.runCommand "actual.rules" { preferLocalBuild = true; } '' + ${pkgs.gnused}/bin/sed -e 's:^[^ ]* ${builtins.storeDir}/[^,/-]*-\([^/,]*\):\1 \0:' ${ + pkgs.apparmorRulesFromClosure { + name = "ping"; + additionalRules = ["x $path/foo/**"]; + } [ pkgs.libcap ] + } | + ${pkgs.coreutils}/bin/sort -n -k1 | + ${pkgs.gnused}/bin/sed -e 's:^[^ ]* ::' >$out + ''}" + ) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/atop.nix b/third_party/nixpkgs/nixos/tests/atop.nix new file mode 100644 index 0000000000..a2565e610a --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/atop.nix @@ -0,0 +1,213 @@ +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let assertions = rec { + path = program: path: '' + with subtest("The path of ${program} should be ${path}"): + p = machine.succeed("type -p \"${program}\" | head -c -1") + assert p == "${path}", f"${program} is {p}, expected ${path}" + ''; + unit = name: state: '' + with subtest("Unit ${name} should be ${state}"): + machine.require_unit_state("${name}", "${state}") + ''; + version = '' + import re + + with subtest("binary should report the correct version"): + pkgver = "${pkgs.atop.version}" + ver = re.sub(r'(?s)^Version: (\d\.\d\.\d).*', r'\1', machine.succeed("atop -V")) + assert ver == pkgver, f"Version is `{ver}`, expected `{pkgver}`" + ''; + atoprc = contents: + if builtins.stringLength contents > 0 then '' + with subtest("/etc/atoprc should have the correct contents"): + f = machine.succeed("cat /etc/atoprc") + assert f == "${contents}", f"/etc/atoprc contents: '{f}', expected '${contents}'" + '' else '' + with subtest("/etc/atoprc should not be present"): + machine.succeed("test ! -e /etc/atoprc") + ''; + wrapper = present: + if present then path "atop" "/run/wrappers/bin/atop" + '' + with subtest("Wrapper should be setuid root"): + stat = machine.succeed("stat --printf '%a %u' /run/wrappers/bin/atop") + assert stat == "4511 0", f"Wrapper stat is {stat}, expected '4511 0'" + '' + else path "atop" "/run/current-system/sw/bin/atop"; + atopService = present: + if present then + unit "atop.service" "active" + + '' + with subtest("atop.service should have written some data to /var/log/atop"): + files = int(machine.succeed("ls -1 /var/log/atop | wc -l")) + assert files > 0, "Expected at least 1 data file" + '' else unit "atop.service" "inactive"; + atopRotateTimer = present: + unit "atop-rotate.timer" (if present then "active" else "inactive"); + atopacctService = present: + if present then + unit "atopacct.service" "active" + + '' + with subtest("atopacct.service should enable process accounting"): + machine.succeed("test -f /run/pacct_source") + + with subtest("atopacct.service should write data to /run/pacct_shadow.d"): + files = int(machine.succeed("ls -1 /run/pacct_shadow.d | wc -l")) + assert files >= 1, "Expected at least 1 pacct_shadow.d file" + '' else unit "atopacct.service" "inactive"; + netatop = present: + if present then + unit "netatop.service" "active" + + '' + with subtest("The netatop kernel module should be loaded"): + out = machine.succeed("modprobe -n -v netatop") + assert out == "", f"Module should be loaded already, but modprobe would have done {out}." + '' else '' + with subtest("The netatop kernel module should be absent"): + machine.fail("modprobe -n -v netatop") + ''; + atopgpu = present: + if present then + (unit "atopgpu.service" "active") + (path "atopgpud" "/run/current-system/sw/bin/atopgpud") + else (unit "atopgpu.service" "inactive") + '' + with subtest("atopgpud should not be present"): + machine.fail("type -p atopgpud") + ''; +}; +in +{ + name = "atop"; + + justThePackage = makeTest { + name = "atop-justThePackage"; + machine = { + environment.systemPackages = [ pkgs.atop ]; + }; + testScript = with assertions; builtins.concatStringsSep "\n" [ + version + (atoprc "") + (wrapper false) + (atopService false) + (atopRotateTimer false) + (atopacctService false) + (netatop false) + (atopgpu false) + ]; + }; + defaults = makeTest { + name = "atop-defaults"; + machine = { + programs.atop = { + enable = true; + }; + }; + testScript = with assertions; builtins.concatStringsSep "\n" [ + version + (atoprc "") + (wrapper false) + (atopService true) + (atopRotateTimer true) + (atopacctService true) + (netatop false) + (atopgpu false) + ]; + }; + minimal = makeTest { + name = "atop-minimal"; + machine = { + programs.atop = { + enable = true; + atopService.enable = false; + atopRotateTimer.enable = false; + atopacctService.enable = false; + }; + }; + testScript = with assertions; builtins.concatStringsSep "\n" [ + version + (atoprc "") + (wrapper false) + (atopService false) + (atopRotateTimer false) + (atopacctService false) + (netatop false) + (atopgpu false) + ]; + }; + netatop = makeTest { + name = "atop-netatop"; + machine = { + programs.atop = { + enable = true; + netatop.enable = true; + }; + }; + testScript = with assertions; builtins.concatStringsSep "\n" [ + version + (atoprc "") + (wrapper false) + (atopService true) + (atopRotateTimer true) + (atopacctService true) + (netatop true) + (atopgpu false) + ]; + }; + atopgpu = makeTest { + name = "atop-atopgpu"; + machine = { + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (getName pkg) [ + "cudatoolkit" + ]; + + programs.atop = { + enable = true; + atopgpu.enable = true; + }; + }; + testScript = with assertions; builtins.concatStringsSep "\n" [ + version + (atoprc "") + (wrapper false) + (atopService true) + (atopRotateTimer true) + (atopacctService true) + (netatop false) + (atopgpu true) + ]; + }; + everything = makeTest { + name = "atop-everthing"; + machine = { + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (getName pkg) [ + "cudatoolkit" + ]; + + programs.atop = { + enable = true; + settings = { + flags = "faf1"; + interval = 2; + }; + setuidWrapper.enable = true; + netatop.enable = true; + atopgpu.enable = true; + }; + }; + testScript = with assertions; builtins.concatStringsSep "\n" [ + version + (atoprc "flags faf1\\ninterval 2\\n") + (wrapper true) + (atopService true) + (atopRotateTimer true) + (atopacctService true) + (netatop true) + (atopgpu true) + ]; + }; +} diff --git a/third_party/nixpkgs/nixos/tests/buildbot.nix b/third_party/nixpkgs/nixos/tests/buildbot.nix index 11f9fbef63..977c728835 100644 --- a/third_party/nixpkgs/nixos/tests/buildbot.nix +++ b/third_party/nixpkgs/nixos/tests/buildbot.nix @@ -109,5 +109,5 @@ import ./make-test-python.nix { bbworker.fail("nc -z bbmaster 8011") ''; - meta.maintainers = with pkgs.lib.maintainers; [ nand0p ]; + meta.maintainers = with pkgs.lib.maintainers; [ ]; } {} diff --git a/third_party/nixpkgs/nixos/tests/cagebreak.nix b/third_party/nixpkgs/nixos/tests/cagebreak.nix index 87f43cc3c3..e343cd88e7 100644 --- a/third_party/nixpkgs/nixos/tests/cagebreak.nix +++ b/third_party/nixpkgs/nixos/tests/cagebreak.nix @@ -17,56 +17,27 @@ in let alice = config.users.users.alice; in { + # Automatically login on tty1 as a normal user: imports = [ ./common/user-account.nix ]; + services.getty.autologinUser = "alice"; + programs.bash.loginShellInit = '' + if [ "$(tty)" = "/dev/tty1" ]; then + set -e - environment.systemPackages = [ pkgs.cagebreak pkgs.wallutils ]; - services.xserver = { - enable = true; - displayManager.autoLogin = { - enable = true; - user = alice.name; - }; - }; - services.xserver.windowManager.session = lib.singleton { - manage = "desktop"; - name = "cagebreak"; - start = '' - export XDG_RUNTIME_DIR="/run/user/${toString alice.uid}" - ${pkgs.cagebreak}/bin/cagebreak & - waitPID=$! - ''; - }; + mkdir -p ~/.config/cagebreak + cp -f ${cagebreakConfigfile} ~/.config/cagebreak/config - systemd.services.setupCagebreakConfig = { - wantedBy = [ "multi-user.target" ]; - before = [ "multi-user.target" ]; - environment = { - HOME = alice.home; - }; - unitConfig = { - type = "oneshot"; - RemainAfterExit = true; - user = alice.name; - }; - script = '' - cd $HOME - CONFFILE=$HOME/.config/cagebreak/config - mkdir -p $(dirname $CONFFILE) - cp ${cagebreakConfigfile} $CONFFILE - ''; - }; + cagebreak + fi + ''; - # Copied from cage: - # this needs a fairly recent kernel, otherwise: - # [backend/drm/util.c:215] Unable to add DRM framebuffer: No such file or directory - # [backend/drm/legacy.c:15] Virtual-1: Failed to set CRTC: No such file or directory - # [backend/drm/util.c:215] Unable to add DRM framebuffer: No such file or directory - # [backend/drm/legacy.c:15] Virtual-1: Failed to set CRTC: No such file or directory - # [backend/drm/drm.c:618] Failed to initialize renderer on connector 'Virtual-1': initial page-flip failed - # [backend/drm/drm.c:701] Failed to initialize renderer for plane - boot.kernelPackages = pkgs.linuxPackages_latest; + hardware.opengl.enable = true; + programs.xwayland.enable = true; + environment.systemPackages = [ pkgs.cagebreak pkgs.wayland-utils ]; virtualisation.memorySize = 1024; + # Need to switch to a different VGA card / GPU driver than the default one (std) so that Cagebreak can launch: + virtualisation.qemu.options = [ "-vga virtio" ]; }; enableOCR = true; @@ -80,14 +51,15 @@ in machine.wait_for_file("${XDG_RUNTIME_DIR}/wayland-0") with subtest("ensure wayland works with wayinfo from wallutils"): - machine.succeed("env XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR} wayinfo") + print(machine.succeed("env XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR} wayland-info")) - with subtest("ensure xwayland works with xterm"): - machine.send_key("ctrl-t") - machine.send_key("t") - machine.wait_until_succeeds("pgrep xterm") - machine.wait_for_text("${user.name}@machine") - machine.screenshot("screen") - machine.send_key("ctrl-d") + # TODO: Fix the XWayland test (log the cagebreak output to debug): + # with subtest("ensure xwayland works with xterm"): + # machine.send_key("ctrl-t") + # machine.send_key("t") + # machine.wait_until_succeeds("pgrep xterm") + # machine.wait_for_text("${user.name}@machine") + # machine.screenshot("screen") + # machine.send_key("ctrl-d") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/chromium.nix b/third_party/nixpkgs/nixos/tests/chromium.nix index 8429d932ae..60ecf986d6 100644 --- a/third_party/nixpkgs/nixos/tests/chromium.nix +++ b/third_party/nixpkgs/nixos/tests/chromium.nix @@ -54,7 +54,8 @@ mapAttrs (channel: chromiumPkg: makeTest rec { in "${pkgs.xdotool}/bin/xdotool ${xdoScript}"; in '' import shlex - from contextlib import contextmanager, _GeneratorContextManager + import re + from contextlib import contextmanager # Run as user alice diff --git a/third_party/nixpkgs/nixos/tests/clickhouse.nix b/third_party/nixpkgs/nixos/tests/clickhouse.nix index 98d8b4b465..017f2ee35d 100644 --- a/third_party/nixpkgs/nixos/tests/clickhouse.nix +++ b/third_party/nixpkgs/nixos/tests/clickhouse.nix @@ -4,6 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine = { services.clickhouse.enable = true; + virtualisation.memorySize = 4096; }; testScript = diff --git a/third_party/nixpkgs/nixos/tests/containers-custom-pkgs.nix b/third_party/nixpkgs/nixos/tests/containers-custom-pkgs.nix index c050e49bc2..1627a2c70c 100644 --- a/third_party/nixpkgs/nixos/tests/containers-custom-pkgs.nix +++ b/third_party/nixpkgs/nixos/tests/containers-custom-pkgs.nix @@ -30,5 +30,5 @@ in { }; # This test only consists of evaluating the test machine - testScript = ""; + testScript = "pass"; }) diff --git a/third_party/nixpkgs/nixos/tests/containers-imperative.nix b/third_party/nixpkgs/nixos/tests/containers-imperative.nix index bb207165a0..1dcccfc306 100644 --- a/third_party/nixpkgs/nixos/tests/containers-imperative.nix +++ b/third_party/nixpkgs/nixos/tests/containers-imperative.nix @@ -162,6 +162,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.fail( "nixos-container create b0rk --config-file ${brokenCfg}" ) - machine.succeed(f"test ! -e /var/lib/containers/b0rk") + machine.succeed("test ! -e /var/lib/containers/b0rk") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/couchdb.nix b/third_party/nixpkgs/nixos/tests/couchdb.nix index d038ee7d89..049532481b 100644 --- a/third_party/nixpkgs/nixos/tests/couchdb.nix +++ b/third_party/nixpkgs/nixos/tests/couchdb.nix @@ -24,8 +24,6 @@ with lib; }; nodes = { - couchdb1 = makeNode pkgs.couchdb testuser testpass; - couchdb2 = makeNode pkgs.couchdb2 testuser testpass; couchdb3 = makeNode pkgs.couchdb3 testuser testpass; }; @@ -41,42 +39,6 @@ with lib; in '' start_all() - couchdb1.wait_for_unit("couchdb.service") - couchdb1.wait_until_succeeds( - "${curlJqCheck "" "GET" "" ".couchdb" "Welcome"}" - ) - couchdb1.wait_until_succeeds( - "${curlJqCheck "" "GET" "_all_dbs" ". | length" "2"}" - ) - couchdb1.succeed("${curlJqCheck testlogin "PUT" "foo" ".ok" "true"}") - couchdb1.succeed( - "${curlJqCheck "" "GET" "_all_dbs" ". | length" "3"}" - ) - couchdb1.succeed( - "${curlJqCheck testlogin "DELETE" "foo" ".ok" "true"}" - ) - couchdb1.succeed( - "${curlJqCheck "" "GET" "_all_dbs" ". | length" "2"}" - ) - - couchdb2.wait_for_unit("couchdb.service") - couchdb2.wait_until_succeeds( - "${curlJqCheck "" "GET" "" ".couchdb" "Welcome"}" - ) - couchdb2.wait_until_succeeds( - "${curlJqCheck "" "GET" "_all_dbs" ". | length" "0"}" - ) - couchdb2.succeed("${curlJqCheck testlogin "PUT" "foo" ".ok" "true"}") - couchdb2.succeed( - "${curlJqCheck "" "GET" "_all_dbs" ". | length" "1"}" - ) - couchdb2.succeed( - "${curlJqCheck testlogin "DELETE" "foo" ".ok" "true"}" - ) - couchdb2.succeed( - "${curlJqCheck "" "GET" "_all_dbs" ". | length" "0"}" - ) - couchdb3.wait_for_unit("couchdb.service") couchdb3.wait_until_succeeds( "${curlJqCheck testlogin "GET" "" ".couchdb" "Welcome"}" diff --git a/third_party/nixpkgs/nixos/tests/custom-ca.nix b/third_party/nixpkgs/nixos/tests/custom-ca.nix index 31909188d3..7ce1101911 100644 --- a/third_party/nixpkgs/nixos/tests/custom-ca.nix +++ b/third_party/nixpkgs/nixos/tests/custom-ca.nix @@ -112,6 +112,7 @@ in }; testScript = '' + from typing import Tuple def execute_as(user: str, cmd: str) -> Tuple[int, str]: """ Run a shell command as a specific user. diff --git a/third_party/nixpkgs/nixos/tests/dendrite.nix b/third_party/nixpkgs/nixos/tests/dendrite.nix new file mode 100644 index 0000000000..a444c9b200 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/dendrite.nix @@ -0,0 +1,99 @@ +import ./make-test-python.nix ( + { pkgs, ... }: + let + homeserverUrl = "http://homeserver:8008"; + + private_key = pkgs.runCommand "matrix_key.pem" { + buildInputs = [ pkgs.dendrite ]; + } "generate-keys --private-key $out"; + in + { + name = "dendrite"; + meta = with pkgs.lib; { + maintainers = teams.matrix.members; + }; + + nodes = { + homeserver = { pkgs, ... }: { + services.dendrite = { + enable = true; + settings = { + global.server_name = "test-dendrite-server.com"; + global.private_key = private_key; + client_api.registration_disabled = false; + }; + }; + + networking.firewall.allowedTCPPorts = [ 8008 ]; + }; + + client = { pkgs, ... }: { + environment.systemPackages = [ + ( + pkgs.writers.writePython3Bin "do_test" + { libraries = [ pkgs.python3Packages.matrix-nio ]; } '' + import asyncio + + from nio import AsyncClient + + + async def main() -> None: + # Connect to dendrite + client = AsyncClient("http://homeserver:8008", "alice") + + # Register as user alice + response = await client.register("alice", "my-secret-password") + + # Log in as user alice + response = await client.login("my-secret-password") + + # Create a new room + response = await client.room_create(federate=False) + room_id = response.room_id + + # Join the room + response = await client.join(room_id) + + # Send a message to the room + response = await client.room_send( + room_id=room_id, + message_type="m.room.message", + content={ + "msgtype": "m.text", + "body": "Hello world!" + } + ) + + # Sync responses + response = await client.sync(timeout=30000) + + # Check the message was received by dendrite + last_message = response.rooms.join[room_id].timeline.events[-1].body + assert last_message == "Hello world!" + + # Leave the room + response = await client.room_leave(room_id) + + # Close the client + await client.close() + + asyncio.get_event_loop().run_until_complete(main()) + '' + ) + ]; + }; + }; + + testScript = '' + start_all() + + with subtest("start the homeserver"): + homeserver.wait_for_unit("dendrite.service") + homeserver.wait_for_open_port(8008) + + with subtest("ensure messages can be exchanged"): + client.succeed("do_test") + ''; + + } +) diff --git a/third_party/nixpkgs/nixos/tests/docker-tools-overlay.nix b/third_party/nixpkgs/nixos/tests/docker-tools-overlay.nix index 98eb728661..6781388e63 100644 --- a/third_party/nixpkgs/nixos/tests/docker-tools-overlay.nix +++ b/third_party/nixpkgs/nixos/tests/docker-tools-overlay.nix @@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "docker-tools-overlay"; meta = with pkgs.lib.maintainers; { - maintainers = [ lnl7 ]; + maintainers = [ lnl7 roberth ]; }; nodes = { diff --git a/third_party/nixpkgs/nixos/tests/docker-tools.nix b/third_party/nixpkgs/nixos/tests/docker-tools.nix index 96662b4540..39b97b4cb9 100644 --- a/third_party/nixpkgs/nixos/tests/docker-tools.nix +++ b/third_party/nixpkgs/nixos/tests/docker-tools.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "docker-tools"; meta = with pkgs.lib.maintainers; { - maintainers = [ lnl7 ]; + maintainers = [ lnl7 roberth ]; }; nodes = { diff --git a/third_party/nixpkgs/nixos/tests/docker.nix b/third_party/nixpkgs/nixos/tests/docker.nix index 58e33535ed..dee7480eb4 100644 --- a/third_party/nixpkgs/nixos/tests/docker.nix +++ b/third_party/nixpkgs/nixos/tests/docker.nix @@ -45,5 +45,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { # Must match version 4 times to ensure client and server git commits and versions are correct docker.succeed('[ $(docker version | grep ${pkgs.docker.version} | wc -l) = "4" ]') + docker.succeed("systemctl restart systemd-sysctl") + docker.succeed("grep 1 /proc/sys/net/ipv4/conf/all/forwarding") + docker.succeed("grep 1 /proc/sys/net/ipv4/conf/default/forwarding") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/fancontrol.nix b/third_party/nixpkgs/nixos/tests/fancontrol.nix index 356cd57ffa..296c680264 100644 --- a/third_party/nixpkgs/nixos/tests/fancontrol.nix +++ b/third_party/nixpkgs/nixos/tests/fancontrol.nix @@ -1,28 +1,34 @@ import ./make-test-python.nix ({ pkgs, ... } : { name = "fancontrol"; + meta = with pkgs.lib.maintainers; { + maintainers = [ evils ]; + }; - machine = - { ... }: - { hardware.fancontrol.enable = true; - hardware.fancontrol.config = '' - INTERVAL=42 - DEVPATH=hwmon1=devices/platform/dummy - DEVNAME=hwmon1=dummy - FCTEMPS=hwmon1/device/pwm1=hwmon1/device/temp1_input - FCFANS=hwmon1/device/pwm1=hwmon1/device/fan1_input - MINTEMP=hwmon1/device/pwm1=25 - MAXTEMP=hwmon1/device/pwm1=65 - MINSTART=hwmon1/device/pwm1=150 - MINSTOP=hwmon1/device/pwm1=0 - ''; + machine = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + hardware.fancontrol.enable = true; + hardware.fancontrol.config = '' + INTERVAL=42 + DEVPATH=hwmon1=devices/platform/dummy + DEVNAME=hwmon1=dummy + FCTEMPS=hwmon1/device/pwm1=hwmon1/device/temp1_input + FCFANS=hwmon1/device/pwm1=hwmon1/device/fan1_input + MINTEMP=hwmon1/device/pwm1=25 + MAXTEMP=hwmon1/device/pwm1=65 + MINSTART=hwmon1/device/pwm1=150 + MINSTOP=hwmon1/device/pwm1=0 + ''; }; # This configuration cannot be valid for the test VM, so it's expected to get an 'outdated' error. testScript = '' start_all() - machine.wait_for_unit("fancontrol.service") - machine.wait_until_succeeds( - "journalctl -eu fancontrol | grep 'Configuration appears to be outdated'" + # can't wait for unit fancontrol.service because it doesn't become active due to invalid config + # fancontrol.service is WantedBy multi-user.target + machine.wait_for_unit("multi-user.target") + machine.succeed( + "journalctl -eu fancontrol | tee /dev/stderr | grep 'Configuration appears to be outdated'" ) + machine.shutdown() ''; }) diff --git a/third_party/nixpkgs/nixos/tests/fontconfig-default-fonts.nix b/third_party/nixpkgs/nixos/tests/fontconfig-default-fonts.nix index 68c6ac9e9c..58d0f6227c 100644 --- a/third_party/nixpkgs/nixos/tests/fontconfig-default-fonts.nix +++ b/third_party/nixpkgs/nixos/tests/fontconfig-default-fonts.nix @@ -4,7 +4,6 @@ import ./make-test-python.nix ({ lib, ... }: meta.maintainers = with lib.maintainers; [ jtojnar - worldofpeace ]; machine = { config, pkgs, ... }: { diff --git a/third_party/nixpkgs/nixos/tests/ghostunnel.nix b/third_party/nixpkgs/nixos/tests/ghostunnel.nix new file mode 100644 index 0000000000..a82cff8082 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/ghostunnel.nix @@ -0,0 +1,104 @@ +{ pkgs, ... }: import ./make-test-python.nix { + + nodes = { + backend = { pkgs, ... }: { + services.nginx.enable = true; + services.nginx.virtualHosts."backend".root = pkgs.runCommand "webroot" {} '' + mkdir $out + echo hi >$out/hi.txt + ''; + networking.firewall.allowedTCPPorts = [ 80 ]; + }; + service = { ... }: { + services.ghostunnel.enable = true; + services.ghostunnel.servers."plain-old" = { + listen = "0.0.0.0:443"; + cert = "/root/service-cert.pem"; + key = "/root/service-key.pem"; + disableAuthentication = true; + target = "backend:80"; + unsafeTarget = true; + }; + services.ghostunnel.servers."client-cert" = { + listen = "0.0.0.0:1443"; + cert = "/root/service-cert.pem"; + key = "/root/service-key.pem"; + cacert = "/root/ca.pem"; + target = "backend:80"; + allowCN = ["client"]; + unsafeTarget = true; + }; + networking.firewall.allowedTCPPorts = [ 443 1443 ]; + }; + client = { pkgs, ... }: { + environment.systemPackages = [ + pkgs.curl + ]; + }; + }; + + testScript = '' + + # prepare certificates + + def cmd(command): + print(f"+{command}") + r = os.system(command) + if r != 0: + raise Exception(f"Command {command} failed with exit code {r}") + + # Create CA + cmd("${pkgs.openssl}/bin/openssl genrsa -out ca-key.pem 4096") + cmd("${pkgs.openssl}/bin/openssl req -new -x509 -days 365 -key ca-key.pem -sha256 -subj '/C=NL/ST=Zuid-Holland/L=The Hague/O=Stevige Balken en Planken B.V./OU=OpSec/CN=Certificate Authority' -out ca.pem") + + # Create service + cmd("${pkgs.openssl}/bin/openssl genrsa -out service-key.pem 4096") + cmd("${pkgs.openssl}/bin/openssl req -subj '/CN=service' -sha256 -new -key service-key.pem -out service.csr") + cmd("echo subjectAltName = DNS:service,IP:127.0.0.1 >> extfile.cnf") + cmd("echo extendedKeyUsage = serverAuth >> extfile.cnf") + cmd("${pkgs.openssl}/bin/openssl x509 -req -days 365 -sha256 -in service.csr -CA ca.pem -CAkey ca-key.pem -CAcreateserial -out service-cert.pem -extfile extfile.cnf") + + # Create client + cmd("${pkgs.openssl}/bin/openssl genrsa -out client-key.pem 4096") + cmd("${pkgs.openssl}/bin/openssl req -subj '/CN=client' -new -key client-key.pem -out client.csr") + cmd("echo extendedKeyUsage = clientAuth > extfile-client.cnf") + cmd("${pkgs.openssl}/bin/openssl x509 -req -days 365 -sha256 -in client.csr -CA ca.pem -CAkey ca-key.pem -CAcreateserial -out client-cert.pem -extfile extfile-client.cnf") + + cmd("ls -al") + + start_all() + + # Configuration + service.copy_from_host("ca.pem", "/root/ca.pem") + service.copy_from_host("service-cert.pem", "/root/service-cert.pem") + service.copy_from_host("service-key.pem", "/root/service-key.pem") + client.copy_from_host("ca.pem", "/root/ca.pem") + client.copy_from_host("service-cert.pem", "/root/service-cert.pem") + client.copy_from_host("client-cert.pem", "/root/client-cert.pem") + client.copy_from_host("client-key.pem", "/root/client-key.pem") + + backend.wait_for_unit("nginx.service") + service.wait_for_unit("multi-user.target") + service.wait_for_unit("multi-user.target") + client.wait_for_unit("multi-user.target") + + # Check assumptions before the real test + client.succeed("bash -c 'diff <(curl -v --no-progress-meter http://backend/hi.txt) <(echo hi)'") + + # Plain old simple TLS can connect, ignoring cert + client.succeed("bash -c 'diff <(curl -v --no-progress-meter --insecure https://service/hi.txt) <(echo hi)'") + + # Plain old simple TLS provides correct signature with its cert + client.succeed("bash -c 'diff <(curl -v --no-progress-meter --cacert /root/ca.pem https://service/hi.txt) <(echo hi)'") + + # Client can authenticate with certificate + client.succeed("bash -c 'diff <(curl -v --no-progress-meter --cert /root/client-cert.pem --key /root/client-key.pem --cacert /root/ca.pem https://service:1443/hi.txt) <(echo hi)'") + + # Client must authenticate with certificate + client.fail("bash -c 'diff <(curl -v --no-progress-meter --cacert /root/ca.pem https://service:1443/hi.txt) <(echo hi)'") + ''; + + meta.maintainers = with pkgs.lib.maintainers; [ + roberth + ]; +} diff --git a/third_party/nixpkgs/nixos/tests/gnome3-xorg.nix b/third_party/nixpkgs/nixos/tests/gnome-xorg.nix similarity index 94% rename from third_party/nixpkgs/nixos/tests/gnome3-xorg.nix rename to third_party/nixpkgs/nixos/tests/gnome-xorg.nix index 0d05c12384..55f9c90c20 100644 --- a/third_party/nixpkgs/nixos/tests/gnome3-xorg.nix +++ b/third_party/nixpkgs/nixos/tests/gnome-xorg.nix @@ -1,5 +1,5 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { - name = "gnome3-xorg"; + name = "gnome-xorg"; meta = with lib; { maintainers = teams.gnome.members; }; @@ -21,8 +21,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { }; }; - services.xserver.desktopManager.gnome3.enable = true; - services.xserver.desktopManager.gnome3.debug = true; + services.xserver.desktopManager.gnome.enable = true; + services.xserver.desktopManager.gnome.debug = true; services.xserver.displayManager.defaultSession = "gnome-xorg"; virtualisation.memorySize = 1024; diff --git a/third_party/nixpkgs/nixos/tests/gnome3.nix b/third_party/nixpkgs/nixos/tests/gnome.nix similarity index 93% rename from third_party/nixpkgs/nixos/tests/gnome3.nix rename to third_party/nixpkgs/nixos/tests/gnome.nix index 7e301be49d..e8d18a41bd 100644 --- a/third_party/nixpkgs/nixos/tests/gnome3.nix +++ b/third_party/nixpkgs/nixos/tests/gnome.nix @@ -1,5 +1,5 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { - name = "gnome3"; + name = "gnome"; meta = with lib; { maintainers = teams.gnome.members; }; @@ -20,13 +20,13 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { }; }; - services.xserver.desktopManager.gnome3.enable = true; - services.xserver.desktopManager.gnome3.debug = true; + services.xserver.desktopManager.gnome.enable = true; + services.xserver.desktopManager.gnome.debug = true; environment.systemPackages = [ (pkgs.makeAutostartItem { name = "org.gnome.Terminal"; - package = pkgs.gnome3.gnome-terminal; + package = pkgs.gnome.gnome-terminal; }) ]; diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/default.nix b/third_party/nixpkgs/nixos/tests/installed-tests/default.nix index e5d7009bb7..6c2846a163 100644 --- a/third_party/nixpkgs/nixos/tests/installed-tests/default.nix +++ b/third_party/nixpkgs/nixos/tests/installed-tests/default.nix @@ -97,6 +97,7 @@ in gsconnect = callInstalledTest ./gsconnect.nix {}; ibus = callInstalledTest ./ibus.nix {}; libgdata = callInstalledTest ./libgdata.nix {}; + librsvg = callInstalledTest ./librsvg.nix {}; glib-testing = callInstalledTest ./glib-testing.nix {}; libjcat = callInstalledTest ./libjcat.nix {}; libxmlb = callInstalledTest ./libxmlb.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/gnome-photos.nix b/third_party/nixpkgs/nixos/tests/installed-tests/gnome-photos.nix index 05e7ccb65a..bcb6479ee8 100644 --- a/third_party/nixpkgs/nixos/tests/installed-tests/gnome-photos.nix +++ b/third_party/nixpkgs/nixos/tests/installed-tests/gnome-photos.nix @@ -7,7 +7,7 @@ makeInstalledTest { testConfig = { programs.dconf.enable = true; - services.gnome3.at-spi2-core.enable = true; # needed for dogtail + services.gnome.at-spi2-core.enable = true; # needed for dogtail environment.systemPackages = with pkgs; [ # gsettings tool with access to gsettings-desktop-schemas (stdenv.mkDerivation { diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/libgdata.nix b/third_party/nixpkgs/nixos/tests/installed-tests/libgdata.nix index f11a7bc1bc..b0d39c042b 100644 --- a/third_party/nixpkgs/nixos/tests/installed-tests/libgdata.nix +++ b/third_party/nixpkgs/nixos/tests/installed-tests/libgdata.nix @@ -6,6 +6,6 @@ makeInstalledTest { testConfig = { # # GLib-GIO-DEBUG: _g_io_module_get_default: Found default implementation dummy (GDummyTlsBackend) for ‘gio-tls-backend’ # Bail out! libgdata:ERROR:../gdata/tests/common.c:134:gdata_test_init: assertion failed (child_error == NULL): TLS support is not available (g-tls-error-quark, 0) - services.gnome3.glib-networking.enable = true; + services.gnome.glib-networking.enable = true; }; } diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/librsvg.nix b/third_party/nixpkgs/nixos/tests/installed-tests/librsvg.nix new file mode 100644 index 0000000000..378e7cce3f --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/installed-tests/librsvg.nix @@ -0,0 +1,9 @@ +{ pkgs, makeInstalledTest, ... }: + +makeInstalledTest { + tested = pkgs.librsvg; + + testConfig = { + virtualisation.memorySize = 2047; + }; +} diff --git a/third_party/nixpkgs/nixos/tests/ipv6.nix b/third_party/nixpkgs/nixos/tests/ipv6.nix index f9d6d82b54..75faa6f602 100644 --- a/third_party/nixpkgs/nixos/tests/ipv6.nix +++ b/third_party/nixpkgs/nixos/tests/ipv6.nix @@ -8,12 +8,34 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { }; nodes = - # Remove the interface configuration provided by makeTest so that the - # interfaces are all configured implicitly - { client = { ... }: { networking.interfaces = lib.mkForce {}; }; + { + # We use lib.mkForce here to remove the interface configuration + # provided by makeTest, so that the interfaces are all configured + # implicitly. + + # This client should use privacy extensions fully, having a + # completely-default network configuration. + client_defaults.networking.interfaces = lib.mkForce {}; + + # Both of these clients should obtain temporary addresses, but + # not use them as the default source IP. We thus run the same + # checks against them — but the configuration resulting in this + # behaviour is different. + + # Here, by using an altered default value for the global setting... + client_global_setting = { + networking.interfaces = lib.mkForce {}; + networking.tempAddresses = "enabled"; + }; + # and here, by setting this on the interface explicitly. + client_interface_setting = { + networking.tempAddresses = "disabled"; + networking.interfaces = lib.mkForce { + eth1.tempAddress = "enabled"; + }; + }; server = - { ... }: { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; networking.firewall.allowedTCPPorts = [ 80 ]; @@ -40,9 +62,12 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { # Start the router first so that it respond to router solicitations. router.wait_for_unit("radvd") + clients = [client_defaults, client_global_setting, client_interface_setting] + start_all() - client.wait_for_unit("network.target") + for client in clients: + client.wait_for_unit("network.target") server.wait_for_unit("network.target") server.wait_for_unit("httpd.service") @@ -64,28 +89,42 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { with subtest("Loopback address can be pinged"): - client.succeed("ping -c 1 ::1 >&2") - client.fail("ping -c 1 ::2 >&2") + client_defaults.succeed("ping -c 1 ::1 >&2") + client_defaults.fail("ping -c 1 2001:db8:: >&2") with subtest("Local link addresses can be obtained and pinged"): - client_ip = wait_for_address(client, "eth1", "link") - server_ip = wait_for_address(server, "eth1", "link") - client.succeed(f"ping -c 1 {client_ip}%eth1 >&2") - client.succeed(f"ping -c 1 {server_ip}%eth1 >&2") + for client in clients: + client_ip = wait_for_address(client, "eth1", "link") + server_ip = wait_for_address(server, "eth1", "link") + client.succeed(f"ping -c 1 {client_ip}%eth1 >&2") + client.succeed(f"ping -c 1 {server_ip}%eth1 >&2") with subtest("Global addresses can be obtained, pinged, and reached via http"): - client_ip = wait_for_address(client, "eth1", "global") - server_ip = wait_for_address(server, "eth1", "global") - client.succeed(f"ping -c 1 {client_ip} >&2") - client.succeed(f"ping -c 1 {server_ip} >&2") - client.succeed(f"curl --fail -g http://[{server_ip}]") - client.fail(f"curl --fail -g http://[{client_ip}]") + for client in clients: + client_ip = wait_for_address(client, "eth1", "global") + server_ip = wait_for_address(server, "eth1", "global") + client.succeed(f"ping -c 1 {client_ip} >&2") + client.succeed(f"ping -c 1 {server_ip} >&2") + client.succeed(f"curl --fail -g http://[{server_ip}]") + client.fail(f"curl --fail -g http://[{client_ip}]") - with subtest("Privacy extensions: Global temporary address can be obtained and pinged"): - ip = wait_for_address(client, "eth1", "global", temporary=True) + with subtest( + "Privacy extensions: Global temporary address is used as default source address" + ): + ip = wait_for_address(client_defaults, "eth1", "global", temporary=True) # Default route should have "src " in it - client.succeed(f"ip r g ::2 | grep {ip}") + client_defaults.succeed(f"ip route get 2001:db8:: | grep 'src {ip}'") - # TODO: test reachability of a machine on another network. + for client, setting_desc in ( + (client_global_setting, "global"), + (client_interface_setting, "interface"), + ): + with subtest(f'Privacy extensions: "enabled" through {setting_desc} setting)'): + # We should be obtaining both a temporary address and an EUI-64 address... + ip = wait_for_address(client, "eth1", "global") + assert "ff:fe" in ip + ip_temp = wait_for_address(client, "eth1", "global", temporary=True) + # But using the EUI-64 one. + client.succeed(f"ip route get 2001:db8:: | grep 'src {ip}'") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/jellyfin.nix b/third_party/nixpkgs/nixos/tests/jellyfin.nix index f8c2429a7b..cae31a7192 100644 --- a/third_party/nixpkgs/nixos/tests/jellyfin.nix +++ b/third_party/nixpkgs/nixos/tests/jellyfin.nix @@ -24,7 +24,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: in '' import json - import time from urllib.parse import urlencode machine.wait_for_unit("jellyfin.service") @@ -101,7 +100,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: def is_refreshed(_): - folders = machine.succeed(api_get(f"/Library/VirtualFolders")) + folders = machine.succeed(api_get("/Library/VirtualFolders")) folders = json.loads(folders) print(folders) return all(folder["RefreshStatus"] == "Idle" for folder in folders) @@ -141,7 +140,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: "ffmpeg" + f" -headers 'X-Emby-Authorization:{auth_header}'" + f" -i http://localhost:8096/Videos/{video}/master.m3u8?mediaSourceId={media_source_id}" - + f" /tmp/test.mkv" + + " /tmp/test.mkv" ) duration = machine.succeed( diff --git a/third_party/nixpkgs/nixos/tests/kernel-generic.nix b/third_party/nixpkgs/nixos/tests/kernel-generic.nix index 17089141e9..a300609cf2 100644 --- a/third_party/nixpkgs/nixos/tests/kernel-generic.nix +++ b/third_party/nixpkgs/nixos/tests/kernel-generic.nix @@ -32,6 +32,7 @@ with pkgs; { linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4; linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10; linux_5_11 = makeKernelTest "5.11" linuxPackages_5_11; + linux_5_12 = makeKernelTest "5.12" linuxPackages_5_12; linux_testing = makeKernelTest "testing" linuxPackages_testing; } diff --git a/third_party/nixpkgs/nixos/tests/keymap.nix b/third_party/nixpkgs/nixos/tests/keymap.nix index 09d5d2a6c9..a18a05f90c 100644 --- a/third_party/nixpkgs/nixos/tests/keymap.nix +++ b/third_party/nixpkgs/nixos/tests/keymap.nix @@ -107,17 +107,32 @@ in pkgs.lib.mapAttrs mkKeyboardTest { altgr.expect = [ "~" "#" "{" "[" "|" ]; }; - extraConfig.console.keyMap = "azerty/fr"; + extraConfig.console.keyMap = "fr"; extraConfig.services.xserver.layout = "fr"; }; + bone = { + tests = { + layer1.qwerty = [ "f" "j" ]; + layer1.expect = [ "e" "n" ]; + layer2.qwerty = [ "shift-f" "shift-j" "shift-6" ]; + layer2.expect = [ "E" "N" "$" ]; + layer3.qwerty = [ "caps_lock-d" "caps_lock-f" ]; + layer3.expect = [ "{" "}" ]; + }; + + extraConfig.console.keyMap = "bone"; + extraConfig.services.xserver.layout = "de"; + extraConfig.services.xserver.xkbVariant = "bone"; + }; + colemak = { tests = { homerow.qwerty = [ "a" "s" "d" "f" "j" "k" "l" "semicolon" ]; homerow.expect = [ "a" "r" "s" "t" "n" "e" "i" "o" ]; }; - extraConfig.console.keyMap = "colemak/colemak"; + extraConfig.console.keyMap = "colemak"; extraConfig.services.xserver.layout = "us"; extraConfig.services.xserver.xkbVariant = "colemak"; }; @@ -129,9 +144,13 @@ in pkgs.lib.mapAttrs mkKeyboardTest { symbols.qwerty = [ "q" "w" "e" "minus" "equal" ]; symbols.expect = [ "'" "," "." "[" "]" ]; }; + + extraConfig.console.keyMap = "dvorak"; + extraConfig.services.xserver.layout = "us"; + extraConfig.services.xserver.xkbVariant = "dvorak"; }; - dvp = { + dvorak-programmer = { tests = { homerow.qwerty = [ "a" "s" "d" "f" "j" "k" "l" "semicolon" ]; homerow.expect = [ "a" "o" "e" "u" "h" "t" "n" "s" ]; @@ -142,6 +161,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest { symbols.expect = [ "&" "[" "{" "}" "(" "=" "*" ")" "+" "]" "!" ]; }; + extraConfig.console.keyMap = "dvorak-programmer"; extraConfig.services.xserver.layout = "us"; extraConfig.services.xserver.xkbVariant = "dvp"; }; @@ -156,6 +176,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest { layer3.expect = [ "{" "}" ]; }; + extraConfig.console.keyMap = "neo"; extraConfig.services.xserver.layout = "de"; extraConfig.services.xserver.xkbVariant = "neo"; }; diff --git a/third_party/nixpkgs/nixos/tests/libreswan.nix b/third_party/nixpkgs/nixos/tests/libreswan.nix new file mode 100644 index 0000000000..17ae60af8e --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/libreswan.nix @@ -0,0 +1,134 @@ +# This test sets up a host-to-host IPsec VPN between Alice and Bob, each on its +# own network and with Eve as the only route between each other. We check that +# Eve can eavesdrop the plaintext traffic between Alice and Bob, but once they +# enable the secure tunnel Eve's spying becomes ineffective. + +import ./make-test-python.nix ({ lib, pkgs, ... }: + +let + + # IPsec tunnel between Alice and Bob + tunnelConfig = { + services.libreswan.enable = true; + services.libreswan.connections.tunnel = + '' + leftid=@alice + left=fd::a + rightid=@bob + right=fd::b + authby=secret + auto=add + ''; + environment.etc."ipsec.d/tunnel.secrets" = + { text = ''@alice @bob : PSK "j1JbIi9WY07rxwcNQ6nbyThKCf9DGxWOyokXIQcAQUnafsNTUJxfsxwk9WYK8fHj"''; + mode = "600"; + }; + }; + + # Common network setup + baseNetwork = { + # shared hosts file + extraHosts = lib.mkVMOverride '' + fd::a alice + fd::b bob + fd::e eve + ''; + # remove all automatic addresses + useDHCP = false; + interfaces.eth1.ipv4.addresses = lib.mkVMOverride []; + interfaces.eth2.ipv4.addresses = lib.mkVMOverride []; + # open a port for testing + firewall.allowedUDPPorts = [ 1234 ]; + }; + + # Adds an address and route from a to b via Eve + addRoute = a: b: { + interfaces.eth1.ipv6.addresses = + [ { address = a; prefixLength = 64; } ]; + interfaces.eth1.ipv6.routes = + [ { address = b; prefixLength = 128; via = "fd::e"; } ]; + }; + +in + +{ + name = "libreswan"; + meta = with lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; + + # Our protagonist + nodes.alice = { ... }: { + virtualisation.vlans = [ 1 ]; + networking = baseNetwork // addRoute "fd::a" "fd::b"; + } // tunnelConfig; + + # Her best friend + nodes.bob = { ... }: { + virtualisation.vlans = [ 2 ]; + networking = baseNetwork // addRoute "fd::b" "fd::a"; + } // tunnelConfig; + + # The malicious network operator + nodes.eve = { ... }: { + virtualisation.vlans = [ 1 2 ]; + networking = lib.mkMerge + [ baseNetwork + { interfaces.br0.ipv6.addresses = + [ { address = "fd::e"; prefixLength = 64; } ]; + bridges.br0.interfaces = [ "eth1" "eth2" ]; + } + ]; + environment.systemPackages = [ pkgs.tcpdump ]; + boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true; + }; + + testScript = + '' + def alice_to_bob(msg: str): + """ + Sends a message as Alice to Bob + """ + bob.execute("nc -lu ::0 1234 >/tmp/msg &") + alice.sleep(1) + alice.succeed(f"echo '{msg}' | nc -uw 0 bob 1234") + bob.succeed(f"grep '{msg}' /tmp/msg") + + + def eavesdrop(): + """ + Starts eavesdropping on Alice and Bob + """ + match = "src host alice and dst host bob" + eve.execute(f"tcpdump -i br0 -c 1 -Avv {match} >/tmp/log &") + + + start_all() + + with subtest("Network is up"): + alice.wait_until_succeeds("ping -c1 bob") + + with subtest("Eve can eavesdrop cleartext traffic"): + eavesdrop() + alice_to_bob("I secretly love turnip") + eve.sleep(1) + eve.succeed("grep turnip /tmp/log") + + with subtest("Libreswan is ready"): + alice.wait_for_unit("ipsec") + bob.wait_for_unit("ipsec") + alice.succeed("ipsec verify 1>&2") + + with subtest("Alice and Bob can start the tunnel"): + alice.execute("ipsec auto --start tunnel &") + bob.succeed("ipsec auto --start tunnel") + # apparently this is needed to "wake" the tunnel + bob.execute("ping -c1 alice") + + with subtest("Eve no longer can eavesdrop"): + eavesdrop() + alice_to_bob("Just kidding, I actually like rhubarb") + eve.sleep(1) + eve.fail("grep rhubarb /tmp/log") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/lightdm.nix b/third_party/nixpkgs/nixos/tests/lightdm.nix index 9611bdbdaf..e98230ecb1 100644 --- a/third_party/nixpkgs/nixos/tests/lightdm.nix +++ b/third_party/nixpkgs/nixos/tests/lightdm.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "lightdm"; meta = with pkgs.lib.maintainers; { - maintainers = [ aszlig worldofpeace ]; + maintainers = [ aszlig ]; }; machine = { ... }: { diff --git a/third_party/nixpkgs/nixos/tests/minecraft-server.nix b/third_party/nixpkgs/nixos/tests/minecraft-server.nix index e6e0bca972..dbe2cd6d56 100644 --- a/third_party/nixpkgs/nixos/tests/minecraft-server.nix +++ b/third_party/nixpkgs/nixos/tests/minecraft-server.nix @@ -24,7 +24,7 @@ in import ./make-test-python.nix ({ pkgs, ... }: { }; }; - virtualisation.memorySize = 2048; + virtualisation.memorySize = 2047; }; testScript = '' diff --git a/third_party/nixpkgs/nixos/tests/networking.nix b/third_party/nixpkgs/nixos/tests/networking.nix index 1ea61f99a9..c8756207f2 100644 --- a/third_party/nixpkgs/nixos/tests/networking.nix +++ b/third_party/nixpkgs/nixos/tests/networking.nix @@ -511,7 +511,7 @@ let machine.sleep(10) residue = machine.succeed("ip tuntap list") assert ( - residue is "" + residue == "" ), "Some virtual interface has not been properly cleaned:\n{}".format(residue) ''; }; @@ -665,10 +665,10 @@ let ipv4Residue = machine.succeed("ip -4 route list dev eth0 | head -n-3").strip() ipv6Residue = machine.succeed("ip -6 route list dev eth0 | head -n-3").strip() assert ( - ipv4Residue is "" + ipv4Residue == "" ), "The IPv4 routing table has not been properly cleaned:\n{}".format(ipv4Residue) assert ( - ipv6Residue is "" + ipv6Residue == "" ), "The IPv6 routing table has not been properly cleaned:\n{}".format(ipv6Residue) ''; }; diff --git a/third_party/nixpkgs/nixos/tests/nfs/kerberos.nix b/third_party/nixpkgs/nixos/tests/nfs/kerberos.nix index 75d1210496..5684131f67 100644 --- a/third_party/nixpkgs/nixos/tests/nfs/kerberos.nix +++ b/third_party/nixpkgs/nixos/tests/nfs/kerberos.nix @@ -88,8 +88,8 @@ in "kdb5_util create -s -r NFS.TEST -P master_key", "systemctl restart kadmind.service kdc.service", ) - server.wait_for_unit(f"kadmind.service") - server.wait_for_unit(f"kdc.service") + server.wait_for_unit("kadmind.service") + server.wait_for_unit("kdc.service") # create principals server.succeed( @@ -102,8 +102,8 @@ in # add principals to server keytab server.succeed("kadmin.local ktadd nfs/server.nfs.test") server.succeed("systemctl start rpc-gssd.service rpc-svcgssd.service") - server.wait_for_unit(f"rpc-gssd.service") - server.wait_for_unit(f"rpc-svcgssd.service") + server.wait_for_unit("rpc-gssd.service") + server.wait_for_unit("rpc-svcgssd.service") client.wait_for_unit("network-online.target") diff --git a/third_party/nixpkgs/nixos/tests/nixos-generate-config.nix b/third_party/nixpkgs/nixos/tests/nixos-generate-config.nix index 7bf8d4da7b..1dadf4992e 100644 --- a/third_party/nixpkgs/nixos/tests/nixos-generate-config.nix +++ b/third_party/nixpkgs/nixos/tests/nixos-generate-config.nix @@ -14,7 +14,7 @@ import ./make-test-python.nix ({ lib, ... } : { system.nixos-generate-config.desktopConfiguration = ['' # DESKTOP services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome3.enable = true; + services.xserver.desktopManager.gnome.enable = true; '']; }; testScript = '' @@ -35,7 +35,7 @@ import ./make-test-python.nix ({ lib, ... } : { # Test if the Perl variable $desktopConfiguration is spliced correctly machine.succeed( - "grep 'services\\.xserver\\.desktopManager\\.gnome3\\.enable = true;' /etc/nixos/configuration.nix" + "grep 'services\\.xserver\\.desktopManager\\.gnome\\.enable = true;' /etc/nixos/configuration.nix" ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/nsd.nix b/third_party/nixpkgs/nixos/tests/nsd.nix index a558ee0a42..7387f4f1df 100644 --- a/third_party/nixpkgs/nixos/tests/nsd.nix +++ b/third_party/nixpkgs/nixos/tests/nsd.nix @@ -43,6 +43,10 @@ in import ./make-test-python.nix ({ pkgs, ...} : { services.nsd.enable = true; services.nsd.rootServer = true; services.nsd.interfaces = lib.mkForce []; + services.nsd.keys."tsig.example.com." = { + algorithm = "hmac-sha256"; + keyFile = pkgs.writeTextFile { name = "tsig.example.com."; text = "aR3FJA92+bxRSyosadsJ8Aeeav5TngQW/H/EF9veXbc="; }; + }; services.nsd.zones."example.com.".data = '' @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600 ipv4 A 1.2.3.4 @@ -51,6 +55,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { ns A 192.168.0.1 ns AAAA dead:beef::1 ''; + services.nsd.zones."example.com.".provideXFR = [ "0.0.0.0 tsig.example.com." ]; services.nsd.zones."deleg.example.com.".data = '' @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600 @ A 9.8.7.6 @@ -71,6 +76,10 @@ in import ./make-test-python.nix ({ pkgs, ...} : { clientv6.wait_for_unit("network.target") server.wait_for_unit("nsd.service") + with subtest("server tsig.example.com."): + expected_tsig = " secret: \"aR3FJA92+bxRSyosadsJ8Aeeav5TngQW/H/EF9veXbc=\"\n" + tsig=server.succeed("cat /var/lib/nsd/private/tsig.example.com.") + assert expected_tsig == tsig, f"Expected /var/lib/nsd/private/tsig.example.com. to contain '{expected_tsig}', but found '{tsig}'" def assert_host(type, rr, query, expected): self = clientv4 if type == 4 else clientv6 diff --git a/third_party/nixpkgs/nixos/tests/oci-containers.nix b/third_party/nixpkgs/nixos/tests/oci-containers.nix index 0dfc7ffb27..68077e3540 100644 --- a/third_party/nixpkgs/nixos/tests/oci-containers.nix +++ b/third_party/nixpkgs/nixos/tests/oci-containers.nix @@ -12,7 +12,7 @@ let name = "oci-containers-${backend}"; meta = { - maintainers = with lib.maintainers; [ adisbladis benley mkaito ]; + maintainers = with lib.maintainers; [ adisbladis benley ] ++ lib.teams.serokell.members; }; nodes = { diff --git a/third_party/nixpkgs/nixos/tests/opensmtpd-rspamd.nix b/third_party/nixpkgs/nixos/tests/opensmtpd-rspamd.nix new file mode 100644 index 0000000000..9cb2624e6c --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/opensmtpd-rspamd.nix @@ -0,0 +1,142 @@ +import ./make-test-python.nix { + name = "opensmtpd-rspamd"; + + nodes = { + smtp1 = { pkgs, ... }: { + imports = [ common/user-account.nix ]; + networking = { + firewall.allowedTCPPorts = [ 25 143 ]; + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.1"; prefixLength = 24; } + ]; + }; + environment.systemPackages = [ pkgs.opensmtpd ]; + services.opensmtpd = { + enable = true; + extraServerArgs = [ "-v" ]; + serverConfiguration = '' + listen on 0.0.0.0 + action dovecot_deliver mda \ + "${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}" + match from any for local action dovecot_deliver + + action do_relay relay + # DO NOT DO THIS IN PRODUCTION! + # Setting up authentication requires a certificate which is painful in + # a test environment, but THIS WOULD BE DANGEROUS OUTSIDE OF A + # WELL-CONTROLLED ENVIRONMENT! + match from any for any action do_relay + ''; + }; + services.dovecot2 = { + enable = true; + enableImap = true; + mailLocation = "maildir:~/mail"; + protocols = [ "imap" ]; + }; + }; + + smtp2 = { pkgs, ... }: { + imports = [ common/user-account.nix ]; + virtualisation.memorySize = 512; + networking = { + firewall.allowedTCPPorts = [ 25 143 ]; + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.2"; prefixLength = 24; } + ]; + }; + environment.systemPackages = [ pkgs.opensmtpd ]; + services.rspamd = { + enable = true; + locals."worker-normal.inc".text = '' + bind_socket = "127.0.0.1:11333"; + ''; + }; + services.opensmtpd = { + enable = true; + extraServerArgs = [ "-v" ]; + serverConfiguration = '' + filter rspamd proc-exec "${pkgs.opensmtpd-filter-rspamd}/bin/filter-rspamd" + listen on 0.0.0.0 filter rspamd + action dovecot_deliver mda \ + "${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}" + match from any for local action dovecot_deliver + ''; + }; + services.dovecot2 = { + enable = true; + enableImap = true; + mailLocation = "maildir:~/mail"; + protocols = [ "imap" ]; + }; + }; + + client = { pkgs, ... }: { + networking = { + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.3"; prefixLength = 24; } + ]; + }; + environment.systemPackages = let + sendTestMail = pkgs.writeScriptBin "send-a-test-mail" '' + #!${pkgs.python3.interpreter} + import smtplib, sys + + with smtplib.SMTP('192.168.1.1') as smtp: + smtp.sendmail('alice@[192.168.1.1]', 'bob@[192.168.1.2]', """ + From: alice@smtp1 + To: bob@smtp2 + Subject: Test + + Hello World + Here goes the spam test + XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X + """) + ''; + + checkMailBounced = pkgs.writeScriptBin "check-mail-bounced" '' + #!${pkgs.python3.interpreter} + import imaplib + + with imaplib.IMAP4('192.168.1.1', 143) as imap: + imap.login('alice', 'foobar') + imap.select() + status, refs = imap.search(None, 'ALL') + assert status == 'OK' + assert len(refs) == 1 + status, msg = imap.fetch(refs[0], 'BODY[TEXT]') + assert status == 'OK' + content = msg[0][1] + print("===> content:", content) + assert b"An error has occurred while attempting to deliver a message" in content + ''; + in [ sendTestMail checkMailBounced ]; + }; + }; + + testScript = '' + start_all() + + client.wait_for_unit("network-online.target") + smtp1.wait_for_unit("opensmtpd") + smtp2.wait_for_unit("opensmtpd") + smtp2.wait_for_unit("rspamd") + smtp2.wait_for_unit("dovecot2") + + # To prevent sporadic failures during daemon startup, make sure + # services are listening on their ports before sending requests + smtp1.wait_for_open_port(25) + smtp2.wait_for_open_port(25) + smtp2.wait_for_open_port(143) + smtp2.wait_for_open_port(11333) + + client.succeed("send-a-test-mail") + smtp1.wait_until_fails("smtpctl show queue | egrep .") + client.succeed("check-mail-bounced >&2") + ''; + + meta.timeout = 1800; +} diff --git a/third_party/nixpkgs/nixos/tests/plotinus.nix b/third_party/nixpkgs/nixos/tests/plotinus.nix index 39a4234dbf..ddd6a4c119 100644 --- a/third_party/nixpkgs/nixos/tests/plotinus.nix +++ b/third_party/nixpkgs/nixos/tests/plotinus.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { { imports = [ ./common/x11.nix ]; programs.plotinus.enable = true; - environment.systemPackages = [ pkgs.gnome3.gnome-calculator pkgs.xdotool ]; + environment.systemPackages = [ pkgs.gnome.gnome-calculator pkgs.xdotool ]; }; testScript = '' diff --git a/third_party/nixpkgs/nixos/tests/printing.nix b/third_party/nixpkgs/nixos/tests/printing.nix index 6a1801fb28..b2f2540fb7 100644 --- a/third_party/nixpkgs/nixos/tests/printing.nix +++ b/third_party/nixpkgs/nixos/tests/printing.nix @@ -50,7 +50,6 @@ in { testScript = '' import os import re - import sys start_all() diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix index 2b17d0ff78..e3bfff218a 100644 --- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -302,7 +302,7 @@ let url = "http://localhost"; configFile = pkgs.writeText "json-exporter-conf.json" (builtins.toJSON { metrics = [ - { name = "json_test_metric"; path = "$.test"; } + { name = "json_test_metric"; path = "{ .test }"; } ]; }); }; @@ -326,6 +326,57 @@ let ''; }; + kea = { + exporterConfig = { + enable = true; + controlSocketPaths = [ + "/run/kea/kea-dhcp6.sock" + ]; + }; + metricProvider = { + users.users.kea = { + isSystemUser = true; + }; + users.groups.kea = {}; + + systemd.services.prometheus-kea-exporter.after = [ "kea-dhcp6.service" ]; + + systemd.services.kea-dhcp6 = let + configFile = pkgs.writeText "kea-dhcp6.conf" (builtins.toJSON { + Dhcp6 = { + "control-socket" = { + "socket-type" = "unix"; + "socket-name" = "/run/kea/kea-dhcp6.sock"; + }; + }; + }); + in + { + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + DynamicUser = false; + User = "kea"; + Group = "kea"; + ExecStart = "${pkgs.kea}/bin/kea-dhcp6 -c ${configFile}"; + StateDirectory = "kea"; + RuntimeDirectory = "kea"; + UMask = "0007"; + }; + }; + }; + exporterTest = '' + wait_for_unit("kea-dhcp6.service") + wait_for_file("/run/kea/kea-dhcp6.sock") + wait_for_unit("prometheus-kea-exporter.service") + wait_for_open_port(9547) + succeed( + "curl --fail localhost:9547/metrics | grep 'packets_received_total'" + ) + ''; + }; + knot = { exporterConfig = { enable = true; @@ -406,8 +457,8 @@ let }; metricProvider = { systemd.services.prometheus-lnd-exporter.serviceConfig.DynamicUser = false; - services.bitcoind.enable = true; - services.bitcoind.extraConfig = '' + services.bitcoind.main.enable = true; + services.bitcoind.main.extraConfig = '' rpcauth=bitcoinrpc:e8fe33f797e698ac258c16c8d7aadfbe$872bdb8f4d787367c26bcfd75e6c23c4f19d44a69f5d1ad329e5adf3f82710f7 bitcoind.zmqpubrawblock=tcp://127.0.0.1:28332 bitcoind.zmqpubrawtx=tcp://127.0.0.1:28333 @@ -1021,7 +1072,7 @@ let # Note: this does not connect the test environment to the Tor network. # Client, relay, bridge or exit connectivity are disabled by default. services.tor.enable = true; - services.tor.controlPort = 9051; + services.tor.settings.ControlPort = 9051; }; exporterTest = '' wait_for_unit("tor.service") diff --git a/third_party/nixpkgs/nixos/tests/radicale.nix b/third_party/nixpkgs/nixos/tests/radicale.nix index 1d3679c82a..5101628a68 100644 --- a/third_party/nixpkgs/nixos/tests/radicale.nix +++ b/third_party/nixpkgs/nixos/tests/radicale.nix @@ -1,140 +1,95 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: + let user = "someuser"; password = "some_password"; - port = builtins.toString 5232; + port = "5232"; + filesystem_folder = "/data/radicale"; - common = { pkgs, ... }: { + cli = "${pkgs.calendar-cli}/bin/calendar-cli --caldav-user ${user} --caldav-pass ${password}"; +in { + name = "radicale3"; + meta.maintainers = with lib.maintainers; [ dotlambda ]; + + machine = { pkgs, ... }: { services.radicale = { enable = true; - config = '' - [auth] - type = htpasswd - htpasswd_filename = /etc/radicale/htpasswd - htpasswd_encryption = bcrypt - - [storage] - filesystem_folder = /tmp/collections - ''; + settings = { + auth = { + type = "htpasswd"; + htpasswd_filename = "/etc/radicale/users"; + htpasswd_encryption = "bcrypt"; + }; + storage = { + inherit filesystem_folder; + hook = "git add -A && (git diff --cached --quiet || git commit -m 'Changes by '%(user)s)"; + }; + logging.level = "info"; + }; + rights = { + principal = { + user = ".+"; + collection = "{user}"; + permissions = "RW"; + }; + calendars = { + user = ".+"; + collection = "{user}/[^/]+"; + permissions = "rw"; + }; + }; }; + systemd.services.radicale.path = [ pkgs.git ]; + environment.systemPackages = [ pkgs.git ]; + systemd.tmpfiles.rules = [ "d ${filesystem_folder} 0750 radicale radicale -" ]; # WARNING: DON'T DO THIS IN PRODUCTION! # This puts unhashed secrets directly into the Nix store for ease of testing. - environment.etc."radicale/htpasswd".source = pkgs.runCommand "htpasswd" {} '' + environment.etc."radicale/users".source = pkgs.runCommand "htpasswd" {} '' ${pkgs.apacheHttpd}/bin/htpasswd -bcB "$out" ${user} ${password} ''; }; + testScript = '' + machine.wait_for_unit("radicale.service") + machine.wait_for_open_port(${port}) -in + machine.succeed("sudo -u radicale git -C ${filesystem_folder} init") + machine.succeed( + "sudo -u radicale git -C ${filesystem_folder} config --local user.email radicale@example.com" + ) + machine.succeed( + "sudo -u radicale git -C ${filesystem_folder} config --local user.name radicale" + ) - import ./make-test-python.nix ({ lib, ... }@args: { - name = "radicale"; - meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ]; + with subtest("Test calendar and event creation"): + machine.succeed( + "${cli} --caldav-url http://localhost:${port}/${user} calendar create cal" + ) + machine.succeed("test -d ${filesystem_folder}/collection-root/${user}/cal") + machine.succeed('test -z "$(ls ${filesystem_folder}/collection-root/${user}/cal)"') + machine.succeed( + "${cli} --caldav-url http://localhost:${port}/${user}/cal calendar add 2021-04-23 testevent" + ) + machine.succeed('test -n "$(ls ${filesystem_folder}/collection-root/${user}/cal)"') + (status, stdout) = machine.execute( + "sudo -u radicale git -C ${filesystem_folder} log --format=oneline | wc -l" + ) + assert status == 0, "git log failed" + assert stdout == "3\n", "there should be exactly 3 commits" - nodes = rec { - radicale = radicale1; # Make the test script read more nicely - radicale1 = lib.recursiveUpdate (common args) { - nixpkgs.overlays = [ - (self: super: { - radicale1 = super.radicale1.overrideAttrs (oldAttrs: { - propagatedBuildInputs = with self.pythonPackages; - (oldAttrs.propagatedBuildInputs or []) ++ [ passlib ]; - }); - }) - ]; - system.stateVersion = "17.03"; - }; - radicale1_export = lib.recursiveUpdate radicale1 { - services.radicale.extraArgs = [ - "--export-storage" "/tmp/collections-new" - ]; - system.stateVersion = "17.03"; - }; - radicale2_verify = lib.recursiveUpdate radicale2 { - services.radicale.extraArgs = [ "--debug" "--verify-storage" ]; - system.stateVersion = "17.09"; - }; - radicale2 = lib.recursiveUpdate (common args) { - system.stateVersion = "17.09"; - }; - radicale3 = lib.recursiveUpdate (common args) { - system.stateVersion = "20.09"; - }; - }; + with subtest("Test rights file"): + machine.fail( + "${cli} --caldav-url http://localhost:${port}/${user} calendar create sub/cal" + ) + machine.fail( + "${cli} --caldav-url http://localhost:${port}/otheruser calendar create cal" + ) - # This tests whether the web interface is accessible to an authenticated user - testScript = { nodes }: let - switchToConfig = nodeName: let - newSystem = nodes.${nodeName}.config.system.build.toplevel; - in "${newSystem}/bin/switch-to-configuration test"; - in '' - with subtest("Check Radicale 1 functionality"): - radicale.succeed( - "${switchToConfig "radicale1"} >&2" - ) - radicale.wait_for_unit("radicale.service") - radicale.wait_for_open_port(${port}) - radicale.succeed( - "curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/" - ) + with subtest("Test web interface"): + machine.succeed("curl --fail http://${user}:${password}@localhost:${port}/.web/") - with subtest("Export data in Radicale 2 format"): - radicale.succeed("systemctl stop radicale") - radicale.succeed("ls -al /tmp/collections") - radicale.fail("ls -al /tmp/collections-new") - - with subtest("Radicale exits immediately after exporting storage"): - radicale.succeed( - "${switchToConfig "radicale1_export"} >&2" - ) - radicale.wait_until_fails("systemctl status radicale") - radicale.succeed("ls -al /tmp/collections") - radicale.succeed("ls -al /tmp/collections-new") - - with subtest("Verify data in Radicale 2 format"): - radicale.succeed("rm -r /tmp/collections/${user}") - radicale.succeed("mv /tmp/collections-new/collection-root /tmp/collections") - radicale.succeed( - "${switchToConfig "radicale2_verify"} >&2" - ) - radicale.wait_until_fails("systemctl status radicale") - - (retcode, logs) = radicale.execute("journalctl -u radicale -n 10") - assert ( - retcode == 0 and "Verifying storage" in logs - ), "Radicale 2 didn't verify storage" - assert ( - "failed" not in logs and "exception" not in logs - ), "storage verification failed" - - with subtest("Check Radicale 2 functionality"): - radicale.succeed( - "${switchToConfig "radicale2"} >&2" - ) - radicale.wait_for_unit("radicale.service") - radicale.wait_for_open_port(${port}) - - (retcode, output) = radicale.execute( - "curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/" - ) - assert ( - retcode == 0 and "VCALENDAR" in output - ), "Could not read calendar from Radicale 2" - - radicale.succeed("curl --fail http://${user}:${password}@localhost:${port}/.web/") - - with subtest("Check Radicale 3 functionality"): - radicale.succeed( - "${switchToConfig "radicale3"} >&2" - ) - radicale.wait_for_unit("radicale.service") - radicale.wait_for_open_port(${port}) - - (retcode, output) = radicale.execute( - "curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/" - ) - assert ( - retcode == 0 and "VCALENDAR" in output - ), "Could not read calendar from Radicale 3" - - radicale.succeed("curl --fail http://${user}:${password}@localhost:${port}/.web/") - ''; + with subtest("Test security"): + output = machine.succeed("systemd-analyze security radicale.service") + machine.log(output) + assert output[-9:-1] == "SAFE :-}" + ''; }) diff --git a/third_party/nixpkgs/nixos/tests/shadow.nix b/third_party/nixpkgs/nixos/tests/shadow.nix index c51961e1fc..dd2a575b19 100644 --- a/third_party/nixpkgs/nixos/tests/shadow.nix +++ b/third_party/nixpkgs/nixos/tests/shadow.nix @@ -36,9 +36,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: { with subtest("Normal login"): shadow.send_key("alt-f2") - shadow.wait_until_succeeds(f"[ $(fgconsole) = 2 ]") - shadow.wait_for_unit(f"getty@tty2.service") - shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty2'") + shadow.wait_until_succeeds("[ $(fgconsole) = 2 ]") + shadow.wait_for_unit("getty@tty2.service") + shadow.wait_until_succeeds("pgrep -f 'agetty.*tty2'") shadow.wait_until_tty_matches(2, "login: ") shadow.send_chars("emma\n") shadow.wait_until_tty_matches(2, "login: emma") @@ -60,9 +60,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: { with subtest("Change password"): shadow.send_key("alt-f3") - shadow.wait_until_succeeds(f"[ $(fgconsole) = 3 ]") - shadow.wait_for_unit(f"getty@tty3.service") - shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty3'") + shadow.wait_until_succeeds("[ $(fgconsole) = 3 ]") + shadow.wait_for_unit("getty@tty3.service") + shadow.wait_until_succeeds("pgrep -f 'agetty.*tty3'") shadow.wait_until_tty_matches(3, "login: ") shadow.send_chars("emma\n") shadow.wait_until_tty_matches(3, "login: emma") @@ -78,9 +78,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: { shadow.send_chars("${password3}\n") shadow.sleep(2) shadow.send_key("alt-f4") - shadow.wait_until_succeeds(f"[ $(fgconsole) = 4 ]") - shadow.wait_for_unit(f"getty@tty4.service") - shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty4'") + shadow.wait_until_succeeds("[ $(fgconsole) = 4 ]") + shadow.wait_for_unit("getty@tty4.service") + shadow.wait_until_succeeds("pgrep -f 'agetty.*tty4'") shadow.wait_until_tty_matches(4, "login: ") shadow.send_chars("emma\n") shadow.wait_until_tty_matches(4, "login: emma") @@ -106,9 +106,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: { with subtest("nologin shell"): shadow.send_key("alt-f5") - shadow.wait_until_succeeds(f"[ $(fgconsole) = 5 ]") - shadow.wait_for_unit(f"getty@tty5.service") - shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty5'") + shadow.wait_until_succeeds("[ $(fgconsole) = 5 ]") + shadow.wait_for_unit("getty@tty5.service") + shadow.wait_until_succeeds("pgrep -f 'agetty.*tty5'") shadow.wait_until_tty_matches(5, "login: ") shadow.send_chars("layla\n") shadow.wait_until_tty_matches(5, "login: layla") diff --git a/third_party/nixpkgs/nixos/tests/signal-desktop.nix b/third_party/nixpkgs/nixos/tests/signal-desktop.nix index c424288e00..42485cd0da 100644 --- a/third_party/nixpkgs/nixos/tests/signal-desktop.nix +++ b/third_party/nixpkgs/nixos/tests/signal-desktop.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "signal-desktop"; meta = with pkgs.lib.maintainers; { - maintainers = [ flokli ]; + maintainers = [ flokli primeos ]; }; machine = { ... }: @@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ...} : services.xserver.enable = true; test-support.displayManager.auto.user = "alice"; - environment.systemPackages = [ pkgs.signal-desktop ]; + environment.systemPackages = with pkgs; [ signal-desktop file ]; virtualisation.memorySize = 1024; }; @@ -39,5 +39,16 @@ import ./make-test-python.nix ({ pkgs, ...} : machine.wait_for_text("Signal") machine.wait_for_text("File Edit View Window Help") machine.screenshot("signal_desktop") + + # Test if the database is encrypted to prevent these issues: + # - https://github.com/NixOS/nixpkgs/issues/108772 + # - https://github.com/NixOS/nixpkgs/pull/117555 + print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'")) + machine.succeed( + "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep 'db.sqlite: data'" + ) + machine.fail( + "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -e SQLite -e database" + ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/sudo.nix b/third_party/nixpkgs/nixos/tests/sudo.nix index 2a85c49066..4885d6e17b 100644 --- a/third_party/nixpkgs/nixos/tests/sudo.nix +++ b/third_party/nixpkgs/nixos/tests/sudo.nix @@ -10,7 +10,7 @@ in maintainers = [ lschuermann ]; }; - machine = + nodes.machine = { lib, ... }: with lib; { @@ -48,6 +48,19 @@ in }; }; + nodes.strict = { ... }: { + users.users = { + admin = { isNormalUser = true; extraGroups = [ "wheel" ]; }; + noadmin = { isNormalUser = true; }; + }; + + security.sudo = { + enable = true; + wheelNeedsPassword = false; + execWheelOnly = true; + }; + }; + testScript = '' with subtest("users in wheel group should have passwordless sudo"): @@ -79,5 +92,11 @@ in with subtest("users in group 'barfoo' should not be able to keep their environment"): machine.fail("sudo -u test3 sudo -n -E -u root true") + + with subtest("users in wheel should be able to run sudo despite execWheelOnly"): + strict.succeed('su - admin -c "sudo -u root true"') + + with subtest("non-wheel users should be unable to run sudo thanks to execWheelOnly"): + strict.fail('su - noadmin -c "sudo --help"') ''; }) diff --git a/third_party/nixpkgs/nixos/tests/sway.nix b/third_party/nixpkgs/nixos/tests/sway.nix new file mode 100644 index 0000000000..1d23b0e943 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/sway.nix @@ -0,0 +1,106 @@ +import ./make-test-python.nix ({ pkgs, lib, ...} : + +{ + name = "sway"; + meta = { + maintainers = with lib.maintainers; [ primeos synthetica ]; + }; + + machine = { config, ... }: { + # Automatically login on tty1 as a normal user: + imports = [ ./common/user-account.nix ]; + services.getty.autologinUser = "alice"; + + environment = { + # For glinfo and wayland-info: + systemPackages = with pkgs; [ mesa-demos wayland-utils ]; + # Use a fixed SWAYSOCK path (for swaymsg): + variables."SWAYSOCK" = "/tmp/sway-ipc.sock"; + # For convenience: + shellAliases = { + test-x11 = "glinfo | head -n 3 | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok"; + test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok"; + }; + }; + + # Automatically configure and start Sway when logging in on tty1: + programs.bash.loginShellInit = '' + if [ "$(tty)" = "/dev/tty1" ]; then + set -e + + mkdir -p ~/.config/sway + sed s/Mod4/Mod1/ /etc/sway/config > ~/.config/sway/config + + sway --validate + sway && touch /tmp/sway-exit-ok + fi + ''; + + programs.sway.enable = true; + + # To test pinentry via gpg-agent: + programs.gnupg.agent.enable = true; + + virtualisation.memorySize = 1024; + # Need to switch to a different VGA card / GPU driver than the default one (std) so that Sway can launch: + virtualisation.qemu.options = [ "-vga virtio" ]; + }; + + enableOCR = true; + + testScript = { nodes, ... }: '' + start_all() + machine.wait_for_unit("multi-user.target") + + # To check the version: + print(machine.succeed("sway --version")) + + # Wait for Sway to complete startup: + machine.wait_for_file("/run/user/1000/wayland-1") + machine.wait_for_file("/tmp/sway-ipc.sock") + + # Test XWayland: + machine.succeed( + "su - alice -c 'swaymsg exec WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty'" + ) + machine.wait_for_text("alice@machine") + machine.send_chars("test-x11\n") + machine.wait_for_file("/tmp/test-x11-exit-ok") + print(machine.succeed("cat /tmp/test-x11.out")) + machine.screenshot("alacritty_glinfo") + machine.succeed("pkill alacritty") + + # Start a terminal (Alacritty) on workspace 3: + machine.send_key("alt-3") + machine.succeed( + "su - alice -c 'swaymsg exec WINIT_UNIX_BACKEND=wayland DISPLAY=invalid alacritty'" + ) + machine.wait_for_text("alice@machine") + machine.send_chars("test-wayland\n") + machine.wait_for_file("/tmp/test-wayland-exit-ok") + print(machine.succeed("cat /tmp/test-wayland.out")) + machine.screenshot("alacritty_wayland_info") + machine.send_key("alt-shift-q") + machine.wait_until_fails("pgrep alacritty") + + # Test gpg-agent starting pinentry-gnome3 via D-Bus (tests if + # $WAYLAND_DISPLAY is correctly imported into the D-Bus user env): + machine.succeed( + "su - alice -c 'swaymsg -- exec gpg --no-tty --yes --quick-generate-key test'" + ) + machine.wait_until_succeeds("pgrep --exact gpg") + machine.wait_for_text("Passphrase") + machine.screenshot("gpg_pinentry") + machine.send_key("alt-shift-q") + machine.wait_until_fails("pgrep --exact gpg") + + # Test swaynag: + machine.send_key("alt-shift-e") + machine.wait_for_text("You pressed the exit shortcut.") + machine.screenshot("sway_exit") + + # Exit Sway and verify process exit status 0: + machine.succeed("su - alice -c 'swaymsg exit || true'") + machine.wait_for_file("/tmp/sway-exit-ok") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/systemd-confinement.nix b/third_party/nixpkgs/nixos/tests/systemd-confinement.nix index d04e4a3f86..e6a308f46d 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-confinement.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-confinement.nix @@ -59,7 +59,8 @@ import ./make-test-python.nix { "chroot-exec chown 65534 /bin", ) machine.succeed( - 'test "$(chroot-exec id -u)" = 0', "chroot-exec chown 0 /bin", + 'test "$(chroot-exec id -u)" = 0', + "chroot-exec chown 0 /bin", ) ''; } diff --git a/third_party/nixpkgs/nixos/tests/systemd-networkd.nix b/third_party/nixpkgs/nixos/tests/systemd-networkd.nix index 4f2cb75f5a..7faeae3704 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-networkd.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-networkd.nix @@ -6,7 +6,6 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { networking.firewall.enable = false; virtualisation.vlans = [ 1 ]; environment.systemPackages = with pkgs; [ wireguard-tools ]; - boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ]; systemd.network = { enable = true; netdevs = { diff --git a/third_party/nixpkgs/nixos/tests/unbound.nix b/third_party/nixpkgs/nixos/tests/unbound.nix index e24c3ef6c9..fcfa222299 100644 --- a/third_party/nixpkgs/nixos/tests/unbound.nix +++ b/third_party/nixpkgs/nixos/tests/unbound.nix @@ -192,7 +192,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: testScript = { nodes, ... }: '' import typing - import json zone = "example.local." records = [("AAAA", "abcd::eeff"), ("A", "1.2.3.4")] diff --git a/third_party/nixpkgs/nixos/tests/v2ray.nix b/third_party/nixpkgs/nixos/tests/v2ray.nix index f1b2570cc8..4808e149d3 100644 --- a/third_party/nixpkgs/nixos/tests/v2ray.nix +++ b/third_party/nixpkgs/nixos/tests/v2ray.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let v2rayUser = { # A random UUID. id = "a6a46834-2150-45f8-8364-0f6f6ab32384"; - alterId = 4; + alterId = 0; # Non-zero support will be disabled in the future. }; # 1080 [http proxy] -> 1081 [vmess] -> direct diff --git a/third_party/nixpkgs/nixos/tests/virtualbox.nix b/third_party/nixpkgs/nixos/tests/virtualbox.nix index 0a7369b0fa..09314d93b7 100644 --- a/third_party/nixpkgs/nixos/tests/virtualbox.nix +++ b/third_party/nixpkgs/nixos/tests/virtualbox.nix @@ -226,18 +226,16 @@ let def create_vm_${name}(): - # fmt: off - vbm(f"createvm --name ${name} ${createFlags}") - vbm(f"modifyvm ${name} ${vmFlags}") - vbm(f"setextradata ${name} VBoxInternal/PDM/HaltOnReset 1") - vbm(f"storagectl ${name} ${controllerFlags}") - vbm(f"storageattach ${name} ${diskFlags}") - vbm(f"sharedfolder add ${name} ${sharedFlags}") - vbm(f"sharedfolder add ${name} ${nixstoreFlags}") + vbm("createvm --name ${name} ${createFlags}") + vbm("modifyvm ${name} ${vmFlags}") + vbm("setextradata ${name} VBoxInternal/PDM/HaltOnReset 1") + vbm("storagectl ${name} ${controllerFlags}") + vbm("storageattach ${name} ${diskFlags}") + vbm("sharedfolder add ${name} ${sharedFlags}") + vbm("sharedfolder add ${name} ${nixstoreFlags}") cleanup_${name}() ${mkLog "$HOME/VirtualBox VMs/${name}/Logs/VBox.log" "HOST-${name}"} - # fmt: on def destroy_vm_${name}(): @@ -259,9 +257,7 @@ let def wait_for_ip_${name}(interface): property = f"/VirtualBox/GuestInfo/Net/{interface}/V4/IP" - # fmt: off getip = f"VBoxManage guestproperty get ${name} {property} | sed -n -e 's/^Value: //p'" - # fmt: on ip = machine.succeed( ru( @@ -394,9 +390,7 @@ let machine.wait_for_x() - # fmt: off ${mkLog "$HOME/.config/VirtualBox/VBoxSVC.log" "HOST-SVC"} - # fmt: on ${testScript} # (keep black happy) diff --git a/third_party/nixpkgs/nixos/tests/web-servers/unit-php.nix b/third_party/nixpkgs/nixos/tests/web-servers/unit-php.nix index 24d6f5f16a..c4e89f069f 100644 --- a/third_party/nixpkgs/nixos/tests/web-servers/unit-php.nix +++ b/third_party/nixpkgs/nixos/tests/web-servers/unit-php.nix @@ -34,7 +34,7 @@ in { }; users = { users.testuser = { - isNormalUser = false; + isSystemUser = true; uid = 1074; group = "testgroup"; }; diff --git a/third_party/nixpkgs/nixos/tests/wmderland.nix b/third_party/nixpkgs/nixos/tests/wmderland.nix index d121ed98b7..6de0cd9212 100644 --- a/third_party/nixpkgs/nixos/tests/wmderland.nix +++ b/third_party/nixpkgs/nixos/tests/wmderland.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "wmderland"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ takagiy ]; }; diff --git a/third_party/nixpkgs/nixos/tests/yggdrasil.nix b/third_party/nixpkgs/nixos/tests/yggdrasil.nix index 0b58ad29aa..0e75ed54db 100644 --- a/third_party/nixpkgs/nixos/tests/yggdrasil.nix +++ b/third_party/nixpkgs/nixos/tests/yggdrasil.nix @@ -147,7 +147,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { # If Alice can talk to Carol, then Bob's outbound peering and Carol's # local peering have succeeded and everybody is connected. alice.wait_until_succeeds(f"ping -c 1 {carol_ip6}") - alice.succeed(f"ping -c 1 ${bobIp6}") + alice.succeed("ping -c 1 ${bobIp6}") bob.succeed("ping -c 1 ${aliceIp6}") bob.succeed(f"ping -c 1 {carol_ip6}") diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/dasher/default.nix b/third_party/nixpkgs/pkgs/applications/accessibility/dasher/default.nix index fe0d8fe863..328ff2c5c5 100644 --- a/third_party/nixpkgs/pkgs/applications/accessibility/dasher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/accessibility/dasher/default.nix @@ -1,22 +1,33 @@ -{ stdenv, lib, fetchFromGitHub -, autoreconfHook, pkg-config, wrapGAppsHook -, glib, gtk3, expat, gnome-doc-utils, which -, at-spi2-core, dbus -, libxslt, libxml2 -, speechSupport ? true, speechd ? null +{ stdenv +, lib +, fetchFromGitLab +, autoreconfHook +, pkg-config +, wrapGAppsHook +, glib +, gtk3 +, expat +, itstool +, gnome-doc-utils +, which +, at-spi2-core +, dbus +, libxslt +, libxml2 +, speechSupport ? true +, speechd }: -assert speechSupport -> speechd != null; - stdenv.mkDerivation { pname = "dasher"; - version = "2018-04-03"; + version = "unstable-2021-04-25"; - src = fetchFromGitHub { - owner = "dasher-project"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; repo = "dasher"; - rev = "9ab12462e51d17a38c0ddc7f7ffe1cb5fe83b627"; - sha256 = "1r9xn966nx3pv2bidd6i3pxmprvlw6insnsb38zabmac609h9d9s"; + rev = "90c753b87564fa3f42cb2d04e1eb6662dc8e0f8f"; + sha256 = "sha256-aM05CV68pCRlhfIPyhuHWeRL+tDroB3fVsoX08OU8hY="; }; prePatch = '' @@ -33,23 +44,27 @@ stdenv.mkDerivation { # doc generation gnome-doc-utils which - libxslt libxml2 + libxslt + libxml2 ]; buildInputs = [ glib gtk3 expat + itstool # at-spi2 needs dbus to be recognized by pkg-config - at-spi2-core dbus + at-spi2-core + dbus ] ++ lib.optional speechSupport speechd; + enableParallelBuilding = true; + meta = { - homepage = "http://www.inference.org.uk/dasher/"; + homepage = "https://www.inference.org.uk/dasher/"; description = "Information-efficient text-entry interface, driven by natural continuous pointing gestures"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.Profpatsch ]; platforms = lib.platforms.all; }; - } diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix b/third_party/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix index 2ff36bb683..9e18904ff6 100644 --- a/third_party/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config -, glib, gtk3, gnome3, gsettings-desktop-schemas, wrapGAppsHook +, glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook , libX11, libXtst, libXfixes, libXcursor }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix b/third_party/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix index 08042a7701..71a0823f78 100644 --- a/third_party/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , glib , gtk3 , wayland @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "squeekboard"; - version = "unstable-2021-03-09"; + version = "1.13.0"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = pname; - rev = "bffd212e102bf71a94c599aac0359a8d30d19008"; - sha256 = "1j10zhyb8wyrcbryfj6f3drn9b0l9x0l7hnhy2imnjbfbnwwm4w7"; + rev = "v${version}"; + sha256 = "0xyd6ickbaqvrr8a7ak6j1ziqjk05jlnganjrdv43p74nnjyqr8y"; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cat Cargo.toml.in Cargo.deps > Cargo.toml ''; name = "${pname}-${version}"; - sha256 = "1qaqiaxqc4x2x5bd31na4c49vbjwrmz5clmgli7733dv55rxxias"; + sha256 = "096skk7vmr93axcf0qj7kyr8hm1faj0nkmd349g8mnzwd68a9npz"; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - gnome3.gnome-desktop + gnome.gnome-desktop wayland wayland-protocols libxml2 diff --git a/third_party/nixpkgs/pkgs/applications/audio/adlplug/default.nix b/third_party/nixpkgs/pkgs/applications/audio/adlplug/default.nix index ecc429de6b..8d396d7f2a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/adlplug/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/adlplug/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = src.meta.homepage; license = licenses.boost; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix index 1bbed0613c..0fee289021 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix @@ -15,6 +15,7 @@ , lilv , serd , sord +, sqlite , sratom , suil , alsaLib @@ -29,24 +30,26 @@ , soundtouch , pcre /*, portaudio - given up fighting their portaudio.patch */ , linuxHeaders -, at-spi2-core ? null -, dbus ? null -, epoxy ? null -, libXdmcp ? null -, libXtst ? null -, libpthreadstubs ? null -, libselinux ? null -, libsepol ? null -, libxkbcommon ? null -, utillinux ? null +, at-spi2-core +, dbus +, epoxy +, libXdmcp +, libXtst +, libpthreadstubs +, libselinux +, libsepol +, libxkbcommon +, util-linux }: # TODO -# - as of 3.0.2, GTK2 is still the recommended version ref https://www.audacityteam.org/download/source/ check if that changes in future versions -# - detach sbsms +# 1. as of 3.0.2, GTK2 is still the recommended version ref https://www.audacityteam.org/download/source/ check if that changes in future versions +# 2. detach sbsms let - wxGTK-audacity = wxGTK.overrideAttrs (oldAttrs: rec { + inherit (lib) optionals; + + wxGTK' = wxGTK.overrideAttrs (oldAttrs: rec { src = fetchFromGitHub { owner = "audacity"; repo = "wxWidgets"; @@ -55,6 +58,7 @@ let fetchSubmodules = true; }; }); + in stdenv.mkDerivation rec { pname = "audacity"; @@ -69,28 +73,21 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://github.com/audacity/audacity/commit/007852e51fcbb5f1f359d112f28b8984a604dac6.patch"; + url = "https://github.com/audacity/audacity/pull/831/commits/007852e51fcbb5f1f359d112f28b8984a604dac6.patch"; sha256 = "0zp2iydd46analda9cfnbmzdkjphz5m7dynrdj5qdnmq6j3px9fw"; name = "audacity_xdg_paths.patch"; }) ]; - # this file *should* be generated by cmake but as of 2.4.2 isn't yet postPatch = '' touch src/RevisionIdent.h - ''; - preConfigure = '' - substituteInPlace src/FileNames.cpp --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h + substituteInPlace src/FileNames.cpp \ + --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h ''; - # workaround for a broken cmake. Drop it with a later version to see if it works. - # https://github.com/NixOS/nixpkgs/issues/94905 - cmakeFlags = lib.optional stdenv.isLinux "-DCMAKE_OSX_ARCHITECTURES="; - # audacity only looks for ffmpeg at runtime, so we need to link it in manually NIX_LDFLAGS = toString [ - # ffmpeg "-lavcodec" "-lavdevice" "-lavfilter" @@ -107,7 +104,7 @@ stdenv.mkDerivation rec { gettext pkg-config python3 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ optionals stdenv.isLinux [ linuxHeaders ]; @@ -130,12 +127,13 @@ stdenv.mkDerivation rec { sord soundtouch soxr + sqlite sratom suil twolame - wxGTK-audacity - wxGTK-audacity.gtk - ] ++ lib.optionals stdenv.isLinux [ + wxGTK' + wxGTK'.gtk + ] ++ optionals stdenv.isLinux [ at-spi2-core dbus epoxy @@ -145,7 +143,7 @@ stdenv.mkDerivation rec { libxkbcommon libselinux libsepol - utillinux + util-linux ]; doCheck = false; # Test fails diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index fca3eaf223..b162586893 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk-pixbuf , wrapGAppsHook, gtk2, gtk3, harfbuzz, jdk, lib, xorg -, libbsd, libjack2, libpng, ffmpeg_3 +, libbsd, libjack2, libpng, ffmpeg , libxkbcommon , makeWrapper, pixman, autoPatchelfHook , xdg-utils, zenity, zlib }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; binPath = lib.makeBinPath [ - xdg-utils zenity ffmpeg_3 + xdg-utils zenity ffmpeg ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 28b5ef438e..93fa00b827 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, cairo, dpkg, freetype , gdk-pixbuf, glib, gtk3, lib, xorg -, libglvnd, libjack2, ffmpeg_3 +, libglvnd, libjack2, ffmpeg , libxkbcommon, xdg-utils, zlib, pulseaudio , wrapGAppsHook, makeWrapper }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; binPath = lib.makeBinPath [ - xdg-utils ffmpeg_3 + xdg-utils ffmpeg ]; ldLibraryPath = lib.strings.makeLibraryPath buildInputs; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cadence/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cadence/default.nix index 2d3ac0c314..62bf32eb71 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cadence/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cadence/default.nix @@ -98,7 +98,7 @@ mkDerivation rec { homepage = "https://github.com/falkTX/Cadence/"; description = "Collection of tools useful for audio production"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ worldofpeace ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix index 3d594a896c..45482c4de0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix @@ -54,12 +54,26 @@ let fstat = x: fn: "-DENABLE_${fn}=${if x then "ON" else "OFF"}"; - fstats = x: - map (fstat x); - withUdisks = (withTaglib && withDevices); - perl' = perl.withPackages (ppkgs: with ppkgs; [ URI ]); + options = [ + { names = [ "CDDB" ]; enable = withCddb; pkgs = [ libcddb ]; } + { names = [ "CDPARANOIA" ]; enable = withCdda; pkgs = [ cdparanoia ]; } + { names = [ "DEVICES_SUPPORT" ]; enable = withDevices; pkgs = [ ]; } + { names = [ "DYNAMIC" ]; enable = withDynamic; pkgs = [ ]; } + { names = [ "FFMPEG" "MPG123" "SPEEXDSP" ]; enable = withReplaygain; pkgs = [ ffmpeg speex mpg123 ]; } + { names = [ "HTTPS_SUPPORT" ]; enable = true; pkgs = [ ]; } + { names = [ "HTTP_SERVER" ]; enable = withHttpServer; pkgs = [ ]; } + { names = [ "HTTP_STREAM_PLAYBACK" ]; enable = withHttpStream; pkgs = [ qtmultimedia ]; } + { names = [ "LAME" ]; enable = withLame; pkgs = [ lame ]; } + { names = [ "LIBVLC" ]; enable = withLibVlc; pkgs = [ libvlc ]; } + { names = [ "MTP" ]; enable = withMtp; pkgs = [ libmtp ]; } + { names = [ "MUSICBRAINZ" ]; enable = withMusicbrainz; pkgs = [ libmusicbrainz5 ]; } + { names = [ "ONLINE_SERVICES" ]; enable = withOnlineServices; pkgs = [ ]; } + { names = [ "STREAMS" ]; enable = withStreams; pkgs = [ ]; } + { names = [ "TAGLIB" "TAGLIB_EXTRAS" ]; enable = withTaglib; pkgs = [ taglib taglib_extras ]; } + { names = [ "UDISKS2" ]; enable = withUdisks; pkgs = [ udisks2 ]; } + ]; in mkDerivation rec { @@ -84,38 +98,16 @@ mkDerivation rec { patchShebangs playlists ''; - buildInputs = [ qtbase qtsvg perl' ] - ++ lib.optionals withTaglib [ taglib taglib_extras ] - ++ lib.optionals withReplaygain [ ffmpeg speex mpg123 ] - ++ lib.optional withHttpStream qtmultimedia - ++ lib.optional withCdda cdparanoia - ++ lib.optional withCddb libcddb - ++ lib.optional withLame lame - ++ lib.optional withMtp libmtp - ++ lib.optional withMusicbrainz libmusicbrainz5 - ++ lib.optional withUdisks udisks2 - ++ lib.optional withLibVlc libvlc; + buildInputs = [ + qtbase + qtsvg + (perl.withPackages (ppkgs: with ppkgs; [ URI ])) + ] + ++ lib.flatten (builtins.catAttrs "pkgs" (builtins.filter (e: e.enable) options)); nativeBuildInputs = [ cmake pkg-config qttools ]; - cmakeFlags = lib.flatten [ - (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) - (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) - (fstat withHttpStream "HTTP_STREAM_PLAYBACK") - (fstat withCdda "CDPARANOIA") - (fstat withCddb "CDDB") - (fstat withLame "LAME") - (fstat withMtp "MTP") - (fstat withMusicbrainz "MUSICBRAINZ") - (fstat withOnlineServices "ONLINE_SERVICES") - (fstat withDynamic "DYNAMIC") - (fstat withDevices "DEVICES_SUPPORT") - (fstat withHttpServer "HTTP_SERVER") - (fstat withLibVlc "LIBVLC") - (fstat withStreams "STREAMS") - (fstat withUdisks "UDISKS2") - "-DENABLE_HTTPS_SUPPORT=ON" - ]; + cmakeFlags = lib.flatten (map (e: map (f: fstat e.enable f) e.names) options); meta = with lib; { description = "A graphical client for MPD"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix index d024128c82..b32eb1b627 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "cava"; - version = "0.7.3"; + version = "0.7.4"; buildInputs = [ alsaLib @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "karlstav"; repo = "cava"; rev = version; - sha256 = "04j5hb29hivcbk542sfsx9m57dbnj2s6qpvy9fs488zvgjbgxrai"; + sha256 = "sha256-BlHGst34aUgQcXcuQG43VnKUTclCxfQmWRa6iCud8dc="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix b/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix index b84b4e6aa9..0b82bbd8d8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm -, qtbase, qtx11extras +, qtbase, qtx11extras, qttools , taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf , qca2, pkg-config, sparsehash, config, makeWrapper, gst_plugins }: @@ -45,6 +45,7 @@ let qjson qtbase qtx11extras + qttools sqlite taglib ] diff --git a/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix index 79f78452c4..4cf91c698b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, libnotify, gdk-pixbuf }: stdenv.mkDerivation { - version = "2020-07-23"; + version = "2021-05-19"; pname = "cmusfm-unstable"; src = fetchFromGitHub { owner = "Arkq"; repo = "cmusfm"; - rev = "73df3e64d8aa3b5053b639615b8f81d512420e52"; - sha256 = "1p9i65v8hda9bsps4hm9m2b7aw9ivk4ncllg8svyp455gn5v8xx6"; + rev = "a1f9f37c5819ca8a5b48e6185c2ec7ad478b9f1a"; + sha256 = "19akgvh9gl99xvpmzgqv88w2mnnln7k6290dr5rn3h6a1ihvllaw"; }; # building configureFlags = [ "--enable-libnotify" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation { + Inside cmus run `:set status_display_program=cmusfm` to set up cmusfm ''; homepage = "https://github.com/Arkq/cmusfm/"; - maintainers = with lib.maintainers; [ CharlesHD ]; + maintainers = with lib.maintainers; [ CharlesHD mudri ]; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix index bcad36e2da..5eb71cbe04 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -12,7 +12,7 @@ , file , cairo , gettext -, gnome3 +, gnome }: python3Packages.buildPythonApplication rec { @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { gtk3 cairo gettext - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-good diff --git a/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix b/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix index 9eda633311..10b4256a85 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix @@ -17,7 +17,7 @@ , aacSupport ? true, faad2 ? null , opusSupport ? true, opusfile ? null , wavpackSupport ? false, wavpack ? null -, ffmpegSupport ? false, ffmpeg_3 ? null +, ffmpegSupport ? false, ffmpeg ? null , apeSupport ? true, yasm ? null # misc plugins , zipSupport ? true, libzip ? null @@ -45,7 +45,7 @@ assert cdaSupport -> (libcdio != null && libcddb != null); assert aacSupport -> faad2 != null; assert opusSupport -> opusfile != null; assert zipSupport -> libzip != null; -assert ffmpegSupport -> ffmpeg_3 != null; +assert ffmpegSupport -> ffmpeg != null; assert apeSupport -> yasm != null; assert artworkSupport -> imlib2 != null; assert hotkeysSupport -> libX11 != null; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ++ optional aacSupport faad2 ++ optional opusSupport opusfile ++ optional zipSupport libzip - ++ optional ffmpegSupport ffmpeg_3 + ++ optional ffmpegSupport ffmpeg ++ optional apeSupport yasm ++ optional artworkSupport imlib2 ++ optional hotkeysSupport libX11 diff --git a/third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix b/third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix index 4f3d2a6a4d..a07dca699d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "dragonfly-reverb"; - version = "3.2.1"; + version = "3.2.5"; src = fetchFromGitHub { owner = "michaelwillis"; repo = "dragonfly-reverb"; rev = version; - sha256 = "0vfm2510shah67k87mdyar4wr4vqwii59y9lqfhwm6blxparkrqa"; + sha256 = "14kia9wjs0nqfx4psnr3vf4x6hihkf80gb0mjzmdnnnk4cnrdydm"; fetchSubmodules = true; }; - patchPhase = '' + postPatch = '' patchShebangs dpf/utils/generate-ttl.sh ''; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall mkdir -p $out/bin mkdir -p $out/lib/lv2/ mkdir -p $out/lib/vst/ @@ -31,13 +32,14 @@ stdenv.mkDerivation rec { cp -a $bin-vst.so $out/lib/vst/ cp -a $bin.lv2/ $out/lib/lv2/ ; done + runHook postInstall ''; meta = with lib; { homepage = "https://github.com/michaelwillis/dragonfly-reverb"; description = "A hall-style reverb based on freeverb3 algorithms"; maintainers = [ maintainers.magnetophon ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = ["x86_64-linux"]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/easytag/default.nix b/third_party/nixpkgs/pkgs/applications/audio/easytag/default.nix index 65c871640e..d55fd7ff0c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/easytag/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/easytag/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, intltool, gtk3, glib, libid3tag, id3lib, taglib , libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas -, gnome3, wrapGAppsHook +, gnome, wrapGAppsHook }: let @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac - gsettings-desktop-schemas gnome3.adwaita-icon-theme + gsettings-desktop-schemas gnome.adwaita-icon-theme ]; doCheck = false; # fails 1 out of 9 tests passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix index 6524700ae1..a053dda46a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix @@ -8,8 +8,10 @@ , python3 , pkg-config , glib -, libhandy_0 +, libhandy , gtk3 +, appstream-glib +, desktop-file-utils , dbus , openssl , sqlite @@ -19,20 +21,20 @@ stdenv.mkDerivation rec { pname = "gnome-podcasts"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "podcasts"; rev = version; - sha256 = "0y2332zjq7vf1v38wzwz98fs19vpzy9kl7y0xbdzqr303l59hjb1"; + sha256 = "1ah59ac3xm3sqai8zhil8ar30pviw83cm8in1n4id77rv24xkvgm"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-GInRA/V61r42spb/JYlM8+mATSkmOxdm2zHPRWaKcck="; + sha256 = "1iihpfvkli09ysn46cnif53xizkwzk0m91bljmlzsygp3ip5i5yw"; }; nativeBuildInputs = [ @@ -49,9 +51,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + appstream-glib + desktop-file-utils glib gtk3 - libhandy_0 + libhandy dbus openssl sqlite diff --git a/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix index 229050654c..681c6ffe28 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3, python3Packages, intltool -, glibcLocales, gnome3, gtk3, wrapGAppsHook +, glibcLocales, gnome, gtk3, wrapGAppsHook , gobject-introspection }: @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 gobject-introspection - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; checkInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/gtkpod/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gtkpod/default.nix index f39558c157..61484bc2fb 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gtkpod/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gtkpod/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, intltool, libgpod, curl, flac, - gnome3, gtk3, gettext, perlPackages, flex, libid3tag, gdl, + gnome, gtk3, gettext, perlPackages, flex, libid3tag, gdl, libvorbis, gdk-pixbuf }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl gettext flex libgpod libid3tag flac libvorbis gtk3 gdk-pixbuf - gdl gnome3.adwaita-icon-theme gnome3.anjuta + gdl gnome.adwaita-icon-theme gnome.anjuta ] ++ (with perlPackages; [ perl XMLParser ]); patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix b/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix index 7f41fa6c5f..f90cae115b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, fetchpatch , avahi , bluez , boost @@ -10,7 +11,7 @@ , glib , glib-networking , glibmm -, gnome3 +, gnome , gsettings-desktop-schemas , gtk3 , gtkmm3 @@ -41,13 +42,22 @@ in stdenv.mkDerivation rec { pname = "guitarix"; - version = "0.41.0"; + version = "0.42.1"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "0qsfbyrrpb3bbdyq68k28mjql7kglxh8nqcw9jvja28x6x9ik5a0"; + sha256 = "101c2hdpipj3s6rmva5wf3q9hfjv7bkyzi7s8sgaiys8f7h4czkr"; }; + patches = [ + (fetchpatch { + name = "guitarix-gcc11.patch"; + url = "https://github.com/brummer10/guitarix/commit/d8f003484c57d808682025dfb07a7a1fb848afdc.patch"; + stripLen = 1; + sha256 = "1qhlbf18cn6m9jdz3741nrdfqvznjna3daqmn9l10k5nd3asy4il"; + }) + ]; + nativeBuildInputs = [ gettext hicolor-icon-theme @@ -68,7 +78,7 @@ stdenv.mkDerivation rec { glib glib-networking.out glibmm - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas gtk3 gtkmm3 diff --git a/third_party/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix b/third_party/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix index bb92682b14..4bcda6c4d3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome3 +, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome , pkg-config, makeWrapper }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr - xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome3.zenity + xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome.zenity ]; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin install -Dm755 build/Helio $out/bin - wrapProgram $out/bin/Helio --prefix PATH ":" ${gnome3.zenity}/bin + wrapProgram $out/bin/Helio --prefix PATH ":" ${gnome.zenity}/bin mkdir -p $out/share cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share diff --git a/third_party/nixpkgs/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/third_party/nixpkgs/pkgs/applications/audio/kapitonov-plugins-pack/default.nix index 4409437ebf..6e5cc0d519 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/kapitonov-plugins-pack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/kapitonov-plugins-pack/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config -, boost, cairo, fftw, gnome3, ladspa-sdk, libxcb, lv2, xcbutilwm +, boost, cairo, fftw, gnome, ladspa-sdk, libxcb, lv2, xcbutilwm , zita-convolver, zita-resampler }: diff --git a/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix index 9ae05fb571..860a621847 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix @@ -106,7 +106,7 @@ python3.pkgs.buildPythonApplication rec { description = "A modern music player for GNOME"; homepage = "https://wiki.gnome.org/Apps/Lollypop"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ worldofpeace lovesegfault ]; + maintainers = with maintainers; [ lovesegfault ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix index 022b41007c..04d5bb0a6d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchFromGitHub , pkg-config +, xxd , cairo , fluidsynth , libX11 @@ -13,17 +14,17 @@ stdenv.mkDerivation rec { pname = "mamba"; - version = "1.8"; + version = "2.2"; src = fetchFromGitHub { owner = "brummer10"; repo = "Mamba"; rev = "v${version}"; - sha256 = "049gvdvvv3hkh1b47h0bia02g1p71agwh6g7q0n4yxz4d81b8kha"; + sha256 = "1885qxyfkpslzk0aaaaws0x73b10h9nbr04jkk7xhkya25gf280m"; fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config xxd ]; buildInputs = [ cairo fluidsynth libX11 libjack2 alsaLib liblo libsigcxx libsmf ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/midisheetmusic/default.nix b/third_party/nixpkgs/pkgs/applications/audio/midisheetmusic/default.nix index bff9e807b4..6a5626d98a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/midisheetmusic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/midisheetmusic/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation { description = "Convert MIDI Files to Piano Sheet Music for two hands"; homepage = "http://midisheetmusic.com"; license = licenses.gpl2; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix b/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix new file mode 100644 index 0000000000..9c49f26bb4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchurl +, bison +, flex +, which +, alsaLib +, libsndfile +, qt4 +, qscintilla +, libpulseaudio +, libjack2 +, audioBackend ? "pulse" # "pulse", "alsa", or "jack" +}: + +stdenv.mkDerivation rec { + pname = "miniaudicle"; + version = "1.3.5.2"; + + src = fetchurl { + url = "https://audicle.cs.princeton.edu/mini/release/files/miniAudicle-${version}.tgz"; + hash = "sha256-dakDz69uHbKZFj8z67CubmRXEQ5X6GuYqlCXXvLzqSI="; + }; + + sourceRoot = "miniAudicle-${version}/src"; + + postPatch = '' + substituteInPlace miniAudicle.pro \ + --replace "/usr/local" $out + ''; + + nativeBuildInputs = [ + bison + flex + which + ]; + + buildInputs = [ + alsaLib + libsndfile + qt4 + qscintilla + ] ++ lib.optional (audioBackend == "pulse") libpulseaudio + ++ lib.optional (audioBackend == "jack") libjack2; + + buildFlags = [ "linux-${audioBackend}" ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "A light-weight integrated development environment for the ChucK digital audio programming language"; + homepage = "https://audicle.cs.princeton.edu/mini/"; + downloadPage = "https://audicle.cs.princeton.edu/mini/linux/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + broken = stdenv.isDarwin; # not attempted + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/mousai/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mousai/default.nix index 502842c7aa..e705c3590a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mousai/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mousai/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "mousai"; - version = "0.3.1"; + version = "0.3.2"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "SeaDve"; repo = "Mousai"; rev = "v${version}"; - sha256 = "0x57dci0prhlj79h74yh79cazn48rn0bckz5j3z4njk4fwc3fvfx"; + sha256 = "sha256-sBB2kqlC+2qPgQinhGxY8lq9unxgQoOOhDP5o1pUWMo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/munt/default.nix b/third_party/nixpkgs/pkgs/applications/audio/munt/default.nix index 0efe034034..da8dcb0b0c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/munt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/munt/default.nix @@ -33,6 +33,6 @@ in mkDerivation rec { homepage = "http://munt.sourceforge.net/"; license = with licenses; [ lgpl21 gpl3 ]; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/muso/default.nix b/third_party/nixpkgs/pkgs/applications/audio/muso/default.nix index 436afac7df..67569ccfb9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/muso/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/muso/default.nix @@ -1,5 +1,5 @@ -{ lib, fetchFromGitHub, rustPlatform -, pkg-config, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, rustPlatform +, pkg-config, wrapGAppsHook, CoreServices }: rustPlatform.buildRustPackage rec { @@ -14,6 +14,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + buildInputs = lib.optional stdenv.isDarwin CoreServices; preConfigure = '' substituteInPlace lib/utils.rs \ diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix index f67169fd49..a37a81d92e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "0j4ax3yh0l8v5bd5i3ijd8ys27dcrh7byigjip52mw1qlqfnh8wk"; + sha256 = "04ws6xkqs0g5fkl11861vqxh6xr0z6k1z40ln0za7n38ra2mjgh0"; }; - cargoSha256 = "022q6rlac97dr6l7rd9xalgx0w257r364i1pij080qx8rk97msb9"; + cargoSha256 = "1ws7qr41pqz99cpcigw4bckiwz7l5kzi0dkfif7203v9zy57mmzi"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/openmpt123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/openmpt123/default.nix index 7f412d528d..a5ea91141c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/openmpt123/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.5.6"; + version = "0.5.8"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "sha256-F96ngrM0wUb0rNlIx8Mf/dKvyJnrNH6+Ab4WBup59Lg="; + sha256 = "sha256-KeLCEXS3P2fyul7naAjWLxgrEw5PcE7i2a6Cg5gtis0="; }; enableParallelBuilding = true; @@ -25,7 +25,7 @@ in stdenv.mkDerivation { description = "A cross-platform command-line based module file player"; homepage = "https://lib.openmpt.org/libopenmpt/"; license = licenses.bsd3; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/orca-c/default.nix b/third_party/nixpkgs/pkgs/applications/audio/orca-c/default.nix index 4cd5d52613..2c3a8fb139 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/orca-c/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/orca-c/default.nix @@ -1,31 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, portmidi }: +{ lib, stdenv, fetchgit, ncurses, portmidi }: stdenv.mkDerivation { pname = "orca-c"; - version = "git-2020-05-01"; + version = "git-2021-02-13"; - src = fetchFromGitHub { - owner = "hundredrabbits"; - repo = "Orca-c"; - rev = "d7a3b169c5ed0b06a9ad0fdb3057704da9a0b6ce"; - sha256 = "101y617a295hzwr98ykvza1sycxlk29kzxn2ybjwc718r0alkbzz"; + src = fetchgit { + url = "https://git.sr.ht/~rabbits/orca"; + rev = "5ba56ca67baae3db140f8b7a2b2fc46bbac5602f"; + sha256 = "sha256-bbIH0kyHRTcMGXV3WdBQIH1br0FyIzKKL88wqpGZ0NY="; }; buildInputs = [ ncurses portmidi ]; - patchPhase = '' + postPatch = '' patchShebangs tool ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin install build/orca $out/bin/orca + + runHook postInstall ''; meta = with lib; { description = "An esoteric programming language designed to quickly create procedural sequencers"; - homepage = "https://github.com/hundredrabbits/Orca-c"; + homepage = "https://git.sr.ht/~rabbits/orca"; license = licenses.mit; platforms = platforms.all; + maintainers = with maintainers; [ netcrns ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix index 31d9292675..c7f12a8df6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchpatch, lib, stdenv, pkg-config, intltool, libpulseaudio, -gtkmm3 , libcanberra-gtk3, gnome3, wrapGAppsHook }: +gtkmm3 , libcanberra-gtk3, gnome, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "pavucontrol"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { })]; buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 - gnome3.adwaita-icon-theme ]; + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix b/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix index 785c334e15..28d0ae6f5f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix @@ -1,4 +1,9 @@ -{ lib, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 +{ lib +, python3Packages +, fetchFromGitHub +, gettext +, chromaprint +, qt5 , enablePlayback ? true , gst_all_1 }: @@ -10,43 +15,45 @@ let else pythonPackages.pyqt5 ; -in pythonPackages.buildPythonApplication rec { +in +pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.5.6"; + version = "2.6.2"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "1mkbg44bm642mlpfxsdlw947var6a3sf9m6c897b4n0742hsdkbc"; + sha256 = "1dhkdzc3601rhg8pqljbv3dz7j0mx75brpfhlizhgwgv65qk3ifj"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] - ++ lib.optionals (pyqt5.multimediaEnabled) [ - qt5.qtmultimedia.bin - gst_all_1.gstreamer - gst_all_1.gst-vaapi - gst_all_1.gst-libav - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - ] + ++ lib.optionals (pyqt5.multimediaEnabled) [ + qt5.qtmultimedia.bin + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-vaapi + gst_all_1.gstreamer + ] ; propagatedBuildInputs = with pythonPackages; [ - pyqt5 - mutagen chromaprint - discid dateutil + discid + fasteners + mutagen + pyqt5 ]; # In order to spare double wrapping, we use: preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") '' - + lib.optionalString (pyqt5.multimediaEnabled) '' - makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - '' + + lib.optionalString (pyqt5.multimediaEnabled) '' + makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + '' ; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/pithos/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pithos/default.nix index 939b53c44f..01c969c3d8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pithos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pithos/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib -, wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection +, wrapGAppsHook, pythonPackages, gtk3, gnome, gobject-introspection , libnotify, libsecret, gst_all_1 }: pythonPackages.buildPythonApplication rec { @@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook ]; propagatedBuildInputs = - [ gtk3 gobject-introspection libnotify libsecret gnome3.adwaita-icon-theme ] ++ + [ gtk3 gobject-introspection libnotify libsecret gnome.adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ (with pythonPackages; [ pygobject3 pylast ]); diff --git a/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix b/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix index 738bf161cd..52e8b4f818 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk-pixbuf, librsvg, - tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme, +{ lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg, + tag ? "", xvfb-run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme, gst_all_1, withGstPlugins ? true, xineBackend ? false, xine-lib, withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false, @@ -20,9 +20,9 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook gettext ]; - checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb_run dbus.daemon glibcLocales ]); + checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb-run dbus.daemon glibcLocales ]); - buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] + buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] ++ (if xineBackend then [ xine-lib ] else with gst_all_1; [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); diff --git a/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix b/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix index 173741484f..65499f5863 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix @@ -6,7 +6,7 @@ , intltool , libpeas , libsoup -, gnome3 +, gnome , totem-pl-parser , tdb , json-glib @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { gtk3 libpeas totem-pl-parser - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gst_all_1.gstreamer gst_all_1.gst-plugins-base @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix index 153e52c82e..702f5c3982 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , libjack2, libsndfile, xorg, freetype, libxkbcommon -, cairo, glib, gnome3, flac, libogg, libvorbis, libopus +, cairo, glib, gnome, flac, libogg, libvorbis, libopus , cmake, pkg-config }: @@ -35,14 +35,14 @@ stdenv.mkDerivation rec { libxkbcommon cairo glib - gnome3.zenity + gnome.zenity freetype ]; nativeBuildInputs = [ cmake pkg-config ]; postPatch = '' substituteInPlace editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \ - --replace '"/usr/bin/zenity' '"${gnome3.zenity}/bin/zenity' + --replace '"/usr/bin/zenity' '"${gnome.zenity}/bin/zenity' ''; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix index 83af7985db..9eae394488 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, wrapGAppsHook, gettext -, python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: +, python3Packages, gnome, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools; @@ -24,7 +24,7 @@ in buildPythonApplication rec { buildInputs = [ glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas gtk3 gdk-pixbuf diff --git a/third_party/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix index 740757a639..c03b48c436 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix @@ -1,31 +1,61 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, gtk3, intltool, itstool, libxml2, brasero -, libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes -, gsettings-desktop-schemas, wrapGAppsHook }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, glib +, gtk3 +, itstool +, libxml2 +, brasero +, libcanberra-gtk3 +, gnome +, gst_all_1 +, libmusicbrainz5 +, libdiscid +, isocodes +, gsettings-desktop-schemas +, wrapGAppsHook +}: -let +stdenv.mkDerivation rec { pname = "sound-juicer"; - version = "3.24.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "19qg4xv0f9rkq34lragkmhii1llxsa87llbl28i759b0ks4f6sny"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "08d5d81rz9sj3m5paw8fwbgxmhlbr7bcjdzpmzj832qvg8smydxf"; }; - nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + itstool + libxml2 + wrapGAppsHook + ]; + buildInputs = [ - glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme - gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad + glib + gtk3 + brasero + libcanberra-gtk3 + gnome.adwaita-icon-theme + gsettings-desktop-schemas + libmusicbrainz5 + libdiscid + isocodes + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad gst_all_1.gst-libav ]; - NIX_CFLAGS_COMPILE="-Wno-error=format-nonliteral"; - passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; @@ -34,7 +64,7 @@ in stdenv.mkDerivation rec { description = "A Gnome CD Ripper"; homepage = "https://wiki.gnome.org/Apps/SoundJuicer"; maintainers = [ maintainers.bdimcheff ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix index 211e45f7b1..629cc4bd11 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "spotify-qt"; - version = "3.5"; + version = "3.6"; src = fetchFromGitHub { owner = "kraxarn"; repo = pname; rev = "v${version}"; - sha256 = "1bgd0q4sbbww3lbrx2zwgaz0sl7qh195s4kvgsq16gv7ij82bskn"; + sha256 = "mKHyE6ZffMYYRLMpzMX53chyJyWxhTAaGvtBI3l6wkI="; }; buildInputs = [ libxcb qtbase qtsvg ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix index 4014468eaf..8656deb2f6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome3 +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon }: @@ -139,7 +139,7 @@ stdenv.mkDerivation { librarypath="${lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix PATH : "${gnome3.zenity}/bin" + --prefix PATH : "${gnome.zenity}/bin" # fix Icon line in the desktop file (#48062) sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop" diff --git a/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix b/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix index 6bb3bef8a5..600ba95947 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix @@ -2,7 +2,7 @@ , alsaLib, flac, libmad, libvorbis, mpg123 , dsdSupport ? true , faad2Support ? true, faad2 -, ffmpegSupport ? true, ffmpeg_3 +, ffmpegSupport ? true, ffmpeg , opusSupport ? true, opusfile , resampleSupport ? true, soxr , sslSupport ? true, openssl @@ -35,7 +35,7 @@ in stdenv.mkDerivation { buildInputs = [ alsaLib flac libmad libvorbis mpg123 ] ++ optional faad2Support faad2 - ++ optional ffmpegSupport ffmpeg_3 + ++ optional ffmpegSupport ffmpeg ++ optional opusSupport opusfile ++ optional resampleSupport soxr ++ optional sslSupport openssl; diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix index 76ed0e9cc1..c8ffba2c2a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix @@ -82,10 +82,6 @@ mkDerivation rec { util-linux ]; - cmakeFlags = [ - "-DUSE_SYSTEM_TAGLIB=ON" - ]; - postInstall = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix index 15963faf06..3d25ec3cdb 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix @@ -1,12 +1,11 @@ { fetchFromGitLab -, fetchpatch , lib , python3Packages , gobject-introspection , gtk3 , pango , wrapGAppsHook -, xvfb_run +, xvfb-run , chromecastSupport ? false , serverSupport ? false , keyringSupport ? true @@ -16,26 +15,16 @@ python3Packages.buildPythonApplication rec { pname = "sublime-music"; - version = "0.11.11"; + version = "0.11.12"; format = "pyproject"; src = fetchFromGitLab { owner = "sublime-music"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r4Tn/7CGDny8Aa4kF4PM5ZKMYthMJ7801X3zPdvXh4Q="; + sha256 = "sha256-fcEdpht+xKJRTaD3gKoRdf6O2SAPlZHZ61Jy8bdTKjs="; }; - patches = [ - # Switch to poetry-core: - # https://gitlab.com/sublime-music/sublime-music/-/merge_requests/60 - (fetchpatch { - name = "use-poetry-core.patch"; - url = "https://gitlab.com/sublime-music/sublime-music/-/commit/9b0af19dbdfdcc5a0fa23e73bb34c7135a8c2855.patch"; - sha256 = "sha256-cXG0RvrnBpme6yKWM0nfqMqoK0qPT6spflJ9AaaslVg="; - }) - ]; - nativeBuildInputs = [ gobject-introspection python3Packages.poetry-core @@ -77,7 +66,7 @@ python3Packages.buildPythonApplication rec { pytest pytest-cov ]; - checkPhase = "${xvfb_run}/bin/xvfb-run pytest"; + checkPhase = "${xvfb-run}/bin/xvfb-run pytest"; # Also run the python import check for sanity pythonImportsCheck = [ "sublime_music" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sunvox/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sunvox/default.nix index ef7133630b..577175fcff 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sunvox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sunvox/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; - sha256 = "0lqzr68n2c6aifw2vbyars91wn1chmgb9xfdk463g4vjqiava3ih"; + sha256 = "10lqbm1grw0sqasx7i6528cishv5ksdf9zbb3ygxd8c1iwaxzhb9"; }; nativeBuildInputs = [ unzip ]; @@ -44,7 +44,5 @@ stdenv.mkDerivation rec { homepage = "http://www.warmplace.ru/soft/sunvox/"; maintainers = with maintainers; [ puffnfresh ]; platforms = [ "i686-linux" "x86_64-linux" ]; - # hash mismatch - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/uade123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/uade123/default.nix index 368731c52b..271f9f912e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/uade123/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/uade123/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API"; homepage = "http://zakalwe.fi/uade/"; license = licenses.gpl2; - maintainers = [ lib.maintainers.gnidorah ]; - platforms = lib.platforms.unix; + maintainers = [ ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/vocal/default.nix b/third_party/nixpkgs/pkgs/applications/audio/vocal/default.nix index 8c44931667..b91a8e6d50 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/vocal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/vocal/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/needle-and-thread/vocal"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/backup/deja-dup/default.nix b/third_party/nixpkgs/pkgs/applications/backup/deja-dup/default.nix index 4ab491cb9a..ccd121f5da 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/deja-dup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/deja-dup/default.nix @@ -12,7 +12,7 @@ , coreutils , libsoup , libsecret -, libhandy_0 +, libhandy , wrapGAppsHook , libgpgerror , json-glib @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "deja-dup"; - version = "42.6"; + version = "42.7"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "0grwlfakrnr9ij7h8lsfazlws6qix8pl50dr94cpxnnbjga9xn9z"; + sha256 = "1q66wccnph78cp1r5mln2iq4bcqdrrchxq3c1pjrzkmzwc6l93gz"; }; patches = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { glib gtk3 libsecret - libhandy_0 + libhandy libgpgerror json-glib ]; diff --git a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix index f04a5a2d8b..f64fbd15ae 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - sha256 = "sha256-jy22eyuzM2y7vByT3TOlAUuTKtPepkB9iiHQT1YGQ88="; + sha256 = "sha256-k9kl6cSohWx+MB/9jyVcTgpv02gsVwAk5KDSNqQrmzI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1ndcpgw18w3l5f7vv5vw8lxhgd5y1zxfarwnyfx13m7kcv8m3vyj"; + sha256 = "0r6nbffik5j82bi82cmc00b17xv9m7xn3w3sarzwfxz0h43lal8a"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix index c37bf0f20f..fc56d6c540 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix @@ -2,6 +2,7 @@ , python3 , fetchFromGitHub , wrapQtAppsHook +, borgbackup }: python3.pkgs.buildPythonApplication rec { @@ -30,7 +31,10 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") + makeWrapperArgs+=( + "''${qtWrapperArgs[@]}" + --prefix PATH : ${lib.makeBinPath [ borgbackup ]} + ) ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-gold.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-gold.nix index 7ff2804ba7..5d6775f729 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-gold.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-gold.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , openssl , boost +, libb2 , libevent , autoreconfHook , db4 @@ -21,13 +22,13 @@ with lib; stdenv.mkDerivation rec { pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold"; - version = "0.15.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "BTCGPU"; repo = "BTCGPU"; rev = "v${version}"; - sha256 = "0grd1cd8d2nsrxl27la85kcan09z73fn70ncr9km4iccaj5pg12h"; + sha256 = "sha256-1tFoUNsCPJkHSmNRl5gE3n2EQD6RZSry1zIM5hiTzEI="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { db4 zeromq libsodium + libb2 ] ++ optionals withGui [ qtbase qttools diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited.nix index 04c906aefb..f1825b0cbd 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited.nix @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; - version = "1.9.0.1"; + version = "1.9.1.1"; src = fetchFromGitHub { owner = "bitcoinunlimited"; repo = "bitcoinunlimited"; rev = "BCHunlimited${version}"; - sha256 = "018a22zbvjqky0whizmgxzscmna0sh2xqgyw02yjk8qj4yi0zp8c"; + sha256 = "sha256-K15SI1F/xI4SkX4a41QHLn89YaHCgrlv+wcbkpwGKhI="; }; nativeBuildInputs = [ pkg-config autoreconfHook python3 ] diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin.nix index 1f222477ab..162a5ddee1 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin.nix @@ -16,6 +16,7 @@ , python3 , qrencode , libevent +, nixosTests , withGui , withWallet ? true }: @@ -81,6 +82,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + smoke-test = nixosTests.bitcoind; + }; + meta = { description = "Peer-to-peer electronic cash system"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix index 6952d9c007..7b6e3918da 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "btcpayserver"; - version = "1.0.7.2"; + version = "1.1.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1hxpbzc4l1zxrcvmdm93vvphhksfwd0mw2dv6h8vi4451p77dhd9"; + sha256 = "sha256-cCm4CZdVtjO2nj69CgRCrcwO0lAbiQVD6KocOj4CSdY="; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix index b579fc8f7f..20b9797210 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -94,6 +94,21 @@ version = "0.6.3"; sha256 = "1vb7ahafcd3lcbiiz552aisilwm1yq3j600gkf1wik8vhvsk02fs"; }) + (fetchNuGet { + name = "Fido2.AspNet"; + version = "2.0.1"; + sha256 = "1d6bjyck3mlhb9b4c75xhzr2pcs47vdqg2ayi5wnjh1aszyam3nq"; + }) + (fetchNuGet { + name = "Fido2.Models"; + version = "2.0.1"; + sha256 = "0llpzkik82n5gpgjawx181j85d2lizimkbdkxj1wyrjvxb2xbg3q"; + }) + (fetchNuGet { + name = "Fido2"; + version = "2.0.1"; + sha256 = "1s829n970lxngbhac9lvarwa9n9hqxr79kwv8i12amnmg6ir8ny5"; + }) (fetchNuGet { name = "Google.Api.Gax.Rest"; version = "2.5.0"; @@ -149,6 +164,11 @@ version = "5.0.372"; sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; }) + (fetchNuGet { + name = "libsodium"; + version = "1.0.18"; + sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; + }) (fetchNuGet { name = "McMaster.NETCore.Plugins.Mvc"; version = "1.3.1"; @@ -359,6 +379,11 @@ version = "3.1.4"; sha256 = "11w63yp7fk9qwmnq3lmpf1h30mlbzfx4zpm89vrs0lprj86g0742"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Abstractions"; + version = "2.2.0"; + sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52"; + }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; version = "3.1.4"; @@ -389,6 +414,11 @@ version = "3.1.4"; sha256 = "0r33m68y1vgpmqams4sgciizl0w6y97qkp93m0hyn0nlkxqf72l6"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "3.1.5"; + sha256 = "03jwqjrfyx11ax19bq84c28qzaiyj4whrx7vayy4hr7sv0p28h8k"; + }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; @@ -399,6 +429,11 @@ version = "3.1.4"; sha256 = "1bnf213zlrh0m3sbhsv601yx21l5xp254jiy2g4hm7zpm8vsz1hz"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "3.1.5"; + sha256 = "0310pvrwbbqak7k4s32syryqxlkwli8w8bwlpnqmz42svh2302wv"; + }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "2.1.0"; @@ -429,6 +464,11 @@ version = "3.1.4"; sha256 = "0npc18pjl86d06czb0fy6ln3prfpwfb16p6709xx2jrsl96dp9bp"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "3.1.5"; + sha256 = "1i7zm8ghgxwp655anyfm910qm7rcpvrz48fxjyzw9w63hj4sv6bk"; + }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; @@ -444,6 +484,11 @@ version = "3.1.4"; sha256 = "03ys96pqca93zwxvh0vprzms09i9y0lmq32w98m6klbizq01fc06"; }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "3.1.5"; + sha256 = "1wkf8ajh4pj6g3wwd18g3hjc3lqqny8052rl373ddcardxrs2gvn"; + }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; @@ -539,6 +584,11 @@ version = "3.1.4"; sha256 = "1rkl0yqmi5vfivn641866v2mdsgdy8amym546y6lzbab39g24b5n"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "3.1.5"; + sha256 = "0lr22hlf52csrna9ly2lbz3y1agfgdlg7rvsqjg7ik488dhkmhji"; + }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Filter"; version = "1.1.2"; @@ -559,6 +609,11 @@ version = "2.0.0"; sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Options.ConfigurationExtensions"; + version = "3.1.5"; + sha256 = "10w78fj2jpmghvprz6b046xcr68zzp6x550a7m1iivn0h7a3l7pi"; + }) (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "2.0.0"; @@ -569,6 +624,11 @@ version = "3.1.4"; sha256 = "0jphncx82l7jm5xi49dfxhbh24wv86sy44022chd7bkizllsypp4"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "3.1.5"; + sha256 = "0rhqyqa7vhlmz2g0250zhypaayvckx4dv89micdg521cpvr5arpr"; + }) (fetchNuGet { name = "Microsoft.Extensions.PlatformAbstractions"; version = "1.1.0"; @@ -589,11 +649,36 @@ version = "2.1.0"; sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "2.2.0"; + sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; + }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "3.1.4"; sha256 = "12xvysk024aghrcwzv4525vznnk8lqmknl2vqqxhq4k5hjxpsysp"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "3.1.5"; + sha256 = "0n2pk1sy8ikd29282sx4ps9r1wnhzgg4nwmkka9ypjizd8lkkk2m"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.JsonWebTokens"; + version = "6.6.0"; + sha256 = "06z5a1jpqpdd1pix85is7kkpn4v0l4an909skji2p8gm09p5sfyv"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.Logging"; + version = "6.6.0"; + sha256 = "1mpkx544cbxws1a22zwxbp3lqqamcc3x915l23spsxqvgr02jjrq"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.Tokens"; + version = "6.6.0"; + sha256 = "0h5vbsd5x9cf7nqyrwn7d7y1axhf1zz0jr9prvi4xpxawa3kajyj"; + }) (fetchNuGet { name = "Microsoft.NET.Test.Sdk"; version = "16.6.1"; @@ -671,8 +756,8 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.28"; - sha256 = "1zfirfmhgigp733km9rqkgz560h5wg88bpba499x49h5j650cnn4"; + version = "2.0.31"; + sha256 = "13gcfsxpfq8slmsvgzf6iv581x7n535zq0p9c88bqs5p88r6lygm"; }) (fetchNuGet { name = "NBitcoin"; @@ -694,6 +779,11 @@ version = "5.0.73"; sha256 = "0vqgcb0ws5fnkrdzqfkyh78041c6q4l22b93rr0006dd4bmqrmg1"; }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.77"; + sha256 = "0ykz4ii6lh6gdlz6z264wnib5pfnmq9q617qqbg0f04mq654jygb"; + }) (fetchNuGet { name = "NBitpayClient"; version = "1.0.0.39"; @@ -701,8 +791,8 @@ }) (fetchNuGet { name = "NBXplorer.Client"; - version = "3.0.20"; - sha256 = "1mwa6ncmg5r6q7yn6skm9dgqm631c7r7nadcg9mvbw81113h0xxy"; + version = "3.0.21"; + sha256 = "1asri2wsjq3ljf2p4r4x52ba9cirh8ccc5ysxpnv4cvladkdazbi"; }) (fetchNuGet { name = "NETStandard.Library"; @@ -784,6 +874,11 @@ version = "4.1.3.1"; sha256 = "0qk3hb8s521c2gy4k3m1i6fhpr133mnw9w85cwsy9j7ghxyca1nv"; }) + (fetchNuGet { + name = "NSec.Cryptography"; + version = "20.2.0"; + sha256 = "19slji51v8s8i4836nqqg7qb3i3p4ahqahz0fbb3gwpp67pn6izx"; + }) (fetchNuGet { name = "NuGet.Frameworks"; version = "5.0.0"; @@ -794,6 +889,21 @@ version = "1.5.12"; sha256 = "0f4gs31z8dwfvd246nrv3m0qkxzav37hxynx2maykza017khynyf"; }) + (fetchNuGet { + name = "PeterO.Cbor"; + version = "4.1.3"; + sha256 = "0882i3bhhx2yag2m4lbdsgngjwaj9ff4v0ab9zb839i4r77aq1yn"; + }) + (fetchNuGet { + name = "PeterO.Numbers"; + version = "1.6.0"; + sha256 = "04kfdkfr600h69g67g6izbn57bxqjamvaadyw3p9gjsc0wrivi98"; + }) + (fetchNuGet { + name = "PeterO.URIUtility"; + version = "1.0.0"; + sha256 = "04ihfbk2lf0smznwfb62h57qknls5jyxirdz72g5wn9h1dcgkdac"; + }) (fetchNuGet { name = "Pomelo.EntityFrameworkCore.MySql"; version = "3.1.1"; @@ -804,11 +914,6 @@ version = "2.2.1"; sha256 = "1w6s9wjbsyvq8cnqknkdzm9chnv0g5gcsrq5i94zp6br9vg7c627"; }) - (fetchNuGet { - name = "Portable.BouncyCastle"; - version = "1.8.1.3"; - sha256 = "1lv1ljaz8df835jgmp3ny1xgqqjf1s9f25baw7bf8d24qlf25i2g"; - }) (fetchNuGet { name = "QRCoder"; version = "1.4.1"; @@ -1164,6 +1269,11 @@ version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { + name = "System.IdentityModel.Tokens.Jwt"; + version = "6.6.0"; + sha256 = "17i6a43g1fksq9xy77dgsz54klz71pz062pb58lqx8h06p1818h1"; + }) (fetchNuGet { name = "System.Interactive.Async"; version = "3.1.1"; @@ -1239,11 +1349,21 @@ version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.1"; + sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; + }) (fetchNuGet { name = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.4"; + sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; + }) (fetchNuGet { name = "System.Net.Http"; version = "4.3.0"; @@ -1409,6 +1529,11 @@ version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.1"; + sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; + }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; @@ -1529,6 +1654,11 @@ version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.7.0"; + sha256 = "00797sqbba8lys486ifxblz9j52m29kidclvmqpk531820k55x9j"; + }) (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.3.0"; @@ -1789,11 +1919,6 @@ version = "2.12.1"; sha256 = "0m41dxzc3hh0f4j1k4q915pvcq6zr0hv1pj6b3sayrn8vjhk64qb"; }) - (fetchNuGet { - name = "U2F.Core"; - version = "1.0.4"; - sha256 = "0mk32yyihigp9njs54z411fswgzr6x3kw134c7ylwy2d2wmq2n9b"; - }) (fetchNuGet { name = "WindowsAzure.Storage"; version = "9.3.3"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/update.sh b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/update.sh index 1f7dbedd02..9debe6780f 100755 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/update.sh +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/update.sh @@ -2,5 +2,10 @@ set -euo pipefail scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) +cd "$scriptDir" -"$scriptDir"/../nbxplorer/util/update-common.sh btcpayserver "$scriptDir"/deps.nix +echo "Updating nbxplorer" +../nbxplorer/update.sh +echo +echo "Updating btcpayserver" +../nbxplorer/util/update-common.sh btcpayserver deps.nix diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix new file mode 100644 index 0000000000..0c4220b72b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix @@ -0,0 +1,69 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "chia"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "Chia-Network"; + repo = "chia-blockchain"; + rev = version; + sha256 = "ZUxWOlJGQpeQCtWt0PSdcbMackHdeuNFkxHvYDPcU8Y="; + }; + + patches = [ + # tweak version requirements to what's available in Nixpkgs + ./dependencies.patch + ]; + + nativeBuildInputs = [ + python3Packages.setuptools-scm + ]; + + # give a hint to setuptools_scm on package version + SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; + + propagatedBuildInputs = with python3Packages; [ + aiohttp + aiosqlite + bitstring + blspy + chiapos + chiavdf + chiabip158 + click + clvm + clvm-rs + clvm-tools + colorlog + concurrent-log-handler + cryptography + keyrings-cryptfile + pyyaml + setproctitle + setuptools # needs pkg_resources at runtime + sortedcontainers + websockets + ]; + + checkInputs = [ + python3Packages.pytestCheckHook + ]; + + disabledTests = [ + "test_spend_through_n" + "test_spend_zero_coin" + ]; + + preCheck = '' + export HOME=`mktemp -d` + ''; + + meta = with lib; { + homepage = "https://www.chia.net/"; + description = "Chia is a modern cryptocurrency built from scratch, designed to be efficient, decentralized, and secure."; + license = with licenses; [ asl20 ]; + maintainers = teams.chia.members; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/chia/dependencies.patch b/third_party/nixpkgs/pkgs/applications/blockchains/chia/dependencies.patch new file mode 100644 index 0000000000..d9575d1d39 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/chia/dependencies.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index c5cf95db..b783a9e6 100644 +--- a/setup.py ++++ b/setup.py +@@ -8,7 +8,7 @@ dependencies = [ + "clvm==0.9.6", + "clvm_rs==0.1.7", + "clvm_tools==0.4.3", +- "aiohttp==3.7.4", # HTTP server for full node rpc ++ "aiohttp==3.7.4.post0", # HTTP server for full node rpc + "aiosqlite==0.17.0", # asyncio wrapper for sqlite, to store blocks + "bitstring==3.1.7", # Binary data management library + "colorlog==5.0.1", # Adds color to logs diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/electrs.nix b/third_party/nixpkgs/pkgs/applications/blockchains/electrs.nix index 30742f8d71..af0346196a 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/electrs.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/electrs.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; cargoSha256 = "1rqpadlr9r4z2z825li6vi5a21hivc3bsn5ibxshrdrwiycyyxz8"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix index 597db2ae8f..c9761542da 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 = "4.0.8"; + version = "4.0.10"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-swU4CnX2BxL3ILH/sXux8ZHMo5nAPLQOIiWmr4C8BOQ="; + sha256 = "sha256-o3+yL81WO5/UGh0gl4MOewPHTDch/Vij8mzZWOlEkjg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ethabi.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ethabi.nix deleted file mode 100644 index 8cf3295cca..0000000000 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ethabi.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "ethabi"; - version = "11.0.0"; - - src = fetchFromGitHub { - owner = "paritytech"; - repo = "ethabi"; - rev = "v${version}"; - sha256 = "1gqd3vwsvv1wvi659qcdywgmh41swblpwmmxb033k8irw581dwq4"; - }; - - cargoSha256 = "1hx8qw51rl7sn9jmnclw0hc4rx619hf78hpaih5mvny3k0zgiwpm"; - - meta = with lib; { - description = "Ethereum function call encoding (ABI) utility"; - homepage = "https://github.com/ethcore/ethabi/"; - maintainers = [ maintainers.dbrock ]; - license = licenses.gpl3; - inherit version; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ethabi/add-Cargo-lock.patch b/third_party/nixpkgs/pkgs/applications/blockchains/ethabi/add-Cargo-lock.patch new file mode 100644 index 0000000000..57725d2828 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ethabi/add-Cargo-lock.patch @@ -0,0 +1,683 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..05e3f0f +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,677 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "anyhow" ++version = "1.0.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" ++ ++[[package]] ++name = "arrayvec" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" ++ ++[[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 = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "bitvec" ++version = "0.17.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" ++dependencies = [ ++ "either", ++ "radium", ++] ++ ++[[package]] ++name = "block-buffer" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" ++dependencies = [ ++ "block-padding", ++ "generic-array", ++] ++ ++[[package]] ++name = "block-padding" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" ++ ++[[package]] ++name = "byte-slice-cast" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" ++ ++[[package]] ++name = "byteorder" ++version = "1.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" ++ ++[[package]] ++name = "bytes" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "clap" ++version = "2.33.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] ++ ++[[package]] ++name = "crunchy" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" ++ ++[[package]] ++name = "digest" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "either" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++ ++[[package]] ++name = "ethabi" ++version = "13.0.0" ++dependencies = [ ++ "anyhow", ++ "ethereum-types", ++ "hex", ++ "hex-literal", ++ "paste", ++ "serde", ++ "serde_json", ++ "sha3", ++ "thiserror", ++ "uint", ++] ++ ++[[package]] ++name = "ethabi-cli" ++version = "13.0.0" ++dependencies = [ ++ "anyhow", ++ "ethabi", ++ "hex", ++ "itertools", ++ "sha3", ++ "structopt", ++] ++ ++[[package]] ++name = "ethabi-contract" ++version = "11.0.0" ++ ++[[package]] ++name = "ethabi-derive" ++version = "13.0.0" ++dependencies = [ ++ "anyhow", ++ "ethabi", ++ "heck", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "ethabi-tests" ++version = "0.1.1" ++dependencies = [ ++ "ethabi", ++ "ethabi-contract", ++ "ethabi-derive", ++ "hex", ++ "hex-literal", ++] ++ ++[[package]] ++name = "ethbloom" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "22a621dcebea74f2a6f2002d0a885c81ccf6cbdf86760183316a7722b5707ca4" ++dependencies = [ ++ "crunchy", ++ "fixed-hash", ++ "impl-rlp", ++ "impl-serde", ++ "tiny-keccak", ++] ++ ++[[package]] ++name = "ethereum-types" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05dc5f0df4915fa6dff7f975a8366ecfaaa8959c74235469495153e7bb1b280e" ++dependencies = [ ++ "ethbloom", ++ "fixed-hash", ++ "impl-rlp", ++ "impl-serde", ++ "primitive-types", ++ "uint", ++] ++ ++[[package]] ++name = "fixed-hash" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" ++dependencies = [ ++ "byteorder", ++ "rand", ++ "rustc-hex", ++ "static_assertions", ++] ++ ++[[package]] ++name = "generic-array" ++version = "0.14.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" ++dependencies = [ ++ "typenum", ++ "version_check", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi", ++] ++ ++[[package]] ++name = "heck" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" ++dependencies = [ ++ "unicode-segmentation", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "hex" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" ++ ++[[package]] ++name = "hex-literal" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5af1f635ef1bc545d78392b136bfe1c9809e029023c84a3638a864a10b8819c8" ++ ++[[package]] ++name = "impl-codec" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" ++dependencies = [ ++ "parity-scale-codec", ++] ++ ++[[package]] ++name = "impl-rlp" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" ++dependencies = [ ++ "rlp", ++] ++ ++[[package]] ++name = "impl-serde" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" ++dependencies = [ ++ "either", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" ++ ++[[package]] ++name = "keccak" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" ++ ++[[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.94" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" ++ ++[[package]] ++name = "opaque-debug" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" ++ ++[[package]] ++name = "parity-scale-codec" ++version = "1.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d" ++dependencies = [ ++ "arrayvec", ++ "bitvec", ++ "byte-slice-cast", ++ "serde", ++] ++ ++[[package]] ++name = "paste" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++ ++[[package]] ++name = "primitive-types" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3824ae2c5e27160113b9e029a10ec9e3f0237bad8029f69c7724393c9fdefd8" ++dependencies = [ ++ "fixed-hash", ++ "impl-codec", ++ "impl-rlp", ++ "impl-serde", ++ "uint", ++] ++ ++[[package]] ++name = "proc-macro-error" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" ++dependencies = [ ++ "proc-macro-error-attr", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro-error-attr" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "radium" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" ++ ++[[package]] ++name = "rand" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" ++dependencies = [ ++ "libc", ++ "rand_chacha", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "rlp" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e54369147e3e7796c9b885c7304db87ca3d09a0a98f72843d532868675bbfba8" ++dependencies = [ ++ "bytes", ++ "rustc-hex", ++] ++ ++[[package]] ++name = "rustc-hex" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" ++ ++[[package]] ++name = "ryu" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++ ++[[package]] ++name = "serde" ++version = "1.0.125" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.125" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.64" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" ++dependencies = [ ++ "itoa", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "sha3" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" ++dependencies = [ ++ "block-buffer", ++ "digest", ++ "keccak", ++ "opaque-debug", ++] ++ ++[[package]] ++name = "static_assertions" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++ ++[[package]] ++name = "structopt" ++version = "0.3.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" ++dependencies = [ ++ "clap", ++ "lazy_static", ++ "structopt-derive", ++] ++ ++[[package]] ++name = "structopt-derive" ++version = "0.4.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" ++dependencies = [ ++ "heck", ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "syn" ++version = "1.0.72" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "tiny-keccak" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" ++dependencies = [ ++ "crunchy", ++] ++ ++[[package]] ++name = "typenum" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" ++ ++[[package]] ++name = "uint" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e11fe9a9348741cf134085ad57c249508345fe16411b3d7fb4ff2da2f1d6382e" ++dependencies = [ ++ "byteorder", ++ "crunchy", ++ "hex", ++ "static_assertions", ++] ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" ++ ++[[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.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" ++ ++[[package]] ++name = "version_check" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" ++ ++[[package]] ++name = "wasi" ++version = "0.10.2+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ethabi/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ethabi/default.nix new file mode 100644 index 0000000000..e2598ba22d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ethabi/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }: + +rustPlatform.buildRustPackage rec { + pname = "ethabi"; + version = "13.0.0"; + + src = fetchFromGitHub { + owner = "rust-ethereum"; + repo = "ethabi"; + rev = "v${version}"; + sha256 = "sha256-bl46CSVP1MMYI3tkVAHFrjMFwTt8QoleZCV9pMIMZyc="; + }; + + cargoSha256 = "sha256-Jz0uEP2/ZjLS+GbCp7lNyJQdFDjTSFthjBdC/Z4tkTs="; + + cargoPatches = [ ./add-Cargo-lock.patch ]; + + buildInputs = lib.optional stdenv.isDarwin libiconv; + + meta = with lib; { + description = "Ethereum function call encoding (ABI) utility"; + homepage = "https://github.com/rust-ethereum/ethabi"; + maintainers = [ maintainers.dbrock ]; + license = licenses.asl20; + inherit version; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix index 73e067b5b5..4310f809ba 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix @@ -8,17 +8,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PJaJ9fCva9UUBcQrnVa2c7dk4koi6AyX6bj3JStUMwM="; + sha256 = "sha256-85aUR7MvaPeRilC+4oj6XW2IEUvxRUsVz63tQ/Jc7xw="; }; runVend = true; - vendorSha256 = "sha256-qLpwrV9NkmUO0yoK2/gwb5oe/lky/w/P0QVoFSTNuMU="; + vendorSha256 = "sha256-8zhVQ8FUdzog7h9RBfuq8uBp0zjulXbDOLAPljp4deA="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 2dea189dca..298ae39716 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.24.0"; + version = "2.26.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "1xdqj825vwh3kg35v7568zr1jhvldb4wcazzgzcaawkr4qzfdb2n"; + sha256 = "0zbzqq3c0q45dz4vvgfbvqcgda7413mnwixi7yi78qb9mp8zxkhy"; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix index 47df64b514..59e09939e8 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix @@ -19,13 +19,13 @@ with lib; stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.2.1"; + version = "0.17.2.2"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1apjvpvn6hg0k0ak6wpg4prcdcslnb6fqhzzg2p4iy846f0ai9ji"; + sha256 = "1k3grbd3wydy5gv6d8x35skv1v97lhh6awd9i87im9lz4kn8ywkd"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix index 17e884c579..d8867da5fd 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix @@ -4,13 +4,13 @@ let pname = "MyCrypto"; - version = "1.7.13"; - sha256 = "15m21n68lxnz6fxwf1bb3cxg5qi6nrwcnqymiw8s9wizvv575vj7"; + version = "1.7.16"; + hash = "sha256-fvV/dT9tj8/d/kjM0dVj3IC/O7Y/yG8fscDCzUBwHKI="; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/mycryptohq/mycrypto/releases/download/${version}/linux-x86-64_${version}_MyCrypto.AppImage"; - inherit sha256; + inherit hash; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix index ffa061edc7..7e279b2269 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "nbxplorer"; - version = "2.1.49"; + version = "2.1.51"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "0xg5gbq6rbzgsbgwf94qcy2b0m5kdspi6hc5a64smaj9i7i0136l"; + sha256 = "sha256-tvuuoDZCSDFa8gAVyH+EP1DLtdPfbkr+w5lSxZkzZXg="; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix index b0bf85f623..de75ad228d 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -181,18 +181,23 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.28"; - sha256 = "1zfirfmhgigp733km9rqkgz560h5wg88bpba499x49h5j650cnn4"; + version = "2.0.31"; + sha256 = "13gcfsxpfq8slmsvgzf6iv581x7n535zq0p9c88bqs5p88r6lygm"; }) (fetchNuGet { name = "NBitcoin.TestFramework"; - version = "2.0.21"; - sha256 = "1k26fkss6d7x2yqlid31z5i04b5dmlbbbwijg9c8i3d996i1z7sq"; + version = "2.0.22"; + sha256 = "1zwhjy6xppl01jhkgl7lqjsmi8crny4qq22ml20cz8l437j1zi4n"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.73"; - sha256 = "0vqgcb0ws5fnkrdzqfkyh78041c6q4l22b93rr0006dd4bmqrmg1"; + version = "5.0.76"; + sha256 = "0q3ilmsrw9ip1s38qmfs4qi02xvccmy1naafffn5yxj08q0n1p79"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.77"; + sha256 = "0ykz4ii6lh6gdlz6z264wnib5pfnmq9q617qqbg0f04mq654jygb"; }) (fetchNuGet { name = "NETStandard.Library"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh index 1402d1cd1e..14b1687dff 100755 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh @@ -6,7 +6,7 @@ set -euo pipefail # Expects $pkgSrc to contain a single .sln file. pkgSrc=$1 -depsFile=$2 +depsFile=$(realpath "$2") sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1) [[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/update-common.sh index c69168ccbb..7a9262bf48 100755 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/update-common.sh +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -1,16 +1,16 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 +#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 git gnupg set -euo pipefail # This script uses the following env vars: # getVersionFromTags -# onlyCreateDeps +# refetch pkgName=$1 depsFile=$2 : ${getVersionFromTags:=} -: ${onlyCreateDeps:=} +: ${refetch:=} scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) nixpkgs=$(realpath "$scriptDir"/../../../../..) @@ -29,23 +29,46 @@ getLatestVersionTag() { | sort -V | tail -1 | sed 's|^v||' } -if [[ ! $onlyCreateDeps ]]; then - oldVersion=$(evalNixpkgs "$pkgName.version") - if [[ $getVersionFromTags ]]; then - newVersion=$(getLatestVersionTag) - else - newVersion=$(curl -s "https://api.github.com/repos/$(getRepo)/releases" | jq -r '.[0].name') - fi - - if [[ $newVersion == $oldVersion ]]; then - echo "nixpkgs already has the latest version $newVersion" - echo "Run this script with env var onlyCreateDeps=1 to recreate "$(basename "$depsFile") - exit 0 - else - echo "Updating $pkgName: $oldVersion -> $newVersion" - (cd "$nixpkgs" && update-source-version "$pkgName" "$newVersion") - fi +oldVersion=$(evalNixpkgs "$pkgName.version") +if [[ $getVersionFromTags ]]; then + newVersion=$(getLatestVersionTag) +else + newVersion=$(curl -s "https://api.github.com/repos/$(getRepo)/releases" | jq -r '.[0].name') fi +if [[ $newVersion == $oldVersion && ! $refetch ]]; then + echo "nixpkgs already has the latest version $newVersion" + echo "Run this script with env var refetch=1 to re-verify the content hash via GPG" + echo "and to recreate $(basename "$depsFile"). This is useful for reviewing a version update." + exit 0 +fi + +# Fetch release and GPG-verify the content hash +tmpdir=$(mktemp -d /tmp/$pkgName-verify-gpg.XXX) +repo=$tmpdir/repo +trap "rm -rf $tmpdir" EXIT +git clone --depth 1 --branch v${newVersion} -c advice.detachedHead=false https://github.com/$(getRepo) $repo +export GNUPGHOME=$tmpdir +# Fetch Nicolas Dorier's key (64-bit key ID: 6618763EF09186FE) +gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys AB4CFA9895ACA0DBE27F6B346618763EF09186FE 2> /dev/null +echo +echo "Verifying commit" +git -C $repo verify-commit HEAD +rm -rf $repo/.git +newHash=$(nix hash-path $repo) +rm -rf $tmpdir +echo + +# Update pkg version and hash +echo "Updating $pkgName: $oldVersion -> $newVersion" +if [[ $newVersion == $oldVersion ]]; then + # Temporarily set a source version that doesn't equal $newVersion so that $newHash + # is always updated in the next call to update-source-version. + (cd "$nixpkgs" && update-source-version "$pkgName" "0" "0000000000000000000000000000000000000000000000000000") +fi +(cd "$nixpkgs" && update-source-version "$pkgName" "$newVersion" "$newHash") +echo + +# Create deps file storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)" . "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix index 82b6f2c1ad..b4b5d13f14 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix @@ -10,26 +10,20 @@ , darwin }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { pname = "openethereum"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "openethereum"; repo = "openethereum"; rev = "v${version}"; - sha256 = "143w0b0ff1s73qzr844l25w90d2y2z0b3w2fr5kkbc1wsnpcq7jp"; + sha256 = "1g48fkznvr9fs3j9zy2d9pcwnahmyghxg2b9bsn2mxpyczmfqrki"; }; - cargoSha256 = "1gm02pcfll362add8a0dcb0sk0mag8z0q23b87yb6fs870bqvhib"; + cargoSha256 = "02nlm5ariv4dr6b3rckzs7hw1xrl83yvhimrzb0g5l0j0sxh1nhc"; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - nativeBuildInputs = [ - cmake - llvmPackages.clang - llvmPackages.libclang - pkg-config - ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ systemd ] diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index abe7ab5643..99498c73d9 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -7,20 +7,20 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.8.30"; + version = "0.9.2"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-9GCk1gqlQJhuoiKRi7J1qcJlZjlq2ObGicp5tGGDhrY="; + sha256 = "sha256-lxkLRJYdP30JNDHwa7tpugyIObmnjIBQ/HMGw6deElo="; }; - cargoSha256 = "sha256-pWqbcargCEkisdGnj08VQdRqjocR7zZhWukhYjfZDqI="; + cargoSha256 = "0gg42b6h8782wny3dr9gc38wl6bybyf4smashchgrpc649ds6w0a"; nativeBuildInputs = [ clang ]; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; PROTOC = "${protobuf}/bin/protoc"; # NOTE: We don't build the WASM runtimes since this would require a more @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { description = "Polkadot Node Implementation"; homepage = "https://polkadot.network"; license = licenses.gpl3Only; - maintainers = with maintainers; [ akru andresilva asymmetric RaghavSood ]; + maintainers = with maintainers; [ akru andresilva asymmetric FlorianFranzen RaghavSood ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix index 2f5e6ac010..585f01290b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "21.4.1"; + version = "21.5.1"; name = "${pname}-${version}"; suffix = { @@ -18,9 +18,10 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; - sha256 = { - aarch64-linux = "51ea8a5210f008d13a729ac42085563b5e8b971b17ed766f84d69d76dcb2db0c"; - x86_64-linux = "9219168a504356152b3b807e1e7282e21952461d277596c6b82ddfe81ac2419c"; + # sha512 hashes are obtained from latest-linux-arm64.yml and latest-linux.yml + sha512 = { + aarch64-linux = "sha512-nqwfonWySc+wBSJjC8BW9vm+v5zHbKqbbrTTRmoZdEYBJg2SthMtTULNLVpXaX9NHxr6guZnOWdBlzVk2dQkfQ=="; + x86_64-linux = "sha512-tfvdNXsjMe8YXJwTuujz4tKTdfsCuR/9VECF8EkcRP95YM7vuDV8dumru1jKtdiv0gaS1GT3SPEeAfmczY5jGg=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix b/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix index 3c56e0bbb2..b1548212a6 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix @@ -2,28 +2,29 @@ buildGoModule rec { pname = "turbo-geth"; - version = "2021.02.01"; + version = "2021.05.02"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9z0Hogu/VgGxvgQMKIImv+qyTqTmR40JS4NNIOk5EZI="; + sha256 = "sha256-7sTRAAlKZOdwi/LRbIEDKWpBe1ol8pZfEf2KIC4s0xk="; }; - vendorSha256 = "sha256-Ho68+SzYELQN4DE57LNSXeHIu43zAOb7HK/jx7PFdXk="; + vendorSha256 = "1d0ahdb2b5v8nxq3kdxw151phnyv6habb8kr8qjaq3kyhcnyk6ng"; runVend = true; subPackages = [ "cmd/tg" - "cmd/restapi" + "cmd/evm" "cmd/rpcdaemon" + "cmd/rlpdump" ]; meta = with lib; { homepage = "https://github.com/ledgerwatch/turbo-geth/"; description = "Ethereum node and geth fork focused on scalability and modularity"; - license = with licenses; [ lgpl3 gpl3 ]; + license = with licenses; [ lgpl3Plus gpl3Plus ]; maintainers = with maintainers; [ xwvvvvwx ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix index be9ba0f756..7ca4da69d0 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix @@ -20,7 +20,7 @@ , polkit , accountsservice , gtk-doc -, gnome3 +, gnome , gobject-introspection , vala , fetchpatch @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { autoconf automake yelp-tools - gnome3.yelp-xsl + gnome.yelp-xsl gobject-introspection gtk-doc intltool @@ -142,6 +142,6 @@ stdenv.mkDerivation rec { description = "A cross-desktop display manager"; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix index 678d6a0a35..6d9182b9d6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix @@ -145,7 +145,7 @@ let ]}" # AS launches LLDBFrontend with a custom LD_LIBRARY_PATH - wrapProgram $out/bin/lldb/bin/LLDBFrontend --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + wrapProgram $(find $out -name LLDBFrontend) --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ ncurses5 zlib ]}" 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 466dfb2516..e68e95ba54 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -9,18 +9,18 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "4.1.3.0"; # "Android Studio 4.1.3" - build = "201.7199119"; - sha256Hash = "06xwgk7bwcmljka8xa56cfwwg858r0bl0xp2jb9hdnkwljf796gm"; + version = "4.2.1.0"; # "Android Studio 4.2.1" + build = "202.7351085"; + sha256Hash = "074y6i0h8zamjgvvs882im44clds3g6aq8rssl7sq1wx6hrn5q36"; }; betaVersion = { - version = "4.2.0.22"; # "Android Studio 4.2 Beta 6" - build = "202.7188722"; - sha256Hash = "0mzwkx1csx194wzg7dc1cii3c16wbmlbq1jdv9ly4nmdxlvc2rxb"; + version = "4.2.0.24"; # "Android Studio 4.2.0" + build = "202.7322048"; + sha256Hash = "1ii1zf8mv7xyql56wwkcdj5l4g3zaprdszv6r9md9r5zh78k4ccz"; }; latestVersion = { # canary & dev - version = "2020.3.1.10"; # "Android Studio Arctic Fox (2020.3.1) Canary 10" - sha256Hash = "15xxyjjjy5pnimc66dcwnqb7z4lq7ll4fl401a3br5ca4d1hpgsj"; + version = "2020.3.1.15"; # "Android Studio Arctic Fox (2020.3.1) Canary 15" + sha256Hash = "0k66ibflqwdlgapir5w2v1d4zjwn6464yk2hvlmif9lsfdvd0ivv"; }; in { # Attributes are named by their corresponding release channels diff --git a/third_party/nixpkgs/pkgs/applications/editors/apostrophe/default.nix b/third_party/nixpkgs/pkgs/applications/editors/apostrophe/default.nix index 9dafc055bc..851c3ea1c2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/apostrophe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/apostrophe/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, meson, ninja, cmake , wrapGAppsHook, pkg-config, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection -, gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive +, gtk3, webkitgtk, glib-networking, gnome, gspell, texlive , shared-mime-info, libhandy }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { appstream-glib wrapGAppsHook ]; buildInputs = [ glib pythonEnv gobject-introspection gtk3 - gnome3.adwaita-icon-theme webkitgtk gspell texlive + gnome.adwaita-icon-theme webkitgtk gspell texlive glib-networking libhandy ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/bless/default.nix b/third_party/nixpkgs/pkgs/applications/editors/bless/default.nix index 24fc8440bb..e613747aea 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/bless/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/bless/default.nix @@ -1,73 +1,58 @@ { lib, stdenv , fetchFromGitHub -, autoreconfHook , pkg-config , mono +, meson +, ninja , gtk-sharp-2_0 , gettext , makeWrapper , glib , gtk2-x11 -, gnome2 +, libxslt +, docbook_xsl +, python3 }: stdenv.mkDerivation rec { pname = "bless"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "afrantzis"; repo = pname; rev = "v${version}"; - sha256 = "04ra2mcx3pkhzbhcz0zwfmbpqj6cwisrypi6xbc2d6pxd4hdafn1"; + hash = "sha256-rS+vJX0y9v1TiPsRfABroHiTuENQKEOxNsyKwagRuHM="; }; + postPatch = '' + sed "s|get_option('tests')|false|g" -i meson.build + patchShebangs . + ''; + buildInputs = [ gtk-sharp-2_0 mono # runtime only deps glib gtk2-x11 - gnome2.libglade ]; nativeBuildInputs = [ pkg-config - autoreconfHook + meson + ninja gettext makeWrapper + libxslt + docbook_xsl + python3 ]; - configureFlags = [ - # scrollkeeper is a gnome2 package, so it must be old and we shouldn't really support it - # NOTE: that sadly doesn't turn off the compilation of the manual with scrollkeeper, so we have to fake the binaries below - "--without-scrollkeeper" - ]; - - autoreconfPhase = '' - mkdir _bin - - # this fakes the scrollkeeper commands, to keep the build happy - for f in scrollkeeper-preinstall scrollkeeper-update; do - echo "true" > ./_bin/$f - chmod +x ./_bin/$f - done - - export PATH="$PWD/_bin:$PATH" - - # and it also wants to install that file - touch ./doc/user/bless-manual.omf - - # patch mono path - sed "s|^mono|${mono}/bin/mono|g" -i src/bless-script.in - - ./autogen.sh - ''; - preFixup = '' - MPATH="${gtk-sharp-2_0}/lib/mono/gtk-sharp-2.0:${glib.out}/lib:${gtk2-x11}/lib:${gnome2.libglade}/lib:${gtk-sharp-2_0}/lib" - wrapProgram $out/bin/bless --prefix MONO_PATH : "$MPATH" --prefix LD_LIBRARY_PATH : "$MPATH" - ''; + MPATH="${gtk-sharp-2_0}/lib/mono/gtk-sharp-2.0:${glib.out}/lib:${gtk2-x11}/lib:${gtk-sharp-2_0}/lib" + wrapProgram $out/bin/bless --prefix MONO_PATH : "$MPATH" --prefix LD_LIBRARY_PATH : "$MPATH" --prefix PATH : ${lib.makeBinPath [ mono ]} + ''; meta = with lib; { homepage = "https://github.com/afrantzis/bless"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix b/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix index 59d1f11312..3a5436d4f3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2 -, enchant, gucharmap, python3, gnome3 +, enchant, gucharmap, python3, gnome }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ]; - buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2 + buildInputs = [ gnome.adwaita-icon-theme gtk libxml2 enchant gucharmap python3 ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix index ca76e43e41..fbaa8aa2ec 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -114,10 +114,10 @@ elpaBuild { pname = "aggressive-completion"; ename = "aggressive-completion"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/aggressive-completion-1.5.tar"; - sha256 = "1gy0q5yc1a0w31qpyb92f672zcfgxbp5s104ycgk11jxk4y17nw9"; + url = "https://elpa.gnu.org/packages/aggressive-completion-1.6.tar"; + sha256 = "0i7kcxd7pbdw57gczbxddr2n4j778x2ccfpkgjhdlpdsyidfh2bq"; }; packageRequires = [ emacs ]; meta = { @@ -219,16 +219,16 @@ license = lib.licenses.free; }; }) {}; - async = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: + async = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "async"; ename = "async"; - version = "1.9.3"; + version = "1.9.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/async-1.9.3.tar"; - sha256 = "1pmfjrlapvhkjqcal8x95w190hm9wsgxb3byc22rc1gf5z0p52c8"; + url = "https://elpa.gnu.org/packages/async-1.9.5.tar"; + sha256 = "02f43vqlggy4qkqdggkl9mcg3rvagjysj45xgrx41jjx6cnjnm19"; }; - packageRequires = [ cl-lib nadvice ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/async.html"; license = lib.licenses.free; @@ -238,10 +238,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.0.6"; + version = "13.0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.0.6.tar"; - sha256 = "00wp388rh2nnk8fam53kilykg90jylps31qxv9ijy1lsp1hqdjys"; + url = "https://elpa.gnu.org/packages/auctex-13.0.11.tar"; + sha256 = "0sy4f1n38q58vyzw5l0f80ci3j99rb25gbwj0frl0pglfmgzl44k"; }; packageRequires = [ emacs ]; meta = { @@ -482,10 +482,10 @@ elpaBuild { pname = "cl-lib"; ename = "cl-lib"; - version = "0.6.1"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cl-lib-0.6.1.el"; - sha256 = "00w7bw6wkig13pngijh7ns45s1jn5kkbbjaqznsdh6jk5x089j9y"; + url = "https://elpa.gnu.org/packages/cl-lib-0.7.tar"; + sha256 = "0s1vkkj1yc5zn6bvc84sr726cm4v3jh2ymm7hc3rr00swwbz35lv"; }; packageRequires = []; meta = { @@ -651,6 +651,21 @@ license = lib.licenses.free; }; }) {}; + corfu = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "corfu"; + ename = "corfu"; + version = "0.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/corfu-0.6.tar"; + sha256 = "0zl769l3mmy4b0pj70dwjllq0224r2w4l45xvaqbj75qfqclj6cj"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/corfu.html"; + license = lib.licenses.free; + }; + }) {}; counsel = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib, swiper }: elpaBuild { pname = "counsel"; @@ -775,10 +790,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.27"; + version = "0.28"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.27.tar"; - sha256 = "1zn9p9vmfv5ihrp8d06b6abs48q225v42cgwa01s39hld6zg6wbv"; + url = "https://elpa.gnu.org/packages/debbugs-0.28.tar"; + sha256 = "1qks38hpg3drhxzw66n5yxfq0v6fj9ya7d9dc6x0xwfp6r2x0li0"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1030,10 +1045,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20210102"; + version = "20210512"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20210102.tar"; - sha256 = "14vpgcncmzzbv8v78v221hdhigvk00vqiizwd8dy0b7hqz6gl0rq"; + url = "https://elpa.gnu.org/packages/eev-20210512.tar"; + sha256 = "0dj49lpqv5vsx02h8mla8cmv5cr5f2qbz74f9dn8q4adpzxsajin"; }; packageRequires = [ emacs ]; meta = { @@ -1133,10 +1148,10 @@ elpaBuild { pname = "elisp-benchmarks"; ename = "elisp-benchmarks"; - version = "1.11"; + version = "1.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.11.tar"; - sha256 = "0s1mpapvcivy25zbhw6ghpg0ym23vb4dsrz876rl4z2rfyckxral"; + url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.12.tar"; + sha256 = "0jzpzif4vrjg5hl0hxg4aqvi6nv56cxa1w0amnkgcz4hsscxkvwm"; }; packageRequires = []; meta = { @@ -1144,16 +1159,21 @@ license = lib.licenses.free; }; }) {}; - emms = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }: + emms = callPackage ({ cl-lib ? null + , elpaBuild + , fetchurl + , lib + , nadvice + , seq }: elpaBuild { pname = "emms"; ename = "emms"; - version = "7.1"; + version = "7.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-7.1.tar"; - sha256 = "1dng8dy0w0wsdvvnjnrllwv5a8wq3kj20jik994b7prdx5dn6y52"; + url = "https://elpa.gnu.org/packages/emms-7.2.tar"; + sha256 = "11vqqh9rnzibsfw7wx62rgzl8i8ldpf0hv1sj43nhl5c6dlc8d5z"; }; - packageRequires = [ cl-lib seq ]; + packageRequires = [ cl-lib nadvice seq ]; meta = { homepage = "https://elpa.gnu.org/packages/emms.html"; license = lib.licenses.free; @@ -1209,7 +1229,8 @@ license = lib.licenses.free; }; }) {}; - excorporate = callPackage ({ elpaBuild + excorporate = callPackage ({ cl-lib ? null + , elpaBuild , emacs , fetchurl , fsm @@ -1220,12 +1241,19 @@ elpaBuild { pname = "excorporate"; ename = "excorporate"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/excorporate-0.9.5.tar"; - sha256 = "0z5x8lqvxh8zra23nmh36cdnr2yk855i4fc3mlbwaj5sdy9sqpf5"; + url = "https://elpa.gnu.org/packages/excorporate-0.9.6.tar"; + sha256 = "0ljav8g1npg0a36x1xxpfs2gvk622fh3si95s3w2vmwa27ynirzj"; }; - packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ]; + packageRequires = [ + cl-lib + emacs + fsm + nadvice + soap-client + url-http-ntlm + ]; meta = { homepage = "https://elpa.gnu.org/packages/excorporate.html"; license = lib.licenses.free; @@ -2233,10 +2261,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "1.2.4"; + version = "1.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-1.2.4.tar"; - sha256 = "0wz6dgkrq4ryvj0kxnzqxwh4i8b9lw15d5dsazjpqa7gfwffpzp0"; + url = "https://elpa.gnu.org/packages/modus-themes-1.3.2.tar"; + sha256 = "085zi3ckf4s1kjskqb04b78rgrhbdhrrp74yksb5w0hl58bd8rsc"; }; packageRequires = [ emacs ]; meta = { @@ -2696,10 +2724,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.2"; + version = "0.4.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.2.tar"; - sha256 = "0ngh54jdh56563crgvf0r4gd6zfvhbkxs9prp12930gav8mdm3sh"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.3.tar"; + sha256 = "0yvwfaj7l4z3zgycvnf1j0r5jx4lryaapljbw2sqvwqpbgyiw0y0"; }; packageRequires = [ emacs ]; meta = { @@ -2741,10 +2769,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.0.0.tar"; - sha256 = "1k06dbh9xqn2vix5qkcapl57v0c21b344r8dx6j5qr4jxirsn2x5"; + url = "https://elpa.gnu.org/packages/posframe-1.0.2.tar"; + sha256 = "19a1dkjyw9m74aamyqrsvzrdwshngqpmjzdngx6v5nifvcilrlnk"; }; packageRequires = [ emacs ]; meta = { @@ -2756,10 +2784,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.5.4"; + version = "0.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.5.4.tar"; - sha256 = "0arjvhzzcf8b80w94yvpgfdlhsjwf5jk1r7vcai5a4dg3bi9cxyb"; + url = "https://elpa.gnu.org/packages/project-0.6.0.tar"; + sha256 = "0m0r1xgz1ffx6mi2gjz1dkgrn89sh4y5ysi0gj6p1w05bf8p0lc0"; }; packageRequires = [ emacs xref ]; meta = { @@ -2801,10 +2829,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "3.6"; + version = "3.7.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-3.6.tar"; - sha256 = "1fmbzh33s9xdvrfjhkqr9ydcqbiv8lr04k5idvbpc9vwjjjan5y0"; + url = "https://elpa.gnu.org/packages/pyim-3.7.5.tar"; + sha256 = "09f34wgzckbxgr5xvaqrj0wdcmnfsb31a6m460f5g0acys20ams5"; }; packageRequires = [ async emacs xr ]; meta = { @@ -3081,10 +3109,10 @@ elpaBuild { pname = "rec-mode"; ename = "rec-mode"; - version = "1.6"; + version = "1.8.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rec-mode-1.6.tar"; - sha256 = "1dhv3n2x0bpdisi9bj3qa0bhpjzhs57fga72s4fxh44gp92yl18q"; + url = "https://elpa.gnu.org/packages/rec-mode-1.8.1.tar"; + sha256 = "0injk27l38d0sl9nzjz2bkd0qgccxyf31i42mwmivv86kv0kyxyb"; }; packageRequires = [ emacs ]; meta = { @@ -3267,10 +3295,10 @@ elpaBuild { pname = "setup"; ename = "setup"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/setup-0.1.2.tar"; - sha256 = "1q29phch4fvmvc255kgvzsnzdqp6kaip7ybpxprd0kkdjs3jrsqv"; + url = "https://elpa.gnu.org/packages/setup-0.2.0.tar"; + sha256 = "1xhjkyksilw1vbx12a4yz4bpj0dhl3m02yi8d9nyd19z098cfa9y"; }; packageRequires = [ emacs ]; meta = { @@ -3297,10 +3325,10 @@ elpaBuild { pname = "shell-command-plus"; ename = "shell-command+"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.0.0.tar"; - sha256 = "1l8lwami4rbp94sbb1k4dvv7z0dvf51s0992xragpn9b9jbx5qd6"; + url = "https://elpa.gnu.org/packages/shell-command+-2.1.0.tar"; + sha256 = "1jyrnv89989bi03m5h8dj0cllsw3rvyxkiyfrh9v6gpxjwfy8lmq"; }; packageRequires = [ emacs ]; meta = { @@ -3691,10 +3719,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.0.3"; + version = "2.5.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.0.3.tar"; - sha256 = "0c77d1ihn17lzk9jb7ss346ryprnbii1zmijl6zj0kk4lm8fpfl3"; + url = "https://elpa.gnu.org/packages/tramp-2.5.0.4.tar"; + sha256 = "0yk4ckk45gkjp24nfywz49j8pazq33m6pga3lirb5h6zc8an5z24"; }; packageRequires = [ emacs ]; meta = { @@ -3736,10 +3764,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.3.0"; + version = "0.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.3.0.tar"; - sha256 = "1a457apfl762nn5xf1h3hbvrgs9hybkxh0jwb2y713zkhhck66cp"; + url = "https://elpa.gnu.org/packages/transient-0.3.2.tar"; + sha256 = "10zqa245dn6z689z7ap6nx6q9s95whzgybpwl2slpmnawxix2q6i"; }; packageRequires = [ emacs ]; meta = { @@ -3927,10 +3955,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.4"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.4.tar"; - sha256 = "1af9ri51i7pn1pcsmbavnwqafrn46vbxrbqjzfi6a7q6n5yv77im"; + url = "https://elpa.gnu.org/packages/vertico-0.8.tar"; + sha256 = "1cdq49csd57vqhrs1nbif79yw4s8c0p2i2ww5n5znzj7rnxwpva4"; }; packageRequires = [ emacs ]; meta = { @@ -4235,10 +4263,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.0.4.el"; - sha256 = "0hkm59qqlsfw3w9ws9xhpmmz30ylifmh05a00ba58zvv1kz04x1g"; + url = "https://elpa.gnu.org/packages/xref-1.1.0.tar"; + sha256 = "1s7pwk09bry4nqr4bc78a3mbwyrxagai2gpsd49x47czy2x7m3ax"; }; packageRequires = [ emacs ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/emacs2nix.nix index cc82646870..658756250a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/emacs2nix.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/emacs2nix.nix @@ -7,10 +7,10 @@ let rev = "860da04ca91cbb69c9b881a54248d16bdaaf9923"; sha256 = "1r3xmyk9rfgx7ln69dk8mgbnh3awcalm3r1c5ia2shlsrymvv1df"; }; +in +pkgs.mkShell { -in pkgs.mkShell { - - buildInputs = [ + packages = [ pkgs.bash ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix index 0114f4dc18..46b20e3852 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210412"; + version = "20210510"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210412.tar"; - sha256 = "17hj4y0c9hjqqa7inzjadz9z64vh621lm4cb0asm13r7d1v186yf"; + url = "https://orgmode.org/elpa/org-20210510.tar"; + sha256 = "015c68pk52vksar7kpyb0nkcyjihlczmpq4h5vdv8xayas2qlzc7"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210412"; + version = "20210510"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210412.tar"; - sha256 = "162nl1a62l9d4nazply93sx4lih11845z87hxmpfd0n7i7s290mh"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210510.tar"; + sha256 = "0pdwjnpcsk75jv4qs8n4xia6vspwn6dndbdx9z7kq5vqz7w4ykmw"; }; packageRequires = []; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index b24f79ed26..325b8d2f5e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -31,20 +31,20 @@ "url": "https://git.sr.ht/~zge/nullpointer-emacs", "unstable": { "version": [ - 20201121, - 1210 + 20210512, + 1001 ], - "commit": "996f822a7c6a7ff7caf49ee537e92c0d01be1f9c", - "sha256": "0fij6gz4188g7dr3gip1w5bc1947j45gf2xc2xl8gyg6hb9c7ycq" + "commit": "655846fd3ce772950d30167b4b9be6ce64502ae7", + "sha256": "0y4v72pmjjly2kxrrwks2z35qbc76109pnqpj637fpjr190c468l" }, "stable": { "version": [ 0, 4, - 1 + 2 ], - "commit": "996f822a7c6a7ff7caf49ee537e92c0d01be1f9c", - "sha256": "0fij6gz4188g7dr3gip1w5bc1947j45gf2xc2xl8gyg6hb9c7ycq" + "commit": "655846fd3ce772950d30167b4b9be6ce64502ae7", + "sha256": "0y4v72pmjjly2kxrrwks2z35qbc76109pnqpj637fpjr190c468l" } }, { @@ -198,19 +198,19 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20210316, - 2027 + 20210417, + 1134 ], - "commit": "e2b3edafd7aafa8c47833a70984d7404c607626c", - "sha256": "0xg651vfjnq5dywg855wf7ld34gnfspql4b0b0413kydhh15fmxi" + "commit": "3076cefea0f6ae9d7757f13c27b5602e007b58ec", + "sha256": "1psy6qpqxh6dm2ix7pwqdcq0rbiy6hyd830g76jk4wvj4spm5rpf" }, "stable": { "version": [ - 0, - 2 + 1, + 0 ], - "commit": "ffafc54e02475b9e7f7bcbe1d8ed3f11bcb4b542", - "sha256": "054sfzvm1ihaxy4hnhl424y5py8k7wi73rb0lqvbi4v8iphihzhr" + "commit": "3076cefea0f6ae9d7757f13c27b5602e007b58ec", + "sha256": "1psy6qpqxh6dm2ix7pwqdcq0rbiy6hyd830g76jk4wvj4spm5rpf" } }, { @@ -221,11 +221,11 @@ "repo": "mkjunker/abc-mode", "unstable": { "version": [ - 20171020, - 1019 + 20210508, + 1552 ], - "commit": "15691b32431b50f9106cb9fa50ee7244957a8ac8", - "sha256": "089l4rmxrnm4fmrbgw98rjigy3hzkx4lkw9hv8gn36cv2fp61h71" + "commit": "80fa954787b57d14e21e19bd65e52abab1686f4a", + "sha256": "0x7y2r5kijzg33jqlwym8lw1ivx00j3g7lzbl171wzyy3qn15bk5" }, "stable": { "version": [ @@ -310,8 +310,8 @@ "flymake", "maude-mode" ], - "commit": "c9b7a2af3232aad8a51138194544c9a427cf46ca", - "sha256": "0h8assjgwwcgnqhlndsc86z9lc1nzlglhvhzxdnkz2ksk90n85q1" + "commit": "3b332ec1e941874f220897e5c0e0a6df762ca28d", + "sha256": "0m7v87w2akdpgr360gyjiw0p5sc6ms3y9bccwi9j4jz4gnlix6l5" }, "stable": { "version": [ @@ -510,15 +510,15 @@ "repo": "atilaneves/ac-dcd", "unstable": { "version": [ - 20210329, - 1928 + 20210428, + 1556 ], "deps": [ "auto-complete", "flycheck-dmd-dub" ], - "commit": "56cdead8c9d2ca64db1f24c59d005ba8b3780bd5", - "sha256": "1z38mg76376xac3rnamzhhmx4h4yzn89xycx7kk51vkcjffjzvg6" + "commit": "56d9817159acdebdbb3d5499c7e9379d29af0cd4", + "sha256": "0p5cjs156ac1x3fsxnb4kc6bd4z09kdkwkyav9ryw5nkrdzv0bd6" }, "stable": { "version": [ @@ -1603,11 +1603,11 @@ "repo": "ianpan870102/acme-emacs-theme", "unstable": { "version": [ - 20200724, - 1833 + 20210430, + 302 ], - "commit": "e416ec678be72eb1aed3de3d88a8a9e3ee7315ca", - "sha256": "0y98il3gsnhm586hr1qdmif4r6v1987fzl82wgx75g8kiy5shbrj" + "commit": "7c408d111c5e451ecb8fdd5f76cf7d8074aec793", + "sha256": "16qxspzlf0bvw36ff4qnrn5p7mc5sf923ba0ar04cr87bfqgyak4" }, "stable": { "version": [ @@ -1786,11 +1786,11 @@ "repo": "louabill/ado-mode", "unstable": { "version": [ - 20210219, - 1548 + 20210510, + 1902 ], - "commit": "438e2b9ca1ce9fd1043998359dfe5a32a0ddb6d0", - "sha256": "1fpk7lc5z9v8an9x8j1v3l2pkbg93368qv23jzsqs84r3ndw5b7k" + "commit": "4832a51c2e94e969a99817ccdd13d656344d0afc", + "sha256": "0iyijlyj1d7k5m9mk3blb4wlam652487jhayrmgfy25snqd8b0sm" }, "stable": { "version": [ @@ -1911,15 +1911,15 @@ "repo": "agda/agda", "unstable": { "version": [ - 20210220, - 2039 + 20210505, + 1142 ], "deps": [ "annotation", "eri" ], - "commit": "3e079614f2b4810ff5920ae69a389da91c855217", - "sha256": "1jn0kp33b77lskhi02d0jm0rpcgxhrpxdj82bmr7vi7m199p5jn0" + "commit": "82abfa4cfbfe7ebdfa818e526d03a1e2d9de5175", + "sha256": "0hxa4mxzxld8rjxydqrygcrdc8pf19jh9l5rbngls1h3knh9b9df" }, "stable": { "version": [ @@ -2015,11 +2015,11 @@ "url": "https://bitbucket.org/agriggio/ahg", "unstable": { "version": [ - 20200304, - 741 + 20210412, + 847 ], - "commit": "0ece48646ef7a8c813005934cc13f984b9998707", - "sha256": "0ypck79bmv4pa8l555kgij69jbpkv4fz9w91qs30lacjmrj0nha5" + "commit": "77bc2a628df006dcd2dc359ac12acdf8091a1356", + "sha256": "1wmvz9d40aznqh2y078v8k7n3l66m48vnf873vifi8rwg6158kqh" } }, { @@ -2378,11 +2378,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20210411, - 1650 + 20210425, + 1035 ], - "commit": "07a4f7315bf5dd609f95e18390a9707b5a29fe9c", - "sha256": "0z0bqs2cqwndkjaiv301l1n4i1g7h6v89cl95inilfxxkyxhbzig" + "commit": "7a1225826798622d5dbe416b1d5e0a6fba8c19d7", + "sha256": "1h85cbr4bnianwk77f6g5k7phcrq5cw8fqxxd6b7x396ffn2pmgm" }, "stable": { "version": [ @@ -2405,14 +2405,14 @@ "repo": "wyuenho/all-the-icons-dired", "unstable": { "version": [ - 20210411, - 1226 + 20210422, + 921 ], "deps": [ "all-the-icons" ], - "commit": "07f035d2f6df4f1e840572784a96f5b407a74680", - "sha256": "134p5wz5jgbwfri6ihwf4p8xxbdmwwzpkklxn195gl46r2zqnnwx" + "commit": "a294f45ec2c338e1255ae2dd98b19f3f143204e6", + "sha256": "1m3gqsgybx57qhdlswbn92cnsz9w10sqfzs2lnja63hzwzwxjg92" } }, { @@ -2504,28 +2504,28 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20210405, - 1824 + 20210505, + 840 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "e7775f85a2bb9c13a4c55417ae8d6f16477e3ca0", - "sha256": "0jys6kvwgkf04cyzxh5r2g38qfcpqas4qqyqqkmp8z8vc68fnwz0" + "commit": "0138c7e7f3b7a6c09665e45a6dd2168359efd47c", + "sha256": "0nbbkasbklxf62rx9mc5w37r014vdbbg3vm5dy03hxzvq3y1yrpn" }, "stable": { "version": [ 1, - 4, - 1 + 5, + 0 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "e918b23d55313a7464d8cb5d45eb917249638e32", - "sha256": "1wz3dgn8cggdkijzm7qf13g3s9gmz6v895bjck7sdhmr5mbr28a4" + "commit": "7f8249ac92321a81d3db11e56888e569988b51d5", + "sha256": "1fwih9qidv0wkqrcsngcainw8b5bxcbk15g5a0p5dpl6hqcxj3rz" } }, { @@ -3104,11 +3104,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20210322, - 1739 + 20210506, + 1306 ], - "commit": "54ac759facadacbfea5c1e7c2975e2da6434cdda", - "sha256": "18pr4bympwl6c2a1bsk4s8ixg4l7ykcxfh1bk42vvbcqnbmvd7dw" + "commit": "bd12129213f5b87aaffc6a6dca25c3c2e4b68301", + "sha256": "18fji3c9ggzw9iyqz3yzxxpkzxr2mndph1cpxcfg5aapfcb5h11l" }, "stable": { "version": [ @@ -3146,8 +3146,8 @@ 20200914, 644 ], - "commit": "3e079614f2b4810ff5920ae69a389da91c855217", - "sha256": "1jn0kp33b77lskhi02d0jm0rpcgxhrpxdj82bmr7vi7m199p5jn0" + "commit": "82abfa4cfbfe7ebdfa818e526d03a1e2d9de5175", + "sha256": "0hxa4mxzxld8rjxydqrygcrdc8pf19jh9l5rbngls1h3knh9b9df" }, "stable": { "version": [ @@ -3468,11 +3468,11 @@ "repo": "dieter-wilhelm/apdl-mode", "unstable": { "version": [ - 20201024, - 1900 + 20210423, + 1115 ], - "commit": "178af26baac72890fca1904aa9e9c90bc1668a4c", - "sha256": "1mkhjp9i4zhbxj72915g6b976dz7jmzyn2ma9x6n85psi3v7ldk1" + "commit": "5e9de43494cc307a3b43b0eebf774c03670a4582", + "sha256": "00lz9mcxcmlgnnbc05b49arxa2fcckjhsxdcqi66v66zn9h8kr13" }, "stable": { "version": [ @@ -3644,11 +3644,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20210408, - 1935 + 20210512, + 1544 ], - "commit": "a21c143b7cc92a0d8402955d079fc78c4140c2ff", - "sha256": "04zs9785b7j16gcgbi26xcl6bhmclprz5pj1jzb40igy7f2kwyqs" + "commit": "12e010d9f10924056035733d5d773281413dc15b", + "sha256": "1n99k5dr9gdgxhaqnzv695q4zsgk5wvahigzcll2k4jbnhja31q2" }, "stable": { "version": [ @@ -3775,11 +3775,11 @@ "repo": "motform/arduino-cli-mode", "unstable": { "version": [ - 20210321, - 1641 + 20210511, + 653 ], - "commit": "1724860a6a930a539472bb56bc3cae0e317dc055", - "sha256": "184phkylr4ax586glx7qx2f8yfdbbjx94vwq698z2yxs4jphni91" + "commit": "a93de7e8fef202163df4657f2ab522b57f70f202", + "sha256": "1jmwjz1ldr0lgh3vvpn8y6qzpqzavmdqcgf9jz4sx0v8nd5hr4pn" } }, { @@ -4031,11 +4031,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20210117, - 718 + 20210501, + 1527 ], - "commit": "d7e7f79ee42311a0187aa2ab4f4e2f8843fa28da", - "sha256": "11r6jzqyywgzxmpq2z97j3ni5b1sv6z5lrjmkqip396bxmw9zxm1" + "commit": "9a8cd0c3d5c120bfa03187c54dba6e33f6e3ca19", + "sha256": "1s2gdilaf38m2dg6nm4kcz5n4n455a9127pl4cbz9lg7mp3l2pg5" }, "stable": { "version": [ @@ -4237,8 +4237,8 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20210407, - 1826 + 20210426, + 1348 ], "deps": [ "dash", @@ -4246,8 +4246,8 @@ "flycheck", "s" ], - "commit": "4b088698ec81f7cd0f715b30e280b37e3881b91d", - "sha256": "1jil04a69fx946vh6f81x3ki84jmmdfz7g3c9v4phddz58clb1sb" + "commit": "a5bc695af27349ae6fe4541a581e6fd449d2a026", + "sha256": "06j1cpqmplh1xy5aal8fk7r8s42jf3zlk92mh3lll9knx81xix9q" }, "stable": { "version": [ @@ -4413,6 +4413,21 @@ "sha256": "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28" } }, + { + "ename": "auth-source-kwallet", + "commit": "047cc780e55a0f574afaf7fa0d94c31ed86cb57f", + "sha256": "1fz63fdfw3cm8k59nxnbsaiylbs0nn5f250fwwfh51bknrqj3vin", + "fetcher": "github", + "repo": "vaartis/auth-source-kwallet", + "unstable": { + "version": [ + 20210421, + 1504 + ], + "commit": "c2abee6ada13d7332725bd700ad76da8aebea530", + "sha256": "1w43mlfslvmqabnm76j0bhkdsb4a2iwwidhm83qqrjpj08cq3ldj" + } + }, { "ename": "auth-source-pass", "commit": "6e63342b442794ead4d8bed803b0924d9cd26dc4", @@ -4424,8 +4439,8 @@ 20210210, 1908 ], - "commit": "468bba286fc20d739ed7724ec884357907ac8bda", - "sha256": "1pazl19rd4fvnfi9i2ssaygby5pw2a821aysy8jswsij57lw40dy" + "commit": "fa8b964494c1ef42035fad340ff5f29fcdbed21c", + "sha256": "0fn30iy1jy0kh09652a0fn7zg93cf3xvs2bz28lml7knj2hbqi2r" }, "stable": { "version": [ @@ -4502,26 +4517,26 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20201122, - 1157 + 20210503, + 2047 ], "deps": [ "packed" ], - "commit": "4952a1a1cadf1bdf7018610a71f8c3acb67962c2", - "sha256": "17p7jmr8qd3hgx79iiljsi2kpy24g8v2ynxiz023wanasxr6bdc6" + "commit": "ec4c700f5a7d6af6992b50d7b309c8d9a7c07a7c", + "sha256": "0b3g81hwaz0qjlzfhqfx0k60injbfka965mc5y4dzlrph00x7slm" }, "stable": { "version": [ 1, 6, - 1 + 2 ], "deps": [ "packed" ], - "commit": "f8619d1616b523918323914ec77bfbee2c559781", - "sha256": "1qcszjjqkq811p8pafjx0knm4giv7dls4x1xamhzbndjz0d022kz" + "commit": "ec4c700f5a7d6af6992b50d7b309c8d9a7c07a7c", + "sha256": "0b3g81hwaz0qjlzfhqfx0k60injbfka965mc5y4dzlrph00x7slm" } }, { @@ -5008,11 +5023,11 @@ "repo": "jcs-elpa/auto-rename-tag", "unstable": { "version": [ - 20201012, - 630 + 20210418, + 1758 ], - "commit": "88c5236280ff8212ff5c74f3e2e654c1a288dbf2", - "sha256": "0q584zrqyz8cc8ib5rll44qvf30xsrjnmdz7yipzqjbvciv6kh7g" + "commit": "8dbf13b344f6d5eba5c4876b18905d30b3118bb9", + "sha256": "1nlwg78d60w6xjpqhrc49nxxvjaxj07wb036rb5jsng9yb6r94m9" }, "stable": { "version": [ @@ -5079,26 +5094,26 @@ "repo": "ncaq/auto-sudoedit", "unstable": { "version": [ - 20200427, - 635 + 20210502, + 1103 ], "deps": [ "f" ], - "commit": "0ad8247fdd0f1d747cd1ff73adb6b5efcecc7f3b", - "sha256": "10p0hc95j382km8655pqld9wxg10j1f36czzppkdd6a55cxarv9f" + "commit": "54a7f295e6b1eecbcc86741aaf5d72e404b43bce", + "sha256": "1rhdvrj2rjbvl7vkb0wcp6krqxcaigl7jk9z8yvhx6s4cm2qli6q" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "f" ], - "commit": "0ad8247fdd0f1d747cd1ff73adb6b5efcecc7f3b", - "sha256": "10p0hc95j382km8655pqld9wxg10j1f36czzppkdd6a55cxarv9f" + "commit": "738fd22452f00fa05daf200f997cb5db2531a211", + "sha256": "1rhdvrj2rjbvl7vkb0wcp6krqxcaigl7jk9z8yvhx6s4cm2qli6q" } }, { @@ -5216,14 +5231,14 @@ "url": "https://git.sr.ht/~zge/autocrypt", "unstable": { "version": [ - 20210411, - 1759 + 20210412, + 1127 ], "deps": [ "cl-generic" ], - "commit": "39c06eb4020c38de8f282340449691210cc23bb8", - "sha256": "0gvdjgfnisx1acy5jmzs82yngmnmiimq1ralbvw9a28knlsdbnig" + "commit": "5b55f8d37545e9c441788627c17e350d7edf4055", + "sha256": "0b06xnjkgwjpxl96mdi674pmvdaiwncifi1a30wxhl1dwr7kr084" } }, { @@ -5272,36 +5287,6 @@ "sha256": "1hyp49bidwc53cr25wwwyzcd0cbbqzxkfcpnccimphv24qfsai85" } }, - { - "ename": "autopair", - "commit": "4150455d424326667390f72f6edd22b274d9fa01", - "sha256": "0l2ypsj3dkasm0lj9jmnaqjs3rv97ldfw8cmayv77mzfd6lhjmh3", - "fetcher": "github", - "repo": "joaotavora/autopair", - "unstable": { - "version": [ - 20160304, - 1237 - ], - "deps": [ - "cl-lib" - ], - "commit": "2b6d72bccb0ebba6e7e711528872b898b0c65b0a", - "sha256": "09p56vi5zgm2djglimwyhv4n4gyydjndzn46vg9qzzlxvvmw66i1" - }, - "stable": { - "version": [ - 0, - 6, - 1 - ], - "deps": [ - "cl-lib" - ], - "commit": "2d1eb81d12f71248ad305e70cceddf08d4fe2b39", - "sha256": "0g6kd1r0wizamw26bhp5jkvpsd98rcybkfchc622b9v5b89a07nq" - } - }, { "ename": "autotest", "commit": "5fc2c4a590cbeccfb43003972a78f5d76ec4a9e7", @@ -5313,8 +5298,8 @@ 20190331, 2230 ], - "commit": "74e1fcbeca25734235afec9c6a4d0cf73736b62c", - "sha256": "0yrcsr4360v222klahbccfq3vb4kp5xdsibydwircv36xhxplzq3" + "commit": "2d76365d2aa13543121d5c623df465adb68b76f7", + "sha256": "1n247g5dq73rkxf0wys5lsbvma44y5qlh577s3rcx7l0yrylwdry" } }, { @@ -5350,8 +5335,8 @@ "cl-lib", "dash" ], - "commit": "69488c71dfc182cf2e7be2d745037f230ade678e", - "sha256": "0l3xsnp5j46jcjc1nkfbfg0pyzdi94rn0h5idfpqikj6f3ralh10" + "commit": "8ec0c27a73b2d0a335eda63fde695a101e2956b2", + "sha256": "1m2r5fg5r4gqhim5l1g5937ngkc2hvidb5kr8r4pffcg8xv8djgn" }, "stable": { "version": [ @@ -5405,11 +5390,11 @@ "repo": "avkoval/avk-emacs-themes", "unstable": { "version": [ - 20201223, - 750 + 20210507, + 1127 ], - "commit": "d5471776c01a2bdf2a1fa255a79447489cf68e65", - "sha256": "1m1s7fzl8hxzkx0672l62jpkak0v8vdyb7l6nmw9648rww78gzyl" + "commit": "2da6de854b07f696da0cbc9e6961b3d228295f5e", + "sha256": "14rqaf6gaxabz92s9cv9fm7pjhc2vm154yjyvj3phaj188nn298x" } }, { @@ -5457,8 +5442,8 @@ "avy", "embark" ], - "commit": "a005eef82a63950927a68a5ef79b33d25245687b", - "sha256": "1dy01y87bqjddsdjqhmp6m144azn72yswsj0prywm5alxypck9lg" + "commit": "d82f8c73fae4d2d7283838cf5111366384775977", + "sha256": "0268sdajb0213ggcshx6grwqx776qdi246nklhyxavxcyg4hw567" }, "stable": { "version": [ @@ -5775,11 +5760,11 @@ "repo": "mschuldt/backlight.el", "unstable": { "version": [ - 20200813, - 1839 + 20210513, + 129 ], - "commit": "38fcb9256c3bf7300a41332fa7f9feffc4e2db9a", - "sha256": "0982il82v10yclm87b06ghwv4cglw03ia0zs4m838ag6zg8a08jg" + "commit": "b6826a60440d8bf440618e3cdafb40158de920e6", + "sha256": "0nj5l0wwza1j908n9k0896b972b84s401szkgb0acf4fs834vc0w" } }, { @@ -6043,11 +6028,11 @@ "repo": "belak/base16-emacs", "unstable": { "version": [ - 20210406, - 1956 + 20210506, + 1530 ], - "commit": "b35d21ae0d46856416b64851ccbb5e44ee9498d0", - "sha256": "04vs50a5wh0ziq34hh9li5d84nv39p3akaync1i9sbmr4kxkhr1l" + "commit": "59692942f34b9be0447a7766ad03115d04e79874", + "sha256": "1la7671sz666in8zx35j517sbj2y4jyasnj0x9yxh5n4g5qdrnbp" }, "stable": { "version": [ @@ -6517,11 +6502,11 @@ "repo": "DamienCassou/beginend", "unstable": { "version": [ - 20210320, - 1115 + 20210504, + 341 ], - "commit": "18d0bbde367dfe259d697d1c589e3040d69797ee", - "sha256": "13gdlaiqi3jnavwrwj5ic9aqycfvbzw8d4v0413nwzag35bz4mpl" + "commit": "4b4e4808dc3248ea61b3d8bdd7c6b73edd3b6902", + "sha256": "0cx8k5vvqkhkaa9ay4cnb2gshi8118zq87ddbxmffai6ryj2lg7b" }, "stable": { "version": [ @@ -6830,14 +6815,14 @@ "repo": "cpitclaudel/biblio.el", "unstable": { "version": [ - 20200416, - 1407 + 20210418, + 406 ], "deps": [ "biblio-core" ], - "commit": "242c3f3ac1198b1e969e2a34d6348354a9d83345", - "sha256": "0m1ih8p7s3335wah1wzaiipqphvjd88nyig582ja3ra6xkvazf00" + "commit": "517ec18f00f91b61481214b178f7ae0b8fbc499b", + "sha256": "0m5vpyj6312rc3xq8lrr1g2hyl26adzwvjxb3jqrm7bvqvs4i5zp" }, "stable": { "version": [ @@ -6877,16 +6862,16 @@ "repo": "cpitclaudel/biblio.el", "unstable": { "version": [ - 20210311, - 2310 + 20210418, + 406 ], "deps": [ "dash", "let-alist", "seq" ], - "commit": "242c3f3ac1198b1e969e2a34d6348354a9d83345", - "sha256": "0m1ih8p7s3335wah1wzaiipqphvjd88nyig582ja3ra6xkvazf00" + "commit": "517ec18f00f91b61481214b178f7ae0b8fbc499b", + "sha256": "0m5vpyj6312rc3xq8lrr1g2hyl26adzwvjxb3jqrm7bvqvs4i5zp" }, "stable": { "version": [ @@ -6917,8 +6902,8 @@ "a", "pdf-tools" ], - "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f", - "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q" + "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984", + "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b" } }, { @@ -6966,14 +6951,25 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20210411, - 1846 + 20210511, + 12 ], "deps": [ "bibtex-completion" ], - "commit": "516cbdb63810bcb571e41436e2c568c328fc8980", - "sha256": "0n3byfv1khn2lr9c1r619gc52993hf01nwl5c7ih7nmrr5q3rckk" + "commit": "d994b7e34e39adcc069685220c7c3cb7516625b9", + "sha256": "1jxdfyf68d1gc240kzvllzlk7wzhsdg4m50r8g6m6a9xnyzi68ad" + }, + "stable": { + "version": [ + 0, + 4 + ], + "deps": [ + "bibtex-completion" + ], + "commit": "c18b1ad05168597a3cbaee67775d15d2ebb737f4", + "sha256": "0x45wq2nw753dz6694li3f0zmjm0rljmrr5rvj2qrhgqldlwn6zn" } }, { @@ -6995,8 +6991,8 @@ "parsebib", "s" ], - "commit": "9870333cdd4a54b309e2709af647cda6f4070a42", - "sha256": "02cpg60hif4rz6va2ynh3wc9dwj0nyig4fa0l6jchmzz8v2zvf86" + "commit": "9f6ea920a49457d85096caa0e61f086a42b2908e", + "sha256": "0dqf2anmjlgcz7xn4q2pw8cfmhwdhdg4fm8q41vhrp60ymbc6dik" }, "stable": { "version": [ @@ -7201,8 +7197,8 @@ "deps": [ "seq" ], - "commit": "9cec78c685dbca51ab9d1014eb535a541083effc", - "sha256": "065cqvdjdb5w60b7ga7q51920ib5vpz63zq9s68q0fjwb55q3k8z" + "commit": "52f1c11b01a5f7e7a470a73dec4c3335dea4124b", + "sha256": "00kjjr28bvimbdhg016n0g6ws1lix87c1bic1xb3nk0bvnbkpwfp" }, "stable": { "version": [ @@ -7609,11 +7605,11 @@ "repo": "joodland/bm", "unstable": { "version": [ - 20201116, - 2341 + 20210421, + 1351 ], - "commit": "dc69eb6e431151d3942cb812b7161e6f23c28c07", - "sha256": "0gxj8m8q4md1kaay5ymsyynw5990apnqxa6lw73y8w1py785drmn" + "commit": "9a31c61f44e6f1033ca43bd7f3eb33ffdb2ca595", + "sha256": "0iizqcbxm8yjv1fz2lhn23vbyzmmc8g6xazk0glv9mrldmmppgn5" }, "stable": { "version": [ @@ -7658,8 +7654,8 @@ "deps": [ "cl-lib" ], - "commit": "d88eef69ae66ea1ffa21a65317afe84c9ddb0814", - "sha256": "1bci2w8drwgcli9hqg55izaxpwq4fvqdigvlrfc0524s7021ij24" + "commit": "2d1ee12f3ba6e75841066bf429d7bf836d4b89d7", + "sha256": "1hls8463fl8ndbfry1x4pimx2fz1b9zl3b6wfgcrb3jw3p4ys86x" }, "stable": { "version": [ @@ -7840,8 +7836,8 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20210323, - 1341 + 20210509, + 1905 ], "deps": [ "dash", @@ -7849,8 +7845,8 @@ "multiple-cursors", "pcre2el" ], - "commit": "17a7a9219a5a9b7156f58f7f30227fc2b79b6020", - "sha256": "1jcvz9vy5sz9bysrlg2b9d3732zab8hmg8hg5ghwjx5kgxl2yfzh" + "commit": "f1fba331e1941d9cc805e5636c1475665d81c9f6", + "sha256": "1b022y4rd2i2i934bihpjwpm90jac842c2jd3q6qm66k0f588bqc" }, "stable": { "version": [ @@ -8068,25 +8064,25 @@ "url": "https://bitbucket.org/MikeWoolley/brf-mode", "unstable": { "version": [ - 20210325, - 2154 + 20210501, + 1723 ], "deps": [ "fringe-helper" ], - "commit": "733a44bc491d9d28f9eefc2550616e97b1419cee", - "sha256": "0dfd3w3g31fjzqvzn57xw3whr60fy8yj8hnga8b4n9698dihw0bn" + "commit": "9d6b6797c465589ca39a1020d7af5775f5ddc801", + "sha256": "1jpsrsc4qi2yiwxccdagxz1gj9fgzaxnd5fszgdmwvsgzqwfasvh" }, "stable": { "version": [ 1, - 19 + 20 ], "deps": [ "fringe-helper" ], - "commit": "0024b1a276c43fde0d85011b51b5aaf1f201da64", - "sha256": "1nnhb0vyx5f3f7h2fsg2p7656kcsk7ahrndxrhs7a77svnr426lb" + "commit": "9d6b6797c465589ca39a1020d7af5775f5ddc801", + "sha256": "1jpsrsc4qi2yiwxccdagxz1gj9fgzaxnd5fszgdmwvsgzqwfasvh" } }, { @@ -9634,15 +9630,14 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20210327, - 1821 + 20210422, + 657 ], "deps": [ - "markdown-mode", - "rust-mode" + "markdown-mode" ], - "commit": "4846373bf1ed6268f1a1d9f9c489f8740351d8bb", - "sha256": "0y4wxddjp055kisv7yx6zs9bzggw65b08aa1g3y0vlaafrps8bga" + "commit": "0174599fd1c1b429042c7ca67c3d45f07441a43d", + "sha256": "0qm6cgzsr86s1rcvqpv8x5b3r1v7nq7z8il8ci4vlw9hk0wg65a2" }, "stable": { "version": [ @@ -9729,8 +9724,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20210410, - 2057 + 20210424, + 125 ], "deps": [ "ansi", @@ -9741,27 +9736,26 @@ "s", "shut-up" ], - "commit": "dce91052dc8fae386a1898fd88d554b5cb527fdc", - "sha256": "1j853gbdc50s1csvsi2a0f6i2vakgnd8afb97qkkj5alpwq8883p" + "commit": "81edfa78428fd2d9689507fd4d3b13c24cd99323", + "sha256": "071biqz1fv3rzjbn9xprpazk65xfl78hzhf2gdvz944pks3rhdfi" }, "stable": { "version": [ 0, 8, - 6 + 7 ], "deps": [ "ansi", "cl-lib", - "dash", "epl", "f", "package-build", "s", "shut-up" ], - "commit": "610894d57f467a55fb146ade4d6f8173e4e9579b", - "sha256": "1y12m5sjgws4a4bikr8d1ccysy55j7xx3cp1qii4pw62bkf9y2bq" + "commit": "9600dd9a341c61ac006c0a44912e13f3810f3c54", + "sha256": "0aqc3p7i00rbdgj2cjil71c8wqq9ard637fnpdq1ny6wnb8kblm7" } }, { @@ -9937,11 +9931,11 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20210403, - 1958 + 20210501, + 820 ], - "commit": "a266f70eb99ffb657b7821c2e1de49f5184a59ed", - "sha256": "0j1gcsi40yrfy9saqjdhxnwsvmqf32l9mnwfvhbbfxm82ddhwxnk" + "commit": "7a7e1ecaf7f4f68058f1b8831d0b7b839d228614", + "sha256": "0gcgbr28j88a73p5ng4f20qp0fx288na9hi4fnj32grqyrl6f1pq" } }, { @@ -9989,8 +9983,8 @@ 20200904, 1431 ], - "commit": "a266f70eb99ffb657b7821c2e1de49f5184a59ed", - "sha256": "0j1gcsi40yrfy9saqjdhxnwsvmqf32l9mnwfvhbbfxm82ddhwxnk" + "commit": "7a7e1ecaf7f4f68058f1b8831d0b7b839d228614", + "sha256": "0gcgbr28j88a73p5ng4f20qp0fx288na9hi4fnj32grqyrl6f1pq" } }, { @@ -10124,15 +10118,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20210309, - 1822 + 20210507, + 1633 ], "deps": [ "cl-lib", "powerline" ], - "commit": "df972095135de90b47413190f61ec4f5af33f9f1", - "sha256": "0is51bc9zd9lr0y59md2ci4ddlfylp5jb9hwyll9r6j8gn3lrzza" + "commit": "9c7c936e4e1de6f4f4095d70e43c9ae738d05086", + "sha256": "0h0v3yiz9qis99l83x588b94va13jzanfwacmgvq29ygp0a87n65" }, "stable": { "version": [ @@ -10259,8 +10253,8 @@ 20171115, 2108 ], - "commit": "02478862ea707ed51223c1d5d2d8cd8d61d2915d", - "sha256": "0vf94pkd2slwkrgv93yqh2qb2y72bzya9nq5gmqd0g08nb6kdmjx" + "commit": "794e723a8d4baf40bab11adcd22e3c7659f8e395", + "sha256": "055p90swfnvl2jp6kp22z5rgfmwwwmgiwq80n6pijgk43dxhwlh9" }, "stable": { "version": [ @@ -10694,6 +10688,21 @@ "sha256": "1niin51xwkd8q3wbwcgb0gyk3sw1829qj2p2zv7fm8ljy1jicn2d" } }, + { + "ename": "chembalance", + "commit": "780449de5166ddfc2a87ecaf4127f18bf4e7f81f", + "sha256": "14qqqzq5xj18f46pibdyfbypffd7xdimazcgv7mshbg5kyyryr73", + "fetcher": "github", + "repo": "sergiruiztrepat/chembalance", + "unstable": { + "version": [ + 20210504, + 1505 + ], + "commit": "a3e1b65ece2fd41540bb480b5c5ee5dd19d4b9dd", + "sha256": "1hd77h27hcb1fcca1x64rxl8jmvyr5zni3nfnpqm5cknkh9qr6ma" + } + }, { "ename": "cherry-blossom-theme", "commit": "401ae22f11f7ee808eb696a4c1f869cd824702c0", @@ -10870,59 +10879,57 @@ }, { "ename": "chronometrist", - "commit": "9031f880b8646bf9a4be61f3057dc6a3c50393e8", - "sha256": "1xjxq257iwjd3zzwqicjqs3mdrkg9x299sm7wfx53dac14d7sa9g", - "fetcher": "github", - "repo": "contrapunctus-1/chronometrist", + "commit": "df1ca228013952fbb6b5a4a032449e6709266b2f", + "sha256": "1054d9d7r1gb3y1pw6pj46lx0wcax2xrmb7qkpzj8kh26vcpydi7", + "fetcher": "git", + "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20210211, - 601 + 20210507, + 923 ], "deps": [ - "anaphora", "dash", - "s", + "literate-elisp", "seq", "ts" ], - "commit": "d1b42bbf0d134ee6ed6f423956a355ba0a7ac968", - "sha256": "1k7r5rc6vzrnhp9j5bkv45yzqz7zbqrkiry4fzc8w6f36pcw862f" + "commit": "81b12053bc5c645ef27577cc9e6258c4cc8b3f33", + "sha256": "0s483ca4f8192gr9ix9jxjfcmxp30b7qk2jiaqzprkrn9kcgw544" }, "stable": { "version": [ 0, - 6, - 5 + 7, + 0 ], "deps": [ - "anaphora", "dash", - "s", + "literate-elisp", "seq", "ts" ], - "commit": "d1b42bbf0d134ee6ed6f423956a355ba0a7ac968", - "sha256": "1k7r5rc6vzrnhp9j5bkv45yzqz7zbqrkiry4fzc8w6f36pcw862f" + "commit": "81b12053bc5c645ef27577cc9e6258c4cc8b3f33", + "sha256": "0s483ca4f8192gr9ix9jxjfcmxp30b7qk2jiaqzprkrn9kcgw544" } }, { "ename": "chronometrist-goal", - "commit": "61031b9ab0c0dedf88e6947ae2ad8d4ad0351210", - "sha256": "0hcww5qy167fiwwkj33pj8fdc89b61mb767gz85ya5r6d5nd4si3", - "fetcher": "github", - "repo": "contrapunctus-1/chronometrist-goal", + "commit": "df1ca228013952fbb6b5a4a032449e6709266b2f", + "sha256": "05z9jwjf9py0bfxgilh2x05pqjyg9zamf4zl6s6fb7fiz7mfm9k5", + "fetcher": "git", + "url": "https://tildegit.org/contrapunctus/chronometrist-goal.git", "unstable": { "version": [ - 20210104, - 336 + 20210510, + 1831 ], "deps": [ "alert", "chronometrist" ], - "commit": "7a878bd3709b9638caff17b5f49b27c03b06862a", - "sha256": "1gyz0cfq7sqqrcj8d5ikm6xqmbg3njhmbi291fs5jr8bdqrcbbmg" + "commit": "6cb939d160f5d5966d7853aa23f3ed7c7ef9df44", + "sha256": "05jcn67fzf349h3vqvfrwhklan0i037mp0nq53wghfzapv1m7lv8" }, "stable": { "version": [ @@ -10994,8 +11001,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210408, - 1212 + 20210508, + 948 ], "deps": [ "clojure-mode", @@ -11006,14 +11013,15 @@ "sesman", "spinner" ], - "commit": "fd2bb0c64eb3590cffa91188644d1e40fbbc634b", - "sha256": "0mhscf5cpcqs68c863ns6rbjwr1p71wb7kp80ds5qzar8x2k2qwn" + "commit": "6c876766776d69847ca0838a162da2b686add6e7", + "sha256": "0s59227hvc6pl0dcwrn39smysapf3mrnyj5mfq525v0dbsh6vik4" }, "stable": { "version": [ + 1, 1, 0, - 0 + 1 ], "deps": [ "clojure-mode", @@ -11024,8 +11032,8 @@ "sesman", "spinner" ], - "commit": "140b062e62165e536dcdb878a00f492a1d5b3518", - "sha256": "143kh9k34yk0g6kdlkma6g432kmb2r9r1lhyq4irsw6d3vaql7dj" + "commit": "45f6125301fbbe69333dc450804ce8ecdd611539", + "sha256": "1kf4056bga3cr40mm812m21r9mi0r30gn9v3jil3q6yhb5bm1gcl" } }, { @@ -11198,14 +11206,14 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20210323, - 1704 + 20210508, + 1616 ], "deps": [ "cl-lib" ], - "commit": "e67e2d1149ebf3e79cd2162e78802af3ed5f82da", - "sha256": "0jrpa8kndq2v69nr9jva970q0n3662x2g0chg89nd2d3gbv693mw" + "commit": "2798a75d625677402b01f138ebac6eb53337d9d6", + "sha256": "0r7k7cxs6gfam1rdy04vdq3q796v32wv5q9gq67sxfji8x1vbkn7" }, "stable": { "version": [ @@ -11545,6 +11553,21 @@ "sha256": "19q6zbnl9fg4cwgi56d7p4qp6y3g0fdyihinpakby49xv2n2k8dx" } }, + { + "ename": "clhs", + "commit": "8db8f451b28ff1ff4bdab5883138a2bc8964973e", + "sha256": "0089c3p37dzf02sk3vwj11x6pyincqh4gil38g76i5p989vjrc50", + "fetcher": "gitlab", + "repo": "sam-s/clhs", + "unstable": { + "version": [ + 20210428, + 1911 + ], + "commit": "7b106c4fb5a6388ab753f94740f6dfadcdeedcbb", + "sha256": "06jwk5i445y800xizp7nv3yzxxfyll6485n4h6vd5xvrpnq3kqxa" + } + }, { "ename": "click-mode", "commit": "1859bb26e3efd66394d7d9f4d2296cbeeaf5ba4d", @@ -11600,14 +11623,14 @@ "repo": "redguardtoo/cliphist", "unstable": { "version": [ - 20210301, - 748 + 20210426, + 245 ], "deps": [ "ivy" ], - "commit": "1ef50459fa6044c4d571cec0009368948bcf5fc5", - "sha256": "0xba2gxwy1y8zl9nvga186873icvwfi0yan3qbw2vdkpzry5ifhk" + "commit": "0d02d72fb63453ff5623b26234a63f66090da7ac", + "sha256": "033z367nmfh6mc1k8kv2m3xsxjw44hnvgiai2n7fp4h9jdv5j8h8" }, "stable": { "version": [ @@ -11705,8 +11728,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20210407, - 724 + 20210413, + 733 ], "deps": [ "cider", @@ -11719,8 +11742,8 @@ "seq", "yasnippet" ], - "commit": "9f88174878d62e3906be5b04b8ba7788e6ca4570", - "sha256": "155lhb3myzxpxnnp257p3rxhgw9xmr3l2h39gj23q5sr0hhsnm5s" + "commit": "f50fb242ba0ff8526746ae0ffeb19b9a535c00b2", + "sha256": "0ajnc3x7fy9mlgdrfq1p1hvafcisvdnilh9vv0h5s091qkvv3hp9" }, "stable": { "version": [ @@ -11967,20 +11990,20 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20210322, - 704 + 20210505, + 712 ], - "commit": "a14671e03c867c9d759ee9e59cdc5cecbf271245", - "sha256": "1jnqwcspm7c3v33wywvm605hsf6vp29ym3smy2jaq8j5vwywi8k3" + "commit": "33f267ac182afe8fa82cc321e9f515c0397e35f6", + "sha256": "1v5gqpkw63h4h1c5kyw8dwg08famp89vbgi789yb32md5819l52s" }, "stable": { "version": [ 5, - 12, + 13, 0 ], - "commit": "3dc12d3a54ab17dee2db36c8fc48eb9598a17c5e", - "sha256": "14ipfy9ji39pnb9x7bzjp8lyqyxk168fx017m823j7a2g9i0sgp3" + "commit": "0e886656c83e6e8771f748ec698bb173adcb0968", + "sha256": "1ikl29rygr1habcsglz07m4ihd4ivi732kkzg8q676ihf367wa9i" } }, { @@ -11997,20 +12020,20 @@ "deps": [ "clojure-mode" ], - "commit": "a14671e03c867c9d759ee9e59cdc5cecbf271245", - "sha256": "1jnqwcspm7c3v33wywvm605hsf6vp29ym3smy2jaq8j5vwywi8k3" + "commit": "33f267ac182afe8fa82cc321e9f515c0397e35f6", + "sha256": "1v5gqpkw63h4h1c5kyw8dwg08famp89vbgi789yb32md5819l52s" }, "stable": { "version": [ 5, - 12, + 13, 0 ], "deps": [ "clojure-mode" ], - "commit": "3dc12d3a54ab17dee2db36c8fc48eb9598a17c5e", - "sha256": "14ipfy9ji39pnb9x7bzjp8lyqyxk168fx017m823j7a2g9i0sgp3" + "commit": "0e886656c83e6e8771f748ec698bb173adcb0968", + "sha256": "1ikl29rygr1habcsglz07m4ihd4ivi732kkzg8q676ihf367wa9i" } }, { @@ -12263,8 +12286,8 @@ "repo": "atilaneves/cmake-ide", "unstable": { "version": [ - 20201027, - 1947 + 20210512, + 630 ], "deps": [ "cl-lib", @@ -12272,8 +12295,8 @@ "s", "seq" ], - "commit": "2330f91e51e6cf8a46ce595be3deb0feda223f75", - "sha256": "0y5wbnf1pkzi7jvbvfhybwvbymg13fknpsyychb6f9mdkzcmik4j" + "commit": "89b03795a02dcbfb14046c97230e82736a02f874", + "sha256": "027j4dcvjvvnjh6aln8brmi8xny787n0y2ycrajx043zjmh6x0cg" }, "stable": { "version": [ @@ -12300,19 +12323,17 @@ 20210104, 1831 ], - "commit": "b1c739ad8bcacae6d66d88514102dcd4423c2dcb", - "sha256": "1jwkscld38b6b6f4w3hw1m9dgdvcvbbwwfx2dd5v7548mp3wpxrj" + "commit": "169d998bb8cb43e4f7793381fbd79781ffb1548e", + "sha256": "06mha58ld59yq3anh825f4zzdbplq1k71ygkcysh3blnlqzamkz4" }, "stable": { "version": [ 3, 20, - 0, - -1, - 5 + 2 ], - "commit": "fab7fe7ef5a5462952297611c1dd668a603e3a36", - "sha256": "12v6v1hpw0ykkikj4qid3m4m7sb164rgpx6fxin4hvsm20pjcrd4" + "commit": "1ad4501ae97fb6c6deab096ff0ac7e03d554e26d", + "sha256": "0zr4zbbd1zng0v3mj8kql0ci2w18p4izjfq7hh6g5adq6l7ckfhm" } }, { @@ -13271,11 +13292,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210411, - 2221 + 20210510, + 2326 ], - "commit": "4037e82cf82b459b6a1d8529f2a3bb3e310fbdf7", - "sha256": "0hqm4529cng2zwj5nlm9b5k1yngf0viywmrq7k052g3fpx21b4l2" + "commit": "54fb45080755691793eefa2bd01539e0768c6f63", + "sha256": "0cvgln4vvssfjmhsyqhb1nz5q6jn7fl2bkpq6sm2zr7ga05389ka" }, "stable": { "version": [ @@ -13516,8 +13537,8 @@ "repo": "cpitclaudel/company-coq", "unstable": { "version": [ - 20210324, - 1603 + 20210420, + 215 ], "deps": [ "cl-lib", @@ -13526,7 +13547,7 @@ "dash", "yasnippet" ], - "commit": "7423ee253951a439b2491e1cd2ea8bb876d25cb7", + "commit": "6a23da61e4008f54cf1b713f8b8bffd37887e172", "sha256": "15rd9ga4ydhl6ljzdg26a3kcaqlhaygp67507wrrf8j3801ivks4" }, "stable": { @@ -13690,15 +13711,15 @@ "repo": "dunn/company-emoji", "unstable": { "version": [ - 20201212, - 2325 + 20210427, + 2151 ], "deps": [ "cl-lib", "company" ], - "commit": "4ba7dc60ba67f736e698a5fa0b754b866f36a646", - "sha256": "1rhf2hr345953mkn52i58aiq8j16ps2ckapd5f7jxmhkcpzxxfhk" + "commit": "90594eb58b20fb937cfd4e946efcc446ee630e6f", + "sha256": "08dx812vg92bkwp0ham40rv3x9648x7y5bmbvphcc71s9knfgxcz" }, "stable": { "version": [ @@ -14041,8 +14062,8 @@ "lean-mode", "s" ], - "commit": "5a2a36356e73c74a42e49fad19a71f4f12929a90", - "sha256": "18lswxxwvp85yzg1kc9vxn4dpmxmj40j6g64c8ns83nb7hw9lszg" + "commit": "bf32bb97930ed67c5cbe0fe3d4a69dedcf68be44", + "sha256": "1bkv5zs38ijawvavbba0fdf2flb6fiwici3qi99ws8wvwhnbkws2" } }, { @@ -14455,15 +14476,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20210331, - 325 + 20210419, + 607 ], "deps": [ "company", "posframe" ], - "commit": "a28f38213a2a30ce68fdb0b124cadc68ebbcb24f", - "sha256": "1ys40y62c0aqs8nlyhnkahb67slh0i4dpvxvj8mcvcmp68aiih3f" + "commit": "c7a820a35ff132aaec53c81e05afc829de39eb68", + "sha256": "0fyc7c4r4jfa5y0x9lfcqlx0qazg1d4il5p0bdw4hdcpjd2h26ys" }, "stable": { "version": [ @@ -14494,8 +14515,8 @@ "company", "prescient" ], - "commit": "ed2b762241bbea03e374dc9dcd4fbe207c6b2ea4", - "sha256": "03c0dmblixh5mx8365b6608l7z3vcgp6pzdflwqf8nfwj2c5rm0w" + "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4", + "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n" }, "stable": { "version": [ @@ -14621,15 +14642,15 @@ "repo": "TheBB/company-reftex", "unstable": { "version": [ - 20201116, - 1605 + 20210418, + 1316 ], "deps": [ "company", "s" ], - "commit": "291c283c8a015fd7cbaa99f836e1a721f1e2c832", - "sha256": "0qwmjqcpi10lwsrppifjyr041hmgqb86nxpb970rb1m3n9p5rnk0" + "commit": "42eb98c6504e65989635d95ab81b65b9d5798e76", + "sha256": "0x5zhhy70cdhbark2vm364bazg2mbwlhy7123qyq02knsjdwwqrl" } }, { @@ -14749,8 +14770,8 @@ "company", "solidity-mode" ], - "commit": "b83354943626ea7c50011d5806b17be17077d1c4", - "sha256": "0h4fyyv2k44x67nwqflh3zpazfkcf5zbgdzwjxbwjgvvxm1hdqlx" + "commit": "383ac144727c716c65989c079ae76127e25144c3", + "sha256": "1q4b8623mygzp3qwy5bmb3hipzjfri9007x0ilq3i7k5bs34jz9r" }, "stable": { "version": [ @@ -14775,17 +14796,16 @@ "repo": "nathankot/company-sourcekit", "unstable": { "version": [ - 20170126, - 1153 + 20210430, + 2155 ], "deps": [ "company", "dash", - "dash-functional", "sourcekit" ], - "commit": "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781", - "sha256": "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n" + "commit": "a1860ad4dd3a542acd2fa0dfac2a388cbdf4af0c", + "sha256": "18pv1hcilj7kndr7a29jjskp21khh1sd0wy01h8y8y9mf70kikg6" }, "stable": { "version": [ @@ -15162,11 +15182,11 @@ "repo": "muffinmad/emacs-completions-frame", "unstable": { "version": [ - 20201123, - 1213 + 20210430, + 640 ], - "commit": "95e0845fdac5412a511ca15b12189ed9487a64a7", - "sha256": "1mz7dxa4bhay4h2kh1f4g4dwsfswidlhiy11s4a6l3zjqjj8hklb" + "commit": "860e5b97730df7ef5c34584ad164bc69c561db84", + "sha256": "026qzq1ddk1acqsgbsd2nk2g5gm9ml2sq31rnsdapzaj4rxa192w" } }, { @@ -15467,19 +15487,19 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210411, - 2120 + 20210511, + 1023 ], - "commit": "812204b647b1f45cc9d04d7d2f565061940f5e70", - "sha256": "11jpmswhx5x69wsrl5mg9wmxm49hqkdn2r9swz9z7hikk7485mx8" + "commit": "b873ceeefcb80ae0a00aa5e9ce7d70a71680aa4b", + "sha256": "1d0q8h6mdbmcgfqiz41rcmyrqmwyg1mq76lhp4f8gyxil7w4icb4" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "3184edd6ccf9cfb300511feb297b9012ce902bbe", - "sha256": "09n3q3dyi83s4fk4z7csnjicbxd69ws4zp4371c1lbxcvvq2fdnd" + "commit": "7480f020e57036ef14c2fda1d83c830583b2a53b", + "sha256": "1kzwybp87srckd1238drdcn9h7jyyqz9pzcwvw3ld8bgyyrwsxkj" } }, { @@ -15490,27 +15510,60 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210410, - 1355 + 20210429, + 1158 ], "deps": [ "consult", "flycheck" ], - "commit": "812204b647b1f45cc9d04d7d2f565061940f5e70", - "sha256": "11jpmswhx5x69wsrl5mg9wmxm49hqkdn2r9swz9z7hikk7485mx8" + "commit": "b873ceeefcb80ae0a00aa5e9ce7d70a71680aa4b", + "sha256": "1d0q8h6mdbmcgfqiz41rcmyrqmwyg1mq76lhp4f8gyxil7w4icb4" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "consult", "flycheck" ], - "commit": "3184edd6ccf9cfb300511feb297b9012ce902bbe", - "sha256": "09n3q3dyi83s4fk4z7csnjicbxd69ws4zp4371c1lbxcvvq2fdnd" + "commit": "7480f020e57036ef14c2fda1d83c830583b2a53b", + "sha256": "1kzwybp87srckd1238drdcn9h7jyyqz9pzcwvw3ld8bgyyrwsxkj" + } + }, + { + "ename": "consult-lsp", + "commit": "c2d4a871be8f52fcfd24c3823382a983d9dcce46", + "sha256": "0qrillb8yg8lzilbf40y8c9jpf8jyhfdry2xp6d9mlfnkrdc1qr0", + "fetcher": "github", + "repo": "gagbo/consult-lsp", + "unstable": { + "version": [ + 20210428, + 1515 + ], + "deps": [ + "consult", + "f", + "lsp-mode" + ], + "commit": "12989949cc21a1173206f688d56a1e798073a4c3", + "sha256": "0g3bpi53x6gr9631kzidbv4596bvdbxlr8y84ln40iwx5j8w6s7p" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "consult", + "f", + "lsp-mode" + ], + "commit": "c4c0426b58946578ac1806a60258d2b275d5b524", + "sha256": "11lrnv5ssiwwdvdib05nz070yc3w9lfcqikgnl3bq8gbcrm9zjf4" } }, { @@ -15895,15 +15948,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210404, - 1716 + 20210509, + 830 ], "deps": [ "ivy", "swiper" ], - "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245", - "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36" + "commit": "11444e82ad3ec4b718b03ee51fc3ba62cbba81bc", + "sha256": "1bvqicw10lz048lwn4p4ilxyk3sfmplclz1gk6zsyimf72y3xymg" }, "stable": { "version": [ @@ -16207,14 +16260,32 @@ "stable": { "version": [ 1, - 0, - 0 + 1 ], "deps": [ + "ivy", "swiper" ], - "commit": "33d709f5b73a68093ec9414c774844d5f4983aee", - "sha256": "120i4j4bw3v1ybcwrfpn0v7jphhk7hhlp738m60fck97p9lwfyy0" + "commit": "8cadd2e96470402ede4881b4e955872976443689", + "sha256": "1chfrzkqfsw1rlwkb3k7v827fwipg0cish22rr3sxxydxr7kysx5" + } + }, + { + "ename": "counsel-mairix", + "commit": "2ca80edc78250911b84e806f750d5474e7d93e86", + "sha256": "1i535x0xw9sj602l70sabg6y5mxzff5wlr0gpfqw9by5g7q79w95", + "fetcher": "git", + "url": "https://git.sr.ht/~ane/counsel-mairix", + "unstable": { + "version": [ + 20210422, + 649 + ], + "deps": [ + "ivy" + ], + "commit": "39fa2ad10a5f899cb3f3275f9a6ebd166c51216a", + "sha256": "1z5qn9k68413jr946dy53l02zk2b1qx6wl5w3gp0jh34i3b6yk2y" } }, { @@ -16546,6 +16617,21 @@ "sha256": "1qf1s0997n6bfx50bd0jln25p7z6y8pfibijnbqcg2011xmv5dqh" } }, + { + "ename": "cowsay", + "commit": "1731327f28b2b47285a526b3ddd322d5b4a862e8", + "sha256": "0f2iq8jd2w5bcsv4yksyj7l50g9yvi28dhjx29dyxlywbj0nqz98", + "fetcher": "github", + "repo": "lassik/emacs-cowsay", + "unstable": { + "version": [ + 20210510, + 1540 + ], + "commit": "d8a72a311c6875f1aef6a30b3d23a1b02df75941", + "sha256": "0sczdlhpqs0pgka426ngvvcf01c6lvgk2aykajc5b2zgxywkfg40" + } + }, { "ename": "cp5022x", "commit": "761fcb0ff07d9746d68e9946c8b46e50c67cd1d8", @@ -17258,11 +17344,11 @@ "repo": "raxod502/ctrlf", "unstable": { "version": [ - 20210404, - 1704 + 20210418, + 2044 ], - "commit": "45026a8655fb170004959f83b984589224cc156e", - "sha256": "0ij830jpkrp29rrpapmr9cglnjsdiycp3j620sd10s069wavbmcr" + "commit": "dbe83710d06bc39315f1455f6f21479f3747c0aa", + "sha256": "0nl7mh1i9pw039gd0ma6xrv499aw2vs3a1fm1bxz71hh13jmbd4c" }, "stable": { "version": [ @@ -17463,11 +17549,11 @@ "repo": "lassik/emacs-currency-convert", "unstable": { "version": [ - 20201017, - 1817 + 20210427, + 2032 ], - "commit": "0b12614956085444d73c47bc308c02cef0f64f97", - "sha256": "0abpkcn2mcg0c4nycannwz9skvl6w7zgvbh1rx30qw0wl0i5svdm" + "commit": "12805ea66aa8421de5eedda39d23f709de634460", + "sha256": "1p304k3s0iawsrlpndc9vrjxm1vv4nlkv0fb51x8pmcqw5ivy1dg" } }, { @@ -17488,10 +17574,10 @@ "version": [ 1, 0, - 3 + 4 ], - "commit": "2d7c5547e4b0da361b1533d2ff30e3f62f4b682c", - "sha256": "1d1mz0j51i09g2fn25iik7wk0cc9i6ps8qviik73fy7ivvxjn0vp" + "commit": "d82441c85773bec2bc41eb3c5778659f0be31a61", + "sha256": "0qi40qgya3k028sgmqhqslgdfkxq9iv3wpzhz6x87j0xqv32jd55" } }, { @@ -17532,26 +17618,26 @@ "repo": "tom-tan/cwl-mode", "unstable": { "version": [ - 20171205, - 945 + 20210510, + 1150 ], "deps": [ "yaml-mode" ], - "commit": "bdeb9c0734126f940db80bfb8b1dc735dab671c7", - "sha256": "0x9rvyhgy7ijq2r9pin94jz7nisrw6z91jch7d27lkhrmyb1rwk3" + "commit": "23a333119efaac78453cba95d316109805bd6aec", + "sha256": "0507acyr9h4646scx316niq27vir6hl2gsgz7wdbiw0cb2drfkd1" }, "stable": { "version": [ 0, 2, - 5 + 6 ], "deps": [ "yaml-mode" ], - "commit": "bdeb9c0734126f940db80bfb8b1dc735dab671c7", - "sha256": "0x9rvyhgy7ijq2r9pin94jz7nisrw6z91jch7d27lkhrmyb1rwk3" + "commit": "23a333119efaac78453cba95d316109805bd6aec", + "sha256": "0507acyr9h4646scx316niq27vir6hl2gsgz7wdbiw0cb2drfkd1" } }, { @@ -17690,17 +17776,17 @@ 20190111, 2150 ], - "commit": "8cef4203124241911f63dc171f5536665f324507", - "sha256": "0qm605xkr294yrmrkzsqq9bhdqyg9nxiwxwg1br6hzcj01wvgjqf" + "commit": "16aba7eb35b2a6f0c88b53da00539a5d875ebfdf", + "sha256": "1cfqwc3cchv10a33yw2hp6y1mb38s7djfbndqhwy32yv3ifsfgz3" }, "stable": { "version": [ 0, 29, - 22 + 23 ], - "commit": "3e470fcc3a4e9a33b66d5db6ab761c773888a1ea", - "sha256": "1fbi0ladg9c37hw3js72i72nza8hfjzm5c8w95c6bmzsl22lszwi" + "commit": "17670781083e3ccfedb1af4adcec614d4599eef9", + "sha256": "1yri0ay0p3p80h9ypq692470y1b99y4hk468zqlmfzb87yv8vv7j" } }, { @@ -17842,11 +17928,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20210407, - 1942 + 20210429, + 657 ], - "commit": "cd45635155aa6bae941156043217ce11531deca9", - "sha256": "1j2fr8gcy5pxzvaf3xh9z2k6bsdbw5z0a2ciys1zy8629sfx6w83" + "commit": "e4d1f2c76245fe9d0d07133a841e789d139df28d", + "sha256": "1ii3cgf4hlclwaraisxksv98mmhajx517i60p1cgd7vapznn2b6v" } }, { @@ -17898,8 +17984,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20210405, - 1739 + 20210506, + 1934 ], "deps": [ "bui", @@ -17911,8 +17997,8 @@ "posframe", "s" ], - "commit": "2cb49bb2ec22a7d6d4fd403bd4e2cc468f512501", - "sha256": "0zymjabd6xpsdy3jr72rag8dmd7c1hsr1d973yjmvwj1awh9d0dd" + "commit": "49af1b8cbd261a5f97e1b2886418dae5e51b452d", + "sha256": "0y1j9whxyvng9q61mmxydkp3ddi99akr9c8nzb1ghwh0cxckgp5m" }, "stable": { "version": [ @@ -18268,14 +18354,14 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20210325, - 757 + 20210427, + 705 ], "deps": [ "page-break-lines" ], - "commit": "00f1dc84d3fbaf439d23645aa531eee59e28f688", - "sha256": "0afn7p79na8351gimmjrj2z4y3slyvsrinm8gx7qphflz2a13m2z" + "commit": "9983aa0838ce5a2219ef4b674e6b37de41b5b585", + "sha256": "1mi1jn5gknvs7xjgj2v4dcq7z1a7xknksgfqi66bby7cl6cr3hqd" }, "stable": { "version": [ @@ -18614,8 +18700,8 @@ "ccc", "cdb" ], - "commit": "a266f70eb99ffb657b7821c2e1de49f5184a59ed", - "sha256": "0j1gcsi40yrfy9saqjdhxnwsvmqf32l9mnwfvhbbfxm82ddhwxnk" + "commit": "7a7e1ecaf7f4f68058f1b8831d0b7b839d228614", + "sha256": "0gcgbr28j88a73p5ng4f20qp0fx288na9hi4fnj32grqyrl6f1pq" } }, { @@ -18657,29 +18743,29 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20210219, - 748 + 20210510, + 416 ], "deps": [ "dash", "s", "spinner" ], - "commit": "ca16c37ffa5caa5f698bc049012489a2e3071bcc", - "sha256": "055yxchqbqp4pbw9w9phibnp0a2qw1jsb1a5xbfc558phi2vbxdd" + "commit": "83e7812cda2673884b3d4d218757c7489f817fbb", + "sha256": "1fiwr55s4aq38kyai9k77lb7j0kk53bcrrhd8sw0yqb65a1n363i" }, "stable": { "version": [ 0, - 9 + 10 ], "deps": [ "dash", "s", "spinner" ], - "commit": "411a6973580b3503535ba58e405035bde2392903", - "sha256": "05xsf2axlxdsv8aivd7qyb0ipf9cp95y9f0sf0kaqpc1rn6i79ps" + "commit": "647523452d57e94cec6ebc28e35d3e88487d82dc", + "sha256": "1lb17pisy0zfz9ixawf8rld34m47zil96r3khlv32vzpi84f9x1a" } }, { @@ -18839,11 +18925,11 @@ "repo": "ideasman42/emacs-default-font-presets", "unstable": { "version": [ - 20201227, - 2319 + 20210418, + 924 ], - "commit": "e5aad0510139cca42b37614d3599951ac0a28ccc", - "sha256": "0kp3ngmdwip7c4c9mvw1l04p13gjjfaigwdiaycbzd5jzlgdh6rq" + "commit": "81ef9d54000617ce98c40b4627eca64e076ff11d", + "sha256": "14l1m8jaqranj01fr040l2g560gbpbnd4sha4x4rcs2gc99sjqxx" } }, { @@ -19498,8 +19584,8 @@ "deps": [ "cl-lib" ], - "commit": "8f4c2358ac00e32d261f7e77b29af60adfdf0e41", - "sha256": "1grd6pzbirdq42qcwxis3q97cxlx6r3m20lqg0lb77vk6k75y619" + "commit": "b39c08c8d08d5c58b5b2a76214e0872984e1ae7d", + "sha256": "1hw6c7v6n229p8bz829b3nfzdg7afrxdn4rblgk39q1wl04v4cd5" }, "stable": { "version": [ @@ -20233,11 +20319,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20200430, - 1625 + 20210510, + 2137 ], - "commit": "95a411f6d4bb5eec4ef8fdbba9f038ddf60da81f", - "sha256": "0rz8d9lj2zbipz6cwrlw2a3z9y4rybbmz73h73l1i7fjg9q1kqm4" + "commit": "757c82e888d80e5746ccb8654ba58389fa7dc0eb", + "sha256": "0la6xgl3lr5pjs3x5y0l1g66cjdilnw6m0h526chgq140265yg3l" } }, { @@ -20491,14 +20577,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20210301, - 2158 + 20210411, + 2315 ], "deps": [ "dired-subtree" ], - "commit": "92e7f77ec65c2089d75edb63ca312f55e3033be0", - "sha256": "0ad9r63jp257z95jb5537nbw64q6shdg4m5cmlx8asb7fp2wgsf8" + "commit": "79d8187da373b573a2d5385ca868553bb73e0005", + "sha256": "0b1f6ddhn8z4q790d370zhyqrn4mlqk7i6901sld52m14zigd72j" }, "stable": { "version": [ @@ -20603,6 +20689,25 @@ "sha256": "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2" } }, + { + "ename": "dired-view-data", + "commit": "4a3f94025604a6efc529891d4bc78293f0a11a98", + "sha256": "00gc7qa278nfyxhpx9h765m62i1g6z5ambcg0kgksl8k0571xqj3", + "fetcher": "github", + "repo": "ShuguangSun/dired-view-data", + "unstable": { + "version": [ + 20210510, + 931 + ], + "deps": [ + "ess", + "ess-view-data" + ], + "commit": "80a5f254fc9e0a8f022e429a53c3d8b1da26c4b8", + "sha256": "04jj3jpgvnvrn7r1z5y7ilh1hah2d6rb91m17ll45i20sakhp2xc" + } + }, { "ename": "diredc", "commit": "abaea37c792e6593665dc536e8803e0f591f7359", @@ -20611,11 +20716,14 @@ "repo": "Boruch-Baum/emacs-diredc", "unstable": { "version": [ - 20210316, - 1841 + 20210428, + 247 ], - "commit": "dd945de3e0c66a164f003a96d473376b58fc6dc7", - "sha256": "1d4rdrc827nnb9p56la1sd9nzwjbxbnr8fgmcgardlz3qw97j3q1" + "deps": [ + "key-assist" + ], + "commit": "7651b1dcc98cbc37f5e4d0992a27d1f96279900c", + "sha256": "0y59z1651g0jsvrzjq4nx5i7r1rqrhgas6bplwlw60sb6ygqijpy" }, "stable": { "version": [ @@ -20680,14 +20788,14 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20210117, - 1213 + 20210419, + 1851 ], "deps": [ "dash" ], - "commit": "381176f301dea8414a5a395c0d6546507838f6ce", - "sha256": "0hmj5m3wiqwdmjzxbzkf4sg8gaswdv5rv6jqgqvz3h9sm17fnps7" + "commit": "4b94393a9adf677c7c037215e233eef5fbca553d", + "sha256": "14whrhi6hgzadrw9z9k2sh2800483xs1h611avz4x68c8d2jfj5k" }, "stable": { "version": [ @@ -20802,11 +20910,11 @@ "repo": "purcell/disable-mouse", "unstable": { "version": [ - 20200304, - 2159 + 20210512, + 2114 ], - "commit": "a8318f5f21716316053cc092ab9abb43cb681fe0", - "sha256": "0z9749hd3x1z2sf3lyzx2rrcfarixmfg0hnc5xsckkgyb7gbn6hq" + "commit": "cae3be9dd012727b40ad3b511731191f79cebe42", + "sha256": "0zx3ihhxhjvhsi08khyx8fdhw2kg065zhhicqc587jsabk0wzj6f" }, "stable": { "version": [ @@ -21661,14 +21769,14 @@ "repo": "jcs-elpa/docstr", "unstable": { "version": [ - 20210410, - 1249 + 20210417, + 1315 ], "deps": [ "s" ], - "commit": "67a219425d1fe9a29ad3beae0677d5ca0047bd53", - "sha256": "0irqfn5cxb8gkxvdmikmjz2j9km6k7057r7yw5aypgaxm89a404x" + "commit": "c14485468439056bcfc6a0862fe35fa8d787d34a", + "sha256": "198vqmhyasilxgz2lwn7y3a0g885ws3pyhvvj80wy7n4ml8mfdr4" }, "stable": { "version": [ @@ -21810,21 +21918,21 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20210330, - 1522 + 20210511, + 1829 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "669cac3839271f84ccfed06eddaad206224ca831", - "sha256": "1p5w5qbz6dgsk1dcy4fspdqwh03h4cxs175ng6zm6590dk0xs5bb" + "commit": "a7f376d4bb591a5b7c6c1222e64b1d0f01c16b9b", + "sha256": "1csalihwn029mqmqgif39sl2wdyg6f6vgvdsh9plac3gp41mmqwp" }, "stable": { "version": [ 3, - 0, + 1, 0 ], "deps": [ @@ -21832,8 +21940,8 @@ "dash", "shrink-path" ], - "commit": "b44955841a301f4930b054e912fa4c1a700d426d", - "sha256": "08m75rl5i812pa87zcsjvb4mm3jjhpwzgx9mf2m7sxj807airz5d" + "commit": "92f141f91a87664104ffb17177b01b9fcc706744", + "sha256": "0flxjyzccqv8yyk6iaxmcb3m47khy6ck3vffnfdkqs5lckm9c31s" } }, { @@ -21863,14 +21971,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210322, - 1750 + 20210507, + 620 ], "deps": [ "cl-lib" ], - "commit": "4199e74db170200995ee8dfbb55ffae004d6e219", - "sha256": "0vfhnywww560rf0b7h2gc9w4x4738xwq12c8qi9y267110zg62mz" + "commit": "4d24728f11853b5bd231687ac3f7a95108688313", + "sha256": "0kws2305asszwjcc28zsbb6xwg25pxwabm5vml9jqk9w5f3ajl33" }, "stable": { "version": [ @@ -22114,11 +22222,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20210220, - 1358 + 20210502, + 1743 ], - "commit": "b5e50ed1e30ee054fb6a0827e78382b038e83c46", - "sha256": "0bdlcvx95r0hwxpvdfac6xjcs59jn4mi29yny7bjz3x463czidcy" + "commit": "0a76928fdb49d1cf65b10c706ae0e1bbc779effb", + "sha256": "0a1jvcgzrp38xwa3rx7h7c5j5gcdgncfjgsjz8vcfnhckcj5zmzn" }, "stable": { "version": [ @@ -22196,6 +22304,21 @@ "sha256": "1ynjxfvx8b6rq6d4gm1sl96rmlk5pi8j5s1rd1y0p8x2lwqcfv77" } }, + { + "ename": "dream-theme", + "commit": "21d32adebc711ffcff2633c5ec4ba4fe58dcb0b5", + "sha256": "1lbfassmf2b6ibi3szp5p1q57nabj133bgwfnlf21svhb85zax05", + "fetcher": "github", + "repo": "djcb/dream-theme", + "unstable": { + "version": [ + 20210419, + 605 + ], + "commit": "0c27f05544b90e41338f79ea923044b358a323c6", + "sha256": "1dnfisa6smrnjxm6yvb3w57skz4i8akigvzr8lsh1zr7by821wl0" + } + }, { "ename": "drill-instructor-AZIK-force", "commit": "fb5ee8a113b98e8df8368c5e17c6d762decf8f5b", @@ -22377,11 +22500,11 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20210307, - 2140 + 20210423, + 745 ], - "commit": "37529fc7a98564164c87103e5107a6dca32b0e44", - "sha256": "1h2j25b6qayydl841zwbh73fw1177xgskrqm27cqmfx0bcpx7qq3" + "commit": "9714f2c5f1c9b7c21e732df8c15a870a88caba84", + "sha256": "1aygba84si1g8kx12hscwa6m3c3946r0vbk93p9izib9fkbgngw6" }, "stable": { "version": [ @@ -22467,8 +22590,8 @@ "popup", "s" ], - "commit": "8bc195000e17ce6c72755a8fb55ca0fcd36add76", - "sha256": "0dc31yy4r41nwwv57dzbd6zgwddizqh4q4qagpqx645l509s7k7i" + "commit": "8f70acbe164553b225476fed55019ecddcf0bbd6", + "sha256": "08g417yf4byhhldvcbkmhrlm7iaylkv0cbcg1c701dyfngxn01y2" }, "stable": { "version": [ @@ -22512,17 +22635,46 @@ 20210213, 757 ], - "commit": "65404cf973aa7ffc0e9dd7d05c9dd3709c7db2d4", - "sha256": "13v4i59f0m5syjz49g5xh4nnr7k2wck0nf0pc5hgsv6g61gkpwvj" + "commit": "66c846e655c6b677963c03cefafa35e08bf0a79e", + "sha256": "1ggq3pd0asynq1fzixyi0i5m8b5z4msgkbw22q7ka48v2awygiil" }, "stable": { "version": [ 2, 8, - 4 + 5 ], - "commit": "b6a3f66fb15378fc7170e94778f4d2c0b142ad92", - "sha256": "1p3r197cfb96675n2s7mbggndqspcxxmk9lkncirixm3k7ww36l1" + "commit": "e84ba5230f6afacb12f022937138a752f1c301b6", + "sha256": "0a1jj6njzsfjgklsirs6a79079wg4jhy6n888vg3dgp44awwq5jn" + } + }, + { + "ename": "dune-format", + "commit": "82368b9bf29492002918a2d77023ff2ef0b9917c", + "sha256": "00fc7vbxqzx4q2azs26s2jyw3rhfwv3jplh3hk5fiqvrxd0krpix", + "fetcher": "github", + "repo": "purcell/emacs-dune-format", + "unstable": { + "version": [ + 20210505, + 108 + ], + "deps": [ + "reformatter" + ], + "commit": "eda7a16ae378e7c482c11228c43ef32b893a1520", + "sha256": "0z39a1c227si435j3k8vkf4q6l01jdf70x69dywsmnrkcrcvrbf8" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "reformatter" + ], + "commit": "eda7a16ae378e7c482c11228c43ef32b893a1520", + "sha256": "0z39a1c227si435j3k8vkf4q6l01jdf70x69dywsmnrkcrcvrbf8" } }, { @@ -22572,11 +22724,11 @@ "stable": { "version": [ 1, - 0, - 1 + 1, + 0 ], - "commit": "66d92f592b35fd168f23d7c58d698a1ed2dcaa0a", - "sha256": "1pfz1wwrdpdkd29309dryy7ficl1h1rfmgv7fbpy9p33vs9mdi9p" + "commit": "61c5718ba64ace4c9e29de18aa2690ecc3f0f258", + "sha256": "14nd544ispfj165ys6lv9bpy41p9j8kf4lwy73qigr4c7qlf43by" } }, { @@ -22587,14 +22739,14 @@ "repo": "harsman/dyalog-mode", "unstable": { "version": [ - 20200822, - 1536 + 20210413, + 810 ], "deps": [ "cl-lib" ], - "commit": "f42e49b9dd7ab41f08361185cc25509f19b949a8", - "sha256": "1cqaa12pycwiv4cj100n8326f3yg59xgww3lk2l6x7841n7g7szm" + "commit": "697a84194766708d2607e8ba48a552e383c6523e", + "sha256": "1afcfqf9z1d67va9cdi2fxpr1l1nrgkksxh5g7h8ggqkml2ks8hn" } }, { @@ -22654,11 +22806,11 @@ "repo": "zellerin/dynamic-graphs", "unstable": { "version": [ - 20200902, - 1238 + 20210430, + 352 ], - "commit": "ba3fdf2cf0e5e1e952a1961a03dfb7f61a4ab0e7", - "sha256": "0cyngkba93swhgklh88r5czlvimc0pa9blg02cwz3mjwj5r558bl" + "commit": "f7239e381de56af5d6ff8e0d6ab31a78d3e3da58", + "sha256": "1v3p0ycm3yh8gvpbr96ml89470piam25qyhrwrkin228k17949br" } }, { @@ -22700,6 +22852,24 @@ "sha256": "0qs7gqjl6ilwwmd21663345az6766j7h1pv7wvd2kyh24yfs1xkj" } }, + { + "ename": "dyncloze", + "commit": "4725983cb1d5d2c5ad1dda162050973516196323", + "sha256": "173z9skkmpmjw0h5z1dcdlplihjz9yszn1h20p53w9sicif58i1c", + "fetcher": "github", + "repo": "ahyatt/emacs-dyncloze", + "unstable": { + "version": [ + 20210405, + 212 + ], + "deps": [ + "dash" + ], + "commit": "38aac1a38017a707b4c539a7932cc8f6cd8f1a77", + "sha256": "05i0a1680a79xvawa93iip10ln6bkrnvzqh3a2lica4hfx0hsi0x" + } + }, { "ename": "e2ansi", "commit": "5e655a3fdfae80ea120cdb2ce84dd4fd36f9a71e", @@ -23183,26 +23353,26 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210407, - 2146 + 20210505, + 1914 ], "deps": [ "parsebib" ], - "commit": "bd1c9dcda79f734f6302e7c81ee0f13106a3a9e1", - "sha256": "1bd6hqiq178h1z8x0hjyrxg6l0h2inkzmrg6fadfj3ly1hbs5157" + "commit": "0ed8c3cb1ccc130e9d4060d19e478474cdf3d6e0", + "sha256": "1i37hsgywhcrmsj0cmvs67hzknhx56wrs868k4rrs9cwgc2yf6j1" }, "stable": { "version": [ 2, - 30, + 32, 1 ], "deps": [ "parsebib" ], - "commit": "6a3351c4bee70517facf0eac457a17a1efc21144", - "sha256": "0ppp6a8qyllh1kjrh8fa8dvhv98wnq0w742mzh8gahkjbrsjdwcj" + "commit": "3142de8d64789c611e553667cac3bb84428d004c", + "sha256": "1xgpdw0sxl2c9dn6x6fk0rqpqlqxsjlj0vyag611blj600br7dqr" } }, { @@ -24031,8 +24201,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210410, - 1942 + 20210430, + 832 ], "deps": [ "eldoc", @@ -24041,8 +24211,8 @@ "project", "xref" ], - "commit": "8a5598d06a0539492ec30fc90201a263ea6a03e6", - "sha256": "0jlqskw08zlqhckhz64w2c0a14kk100lmnadwf4li5h2b2clmr7l" + "commit": "3f1ad3bd1bf6c2ccef61c3ca606ef69962ae6e55", + "sha256": "0532fd44lb913qpx6h6hdmk1gsmj3klwh2l41vkwc7vwqsb0rg23" }, "stable": { "version": [ @@ -24099,28 +24269,28 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20200726, - 741 + 20210415, + 1207 ], "deps": [ "eglot", "julia-mode" ], - "commit": "84cff9d6ef1643f3eac6c9d620cc1e380a9847d9", - "sha256": "1g3k3ym0hx97dk3sv1kz3vq0p1s1zw6r34ynhwm31y954miwyvm4" + "commit": "49f170e01c5a107c2cb662c00544d827eaa2c4d8", + "sha256": "1bmp517zfsspxlj0k67q15ladiphjha45zgnq3djs631mvr9bfaw" }, "stable": { "version": [ 2, 1, - 0 + 1 ], "deps": [ "eglot", "julia-mode" ], - "commit": "84cff9d6ef1643f3eac6c9d620cc1e380a9847d9", - "sha256": "1g3k3ym0hx97dk3sv1kz3vq0p1s1zw6r34ynhwm31y954miwyvm4" + "commit": "49f170e01c5a107c2cb662c00544d827eaa2c4d8", + "sha256": "1bmp517zfsspxlj0k67q15ladiphjha45zgnq3djs631mvr9bfaw" } }, { @@ -24192,8 +24362,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210330, - 1531 + 20210505, + 2237 ], "deps": [ "anaphora", @@ -24204,8 +24374,8 @@ "websocket", "with-editor" ], - "commit": "608c3cbfd58a626aab3cea6aa5b31d8a4032cf10", - "sha256": "103sg5wzzr7zp0x181nardc8r63cyx1f7s1l5drig5dwzp4dnd60" + "commit": "a9903b3b6df26eb5603aa38960c6bd9d826cecb8", + "sha256": "0di5275avxmd014zhwj420zapwdy0a00lkrl8j362f636kwp9lir" }, "stable": { "version": [ @@ -24371,8 +24541,8 @@ 20200912, 1653 ], - "commit": "84dd1837f9ac80a329ab0c2de6859777f445f8ff", - "sha256": "098x17hg9dc28s7g50mxhv6m6fgch1xp1di7rplkg7w1dfphpc5a" + "commit": "d76ac84ae9670de7bf7725b362cafe86688771f9", + "sha256": "18x4qj75bh45b0dirp3jpw1zqni8xfqqh1q13q6b5ncy1nhvm4gl" }, "stable": { "version": [ @@ -24574,36 +24744,6 @@ "sha256": "016l3inzb7dby0w58najj2pvymwk6gllsxvqj2fkz3599i36p1pn" } }, - { - "ename": "el-x", - "commit": "0346f6349cf39a0414cd055b06d8ed193f4972d4", - "sha256": "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g", - "fetcher": "github", - "repo": "sigma/el-x", - "unstable": { - "version": [ - 20140111, - 2201 - ], - "deps": [ - "cl-lib" - ], - "commit": "e7c333d4fc31a90f4dca951efe21129164b42605", - "sha256": "00wp2swrmalcifx9fsvhz9pgbf6ixvn8dpz1lq6k6pj9h24pq7wh" - }, - "stable": { - "version": [ - 0, - 3, - 1 - ], - "deps": [ - "cl-lib" - ], - "commit": "e96541c1f32e0a3aca4ad0a0eb382bd898250163", - "sha256": "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5" - } - }, { "ename": "el2markdown", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -24702,11 +24842,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20210323, - 2234 + 20210416, + 1333 ], - "commit": "25531186c10b74a10ee24990f9e967296cc70342", - "sha256": "14lk3whvj45ilb7mv60dfpxhbw3jsddglz0mq5vhdgy6n8wkcpa9" + "commit": "6608e0392b46324fc09a5b5f4457c15ac1394f80", + "sha256": "0mr6xx1bwpfn24x6vbrzd482scz6mrdmgdrk03ixwlspaqmancdm" } }, { @@ -24751,20 +24891,19 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20210410, - 1721 + 20210425, + 2011 ], - "commit": "635744890ba2d55d9569a66cb72b13870418a513", - "sha256": "1hlsnd9ppw18p0kbjgf2g5xwikipjkzzqcvql63pn9ds5zr1gn6q" + "commit": "7256b1b953fd8bf09acc840354e3a28e63fd1ba6", + "sha256": "0491iq2ia76lm4sn9q4ks74qfn4wwzrj66mz4hck3962h8iabydz" }, "stable": { "version": [ 0, - 8, - 1 + 9 ], - "commit": "c4f9b7ff4d12c59cc80b4a67f856601ba7cff2cd", - "sha256": "19s45hdhcg5l608awfxvmhd61xzp7dd5pvviv89xzzksx74l1188" + "commit": "70612cead889bb763f7b353aa2ecf67577da344c", + "sha256": "1m067l3wf7dx2qya4mw1ngvl266ln26ngac3vkswxj9l3s69mqjn" } }, { @@ -24893,6 +25032,21 @@ "sha256": "0s4y1319sr4xc0k6h2zhzzxsx2kc3pc2m6saah18y4kip0hjyhr8" } }, + { + "ename": "electric-cursor", + "commit": "639747f3e5b2f8753478826a69b27727e1738d04", + "sha256": "12rlgyp9r4dgp0mid95rx0p5ygpxjzhvlxkmidlzakyirc1i0jlw", + "fetcher": "github", + "repo": "duckwork/electric-cursor", + "unstable": { + "version": [ + 20210501, + 2107 + ], + "commit": "e20c6f6e85c020e472ef05b12af7a12bbae65dbf", + "sha256": "0x1bhpb86bhkyyg28w81jw124l6zcbbqmf8i3fx28sc14q4y1gsd" + } + }, { "ename": "electric-operator", "commit": "906cdf8647524bb76f644373cf8b65397d9053a5", @@ -24932,11 +25086,11 @@ "repo": "xwl/electric-spacing", "unstable": { "version": [ - 20210313, - 1118 + 20210430, + 1714 ], - "commit": "fb1437a3386f55440abdbe7c107c86e5b028bdc5", - "sha256": "00pmp1596p24i7pasmm080aly8ifinp9hbvia2l4jf8mbfg2ndlw" + "commit": "800e09af7b0cd5d78d22f857dbce10fb080637df", + "sha256": "0ykndvbbx8rvaxppmkngyrzp1x6fghj9xv55i847kpzx1c6gs4fc" } }, { @@ -25099,8 +25253,8 @@ "repo": "remyhonig/elfeed-org", "unstable": { "version": [ - 20181015, - 1100 + 20210510, + 1219 ], "deps": [ "cl-lib", @@ -25109,8 +25263,8 @@ "org", "s" ], - "commit": "77b6bbf222487809813de260447d31c4c59902c9", - "sha256": "0a2ibka82xq1dhy2z7rd2y9zhcj8rna8357881yz49wf55ccgm53" + "commit": "268efdd0121fa61f63b722c30e0951c5d31224a4", + "sha256": "0krfklh3hyc72m9llz3j7pmf63n4spwlgi88b237vcml9rhlda5b" } }, { @@ -25121,15 +25275,15 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20210401, - 100 + 20210430, + 846 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "2b2aaf2f3b92e7c27827e0f280598cb52db558e0", - "sha256": "1nffhs0mnc0j87wfk6siw3zaj6p1dm1hxz55p54v9895x8c5bakv" + "commit": "5e17d4280f5f8019c3f8962a710c9b3e633f41ff", + "sha256": "0kv6svwg1h0wcj7z89xs20a9wns7v67af9m9rir3m8f47iyy70gr" }, "stable": { "version": [ @@ -25153,26 +25307,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20210302, - 2051 + 20210429, + 1337 ], "deps": [ "elfeed" ], - "commit": "f59cbc38c83007e160722347c8cb5438d5fe13a0", - "sha256": "07xid0a31ghknbfwj8dxzbqkg4sfayjhlqvp17p2bzlf1mj0zjyd" + "commit": "8c694d0feb33dca66d9a8d88f9aaa6e7ded472ea", + "sha256": "0lcpj2vp947kbfk6fq7xz7j71mcpjs9086pqh690w4mzv1253gra" }, "stable": { "version": [ 0, 7, - 7 + 8 ], "deps": [ "elfeed" ], - "commit": "f59cbc38c83007e160722347c8cb5438d5fe13a0", - "sha256": "07xid0a31ghknbfwj8dxzbqkg4sfayjhlqvp17p2bzlf1mj0zjyd" + "commit": "8c694d0feb33dca66d9a8d88f9aaa6e7ded472ea", + "sha256": "0lcpj2vp947kbfk6fq7xz7j71mcpjs9086pqh690w4mzv1253gra" } }, { @@ -25459,14 +25613,14 @@ "repo": "purcell/elisp-slime-nav", "unstable": { "version": [ - 20200304, - 2201 + 20210510, + 528 ], "deps": [ "cl-lib" ], - "commit": "9ab52362600af9f97f1590f05a295538025170b3", - "sha256": "08k4zlawjkb0ldn4lgrhih8nzln398x7dwzpipqfyrmp0xziywma" + "commit": "8588d80d414aee1fafce5b9da0e913612ee0bcdd", + "sha256": "0bpa0wv2qbll34bvdm31w541zavad6h344csa160z6da3ksihs2i" }, "stable": { "version": [ @@ -25488,14 +25642,14 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20210324, - 1605 + 20210509, + 2353 ], "deps": [ "pkg-info" ], - "commit": "0212b06f079f4965b6032bbbe7f86876575770de", - "sha256": "0n9b901kzk95r28a17amx25xyffvxbfrxw62sakrn0q3pbq988s2" + "commit": "6bbc1e5ac46064613c982cedc60566ed077e7a58", + "sha256": "051pxppp7bdxjjr56p48khi5vfwf5kj7vvyddr66pfw5fwdpd86m" }, "stable": { "version": [ @@ -25866,20 +26020,20 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20210325, - 1219 + 20210509, + 439 ], - "commit": "2d50b2861ab0ba6a2a518de44823869fb4b14dfc", - "sha256": "0x0sfim9l5xl4fysy61w7migf504ynnmnraiwisdxl9bap7iraw9" + "commit": "193dd942cd74f71d94067f48249427676ba7dec8", + "sha256": "0hwsy780x1kw1c9k1xrbrbip6l62fa41czal0nnqr9li0brig7d7" }, "stable": { "version": [ 2, 1, - 4 + 6 ], - "commit": "47f194c77830946c66bc6ffecdecadc5a3191402", - "sha256": "00c33b0k5rw66xbzv1ggz1ai1yaqa705vqb25b54sirwr0s37wly" + "commit": "abc8d7b7de12e4eb06efa2dbb1cc77a714f14479", + "sha256": "0p5jbdbl7bmx94fj7qyqqsy0clvkzjgczbgvhx4ay9wyq83wdaav" } }, { @@ -26242,11 +26396,11 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20210228, - 2103 + 20210504, + 1306 ], - "commit": "de9d42c86fc3e71239492f64bf4ed7325b056363", - "sha256": "0778izaq1hjcc9i7d0v3p9xb08y6bwj9brcmpyd2yj3lfajbhxdx" + "commit": "53d257db92fb72ade8ea1b91dc6839c21563119e", + "sha256": "1qccz8z0410xhygrfy62h1j3553avdcb7m61ps6b6y74nz615l1r" }, "stable": { "version": [ @@ -26266,14 +26420,14 @@ "repo": "tecosaur/emacs-everywhere", "unstable": { "version": [ - 20210303, - 1507 + 20210422, + 1053 ], "deps": [ "cl-lib" ], - "commit": "99997af93310128cc95b8ddceacb448daed2403a", - "sha256": "03syfvwsbrrmghdav3xkmpjvdfh1q1qr880a6f6wkri9iazg021g" + "commit": "64ba2e3f3096f48928f7be06ed690069b96add22", + "sha256": "1cjzrckbxcl1ahhnnk78778yxsrhwb725cwjbx6i8y6jxwbddpqj" } }, { @@ -26563,11 +26717,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210411, - 1954 + 20210509, + 1849 ], - "commit": "a005eef82a63950927a68a5ef79b33d25245687b", - "sha256": "1dy01y87bqjddsdjqhmp6m144azn72yswsj0prywm5alxypck9lg" + "commit": "d82f8c73fae4d2d7283838cf5111366384775977", + "sha256": "0268sdajb0213ggcshx6grwqx776qdi246nklhyxavxcyg4hw567" }, "stable": { "version": [ @@ -26593,8 +26747,8 @@ "consult", "embark" ], - "commit": "a005eef82a63950927a68a5ef79b33d25245687b", - "sha256": "1dy01y87bqjddsdjqhmp6m144azn72yswsj0prywm5alxypck9lg" + "commit": "d82f8c73fae4d2d7283838cf5111366384775977", + "sha256": "0268sdajb0213ggcshx6grwqx776qdi246nklhyxavxcyg4hw567" }, "stable": { "version": [ @@ -26761,27 +26915,29 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210407, - 1604 + 20210512, + 1407 ], "deps": [ "cl-lib", + "nadvice", "seq" ], - "commit": "f79343bf03f6ece09638ec27eeb831c0abe59667", - "sha256": "1ki2hd38fxvd4112bhgfifr3raar3yz345h9hya7dn8aw9hscr14" + "commit": "a435df9461bd141848504418b4bc7bcea7cc881c", + "sha256": "1jkfgv02g4sixa85fzr1m61mac4rgn0059pnjkbdp8kvcqp38x54" }, "stable": { "version": [ - 6, - 3 + 7, + 2 ], "deps": [ "cl-lib", + "nadvice", "seq" ], - "commit": "a2738fe1a9013f641eeba31300e828e88b468b14", - "sha256": "0r2krmrhmwqcw3sdmy7z9rw4l222ja4jz8an8av11qjhpacr8v98" + "commit": "b0173b6b4c5b66a4706cb82c9b50a179bf159a0f", + "sha256": "1scppj8wkiml4dgsg4540hdd8mv9ghcp2r17b647az0ccxwp73qm" } }, { @@ -27486,6 +27642,19 @@ ], "commit": "99d3a4b6973d5b09864e0af7425a61f99c19b90a", "sha256": "0k6isn6szbwc6jc7kzfq82p8w737z7iyn2yi9aqf6j54a6xa5aka" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "dash", + "s" + ], + "commit": "0d5d80dd0c76f0d46a3565d940a2b0ed955dfd0a", + "sha256": "0bfab8yh2r08vqgnk81avw9n46fda5jb4fcm0h2y8f1lv6jgnfy0" } }, { @@ -27820,24 +27989,6 @@ "sha256": "0k3gp4c74g5awk7v9lzb6py3dvf59nggh6dw7530cswxb6kg2psa" } }, - { - "ename": "erc-status-sidebar", - "commit": "29631de8ec4140a8e35cc500902b58115faa3955", - "sha256": "04qh70ih74vbavq7ccwj1ixpd8s3g8rck9bxv6zhm1yv34bslw5d", - "fetcher": "github", - "repo": "drewbarbs/erc-status-sidebar", - "unstable": { - "version": [ - 20200907, - 1307 - ], - "deps": [ - "seq" - ], - "commit": "87210a3ccc16a86e6b5992744b68daabed3b2d11", - "sha256": "1gb8lzsi3clbass40sllfwf8akzlgb2k93wqlw1lf4gfb9shx08v" - } - }, { "ename": "erc-terminal-notifier", "commit": "f2ba978b1ba63fac3b7f1e9776ddc3b054455ac4", @@ -28152,8 +28303,8 @@ 20200914, 644 ], - "commit": "3e079614f2b4810ff5920ae69a389da91c855217", - "sha256": "1jn0kp33b77lskhi02d0jm0rpcgxhrpxdj82bmr7vi7m199p5jn0" + "commit": "82abfa4cfbfe7ebdfa818e526d03a1e2d9de5175", + "sha256": "0hxa4mxzxld8rjxydqrygcrdc8pf19jh9l5rbngls1h3knh9b9df" }, "stable": { "version": [ @@ -28177,18 +28328,16 @@ 20210315, 1640 ], - "commit": "165f8fe9354aaf23c166b5c54f352b3024da9bd3", - "sha256": "102dbzpfcysq7pinli2jcdff1mxh2af0s79qmia1wfm8jmzh0zhf" + "commit": "3a8e65972ac1d0c4ae1412eae2dc2b3e5b3d758d", + "sha256": "02vgl6scx1mjmhknzdfwc4p8c8f1mj67hxn81kwkd7nhp0hz1fnj" }, "stable": { "version": [ 24, - 0, - -1, - 1 + 0 ], - "commit": "655bd1a27673720bcee187e9fd9f07d739860ad3", - "sha256": "00k0x24diq2z24582bjk65c07ky1kf5h1zihs06ndl782i5cqjfa" + "commit": "583cba31eb09c14abd0b217fe7ac2e9a60425d51", + "sha256": "0p4p920ncsvls9q3czdc7wz2p7m15bi3nr4306hqddnxz1kxcm4w" } }, { @@ -28199,14 +28348,14 @@ "repo": "k32/erlstack-mode", "unstable": { "version": [ - 20190812, - 1117 + 20210419, + 1917 ], "deps": [ "dash" ], - "commit": "d0a67fb6f91cef02376e71b4b4669b071ebd9737", - "sha256": "10b77q2qwwlvj56g9yd6d9lkmk184mjf6x3067vvqs40xiv9bsgl" + "commit": "ca264bca24cdaa8b2bac57882716f03f633e42b0", + "sha256": "0541q21srscy8x7w4f8vbag1nsjksv9i1wi6sq5xjqnrl0piyv4k" }, "stable": { "version": [ @@ -28757,11 +28906,11 @@ "repo": "akreisher/eshell-syntax-highlighting", "unstable": { "version": [ - 20210223, - 936 + 20210429, + 413 ], - "commit": "eeace52ebb2c730f3665fb235017cd57dc6050a2", - "sha256": "1anlan2ldvx0qzj44dhb44flcs3h0d57v79qzn21jpy4d0y0m3kq" + "commit": "32d2568ebeb42553a30dda77e03c0e2ec8854199", + "sha256": "0my99472i5zdlhcv95jhfv58ph28gaw159p2llp4wv13acryin56" }, "stable": { "version": [ @@ -28939,11 +29088,11 @@ "repo": "dgutov/espresso-theme", "unstable": { "version": [ - 20181025, - 826 + 20210505, + 1957 ], - "commit": "d2fa034eb833bf37cc6842017070725e0da9b046", - "sha256": "0fds36w6l2aaa88wjkd2ck561i0wwpxgz5ldadhbi5lvfwj9386m" + "commit": "580f673729f02aa07070c5300bedf24733d56e74", + "sha256": "1fxnsz0v7hizs7wf8pjfm7jwbrm9vg5gvxv1a6ixgfajka79amfw" } }, { @@ -29040,11 +29189,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20210403, - 520 + 20210510, + 2052 ], - "commit": "b501beec408b66e2f2a8c4f3117e0c84ee1b0262", - "sha256": "03rd1qp9d8br36cynxm73ajac0f2kyyjnffnciix3vf7w5lpsily" + "commit": "5b807fdc1e5b564e17753b84fc634c1fbd2bfe7f", + "sha256": "02g677f84l7hq5n86yiwn52q26mnpcvp1vn6ix7hhb6jigbgs32f" }, "stable": { "version": [ @@ -29245,8 +29394,8 @@ "cl-lib", "s" ], - "commit": "fa1413737b8d5173a4db8c18d8de9ac798365d53", - "sha256": "1barvpcxw9v0gy16drcrmq2izmasm0icahnzrpyzdfnvcmvp3al7" + "commit": "5169dd7fc8765a7377b0ab93aa63b7f0f934689a", + "sha256": "0mn9pffw7kzdzwv3jkhygdkmlqax9fsrbjznbck90ydiv095fmp6" }, "stable": { "version": [ @@ -29283,10 +29432,14 @@ "version": [ 0, 3, - 5 + 7 ], - "commit": "68efaa4a7e9841b9bf2b80ea4841ee07d7bd68f9", - "sha256": "16jn404vfmsvm12wrf8iczqlgdf2iycbxrvalvzxnm2gr5dfzp7z" + "deps": [ + "cl-lib", + "kv" + ], + "commit": "9f96449f6059cb75491dc812ddeb1b6200ec6740", + "sha256": "1xzxmgsg0j72sf1vjh9gjswz3c29js0kqhm7r3jrqrh3a5agdnml" } }, { @@ -29374,8 +29527,8 @@ "f", "xterm-color" ], - "commit": "05fdbd336a888a0f4068578a6d385d8bf812a4e8", - "sha256": "0ln1agcgr607n5akm0ax659g11kfbik7cq8ssnqpr3z7riiv95dm" + "commit": "c9cfccef03e730f7ab2b407aada3df15ace1fe32", + "sha256": "1ip1mcry2mryr3gzina16c7m2pw71klx1ldbfv8w7rv8fsx2dsma" }, "stable": { "version": [ @@ -29630,15 +29783,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210411, - 2050 + 20210503, + 2034 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "d998a8195e404b01e2ea62a455c3dec74d0823c3", - "sha256": "0d4839nqdhr858nzb2cqj3wak2g8ynm5l8ak3467p1k9sn4d487a" + "commit": "8dc0ccdc4c0246af87588a93812a23268f83ab94", + "sha256": "0h09jhq1fpy3qn9ngj04ndjx4r5gxiypwj38z1hmy69nwc9ng02i" }, "stable": { "version": [ @@ -29832,15 +29985,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210401, - 1012 + 20210507, + 1741 ], "deps": [ "annalist", "evil" ], - "commit": "f2be91297029ae002d15e23510f9f686d848d7a8", - "sha256": "0ikb3ic84bxj9rzvkjhcvzgiwjpwmhfi6xli5yh03li7qdqsg5j5" + "commit": "23c60d576cf2ca4e931ca43815ceccc3f98acec1", + "sha256": "1d4nbs64cl0pq48xvd4ylpn4rgjsl3k03pcdshlbw1ifqkh55i50" }, "stable": { "version": [ @@ -29949,15 +30102,15 @@ "repo": "cute-jumper/evil-embrace.el", "unstable": { "version": [ - 20160519, - 1829 + 20210418, + 2038 ], "deps": [ "embrace", "evil-surround" ], - "commit": "4379adea032b25e359d01a36301b4a5afdd0d1b7", - "sha256": "0rj1ippc6yi560xalhd91r7a00lk3d0jk13w464myznkpnasfw3a" + "commit": "464e8ec52ff78edf3c9060143fc375f6ce5f275f", + "sha256": "1bga1idxj8mg5xpl7k4ymwaniyba2x13lf8yihyh713s5238fdmd" }, "stable": { "version": [ @@ -30411,13 +30564,13 @@ "version": [ 2, 3, - 10 + 11 ], "deps": [ "evil" ], - "commit": "b24a7232a2de114cb09774111c2ff8462451894f", - "sha256": "14nrc46290q54y7wv25251f2kqc0z8i9byl09xkgjijqldl9vdxa" + "commit": "a0c5bd1fe89119b94ffb0a266d2969434e7ec4c1", + "sha256": "1990g1b6v0i7jaiv35bdssdn601rjifzg4fy9s3sxk0drqm1xiss" } }, { @@ -30533,11 +30686,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20210311, - 37 + 20210512, + 1346 ], - "commit": "b8ac35fe019df5602c31912f65303a3d8ad0066c", - "sha256": "1vyl8lidhjph7k86n8q09mwqpasaxsmwb8vi5i2gcd6klds9hg0d" + "commit": "9e7e96971900a2840fe2f7e8d6774c92fed2ccba", + "sha256": "04wyz472g4dlyyj7415s8wp4djaizrh7ncngqx8bl6zanksqyv56" }, "stable": { "version": [ @@ -30566,17 +30719,17 @@ }, { "ename": "evil-numbers", - "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", - "sha256": "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2", + "commit": "00d26e91412c9132287ea0019afc29abfc4fb171", + "sha256": "0g02z6jp448lm7dyicxpm53k11f7wgjzn39zgla6p7gg6nmz5hpc", "fetcher": "github", - "repo": "cofi/evil-numbers", + "repo": "juliapath/evil-numbers", "unstable": { "version": [ - 20140606, - 1251 + 20210512, + 2158 ], - "commit": "6ea1c8c3a9b37bed63d48f1128e9a4910e68187e", - "sha256": "1aq95hj8x13py0pwsnc6wvd8cc5yv5qin8ym9js42y5966vwj4np" + "commit": "b54cc5ba35859df15ea9b0405314d9a8ab152743", + "sha256": "1w77ga0r5iwda7ccn7sywndmri4yrryxsb790absx98k69dsai5s" }, "stable": { "version": [ @@ -30657,14 +30810,14 @@ "repo": "mamapanda/evil-owl", "unstable": { "version": [ - 20210408, - 32 + 20210416, + 1700 ], "deps": [ "evil" ], - "commit": "949ab1331ed9ff65d04930b215e033ef19f3696e", - "sha256": "1nkqxpzczlpw7yn8jjr9lqs2izdbw86x7nz0y67x9yy49aj19v6q" + "commit": "a41a6d28e26052b25f3d21da37ccf1d8fde1e6aa", + "sha256": "15yp158krz3znixgxgcblmsfh0dbxc6bf7fig8757vnmjcwlpqrv" }, "stable": { "version": [ @@ -31155,8 +31308,8 @@ "deps": [ "evil" ], - "commit": "d998a8195e404b01e2ea62a455c3dec74d0823c3", - "sha256": "0d4839nqdhr858nzb2cqj3wak2g8ynm5l8ak3467p1k9sn4d487a" + "commit": "8dc0ccdc4c0246af87588a93812a23268f83ab94", + "sha256": "0h09jhq1fpy3qn9ngj04ndjx4r5gxiypwj38z1hmy69nwc9ng02i" }, "stable": { "version": [ @@ -31179,15 +31332,15 @@ "repo": "iyefrat/evil-tex", "unstable": { "version": [ - 20201103, - 1410 + 20210510, + 1809 ], "deps": [ "auctex", "evil" ], - "commit": "5f0d6fb11bce66d32c27c765e93557f6ca89cc7d", - "sha256": "1856liiy75w3r6s5ss6hnzcrypymfp6fpnw0i6ybrw351fkw4k9w" + "commit": "87445d4d2339436179e792609bfbff0eaf056a9c", + "sha256": "014bwsnry6v07n9cv194gsiwny0jp6rxs5gl4dhqfwq9hbj74p84" }, "stable": { "version": [ @@ -31944,11 +32097,11 @@ "repo": "extemporelang/extempore-emacs-mode", "unstable": { "version": [ - 20210316, - 205 + 20210512, + 2350 ], - "commit": "81d79cb2f611aef10fd7b05f6d47977a66502a08", - "sha256": "0bmpmiaz32id2yplfp2vmg3bjbfypg8k0mac8m7v6jclaprw3mal" + "commit": "eb2dee8860f3d761e949d7c2ee8e2e469ac1cf51", + "sha256": "0ivb3c00jlqblzjxw36z3nmqqvv2djyzk69yhlzjw2nl2r2xmhnd" } }, { @@ -32140,39 +32293,30 @@ "repo": "tumashu/exwm-x", "unstable": { "version": [ - 20210411, - 1120 + 20210419, + 950 ], "deps": [ "async", - "bind-key", "cl-lib", - "counsel", - "exwm", - "ivy", - "swiper", - "switch-window" + "exwm" ], - "commit": "7bc7a930998117a714cf1f2940dcab12bcac9b73", - "sha256": "1zs2sixp77q6dd9pdsk3w4y3nj1iz8j74q7nn5rsdmk0ja8i9sws" + "commit": "2ab026f407b011a8e8380c889990e85e69cb3a4e", + "sha256": "05jilbhpbbqbgpxhy11yadmal4gsh8bh1fffxkz8b5k8dpajc634" }, "stable": { "version": [ - 1, - 9, - 0 + 2, + 0, + 2 ], "deps": [ - "bind-key", + "async", "cl-lib", - "counsel", - "exwm", - "ivy", - "swiper", - "switch-window" + "exwm" ], - "commit": "88c8b70be678ce0e9fa31e191ffd3f76bbfee61f", - "sha256": "03l3dl7s1qys1kkh40rm1sfx7axy1b8sf5f6nyksj9ps6d30p5i4" + "commit": "8fd00a0ca586e1c80d08209919f1414b448bc228", + "sha256": "0h248mma7kky30jr9bbhmp95wchl2cx5p6kh0gxmzpbc247dn2cc" } }, { @@ -32447,19 +32591,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20210331, - 233 + 20210427, + 2150 ], - "commit": "ef7efae7a86979e9267f9a600ef1482e0f6a2aa3", - "sha256": "0dl9i2l8186ir56v9vx32rw30pj9xgd7zhf24y6sqfjxn80hkdz8" + "commit": "7b994f27c798a6cd528af25bccbba28e27e6adcf", + "sha256": "0m826s1hll6gjr7y665kix7rnyghdrwi7rga57s158vgg0j345wy" }, "stable": { "version": [ 2, - 17 + 19 ], - "commit": "2db5c559ca7356189083fb698a053bb1fee922a9", - "sha256": "1gk2dxmxv0sgkng7zgakz0gq9i0zh3wrwzsi785s338vjyypwm3g" + "commit": "7b994f27c798a6cd528af25bccbba28e27e6adcf", + "sha256": "0m826s1hll6gjr7y665kix7rnyghdrwi7rga57s158vgg0j345wy" } }, { @@ -32926,11 +33070,7 @@ 1942 ], "commit": "59ab02344f569069b9899a3a5ffdca4a30093df4", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503; retrying in 262 ms\nwarning: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503; retrying in 704 ms\nwarning: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503; retrying in 1035 ms\nwarning: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503; retrying in 2286 ms\nerror: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503\n" - ] + "sha256": "1vh6n2sg89g43sidymk22wjzjh71wgbajshhh7y3f6zf8xs94mmz" }, "stable": { "version": [ @@ -33072,9 +33212,20 @@ "ename": "filetree", "commit": "b4714ecde7200de934165d8e3b7f94ab5d711fa6", "sha256": "0d8ryxq7xa95av36fc25dxrrdxbm69iik22q52fjl9pzivrzlz58", - "error": "Not in archive", "fetcher": "github", - "repo": "knpatel401/filetree" + "repo": "knpatel401/filetree", + "unstable": { + "version": [ + 20210507, + 111 + ], + "deps": [ + "dash", + "helm" + ], + "commit": "113aadfae8ec94fe4ba956dfa6f47fd35b971b3c", + "sha256": "09jddwh0qlawh9isahjw0bn4701j4plgy15j1f514h144chl9z5m" + } }, { "ename": "fill-column-indicator", @@ -33233,11 +33384,11 @@ "repo": "ShuguangSun/find-dupes-dired", "unstable": { "version": [ - 20210204, - 49 + 20210426, + 835 ], - "commit": "3c9783589e43717b682c9e37dd229839735402e8", - "sha256": "1wd7n08cf1mnd7czca3mcsfyh4nlkl36arhc3lnh7lzi98nyd0zv" + "commit": "af56f75afc240d8121c8944a614a272be811830c", + "sha256": "151c9hvsb5bnprn7kf3g23igazkw9l7xvzizikifizfabay9wi2h" }, "stable": { "version": [ @@ -33256,20 +33407,20 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20210323, - 118 + 20210427, + 1205 ], - "commit": "595c6ac9d5e5b2dc138b472a40bc85c7f20a56c0", - "sha256": "1fqg4jg3x7vrcap46vbncazzjaj6yan57rdmi2n8xbhmw3jcc8z9" + "commit": "3bf010d2be073d499de5ffdaa98f48bf8a3dd21e", + "sha256": "0zpckqcx4fbjni1f0c6wzi1356ab06j33himfgkhvyl1bn4w5jna" }, "stable": { "version": [ 6, 0, - 3 + 7 ], - "commit": "6a6328c59a96b09e771cbcc5f4188f20d0757aca", - "sha256": "17l5b9nibhfymyndppq0avbdr2rh20527fyr1q5i1c3xkn4d6wvp" + "commit": "2f44af320b4e62053c5b6b523f69a8f16eaaa1c9", + "sha256": "1qkfijqr839y605ssyalr2v9n6b86hr64mxikc96lx6nzdyjyyl0" } }, { @@ -33496,11 +33647,11 @@ "url": "https://depp.brause.cc/firestarter.git", "unstable": { "version": [ - 20200506, - 1311 + 20210508, + 1626 ], - "commit": "d26bfaaf231a801f7bccf4c5edb51a521ddb7694", - "sha256": "19hmdfrdwiqpsamxsh0zixhgmbkm5pw7p4y4rn0z4k3k0spxajx5" + "commit": "76070c9074aa363350abe6ad06143e90b3e12ab1", + "sha256": "0agw50yrv2hylqqq8c4cjwl3hwfyfsbk74mpys8mi9lsycfw1sg9" }, "stable": { "version": [ @@ -34346,14 +34497,14 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20210213, - 1822 + 20210411, + 2342 ], "deps": [ "flycheck" ], - "commit": "8cd2e747c3f3c1a0879f66b42db090b2878af508", - "sha256": "0m6s8kjk1xpr9pp1s7r39mmm5ry2sa05ync3vjr4kr2m7s5fqchh" + "commit": "74fa2837fd667235121a12eba43aa1675a58c0ec", + "sha256": "0kgib5igj4ngr589v57k3pwk5v8an33v9mdw5g8kxlsiw7ibr3xk" } }, { @@ -34895,15 +35046,15 @@ "repo": "atilaneves/flycheck-dmd-dub", "unstable": { "version": [ - 20210329, - 1926 + 20210412, + 1608 ], "deps": [ "f", "flycheck" ], - "commit": "0799b16872829405e9da4e806ffffa42ad51fa36", - "sha256": "07jip6x59h439m714kx0fs6xfqi9p7yfl47js2py0q51hr51k2ij" + "commit": "818bfed45ac8597b6ad568c71eb9428138a125c8", + "sha256": "19xgj1z1b6m30syq2ps99v1gk76prmvh27nqj83nbqz57nqa0vjb" }, "stable": { "version": [ @@ -35012,14 +35163,14 @@ "repo": "lbolla/emacs-flycheck-elixir", "unstable": { "version": [ - 20180810, - 642 + 20210413, + 612 ], "deps": [ "flycheck" ], - "commit": "11998d7e3e63a33453e934d25b3673f7c558e579", - "sha256": "1hdbg0hvb6hwzjma9mxy0h888c8j2z4g38gwixrdixzbw5727r75" + "commit": "b57a77a21d6cf9621b3387831cba34135c4fa35d", + "sha256": "10y2z3w2hjycy0hx8zbhma88i2v9fs5xs7pwz3k56jnv95ipjmpy" } }, { @@ -35220,25 +35371,33 @@ "url": "https://git.umaneti.net/flycheck-grammalecte/", "unstable": { "version": [ - 20210106, - 1422 + 20210504, + 1852 ], "deps": [ "flycheck" ], - "commit": "69f1f276057dadc7aaa8d1669d68ab17986e5b37", - "sha256": "0ih0nakal36is0dci82gx4ijrvnpz9jpw1adprfara2cf8dx4rk6" + "commit": "f488739aea2ef5c8d39bd28083dd72fdfee46e02", + "error": [ + "exited abnormally with code 1\n", + "", + "Initialized empty Git repository in /run/user/1000/git-checkout-tmp-CWrbtBP5/flycheck-grammalecte-f488739/.git/\nfatal: unable to access 'https://git.umaneti.net/flycheck-grammalecte/': OpenSSL SSL_connect: SSL_ERROR_SYSCALL in connection to git.umaneti.net:443 \nerror: Unable to get pack file https://git.umaneti.net/flycheck-grammalecte/objects/pack/pack-242bc54824844c700bc4fe4a590b9082bf927286.pack\nOpenSSL SSL_read: Connection timed out, errno 110\nerror: Unable to find e9a9751059211e2725b4b68614a5f47ba34f0788 under https://git.umaneti.net/flycheck-grammalecte\nCannot obtain needed object e9a9751059211e2725b4b68614a5f47ba34f0788\nwhile processing commit af9a044c1efab8a9b315cad110b15e9e143a6642.\nerror: fetch failed.\nUnable to checkout f488739aea2ef5c8d39bd28083dd72fdfee46e02 from https://git.umaneti.net/flycheck-grammalecte/.\n" + ] }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "flycheck" ], - "commit": "69f1f276057dadc7aaa8d1669d68ab17986e5b37", - "sha256": "0ih0nakal36is0dci82gx4ijrvnpz9jpw1adprfara2cf8dx4rk6" + "commit": "f488739aea2ef5c8d39bd28083dd72fdfee46e02", + "error": [ + "exited abnormally with code 1\n", + "", + "Initialized empty Git repository in /run/user/1000/git-checkout-tmp-CWrbtBP5/flycheck-grammalecte-f488739/.git/\nfatal: unable to access 'https://git.umaneti.net/flycheck-grammalecte/': OpenSSL SSL_connect: SSL_ERROR_SYSCALL in connection to git.umaneti.net:443 \nerror: Unable to get pack file https://git.umaneti.net/flycheck-grammalecte/objects/pack/pack-242bc54824844c700bc4fe4a590b9082bf927286.pack\nOpenSSL SSL_read: Connection timed out, errno 110\nerror: Unable to find e9a9751059211e2725b4b68614a5f47ba34f0788 under https://git.umaneti.net/flycheck-grammalecte\nCannot obtain needed object e9a9751059211e2725b4b68614a5f47ba34f0788\nwhile processing commit af9a044c1efab8a9b315cad110b15e9e143a6642.\nerror: fetch failed.\nUnable to checkout f488739aea2ef5c8d39bd28083dd72fdfee46e02 from https://git.umaneti.net/flycheck-grammalecte/.\n" + ] } }, { @@ -35256,8 +35415,8 @@ "flycheck", "grammarly" ], - "commit": "192109f43ca5508709a49875ff5f99c25b7f1696", - "sha256": "0ymnypijbivncjncs57dsn096wjccl7vwslv2pa8fl9hjl4y34r0" + "commit": "8321fc98a0809cad17e37ca924d364423c37b8c0", + "sha256": "1pga651wnvw3czqshn731nx0cdaf157v7v1c5n7kh95lc2r3jmn3" }, "stable": { "version": [ @@ -35767,8 +35926,8 @@ "deps": [ "flycheck" ], - "commit": "a285d849e6e227b79bef98f575ecfa43a70661da", - "sha256": "1wdv7iv3lmrpxxdas1p3grkpi08c4ipjfg170nfd2fy9nhr8iy38" + "commit": "2f5f7502c1e422c1df5b347b8142d67d5cd5caa7", + "sha256": "11bhblr96s8a19sb7lnzrwgihqjcwdnajxr6kiplgqd0wsh2h07v" }, "stable": { "version": [ @@ -35922,27 +36081,27 @@ "repo": "purcell/flycheck-package", "unstable": { "version": [ - 20200304, - 2151 + 20210509, + 2323 ], "deps": [ "flycheck", "package-lint" ], - "commit": "303f9e0708292937a668e1145f5eaa19d7d374e2", - "sha256": "0xav8x3vs7i8kvvhnq86scahjzv6m9mnpiibapflc995wqs4yq02" + "commit": "ecd03f83790611888d693c684d719e033f69cb40", + "sha256": "00py39n1383761wq6wp194pvyk94ydqdbxj9kl64g9jnipkp7849" }, "stable": { "version": [ 0, - 13 + 14 ], "deps": [ "flycheck", "package-lint" ], - "commit": "e867b83dc84f1f8870eea069a71fa2a24cbcd5c9", - "sha256": "1b7javiqbcfzh1xkrjld9f5xrmld69gvnjz72mqpqmzbilfvmdpq" + "commit": "ecd03f83790611888d693c684d719e033f69cb40", + "sha256": "00py39n1383761wq6wp194pvyk94ydqdbxj9kl64g9jnipkp7849" } }, { @@ -36081,8 +36240,8 @@ "deps": [ "flycheck" ], - "commit": "039a6c9d0324208d4f4b006693c16248fcf5519b", - "sha256": "1sr1n7gv5n22w018z5nxfnknjqmk2lc8h2flv4d2f23aihlss9h3" + "commit": "ca00e018ecb9ebea4dde7f17eadb95d755ea88ab", + "sha256": "0j2klnv15v2gqnly5vgdrdrkccsza9mwz5c87i6qgnfawmnsh32d" }, "stable": { "version": [ @@ -36269,14 +36428,14 @@ "repo": "msherry/flycheck-pycheckers", "unstable": { "version": [ - 20200828, - 1814 + 20210414, + 2023 ], "deps": [ "flycheck" ], - "commit": "e8ce874eea4bba13aead8eb8e0262e94fb51f25e", - "sha256": "0i98viqm5plifaw3qdf2sxnk70l32qnkr82gl6j561vqhycxjq40" + "commit": "771fb9a66223287fcd4998b5f6d32d8c602bd91c", + "sha256": "1p4fys8hb89dfqqrzrwqdglxxm50g4x5na2hgzvkq1n0ss617rdj" }, "stable": { "version": [ @@ -36843,11 +37002,11 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20210213, - 1822 + 20210411, + 2342 ], - "commit": "8cd2e747c3f3c1a0879f66b42db090b2878af508", - "sha256": "0m6s8kjk1xpr9pp1s7r39mmm5ry2sa05ync3vjr4kr2m7s5fqchh" + "commit": "74fa2837fd667235121a12eba43aa1675a58c0ec", + "sha256": "0kgib5igj4ngr589v57k3pwk5v8an33v9mdw5g8kxlsiw7ibr3xk" } }, { @@ -37149,8 +37308,8 @@ "deps": [ "grammarly" ], - "commit": "f09caa56254e6c639993afba29f5a4b8b9f9c73e", - "sha256": "0djjxnmy2bkkc6nyl5iq3axnp0marpzpnb8cgh79w1fch300avrf" + "commit": "bc7c7e74013816ea06463ff85627bdc08ad60d9a", + "sha256": "0yj0mqyg0c87kvxz21y0wmfx97lwvym6qm3sdppgkff5fwppyj91" }, "stable": { "version": [ @@ -37936,8 +38095,8 @@ 20210124, 1143 ], - "commit": "d19a090b978a249fc8f6d8b14309a5705a6bb483", - "sha256": "1p9s1qcqk834r0lkqzch8gb7c8qrpvbhxfyb44bgjd9qcw0kzr3s" + "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", + "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" }, "stable": { "version": [ @@ -37964,8 +38123,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "d19a090b978a249fc8f6d8b14309a5705a6bb483", - "sha256": "1p9s1qcqk834r0lkqzch8gb7c8qrpvbhxfyb44bgjd9qcw0kzr3s" + "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", + "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" }, "stable": { "version": [ @@ -37996,8 +38155,8 @@ "flyspell-correct", "helm" ], - "commit": "d19a090b978a249fc8f6d8b14309a5705a6bb483", - "sha256": "1p9s1qcqk834r0lkqzch8gb7c8qrpvbhxfyb44bgjd9qcw0kzr3s" + "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", + "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" }, "stable": { "version": [ @@ -38028,8 +38187,8 @@ "flyspell-correct", "ivy" ], - "commit": "d19a090b978a249fc8f6d8b14309a5705a6bb483", - "sha256": "1p9s1qcqk834r0lkqzch8gb7c8qrpvbhxfyb44bgjd9qcw0kzr3s" + "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", + "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" }, "stable": { "version": [ @@ -38060,8 +38219,8 @@ "flyspell-correct", "popup" ], - "commit": "d19a090b978a249fc8f6d8b14309a5705a6bb483", - "sha256": "1p9s1qcqk834r0lkqzch8gb7c8qrpvbhxfyb44bgjd9qcw0kzr3s" + "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", + "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" }, "stable": { "version": [ @@ -38428,11 +38587,11 @@ "repo": "Fuco1/fontify-face", "unstable": { "version": [ - 20180420, - 1624 + 20210503, + 1956 ], - "commit": "30ec0134f04d2b156bbc772e94edfa1a31ef0a58", - "sha256": "1i7hc436230dn68q2r7das7rgg8x0j3h43sv23krrg4qr0n0v07y" + "commit": "d1386c88ccc77ccfb40b888ff90d6181325d14f8", + "sha256": "1fi8sa7d6p6zgpvrnmpl85jfxqnl43053krb4h2lw0cgxd2wbd1v" }, "stable": { "version": [ @@ -38455,8 +38614,8 @@ 20191004, 1850 ], - "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f", - "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q" + "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984", + "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b" } }, { @@ -38533,8 +38692,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20210406, - 1356 + 20210507, + 1554 ], "deps": [ "closql", @@ -38546,8 +38705,8 @@ "markdown-mode", "transient" ], - "commit": "ab3be5a703f319e6de7e76ed292d20deb60cb2d7", - "sha256": "1flpxzmxyz94vl0y2mw437nmcsls1fncapa75kqnbbcf641nidhy" + "commit": "37aa4e4b82a99246b3551daee6104dc1d192174a", + "sha256": "01z6mnl68lwm0nj0mbvns6xacfydadwcmjzfy3vnmj7hkcd9nynd" }, "stable": { "version": [ @@ -38578,11 +38737,11 @@ "url": "https://depp.brause.cc/form-feed.git", "unstable": { "version": [ - 20201116, - 1108 + 20210508, + 1627 ], - "commit": "26a52410db56fab9888b24b7622d74a2779c719d", - "sha256": "17xg7l6d509ngpdmx56z7mqr2iiyslyb3fhhlccifmnlxbvcr15g" + "commit": "ac1f0ef30a11979f5dfe12d8c05a666739e486ff", + "sha256": "1rrsnc6qwbqk091v1xinfn48fc0gbi3l5fy9hyafgl4zdx5ia2bg" }, "stable": { "version": [ @@ -38602,15 +38761,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210315, - 640 + 20210413, + 802 ], "deps": [ "inheritenv", "language-id" ], - "commit": "94239d35944830ce009d01ac3369e0d61f9723c2", - "sha256": "1q27yr916vhk0ah1406vs540f8hpp8bca1f118xwhyj1fw3yrbaw" + "commit": "eb5906c7070b667432194da3991daf21f24b516a", + "sha256": "02i9qijkwzwjcl52ivzhcjamsiygdxn62gdkb9v511036vv4dqff" }, "stable": { "version": [ @@ -38747,14 +38906,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20210411, - 1308 + 20210508, + 938 ], "deps": [ "seq" ], - "commit": "3416d8cbf17af8b6f9118ae1963f203bf9b2509d", - "sha256": "1a9w6l46fs3dq52vih5dlm3163iy3dghz08d7c5xfg17c1b98yg8" + "commit": "d8c0a9b842f332c2b781a1cae03777ef193929c3", + "sha256": "0dya3idd0livajb9xx8fhdaplsv5avr97iqb3jjzkxn367i9dnnj" }, "stable": { "version": [ @@ -39037,8 +39196,8 @@ 20210201, 731 ], - "commit": "752fe042ba3153473cd149875388c8dd9b4a8a26", - "sha256": "0x4sp6n6dksa8vps465i8sqvdzacr7hrxd4jlxj9gqkcspalrjgy" + "commit": "d5dc811fc892d78e042394bb4a1342dea2480b5c", + "sha256": "0n1w3rycc5cpqvhw6d1dzkwjdy1xx7bps7d994l4hcpdfx5c25lx" }, "stable": { "version": [ @@ -39250,8 +39409,8 @@ "repo": "thefrontside/frontmacs", "unstable": { "version": [ - 20210206, - 2008 + 20210512, + 2338 ], "deps": [ "add-node-modules-path", @@ -39263,8 +39422,8 @@ "tide", "web-mode" ], - "commit": "2b0e27a2f5fa18079b00753b3bf9635818e11f71", - "sha256": "0cv0vrz8mv7b8hm3ac8l7zjscavsxix0wiv646n5vx03282zfgpk" + "commit": "dbd6f8845376a0e1de252751206a6cfc7d0ec3ff", + "sha256": "0m7slls2mwvx5jars0fvxvs3x12nhjnmcl0njj03aw02lxb4wh17" } }, { @@ -39365,14 +39524,14 @@ "repo": "factor/factor", "unstable": { "version": [ - 20210323, - 1426 + 20210506, + 1352 ], "deps": [ "cl-lib" ], - "commit": "43dfeb07bd3932f9d42c2b964413001cf32f0d50", - "sha256": "16an39w1ycbw90d6l0d2mcvyndah1j21b2jf7iwnqipwsac9f1qm" + "commit": "20cefa0fb6514f30738a4b6774e0ce356b4af9bd", + "sha256": "0nbpxxplfg1954yxlj9d54v7ln99qb4fqy5p6d32qxh4v475fbdq" }, "stable": { "version": [ @@ -39706,11 +39865,11 @@ "repo": "bling/fzf.el", "unstable": { "version": [ - 20210101, - 1358 + 20210508, + 1516 ], - "commit": "c84beb96b959c0a20d70dad3bb9e3bc275a5b001", - "sha256": "1qb49qw0lyb2v3yn4jzq8fyq45akrl4078kg2q38g3gh9n29wf52" + "commit": "23c09c9c0417c7de67a8965d9b506d0cc7aea7a2", + "sha256": "0c4cz1kyanqswz5ww8aql96hqxg8p8lwwwygw061rq2ycmkl54nk" }, "stable": { "version": [ @@ -39971,23 +40130,19 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20210410, - 2304 + 20210428, + 1942 ], - "commit": "aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503; retrying in 278 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503; retrying in 535 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503; retrying in 1141 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503; retrying in 2003 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503\n" - ] + "commit": "4099dce8f5f17cce8f292cdf0bc1bf2e5cb6975c", + "sha256": "0s02443pxi49c8hmkk3g489ngb5bl95inraq3jabb6dh7gyxgkag" }, "stable": { "version": [ 0, - 12 + 16 ], - "commit": "adc5c4ab5ff33cf94cb3fcd892bb9503b5fa2aa2", - "sha256": "0n718xpys7v94zaf9lpmsx97qgn6qxif1acr718wyvpmfr4hiv08" + "commit": "803dfeb9414ed7b99c5d567170f32c97cafa1114", + "sha256": "16jqni4s2yxszhkbb83fkgflygbxzx01cmq2qq40p4ihbvwm0gb0" } }, { @@ -39998,18 +40153,25 @@ "repo": "emacs-geiser/chez", "unstable": { "version": [ - 20210405, - 1922 + 20210421, + 120 ], "deps": [ "geiser" ], - "commit": "4cb7f2667ea1c53da53f0144910fbbd67bccbf4d", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503; retrying in 257 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503; retrying in 677 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503; retrying in 1142 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503; retrying in 2316 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503\n" - ] + "commit": "03da1c17253856d8713bc5a25140cb5002c9c188", + "sha256": "0cc1z5z5cpvxa5f3n8kvms0wxlybzcg4l1bh3rwv1l1sb0lk1xzx" + }, + "stable": { + "version": [ + 0, + 16 + ], + "deps": [ + "geiser" + ], + "commit": "03da1c17253856d8713bc5a25140cb5002c9c188", + "sha256": "0cc1z5z5cpvxa5f3n8kvms0wxlybzcg4l1bh3rwv1l1sb0lk1xzx" } }, { @@ -40020,18 +40182,25 @@ "repo": "emacs-geiser/chibi", "unstable": { "version": [ - 20210405, - 1924 + 20210421, + 123 ], "deps": [ "geiser" ], - "commit": "54e7f384618c73d8fb675b5289d443a8ee3e4dc8", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503; retrying in 250 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503; retrying in 530 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503; retrying in 1321 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503; retrying in 2133 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503\n" - ] + "commit": "6f59291d8d1dc92ffd3f53f919d8cab4bf50b7d3", + "sha256": "0r92iay5cw7jqyd8cy2mm02y0sl89flp4asbz6ca9l818micphfn" + }, + "stable": { + "version": [ + 0, + 16 + ], + "deps": [ + "geiser" + ], + "commit": "6f59291d8d1dc92ffd3f53f919d8cab4bf50b7d3", + "sha256": "0r92iay5cw7jqyd8cy2mm02y0sl89flp4asbz6ca9l818micphfn" } }, { @@ -40042,18 +40211,25 @@ "repo": "emacs-geiser/chicken", "unstable": { "version": [ - 20210405, - 1931 + 20210421, + 127 ], "deps": [ "geiser" ], - "commit": "47be5b43b35d3bf35b0f668b4c08715ea41fb97d", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503; retrying in 302 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503; retrying in 546 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503; retrying in 1206 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503; retrying in 2316 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503\n" - ] + "commit": "ceab39c89607f55cba88e5606ba5eb37c7df5260", + "sha256": "0klssx0vhj48868p36nkn22qh2k4188gpvi3c2pjk9lb7d5356xj" + }, + "stable": { + "version": [ + 0, + 16 + ], + "deps": [ + "geiser" + ], + "commit": "ceab39c89607f55cba88e5606ba5eb37c7df5260", + "sha256": "0klssx0vhj48868p36nkn22qh2k4188gpvi3c2pjk9lb7d5356xj" } }, { @@ -40064,18 +40240,25 @@ "repo": "emacs-geiser/gambit", "unstable": { "version": [ - 20210405, - 1925 + 20210421, + 124 ], "deps": [ "geiser" ], - "commit": "0ee4156640988497779345452c3aa0417356e606", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503; retrying in 251 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503; retrying in 559 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503; retrying in 1131 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503; retrying in 2010 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503\n" - ] + "commit": "3294c944d1c3b79db44ed14b133129fec454bd60", + "sha256": "1vwr0iv7pznr7n6j76i90n306mhq5pxdj8b2f7l5mb32m442w2w9" + }, + "stable": { + "version": [ + 0, + 16 + ], + "deps": [ + "geiser" + ], + "commit": "3294c944d1c3b79db44ed14b133129fec454bd60", + "sha256": "1vwr0iv7pznr7n6j76i90n306mhq5pxdj8b2f7l5mb32m442w2w9" } }, { @@ -40098,14 +40281,10 @@ "stable": { "version": [ 0, - 0, - 2 + 14 ], - "deps": [ - "geiser" - ], - "commit": "9e7ed54e5629f759660569bc7efc3d75dbabbc5f", - "sha256": "0rxncnzx7qgcpvc8nz0sd8r0hwrplazzraahdwhbpq0q6z8ywqgg" + "commit": "362f1d1189c090ece8b94f6a51680f74b1ff40f9", + "sha256": "1gsvl0r6r385lkv0z4gkxirz9as6k0ghmk402zsyz8gvdpl0f3jw" } }, { @@ -40116,36 +40295,54 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20210405, - 1917 + 20210508, + 1838 ], "deps": [ "geiser" ], - "commit": "93ef7101fdfcc7eac6f465b4b9788c384a323c14", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503; retrying in 250 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503; retrying in 632 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503; retrying in 1153 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503; retrying in 2774 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503\n" - ] + "commit": "8dda28f4f1758221f84f5cb5dc5b5ca5fd56caa9", + "sha256": "0iw23nlgqppf6f00ly50m8lq85n9mv244pw3whxv0hynfjxr2ic0" + }, + "stable": { + "version": [ + 0, + 17 + ], + "deps": [ + "geiser" + ], + "commit": "8dda28f4f1758221f84f5cb5dc5b5ca5fd56caa9", + "sha256": "0iw23nlgqppf6f00ly50m8lq85n9mv244pw3whxv0hynfjxr2ic0" } }, { "ename": "geiser-kawa", - "commit": "68690d6b011c95197af6b5a87cc21c4dbe97ff00", - "sha256": "0gzzab0v93vd9n14s1bya0frf3dagh0gbwg1an4mapg7gjz9ffdg", + "commit": "8e3f52b2b0dbd2ace92ec33caa3afc51e5c5e5cf", + "sha256": "0rvcpcf8znbndzm481a3477dw61rih1ifj3z2pwv33z6al6lwlh4", "fetcher": "gitlab", - "repo": "spellcard199/geiser-kawa", + "repo": "emacs-geiser/kawa", "unstable": { "version": [ - 20200507, - 1305 + 20210427, + 1626 ], "deps": [ "geiser" ], - "commit": "b96c008e9c3b8dc210d8b536ee7b76b8690c8af6", - "sha256": "0j2djjgfd4hd2k60ymgxzpsy52ks6hxpd4rr81z5nh9fdg9axhrs" + "commit": "3d999a33deedd62dae60f3f7cedfbdb715587ea7", + "sha256": "1i4ywb4ggq884p2lbpmp6y53l8ys5ajma7sk21zxi1jx28nb01nm" + }, + "stable": { + "version": [ + 0, + 14 + ], + "deps": [ + "geiser" + ], + "commit": "f76b53dbc1465dbd799e29bdcd2be34cc1603f50", + "sha256": "1i4ywb4ggq884p2lbpmp6y53l8ys5ajma7sk21zxi1jx28nb01nm" } }, { @@ -40163,11 +40360,18 @@ "geiser" ], "commit": "d17394f577aaa2854a74a1a0039cb8f73378b400", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503; retrying in 286 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503; retrying in 541 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503; retrying in 1159 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503; retrying in 2059 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503\n" - ] + "sha256": "0w80ifs5d49ss81j34lnq91x2sbkc44i2xswkcwx23rh62p4jvyc" + }, + "stable": { + "version": [ + 0, + 14 + ], + "deps": [ + "geiser" + ], + "commit": "d17394f577aaa2854a74a1a0039cb8f73378b400", + "sha256": "0w80ifs5d49ss81j34lnq91x2sbkc44i2xswkcwx23rh62p4jvyc" } }, { @@ -40178,18 +40382,54 @@ "repo": "emacs-geiser/racket", "unstable": { "version": [ - 20210405, - 1929 + 20210421, + 125 ], "deps": [ "geiser" ], - "commit": "a87fd449cc6c7b0b17a0b08268e78d3f038f3351", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503; retrying in 346 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503; retrying in 544 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503; retrying in 1082 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503; retrying in 2114 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503\n" - ] + "commit": "22e56ce80389544d3872cf4beb4008fb514b2218", + "sha256": "1aqsvmk1hi7kc3j4h8xlza7c6rwm71v98fv5wpw8kmyj9vsp49wx" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "geiser" + ], + "commit": "42376b74ae0ad84d02c26560dfd9181493dcccd7", + "sha256": "1aqsvmk1hi7kc3j4h8xlza7c6rwm71v98fv5wpw8kmyj9vsp49wx" + } + }, + { + "ename": "geiser-stklos", + "commit": "6530db79aafe4ac4cefa01f77a8cc1e259385171", + "sha256": "0bbxxxvzp4dd22lrlmg0lnishvqj1pcm82scds27nrkzrcdycs8s", + "fetcher": "gitlab", + "repo": "emacs-geiser/stklos", + "unstable": { + "version": [ + 20210503, + 944 + ], + "deps": [ + "geiser" + ], + "commit": "0e3a0570354c03c0cfa25da82fb34ad2e81c1981", + "sha256": "1g31cibl88g1vjfvw4z80ywxpnxy5lijhs754qdcnx36maragh07" + }, + "stable": { + "version": [ + 1, + 6 + ], + "deps": [ + "geiser" + ], + "commit": "0e3a0570354c03c0cfa25da82fb34ad2e81c1981", + "sha256": "1g31cibl88g1vjfvw4z80ywxpnxy5lijhs754qdcnx36maragh07" } }, { @@ -40358,8 +40598,8 @@ "magit", "s" ], - "commit": "63ca93be02f830f8d65905ebde72d60a2280687a", - "sha256": "08s7q7br8a68gs7w55g6i4g0d6ky2mksl1ws8iigiavkh64sihkb" + "commit": "6a90e7233dccc2f997af2cd5c896c8d72d3c3a76", + "sha256": "1nmgngxgzbp1l4av6vb6fgl2nbizsffv51qnki8yaycl1f3cmrg9" } }, { @@ -40593,11 +40833,11 @@ "repo": "rcoedo/emacs-ghq", "unstable": { "version": [ - 20160803, - 1557 + 20210504, + 902 ], - "commit": "aae4b8cb22fd6c24d2c9e3962c7e8e9dac6d9825", - "sha256": "0rh2k93c3a0vl073a3s3a3h6gkw454v1lyd7y8l3pd24vw9hc628" + "commit": "582bd6daa505d04c7cc06d6c82ed8aee0624bfbe", + "sha256": "0lb3ic0s32ipvdka8y8grkfi8jb8j821g815v9dnslj7hzh07g2j" }, "stable": { "version": [ @@ -40617,28 +40857,28 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20210327, - 1647 + 20210427, + 1239 ], "deps": [ "let-alist", "treepy" ], - "commit": "2273c3b49a08cde0498b3b2cfae6c764629a4c93", - "sha256": "1pg46ycllg900cd8q5bsgv9b9mcc0bm0z5g2bw9gf5nnbw556jla" + "commit": "d6e6b0666104f3896d05d2b03d08d84d9dca096f", + "sha256": "04ifyn8pkhg6lhlikxfgj6fcnz33mgr6x24y72754szc105irb0s" }, "stable": { "version": [ 3, 5, - 1 + 2 ], "deps": [ "let-alist", "treepy" ], - "commit": "5fae5e31586a11a2025168030e0eb3876502611c", - "sha256": "0i19h9zl8wky1296f0d7dcx9dpfmfixinnaf4l1w1bf4p2xmyfiw" + "commit": "d6e6b0666104f3896d05d2b03d08d84d9dca096f", + "sha256": "04ifyn8pkhg6lhlikxfgj6fcnz33mgr6x24y72754szc105irb0s" } }, { @@ -40684,19 +40924,15 @@ 656 ], "commit": "fa81e915c256271fa10b807a2935d5eaa4700dff", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503; retrying in 272 ms\nwarning: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503; retrying in 546 ms\nwarning: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503; retrying in 1078 ms\nwarning: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503; retrying in 2648 ms\nerror: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503\n" - ] + "sha256": "1yf6yipvhhna29mzaan5vb3d5qvbrkp2awr5diyf381mvxgk8akh" }, "stable": { "version": [ 1, - 1 + 2 ], - "commit": "9522f7e41d07b59afe21e28abbf186f78be3eab6", - "sha256": "1g1by8lvf8c9vzm4wwsi5kp285kaj0ahsl54048ympin4pi0njw9" + "commit": "fa81e915c256271fa10b807a2935d5eaa4700dff", + "sha256": "1yf6yipvhhna29mzaan5vb3d5qvbrkp2awr5diyf381mvxgk8akh" } }, { @@ -40987,16 +41223,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210328, - 1730 + 20210512, + 1949 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "5882df245d3388cd6f443bc11df219a838104df2", - "sha256": "08yisn699gg2mfapc1h1rfb90vm9p10vk1c9xzd4h30xa6c0299h" + "commit": "fcd50dd8ae7cb33332eb7c6d90932be41b869cae", + "sha256": "01mmia1zcq980gxb65v553nlr3zdy1zk772ad4q34zlkvvaq605r" }, "stable": { "version": [ @@ -41089,11 +41325,11 @@ "repo": "emacsorphanage/git-gutter", "unstable": { "version": [ - 20210127, - 1100 + 20210511, + 427 ], - "commit": "cca61a1c6b0c0fd6ecb1b0366711c618581eabb6", - "sha256": "1q6qrrxa3mf3pkkqr8piaij3yrgqh48xrrn3a442wn2i427q63kc" + "commit": "d050abdd7f5a46c9cfbec2953d2fca90095e2857", + "sha256": "1bx44spbhags7d2jjfcvanian36vkw1cw186zy7vl2nqwf9hfa95" }, "stable": { "version": [ @@ -41206,16 +41442,16 @@ "repo": "akirak/git-identity.el", "unstable": { "version": [ - 20201223, - 948 + 20210430, + 1603 ], "deps": [ "dash", "f", "hydra" ], - "commit": "1c35e1693bbb7de41a8aac820a080a7299c13c17", - "sha256": "136j6gbpg8qx6ry1ryh4aal41b3c8pz7g2xisyipjj6p9lmykvqi" + "commit": "24360718c1666a246a39aadc8a251faa8578cc66", + "sha256": "129xv2ddgdkc9ipkxvwprkwp245x1zq2r75liv31x8x4g4i4305i" }, "stable": { "version": [ @@ -41279,11 +41515,11 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20210318, - 313 + 20210504, + 2207 ], - "commit": "2b510cf3f28bed842853294fc4ee23c7f8b6435a", - "sha256": "0c5p5llxlgi09lymjnh0jpp36v5vfmi6rjb77123gcnsqi0031wn" + "commit": "0d2fd02c160cf2a09ca4b5b4ffa544833df5afed", + "sha256": "1ryb5hfdfv5iaakv74h5wnwislbc4b9ihjc32cy9sc4gizjvrrmp" }, "stable": { "version": [ @@ -41480,20 +41716,20 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20180318, - 1956 + 20210426, + 2132 ], - "commit": "14adca24eb6b0b4e311ad144c5d41972c6b044b2", - "sha256": "1z3xyjlbxni98hqdnd46lg89dcmcaqjsv73wv16ia4z6lrkhv5dp" + "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", + "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" }, "stable": { "version": [ 1, - 2, - 8 + 3, + 0 ], - "commit": "55468314a5f6b77d2c96be62c7005ac94545e217", - "sha256": "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72" + "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", + "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" } }, { @@ -41528,20 +41764,20 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20180318, - 1956 + 20210426, + 2132 ], - "commit": "14adca24eb6b0b4e311ad144c5d41972c6b044b2", - "sha256": "1z3xyjlbxni98hqdnd46lg89dcmcaqjsv73wv16ia4z6lrkhv5dp" + "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", + "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" }, "stable": { "version": [ 1, - 2, - 8 + 3, + 0 ], - "commit": "55468314a5f6b77d2c96be62c7005ac94545e217", - "sha256": "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72" + "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", + "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" } }, { @@ -41816,20 +42052,20 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20180318, - 1956 + 20210426, + 2132 ], - "commit": "14adca24eb6b0b4e311ad144c5d41972c6b044b2", - "sha256": "1z3xyjlbxni98hqdnd46lg89dcmcaqjsv73wv16ia4z6lrkhv5dp" + "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", + "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" }, "stable": { "version": [ 1, - 2, - 8 + 3, + 0 ], - "commit": "55468314a5f6b77d2c96be62c7005ac94545e217", - "sha256": "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72" + "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", + "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" } }, { @@ -41978,26 +42214,26 @@ "repo": "TxGVNN/gitlab-pipeline", "unstable": { "version": [ - 20210322, - 439 + 20210430, + 151 ], "deps": [ "ghub" ], - "commit": "089400ac1d411a2b58cf1a64f28911079d5c898f", - "sha256": "0zck5488fswqcl7ahknm6nan5al8db73p2jbxnwcv2cxcia81qza" + "commit": "0a07b64e402fa1e25423f8f6ed38b35ff09159d9", + "sha256": "1611nday1mxkkjjwcz62bvl8863vlkl4bq4vf3wj6p237m4ai3ks" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "ghub" ], - "commit": "ecb3a2277f6a1c7fed73f9381834724c143c85da", - "sha256": "1nqrim3fpgf5npzl14sd0h6dlhi925hns2f75l4arrhbcjgcn984" + "commit": "078f72d52e840907aa4c568468ce25758f20eb15", + "sha256": "0y2dkw7dwk1g4q0z1bjycj7sv47pvna6h7kwh8padn5l4fiy0hkd" } }, { @@ -42963,8 +43199,8 @@ "cl-lib", "go-mode" ], - "commit": "49a538028e63dbe20f428c52d91f09b70b564626", - "sha256": "1zmpbna0picp8iyscrqgvxz5pbkbpapzij0vprkqzfznvihn926n" + "commit": "34974346d1f74fa835d745514c9fe9afccce8dae", + "sha256": "1h0vyp3xbz6xx6warxi23w8kjjgkr0x1lr6r9a2qiz2rywn8jlxf" }, "stable": { "version": [ @@ -43056,11 +43292,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20210201, - 1458 + 20210509, + 2353 ], - "commit": "49a538028e63dbe20f428c52d91f09b70b564626", - "sha256": "1zmpbna0picp8iyscrqgvxz5pbkbpapzij0vprkqzfznvihn926n" + "commit": "34974346d1f74fa835d745514c9fe9afccce8dae", + "sha256": "1h0vyp3xbz6xx6warxi23w8kjjgkr0x1lr6r9a2qiz2rywn8jlxf" }, "stable": { "version": [ @@ -43179,8 +43415,8 @@ "deps": [ "go-mode" ], - "commit": "49a538028e63dbe20f428c52d91f09b70b564626", - "sha256": "1zmpbna0picp8iyscrqgvxz5pbkbpapzij0vprkqzfznvihn926n" + "commit": "34974346d1f74fa835d745514c9fe9afccce8dae", + "sha256": "1h0vyp3xbz6xx6warxi23w8kjjgkr0x1lr6r9a2qiz2rywn8jlxf" }, "stable": { "version": [ @@ -43337,8 +43573,8 @@ 20210102, 515 ], - "commit": "02a402b2323e025f77e89cf56d5e678e31a2d2f6", - "sha256": "07xxj1wqxjvzlqp41xj9jz1jfbb8h4578xmbfaqi4isljbadj04k" + "commit": "fcbd45f78b85500f66f323bd19994941832c28d1", + "sha256": "1akrm884nbqjf4l5667cfdxn8xawb2fkri40hv7k8w0pl9cjbamx" }, "stable": { "version": [ @@ -43474,8 +43710,8 @@ 20180221, 2015 ], - "commit": "83fdc39ff7b56453e3793356bcff3070b9b96445", - "sha256": "0ms3rs5hvpnm9bxbr5f9743i7hn2bbmqdmvzxq6nmi0f24ypv1l3" + "commit": "6edffad5e6160f5949cdefc81710b2706fbcd4f6", + "sha256": "1n7lrr3282q3li4f06afms444qy13rfd316za0drqihakwyki2jk" } }, { @@ -43528,11 +43764,11 @@ "stable": { "version": [ 0, - 3, + 4, 0 ], - "commit": "a4e80bbf83872fa6c8ace5197693d2f81c4ff1cd", - "sha256": "0bh3wbaiavz033isgl0m7crjhfsb0gxsgsnh54aph7pdrffci0r6" + "commit": "fb01f121c4c77db3e6750303894d57b31e410b14", + "sha256": "0jz4p6xa8nb36g96a8pbhpc4l16jzwryddlw2c442vmkngwy9s1j" } }, { @@ -43561,8 +43797,8 @@ 20180130, 1736 ], - "commit": "845e4f9a15a794071457e74c1fa99be2c68d75fe", - "sha256": "130bjw6bpizf0wq48d8n1cvgpdrq31d8ryd6wmah8a5vbwnczf6y" + "commit": "9c8784ded344f6a35d1e1550385002f613a0c788", + "sha256": "1n1pk876yicv9hvwmja3hs6i7s25nv626p3gxsp9278yb933ml2m" } }, { @@ -43777,11 +44013,11 @@ "url": "https://depp.brause.cc/gotham-theme.git", "unstable": { "version": [ - 20210318, - 2207 + 20210508, + 1632 ], - "commit": "51876a72dbe5a16aeadde2e885da6bbf75909bd1", - "sha256": "042cpdl7srfj1ha3z27xj03bzp3vrz6ql4x0zzvjxsyj08z1q80y" + "commit": "8a97fb8a68cef8e431c972b3d5713b637e21dd7e", + "sha256": "1ldywxhbb34pj7p4rhhzlavwqci9i35i4f8cnyi1w5b1469v1x9f" }, "stable": { "version": [ @@ -43825,11 +44061,11 @@ "repo": "emacs-evil/goto-chg", "unstable": { "version": [ - 20201101, - 1029 + 20210508, + 1632 ], - "commit": "2af612153bc9f5bed135d25abe62f46ddaa9027f", - "sha256": "1awmvihqgw6kspx192bcp9xp56xqbma90wlhxfxmidx3bvxghwpv" + "commit": "3ce1389fea12edde4e343bc7d54c8da97a1a6136", + "sha256": "13v9d97ypkfa3g0x64psk29hpicl4djk35iwxhvw080bagrn5gls" }, "stable": { "version": [ @@ -43921,14 +44157,14 @@ "magit-popup", "s" ], - "commit": "52c75aa6b3d8eeacfede11b314e20514ca7c75a4", - "sha256": "1a2nzbxhqwpjxfm4sr1l2pyjxhvfwd3ralxmldgsdpssqx64lvsn" + "commit": "880725e0210d048e4d415d6aedb64c80e111357c", + "sha256": "0s7ya563j6ha10hm3r03dk053awws6740g42njxfvvccw3xqx80g" }, "stable": { "version": [ 0, - 24, - 1 + 25, + 0 ], "deps": [ "dash", @@ -43936,8 +44172,8 @@ "magit-popup", "s" ], - "commit": "f49dcf5ec6e16562de30674b36b18e6bdcd47411", - "sha256": "1slw2pawlcx9zfvsazsir2kj32g30b80c7a0yiqyrd7cv1hjnr8g" + "commit": "bb0307eb84ae981cfca7fc8d680821a2c2be3c6d", + "sha256": "0jwfk4kqz8jzxlhdihb0wvyiza1zfwcwr2p9frk0cw50p6fjqbs6" } }, { @@ -43987,11 +44223,11 @@ "repo": "xuchunyang/grab-mac-link.el", "unstable": { "version": [ - 20200712, - 428 + 20210511, + 1303 ], - "commit": "9b47cbe126a0735fa447a3c5e1e8ba80a7ef8d26", - "sha256": "1hx3a6sfc3ah3xgwii0l0jvshgbw0fjwsyrmb4sri0k8cla7fwin" + "commit": "2c722016ca01bd4265d57c4a7d55712c94cf4ea5", + "sha256": "1019304mw72swkw1dkhbcrfl0acg6gj0m1cwg2w8d89dba2ddbw8" }, "stable": { "version": [ @@ -44096,8 +44332,8 @@ 20160504, 911 ], - "commit": "26da902d1158c0312628d57578109be54eca2415", - "sha256": "113s9znqrdi9zm045hi3ws5ixrd0bzxfy3wr8lzxq9r3jbv67iz2" + "commit": "99eaf70720e4a6337fbd5acb68ae45cc1779bdc4", + "sha256": "1jpfyqnqd8nj0g8xbiw4ar2qzxx3pvhwibr6hdzhyy9mmc4yzdgk" }, "stable": { "version": [ @@ -44156,8 +44392,8 @@ "s", "websocket" ], - "commit": "e11a5a67307f05e08812be190b23460a1bf97687", - "sha256": "10ral5vipq3jvg3l8l2vgia97dpsjzkjvidp63n5z6mpjdwblka1" + "commit": "175e68d7ce9fd4c44d1eb808954cf0ba66b59599", + "sha256": "1ylynb295p5c26ayb8kdxqfbj9z61vinnd6bdlwsynr1wncbwyy4" }, "stable": { "version": [ @@ -44534,11 +44770,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20200725, - 725 + 20210428, + 1052 ], - "commit": "98d566db769b865f102a0c6802a08ebce8ae5e7f", - "sha256": "0dh0a2msrbr31lzrp9b0xrp78g4h02qcsxjjzgmqyb6fqzhbr3kd" + "commit": "28552059c4643f571ef0883ad543270a48241572", + "sha256": "00prmjyfcnslb8b2gynlsrg80z6ns6jjyj87qniwj0rfmbfnh0qa" }, "stable": { "version": [ @@ -44585,27 +44821,28 @@ "repo": "mbezjak/emacs-groovy-imports", "unstable": { "version": [ - 20161003, - 851 + 20210505, + 1807 ], "deps": [ "pcache", "s" ], - "commit": "e56d7dda617555ec6205644d32ffddf2e1fa43d9", - "sha256": "060zxl2y4p50g5fwgplgx07h5akfplp49rkv5cx09rqlcyzqhqwa" + "commit": "a60c3202973e3185091db623d960f71840a22205", + "sha256": "1bsmf64ycmfnsb0r0nyaky1h3x2fpr4qyck3ihw16pa6d7spaw8c" }, "stable": { "version": [ 1, - 0 + 0, + 1 ], "deps": [ "pcache", "s" ], - "commit": "e56d7dda617555ec6205644d32ffddf2e1fa43d9", - "sha256": "060zxl2y4p50g5fwgplgx07h5akfplp49rkv5cx09rqlcyzqhqwa" + "commit": "a60c3202973e3185091db623d960f71840a22205", + "sha256": "1bsmf64ycmfnsb0r0nyaky1h3x2fpr4qyck3ihw16pa6d7spaw8c" } }, { @@ -44616,15 +44853,15 @@ "repo": "Groovy-Emacs-Modes/groovy-emacs-modes", "unstable": { "version": [ - 20191031, - 2256 + 20210510, + 317 ], "deps": [ "dash", "s" ], - "commit": "26da902d1158c0312628d57578109be54eca2415", - "sha256": "113s9znqrdi9zm045hi3ws5ixrd0bzxfy3wr8lzxq9r3jbv67iz2" + "commit": "99eaf70720e4a6337fbd5acb68ae45cc1779bdc4", + "sha256": "1jpfyqnqd8nj0g8xbiw4ar2qzxx3pvhwibr6hdzhyy9mmc4yzdgk" }, "stable": { "version": [ @@ -44878,8 +45115,8 @@ 20200416, 2136 ], - "commit": "4462a5ab071ec001734e92d1ac2e5fa9721b94bd", - "sha256": "0v2h846k9xv47am66nv4piqhvn74xijhp2bq84v3wpls4msvfk70" + "commit": "e0653e4a654b7800dc15f7e1a06a956b77d2aabe", + "sha256": "0aclxzxsh0ixibnw86d8gcyq5yzbfqzmz02rh2djk7l27yg50f10" }, "stable": { "version": [ @@ -44887,7 +45124,7 @@ 0, 4 ], - "commit": "4462a5ab071ec001734e92d1ac2e5fa9721b94bd", + "commit": "a60af277fbb52306c17663074cf9954dd6cea024", "sha256": "0v2h846k9xv47am66nv4piqhvn74xijhp2bq84v3wpls4msvfk70" } }, @@ -45057,14 +45294,14 @@ "repo": "wbolster/emacs-gvariant", "unstable": { "version": [ - 20190513, - 1005 + 20210507, + 1310 ], "deps": [ "parsec" ], - "commit": "b162867c03ead58784c47996ae329355ecea2869", - "sha256": "0yqgj3zcpmga9v085l98yr02k8bhgd4bzshmyjl1x98s50n207jp" + "commit": "f2e87076845800cbaaeed67f175ad4e4a9c01e37", + "sha256": "1m6gwplzps0hykzszh0vh4rs48hcfi99vxb4i870y46lq2y8x2xb" }, "stable": { "version": [ @@ -45606,11 +45843,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20210407, - 214 + 20210507, + 2243 ], - "commit": "426e28bbee7853734664d75a7e5f960c6c15ee67", - "sha256": "01qrrbb2rgr780xna4a1ncv92y8af76kvj0hjdl3qa1mdn0ypc3j" + "commit": "b35e8547b67f3d2c4d38ec7e7e516e3c0925352f", + "sha256": "1z6x28gv47vdi2a06p1w390a40ll1b1g2dhxhzpn998r6b1d8zxm" }, "stable": { "version": [ @@ -45940,16 +46177,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210409, - 1016 + 20210510, + 1311 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "4f16ec21f5ac4d0b9e36768c27abd453a959388d", - "sha256": "07v5gr61pvm5nh8xfi79i7ps6hjicm07zkg98m14z424dc8x6kl4" + "commit": "9e892eb9593d353076656d999c734072230be3a0", + "sha256": "097c91s1bwrs4n6mcxf3447p7x8rrndjk16xjhf3hhyxic0il66p" }, "stable": { "version": [ @@ -46242,8 +46479,8 @@ "cl-lib", "helm" ], - "commit": "9870333cdd4a54b309e2709af647cda6f4070a42", - "sha256": "02cpg60hif4rz6va2ynh3wc9dwj0nyig4fa0l6jchmzz8v2zvf86" + "commit": "9f6ea920a49457d85096caa0e61f086a42b2908e", + "sha256": "0dqf2anmjlgcz7xn4q2pw8cfmhwdhdg4fm8q41vhrp60ymbc6dik" }, "stable": { "version": [ @@ -46848,14 +47085,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210324, - 1445 + 20210504, + 1723 ], "deps": [ "async" ], - "commit": "4f16ec21f5ac4d0b9e36768c27abd453a959388d", - "sha256": "07v5gr61pvm5nh8xfi79i7ps6hjicm07zkg98m14z424dc8x6kl4" + "commit": "9e892eb9593d353076656d999c734072230be3a0", + "sha256": "097c91s1bwrs4n6mcxf3447p7x8rrndjk16xjhf3hhyxic0il66p" }, "stable": { "version": [ @@ -48391,8 +48628,8 @@ "helm", "lean-mode" ], - "commit": "5a2a36356e73c74a42e49fad19a71f4f12929a90", - "sha256": "18lswxxwvp85yzg1kc9vxn4dpmxmj40j6g64c8ns83nb7hw9lszg" + "commit": "bf32bb97930ed67c5cbe0fe3d4a69dedcf68be44", + "sha256": "1bkv5zs38ijawvavbba0fdf2flb6fiwici3qi99ws8wvwhnbkws2" } }, { @@ -48538,16 +48775,16 @@ "repo": "emacs-lsp/helm-lsp", "unstable": { "version": [ - 20210226, - 2027 + 20210419, + 2014 ], "deps": [ "dash", "helm", "lsp-mode" ], - "commit": "74a02f89088484c42ffc184ece338b73abd4d6f6", - "sha256": "1p130xj03wh3pqwf1bb3xl86pqnv1kpmn90mwfg0g52jwl0grv6b" + "commit": "c2c6974dadfac459b1a69a1217441283874cea92", + "sha256": "0xpz9qrcbxknnncqf0hw7hs9k6sv9dckzsf081k2zmsks3l5qh4p" }, "stable": { "version": [ @@ -49210,15 +49447,15 @@ "repo": "tumashu/helm-posframe", "unstable": { "version": [ - 20200512, - 1146 + 20210412, + 1147 ], "deps": [ "helm", "posframe" ], - "commit": "b107e64eedef6292c49d590f30d320c29b64190b", - "sha256": "09y98ij4wkqh771ahwi3b7nsg6yb2b69n94v3ad41kp4q0c2rscd" + "commit": "2412e5b3c584c7683982a7e9cfa10a67427f2567", + "sha256": "0k4lmgvrxm4lswafc3fb8aab3ax0gnkkq64vg3vmiry85kih2cqb" } }, { @@ -50170,14 +50407,14 @@ "repo": "emacsorphanage/helm-swoop", "unstable": { "version": [ - 20200814, - 448 + 20210426, + 547 ], "deps": [ "helm" ], - "commit": "1f7d3cf0d742b199e4ce13fcb8b19c977a44611e", - "sha256": "1r03d3ivmi0r5knsrlfx2cq5jljjl36h2l5n0mbs3sc6iad9wz20" + "commit": "1b3285791f1dc1fde548fe67aec07214d698fd57", + "sha256": "0wgi7pk2s4syi3fc8l60zcnz34f8ik9y558la0d5ryci4fssrl7i" }, "stable": { "version": [ @@ -50858,17 +51095,17 @@ }, { "ename": "hide-lines", - "commit": "ae489be43b1aee93614e40f492ebdf0b98a3fbc1", - "sha256": "18h5ygi6idpb5wjlmjjvjmwcw7xiljkfxdvq7pm8wnw75p705x4d", + "commit": "b61ab7d6dba6b0ca42d5647237ad15ca74177a88", + "sha256": "15hfxcq839i668jv89skq4qz8zdz6xwszgdjb1sfj7gi2fhw0xb7", "fetcher": "github", - "repo": "emacsorphanage/hide-lines", + "repo": "vapniks/hide-lines", "unstable": { "version": [ - 20151127, - 1840 + 20181123, + 111 ], - "commit": "331122bf19361130351cfe55968c2a7820329eb3", - "sha256": "183l0sx8zn3jv1fqa3xj7a6fd792sp50jyhm50j3hy7c54m4capf" + "commit": "30d3557997bf5ab3a58d5756f27d8f983118f55c", + "sha256": "1cxschg194k3ahlaqp6aixwvh3qf5plgh5sbkk8fmbxarl4yb4jk" }, "stable": { "version": [ @@ -51037,10 +51274,10 @@ "version": [ 0, 1, - 5 + 6 ], - "commit": "9cc03c7136b56c04ea053fbe08a3a4a6af26b90e", - "sha256": "08czwa165rnd5z0dwwdddn7zi5w63sdk31l47bj0598kbly01n7r" + "commit": "4420bdda419875dacb065468aafe273b2022580e", + "sha256": "0a9nn1jnbgv93kz1iz5iay34d0p7lkpd8ic619ysk8qcksc0yn2i" } }, { @@ -51195,23 +51432,20 @@ "url": "https://git.sr.ht/~tsdh/highlight-parentheses.el", "unstable": { "version": [ - 20210410, - 1932 + 20210420, + 1924 ], - "commit": "fdabfda5f6300f8dd4d2a62c49359605798cc001", - "sha256": "0x833ahd5m4rlqrgr7n5xj477vbs7mmp267in22hw0cxi9aan08q" + "commit": "891538de31524956136e1419e1206af0c8befe02", + "sha256": "08l5gb73ibs1mmfifnks5gxrcg8x8azw9g10jj2f8vn8viwwa7m0" }, "stable": { "version": [ 2, 0, - 0 + 2 ], - "deps": [ - "cl-lib" - ], - "commit": "e18f2c2b240d7586ff7ffdc2881079e2dd8944ca", - "sha256": "1agdsqn3g18s9nicp23mlwvshxqskkbfzs9lgjmzxsa5628rxixc" + "commit": "fdabfda5f6300f8dd4d2a62c49359605798cc001", + "sha256": "0x833ahd5m4rlqrgr7n5xj477vbs7mmp267in22hw0cxi9aan08q" } }, { @@ -51604,6 +51838,21 @@ "sha256": "0fwb64ja5ij97308pnd7g6l5mascavcp7jcar8igxv9yyqnw6pfi" } }, + { + "ename": "hl-prog-extra", + "commit": "d4ababc787d4dd173c65cc1b4b4a0fc0bb6e6d07", + "sha256": "1dgjskhz1jq01j19dmy8d3fzrg1d8jzrycdsxmkjlc2h05285wkg", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-hl-prog-extra", + "unstable": { + "version": [ + 20210422, + 56 + ], + "commit": "42dee82058e49a7eae5490af2b6b4147600e87ed", + "sha256": "1csvhvjzhq1w9384i9n78qv8x0c2y8mdqig6fa2k5qi84cgsh8zp" + } + }, { "ename": "hl-sentence", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", @@ -51634,20 +51883,20 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20210117, - 1140 + 20210504, + 1406 ], - "commit": "4d18ccde596aef84ef278aa60144390ab41f0046", - "sha256": "0r9yz485g393yh4nh1a8nqhk1yxjapq2dzjs3l13ld34hql776yc" + "commit": "57378bd4511887a815725a7850e1ff2c6e9fda16", + "sha256": "0bdwdp8d0g7n0kv6l4h7alya3z6fsfi618dzw5x8f2az3r87yg8y" }, "stable": { "version": [ 3, - 1, - 2 + 3, + 0 ], - "commit": "3bba4591c54951d2abab113ec5e58a6319808ca9", - "sha256": "1i5mdmkbrxqx75grwl01pywbgl8pasr00mq6fidspp0aligsbg6w" + "commit": "57378bd4511887a815725a7850e1ff2c6e9fda16", + "sha256": "0bdwdp8d0g7n0kv6l4h7alya3z6fsfi618dzw5x8f2az3r87yg8y" } }, { @@ -52412,11 +52661,11 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20210106, - 2120 + 20210422, + 1351 ], - "commit": "c1f9989bcecd1d93a2d7469d6b5c812bd35fe0f3", - "sha256": "180hj0ww30kjr4nrnlp5r59xr6qpi7xhw19cp91syqhclzylkpqr" + "commit": "1ce4f09af216f5bb643454da1a3f66beb4a26a55", + "sha256": "0f1aqkd9vxf32mafpd7hdbkj9wy5g4y2gqqlvgpy7j50iqkdcm5h" } }, { @@ -52886,11 +53135,11 @@ "repo": "jojojames/ibuffer-sidebar", "unstable": { "version": [ - 20210215, - 1849 + 20210508, + 836 ], - "commit": "59e20690fc4f5ccd751e7a13a60664b97f053a1c", - "sha256": "1z6japr7n950222x33jinb34z7j6n5spj9cn8nq8f8yf8rgp6n2j" + "commit": "fb685e1e43db979e25713081d8ae4073453bbd5e", + "sha256": "04x87gngmvyj4nfq1dm3h9jr6b0kvikxsg1533kdkz9k72khs3n3" } }, { @@ -52984,11 +53233,11 @@ "repo": "oantolin/icomplete-vertical", "unstable": { "version": [ - 20210411, - 1913 + 20210424, + 1811 ], - "commit": "a258ff1033dd3d3cb894a039ac13ff3a85b96f57", - "sha256": "1r6cpq6nm3hhxhim4i0alcwmrvq17n7gh5dri9lfpcq6c7wqf0qi" + "commit": "d7ab5e5de18a027375666755e6610ea26c35ac16", + "sha256": "1jkykgf56091w2xb4mgnrfprarbjkqlmac3d388f9ckmiiyyqyrp" }, "stable": { "version": [ @@ -53846,11 +54095,11 @@ "repo": "QiangF/imbot", "unstable": { "version": [ - 20210319, - 126 + 20210423, + 731 ], - "commit": "0fdc71bfa66ecc1f8a54cdcd2458eb47eab41ecd", - "sha256": "1ibd9i75x6gb0nprbdi0giklllfwsmvghi3fm19qm7hiw3kg9j3m" + "commit": "01bf1e1101ac9cd34bfda7016ce0f82f97a3de35", + "sha256": "08w76awwg1g7n67b2rvbwg0i366zshqnhvlp6zyfagjg2bz5gdmf" } }, { @@ -53915,11 +54164,11 @@ "repo": "bmag/imenu-list", "unstable": { "version": [ - 20210411, - 1703 + 20210420, + 1200 ], - "commit": "1447cdc8c0268e332fb4adc0c643702245d31bde", - "sha256": "1fhfxwwf622mjl3slnzyj0zzmbx15qhq6xv8p7fpw88dx1dki113" + "commit": "76f2335ee6f2f066d87fe4e4729219d70c9bc70d", + "sha256": "0b7q6h7ky7n20w1p471fmnwyfmc59c9ihgnl72m11dnciiz325wa" }, "stable": { "version": [ @@ -54089,8 +54338,8 @@ "deps": [ "impatient-mode" ], - "commit": "9ad16da9f78ae242b0a6fb1de388d5f4f1264207", - "sha256": "0h665wxnz3l97dxgk2rw3v0sdhb2lr30iqmf4q304wk7ljxg6lig" + "commit": "60ae30d07b857c074e2918680805cb37249de0ad", + "sha256": "0brj34ijgsgkbawp097wjwiaka2b082aypl5pal0298mpk97zxq0" }, "stable": { "version": [ @@ -54203,11 +54452,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20210404, - 727 + 20210508, + 309 ], - "commit": "5048c685e7071631dbad52988dbf91ffc67a4af3", - "sha256": "0clj2rm5lsyd6c3087j0z5ndg20pji5c7yqd6r1jnpclrvvwb04w" + "commit": "044291cf063a86927dae50dffdb2b0e2e3f9199b", + "sha256": "0hiwq5nzh42f5ynjlhq9vlcgq8pmgcgbi9w5c5gczdl0s7cxv6l7" }, "stable": { "version": [ @@ -54418,8 +54667,8 @@ "deps": [ "clojure-mode" ], - "commit": "c3ff2f40fdcedf3357cde868c278474767b65adb", - "sha256": "0ljxpjhm3v0wb851zfqvkr5cv4hblg29rz3a5lw48jwz9ijpapq9" + "commit": "a2cebf5362fe583538dda8dcf6348a8d73b462a2", + "sha256": "0sfn6x08i7sd2k6z4swpd8hxaab3ly0gfyapcaq768chi0grr0gw" }, "stable": { "version": [ @@ -54511,11 +54760,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20210314, - 123 + 20210427, + 1755 ], - "commit": "c6990a60c740b2d69495e34e95b29f13014b3cde", - "sha256": "05nz7hvly47n7d945gdb1x8xgzla5r9k629if81rgjh99w24dpgc" + "commit": "92d5d122fa172bc49b5ec9ee1891aa9c84805c92", + "sha256": "1dn8wml7jwf3dx2nbkjpf2v6k88apiin8wqmz4yix5d2k3x2qm46" }, "stable": { "version": [ @@ -54564,11 +54813,11 @@ "repo": "dakra/info-beamer.el", "unstable": { "version": [ - 20180604, - 2122 + 20210427, + 1033 ], - "commit": "97db34d23cb05b23e50c15875ee84f5d3236e0db", - "sha256": "0z1cya3mhgh5ibj3dgwzii1fkbzsq7zjjzg6hfdv3pd4a7722qlx" + "commit": "6b4cc29f1aec72d8e23b2c25a99cdd84e6cdc92b", + "sha256": "064igpiip1b037rs32z8w1g3w7rywyhabi1h92p1zkx3gjlqgpp2" }, "stable": { "version": [ @@ -54860,11 +55109,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20210109, - 1112 + 20210427, + 1337 ], - "commit": "e8ae7b2345b8b21dd866fc043906ceecd40832c7", - "sha256": "19fxqb6x05480wa4dp4mv2a6cw5sgc8bsm3syqpbhmflymfvxnsy" + "commit": "7c3a0a76fa00db41a4d3d990cc98a1c6b088df3d", + "sha256": "17x0afwfcr4k0nmliqajswmvaiglk1xl33r3j215w214xp6dqrp2" } }, { @@ -55123,30 +55372,6 @@ "sha256": "1vmaj14k5idx1ykkp1yl0b9qr4fimwagz7p6c00xi9klvjsx566y" } }, - { - "ename": "interleave", - "commit": "6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2", - "sha256": "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy", - "fetcher": "github", - "repo": "rudolfochrist/interleave", - "unstable": { - "version": [ - 20191129, - 958 - ], - "commit": "e1791a96a2633a9f5ea99fc0a20ebacedcefdaaa", - "sha256": "1biysf8cqfw4q7d2dnlisviign3n5knvrb0g6zdalzv8pnd1cxqr" - }, - "stable": { - "version": [ - 1, - 1, - 0 - ], - "commit": "6b28363eac939227c6cdc8a73a1d3ea5b002442d", - "sha256": "1qs6j9cz152wfy54c5d1a558l0df6wxv3djlvfl2mx58wf0sk73h" - } - }, { "ename": "interval-list", "commit": "afee0fed80f4fa444116b12653c034d760f5f1fb", @@ -55713,11 +55938,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210404, - 1241 + 20210506, + 2157 ], - "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245", - "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36" + "commit": "11444e82ad3ec4b718b03ee51fc3ba62cbba81bc", + "sha256": "1bvqicw10lz048lwn4p4ilxyk3sfmplclz1gk6zsyimf72y3xymg" }, "stable": { "version": [ @@ -55744,8 +55969,8 @@ "avy", "ivy" ], - "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245", - "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36" + "commit": "11444e82ad3ec4b718b03ee51fc3ba62cbba81bc", + "sha256": "1bvqicw10lz048lwn4p4ilxyk3sfmplclz1gk6zsyimf72y3xymg" }, "stable": { "version": [ @@ -55777,8 +56002,8 @@ "cl-lib", "swiper" ], - "commit": "9870333cdd4a54b309e2709af647cda6f4070a42", - "sha256": "02cpg60hif4rz6va2ynh3wc9dwj0nyig4fa0l6jchmzz8v2zvf86" + "commit": "9f6ea920a49457d85096caa0e61f086a42b2908e", + "sha256": "0dqf2anmjlgcz7xn4q2pw8cfmhwdhdg4fm8q41vhrp60ymbc6dik" }, "stable": { "version": [ @@ -55847,16 +56072,16 @@ "repo": "jixiuf/ivy-dired-history", "unstable": { "version": [ - 20170626, - 556 + 20210418, + 1444 ], "deps": [ "cl-lib", "counsel", "ivy" ], - "commit": "c9c67ea1ee5e68443f0e6006ba162d6c8d868b69", - "sha256": "1lim9zi57w011df5zppb18yjkaxkgfy796pc6i01p4dl32x0rpfv" + "commit": "1ffa9b705c52a9d5b03c97150addb4f746c08380", + "sha256": "1li8vh94w1mkwqbh1f0i1mmv5advrbh1183vpjc2zbmmk02pynkf" }, "stable": { "version": [ @@ -56112,8 +56337,8 @@ "hydra", "ivy" ], - "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245", - "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36" + "commit": "11444e82ad3ec4b718b03ee51fc3ba62cbba81bc", + "sha256": "1bvqicw10lz048lwn4p4ilxyk3sfmplclz1gk6zsyimf72y3xymg" }, "stable": { "version": [ @@ -56156,28 +56381,30 @@ "repo": "ROCKTAKEY/ivy-migemo", "unstable": { "version": [ - 20210206, - 919 + 20210425, + 613 ], "deps": [ "ivy", - "migemo" + "migemo", + "nadvice" ], - "commit": "9cdf3823b3303d69c0c77dfee91136817da12aea", - "sha256": "0nxk1i208zm6p666920gh1nmrfhfqglhgs07b5ir4b7mz3m5caab" + "commit": "a2ce15abe6a30fae63ed457ab25a80455704f28e", + "sha256": "18j3h2ndrw92gpbd9q5ji6q8qrwqmzw2xw8yds8f0fd8aybkw8zz" }, "stable": { "version": [ 1, - 1, + 4, 0 ], "deps": [ "ivy", - "migemo" + "migemo", + "nadvice" ], - "commit": "fc4f44750466ba9385e3313c85adf83a8e55a1fa", - "sha256": "0lax72js89k5g007ra6ngy9gnphny4bgjggnl9d3j3mizw9cynvn" + "commit": "2d44f7bbc1eb5f95162db889b889488b65bc0042", + "sha256": "14jmxg56w6jxz9i4wllbr18c25ximdrbi8w4qcc8lxr9yjlakl15" } }, { @@ -56279,15 +56506,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20210410, - 530 + 20210426, + 2144 ], "deps": [ "ivy", "posframe" ], - "commit": "7f1ab7890040c4b8dc4e9645c824cd35210e1121", - "sha256": "053irrmqvlzs7597grsq0fn06w3apqkgma45xv5pfb2wqin2kx2w" + "commit": "084cc59ea2cd62afaa51445ada3d00404749a541", + "sha256": "170z5akdwxzrn0b4cbk6v8a3dqz229b7pj9n0534y1a7ydvcyv9h" }, "stable": { "version": [ @@ -56311,15 +56538,15 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20210227, - 600 + 20210425, + 1720 ], "deps": [ "ivy", "prescient" ], - "commit": "ed2b762241bbea03e374dc9dcd4fbe207c6b2ea4", - "sha256": "03c0dmblixh5mx8365b6608l7z3vcgp6pzdflwqf8nfwj2c5rm0w" + "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4", + "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n" }, "stable": { "version": [ @@ -56747,11 +56974,11 @@ "url": "https://depp.brause.cc/jammer.git", "unstable": { "version": [ - 20200506, - 1247 + 20210508, + 1633 ], - "commit": "5d9bb7b953bd9daed9ca15bf27428db4301d60f8", - "sha256": "03gzbixxrbf1m9p19j0q72q2wi22viss28kf15az5a0891w10vck" + "commit": "a780e4c2adb2e85a4daadcefd1a2b189d761872f", + "sha256": "0s2piak1iyxj06z3hhywkrnrq5i1ppjcl5v55fys900fnyqzzgjy" }, "stable": { "version": [ @@ -57059,8 +57286,8 @@ "auto-complete", "jedi-core" ], - "commit": "3a9c503c35359d6bca6ff90c384c104c8743cdab", - "sha256": "1rx3qiicgg9p0chbfx8v1aypk93p6r5wlkia0b2sqr796r7xdn35" + "commit": "e942a0e410cbb2a214c9cb30aaf0e47eb0895b78", + "sha256": "1c4nqgg1w2qv0mhpi6hhz3xr5kk4bbxc951fhik6dpi2c2w8p73s" }, "stable": { "version": [ @@ -57084,16 +57311,16 @@ "repo": "tkf/emacs-jedi", "unstable": { "version": [ - 20210202, - 856 + 20210503, + 1315 ], "deps": [ "cl-lib", "epc", "python-environment" ], - "commit": "3a9c503c35359d6bca6ff90c384c104c8743cdab", - "sha256": "1rx3qiicgg9p0chbfx8v1aypk93p6r5wlkia0b2sqr796r7xdn35" + "commit": "e942a0e410cbb2a214c9cb30aaf0e47eb0895b78", + "sha256": "1c4nqgg1w2qv0mhpi6hhz3xr5kk4bbxc951fhik6dpi2c2w8p73s" }, "stable": { "version": [ @@ -57325,8 +57552,8 @@ 20200927, 1317 ], - "commit": "7a934115238d7b80df230a5ba7a70d866bc18c66", - "sha256": "087fj39m7gmi3bx2q983afal3738rc5zxnfs4d4c72z065z7gsss" + "commit": "b9b3c39743be5aeba17d4d8e5d379613451ddec6", + "sha256": "1j3dxj4cr26vir226zb84zn0jsjwnhz02xb60a69jv4k1wcl6bq9" }, "stable": { "version": [ @@ -57459,11 +57686,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20210404, - 1924 + 20210512, + 2301 ], - "commit": "9e7b841083c7bb1c76772e8a58428d59ea2fd0f4", - "sha256": "0l3qcnbdh7n4racd2b548h1f8plz1r78n1crcnsqnl7gpxxn1fmk" + "commit": "c3548cac4c4d2caffb750391b2d7d88c3892d139", + "sha256": "06328yfj7g575dyxa7a17hwbas3ly45hikrax6qzy64zsakp9gx2" } }, { @@ -57638,8 +57865,8 @@ 20180807, 1352 ], - "commit": "2cb7131e9cda6179541cfc7e3703c426ef3f8024", - "sha256": "1na2n607bdp5l9wg74i77rbd6wq6z4mcw2yp1b66xkzgmjhpndj6" + "commit": "516abed166d687aa8b197973315bd6ea0900fb62", + "sha256": "0l0hk6lfn6rvfxjmnkyigc0qqh6k1jbfg4i3g2s2d994hihdynhp" }, "stable": { "version": [ @@ -57829,14 +58056,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20201220, - 1718 + 20210414, + 2241 ], "deps": [ "cl-lib" ], - "commit": "29979e5f3301796ba606759e39ee0b1b6a2a24f3", - "sha256": "1pvdzinxfd3b08d92cf5v0fk88dzlyw5r5g3hablh6gcfc9i57xx" + "commit": "b891edecedf30be6321e2f109fdfeb25b0edad27", + "sha256": "179vkwr57nibc148b961g1aim052v65qsva44imxibkm9h0n32w9" }, "stable": { "version": [ @@ -58369,7 +58596,7 @@ 0, 0, -1, - 5 + 6 ], "deps": [ "dash", @@ -58378,8 +58605,8 @@ "spinner", "vterm" ], - "commit": "34498596550b0f819106db8dd6e80dd01332c345", - "sha256": "05hrvidpgsinvq7n56c3kfk23x561djchsa10vybjk027fqfvlwb" + "commit": "03b4296ba7151963eb3c850f3314b02644101f51", + "sha256": "1jgs0pz8bzqg8116kyw3z7jwbf6karrl89ks028q091ylc00nm8b" } }, { @@ -58396,19 +58623,19 @@ "deps": [ "vterm" ], - "commit": "b8a749f19bef179c58068d3fa5cd53c3db5d1ecf", - "sha256": "1bp3dc915zq1qd7zycz8bdjq4pz172r3zbzjn8k4rsw0lz9j6w88" + "commit": "d57448466c11833d4fd67f5dbbea9cb9a07a74e2", + "sha256": "0v7l4jxq71vcw3sjs476smbw9ln6xfrq7n3vzw26apzkrplizqyy" }, "stable": { "version": [ 0, - 11 + 13 ], "deps": [ "vterm" ], - "commit": "06ee45bffb6e711278a7af5207899d2b4316706c", - "sha256": "1zwhbwm285gqy9bfhlaaa9wp3lz959i3d1s41msl70jxbrnjz7pw" + "commit": "b8a749f19bef179c58068d3fa5cd53c3db5d1ecf", + "sha256": "1bp3dc915zq1qd7zycz8bdjq4pz172r3zbzjn8k4rsw0lz9j6w88" } }, { @@ -58543,8 +58770,8 @@ "repo": "nnicandro/emacs-jupyter", "unstable": { "version": [ - 20210407, - 212 + 20210422, + 1451 ], "deps": [ "cl-lib", @@ -58552,8 +58779,8 @@ "websocket", "zmq" ], - "commit": "7735d2b8fb32434992467f0d4d9d59c1a1a5dc0c", - "sha256": "12q70b249yygqr30l1vhgxzlbfxkcil9xaixzj8zy3xbd3vsjdns" + "commit": "1f0612eb936d36abab0f27b09cca691e81fc6e74", + "sha256": "1mpch20iahijlgwg8bjpjg7bm9hd2wyskqbknafw8jkwyj7dvng2" }, "stable": { "version": [ @@ -58633,14 +58860,14 @@ "repo": "TxGVNN/emacs-k8s-mode", "unstable": { "version": [ - 20210219, - 1317 + 20210414, + 1543 ], "deps": [ "yaml-mode" ], - "commit": "0df142ac98bcd072dd7017053c9c9c476345aeef", - "sha256": "1nxcp1hq9d1j7whfak60j4dmzsfmq2mgmdxxvlj3az7p7vannd2v" + "commit": "14f08627d5bc320fee5bd9926e9aabe6956f514e", + "sha256": "1rfglmslhv3i71fgsqs8gjcnkff06lnp0b9s182rsnfz29dnzd1a" }, "stable": { "version": [ @@ -58924,28 +59151,28 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20210403, - 749 + 20210507, + 1241 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "367429c39e330cf2b87e8af0ca7c8883baa21ea3", - "sha256": "0hj21jmkcsjv7rxpfq6n77jsmm894rfgsdn80qymh6nyxznq93ym" + "commit": "4e46cc6c843d95427139f824f448f779be80fbc7", + "sha256": "1q3wa0i8ng2b0gsmpi9cvdr1h0ffs1pys95pgnxnsdw2cvlh4v6m" }, "stable": { "version": [ 1, 6, - 2 + 4 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "5694f27f6e17bf2d840fa04728d392b5df77e20c", - "sha256": "1c5hdr654f012lj3ssxsavbnij0i109nykwcsgl2c2pb9yxqr5rw" + "commit": "c50bc11fdd42dc98ff806d1fc7cd94619c0ab7bb", + "sha256": "08ypmv43vjk1l409n894jxplnja6nicn2k3qwhwaf9qxhz0yxpjr" } }, { @@ -59122,11 +59349,11 @@ "repo": "Boruch-Baum/emacs-key-assist", "unstable": { "version": [ - 20201109, - 1358 + 20210415, + 227 ], - "commit": "7fd89c306c975a1fa3ab16ba7a4d3b102130a868", - "sha256": "1m1p3iydn5s3dlmjv751ligbwxkg472rhcbk80q2y1lnwjsnbhdy" + "commit": "fae7ce265db3bcfd1c6153eb051afd8789e61a4b", + "sha256": "16gi43wgqqjqljnmjwap8lng1p4davv8prvpip034qw9v6vjmm2p" }, "stable": { "version": [ @@ -59709,8 +59936,8 @@ 20210318, 2106 ], - "commit": "53b655b0ef4bdfe8bf81a2bef8f09179a4917076", - "sha256": "095z6dkqz6iw28ighqbl2c60i6bm6qyrkxl93yg9b31cd6yzlzin" + "commit": "c0800fa6f9650acd5d13c9451f985d0eb4231272", + "sha256": "0xfh2mnxabv11h3n11qqiqiwwz4n3qfv8ljilncgjmj4h6c22zkr" }, "stable": { "version": [ @@ -60252,28 +60479,29 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20210327, - 1230 + 20210508, + 1224 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "654ea30aa0263e85891ddcabc0b7a0f0144b9e27", - "sha256": "1z5pw9xhp4gh156n9n3yq92zm6z8gw2ik7nfrvgnip2v3yr31pfb" + "commit": "635e974cb692973856a4d26093876f5ad2285d3a", + "sha256": "0c3fz2v3zyq6s1gzz2013yafdhg46lffr4w8hwhxmgpsci6vf3hd" }, "stable": { "version": [ - 0, - 2 + 1, + 0 ], "deps": [ "aas", + "auctex", "yasnippet" ], - "commit": "94be7523159ee261077a33094775c7f73218a900", - "sha256": "0qyj4xwsxhn78akkv08ka9k47aa3jssd4mgws7ccbnqj68fv78gg" + "commit": "e9bc939237bed4ce50d3d403120f7206c835ea4a", + "sha256": "1z2r52x9fsjm1y2m8n0fm9ymd0dx798iw5b3x79fkhnrrw4wfq0s" } }, { @@ -60361,8 +60589,8 @@ "highlight", "math-symbol-lists" ], - "commit": "8609ec2101777362f45df493c593e0e125fe0824", - "sha256": "142v2yccbh5aiwy6xzxnz9656p9zj3j2vmmyy70x7vxn2jair3bl" + "commit": "15de9f64cd0408052d9186435160092c4d435db2", + "sha256": "1wd8v7in280j9w5yxf9l9l79l7pmcpzqjidkb0sivvd5i1vlzvbd" } }, { @@ -60974,14 +61202,14 @@ "repo": "conao3/leaf-tree.el", "unstable": { "version": [ - 20200412, - 2355 + 20210503, + 531 ], "deps": [ "imenu-list" ], - "commit": "22f6c116cf1465c28d4a35d8a4587a8b614be175", - "sha256": "1bgjhrpq6a239v8vfi6i9qcbyrg76mpy4yykkb5da8hlp23idwy7" + "commit": "8126baf45c881fd4a692c2d74f9cc2eb15170401", + "sha256": "1vb5id0y9002yabkxijfi0l8vbibbd863kq4qk3gqax9dgbld481" }, "stable": { "version": [ @@ -61004,8 +61232,8 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20210406, - 1038 + 20210502, + 2049 ], "deps": [ "dash", @@ -61013,8 +61241,8 @@ "flycheck", "s" ], - "commit": "5a2a36356e73c74a42e49fad19a71f4f12929a90", - "sha256": "18lswxxwvp85yzg1kc9vxn4dpmxmj40j6g64c8ns83nb7hw9lszg" + "commit": "bf32bb97930ed67c5cbe0fe3d4a69dedcf68be44", + "sha256": "1bkv5zs38ijawvavbba0fdf2flb6fiwici3qi99ws8wvwhnbkws2" } }, { @@ -61080,14 +61308,14 @@ "repo": "DamienCassou/ledger-import", "unstable": { "version": [ - 20210108, - 728 + 20210419, + 818 ], "deps": [ "ledger-mode" ], - "commit": "d1eda3ccafbfabbcc51be364146e31450f11745f", - "sha256": "0w6qgqmcv1nyrgjqrb1ah4wj94rn7zn00g0kib4vmc83wcnmyrjb" + "commit": "f77adf79ce67524c3e08546448ac88ea1a665b64", + "sha256": "1zgv3sxg1dwg7dgy0cl5df6nkxp79cg906hskxsdx6yfplxvi4px" }, "stable": { "version": [ @@ -61110,11 +61338,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20210329, - 2024 + 20210429, + 134 ], - "commit": "3b0fa5c22bd196dbe31a19f4b2ebbdf8f4081b20", - "sha256": "1igg1dmsn90crggm11xnlhrc36szr3dfc4463dn65cagwlck3g3k" + "commit": "58a2bf57af9289daeaac6892fa4008ea8255b205", + "sha256": "0sbyagz93yvr1a0y7k0nki7030drr27i3nqhwflsdrl0hy4f9iwr" }, "stable": { "version": [ @@ -61347,11 +61575,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20201207, - 2103 + 20210507, + 1556 ], - "commit": "a1154d65bf33ae34ea944b9e59d95b601fea7169", - "sha256": "0ibh09iz1m2m752rkk9dbyvmczrzv401gi4k18vlh67hz7vd5la0" + "commit": "7a2a8c49fd17c43c276dbe0aa941fd676a54a5cf", + "sha256": "02i7d8lzalwv6xaja82gn48qkf9ks0xvnaqzl9qwxiw980545z0y" }, "stable": { "version": [ @@ -61423,8 +61651,8 @@ 20201007, 2214 ], - "commit": "5677410abffa1d1bc66b867be8918f1423fd586b", - "sha256": "1lcyd7gh2d72vx47dh375d50qcf7xnx888xrx76yc5zfx2df4p80" + "commit": "f762e9310390edb7a5a49d8d9dc22693fbcde973", + "sha256": "022bnn3ksaaihi3cnc7ib15ry2kydp4rjh1v25vym7vmfxlw9akz" }, "stable": { "version": [ @@ -61670,21 +61898,17 @@ 20210303, 1751 ], - "commit": "d029f4d1738dad616df1a56b570cdf1e725cd967", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503; retrying in 286 ms\nwarning: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503; retrying in 612 ms\nwarning: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503; retrying in 1232 ms\nwarning: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503; retrying in 2325 ms\nerror: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503\n" - ] + "commit": "1faa2bc583ccb2c1b55a400683f352cc5cc5ed02", + "sha256": "0yns4cia5p1qg2g44yldw02hd5qcznxj7zqf6bamrwqys844zfjd" }, "stable": { "version": [ 0, - 12, + 16, 0 ], - "commit": "70d42b3922d152e8be946c2415151d0551b591d4", - "sha256": "17k0v1nfcsq5kdfk05cdkh8nbbi5bqniydqcr6whzw3aawnjryyc" + "commit": "edfe0c73984e429b5329a883537d5cb738dc3213", + "sha256": "0yns4cia5p1qg2g44yldw02hd5qcznxj7zqf6bamrwqys844zfjd" } }, { @@ -61695,14 +61919,15 @@ "repo": "jcs-elpa/line-reminder", "unstable": { "version": [ - 20210216, - 1451 + 20210426, + 1859 ], "deps": [ + "fringe-helper", "indicators" ], - "commit": "bc488bbdba2172629183891758cfa9466a64182f", - "sha256": "1993rwd9bgr1lqxgxzwp6h2r57ljsbjh5r08f57jaalanjp4iq55" + "commit": "8c9f824b1dc67c8489afef05b06d9525b29dab00", + "sha256": "0qr7qvcl6rlsagim3y71im24z85l3f7cvj39r0g77mnhm733z9m3" }, "stable": { "version": [ @@ -62361,11 +62586,11 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20210318, - 350 + 20210424, + 918 ], - "commit": "6979fc6369d55519d52ca1e8f7d80d73ce54c383", - "sha256": "180lsghxcjrn21c79jl7g9kkvd4lf4xabgbwbqlck7barfj256jv" + "commit": "3e00b497711ac78f0ac26669e35f375451f6711a", + "sha256": "0gpg60xr86qx2ib5q9ig5pi9lmhk5vjsb7fh5g6kifvsch31cry3" }, "stable": { "version": [ @@ -62458,20 +62683,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20210411, - 244 + 20210413, + 205 ], - "commit": "23b4308caddf02cc0312ebe4d971e3bfab22f3f8", - "sha256": "1zfqdbbknjdg73g1jdy758dln6hgi1rq6j0xpyasyasj169j1nxh" + "commit": "d799d074300aa7f1d78024167513a2316cffc204", + "sha256": "0dcz2npdf51284wq3c2sw7cq9r9z13irx9y06qi1xaxxv0p4r7z2" }, "stable": { "version": [ 4, - 3, + 4, 0 ], - "commit": "c6d3d34bae62f1d5e986625db74f2076af258900", - "sha256": "1d022chhib61ghrf847f2w9baqiscpp1s2qvj9i84zmk7bndjvag" + "commit": "26d51013e75ddedd5eb8600a0a3dd035319f9d3f", + "sha256": "10p4ijx4l56ikb10416bmdwfxbcyqfa29kk1nf48gibxyvdlwdby" } }, { @@ -63090,8 +63315,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210406, - 2012 + 20210506, + 34 ], "deps": [ "dap-mode", @@ -63102,14 +63327,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "10e309acc31648ec9bf7ffeef0fc2ad16b2a8584", - "sha256": "1wm0lxllazfxrrv4cgalcnsf7g88g1cwz7b69dxfgirlcybcw9il" + "commit": "96949d1c1cb5c63eb17ebbd43a125abead79149f", + "sha256": "0yqfb57pa2ks4y3v07asy2x7rvzlfcn7aj45x77dcqcssipnddps" }, "stable": { "version": [ 1, 18, - 0 + 3 ], "deps": [ "dap-mode", @@ -63120,8 +63345,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "f3b70ec0e6adf3a51e15f9a3effb182c2363493d", - "sha256": "0iyp844wnvxjrp860dgkr10qrfsaj2rcssj8dv93hhv8pg91fhsk" + "commit": "96949d1c1cb5c63eb17ebbd43a125abead79149f", + "sha256": "0yqfb57pa2ks4y3v07asy2x7rvzlfcn7aj45x77dcqcssipnddps" } }, { @@ -63139,8 +63364,8 @@ "dash", "lsp-mode" ], - "commit": "5a9c7e39905756d6cd58b686f6aa203f31c2271c", - "sha256": "1v9nqr6xpq6hqpaw8k5gx3nvxk7yjmkwyprw2009ckgb84icl8hi" + "commit": "1909466ee7f7f4aeef624acd10c710afe685ef8a", + "sha256": "0y5w97c37wj67mvwk23l4rq3i80fw82r758dsma6ly32h5xlsq8b" } }, { @@ -63183,8 +63408,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20210404, - 645 + 20210418, + 1806 ], "deps": [ "grammarly", @@ -63193,25 +63418,24 @@ "request", "s" ], - "commit": "aa2e70eec5755651ed6c9d9f4063542634760c91", - "sha256": "0qisz5117ifravbwvnaq2ci62v3sxl2dd1bd9giacscvshx2hw2c" + "commit": "aff219380a7d192a37c8c25823b6bfc816bae825", + "sha256": "0ghqmay00r7lfmqx57r5kkldkgr4r20fb5xqh3i440wjdw8m3i3p" }, "stable": { "version": [ 0, 2, - 1 + 2 ], "deps": [ "grammarly", "ht", - "keytar", "lsp-mode", "request", "s" ], - "commit": "739a7efc7de6e2b0eca9e72268790431a0fb3185", - "sha256": "1ksa685ggp9z0zndscwy9azxjibxd9l79qzvh50i7mz4x9xzdjbd" + "commit": "984037557b7e445183453faffc965fbe56df12f2", + "sha256": "12q3j0sgsgm73m3i0sw72dzkqa55zn0dbqjgp0g2wryhfhg0zq1p" } }, { @@ -63292,8 +63516,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20210309, - 1856 + 20210506, + 829 ], "deps": [ "dap-mode", @@ -63305,8 +63529,8 @@ "request", "treemacs" ], - "commit": "542aaf16d6d3a410b0e41861d80f3fd6b5be7bb9", - "sha256": "07kpx8gx9v9v6zhpl7kyg3q4dgpkxk1n089cn1hdxr5vapw7xac9" + "commit": "ba347ab575e17e7fb101101ac7537dd0df6e55d9", + "sha256": "05ilrgmn6pa19zw98xhzi8cdn88wfhzx2nx5n1r060x4ywzawyz1" }, "stable": { "version": [ @@ -63355,26 +63579,26 @@ "repo": "fredcamps/lsp-jedi", "unstable": { "version": [ - 20200812, - 1826 + 20210419, + 2007 ], "deps": [ "lsp-mode" ], - "commit": "10c782261b20ad459f5d2785592c4f46f7088126", - "sha256": "0rip6fq5mwk2lsa0wwr573mx4myqvc8a7v4mqalmqxgwzcv9w7vb" + "commit": "a6a6dcfbab69caee0b88dbe4244772e0bea5531a", + "sha256": "0l2dawi7avzb9i1wfff4kdfbz9s7vp4443y7x3va0jrsn3v33485" }, "stable": { "version": [ + 1, 0, - 0, - 1 + 0 ], "deps": [ "lsp-mode" ], - "commit": "10c782261b20ad459f5d2785592c4f46f7088126", - "sha256": "0rip6fq5mwk2lsa0wwr573mx4myqvc8a7v4mqalmqxgwzcv9w7vb" + "commit": "a6a6dcfbab69caee0b88dbe4244772e0bea5531a", + "sha256": "0l2dawi7avzb9i1wfff4kdfbz9s7vp4443y7x3va0jrsn3v33485" } }, { @@ -63398,15 +63622,15 @@ "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ "julia-mode", "lsp-mode" ], - "commit": "72e26d0c1d34e3dd16ff6427af883bd0136015d3", - "sha256": "0f4zmvn13x468p6vpfixx3ghlrygdgdyx8xpb7nx232pv38156dn" + "commit": "81f7de5b9fe8e8e0e1e3a3ccc677f052edad140d", + "sha256": "1hwkx5ssix2si7jpsbfcg1i65v3z265l39158qjm31cxf8pk52dw" } }, { @@ -63447,8 +63671,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20210410, - 615 + 20210426, + 739 ], "deps": [ "dap-mode", @@ -63457,28 +63681,30 @@ "ht", "lsp-mode", "lsp-treemacs", + "scala-mode", "treemacs" ], - "commit": "a603e9ec3d5f926774a8facb045f33eaa6df9037", - "sha256": "1pxfvmkk64v0sd7ghwj3dmhf7bbfh8wk2apxvckdq76l1wrd8izs" + "commit": "5aea52dfe08b8f5936ea3982be6c25339f652eba", + "sha256": "0ca5xq1l3lscx36pcdnpy2axgyikjrl18naqr140kr1y500sy37s" }, "stable": { "version": [ 1, - 1, + 2, 0 ], "deps": [ "dap-mode", "dash", - "dash-functional", "f", "ht", "lsp-mode", + "lsp-treemacs", + "scala-mode", "treemacs" ], - "commit": "efefcc0e936ec463f0d19b6cae7c8336dcd186e4", - "sha256": "01396r17ipmp0s5k5njm8m4vqw0g1sj9rq6dpkxv7wbad1c4izmx" + "commit": "5aea52dfe08b8f5936ea3982be6c25339f652eba", + "sha256": "0ca5xq1l3lscx36pcdnpy2axgyikjrl18naqr140kr1y500sy37s" } }, { @@ -63489,8 +63715,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210410, - 1801 + 20210511, + 1617 ], "deps": [ "dash", @@ -63500,8 +63726,8 @@ "markdown-mode", "spinner" ], - "commit": "65fb3e8d071406c4596dcc13e3f0230e1f730ec6", - "sha256": "1cdhgmqzg9dj491jqwfnqjdjkl4ki3gkpfn386mb5hwfl5aiv5pf" + "commit": "a033e1fb378d8dd165ef4d95ce3698868412014b", + "sha256": "1by13qwx69ws16b4k10ixb75ndid7415fl9gb101gc8haxn27xyy" }, "stable": { "version": [ @@ -63649,16 +63875,16 @@ "repo": "emacs-lsp/lsp-pyright", "unstable": { "version": [ - 20210220, - 1714 + 20210430, + 323 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "65fb14128127fb1ddf68dd4cb3140d6c7911a093", - "sha256": "0qhs4cv01b7aqq5r6bk91xgwsp8yg1bpn68xk90iirsxlgfb1ffq" + "commit": "6163527b4801c0e521d5d2e1d6ba90b8774ec946", + "sha256": "1c0d6cnk8w9zgq17c8aw22vvlrr38nm2gixddwcsxhkzb1gg06cf" } }, { @@ -63751,14 +63977,14 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20210330, - 323 + 20210508, + 454 ], "deps": [ "lsp-mode" ], - "commit": "5df10c36d3162982f5100b8c66af957dd05712cf", - "sha256": "0vl5gajg1w5qrzafvkqrbkb9dlja4ina2i3gs6pfv1jrn473h8p7" + "commit": "7156fcd0d8beea0536c2830399631cd189ee4038", + "sha256": "0lvsdnn48z379cj553vwng6hsp9mnmy03qgxbnnamw5d0lkvfp9i" } }, { @@ -63769,8 +63995,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20210411, - 1507 + 20210502, + 1804 ], "deps": [ "dash", @@ -63779,8 +64005,8 @@ "lsp-mode", "treemacs" ], - "commit": "4cfb46d7fe69cc537a8a86389c5d8d9fd3fbfabe", - "sha256": "0ca20xdmk0c5w3hpimly6pl355sjvzjaq3nwfaw3p6qr9sx1sy9w" + "commit": "b07868740d6f7d364e496048cee00bce10a6ab33", + "sha256": "1g8qkk6g67myz8rjvwa7iysrj0xpf0kcwrcdvf4dkc3rgh3kzm2v" }, "stable": { "version": [ @@ -64279,8 +64505,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210411, - 2036 + 20210512, + 1949 ], "deps": [ "dash", @@ -64288,8 +64514,8 @@ "transient", "with-editor" ], - "commit": "5882df245d3388cd6f443bc11df219a838104df2", - "sha256": "08yisn699gg2mfapc1h1rfb90vm9p10vk1c9xzd4h30xa6c0299h" + "commit": "fcd50dd8ae7cb33332eb7c6d90932be41b869cae", + "sha256": "01mmia1zcq980gxb65v553nlr3zdy1zk772ad4q34zlkvvaq605r" }, "stable": { "version": [ @@ -64317,15 +64543,15 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20210210, - 2312 + 20210512, + 405 ], "deps": [ "cl-lib", "magit" ], - "commit": "870174f23faa00b003b3eb63452228511c2da597", - "sha256": "156d0gd0a2cx9rn0zb9i96s3l62rys1dpxcdix2j6aix6iv669ql" + "commit": "d48fc38da0ed8c79a02591c5393aaef55498a988", + "sha256": "0qsnrwji66b0bwrgp1kj3b2mqq5vwphcs95mzk2y7xr75fwnvcbw" }, "stable": { "version": [ @@ -64469,14 +64695,15 @@ "repo": "emacsorphanage/magit-gerrit", "unstable": { "version": [ - 20160226, - 930 + 20210414, + 1334 ], "deps": [ - "magit" + "magit", + "transient" ], - "commit": "ece6f369694aca17f3ac166ed2801b432acfe20d", - "sha256": "0mms0gxv9a3ns8lk5k2wjibm3088y1cmpr3axjdh6ppv7r5wdvii" + "commit": "31f5ce30e374716818df7deb0cdbf462ef67e679", + "sha256": "08pwdjknd7407922w7gli76ji87zqj9j87sinhzjc38cnlhvm77n" }, "stable": { "version": [ @@ -64566,14 +64793,14 @@ "repo": "magit/magit-imerge", "unstable": { "version": [ - 20200516, - 2029 + 20210512, + 408 ], "deps": [ "magit" ], - "commit": "a6130871e5f4421618e66d9254d0b5df9f3a1ef2", - "sha256": "1zrgqcxp2jshp52m0sa73kk071hvisqlrk79k9is6smkjss97s8c" + "commit": "04633693d1e902d54d19d404e96201637714361d", + "sha256": "1knm30fzh7lri89gl8scimb5gf3rzbnr7x033zzn12v9w8i3dchy" }, "stable": { "version": [ @@ -64635,8 +64862,8 @@ "libgit", "magit" ], - "commit": "5882df245d3388cd6f443bc11df219a838104df2", - "sha256": "08yisn699gg2mfapc1h1rfb90vm9p10vk1c9xzd4h30xa6c0299h" + "commit": "fcd50dd8ae7cb33332eb7c6d90932be41b869cae", + "sha256": "01mmia1zcq980gxb65v553nlr3zdy1zk772ad4q34zlkvvaq605r" } }, { @@ -64790,8 +65017,8 @@ "deps": [ "dash" ], - "commit": "5882df245d3388cd6f443bc11df219a838104df2", - "sha256": "08yisn699gg2mfapc1h1rfb90vm9p10vk1c9xzd4h30xa6c0299h" + "commit": "fcd50dd8ae7cb33332eb7c6d90932be41b869cae", + "sha256": "01mmia1zcq980gxb65v553nlr3zdy1zk772ad4q34zlkvvaq605r" }, "stable": { "version": [ @@ -64835,26 +65062,28 @@ "repo": "emacsorphanage/magit-svn", "unstable": { "version": [ - 20190821, - 1455 + 20210426, + 2114 ], "deps": [ - "magit" + "magit", + "transient" ], - "commit": "2cff1a30a30f2b3963342a7d185ec13fc12279c3", - "sha256": "0c4bn9wjjwb0f6hzh7d6vz33lrf75kal62329drzmbh1sla2s3h3" + "commit": "350493217afdb7637564e089f475909adecd9208", + "sha256": "1v1y4fir1plz4kj0cvkcd29wibli4dw7vp4fmbxq4df76d8iy8yd" }, "stable": { "version": [ 2, 2, - 2 + 3 ], "deps": [ - "magit" + "magit", + "transient" ], - "commit": "99601f47f47a421576809595ca7463fd010760b1", - "sha256": "00lsfkmsz26pz1paqn73skgx747250vc2pa0n8n0h7ywxj9dkzvb" + "commit": "350493217afdb7637564e089f475909adecd9208", + "sha256": "1v1y4fir1plz4kj0cvkcd29wibli4dw7vp4fmbxq4df76d8iy8yd" } }, { @@ -64865,14 +65094,14 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20210327, - 350 + 20210512, + 407 ], "deps": [ "magit" ], - "commit": "99cb9c0501f0f1ea7ec3ebf0fb398f3d36cddafb", - "sha256": "189c4hrgbrwx44nidf4xv30yyb2y7lid57by0fn9hyi21nbk2gmx" + "commit": "d8609cb28d0411edf40031c1a551d64f383fac51", + "sha256": "1l3wqrv3338w7lgmpqpqqmc3wwh0dhl76nmfqlp8xjf44r3is2v7" }, "stable": { "version": [ @@ -65580,19 +65809,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210409, - 2305 + 20210506, + 1500 ], - "commit": "668265af921285c726b2239dae32459bd1064d03", - "sha256": "1kl516mzcpdam787x5k55s0crspacvxnz2zqz5m32b13xl2pr847" + "commit": "445d2832a2f06484ad28d9b55676c52d63cd0a46", + "sha256": "0sf7b8f77cw3cgxhhq5qlmnzsfdrgx90m85dacm89hk2hpagmphf" }, "stable": { "version": [ 0, - 4 + 5 ], - "commit": "e741b243b30f6cfe85e568cc551acff9a1e5e74f", - "sha256": "0piwzxp1zmwp876kyca0xcgyxgn8bn4wh5fnn88dkvdzi8mcgmkh" + "commit": "5126ba6244e13e3e2cf608e7f3955377bcbd8c04", + "sha256": "07vfidgq9am07zz2ydhdifmp4jmgs9jn5l1nfqiyp16sd1br6czj" } }, { @@ -65700,11 +65929,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20210405, - 1349 + 20210504, + 249 ], - "commit": "ac9ea26b941eef512a3c206375a6404625c229ed", - "sha256": "0nszqrx6nfdzlib3w6l5pmzmgnrwzmvzlz7hv46x4iqzyxjg2jsn" + "commit": "9977753eebe3f5cca7ab85b18a7c719fdb0b7654", + "sha256": "0aaj4bdl7cks06kx0jbhw0rvcwl2g68wyniy344fz2dzwwmp7acf" }, "stable": { "version": [ @@ -65715,35 +65944,6 @@ "sha256": "0g0ja4h651yfabm3k6gbw4y8w7wibc9283fyfzb33kjj38ivl5d7" } }, - { - "ename": "markdown-mode+", - "commit": "ca7bf43ef8893bf04e9658390e306ef69e80a156", - "sha256": "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00", - "fetcher": "github", - "repo": "milkypostman/markdown-mode-plus", - "unstable": { - "version": [ - 20170320, - 2104 - ], - "deps": [ - "markdown-mode" - ], - "commit": "411d079f4430a33c34ec0bbcb1535fe1145a2509", - "sha256": "0427cxvykmz8kz1gnn27yc9c4z8djyy6m9qz6wbd4np1cgqlmly2" - }, - "stable": { - "version": [ - 0, - 8 - ], - "deps": [ - "markdown-mode" - ], - "commit": "f35e63284c5caed19b29501730e134018a78e441", - "sha256": "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r" - } - }, { "ename": "markdown-preview-eww", "commit": "d9b3ad97a193c41068ca184b4835fa7a7a0ebc9c", @@ -66129,11 +66329,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20210410, - 1340 + 20210504, + 1439 ], - "commit": "587ad073069e8c932388d6f4ab8e7689b52bc6ad", - "sha256": "1lnwax7m105h9djvbyhwcxg6av9i04myq02dxhb1gw64w6i3vas8" + "commit": "c5824936cc7c2d24aeaac40010669f4eec89a239", + "sha256": "0rccwkglyw9hnab5mzhrzfrldlvi9c8ivygdh54jzfjlzcgwddv9" } }, { @@ -66460,16 +66660,16 @@ "repo": "mopemope/meghanada-emacs", "unstable": { "version": [ - 20200628, - 247 + 20210505, + 652 ], "deps": [ "company", "flycheck", "yasnippet" ], - "commit": "1e41f7f2c7a172e9699f3557c97c3f39a149bfc2", - "sha256": "1cplw3x94xc2yqvvimkjgppbb36mnj8n3gcx0k2gy7zwzdvzg4c6" + "commit": "6c57e8a0ae27e2929bb12572cf33059cd4ecbc04", + "sha256": "1wq4x80lqzlpixy701xncvmz0jwk1zgp1kpz1z7wgl5i0jnb1516" }, "stable": { "version": [ @@ -66650,16 +66850,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20210410, - 1837 + 20210511, + 314 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "6eb10d223fb7e0d87ac7ab7063fdb3951934e94c", - "sha256": "0b1s51yfklm52j2g0gnrwdahr1jql1fv93sn7inm5c1ygx3agc7c" + "commit": "bfe4a67b6f3ea14dcc9140e16731f45afb64faf0", + "sha256": "13w54vpv5y4mxvrzc36f6vciq5sjxxmfj7k0d81svpjywz9cd12r" } }, { @@ -66673,16 +66873,18 @@ 20210408, 1014 ], - "commit": "cb1094ee0aeb5bd2bf5530911157c61cb316e6f3", - "sha256": "1bvym9p120sdiwc4lr2f13bhfmxr14vr3scf3g90dj6swa9k9ww8" + "commit": "e0f4648b3c713030471e09d42b65265471e853b3", + "sha256": "073ppd8ckr6j4kw8a0y6pssgp3jvs85fy309pxrs0bd1m9s4hnsh" }, "stable": { "version": [ 4, - 1 + 2, + -4, + 412 ], - "commit": "ab02f60994c81166820791b5f465f467d752b8dc", - "sha256": "1lsrn6739736gr72c83hnxdynqmvjbs8pq3spb74v39k7xixmh99" + "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c", + "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1" } }, { @@ -66700,8 +66902,22 @@ "auto-complete", "merlin" ], - "commit": "cb1094ee0aeb5bd2bf5530911157c61cb316e6f3", - "sha256": "1bvym9p120sdiwc4lr2f13bhfmxr14vr3scf3g90dj6swa9k9ww8" + "commit": "e0f4648b3c713030471e09d42b65265471e853b3", + "sha256": "073ppd8ckr6j4kw8a0y6pssgp3jvs85fy309pxrs0bd1m9s4hnsh" + }, + "stable": { + "version": [ + 4, + 2, + -4, + 412 + ], + "deps": [ + "auto-complete", + "merlin" + ], + "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c", + "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1" } }, { @@ -66719,8 +66935,22 @@ "company", "merlin" ], - "commit": "cb1094ee0aeb5bd2bf5530911157c61cb316e6f3", - "sha256": "1bvym9p120sdiwc4lr2f13bhfmxr14vr3scf3g90dj6swa9k9ww8" + "commit": "e0f4648b3c713030471e09d42b65265471e853b3", + "sha256": "073ppd8ckr6j4kw8a0y6pssgp3jvs85fy309pxrs0bd1m9s4hnsh" + }, + "stable": { + "version": [ + 4, + 2, + -4, + 412 + ], + "deps": [ + "company", + "merlin" + ], + "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c", + "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1" } }, { @@ -66767,8 +66997,22 @@ "iedit", "merlin" ], - "commit": "cb1094ee0aeb5bd2bf5530911157c61cb316e6f3", - "sha256": "1bvym9p120sdiwc4lr2f13bhfmxr14vr3scf3g90dj6swa9k9ww8" + "commit": "e0f4648b3c713030471e09d42b65265471e853b3", + "sha256": "073ppd8ckr6j4kw8a0y6pssgp3jvs85fy309pxrs0bd1m9s4hnsh" + }, + "stable": { + "version": [ + 4, + 2, + -4, + 412 + ], + "deps": [ + "iedit", + "merlin" + ], + "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c", + "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1" } }, { @@ -66779,14 +67023,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20210329, - 2328 + 20210505, + 1635 ], "deps": [ "f" ], - "commit": "b650649a9f28629154a041ef187c21c5128530f2", - "sha256": "0pffhrxw91p82gkyhf3bwcs910pjw8f7y94lsyqz5jzs469b0lcy" + "commit": "562ffe86cad91627e2b94b8684818562c3ad2b5d", + "sha256": "0g90fy27ivjaad1wp6rg8jx8dm44vb6zmsrlchzpwcyhkxs7zv8l" } }, { @@ -66963,20 +67207,20 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20191018, - 242 + 20210422, + 326 ], - "commit": "c7f72a87952ed16323fce968462af897235f1719", - "sha256": "0v8zkzai5gfzng9dpkikwf60rvsr1148y5nb7hw65961xms855s4" + "commit": "c1b386f3522054f063f4ac60730397ed1f724478", + "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q" }, "stable": { "version": [ 1, 1, - 10 + 11 ], - "commit": "19aa8a17428d6ee42f54e464c26eeab17a6478ab", - "sha256": "198ahgxji0kh6ynygrrdvllj9fwcqrnma4sd8msj2aq18xij9glr" + "commit": "c1b386f3522054f063f4ac60730397ed1f724478", + "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q" } }, { @@ -67020,11 +67264,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20210131, - 740 + 20210416, + 33 ], - "commit": "8c6bc6bf9562beb74b3b4fda47b2fe473139eb1c", - "sha256": "0bf30kkrmi0qw8i0viv1dnvrd52a66rp6vcklidrnv4dh5b782n8" + "commit": "380d6059fa9f102e736969d086749980820a9e0e", + "sha256": "03fxicfl7yvxj6ac636544km1khhmrjqi97r0smwqfxvlm2gs037" }, "stable": { "version": [ @@ -67089,11 +67333,11 @@ "repo": "purpleidea/mgmt", "unstable": { "version": [ - 20200104, - 108 + 20210131, + 2152 ], - "commit": "76ede10e0a0433d8aae6b3b4e132ca9dcce5ca75", - "sha256": "1n6avpk8ggpjqiin1qrwc3g1rjgq902cgks1kfd2r82bkri2sq1q" + "commit": "48fa796ab1669dc275b8c99238fff6c83ad2fcc6", + "sha256": "0rn7ahpj2kjkmy7gq4fj0n99af70xxxykyjqsza1nnizxfgmrpwj" }, "stable": { "version": [ @@ -67643,11 +67887,7 @@ 1900 ], "commit": "519e05f74825abf04b7d2e0e38ec040d013a125a", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503; retrying in 301 ms\nwarning: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503; retrying in 515 ms\nwarning: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503; retrying in 1011 ms\nwarning: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503; retrying in 2434 ms\nerror: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503\n" - ] + "sha256": "1yf21gm4ziplmgx8yn7jqq45mwfiindbrman7fc5b9ifq78x9ryn" }, "stable": { "version": [ @@ -68010,8 +68250,8 @@ 20210215, 2345 ], - "commit": "02b1da6278e43cc9cc0356110cc6bfbb37eb8241", - "sha256": "0ky330b2sfbzkbxbfp9b21hdywsjw26bllspglz08hrbni7jmry8" + "commit": "8454a5ef404c6f4fe954a10da6ce4fd4311decfa", + "sha256": "01aq4bgris8v7q0yfyz1928q4rh9mba3b799zw2df8slqiigbf8i" } }, { @@ -68118,24 +68358,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210411, - 751 + 20210512, + 1202 ], - "commit": "3c9b98f61e9b781f756ac7a329005156406cae5a", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503; retrying in 250 ms\nwarning: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503; retrying in 595 ms\nwarning: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503; retrying in 1101 ms\nwarning: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503; retrying in 2792 ms\nerror: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503\n" - ] + "commit": "ea3c277db14cfefaf54383c7b3e34bffe90150e8", + "sha256": "0w72946ar1fhv0qjinj9m28hr454mdgjqvsdkbgjha1cnk492akw" }, "stable": { "version": [ 1, - 2, - 3 + 3, + 0 ], - "commit": "0a36239baf908585cdf32c6188eb86713d9bf6c6", - "sha256": "1l392hz6zs6wg06x2zxnk7s0h5cpmvbkcynh68gjmqjj84l7mqrk" + "commit": "69248a97c9da98de786891215ab6baafcc44a55d", + "sha256": "0d3i07g8sxg30llzx519ph3qp4bx0vk0xy80sxhy5vra2l30ihlj" } }, { @@ -68170,11 +68406,11 @@ "repo": "sergiruiztrepat/molar-mass", "unstable": { "version": [ - 20210324, - 1832 + 20210426, + 1754 ], - "commit": "5b7d1d0004d27580e980fe8532658cd09174342e", - "sha256": "18s2np5wflbg0y6ffnjcbljyh3b5qsnjkma6dcl3razfr55mzmgn" + "commit": "27d3a305a9efe3ae8b57ec52cc644c219d0952eb", + "sha256": "09kmfq2klh446zdwnxa51z2i39f7p8f8f2wzcz874sm8nf10vszh" } }, { @@ -68290,11 +68526,11 @@ "repo": "ananthakumaran/monky", "unstable": { "version": [ - 20201226, - 1950 + 20210417, + 12 ], - "commit": "e04632277ef24acacc029ae29db1fadc458ae83b", - "sha256": "0xzn9fgxvbpgx5wky8vdhd3bw7hy6h6hngx7l8a0qspg560r7hz1" + "commit": "72c7cd21b7b995c476e938fd0b92a494aa25c3a7", + "sha256": "03khwadd3x3s9wrggdfjj8cff0nr64fj6hzc9yqbn2baxfkgrn8l" }, "stable": { "version": [ @@ -68502,11 +68738,11 @@ "stable": { "version": [ 1, - 5, + 6, 0 ], - "commit": "d0076ea22b2afc4c3faeea2138e836b1c8f08988", - "sha256": "0hz525xmv6kslss3yn8ibj6bi2xp442knad0030px7giia6y1pf6" + "commit": "f94cf84138a81212ffe856599834f7824a1b6e95", + "sha256": "0rdvcv8hwrxxbb9s8sfx5331a08kdk28x8chnnq3pj58pxqvagy3" } }, { @@ -68828,8 +69064,8 @@ 20210306, 1053 ], - "commit": "1ddec765e033d22079627dc14a06a204134e1b28", - "sha256": "0is1il0xws1k31p67s4xvpql7qm4rrv23fj2szdmfdds9f7qpp18" + "commit": "13a0f0af93fa6220256fa0df534691b893ae3424", + "sha256": "08gabqnnx3gc5arr1q79l5f0lzlkwsdi3h2vpcdd2xxbn6w3y12s" }, "stable": { "version": [ @@ -69141,16 +69377,16 @@ "repo": "yaruopooner/msvc", "unstable": { "version": [ - 20191211, - 540 + 20210503, + 1856 ], "deps": [ "ac-clang", "cedet", "cl-lib" ], - "commit": "9fe50e5961fa63fc5cf7326370f441993e9d5cfc", - "sha256": "133pidan95qyn78gdhfxlyk8x5f28rm5rwb9wdw1gpjy4l72q22f" + "commit": "122dc9cb7f145f12dac7b117a48fceb38b279432", + "sha256": "0ch9kvqvyirv8asqd5w2g3yb7h15741aavzm5hlmy8sj3l7q22jz" }, "stable": { "version": [ @@ -69426,27 +69662,31 @@ "repo": "mihaiolteanu/mugur", "unstable": { "version": [ - 20200831, - 702 + 20210503, + 1516 ], "deps": [ "anaphora", + "cl-lib", + "dash", "s" ], - "commit": "34dfba027bf11e4cca2c547ce80b73d7324c7ba6", - "sha256": "011qr9jc90arg3y8y49hjmv94968ym81a36db0dvxyf08hspz006" + "commit": "b84752c391c5fe515960f77c80d08f313df57f33", + "sha256": "0la8lqr3wgizmnwnpys9mwrj1qi0al0gx6kxhlfwf9jr5gbdg9np" }, "stable": { "version": [ - 1, + 2, 0 ], "deps": [ "anaphora", + "cl-lib", + "dash", "s" ], - "commit": "34dfba027bf11e4cca2c547ce80b73d7324c7ba6", - "sha256": "011qr9jc90arg3y8y49hjmv94968ym81a36db0dvxyf08hspz006" + "commit": "b8ebfd18a579b834d062082a8018f73561a0cde1", + "sha256": "0a7yd9y6nfyxz9qc84yrn8ii2z6359vhj8if3bx6b0hi8g03m4xl" } }, { @@ -69680,8 +69920,8 @@ "deps": [ "cl-lib" ], - "commit": "7b13b03c995e13ad86e499d40ec49c4dc281f889", - "sha256": "1fysnjbh0dai1bzx4122fp4qhbyn82m8hh3smd0xhwphjwrbnl57" + "commit": "616fbdd3696f99d85660ad57ebbb0c44d6c7f426", + "sha256": "10raq8p881zzz7si3wfpcgdnwyl8y7y9rgw28akyigjyq8knl6kf" }, "stable": { "version": [ @@ -70482,11 +70722,11 @@ "repo": "rolandwalker/nav-flash", "unstable": { "version": [ - 20191204, - 1427 + 20210510, + 2035 ], - "commit": "dbb91216637e0a1e8bfd59aa883c75d45db70daf", - "sha256": "0f8dsxgk1a994clwkii9hv2ibvkf38kbvgd4sp3w1sf4vy12z5n5" + "commit": "d76314802273153c2c38156250d75f95ca352482", + "sha256": "006ghb4xrpp82wlshqmpsj0yh5vq8il6wl5v8f1cyy1vd21yl285" }, "stable": { "version": [ @@ -71117,8 +71357,8 @@ 20210318, 1654 ], - "commit": "a4d9d69442c9edac3f2cacabd2a7401dbefe7ff3", - "sha256": "1h828cxjacfqlhm719w2kwh91i0r1lai6wswpp7wp21wvvp28v5r" + "commit": "7e9ad5a617a26641988445503e235c68fa21b611", + "sha256": "1wy06kphgljlcnl55qx5g8hzcv9bnfrrp22pfsxpyawlrmmgxp1j" } }, { @@ -71132,8 +71372,8 @@ 20181024, 1439 ], - "commit": "ce700488e01af33bc478bc986e261e306180b993", - "sha256": "0xraqmi9cx8z2wdwk2d8z9yr0b0csx7xwv012k531zqmhk81srpq" + "commit": "0a632d11eb1e8b7becbd9756c3e3439777924f6d", + "sha256": "0s9gyvs5kjwa5nj9hrnxgpjl6kf2swnig8kyy6y4lgprfl2b4ifs" }, "stable": { "version": [ @@ -71247,6 +71487,21 @@ "sha256": "1bqlhkxg0faddhvxx909dq46dxdxk4mdyhdpww92dmzgxdpq38sx" } }, + { + "ename": "nix-modeline", + "commit": "6257a28862614c40db5ca933338e69faf7999eab", + "sha256": "0c3hr7l3d7qz83hgf3d4i171aya36qmfyvc5qzq7x0qdhiwavjpz", + "fetcher": "github", + "repo": "ocelot-project/nix-modeline", + "unstable": { + "version": [ + 20210405, + 742 + ], + "commit": "ecda866b960321bb82deac26af45918e172ef0ba", + "sha256": "1yq1lyg4ix45n4cbqml36grmk6v1ici6dpdvr5yy56lv2zxbjrc4" + } + }, { "ename": "nix-sandbox", "commit": "66be755a6566e8c0cfb5aafa50de29b434023c7a", @@ -71387,26 +71642,6 @@ "sha256": "0h00ghr5sipayfxz7ykzy7bg1p1vkbwxl5xch3x0h8j2cp1dqc3d" } }, - { - "ename": "nm", - "commit": "cdad6565e83dd79db538d3b6a45e932864246da2", - "sha256": "004rjbrkc7jalbd8ih170sy97w2g16k3whqrqwywh09pzrzb05kw", - "fetcher": "github", - "repo": "tjim/nevermore", - "unstable": { - "version": [ - 20151110, - 1910 - ], - "deps": [ - "company", - "notmuch", - "peg" - ], - "commit": "5a3f29174b3a4b2b2e7a700a862f3b16a942687e", - "sha256": "1skbjmyikzyiic470sngskggs05r35m8vzm69wbmrjapczginnak" - } - }, { "ename": "nndiscourse", "commit": "1d6a236cd3ff51f2d4cfca114b2791c8ac7411e8", @@ -71541,13 +71776,13 @@ "version": [ 1, 2, - 1 + 2 ], "deps": [ "cl-lib" ], - "commit": "96ed5b8ecad8bcdcd212aacd9957276be3cf128e", - "sha256": "00chkzpjcdll907vpzfzmf9p3jprisnr8i0h1x5gixidwbfc2whi" + "commit": "57357e15643158b4e0d9b3b4f70a82f5fc73178a", + "sha256": "1kbbbx1agzcxc5n1b6cavdx3wjxz6mgi9rafja8mk8cyaaiz0rkd" } }, { @@ -71837,17 +72072,16 @@ 20210205, 1412 ], - "commit": "1459217e17e94277495c5c644b5a4ca1651c9452", - "sha256": "1p1g816ansbq388pqclckcjs0cgl38p0gc77rrgmab3mccdvib2r" + "commit": "a34d7b41444ad2fb50cc7def25659c88d439780a", + "sha256": "092zilqchq1hydjzwxgb493gwi7lrfvk02l4sarhn56zsbbyr9hh" }, "stable": { "version": [ 0, - 31, - 4 + 32 ], - "commit": "3a3208bb7b8bfca1c0bcaa5b45b6ef71aa768612", - "sha256": "04q9zwy6mpck82zk70xnx2knh2jmqhf676703kjw0fbvdrzw9qik" + "commit": "5fe92332f2dcff460dea1f2aa78717d1954df62c", + "sha256": "1sgjjcc53ys8pspblbif24min5gg7l71xakhrvmb4xniw4rg2qx6" } }, { @@ -71917,26 +72151,26 @@ "url": "https://git.sr.ht/~tarsius/notmuch-maildir", "unstable": { "version": [ - 20201028, - 1330 + 20210416, + 1043 ], "deps": [ "notmuch" ], - "commit": "9f3e8bbce4c8c6cd80fb71b92d315d4f3334b450", - "sha256": "1rrd3ymc7k8irq1w4496h4whks7lnfam7ibfwgcra074ligfrs4p" + "commit": "e34c470521e83c3100f0d6eb9e7402ae35e19321", + "sha256": "0pmikf1djkr07067nkgmdcxyn7l7ibswx6qlnai8v1v51f9h1g9q" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "notmuch" ], - "commit": "8c641d9688f20262c9dac59901aaecd2a21525d7", - "sha256": "1nh7vkxhwb2cmm8g7gxh3rc6lcfqlhsbf82vi3lsbdq008p1b3kh" + "commit": "e34c470521e83c3100f0d6eb9e7402ae35e19321", + "sha256": "0pmikf1djkr07067nkgmdcxyn7l7ibswx6qlnai8v1v51f9h1g9q" } }, { @@ -71961,14 +72195,14 @@ "version": [ 0, 3, - 3 + 4 ], "deps": [ "dash", "esxml" ], - "commit": "0ece7ccbf79c074a3e4fbad1d1fa06647093f8e4", - "sha256": "116klnjyggwfwvs9nqhpv97m00k63q6lg41ph41kywsqkfy42dlk" + "commit": "b3c7cc28e95fe25ce7b443e5f49e2e45360944a3", + "sha256": "0va9xjrq30cv5kb59a4rq5mcm83ggnv774r8spmskff3hj8012wf" } }, { @@ -71979,11 +72213,11 @@ "repo": "muirmanders/emacs-nova-theme", "unstable": { "version": [ - 20200826, - 1803 + 20210512, + 1802 ], - "commit": "279e165171558930f56d8d5cfc83e1bb6560e452", - "sha256": "0rwqnqkbasgp80cgsz0pp1gbg2w7803lh7z02565p193mrvfwr3b" + "commit": "1498f756a4c1c9ea9740cd3208f74d071283b930", + "sha256": "0jbk5wwv5dfcp4y19azl3jjcjlzr1547w1g1grq6kwpc69r5x2bf" } }, { @@ -72131,6 +72365,18 @@ ], "commit": "a5508d9958c2148c04ec32d7b3a9f72423e4b0aa", "sha256": "1d1snvxbdv0mh48jmi6dx0yr4hmblcq1aajxb1z56714702ycdgj" + }, + "stable": { + "version": [ + 0, + 9, + 0 + ], + "deps": [ + "org-roam" + ], + "commit": "c150603a25445d65b7b08d658793a6019fd763ea", + "sha256": "0qip0vhyvif5az7zph1m41gwamz84v01ay9qzicydzbizhzp4n5i" } }, { @@ -72326,28 +72572,28 @@ "repo": "douglasdavis/numpydoc.el", "unstable": { "version": [ - 20210305, - 2006 + 20210510, + 1558 ], "deps": [ "dash", "s" ], - "commit": "ddd7d54fc66ace3a56ff839ccd1993e2f40a7412", - "sha256": "0zbqnraynz25gj3ca1iqvn36xkgh8x24hzk3pm1c6ga395xpq0ki" + "commit": "01c067e1b83175cb3f03c2061528393166173012", + "sha256": "1wla0drxbk7kqxpam4yrmlz2ajrqv6sz66jg11795k7wh16ab21s" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ "dash", "s" ], - "commit": "1549f362fda96b75760f20cee9b471362823ef4e", - "sha256": "1d5ff42fifssb38qvmhr8p6rvgak7z1mjhandirla05bjb4cramp" + "commit": "01c067e1b83175cb3f03c2061528393166173012", + "sha256": "1wla0drxbk7kqxpam4yrmlz2ajrqv6sz66jg11795k7wh16ab21s" } }, { @@ -72531,16 +72777,16 @@ "repo": "astahlman/ob-async", "unstable": { "version": [ - 20200921, - 205 + 20210428, + 2052 ], "deps": [ "async", "dash", "org" ], - "commit": "de1cd6c93242a4cb8773bbe115b7be3d4dd6b97e", - "sha256": "12n6fvjiwkf02aypvj5zrbjrxhz2p0rcq2k3mfz5ravyarpvrybp" + "commit": "9aac486073f5c356ada20e716571be33a350a982", + "sha256": "0k0jcha7cckj8dc2cc1a6m2yhagsl5bmlnr3p8x3g8ij1axk533h" }, "stable": { "version": [ @@ -72583,11 +72829,11 @@ "repo": "corpix/ob-blockdiag.el", "unstable": { "version": [ - 20190720, - 1858 + 20210412, + 1541 ], - "commit": "272fafcf3bc37f9de41b11beb6a33e0dbf0a1909", - "sha256": "0gi7vnh5fchbjb7hp7yi08z2vqkmhjrg64ssir358qxqambxvrxb" + "commit": "c3794bf7bdb8fdb3db90db41619dda4e7d3dd7b9", + "sha256": "14lw5y8djl9ff71layshz4rrmknp4kisv9lak26d9lh1l2z69fi6" }, "stable": { "version": [ @@ -72858,28 +73104,28 @@ "repo": "frederic-santos/ob-ess-julia", "unstable": { "version": [ - 20201109, - 911 + 20210414, + 1444 ], "deps": [ "ess", "julia-mode" ], - "commit": "b97ebf19c3d68ff946584e78ab7943f8a691ebe5", - "sha256": "1g9p3i6iwhgh6wj1k326lswms59nx4n1dyb7rr1qia1d0y3k1zym" + "commit": "147e9e7fe55c41dd77171417e92af40db3530b84", + "sha256": "00wplflc4pp0ffhnkya19cqm3ihz8mybfj2ywk3ii2d9x08kjnp3" }, "stable": { "version": [ 1, 0, - 0 + 3 ], "deps": [ "ess", "julia-mode" ], - "commit": "337df3eefd85c01020fe08eae3ddcf3ec3e4ac2d", - "sha256": "0pk4b6zg08nacds129frk3qwn0mlm4sg03gihyn42fd8iq16mjzf" + "commit": "147e9e7fe55c41dd77171417e92af40db3530b84", + "sha256": "00wplflc4pp0ffhnkya19cqm3ihz8mybfj2ywk3ii2d9x08kjnp3" } }, { @@ -73030,6 +73276,35 @@ "sha256": "1a10fc2jk37ni5sjjvf87s5nyaz2a6h2mlj5dxh4dhv5sd3bb85p" } }, + { + "ename": "ob-julia-vterm", + "commit": "6e5f9703d8d4f9e5272db5be2c2bd89dfd27f32a", + "sha256": "0bkjqln8pi6j0lq5ch68v2r2rb2zbdch3g63kqjwskadgsypgfpj", + "fetcher": "github", + "repo": "shg/ob-julia-vterm.el", + "unstable": { + "version": [ + 20210418, + 2306 + ], + "deps": [ + "julia-vterm" + ], + "commit": "3e7ff901687c320869c5e17e3273185af68e8cd6", + "sha256": "0i155p3k2xf0p00xazqjw4llylb13svgad9a9m6as6lcvrvc0zsp" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "julia-vterm" + ], + "commit": "5893d75cdb9e687b98b99b3675165f4edf0083a6", + "sha256": "12ya7dn7fd0szm6pi68f7h4cyb5cy56cfs43nl9f4v8v2qvlyh5y" + } + }, { "ename": "ob-kotlin", "commit": "7aa74d349eb55aafddfc4327b6160ae2da80d689", @@ -73596,17 +73871,17 @@ 20201204, 945 ], - "commit": "fd078c3a37cb679dfffe890995a4e6a1f63ece15", - "sha256": "0vq3nnjk76i947wjmfddbr1fs6m8dkddlrqcdsvsf2xw2xfpsfvs" + "commit": "4a291edd95a65cdf9a0d67e7c21dfb5faeed17f2", + "sha256": "0bjcvxyi99zd2cn46771i22y0mjs5m1vg4c4c9vxg0kkz04wk3wv" }, "stable": { "version": [ 0, - 17, + 18, 0 ], - "commit": "bfd6bbe95c614d1d982244c4fd0ba494275d2245", - "sha256": "0vy69sjl184czpwbhcbgzyh8kgj6n3jq8ckllcbwic859aq8lqvn" + "commit": "3697f0f92854a681fd1156fe4f6fb97d060da1d8", + "sha256": "0n6363km8xr81pvyk453n6h2mb0256c5yxw3p1li4dn83f3lwxr1" } }, { @@ -73790,30 +74065,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210405, - 820 + 20210512, + 1429 ], "deps": [ "org-re-reveal" ], - "commit": "1150feb761047e241af1c5e67333665e729a4a63", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503; retrying in 298 ms\nwarning: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503; retrying in 617 ms\nwarning: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503; retrying in 1257 ms\nwarning: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503; retrying in 2660 ms\nerror: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503\n" - ] + "commit": "fbadeea46739954649c8eb6dd61f74eb1ba2bf8b", + "sha256": "0qsqj7yb608bgzyicn9zpqxvranbs94xapbssxp7y64ng1ad68d2" }, "stable": { "version": [ 3, - 17, + 20, 0 ], "deps": [ "org-re-reveal" ], - "commit": "e880c4f65ad20e22ab845fc2918ca74cc37bf39a", - "sha256": "197fn08xhk6cbvi4hqf51v40x0ki5n8h1896g3bpl4fasfy5zicp" + "commit": "fbadeea46739954649c8eb6dd61f74eb1ba2bf8b", + "sha256": "0qsqj7yb608bgzyicn9zpqxvranbs94xapbssxp7y64ng1ad68d2" } }, { @@ -73918,20 +74189,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20210202, - 709 + 20210510, + 100 ], - "commit": "61d26644fd9dd2d45b80b9b82f5f930ed17530d0", - "sha256": "1nvnahwjqs9i2cinkpwg689lg134wp7l6f9f1k1jwn0dh1amqmvp" + "commit": "4a0719021625ece4def8f18d28f86a681bee7d28", + "sha256": "1qggyq7yxg25k9iyyx5bsv8zmh1z14gdybc1d4qkyc905395jn0l" }, "stable": { "version": [ 1, 11, - 3 + 4 ], - "commit": "a2dbd3dc4e7000fec29febbd089cd4558a7322b9", - "sha256": "0zcph7l0hxisbvsyzb1dw3paq5a5sjp5lrq5nq9zggvgc6zvx7sh" + "commit": "6902410cd857385a3c1aa20ba391901a78d2740b", + "sha256": "1pw1zc0pdwwi9dv8fypfxgn6xbfvm88qzhss880lspialff1wcxn" } }, { @@ -74370,6 +74641,29 @@ "sha256": "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h" } }, + { + "ename": "openfoam", + "commit": "f184e09d370d563852da2028b9c2546d6fc162c0", + "sha256": "09i02kqgw3mqvwzj4p23p66rpy30ziz4gxczs8p47l6ilw5j69rz", + "fetcher": "github", + "repo": "ralph-schleicher/emacs-openfoam", + "unstable": { + "version": [ + 20210508, + 1903 + ], + "commit": "1623aa8d9f72128cc007f84b108d2f6c6205c330", + "sha256": "14s0sfsy6gif6rfs39ryzwqkp150m9jbz2mna5aj7hiny46gjskf" + }, + "stable": { + "version": [ + 0, + 13 + ], + "commit": "7808319de0326aa293636df6c213467c279ff1ea", + "sha256": "14s0sfsy6gif6rfs39ryzwqkp150m9jbz2mna5aj7hiny46gjskf" + } + }, { "ename": "opensource", "commit": "ec4255a403e912a14a7013ea96f554d3588dfc30", @@ -74486,11 +74780,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20210407, - 1548 + 20210507, + 1645 ], - "commit": "87ab7e47e343285f7afd42779c78551332b8fd84", - "sha256": "117lwgw5z980pay656pmgyfqdpvi0cxj69x3c7dcmz451n57ap9j" + "commit": "d97a91f6e12ace638e65bdccefd14d1e638a2dae", + "sha256": "05pk7pd3w59lzgfs0hh1jzm9pmk3yn3bskl951wyxgypix470a0r" }, "stable": { "version": [ @@ -74674,14 +74968,14 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20210401, - 2114 + 20210504, + 1109 ], "deps": [ "org" ], - "commit": "2380562fbec8a17ec193891da755a502a2ccd252", - "sha256": "14b1x446zwdsqy8lvmz3iw1byaq1rn92v19ib5zyk18g9lf9ma7i" + "commit": "c3466c45eb4f03944706cebfa677ea9cb5719a4d", + "sha256": "0wq98qjnry3l376vhzp22bbr7i5y5hcwc4lw6g7nqkw1jbja2rij" } }, { @@ -74883,8 +75177,8 @@ "stable": { "version": [ 0, - 2, - 21 + 3, + 0 ], "deps": [ "dash", @@ -74894,8 +75188,8 @@ "org", "s" ], - "commit": "a88d39e364757594c6b3830cc36f342ee0d1b8ab", - "sha256": "1axzhb9k1i8l9rksk14bb04v4q4mx498f5psnalxwvn0563ngs5r" + "commit": "9f4ec4a981bfc5eebff993c3ad49a4bed26aebd1", + "sha256": "1sgckvpjdaig9r2clcvs6ckgf2kx7amikkpq26y30jbnfnbskf0v" } }, { @@ -74906,14 +75200,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20210108, - 1512 + 20210507, + 658 ], "deps": [ "org" ], - "commit": "e9b9b3e5bb3c63cecb1367df49205c346d9c050a", - "sha256": "0j1f75p40p033acnkds2mxhqx5wilmlhak8cgn196x6y8j1ra7d8" + "commit": "e0c02b57836d4882da9aa3e65f04ba6045aae537", + "sha256": "1r6p3jn7lvyjr777hm803cs320n8lwbajy2iz88zp7lpc88zfhyg" } }, { @@ -75011,14 +75305,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20200729, - 2021 + 20210508, + 110 ], "deps": [ "org" ], - "commit": "5b461ed7d458cdcbff0af5013fbdbe88cbfb13a4", - "sha256": "171ybf5n6a6ab3ycghc2z016qxbgqyj13kkcdsfqy0691wx7dcqb" + "commit": "a97232b4706869ecae16a1352487a99bc3cf97af", + "sha256": "1j4zjp0w7f17y0vddi39fj13iga0pfh5bgi66lwwghb18w0isgng" } }, { @@ -75337,16 +75631,16 @@ "repo": "phillord/org-drill", "unstable": { "version": [ - 20200412, - 1812 + 20210427, + 2003 ], "deps": [ "org", "persist", "seq" ], - "commit": "35c1ce349949cc213f3076799211210f49431850", - "sha256": "06hc98z4sml7jrwm5zvbsw5x6q5jpa335almzkh6h85g1p8syfsn" + "commit": "bf8fe812d44a3ce3e84361fb39b8ef28ca10fd0c", + "sha256": "079x6rcz50rpw0vdq5q2kjpixz95k9f3j9dwk91r5111vvr428w3" }, "stable": { "version": [ @@ -75456,14 +75750,14 @@ "repo": "eschulte/org-ehtml", "unstable": { "version": [ - 20150506, - 2358 + 20210428, + 1547 ], "deps": [ "web-server" ], - "commit": "9df85de1a0fe1e7b2d6c000777c1a0c0217f92d0", - "sha256": "0kqvwqmwnwg2h7r38fpjg6qlkcj9v8011df8nmsgs1w1mfdvnjsq" + "commit": "b4f97edf4150870b84d7ee8508088c0d375eaa83", + "sha256": "124fq9k7qmjvn5hp9i2b4xmrm9z18zhbc9j1rv68wpdqf0kqxkcd" } }, { @@ -75580,11 +75874,11 @@ "repo": "harrybournis/org-fancy-priorities", "unstable": { "version": [ - 20180328, - 2331 + 20210427, + 900 ], - "commit": "819bb993b71e7253cefef7047306ab4e0f9d0a86", - "sha256": "13cyzlx0415i953prq6ch7r5iy23c1pz116bdxi5yqags4igh4wv" + "commit": "44532ab8c25eb2c0028eecca7acd9e8ea8e2ff30", + "sha256": "1cvlyq5p505vx9gcqgvhj7qan1qhq859c2fv7a44kfs0093cb9fz" } }, { @@ -75595,14 +75889,14 @@ "repo": "io12/org-fragtog", "unstable": { "version": [ - 20201231, - 505 + 20210510, + 2202 ], "deps": [ "org" ], - "commit": "0151cabc7aa9f244f82e682b87713b344d780c23", - "sha256": "1szkx3n9gk6799rxv0jb3096pn2ssz82536x9a98xqwbimy4kvn6" + "commit": "51fcac59c724fdf58f478db62dbf6f157621d598", + "sha256": "1b9b5vii1xi93wdm7scc08h2wsak2axb53s32sa8dn80ss2paspw" }, "stable": { "version": [ @@ -75625,8 +75919,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20210407, - 57 + 20210421, + 2203 ], "deps": [ "alert", @@ -75634,8 +75928,8 @@ "request", "request-deferred" ], - "commit": "161465b9448a6413466f1dfe77844f5591fbdeae", - "sha256": "0pwi537cg1yb76bwx2sn1w8vkjgsjq38f7lbqvd159g9rbng7v21" + "commit": "4c2616a4f85adc77b91aa054bb10e76b06f706d5", + "sha256": "0isw9inxbdrf5rwqhjasbbz8av9sn56nwz7xxksr69nk5mv7zm17" }, "stable": { "version": [ @@ -75752,8 +76046,8 @@ "org-agenda-property", "org-edna" ], - "commit": "8d7acda24a00ef94fd14a4e2ebe2606009eb46e9", - "sha256": "1h9gfy2assjl2l9dfyp40ypkdm541cisx84vnapjnr6i1bxsvdck" + "commit": "034edc545335ecc0da20b4f1bb4aa9f048454afe", + "sha256": "0yhnrz7kcq81842sv7zf58fqc6wiy4ckcjyqy8m6bn2z6rwpj655" }, "stable": { "version": [ @@ -75792,15 +76086,15 @@ "stable": { "version": [ 1, - 5, - 7 + 6, + 0 ], "deps": [ "dash", "org" ], - "commit": "0877bd57f95ad96a342505a6ecef0c15977f6bd6", - "sha256": "02q343sznbw1ma9zcxnpa7sy37s85ph9phpg479pfz5c51kji09h" + "commit": "2cb87624238281b438cda67ed375c56403524489", + "sha256": "1xmbrrp1zyvij18v3rqmini6w9i6v7dl4fp103ph6wznav8x0jbl" } }, { @@ -75850,15 +76144,15 @@ "version": [ 7, 1, - 6 + 7 ], "deps": [ "dash", "org", "s" ], - "commit": "47dda7d3dce11e8ab9a3847f8c6a1cbb8345f861", - "sha256": "1s1y0xlin1yx716awzbq6lvzz5c3c5i9qvacgm006bypg8qlmz1a" + "commit": "47805bb8dc681872f3ad5dc74711938978d5c7f2", + "sha256": "0iiw798clq6hmml6fs60wwd38c4rzvxrdv4xr57innj06cja4dvy" } }, { @@ -75875,8 +76169,8 @@ "deps": [ "org" ], - "commit": "f9a3321712626d2f43a8849203ceb089cf8233b1", - "sha256": "195bzlfqf91f7prv4xh1x1p5xnyygr0mzwqxbsw2apc0haaz6ajk" + "commit": "b2dfbf41efac55edacde8a8a6bd0275418de6454", + "sha256": "1gs62qjllsz23qbs9zq767c8xxvxwknl1x6r4ixx9090j7bsrhpd" }, "stable": { "version": [ @@ -75918,16 +76212,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20210330, - 246 + 20210508, + 308 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "c8b2e592150c05ab53af8ee155ac169f58b963ee", - "sha256": "1rid2dl3r7p4c0sag9xcd74rj15pxapvrii286ilipkak6yhg2z2" + "commit": "e7a330ce3146e19efa9d92fbba32b89ada034e61", + "sha256": "1hg98gc90dcfad7mdz636dj7vlb2lg9p4nd06591slivrvzpypha" }, "stable": { "version": [ @@ -76149,14 +76443,14 @@ "repo": "dfeich/org-listcruncher", "unstable": { "version": [ - 20210304, - 1602 + 20210503, + 802 ], "deps": [ "seq" ], - "commit": "b0269843f317b6715dbde8a4e955aac9c38cbdb6", - "sha256": "1ywwngjqfvppxbb0dghqzr0kg9dxyqidjgjrh4ncc0zc9iamcx2w" + "commit": "50c06445a837c6677da035f72dbe0f973d9e10a7", + "sha256": "1nw5wd781a5nh5csvsr6ycjpji66k8vkvw8z1sfa0p8xsbln9rk9" } }, { @@ -76264,15 +76558,15 @@ "version": [ 5, 6, - 1 + 2 ], "deps": [ "dash", "org", "s" ], - "commit": "4fe1f194a8eba00858b78d611ad8a7f14392722d", - "sha256": "1p1k5zmc0dklbvnck0zhsxqmndask822ikaa40d1ik105w1vx3bz" + "commit": "5aeed6d0f7f878b20483975200df43b6fc7f32f9", + "sha256": "102lrlf25i30xbpszr1mh6mkxd6wwgbwg32dafccxm4dmj3v9hqq" } }, { @@ -76325,14 +76619,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20210409, - 1813 + 20210511, + 1629 ], "deps": [ "htmlize" ], - "commit": "e57af9c057d97d14536cef08aca7a19bdf194830", - "sha256": "19m1y686jppl1j7ibigw1h6n518swgdcfgrk84r1nvd7x83vd8v0" + "commit": "2bfdbff95ebe4470d877bd253017129509dc2b02", + "sha256": "1ig7fvz6lf5gsjmx8llpx7dc0bwxijhp5dgy8mxcr1i90yvrjfh0" } }, { @@ -77022,32 +77316,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20210405, - 1309 + 20210507, + 1615 ], "deps": [ "htmlize", "org" ], - "commit": "4d8a63cba537705f4ecf3f45838e3cfc83fa2369", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503; retrying in 327 ms\nwarning: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503; retrying in 591 ms\nwarning: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503; retrying in 1200 ms\nwarning: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503; retrying in 2118 ms\nerror: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503\n" - ] + "commit": "4538c06fab9a7259aa1fb40e93a43dcfacef27c1", + "sha256": "1w6zvgfcyjqlxy4s13h7w66vv0fcid57s6vigzgnzi666w86fdyh" }, "stable": { "version": [ 3, - 7, + 9, 0 ], "deps": [ "htmlize", "org" ], - "commit": "d404eb13d9e34354c081870ebdd69711937682b3", - "sha256": "1vzn0l8ig4rzh5h8j7kxn8kslqrij97qqv98fbnlwmrw4z87v8dr" + "commit": "4538c06fab9a7259aa1fb40e93a43dcfacef27c1", + "sha256": "1w6zvgfcyjqlxy4s13h7w66vv0fcid57s6vigzgnzi666w86fdyh" } }, { @@ -77158,8 +77448,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20210324, - 1337 + 20210510, + 1614 ], "deps": [ "bibtex-completion", @@ -77174,8 +77464,8 @@ "pdf-tools", "s" ], - "commit": "3ca9beb744621f007d932deb8a4197467012c23a", - "sha256": "1n262rsmil2n7dilf711gs8rciv8gd7wf3vadb0zcbkbn703jbk9" + "commit": "8aa2bb45268f660956151547533689d4ec30378d", + "sha256": "0ihjjmysldxx8n3q7mi06p5ydxknxy347c9lf3gnlgzcc776a49v" }, "stable": { "version": [ @@ -77301,8 +77591,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20210411, - 650 + 20210512, + 706 ], "deps": [ "dash", @@ -77312,14 +77602,14 @@ "org", "s" ], - "commit": "997ddcbf4b0373bb449d09f1db6cf5de6983de5e", - "sha256": "0dh325syjn1dkblydbdxqqy24pbyk4h3rcmr8506lycyz1xg2m2k" + "commit": "f754160402ccc12b6e0e8bc6b607d7deef5c5b60", + "sha256": "00c1wfgxzpdh3rd0drk1s8y1j41yjr1gkch8d1w9x8p1df4hn3hi" }, "stable": { "version": [ 1, 2, - 3 + 4 ], "deps": [ "dash", @@ -77329,8 +77619,8 @@ "org", "s" ], - "commit": "cc01cf346e2d832f78694320947e0788c92f49b9", - "sha256": "0n8c0yxqb62i39kn0d5x83s96vwc0nbg0sx5hplffnbkfbj88bba" + "commit": "9065f6a999b98d4b495e3d8fa1fa4424eddd25a8", + "sha256": "10jrnjq65lpg1x8d7lqc537yai9m6pdnfbzwr87fcyv6f8yii8xn" } }, { @@ -77341,29 +77631,31 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20210330, - 852 + 20210507, + 2051 ], "deps": [ "bibtex-completion", "org-ref", "org-roam" ], - "commit": "8d80bf980776df6ead53e917eb482ec8e309a1d7", - "sha256": "1rricy4kxny78cvryrfxcjb656ryq3rgx4na5d5kks8xhdjsckwf" + "commit": "80a86980801ff233d7c12ae9efef589ffa53df67", + "sha256": "0sm4l32xscpq9hmilj0srqh7vij5x3602h1f0yh9wmckz9jq4f4w" }, "stable": { "version": [ 0, - 5, - 0 + 6, + 0, + -1 ], "deps": [ "bibtex-completion", + "org-ref", "org-roam" ], - "commit": "81b6fedf99996a78199067e61935964dea9389ee", - "sha256": "1xb7nskz73dfa2rgwmf4s3iq10f43zagggia3ddhx109wmy2m9a9" + "commit": "03b3a843fdbba428b29faa932661bc74fd66e29b", + "sha256": "17ds31cdq4prlknbjhhcjz17sim26yx8iws1scg4xcffxnb1s39r" } }, { @@ -77432,8 +77724,8 @@ "repo": "tyler-dodge/org-runbook", "unstable": { "version": [ - 20210102, - 1627 + 20210502, + 1732 ], "deps": [ "dash", @@ -77444,8 +77736,8 @@ "s", "seq" ], - "commit": "a05dcf6b9674406a9d616b53b4f199a3f87b3f2a", - "sha256": "0bj91c8zz804zclhl5ay8k2sjw9pi9mrkrjcmcs2h36klcb1x4qn" + "commit": "3206b4ea40614ba87a1b12f66ad0f84354bcdafb", + "sha256": "0b2gs6hm8k25539m7hxbhh5jza37mdfv3z763r130fxj3b646v01" }, "stable": { "version": [ @@ -77639,7 +77931,7 @@ "version": [ 3, 0, - 0 + 2 ], "deps": [ "dash", @@ -77647,8 +77939,8 @@ "org-ml", "s" ], - "commit": "1cc854e814f86bc35f536563837a97a832a06122", - "sha256": "1wp3d3b1wdw8v5drwbrfxrbq8psf82bs9cwjin2psfgb4n1166dy" + "commit": "40c8870b2ab93dde33994f46c0531b3978e25fde", + "sha256": "05c1hgzq69lnw59x1w5bybrdhnyli8d9pzjczixklrrahmx4ig8k" } }, { @@ -78325,11 +78617,11 @@ "repo": "cadadr/elisp", "unstable": { "version": [ - 20200919, - 1348 + 20210414, + 1844 ], - "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f", - "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q" + "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984", + "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b" } }, { @@ -78508,8 +78800,8 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20200817, - 1842 + 20210422, + 339 ], "deps": [ "htmlize", @@ -78517,14 +78809,14 @@ "metaweblog", "xml-rpc" ], - "commit": "c7f72a87952ed16323fce968462af897235f1719", - "sha256": "0v8zkzai5gfzng9dpkikwf60rvsr1148y5nb7hw65961xms855s4" + "commit": "c1b386f3522054f063f4ac60730397ed1f724478", + "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q" }, "stable": { "version": [ 1, 1, - 10 + 11 ], "deps": [ "htmlize", @@ -78532,8 +78824,8 @@ "metaweblog", "xml-rpc" ], - "commit": "19aa8a17428d6ee42f54e464c26eeab17a6478ab", - "sha256": "198ahgxji0kh6ynygrrdvllj9fwcqrnma4sd8msj2aq18xij9glr" + "commit": "c1b386f3522054f063f4ac60730397ed1f724478", + "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q" } }, { @@ -78757,15 +79049,15 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20210309, - 1906 + 20210512, + 1945 ], "deps": [ "magit", "org" ], - "commit": "609fd0ccfb5268704b5bc7d7ac1014d4960b9707", - "sha256": "00rmp5pbn7bn4mrfzlkh9dc5m80qw72bs5jxdss9sk38v1gvxbr3" + "commit": "043db4f0957416652f872ca18289ef00b9474963", + "sha256": "1rybcybb4xb6wsfhh772mapggabn14i7ca2fl30qkzyc5qmhc3s9" }, "stable": { "version": [ @@ -78789,8 +79081,8 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20200621, - 2144 + 20210426, + 2145 ], "deps": [ "forge", @@ -78798,8 +79090,8 @@ "org", "orgit" ], - "commit": "051d92661ef12b67ffadb231324806d87d1e6a54", - "sha256": "0x8wmqp9x2c7qv0ipj2rvjf7bc7z0pn8s253gjxpxmakz3l8wnyk" + "commit": "f7c1a83efbebad3c533259a3256c85012e2d13f4", + "sha256": "0xc070ykg5dnq1di4912ckhyw70c68lw43b2s06b5cg20ka79i6h" }, "stable": { "version": [ @@ -78899,8 +79191,8 @@ 20201129, 604 ], - "commit": "5c065aa584d18257a58cd7c5439df5ce23d989c3", - "sha256": "1pmkkihnrch7z705mc94dmr8bxb4mgg7c5iirmrar4hhg84l13q2" + "commit": "5aec071702c21dcc777e75b575d3875141688e46", + "sha256": "13405irnpwb1fgwv5d9mwywpbvb6d7smmi7nsd140l0i0m7anx1c" }, "stable": { "version": [ @@ -79051,6 +79343,29 @@ "sha256": "1w5xia4f539agf62mlhj8c6hh2zadmncr1dby6m6j2qm3ndqfyvk" } }, + { + "ename": "orthodox-christian-new-calendar-holidays", + "commit": "cd5dfee78c2afb49e59e65b62f2cbe584f3b8e7c", + "sha256": "05k9yj8695m86vwacsrr0cddcyh9jhdpnv6hiv43g6shniq2458n", + "fetcher": "github", + "repo": "cmchittom/orthodox-christian-new-calendar-holidays", + "unstable": { + "version": [ + 20210507, + 1619 + ], + "commit": "71216d56575da602ec713bf1bbe75c92606c1049", + "sha256": "1qfgfkww6v0glpnqdx3a6qixr63vbcvkby7ccw8qzpyb9bpar9g2" + }, + "stable": { + "version": [ + 1, + 3 + ], + "commit": "bcb858f607b0d833e1581e0630446ecc576eefd6", + "sha256": "1b6ms822j075fciijpwywzn675hbqqbaylz5iy3czlwypjg1slhh" + } + }, { "ename": "osa", "commit": "df18def95ae792387da2e21f1050cfc25af772fb", @@ -79276,19 +79591,20 @@ "repo": "emacsorphanage/osx-trash", "unstable": { "version": [ - 20160520, - 1300 + 20210419, + 2229 ], - "commit": "0f1dc052d0a750b8c75f14530a4897f5d4324b4e", - "sha256": "0f4md49175iyrgzv4pijf7qbxyddcm2yscrrlh91pg410la7fysk" + "commit": "af74a2055a15bf4182d8196600f7decd66eec634", + "sha256": "09960kif9gnfmic4iyv9d28577j6zsiji9fdrxcnhh6586hz70ri" }, "stable": { "version": [ 0, - 2 + 2, + 1 ], - "commit": "529619b84d21e18a38ec5255eb40f6b8ede38b2a", - "sha256": "1n44wdffkw14si9kb7bpkp6d9cjwjrvksfh22y9549dhs1vav6qq" + "commit": "af74a2055a15bf4182d8196600f7decd66eec634", + "sha256": "09960kif9gnfmic4iyv9d28577j6zsiji9fdrxcnhh6586hz70ri" } }, { @@ -79633,8 +79949,8 @@ "deps": [ "org" ], - "commit": "e931362e641f97d17dc738d22bb461e54045786d", - "sha256": "045kci7xvlp0kg8gmplnybc7ydv66hkl88dxgd113ac7ipf9zir7" + "commit": "efb74df1179702e19ce531f84993ac5b5039075f", + "sha256": "0sxwbqk6sm8qfpbcxhclin21k6xx5286df57rr0m72xrqqpdsw1p" } }, { @@ -79829,8 +80145,8 @@ "deps": [ "org" ], - "commit": "7a93b0f4b3e8e240d9451f1fa5704acfc494e9aa", - "sha256": "0dvhc559r9jhc8d91mv5an3vfklrfyfrpr32dqvphgk1i85kqvw4" + "commit": "be7fbd9f164d8937b2628719e21e8e6b4827e638", + "sha256": "1p074q7w3j1n98zzsmq2xb9kwbm7bb4lg8yss4q3rv9rkrrz7dk9" }, "stable": { "version": [ @@ -80157,22 +80473,25 @@ "repo": "DarkBuffalo/ox-report", "unstable": { "version": [ - 20210219, - 2023 + 20210430, + 1212 ], "deps": [ "org-msg" ], - "commit": "7e135fb51f252ab1ec5a31e05a1c7e638b656b85", - "sha256": "1lg00p7nr3y5wjm7r53c93gx0ycqjgsrj4w5jxw6fzrdacqdnsz9" + "commit": "1e730396b8b7aa5101b3e3f538d6d4c15514f415", + "sha256": "1firb26xnci1qprb4v4p3cp9vnmmp5bvsm3154gy0n2jr0hzvbjj" }, "stable": { "version": [ 0, - 2 + 4 ], - "commit": "ebd57eda69466735d7fc8f52831490176e1f144b", - "sha256": "1xhyvc1v5hdgki2sbdpajhhq8ydgym5q1cywcaxwbbmpjxi5sd64" + "deps": [ + "org-msg" + ], + "commit": "1e730396b8b7aa5101b3e3f538d6d4c15514f415", + "sha256": "1firb26xnci1qprb4v4p3cp9vnmmp5bvsm3154gy0n2jr0hzvbjj" } }, { @@ -80617,14 +80936,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20210318, - 1411 + 20210421, + 1333 ], "deps": [ "cl-lib" ], - "commit": "0f13dd6655f6d4ff71b77c6d2c93727e5f43b254", - "sha256": "0l4qwz2s63r26y5v02yrpncjdiyspw7pill0bjjlcawvxffykw9i" + "commit": "b4eec13201093070a12f37396afce83eb6771df5", + "sha256": "1kr9iwsrpxbalhjz91pqplwkb44msdl2qv4rwsbapz8z8hs4xzji" }, "stable": { "version": [ @@ -80661,27 +80980,27 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20210326, - 241 + 20210511, + 2055 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "16e589114cc1f2514d95a58d53e1ae7c2ce941b4", - "sha256": "03bcnxd39r9k63zwb6gnqrhs0q629izakj2hmhk83hiy1131v7jl" + "commit": "f910d9912997230e3a34429265ee95b7c0dbec8e", + "sha256": "0sd016in8sg5nazly0mr379j9y59b8mffsa2lpzkwqbj379rnzgl" }, "stable": { "version": [ 0, - 13 + 15 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "9e28a5cd08e94db0ba4fb8847fa970c98316facc", - "sha256": "03pim9ijqmjqyv0qlkap5jw47iv9qsw1d7s2p9vrqjnpf4jxcq70" + "commit": "cfe5aa2c8eeb2f6df38cf97a2315ac8f8ae41696", + "sha256": "1cn713g90zyjfq225yvg14c1qshslpi4466m3w102l5g57p8xv44" } }, { @@ -80698,19 +81017,19 @@ "deps": [ "package-lint" ], - "commit": "16e589114cc1f2514d95a58d53e1ae7c2ce941b4", - "sha256": "03bcnxd39r9k63zwb6gnqrhs0q629izakj2hmhk83hiy1131v7jl" + "commit": "f910d9912997230e3a34429265ee95b7c0dbec8e", + "sha256": "0sd016in8sg5nazly0mr379j9y59b8mffsa2lpzkwqbj379rnzgl" }, "stable": { "version": [ 0, - 13 + 15 ], "deps": [ "package-lint" ], - "commit": "9e28a5cd08e94db0ba4fb8847fa970c98316facc", - "sha256": "03pim9ijqmjqyv0qlkap5jw47iv9qsw1d7s2p9vrqjnpf4jxcq70" + "commit": "cfe5aa2c8eeb2f6df38cf97a2315ac8f8ae41696", + "sha256": "1cn713g90zyjfq225yvg14c1qshslpi4466m3w102l5g57p8xv44" } }, { @@ -80781,20 +81100,20 @@ "repo": "emacscollective/packed", "unstable": { "version": [ - 20201120, - 2047 + 20210503, + 2046 ], - "commit": "47437da7839394b079699eb4cfcc00627ab2df8e", - "sha256": "0hp80n3mxnkssq431h9b9xlz21dqkyzjsajylrnbfvqqwqh293qk" + "commit": "ed63b4803899c3719aeeba461e249c473e5b26f0", + "sha256": "06blk8parnpq3qi6y5628q3v59c8dyi41glb289a0l16248qwphk" }, "stable": { "version": [ 3, 0, - 2 + 3 ], - "commit": "3b96dedb404f614479c1b321fac3e4bf11ba0782", - "sha256": "0fbv8ryxjz1ndfv4ximmr5m1rd9xkmi8dp0x14r8g5wiy9959asb" + "commit": "ed63b4803899c3719aeeba461e249c473e5b26f0", + "sha256": "06blk8parnpq3qi6y5628q3v59c8dyi41glb289a0l16248qwphk" } }, { @@ -81128,8 +81447,8 @@ 20200510, 5 ], - "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f", - "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q" + "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984", + "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b" } }, { @@ -81248,14 +81567,14 @@ "repo": "purcell/paredit-everywhere", "unstable": { "version": [ - 20180506, - 849 + 20210510, + 531 ], "deps": [ "paredit" ], - "commit": "f04c522e6b088a11255a95cb1e6a08198b4d6537", - "sha256": "1jp6wk4zkfcma4akchbdh8wg5fi0i74m4cgnqnmvbyzwkbj6sf0q" + "commit": "b81e5d5356c85001a71640941b469aea9cf2e309", + "sha256": "0qnm020npchrazj6na79ccwjhr7j1gm7n0yksqxzciram1lfggjk" }, "stable": { "version": [ @@ -81357,11 +81676,11 @@ "repo": "justinbarclay/parinfer-rust-mode", "unstable": { "version": [ - 20210325, - 1714 + 20210413, + 2 ], - "commit": "a92e39e86ec24fbc536c68765b4af6f4c6ff24c5", - "sha256": "1l4xvyx4r7ld7d8k18x4khagiivp5a7m647zv7fvg7ivhkq2crqd" + "commit": "c2c1bbec6cc7dad4f546868aa07609b8d58a78f8", + "sha256": "0az4qp118vsqzgsl87wgszzq91qzqkpabifd8qrr2li3sizsn049" }, "stable": { "version": [ @@ -81487,13 +81806,13 @@ "version": [ 0, 1, - 3 + 4 ], "deps": [ "cl-lib" ], - "commit": "8f0c266d8b9b0ee5fcf9b80c518644b2849ff3b3", - "sha256": "1zwdh3dwqvw9z79mxgf9kf1l2c0pb32sknhrs7ppca613nk9c58j" + "commit": "2cbbbc2254aa7bcaa4fb5e07c8c1bf2f381dba26", + "sha256": "1g1s8s45g3kkbi3h7w0pmadmzdswb64mkdvdpg2lihg341kx37gm" } }, { @@ -81644,11 +81963,11 @@ "repo": "vandrlexay/emacs-password-genarator", "unstable": { "version": [ - 20210327, - 1140 + 20210425, + 2227 ], - "commit": "de391a83e6a11f810f0141b7b4758dd978478234", - "sha256": "10yh56jlvnn01swb4pfq2gqpj2shxfp716fzij8c2c0hi52rgnbz" + "commit": "c1da9790d594bc745cdbcc8003153e408aa92a5f", + "sha256": "0nwfdf5ik7d11l2h2fg4pszifv3fncpxjzs933gj91mvjy2wrw98" } }, { @@ -82201,10 +82520,10 @@ }, { "ename": "pdf-tools", - "commit": "8e3d53913f4e8a618e125fa9c1efb3787fbf002d", - "sha256": "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw", + "commit": "10a057a573123c7093159e662fafdc97c2dd4a02", + "sha256": "1x0yd86r3iybpiq7ypln1fy0cl55wznkcgvqszzqjdrnlpqs0abc", "fetcher": "github", - "repo": "politza/pdf-tools", + "repo": "vedang/pdf-tools", "unstable": { "version": [ 20200512, @@ -82618,13 +82937,13 @@ "stable": { "version": [ 2, - 14 + 15 ], "deps": [ "cl-lib" ], - "commit": "2f2b59e693f08b8d9c81062fca25e6076b6e7f8d", - "sha256": "04r5h5zs5r6s22p5ynhpr860r2r552z9pyf4kbabfg1gz9jag7yp" + "commit": "dd2a380ac71edf1321a6462f14668baf99879e80", + "sha256": "0l9i7ky25d9ii04w2brgxc8dk2rky50naba8lbfqi7hcc34z8pp6" } }, { @@ -83065,11 +83384,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20210310, - 1724 + 20210512, + 1731 ], - "commit": "a2bca9be4c34a9dc38393602cb2708df24587838", - "sha256": "1rc67f3jzjhqykcn16s2ibviibxmr7b9y2c20hdwg49r41ax4f9v" + "commit": "fb314f2f77f3238e08cfe36a6c46f6479fe069b9", + "sha256": "0k8izndbjhy6jizx2az37qlci4qv1y10lb7rmzmsci1pq1m3l7gd" }, "stable": { "version": [ @@ -83525,11 +83844,11 @@ "repo": "EricCrosson/pine-script-mode", "unstable": { "version": [ - 20181110, - 151 + 20210420, + 1249 ], - "commit": "f7892d373e30df0b2e8d2191e4ddb2064a92dd3c", - "sha256": "1zxmc2l41h28rl058lrfr8c26hjzqmp37ii8r29mpsm03hsw30fh" + "commit": "72d0cb20cc5c5dff363a08318ac7045f4a5f43e3", + "sha256": "0ry1gd1vgwnr7skalc39baqbffb5vq4bkpy5bnr2sprgj6p4mxvc" }, "stable": { "version": [ @@ -83928,26 +84247,28 @@ "repo": "ZachMassia/PlatformIO-Mode", "unstable": { "version": [ - 20161210, - 1339 + 20210511, + 957 ], "deps": [ + "async", "projectile" ], - "commit": "1466aed132a77f48fcb31938d64abb1a1e58ec42", - "sha256": "1lfkp7df8as9gspynkyhz4dbm95kbngyba1ymg6ql67adyv79v1i" + "commit": "f4fd8932995a8aed80eab14e54232010c2889012", + "sha256": "1m6qmqp124idja9dq8gj8pzajxf40lm1adrnd24hbp26wh9pvc54" }, "stable": { "version": [ 0, - 2, - 2 + 3, + 0 ], "deps": [ + "async", "projectile" ], - "commit": "470a80c1d764a6e1680a2b41ca5a847869a07a27", - "sha256": "1nznbkl06cdq4pyqmvkp9jynsjibn0fd6ai4mggz6ggcwzcixbf0" + "commit": "e7bde6fec31b57ffe1c0a98cd29477d5baea30f3", + "sha256": "0ian50v9vaz7kqzn20bhqadq50h0l3zhjkmniinpz4q9klh7drh9" } }, { @@ -84764,14 +85085,14 @@ "repo": "polymode/poly-rst", "unstable": { "version": [ - 20200316, - 1315 + 20210418, + 1009 ], "deps": [ "polymode" ], - "commit": "8530f56fbdce01bcf4004839ff54e4156282c2b5", - "sha256": "088wzagwxpf2j67wb1i6agqfa944sahh2fm8my2m50spbbd9ymhl" + "commit": "e71f2ae6a00683cdb8006f953e5db0673043e144", + "sha256": "1jhj1hrb998p9n6bjfdnmsinf0rd5wspm9gwsrdb0k6il897h7lf" }, "stable": { "version": [ @@ -84875,11 +85196,11 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20200606, - 1106 + 20210413, + 2004 ], - "commit": "9f4fa7971634f560e83d44b30aefc4d76d261943", - "sha256": "1dp3688kj89r2ywv4zwrji2qv1b0y1cj3dwhzxx1ihb9vx0bjwjn" + "commit": "b50ec54097d279bde6567ee3ba8a22471f466ec0", + "sha256": "0q2vjvz72m3nrnpck4hl059cjgcf2jdw2rl9h8fxyvbllyj0733f" }, "stable": { "version": [ @@ -85000,8 +85321,8 @@ "yafolding", "yasnippet" ], - "commit": "91ca19b2a93029a393f8873e273777b553d308e1", - "sha256": "07sn00k8krsb0bikbbypznvwrk13k4jdk6d66iai0a66s9dr84ys" + "commit": "3c011744e81263dab6a4b20e96ad1d290ef9d320", + "sha256": "15ach67d9n8csbsabm6lhmhli9f397pjpf6vk1rn59bfqrhdakmn" }, "stable": { "version": [ @@ -85178,15 +85499,16 @@ "stable": { "version": [ 0, - 6 + 6, + 1 ], "deps": [ "dash", "flx-ido", "popup" ], - "commit": "c5e2e69adbd3a630e4cb750965a1aee8c10c1f09", - "sha256": "0vn0jli0ya7xnapifkgzynbnh3rpnzb82j5k9bla2j4miqfc6cg8" + "commit": "b00c4d503cbbaf01c136b1647329e6a6257d012c", + "sha256": "0q081lw6zqzpbmscpk1yzyfpalr9ld5qwh962dwwy04rc5f0aq3s" } }, { @@ -85337,11 +85659,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20210410, - 528 + 20210423, + 220 ], - "commit": "ae3c4ddfce698f4e24a0fcab938267e41e74da90", - "sha256": "1agzfliz6vk9zwvl0gm074xwzlywqrhkva9nz3d3581cjfanxqd1" + "commit": "739d8fd1081bdd0d20dee9e437d64df58747b871", + "sha256": "1hapg4dwrpa1ffkx8s3pialkh9zsh3r5jxk076c750k9rdwl3q4m" }, "stable": { "version": [ @@ -85432,14 +85754,14 @@ "repo": "milkypostman/powerline", "unstable": { "version": [ - 20210317, - 110 + 20210428, + 1229 ], "deps": [ "cl-lib" ], - "commit": "cfff1cfe63793ea1a8bcfcae50c296558384cf08", - "sha256": "12s3mp2dyslq1ilah64gpz7a2j0ca9yls7wvj9kcmjca1931s8s3" + "commit": "346de84be53cae3663b4e2512222c279933846d4", + "sha256": "00yy96a1rqcpbkvbn1hmb1pz5i7l0pwb2bqyxcc8qry7rkmvw7gy" }, "stable": { "version": [ @@ -85620,11 +85942,11 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20210411, - 2007 + 20210425, + 1720 ], - "commit": "ed2b762241bbea03e374dc9dcd4fbe207c6b2ea4", - "sha256": "03c0dmblixh5mx8365b6608l7z3vcgp6pzdflwqf8nfwj2c5rm0w" + "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4", + "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n" }, "stable": { "version": [ @@ -86253,14 +86575,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20210407, - 707 + 20210503, + 738 ], "deps": [ "pkg-info" ], - "commit": "513228f473910128efcad13f46dfc22a74976675", - "sha256": "19yblhr88affwmlrfmf3bi7wypf2abgy56xfxgisvwx5d5xi6v25" + "commit": "4126799d94b6a9a4db22976d2dd6625323221359", + "sha256": "1wxv2fv680s89iz9dcxdz36l3mk9icspahh8s4mska7vi607qpzd" }, "stable": { "version": [ @@ -86522,16 +86844,16 @@ "repo": "waymondo/projector.el", "unstable": { "version": [ - 20190703, - 1418 + 20210421, + 1728 ], "deps": [ "alert", "cl-lib", "projectile" ], - "commit": "bad51a81fbcae9aabe47dafc2499ba27cd7308be", - "sha256": "0xiwn58wqm15kvbx0pi2zmh8gc1f06zncxki03bwry4nfpqxr2d0" + "commit": "7bbee0ef70817d52339119d4517dbbcbab930de6", + "sha256": "0zmng37fl8df1d3i66fbkjssv0x0hq74x68p1j01gb8sfayw4dgf" } }, { @@ -86664,11 +86986,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20210408, - 1454 + 20210512, + 556 ], - "commit": "d0acb626eba17023c55b002921870d60e48527a5", - "sha256": "0yn66lxx906nry53dr7msjfha2i85yiq2zw8g25d7y1f3mhjsjpz" + "commit": "632297dd0ab35a42ed6eac163dcaca1e71fcd83b", + "sha256": "0gzggng9iq62qlyzx0v6f586qfqvwibpz7jp7ar8r3wz32h95vjm" }, "stable": { "version": [ @@ -86771,19 +87093,17 @@ 20200619, 1742 ], - "commit": "ee04809540c098718121e092107fbc0abc231725", - "sha256": "053j9j2axr2x7837xcvfgmdl3ddbw2px3fzflbna52fnk9bh2wkc" + "commit": "45e9707871e2e40408fa530dc6d80cf2b1a0d287", + "sha256": "0pgb1ch0l7x84hw0nrd0xyig5ssw7x8bq1aybxrg7lwvqq2jbs9p" }, "stable": { "version": [ - 4, - 0, - 0, - -1, - 2 + 3, + 17, + 0 ], - "commit": "6c61c1e63b9be3c36db6bed19032dfc0d63aadda", - "sha256": "1910pnpy0mfzqga4mv52ybjfbxrbdflgb6nsh2vbpbpsv4jl58dq" + "commit": "652d99a8ee8aa6b801e11977951fbf444cfccc8f", + "sha256": "18w8v2djl5fjhivc09w6ilc5npgacdxqn962q6vl5awc50crkgs3" } }, { @@ -87184,11 +87504,11 @@ "url": "https://depp.brause.cc/punpun-theme.git", "unstable": { "version": [ - 20200506, - 1241 + 20210508, + 1635 ], - "commit": "57c2c87b72336e5dee2165c6b0010022f6e7e51d", - "sha256": "03agwvk14rzxglmw5y43v3sy5hhpr5w6iimpf623hxwzfgl3f6xl" + "commit": "7026684cd568cb691af3ced5de14c375fe6f5a1a", + "sha256": "1nwvlp93l5lj259mchd1a2glq3jxd0h1vazsbjqfi07hsg86xjp0" } }, { @@ -87627,15 +87947,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20210319, - 1102 + 20210512, + 616 ], "deps": [ "async", "xr" ], - "commit": "f48c3edee78ba5f020bcb42830db99a14761f176", - "sha256": "1ld3bqvfrda6fa4dv3g0wilznrdrsv544sr370sn3a9xlmy4fwp9" + "commit": "e6ff7bcdb028453886175ccc79398f34c98168c5", + "sha256": "1pkccislfbb47g8ypylgal7g7sncy97wy37nrjq6xl30i8gfba8n" }, "stable": { "version": [ @@ -87675,21 +87995,39 @@ } }, { - "ename": "pyim-cangjie5dict", - "commit": "abad9b91bcf2dd29255a98ddcfd4b17d8847ecd5", - "sha256": "13sbbiqqpdplm36pa3zyqakbvlkvh7wvm7pmn0li6hnm56dwydg8", + "ename": "pyim-cangjiedict", + "commit": "a82ac773bb9bc36727314d1eb5a75610ec9ca694", + "sha256": "0ma99y1ijpdqrmypmj108ny7bfj9ylryav7hj7dnp9gj4b1bhxhh", "fetcher": "github", - "repo": "p1uxtar/pyim-cangjie5dict", + "repo": "p1uxtar/pyim-cangjiedict", "unstable": { "version": [ - 20170730, - 246 + 20210507, + 928 ], "deps": [ "pyim" ], - "commit": "c8618590780b818db1a67a29bc47c5d25903517a", - "sha256": "0p49h2kn8wy3b51zahzyc1cy24h3b44cg5yjpmv4w23dhsr4zlz8" + "commit": "455e20e90044a1fcd6c4b45252745fa233e0107d", + "sha256": "0dv5l8cpccvc7jsc4qdijnz76dp2rznmcnkkn3w75xw46ai8chnk" + } + }, + { + "ename": "pyim-smzmdict", + "commit": "8bad2e8162f5a44bdbe1117efa31133ae7814489", + "sha256": "104kxd8d2b7rch0pfsdz5w98rskx1sl6fx0lqspcilir9k9my1cc", + "fetcher": "github", + "repo": "p1uxtar/pyim-smzmdict", + "unstable": { + "version": [ + 20210505, + 1445 + ], + "deps": [ + "pyim" + ], + "commit": "fcddbde17a04d174c7353548056524687f7be8d2", + "sha256": "1mi4a8sizlplys93lac34d3fv8338lbk3hfg3n45vp14wvfvpjnq" } }, { @@ -87700,14 +88038,14 @@ "repo": "tumashu/pyim-wbdict", "unstable": { "version": [ - 20210111, - 923 + 20210504, + 1144 ], "deps": [ "pyim" ], - "commit": "62a1bd8b6070463e872137cf8eba50122b180e2c", - "sha256": "03zh5sdqc32q8an8k59csc95sczcs38ganxrg3lp2i2vn5ykza7h" + "commit": "da51e226bca9be2ed6175298489be64e45492759", + "sha256": "0nl1yi3zf4pp7cksprmigm119dcp1d2477k4jdm10z7zfcq2p6r0" }, "stable": { "version": [ @@ -87779,8 +88117,17 @@ 20210411, 1931 ], - "commit": "38d15c98316359c7b0b190f2245a3b2e2bf62109", - "sha256": "1iipx981kz25iznb2p90a3cag71abw6np96r0mf99g44z8ghaapd" + "commit": "318f1afa9384742c3dd42daa4deb7d22c0b662e0", + "sha256": "164zxkjwf7m4ghm9d81z5j59h24jzsah4xpfbnk6b6jipzzdx836" + }, + "stable": { + "version": [ + 2, + 8, + 2 + ], + "commit": "091cb92314dc701f10390136da78fbbb362e892e", + "sha256": "13qiv3v8yc2b7sfvizlnx6xcam7yjicdkfjw00q50s5xqmali22p" } }, { @@ -87826,15 +88173,15 @@ "repo": "dakra/pyramid.el", "unstable": { "version": [ - 20181212, - 1204 + 20210427, + 1032 ], "deps": [ "pythonic", "tablist" ], - "commit": "f0687b8aee3e685b55e2c66b16211e02ac5f9d94", - "sha256": "18kqqdk7yifcjmn11jgsqxvzr6izcgify1d8gm504sxw2qqc3q0i" + "commit": "66f54f4a9cc9fa81edf768ab433d5b3c5517363c", + "sha256": "0sijy6nk46yw21j49x5n93za2zjzqqrfmjm7dz3z3gj7jknk27i9" }, "stable": { "version": [ @@ -87899,28 +88246,28 @@ "repo": "wbolster/emacs-python-black", "unstable": { "version": [ - 20200324, - 930 + 20210511, + 1545 ], "deps": [ "dash", "reformatter" ], - "commit": "a11ca73f6dfcdc125d27ff184496d66bdbd71326", - "sha256": "1jv2fwlf7q8l5npqcpr05xzqmfqlx6xmjn0zphh9rx6dd2dpdma9" + "commit": "6b6ab71d2762b6da703f8d1d3d964b712a98939e", + "sha256": "1cmzc0fa3jj7ajxbqhbsc8jx47k6g223sfd42c4lrqdnmh95760m" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "dash", "reformatter" ], - "commit": "706d317f0874d7c5b5a3d844698bcfb8b1fe253e", - "sha256": "0fjnd85nlkck156dj6cahk8chhgkbgl2kwywqzi8bl4yj700m4dk" + "commit": "6b6ab71d2762b6da703f8d1d3d964b712a98939e", + "sha256": "1cmzc0fa3jj7ajxbqhbsc8jx47k6g223sfd42c4lrqdnmh95760m" } }, { @@ -88013,6 +88360,14 @@ "sha256": "0zk6014dzfrb3y3nhs890x082xf044w0a8nmy6rlrj375lvhfn99" } }, + { + "ename": "python-isort", + "commit": "8b359787b5f0113793714fd9710fde831e7afee3", + "sha256": "0svkcb68r3x1ajhrhhlnj71v33qp3pliv3if1mww19x970r69lmy", + "error": "Not in archive", + "fetcher": "github", + "repo": "wyuenho/emacs-python-isort" + }, { "ename": "python-mode", "commit": "82861e1ab114451af5e1106d53195afd3605448a", @@ -88025,20 +88380,16 @@ 800 ], "commit": "710ffadeb43136d400de0a4c9e4a94c8b7ff36f0", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503; retrying in 326 ms\nwarning: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503; retrying in 558 ms\nwarning: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503; retrying in 1272 ms\nwarning: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503; retrying in 2702 ms\nerror: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503\n" - ] + "sha256": "1vym8nlpwv9ym7yixldjxp999b26a9pr4z0pka28fldxykfccwq0" }, "stable": { "version": [ 6, - 2, - 3 + 3, + 0 ], - "commit": "a0a534639bc6142c2c2f44bd7ca5878ad5f79518", - "sha256": "0sj2hfjwpcdg9djsgl3y5aa3gnvl4s87477x6a9d14m11db3p7ml" + "commit": "906b0a107f7bcfe6e32bcfedb977e6f0f99fda59", + "sha256": "1vym8nlpwv9ym7yixldjxp999b26a9pr4z0pka28fldxykfccwq0" } }, { @@ -88371,8 +88722,8 @@ "leaf", "quelpa" ], - "commit": "eacc544b93f6fdc3be69a6ffbf960380a63fc715", - "sha256": "0ka2qk1y7byrq4rbmyhr06kfgc76afpmpdcxk3nf4g3krgi778dw" + "commit": "cc13df4a6c6cdf1dea558be5b6e99b6e8d8b4065", + "sha256": "0jiwdz1psfkha17by281ii0adjschld0hwl439bawgvzpw1a0zi2" }, "stable": { "version": [ @@ -88669,15 +89020,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20210328, - 2038 + 20210510, + 1517 ], "deps": [ "faceup", "pos-tip" ], - "commit": "045a871d61e930c2eea8647822df39b8319018e1", - "sha256": "0lpy4nmn21jzmf54avkl9yr8j6w62aqmi5yhmssfhq3x0l5srsjq" + "commit": "fc7e8144f117ae0c1e61904e3ee6401853c83deb", + "sha256": "142q7cv9j3vqlrpgrmlqpn1sq5f3k63i0my1hbgri8r6m4gh9nyd" } }, { @@ -88742,11 +89093,11 @@ "repo": "istib/rainbow-blocks", "unstable": { "version": [ - 20171025, - 1438 + 20210412, + 1937 ], - "commit": "dd435d7bb34ff6f162a5f315df308b90b7e9f842", - "sha256": "06yfb3i7wzvqrhkb61zib9xvpb5i00s4frizkzff66im05k0n795" + "commit": "ae5c11cd3dc64039c5e65c9f1804aceba5b3b209", + "sha256": "17ar9k2352h6cnvcknq945lna3illln87r1vf4ll1aa798azizpb" }, "stable": { "version": [ @@ -88866,26 +89217,26 @@ "repo": "Raku/raku-mode", "unstable": { "version": [ - 20200902, - 2139 + 20210412, + 2342 ], "deps": [ "pkg-info" ], - "commit": "8a6e17f1749c084251d19c3d58b9c1495891db6d", - "sha256": "1nxv5x9ywm9zzzl69ssvvxf0lphjqjfazf5qcd3qpv4w5rqa1s3b" + "commit": "7496ad3a03bed613c259405ec8839ae02950fdb1", + "sha256": "002pkw4wx6l64c1apg6n1psq4ckp9129yj3xqkjp68ji5nz2l3bw" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "pkg-info" ], - "commit": "e0639c89a3a29e9196e298951da6c3a79fb944e8", - "sha256": "02zn1sm86srwdzdkhw53ll0h41a9hwh6c8lan72530zysjrm4x1i" + "commit": "7496ad3a03bed613c259405ec8839ae02950fdb1", + "sha256": "002pkw4wx6l64c1apg6n1psq4ckp9129yj3xqkjp68ji5nz2l3bw" } }, { @@ -89045,6 +89396,30 @@ "sha256": "09c6v4lnv6vm2cckbdpx2fdi9xkz9l68qvhx35vaawxhrkgvypzp" } }, + { + "ename": "rbs-mode", + "commit": "c8bd3d8bf771c4d5d45cf1e00a08d54941924357", + "sha256": "0cdd7sypbpgr9j5ydj17pqgdb2rfm2563rwyvi0p2k2xd305bcgb", + "fetcher": "github", + "repo": "ybiquitous/rbs-mode", + "unstable": { + "version": [ + 20210430, + 135 + ], + "commit": "fd766a943d5f1f0624e10ffce096b9aaba14a5f4", + "sha256": "1gl5wqdyaqvdv0557idycfzgr5gvzvlv11jwccq43v6dmvydam15" + }, + "stable": { + "version": [ + 0, + 3, + 1 + ], + "commit": "ad36bb138cec7396f029821d0cf755a8bc663260", + "sha256": "143wz47446dahp5zx9vvhjrqjadzgz4apzlvwhdbs7dgs8bgs7r7" + } + }, { "ename": "rbt", "commit": "ca7241985be1e8a26a454b8136a537040b7ae801", @@ -89183,14 +89558,14 @@ "repo": "aaron-em/rcirc-styles.el", "unstable": { "version": [ - 20160207, - 250 + 20210414, + 1712 ], "deps": [ "cl-lib" ], - "commit": "f313bf6a7470bed314b27c7a40558cb787d7bc67", - "sha256": "1kwn33rxaqik5jls66c2indvswhwmxdmd60n7a1h9siqm5qhy9d6" + "commit": "dd06ec5fa455131788bbc885fcfaaec16b08f13b", + "sha256": "116qvavvw72vkahknb7g7w7knaximw3m1pq6hic7h13xj8xqxz2w" }, "stable": { "version": [ @@ -89266,14 +89641,14 @@ "repo": "johnmastro/react-snippets.el", "unstable": { "version": [ - 20181002, - 1046 + 20210430, + 1510 ], "deps": [ "yasnippet" ], - "commit": "87ccb640d265fe799583ab55605b84d113223694", - "sha256": "0zs78mn37ngy86blmp2xfy7jr5p0s6r0qq6z3z924amrhy5bwdqc" + "commit": "9d0a1bb90ac36c689cded48b661e81d4544fd719", + "sha256": "15vnybyvz18scladfqy1qj6vrwx1ac38ra8ymdg938aayvl57354" }, "stable": { "version": [ @@ -89348,16 +89723,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20210411, - 1241 + 20210508, + 2227 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "a854b8d4344e4606e77c7e73cc414991e53253d5", - "sha256": "0f5av8ldmh54cmqzniifl853mz9mdg6wn3i0wbm7v1m6d79nli88" + "commit": "34557f8d8fc6af8d3763380942cc07193335c73b", + "sha256": "0m7v523s518hf7dx31ayjfa60gkf4pyncqvca7b2sm1z5qmjzqqj" }, "stable": { "version": [ @@ -89440,15 +89815,15 @@ "repo": "realgud/realgud-lldb", "unstable": { "version": [ - 20190912, - 1335 + 20210417, + 1434 ], "deps": [ "load-relative", "realgud" ], - "commit": "47cb0178fdde50a9d9151ab45806b41007cd758a", - "sha256": "11vaiq7c4iaypsgs4x4sdfycjailba36qh0pwgdprmiyf8swy8hq" + "commit": "abffd0d2d23f6c87be5dc5d36e948af92de5df86", + "sha256": "1zjrjgs9vjaqsf5h9sxw1pf2f9sfngx1gxp37lb8myan52qmhlz1" }, "stable": { "version": [ @@ -89744,11 +90119,11 @@ "repo": "ncaq/recentf-remove-sudo-tramp-prefix", "unstable": { "version": [ - 20180205, - 556 + 20210509, + 43 ], - "commit": "84bbac534cb114d8d11b86790435b65d36e99e68", - "sha256": "0lnnh28qax4qk9n9sng7sgb0w0mnjc8abnch3bd0ba9g5x28z8bx" + "commit": "c462344739867f35d39c8794c358b4c4b5af7dcc", + "sha256": "1bpf9bqnhwb6gcr6gxi2fgr03fdh0s7k0k3pgy543dpafhlzm2ac" } }, { @@ -89807,15 +90182,11 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20210404, - 716 + 20210418, + 925 ], - "commit": "802c85b02d99bce4cf540ed4b716eaa39df45c4a", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503; retrying in 301 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503; retrying in 505 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503; retrying in 1324 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503; retrying in 2228 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503\n" - ] + "commit": "ef800da3ff3112baa71ad20e84c752f7a56c90b9", + "sha256": "18m8djkbyykb6cxqayl2v3ap206jkng3w8ah6qr4bixqynkx4yg1" } }, { @@ -90112,17 +90483,17 @@ }, { "ename": "reformatter", - "commit": "58de8cf8864867f7b3969f3a048a4844837078b4", - "sha256": "0z4wa0bmhz55c54vx7qxkl9x7ix20mmgygv91sqll68l10g63l0c", + "commit": "82368b9bf29492002918a2d77023ff2ef0b9917c", + "sha256": "127nss62cn24xj4hmmf6axxyy0ygx84dz0k8dc0xm1642gdndl58", "fetcher": "github", - "repo": "purcell/reformatter.el", + "repo": "purcell/emacs-reformatter", "unstable": { "version": [ - 20200814, - 435 + 20210510, + 522 ], - "commit": "576d339aa80f40c6053592988001bdb285c1cf21", - "sha256": "1hdr5vr5xzlpj5xyapgbm9drrham6r776lmj8sjqaqrdffgxj8dh" + "commit": "e02a9ea94287f4195edeeab3033e017a56872f5b", + "sha256": "1dlm24gjplfdx3cv2j6jslwgfryh0mvcyccljrwq8rzw8svgs8ac" }, "stable": { "version": [ @@ -90323,14 +90694,14 @@ "repo": "torgeir/remark-mode.el", "unstable": { "version": [ - 20191103, - 1825 + 20210504, + 1238 ], "deps": [ "markdown-mode" ], - "commit": "e80a1b78304045dec3eceffb6c8cbaf2b6c7b57a", - "sha256": "1l06hh728p9gnlliz1nq9qg641gyxfzb7mlz8x88bmvb0wyzyr8r" + "commit": "9f15285445fdb53e720ffe72f5cf05231d340906", + "sha256": "0mgkcdagj4n47nahsxnk7l1b4v15cbwqaac4fr8809jvis1rfx5g" } }, { @@ -90704,6 +91075,21 @@ "sha256": "02wva5q8mvc0a5kms2wm1gyaag2x3zd6fkkpl4218nrbb0mbficv" } }, + { + "ename": "rescript-mode", + "commit": "d561116c1da2439da7368a83b5d481962f51280e", + "sha256": "0cjh418qipa3i3g02p1axdqblchc482gcs0nzn1xx9k26yfa6yy5", + "fetcher": "github", + "repo": "jjlee/rescript-mode", + "unstable": { + "version": [ + 20210506, + 2101 + ], + "commit": "964a62f907bf786cec6a60719d17244b2958ac62", + "sha256": "16r1bp6dv6s1k8pkxpf1wpk2rh7qd059z97naik60qa26rdwpa4w" + } + }, { "ename": "resize-window", "commit": "601a8d8f9046db6c4d50af983a11fa2501304028", @@ -90765,11 +91151,11 @@ "repo": "pashky/restclient.el", "unstable": { "version": [ - 20200901, - 1442 + 20210511, + 1331 ], - "commit": "abc307b965bf6720bc466281f2e204cd5ce37dc3", - "sha256": "0dv9was6ycwwyfabr8z71wcc3hbqnxgwbdqkdkx0iaccq2xyj07b" + "commit": "2cc1fd3496f57288de3f97c27a5f018284db2d23", + "sha256": "0zpdkrj2kka85x56qh266vd1rc1kxh4cwv1gbdxcfpkpckn3xg0l" } }, { @@ -90787,8 +91173,8 @@ "helm", "restclient" ], - "commit": "abc307b965bf6720bc466281f2e204cd5ce37dc3", - "sha256": "0dv9was6ycwwyfabr8z71wcc3hbqnxgwbdqkdkx0iaccq2xyj07b" + "commit": "2cc1fd3496f57288de3f97c27a5f018284db2d23", + "sha256": "0zpdkrj2kka85x56qh266vd1rc1kxh4cwv1gbdxcfpkpckn3xg0l" } }, { @@ -90799,25 +91185,25 @@ "repo": "simenheg/restclient-test.el", "unstable": { "version": [ - 20180106, - 2046 + 20210422, + 1815 ], "deps": [ "restclient" ], - "commit": "4518561bc9661fedacb6fb352e9677207f45c418", - "sha256": "0hbilpn77w0vykga9p4dkwaygipyna7mwn24y2kwfcahcr39pqjb" + "commit": "3c6661d087526510a04ea9de421c5869a1a1d061", + "sha256": "0bpvxv8bc671pa0sm4v8pqyla3i99y05mgpbgcjd8pdsfhiwjw7j" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "restclient" ], - "commit": "a21e41b905b423e762eeb4da3a236c8b1aea8c49", - "sha256": "1lan49723rpzg1q7w8x3iggazwl4zirq5l8nhpb8m5hmg21a4kih" + "commit": "3c6661d087526510a04ea9de421c5869a1a1d061", + "sha256": "0bpvxv8bc671pa0sm4v8pqyla3i99y05mgpbgcjd8pdsfhiwjw7j" } }, { @@ -91014,11 +91400,11 @@ "repo": "galdor/rfc-mode", "unstable": { "version": [ - 20201121, - 544 + 20210510, + 1104 ], - "commit": "21c966a02cdd4783dc6ea50b807589abc405d929", - "sha256": "1g8j80nklf14a178qhb7im01zrw84gmix4gcdn5l45194q6ngifk" + "commit": "b885d6bd2b3be69a2413c4dc5cc34344d821cba2", + "sha256": "0qqvab5n5y70mv9dq06xnqmpxy9pr994k3b83kw70pq43gb03nxd" }, "stable": { "version": [ @@ -91203,6 +91589,15 @@ ], "commit": "d0cc3599129db735c23abe74d0876286a2fd6b6a", "sha256": "1g0na5zjsy4600jzi5zr752nggndbwkr6ihxcmq1w82w0b3600rv" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "9df603a5c63ae38ec776e27dc93d3618e2b0fabe", + "sha256": "1qp338v1cwlikkzclbnxy2i4g2lad88qc6aakmla9f8x22gvlpi1" } }, { @@ -91428,14 +91823,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20210328, - 1228 + 20210413, + 2202 ], "deps": [ "inf-ruby" ], - "commit": "0bc2645d140f65215a42f2b9365f1983cc949c6c", - "sha256": "0ff8zminjpgyi2lp2pmjh7cc7bgb15hii2r89zmy5xkq47slr2j4" + "commit": "dcde67f020d0efff35b6db9863e4687c08f1b421", + "sha256": "17ssr9144lnk48iyb3qn797whmvs2s526svfgs554k7bc0vl2j6x" }, "stable": { "version": [ @@ -91458,11 +91853,11 @@ "repo": "kopoli/robot-mode", "unstable": { "version": [ - 20201208, - 1959 + 20210425, + 1925 ], - "commit": "e8ca45ea811a4c6758fa1a086d8f89b8812653ca", - "sha256": "0iji80p1llvp93s42cgyffx0py9j1kjk3bjycajcy1hxsha240xl" + "commit": "e7e9c4d4750d048ad771fa735621ad813fa9c128", + "sha256": "127lydk66n90ih39q8gxzb44rss2xllb7bn3ygxrf5m5vvl9w5rj" } }, { @@ -92191,11 +92586,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20210226, - 1106 + 20210423, + 1157 ], - "commit": "e9e9e32c4f82a9b895543c120b327ab5536ec42b", - "sha256": "0f63lms4arkqj6161v2787dgfra23a01vi82s9dcylk9z6bqyz4v" + "commit": "494d59f92cbe12533eb89b202fc4f5342afcd543", + "sha256": "1g9hch2h3lqdx7ffabikl2ss98akhfpw5las6g5qwyj1l2lcrjbr" }, "stable": { "version": [ @@ -92238,22 +92633,22 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20210328, - 1426 + 20210502, + 1646 ], "deps": [ "dash", "f", - "ht", "let-alist", "markdown-mode", + "project", "s", "seq", "spinner", "xterm-color" ], - "commit": "07d4d9af2c169d6cce6e2117628dfa3192937fb0", - "sha256": "1hv059nac1czpv367bs42qqw8lf6phpbzbiyk90n6mq996cinwrq" + "commit": "ed68fd3bb410869e1a4ce3943b5913ea88d9b509", + "sha256": "0896m5ajlq90pp7ds6iw7plqkffm6k01v3rfqfhb3qwd92nxgcf0" } }, { @@ -92288,11 +92683,11 @@ "repo": "Kungsgeten/ryo-modal", "unstable": { "version": [ - 20201117, - 1903 + 20210507, + 646 ], - "commit": "f14479e277ac7db75bf6756e0589941f84fdd749", - "sha256": "16q1b1dvdh0s7jd58x48m11c925f97lnlm1xn6z1iz8c0bxgqqjm" + "commit": "b44321c6fbbfc53e211083dfa565525e79f596c6", + "sha256": "0gwf9a4cgpl3agggaj8x6r5hmq88wghzvyh69shc378n564n1cq5" } }, { @@ -92672,8 +93067,8 @@ "deps": [ "cider" ], - "commit": "27f35778de9509067716a7bed14306787334a589", - "sha256": "01a6cvk3ycg0z1qg30rqsnx49drmdfpgd78mhf2m6avvagzf8l9s" + "commit": "c813d94ee8d0a85dd33d0c5dbae832c24cf37e4f", + "sha256": "0r0c6h7nikb4181a06bs88sqnqa68jw2f550q2zz34khl7zpr2s6" }, "stable": { "version": [ @@ -92696,11 +93091,11 @@ "repo": "hvesalai/emacs-sbt-mode", "unstable": { "version": [ - 20210409, - 1528 + 20210416, + 1845 ], - "commit": "9a6a8e47b657adeada41c445c9fcda301dbdb9b3", - "sha256": "1h8iqamz5crflhjpxfzgjxspwwkks8cp9m3bf4b42jqsffqkypnb" + "commit": "e29464a82bf706ef921f4e0052ce04fc74c34c84", + "sha256": "1r6n1hcpcy6icy8qs98gafqavmwx4z6v4rnknvrfnnynmrv2ajvr" }, "stable": { "version": [ @@ -92723,8 +93118,8 @@ 20200830, 301 ], - "commit": "5078c5c5e22f509338d20b7ae448b2bbe02e08f9", - "sha256": "03brsgbhsaynjc8xp5wpmla6cf0v4r7qc5hg0jdbp2ihnwp17i2f" + "commit": "739b96ee2152c25de9b59cbaad137e8fe20cd284", + "sha256": "0znl94xnbxm9i7a2mpsl5848s4l9hgx8z5hjipjk8cl5q34xmgw6" } }, { @@ -92753,11 +93148,11 @@ "repo": "hvesalai/emacs-scala-mode", "unstable": { "version": [ - 20210409, - 1441 + 20210414, + 1126 ], - "commit": "6966328dbfcbd1dfb166ff46e5deb9a68379cdf1", - "sha256": "0pmix0km9b7r28jxh31ig1h5j9vvvz4871irzlavzn7kl3qiqwgw" + "commit": "598cb680f321d9609295aa9b4679040cc703b602", + "sha256": "0ryr6jhl0irhaii6cz9nlly8rn4c6h5pnax6xzn9iszl8f7xgphs" }, "stable": { "version": [ @@ -93107,11 +93502,11 @@ "repo": "ideasman42/emacs-scroll-on-drag", "unstable": { "version": [ - 20201013, - 123 + 20210418, + 1318 ], - "commit": "ad94790492d0d66686f3457cea1caeba8bbbdc51", - "sha256": "1b725iz5xhqki33jydq9vrxvrbfraxq2q79jdbrjy548rbsxzyjf" + "commit": "157637ba6b6cbe7a21c57f9eefb8a94fffa0085e", + "sha256": "195ckjmh65z4qg1afs5acz66r6xvc2g91mfnncz12kv7p8bxwrxx" } }, { @@ -93122,11 +93517,11 @@ "repo": "ideasman42/emacs-scroll-on-jump", "unstable": { "version": [ - 20210103, - 2120 + 20210426, + 1226 ], - "commit": "69c86542a148222a7571506a2515fc52529d209d", - "sha256": "00qddxcax55pmfai7083w08mgz6c3876jb5p7fas4j5h417c09yb" + "commit": "30dc5f5e50fa702eb65756304f0fe406daec2397", + "sha256": "02w52rcs8gkf58yig55wn6198b7g6zy6ppp5mjh7k1l07cf2kmay" } }, { @@ -93527,11 +93922,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20210411, - 1153 + 20210510, + 1316 ], - "commit": "35665560c217fc7c39ec7ef006edc6d556a4d3cf", - "sha256": "1w2iiparzs88z2zg8ylqdidgn6qb73x68hjl53yfqqgvrz8krs2f" + "commit": "bfefb8e1a350d44b56290b2c7ddc3418ec217b30", + "sha256": "1ps5jvhidkgn7bssqsib23iz283cim7mszlga2d8fdnmn2618q3q" }, "stable": { "version": [ @@ -93550,15 +93945,15 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20210411, - 2007 + 20210425, + 1720 ], "deps": [ "prescient", "selectrum" ], - "commit": "ed2b762241bbea03e374dc9dcd4fbe207c6b2ea4", - "sha256": "03c0dmblixh5mx8365b6608l7z3vcgp6pzdflwqf8nfwj2c5rm0w" + "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4", + "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n" }, "stable": { "version": [ @@ -93735,15 +94130,28 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20210403, - 1354 + 20210420, + 1527 ], "deps": [ "dash", "edit-indirect" ], - "commit": "588a5dba2b38e57b88870efbc0cd2482202f28c8", - "sha256": "1m3kb6lvdr8manvlvi2avhba94lw16lvxy9p7vksk1gsmdmkgc0j" + "commit": "424b0f260a1bca20cd9359c42a0bc64a1a5e1928", + "sha256": "1i85mbnh6ijycsgxiknzvkimxag72cxg8asg3d1g4bakv3gp32rr" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "dash", + "edit-indirect" + ], + "commit": "424b0f260a1bca20cd9359c42a0bc64a1a5e1928", + "sha256": "1i85mbnh6ijycsgxiknzvkimxag72cxg8asg3d1g4bakv3gp32rr" } }, { @@ -93754,11 +94162,11 @@ "repo": "brannala/sequed", "unstable": { "version": [ - 20210315, - 2012 + 20210417, + 28 ], - "commit": "50c5dca413a12fe2d8a89eae833f10967c2f38d2", - "sha256": "16hsjk04xw88ddr2gbwlb4v8didqmk7ffwphp1iqy3a02wf4kif6" + "commit": "b28e20bf3e0ec7c56c705632e38ab842083d9c49", + "sha256": "09bw3kjr32z8hlhrczl8i3h4yavdcmfx6bk7qxsyhn1f0vmskh03" } }, { @@ -94048,14 +94456,14 @@ "url": "https://depp.brause.cc/shackle.git", "unstable": { "version": [ - 20201116, - 1428 + 20210508, + 1637 ], "deps": [ "cl-lib" ], - "commit": "1c88d2a2fdd2efb3e990da69d6fedeaee5ff71a2", - "sha256": "15adhf4iqcmirngcbq5gnn80yxg4hp9kyiccwn23hqq4az05pfyx" + "commit": "4ef05b117c87e1f0d97e0ee74fd2f0bfd07a49b1", + "sha256": "12x2b133a7npl2bibgsi5rr73cg77g1dljdwg4l49ipp7g4dsmcb" }, "stable": { "version": [ @@ -94108,11 +94516,11 @@ "repo": "arturovm/shades-of-purple-emacs", "unstable": { "version": [ - 20210213, - 1939 + 20210506, + 1448 ], - "commit": "96c58f2421165d67f300cc5014715fc0517e8f8c", - "sha256": "17cnwc235wm6la3wh1wcrs621jqzka7xnrrbcsk4kv8fnidi81n4" + "commit": "e9d2ac081ae657b1ad6a30b9f53e8572479deb80", + "sha256": "0s3ga5ap1m9xfm20hnaanh4vvvkfv6d5h5mxia1sn526349lnpw5" } }, { @@ -94123,11 +94531,11 @@ "repo": "Shopify/shadowenv.el", "unstable": { "version": [ - 20210216, - 2031 + 20210512, + 1625 ], - "commit": "e4563469fe20b9e6e63d7b19c86ac8b8b615df1d", - "sha256": "1p7a4lps2w6dnc5i1fiwx22ij4in70a0h0bl5bp7ab5ba6l22kaw" + "commit": "dbcef650b906fec62608d5e4e3075bf251e675e1", + "sha256": "0qnqp06vb2ikkwy0p10x3s7mil6c948w42mx4c72cdz36m116zc0" } }, { @@ -94211,21 +94619,6 @@ "sha256": "1fw2qn88b84v0fkaigyyipyvvhhllkw1s1h6fgv2xl2h19i8r0gd" } }, - { - "ename": "shell-command", - "commit": "ae489be43b1aee93614e40f492ebdf0b98a3fbc1", - "sha256": "01nviashfr64wm78zi3vrqrqdqgsamp76d9kasxv0b7fqmfx7yjk", - "fetcher": "github", - "repo": "emacsorphanage/shell-command", - "unstable": { - "version": [ - 20090830, - 1040 - ], - "commit": "7e22125f746ce9ffbe9b0282d62f4b4bbbe672bd", - "sha256": "1my2i26a03z8xyyacsnl5wdylnbhhvazn23bpy639d3l4x4l7jzw" - } - }, { "ename": "shell-current-directory", "commit": "edcb78c3491a5999b39a40087b7f991c2b737e30", @@ -94331,11 +94724,11 @@ "repo": "DamienCassou/shell-switcher", "unstable": { "version": [ - 20161029, - 552 + 20210509, + 1045 ], - "commit": "28a7f753dd7addd2933510526f52620cb5a22048", - "sha256": "1x7rrf56hjasciim8rj29vfngwis4pr3mhclvxd4sbmhz9y66wm0" + "commit": "ed74b20fa12935be0068765f5bc8de97b92a8020", + "sha256": "18ynh2j3mq206lqgkd7zmxzxh3661w9nbawkwvgkk2qi3837xrbr" }, "stable": { "version": [ @@ -94531,8 +94924,8 @@ 20210329, 149 ], - "commit": "8bab3dc89d36b55ba26ae5941f294c57805d24b2", - "sha256": "15kp2lsfci6p8wkrda12m4vf12p13xd9x5rh3ypc6yvz1snypgyy" + "commit": "2f95627b93dd49023b1d982329b4ccf8b7854109", + "sha256": "0l2dh75v1vmkh738iq5japh3fmqcinsb5s7qqirxlq54gznl7qm5" } }, { @@ -94718,15 +95111,15 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20210321, - 844 + 20210506, + 358 ], "deps": [ "language-detection", "org" ], - "commit": "a73268705e3558ee91dc05674c5c3bed7fe28202", - "sha256": "1jjs0pclv0ya4d65wzafkvgb7lmg7f13jj0pihs1ch507fyiw3gp" + "commit": "52f7d5827b108d148f1dd02fd8fd32f0f0d3699c", + "sha256": "1p6l22w1jf9sz6azlaj7xzc8l6xijhd62h5lnf1v4ixjgvkayq10" }, "stable": { "version": [ @@ -94927,11 +95320,11 @@ "repo": "rnkn/side-notes", "unstable": { "version": [ - 20210201, - 724 + 20210502, + 935 ], - "commit": "3993e8de44c141420efbec3cdb4c5620b862a200", - "sha256": "1ivm2xr7mc8hp7g1l6l3a4mm5byn2cp7m6bv2g222997xbpk0il5" + "commit": "ca73cec33880322c5bbab407825d502d87f4cf0f", + "sha256": "1qnrk8kib4rndgbljqxq7cmskgxwcc9d8wdbdr3mgkgbg08xv5gq" }, "stable": { "version": [ @@ -95379,14 +95772,14 @@ "repo": "purcell/skewer-less", "unstable": { "version": [ - 20160828, - 2021 + 20210510, + 532 ], "deps": [ "skewer-mode" ], - "commit": "8ce9d030e18133319181d5dabe3e905c8ca5fd6b", - "sha256": "1hkk9si9z9zd2x2cv2gs0z423prlwlhq847irypz2dm1bnm5dzrx" + "commit": "baa973581c2ab7326db65803df97d1a7382b6564", + "sha256": "0md6gghgp8hn296fjwc3ikliw7p412v20917v0kqqlisdskizfbx" }, "stable": { "version": [ @@ -95575,15 +95968,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20210214, - 2243 + 20210512, + 1220 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "68c58c0194ff03cd147fcec99f0ee90ba9178875", - "sha256": "0lammq7116hm79nldxlghi978m7bldccfdc9vy1rlfjj4mhnrlq0" + "commit": "bdda756a5667a537497a35f5a0fc5b7c28bf3bd3", + "sha256": "0xm3fdwla8axag1zpc7361mgyjpf1qg907l86w4v8ald8z4qcvl9" }, "stable": { "version": [ @@ -95638,28 +96031,28 @@ "repo": "cl-docker-images/slime-docker", "unstable": { "version": [ - 20210124, - 2145 + 20210426, + 1422 ], "deps": [ "docker-tramp", "slime" ], - "commit": "903470fe3860402794a4f268c1efffd44a30f273", - "sha256": "089yskdbkr7k25sns5vms7f0hqdbpnjg3ih95nhia1nghxcqj482" + "commit": "c7d073720f2bd8e9f72a20309fff2afa4c4e798d", + "sha256": "03jm0964qqggqia2fkvqgrx8r4knj1qgqr8vimr0x4q2j73lj12a" }, "stable": { "version": [ 0, 8, - 2 + 3 ], "deps": [ "docker-tramp", "slime" ], - "commit": "903470fe3860402794a4f268c1efffd44a30f273", - "sha256": "089yskdbkr7k25sns5vms7f0hqdbpnjg3ih95nhia1nghxcqj482" + "commit": "c7d073720f2bd8e9f72a20309fff2afa4c4e798d", + "sha256": "03jm0964qqggqia2fkvqgrx8r4knj1qgqr8vimr0x4q2j73lj12a" } }, { @@ -96007,11 +96400,11 @@ "repo": "malsyned/smart-dash", "unstable": { "version": [ - 20201202, - 1616 + 20210427, + 1709 ], - "commit": "b4a298572e7acc3f39a908997fdcfa356bac0591", - "sha256": "1lkld9g53064wz2m3xxpjpf8vs75fa8kxxnvgpipvzq55sl1j9v7" + "commit": "bc740889dd81e7dc8a90a33d1f075f21aba9b2d3", + "sha256": "0kadfyvvzfk66d5k263j8cykqh9lbwrdqizs2mag6ahnadpahhyy" } }, { @@ -96100,14 +96493,14 @@ "repo": "Malabarba/smart-mode-line", "unstable": { "version": [ - 20190527, - 1156 + 20210428, + 1641 ], "deps": [ "rich-minority" ], - "commit": "999be065b195f2eddb4e1b629f99038d832d44b7", - "sha256": "0jyvyn7pkqvyyv1rga3i10f4cwfbb0miacbib8lsrrhayrnal186" + "commit": "744ee1a9479a7901cedd6f0d59e6c6c86b20a78d", + "sha256": "18bf6f5yd8gympf5z8fs904qnjjdijapxpincjbpiyb2429yb34a" }, "stable": { "version": [ @@ -96154,8 +96547,8 @@ "powerline", "smart-mode-line" ], - "commit": "999be065b195f2eddb4e1b629f99038d832d44b7", - "sha256": "0jyvyn7pkqvyyv1rga3i10f4cwfbb0miacbib8lsrrhayrnal186" + "commit": "744ee1a9479a7901cedd6f0d59e6c6c86b20a78d", + "sha256": "18bf6f5yd8gympf5z8fs904qnjjdijapxpincjbpiyb2429yb34a" }, "stable": { "version": [ @@ -96778,15 +97171,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20210410, - 1115 + 20210503, + 659 ], "deps": [ "dash", "s" ], - "commit": "7518cf3e1d6ca67e9ee8d9d1e930e1866f460c92", - "sha256": "05ncmknzrqsx8l3c1r3lm4b810m6hnrixbbzkik2brnyzqpqfphj" + "commit": "aef9dcb8b007c59525100fb989c7f8fc6dec71cf", + "sha256": "10fp0wlwla4y94kvl5ajk3jxvcr9k01y2s1f7q3fj1lr31zh7c6f" } }, { @@ -97031,8 +97424,8 @@ "flycheck", "solidity-mode" ], - "commit": "b83354943626ea7c50011d5806b17be17077d1c4", - "sha256": "0h4fyyv2k44x67nwqflh3zpazfkcf5zbgdzwjxbwjgvvxm1hdqlx" + "commit": "383ac144727c716c65989c079ae76127e25144c3", + "sha256": "1q4b8623mygzp3qwy5bmb3hipzjfri9007x0ilq3i7k5bs34jz9r" }, "stable": { "version": [ @@ -97056,11 +97449,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20210331, - 1709 + 20210505, + 1704 ], - "commit": "b83354943626ea7c50011d5806b17be17077d1c4", - "sha256": "0h4fyyv2k44x67nwqflh3zpazfkcf5zbgdzwjxbwjgvvxm1hdqlx" + "commit": "383ac144727c716c65989c079ae76127e25144c3", + "sha256": "1q4b8623mygzp3qwy5bmb3hipzjfri9007x0ilq3i7k5bs34jz9r" }, "stable": { "version": [ @@ -97178,11 +97571,11 @@ "repo": "mssola/soria", "unstable": { "version": [ - 20210201, - 1830 + 20210426, + 1433 ], - "commit": "f765f193ccaf4ad438e1d9be842efd2f4394efa4", - "sha256": "1p6kzsci8hgccpjcy6swwa6yk741l6ay48rb35gmf03j04abszm0" + "commit": "12d3472e6823ff1bdc1591984367e2ed769afcb7", + "sha256": "1vyg73svawi8g1mq6v5y5g9hw0vnks2nhbwdkbn6d53b7bcr0hpx" }, "stable": { "version": [ @@ -97381,16 +97774,15 @@ "repo": "nathankot/company-sourcekit", "unstable": { "version": [ - 20180101, - 834 + 20210430, + 2155 ], "deps": [ "dash", - "dash-functional", "request" ], - "commit": "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781", - "sha256": "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n" + "commit": "a1860ad4dd3a542acd2fa0dfac2a388cbdf4af0c", + "sha256": "18pv1hcilj7kndr7a29jjskp21khh1sd0wy01h8y8y9mf70kikg6" }, "stable": { "version": [ @@ -97706,11 +98098,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20210306, - 1600 + 20210415, + 1821 ], - "commit": "b9f49bab9551e8ca1232582acffdd0a90aaa35f3", - "sha256": "0k9dlkxns8yhv1yzfjlr5gkfc26ihhqjfsjchqg9fvfxqnd39pic" + "commit": "86c223a2db529768fd815dc0635ed432c1a215e8", + "sha256": "1bz6186w83xmajnw489dc1la7b6gly9vrp40mh58gknk5fjdx86w" } }, { @@ -97837,15 +98229,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20210328, - 413 + 20210415, + 1326 ], - "commit": "c566ed568aae0a73202a51e97a73c5e4af0053d2", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503; retrying in 265 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503; retrying in 703 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503; retrying in 1251 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503; retrying in 2299 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503\n" - ] + "commit": "fae15427a1027e5eafdff7e5627cd399f73dbc37", + "sha256": "05xarav1dw4315rh4qchvf6p9vsdyg09nm9rc6k657n4r8ip725c" } }, { @@ -98429,11 +98817,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210325, - 445 + 20210504, + 632 ], - "commit": "633a0ff419438987f6271ff5a5da26307950a3cd", - "sha256": "070p4wyphhm7115afvq7lhxkb69c7l7fz3q5nkwbpjsdp5s8isns" + "commit": "ce69158f5efb3040a00e89ffef0d1931e5038f53", + "sha256": "1sfrp9iwrinx1q9hm6rdb1gayn4jhqsh00c3yzg83wbdw1vl8vpw" }, "stable": { "version": [ @@ -98546,11 +98934,11 @@ "repo": "jhgorrell/ssh-config-mode-el", "unstable": { "version": [ - 20210401, - 243 + 20210428, + 1752 ], - "commit": "6d4f8d12c6a7e7ff776271f3656be5f3ba5a784e", - "sha256": "1pxpm24rlrrdzmy129c6naz9zxfsjrk6hgx3qcizd25kq86sfy4g" + "commit": "4e5c9bf04394438a6256ea7b320df3b0ed129fe6", + "sha256": "19ls9cm4bswxp5zfwxf7mdpf0gcmnpqi8vzyw94j5hmakx89l3kz" } }, { @@ -98857,16 +99245,16 @@ 20200606, 1308 ], - "commit": "6af99af232c90d1629ac71be500eef2241245c81", - "sha256": "03wl804pacmzr2gjdz6ssq0l03hs68hadlgjdn6hinp2k0r90pxw" + "commit": "311caea3f11330a42a37efe078305b4ce42e53ae", + "sha256": "1hfr36xb24y829pcd4maw206lyhrb3qwxxzj6gwh3a0nw8s1sr1m" }, "stable": { "version": [ 1, - 0 + 1 ], - "commit": "11aa5944459e464a96f41d934e23da5320c13333", - "sha256": "0nc388hi362rks9q60yvs2gbbf9v6qp031c0linv29wdqvavwva1" + "commit": "68f949852ab7f0e8bb52c6a6fc2ece2a74ded824", + "sha256": "129mms7gd0kxqcg3gb2rp5f61420ldlhb0iwslkm7iv64kbxzww1" } }, { @@ -98907,11 +99295,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20210331, - 1140 + 20210430, + 839 ], - "commit": "0dc71ec178c3dab8973c90758fa730c70df01554", - "sha256": "0glp3h5anrsvm89zs99gdyp3rpc0g41va30nxw5pn02yv7cqz7hd" + "commit": "eac0f54da5ff116622a6448b68057b45c337f2de", + "sha256": "0b7glyq3z98vi7f79zg0phqm6ibc30lq2m4mwy22gg0941rr2zja" } }, { @@ -99339,30 +99727,6 @@ "sha256": "1d4yda1vv1sfjc36b5aaf811jmlcifc8labglmkx1xvjmc7bggsp" } }, - { - "ename": "sudden-death", - "commit": "3f20f389a2d7ddf49ca64d945b41584a7c120faf", - "sha256": "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh", - "fetcher": "github", - "repo": "yewton/sudden-death.el", - "unstable": { - "version": [ - 20180217, - 23 - ], - "commit": "791a63d3f4df192e71f4232a9a4c5588f4b43dfb", - "sha256": "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps" - }, - "stable": { - "version": [ - 0, - 2, - 1 - ], - "commit": "791a63d3f4df192e71f4232a9a4c5588f4b43dfb", - "sha256": "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps" - } - }, { "ename": "sudo-edit", "commit": "3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e", @@ -99783,6 +100147,36 @@ "sha256": "1d45yanqk4w0idqwkrwig1dl22wr820k11r3gynv7an643k4wngp" } }, + { + "ename": "sway", + "commit": "4c2d1eec09d5f69fbec99c6d190cc78882d8a74c", + "sha256": "00jysn6x6n54xpj6vwrp582p001bjbkjilqs4gsxs5r829cr3zyw", + "fetcher": "github", + "repo": "thblt/sway.el", + "unstable": { + "version": [ + 20210501, + 2201 + ], + "deps": [ + "dash" + ], + "commit": "8a4d9cc1a469efa707cf67b57b752f28547e331e", + "sha256": "0x5w3f07dsgbl7qlcqpmpm3831lrv5jx59g7xnv25giwc3w21d2d" + }, + "stable": { + "version": [ + 0, + 2, + 4 + ], + "deps": [ + "dash" + ], + "commit": "8a4d9cc1a469efa707cf67b57b752f28547e331e", + "sha256": "0x5w3f07dsgbl7qlcqpmpm3831lrv5jx59g7xnv25giwc3w21d2d" + } + }, { "ename": "sweet-theme", "commit": "a149448c38504bdf6f782a10cb1440da9102990f", @@ -99855,15 +100249,15 @@ "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "dash", "lsp-mode", "swift-mode" ], - "commit": "661e6fe419948419da4abf916b193b331b80a3be", - "sha256": "08w9h12y54aj2q6k48p9fglacppb5mlqh18h43n45hd7rcph3j93" + "commit": "ed36ea3d8cd80159f7f90b144c4503411b74ae3e", + "sha256": "0bcrnslqhgz122mv6br6w848a3x3g4jkz1pkdpb4726xssfzz8zk" } }, { @@ -99880,20 +100274,20 @@ "deps": [ "seq" ], - "commit": "fd3c824c3622aef4ad29983667f34ebad91e9f69", - "sha256": "1s60j7778n8vl53capi1bs5mbb1g2vwaaa4y7wdv6ajrlxh95a5x" + "commit": "ad12a3025156873995318b6a0480cd2459063bf7", + "sha256": "1cr484b8pixnk9rk2046wiq7i05r3sr6wmk0qiad1vibzlynz83q" }, "stable": { "version": [ 8, - 1, - 1 + 2, + 0 ], "deps": [ "seq" ], - "commit": "e65a80a659c74d0a62b00dff183a0f7fc8385ce1", - "sha256": "18i6m2zys0nc9j29f7bkzjcfp7rcaycr473ykhprsfikfcgwkj3y" + "commit": "fd3c824c3622aef4ad29983667f34ebad91e9f69", + "sha256": "1s60j7778n8vl53capi1bs5mbb1g2vwaaa4y7wdv6ajrlxh95a5x" } }, { @@ -99904,8 +100298,8 @@ "repo": "michael.sanders/swift-playground-mode", "unstable": { "version": [ - 20190730, - 1707 + 20190717, + 2223 ], "deps": [ "seq" @@ -99958,14 +100352,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210404, - 1302 + 20210509, + 1535 ], "deps": [ "ivy" ], - "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245", - "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36" + "commit": "11444e82ad3ec4b718b03ee51fc3ba62cbba81bc", + "sha256": "1bvqicw10lz048lwn4p4ilxyk3sfmplclz1gk6zsyimf72y3xymg" }, "stable": { "version": [ @@ -100225,14 +100619,14 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20210118, - 807 + 20210422, + 2110 ], "deps": [ "seq" ], - "commit": "5bcd6d7e3f3b6501ccec3e6c378f33f7e7488c99", - "sha256": "10n0871xzycifyqp73xnbqmrgy60imlb26yhm3p6vfj3d84mg1b2" + "commit": "4231a36e39b7393d639e9cdef19f311d780deeab", + "sha256": "0q2x39s3g5kmjf5q47qpqcnzdscnj112dfd7qqb2z0iq0sh2nbrd" }, "stable": { "version": [ @@ -100246,6 +100640,21 @@ "sha256": "10n0871xzycifyqp73xnbqmrgy60imlb26yhm3p6vfj3d84mg1b2" } }, + { + "ename": "symbolist", + "commit": "967f1819c8d3a6ead5cc5bb7a577be07dabdbe5e", + "sha256": "1i940i77agy7c1rv7cqarxcbgjwvjnl05gwi0k2n45pzb91pvgld", + "fetcher": "github", + "repo": "lassik/emacs-symbolist", + "unstable": { + "version": [ + 20210503, + 1220 + ], + "commit": "f600e07fe06c19b67f917a8839bbcd6c78f1fbd4", + "sha256": "02x71kdnkhyzscc2bxayv55qfanqy0hm7rckq4mqhxbryjz7qcab" + } + }, { "ename": "symbolword-mode", "commit": "be2018e0206c3f39c1b67e83000b030d70a72ceb", @@ -100280,8 +100689,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210408, - 1839 + 20210505, + 11 ], "deps": [ "evil", @@ -100293,8 +100702,8 @@ "seq", "undo-tree" ], - "commit": "feaf6d847bbff6642cd3c4926899eee3cbac261b", - "sha256": "1k4b8aqwglgavj3rsjj0macmppjsgb5ykpl388434crn067rlfpz" + "commit": "7292c3371ad0d32e5e2fe73ddf14d5cfeffb6d23", + "sha256": "1qw90li4f8h5jp78lgx042slwwpi7mwch077zpk552df8xrd0aqy" }, "stable": { "version": [ @@ -100672,11 +101081,11 @@ "repo": "fritzgrabo/tab-bar-echo-area", "unstable": { "version": [ - 20210315, - 1609 + 20210424, + 1927 ], - "commit": "d2ff6b1acb553bf1546e730640397b9e33ca5279", - "sha256": "1agjb68bjfjzgacrip2mjwzfdbvj3xn8cs3f6q5kdjg5v7lg9c9h" + "commit": "c60fceca7f0e7e400e4d660b23e6c64b178d9a06", + "sha256": "11h14wp0c30wc0y0y9qp5r9gwma09wl54bg0a1vxn037llwnfiv1" } }, { @@ -100687,14 +101096,14 @@ "repo": "fritzgrabo/tab-bar-groups", "unstable": { "version": [ - 20210321, - 2129 + 20210419, + 2057 ], "deps": [ "s" ], - "commit": "b83315c9a63ba2f6bbeaaa449a3b78b84a87ec1c", - "sha256": "03pc85g5f5ys0s45ccg3z7dni4cxngs3532xf9ng94a421yhxmkr" + "commit": "509b3a3909b074faa9677509de0becb9cc054a37", + "sha256": "1bnhxzbpk7xi0vi5m2mwwss97pzhwbxqn6k59028ibwxs3hvaq1c" } }, { @@ -100911,11 +101320,11 @@ "repo": "tmalsburg/tango-plus-theme", "unstable": { "version": [ - 20201103, - 903 + 20210505, + 1051 ], - "commit": "07ee34725bc19fc1679effb262a014dbc6311aa2", - "sha256": "1flm1vq5fxmix0y6vnikbqr2v4q4idvzj26ilgq7pgx3m9d2q0gi" + "commit": "f31d282a70b0eb24470935438af59de96ddace2e", + "sha256": "1f3kxc9l0f4r7fxhrz77lghn4847f3b7dk8j84sn6d5zr436by8n" } }, { @@ -100941,11 +101350,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20201222, - 602 + 20210417, + 626 ], - "commit": "468ee4f6ba7afb9dbfc8855ae2c333cb16ca4408", - "sha256": "0yqibx6wcdsj5k6130c3qp0hmj6zwhfjrrvw98lny23ksw6k0s3s" + "commit": "d5ccf6f53d65e80083acdfb0bced6bcd678c6ea9", + "sha256": "1wgk0xngamwgh242wfmxizi5r1ji5dxmr8s542g3p7rgfv5w0qs8" }, "stable": { "version": [ @@ -100965,11 +101374,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20210310, - 1632 + 20210415, + 1322 ], - "commit": "d6edb345f31a13918d603d44b90a4ce30b34632b", - "sha256": "0jx095yjpsh28r6a23w2fxqv0rysbwz49c22vri2s8hzw011m55p" + "commit": "1c0028d6c406cf4884e6aa35313e82041b7e857f", + "sha256": "0gv1iychm7xzdf99l1kiyvqfdhl9s8g900jjq7bj2kkd3r3c22ki" }, "stable": { "version": [ @@ -101156,28 +101565,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210409, - 2343 + 20210511, + 1722 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "88e10161e1aa2a7c83ebc41ba8492d84d8e64e26", - "sha256": "010jlhbidl3vny9z4dp4mhix827p2aa76ja2v822sdlszcb8vh9x" + "commit": "bc57c9e27a8c8c82d17cf2a2131e386494d49a1f", + "sha256": "0v9297syqz42fah5ng90a26b16wq1xvm4nh5cqphx4dgb31q2s08" }, "stable": { "version": [ 0, 7, - 22 + 24 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "3ed57544faf0fdd17dd8762126466b15dc471f8f", - "sha256": "1frljw1gipsr9l6cpb1skwi5b566x9yx3dhcc7bxfq11inh7bc74" + "commit": "9187e6e3d903474645f3e64806bc62ef687ec205", + "sha256": "1ra04cp49zzx8vy8aswd00l46ixyc44sxh1s3nw880b4ywzxmc6j" } }, { @@ -101295,20 +101704,20 @@ "repo": "clarete/templatel", "unstable": { "version": [ - 20210327, - 2307 + 20210425, + 2215 ], - "commit": "dd7e76919f36da9f8efe7f9e3d84098f3c7c6644", - "sha256": "0apv1r756d984a47d9pvqzgcs652fdwy3swf4js9dki3nzljy756" + "commit": "3ee3761d9dd30b1c6af74dc393d43b9a91a75951", + "sha256": "1c58m2x4frwqxbi8n884c4l69pfwzdxsrig8p35y7mbywlwf1s2l" }, "stable": { "version": [ 0, 1, - 5 + 6 ], - "commit": "971153aa43addf88bfe0922bcac19cb0edd3f86d", - "sha256": "0ldb01sxzrvchjy160karvmksinicw3d14jazriy84dxks8i6w8a" + "commit": "8374097a129b2cd13c449568f95ee7380b36b307", + "sha256": "03n7amd2mfr4jmc4s1ar5ckm86knr7qarxxlkdhbnw3svy5kbc57" } }, { @@ -101419,22 +101828,22 @@ }, { "ename": "term-alert", - "commit": "0d77aee0b1b2eb7834436bdfa339f95cb97da140", - "sha256": "02qvfhklysfk1fd4ibdngf4crp9k5ab11zgg90hi1sp429a53f3m", + "commit": "8bcf021a68579f1b9c02dc959c525de0c6ca1fb0", + "sha256": "1hk1gzszqc3ijzarzi9d5hiw8ya19qp5jyb7alnsx7sn9pw6a612", "fetcher": "github", - "repo": "CallumCameron/term-alert", + "repo": "calliecameron/term-alert", "unstable": { "version": [ - 20161119, - 945 + 20210414, + 1638 ], "deps": [ "alert", "f", "term-cmd" ], - "commit": "1166c39cc3fb1cb7808eb8955b7f9f6094a306cd", - "sha256": "1hbyiwqv9waynf8gm3c717mph0p9mfi2x1wfpvdzzr25r0fz8xr0" + "commit": "ca1b48ad911bc972b049f48fe0531e702dbc553c", + "sha256": "0jnv1011y521pc4rrjyrv1la6r1q2sb120lxf1nbns17wv86d0cd" }, "stable": { "version": [ @@ -101452,21 +101861,21 @@ }, { "ename": "term-cmd", - "commit": "e08ea89cf193414cce5073fc9c312f2b382bc842", - "sha256": "0pbz9fy9rjfpzspwq78ggf1wcvjslwvj8fvc05w4g56ydza0gqi4", + "commit": "8bcf021a68579f1b9c02dc959c525de0c6ca1fb0", + "sha256": "0jcn77hcjykvd1778948pj2qr03n1w4q8alz50gnlwg3y031y92y", "fetcher": "github", - "repo": "CallumCameron/term-cmd", + "repo": "calliecameron/term-cmd", "unstable": { "version": [ - 20160517, - 1045 + 20210417, + 1447 ], "deps": [ "dash", "f" ], - "commit": "552aa58965aab9b78e46934462bafe54c0396ffb", - "sha256": "0l5xk8npc23c716fjckd65xq83hjwnvpyxixc9brxfz4ybngzwhy" + "commit": "281b9a6d864ca85dc1451dc46baca98f48dc3f60", + "sha256": "1knijk9l8ipb882h8awwx18lh3q1yy13dyjp5gm36nw06212qxx2" }, "stable": { "version": [ @@ -101764,11 +102173,11 @@ "stable": { "version": [ 1, - 0, - 1 + 1, + 0 ], - "commit": "d609290021ea7f2d10caadffc9131663838f8ad4", - "sha256": "1gvydmi37d7jxibn7nfg1rhb6phfn3kgrlmq250g7321g15j1q3v" + "commit": "77181c75cbde5954542688659cd4f2352ed29fbe", + "sha256": "1bcwja7hm11hxd1nmf1z93hkzcvkkpxavvbivg6j336ygzr1r82g" } }, { @@ -102247,18 +102656,18 @@ 20200212, 1903 ], - "commit": "9c6323483c9feaa9ffba8ceb98f54281733ed50c", - "sha256": "0qjx9arygjh7h3wjrfcwc7jw1jxah2jf6wfinprv7b6jg1n8k6vy" + "commit": "0eb6c413562a22e4c24cbb56d18cef63645d952c", + "sha256": "1q0g36bj4w6a5zj8nz3s7id59640fvzaqab7371w543kxrslwwrk" }, "stable": { "version": [ 2021, - 3, - 15, + 5, + 10, 0 ], - "commit": "6d68811e7ee75f8e0b450b9b1778bfad2c44c715", - "sha256": "16yixl9qq6zh47zjnad9rv2vbjq936ms212j0wfdax7qhg094af8" + "commit": "50867396a98d4341bd4468d5211878b4d9b8b96a", + "sha256": "167g3vw7vvd7b2y3w01d895qwpv4amv9dj0pc5iv08jhn8i17jhw" } }, { @@ -102314,20 +102723,20 @@ "deps": [ "haskell-mode" ], - "commit": "4f7bbb325631968d6e7b82b25ece810959d4b87f", - "sha256": "1p4w48zz25fym40l3wijr06qfd4drhkynbhf2nx2yh766yv8icmg" + "commit": "cfc231660a642b2451f874824365931419ab45a0", + "sha256": "06wqsljigm7hvycvg4p5rilivr8g7im300jlnm1r463dc1d12kjh" }, "stable": { "version": [ 1, 7, - 2 + 4 ], "deps": [ "haskell-mode" ], - "commit": "223b0f4388dce62c82eb2fb86cf1351d42aef198", - "sha256": "0k93i9smhw5bws2xiybha15g26mwyq0zj6xzxccwh0bfpl76xzqq" + "commit": "652d7a4e374d3c171278e6bdfccfa41c7621d4d3", + "sha256": "11590ifnh9ynwcfv31f5m59wr6ckrm3xi2g40wvk4ddxslj4yxnh" } }, { @@ -102338,8 +102747,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20210327, - 1928 + 20210412, + 1650 ], "deps": [ "cl-lib", @@ -102348,14 +102757,14 @@ "s", "typescript-mode" ], - "commit": "ad6fa78911d5d7e85c0851c0c1afc01f3cbde7c1", - "sha256": "1b815gxmn31x5b59mmlv5di72mz3vdm19crrpcnvb18vl2ak2vw3" + "commit": "ccff099e94beda9f5378ffc2b412cb4257111e8d", + "sha256": "17fb6zkz5d568151ypw8jkhnpikcrpwn3kc2w1mm9hs2g3hbigid" }, "stable": { "version": [ 4, - 0, - 2 + 2, + 3 ], "deps": [ "cl-lib", @@ -102364,8 +102773,8 @@ "s", "typescript-mode" ], - "commit": "dafb6befd83e5eea2e2c7f79ab89bc4877001b6d", - "sha256": "1n2dihpl53a48jis3l4rry581wpr5lxjd433drlkaa4lqgx8cw67" + "commit": "2a3ac4f38472d66e2d8a6bbe5dadb52bc008acbd", + "sha256": "1fj2fghiycnzds2zxfxgj1d9mdzsvs9rvl9bwy2f1vwawqk1m48w" } }, { @@ -102726,10 +103135,10 @@ "repo": "snosov1/toc-org", "unstable": { "version": [ - 20210323, - 1256 + 20210421, + 657 ], - "commit": "c4c61c5a382f94a3a4537e254243006dec2dcca4", + "commit": "df4ad6ff15e3b02f6322305638a441a636b9b37e", "sha256": "00a2al7ghrlabf65kfj1mk30p2pl37h6ppwlgghbgiy7rwlzkdbm" }, "stable": { @@ -102824,8 +103233,8 @@ "deps": [ "cl-lib" ], - "commit": "74e1fcbeca25734235afec9c6a4d0cf73736b62c", - "sha256": "0yrcsr4360v222klahbccfq3vb4kp5xdsibydwircv36xhxplzq3" + "commit": "2d76365d2aa13543121d5c623df465adb68b76f7", + "sha256": "1n247g5dq73rkxf0wys5lsbvma44y5qlh577s3rcx7l0yrylwdry" } }, { @@ -103124,8 +103533,8 @@ "deps": [ "w32-ime" ], - "commit": "809215eccfe8ff33d461c7ff980ed64c621a84bb", - "sha256": "1915v2x45cx9ydb53aw98da00wmqymn96af0wan9k46527ck54lg" + "commit": "92591f7c0b94f8b1875f1078d1ba3be40848f0b8", + "sha256": "0r5cmj8ih8n7m37fqwyymmd0swyxr6g124cw9cz24ri0dyiwi73k" }, "stable": { "version": [ @@ -103193,8 +103602,8 @@ 20201101, 1045 ], - "commit": "e67e2d1149ebf3e79cd2162e78802af3ed5f82da", - "sha256": "0jrpa8kndq2v69nr9jva970q0n3662x2g0chg89nd2d3gbv693mw" + "commit": "2798a75d625677402b01f138ebac6eb53337d9d6", + "sha256": "0r7k7cxs6gfam1rdy04vdq3q796v32wv5q9gq67sxfji8x1vbkn7" }, "stable": { "version": [ @@ -103297,20 +103706,20 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210315, - 1902 + 20210426, + 2141 ], - "commit": "cc16a5eaa73617a281b0bbf71b24432c38994e30", - "sha256": "15ah0h7i96wn4w5321gydr6pxahb8mc8dk58b9paqv06klp5q2cd" + "commit": "6ceddc4d8c7a3c13d78c459213c796d2c19234c6", + "sha256": "0dhz5ca9i83vgi3pvkbvwanxbi1ibzwbmnhm8ymxdvzn508rlswl" }, "stable": { "version": [ 0, 3, - 0 + 2 ], - "commit": "9ca983bab26d1a8e189a8c44471d9575284b268d", - "sha256": "0g694ydmb9zjn99hxgfjd3m73kpmnkbrgqhr73b4crbxza5sl29c" + "commit": "162698aa9d40ecafefcb1af7bdf602954d766970", + "sha256": "1766hdqzg95k62nqhadfv502mpnjlx1l59ppqmc6r0las82dc6a8" } }, { @@ -103671,8 +104080,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210411, - 1031 + 20210504, + 701 ], "deps": [ "ace-window", @@ -103684,8 +104093,8 @@ "pfuture", "s" ], - "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", - "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" + "commit": "73fdbf241c1163ed85f6dce7f9593eca1648d295", + "sha256": "0iyqz8mh6f9wgyk9a0ch7hf13xkcnmwxsvnvgcfhx6iizwf07hl7" }, "stable": { "version": [ @@ -103721,8 +104130,8 @@ "all-the-icons", "treemacs" ], - "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", - "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" + "commit": "73fdbf241c1163ed85f6dce7f9593eca1648d295", + "sha256": "0iyqz8mh6f9wgyk9a0ch7hf13xkcnmwxsvnvgcfhx6iizwf07hl7" } }, { @@ -103733,15 +104142,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210107, - 1251 + 20210419, + 1753 ], "deps": [ "evil", "treemacs" ], - "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", - "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" + "commit": "73fdbf241c1163ed85f6dce7f9593eca1648d295", + "sha256": "0iyqz8mh6f9wgyk9a0ch7hf13xkcnmwxsvnvgcfhx6iizwf07hl7" }, "stable": { "version": [ @@ -103770,8 +104179,8 @@ "deps": [ "treemacs" ], - "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", - "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" + "commit": "73fdbf241c1163ed85f6dce7f9593eca1648d295", + "sha256": "0iyqz8mh6f9wgyk9a0ch7hf13xkcnmwxsvnvgcfhx6iizwf07hl7" }, "stable": { "version": [ @@ -103802,8 +104211,8 @@ "pfuture", "treemacs" ], - "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", - "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" + "commit": "73fdbf241c1163ed85f6dce7f9593eca1648d295", + "sha256": "0iyqz8mh6f9wgyk9a0ch7hf13xkcnmwxsvnvgcfhx6iizwf07hl7" }, "stable": { "version": [ @@ -103835,8 +104244,8 @@ "persp-mode", "treemacs" ], - "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", - "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" + "commit": "73fdbf241c1163ed85f6dce7f9593eca1648d295", + "sha256": "0iyqz8mh6f9wgyk9a0ch7hf13xkcnmwxsvnvgcfhx6iizwf07hl7" }, "stable": { "version": [ @@ -103868,8 +104277,8 @@ "perspective", "treemacs" ], - "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", - "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" + "commit": "73fdbf241c1163ed85f6dce7f9593eca1648d295", + "sha256": "0iyqz8mh6f9wgyk9a0ch7hf13xkcnmwxsvnvgcfhx6iizwf07hl7" } }, { @@ -103887,8 +104296,8 @@ "projectile", "treemacs" ], - "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", - "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" + "commit": "73fdbf241c1163ed85f6dce7f9593eca1648d295", + "sha256": "0iyqz8mh6f9wgyk9a0ch7hf13xkcnmwxsvnvgcfhx6iizwf07hl7" }, "stable": { "version": [ @@ -103994,20 +104403,20 @@ "repo": "ianpan870102/tron-legacy-emacs-theme", "unstable": { "version": [ - 20210315, - 712 + 20210420, + 1201 ], - "commit": "4d543fbb9cb2098af1be0f5b10e1e4cd5245a9d0", - "sha256": "0fyprvi4s331r6a54xa4dljw0k330kiyhzcfnnjhbsqxc86264pz" + "commit": "e7d16ebe4a824e7d7766fb34ffe4ea3b002f3d23", + "sha256": "15njpd9923rl07lq4mxs611glgnw3qyr21wk6xak6n1cminvy81g" }, "stable": { "version": [ 2, - 5, + 6, 0 ], - "commit": "cdc052b044448654109bfb7d9b3d8bbfcf49042d", - "sha256": "0q1i2q6pkld8rz938yj9g68a55041d9vnps05nn4v1l8rx1x8jif" + "commit": "74e0cf066392c6fa99327e42b24caf4ed2fc414f", + "sha256": "1vc50y7a248f0b4bk6mawb6f7n5dd6skrln8asall2m834bzzg37" } }, { @@ -104886,15 +105295,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20200701, - 1435 + 20210418, + 920 ], - "commit": "7cbc3f852bcc1a22ce279cf36c89328841692493", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503; retrying in 296 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503; retrying in 553 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503; retrying in 1293 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503; retrying in 2555 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503\n" - ] + "commit": "e0ad06b5ef2ac2733dad2ad48e3957b5c36edfa5", + "sha256": "0xix4ghri62xdqlh48pydhih1zsnfsy7ncrk6w2wrnz4fa033pia" } }, { @@ -104905,15 +105310,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20210407, - 326 + 20210418, + 920 ], - "commit": "b2d8874bc8ce892a6702b4136626bd65e0ad7760", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503; retrying in 283 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503; retrying in 562 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503; retrying in 1339 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503; retrying in 2016 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503\n" - ] + "commit": "243d93b4c7c1224e7067cd323f64d23dfdfe7c0e", + "sha256": "1gdx6kir0a0v7q2ai59miibch9hccqlnx2y88qswfpqr9pf7z6vm" } }, { @@ -105778,11 +106179,11 @@ "repo": "ideasman42/emacs-utimeclock", "unstable": { "version": [ - 20210124, - 138 + 20210418, + 1050 ], - "commit": "d4b2014c5684b33ff73b4940bdff7b1138c1f85d", - "sha256": "00cx125pq6jad1v8pxq016hzg6wz1d06l4pc6z9r60l89y2m9hm2" + "commit": "21e74953a88ea5a0a17b86a951bf649dc9a0eaf4", + "sha256": "14hn22ld61l4w4livl83fjf4w59kzwn9qy2pc94p05qpgp8x2hy8" } }, { @@ -105858,15 +106259,15 @@ "repo": "damon-kwok/v-mode", "unstable": { "version": [ - 20200823, - 535 + 20210425, + 411 ], "deps": [ "dash", "hydra" ], - "commit": "d97fb8de5ab19359029dec1195f3d5b87aeb27b1", - "sha256": "1rhk9bcrn43gv0cz92cbvhhjvbifyq7lkdg3hcrla87b2dm4rp3l" + "commit": "96ca8dad3a3a402a44bf9066591fe27fa2e4fd9a", + "sha256": "08n577b8xr1pv2mdzqzdbkd5j0pih7zd4z4p5y5w4hq72mcid43q" } }, { @@ -106000,11 +106401,11 @@ "repo": "arthurgleckler/validate-html", "unstable": { "version": [ - 20210131, - 1704 + 20210420, + 2344 ], - "commit": "39890f7d00579954a660fc3b1c0195231325efd6", - "sha256": "0xb1gnf0f408z9p6iscb9g5c5xj2d460gyzk1mr0wjm847b9cs42" + "commit": "748e874d50c3a95c61590ae293778e26de05c5f9", + "sha256": "0b2b5dm85jwgkqvga23r3vfya07vxv2n7a3a6r1pxpk8asqlw41c" } }, { @@ -106263,14 +106664,14 @@ "repo": "justbur/emacs-vdiff", "unstable": { "version": [ - 20201103, - 1427 + 20210426, + 155 ], "deps": [ "hydra" ], - "commit": "007e44be19d068fd6b49874b6e9b8df8b1f552bd", - "sha256": "197xrwph1llrzjgkhlvagiwdgfp68pb45w5afg89ndahpqc2725s" + "commit": "84b8243d9f5d8082b05794dbc998d43dbdd7676a", + "sha256": "0lv9d9g8lnc3rzqi4v9iqr1ck5df8d52yh81cxzy7x2375b2mfgm" }, "stable": { "version": [ @@ -106487,20 +106888,20 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20210402, - 1621 + 20210429, + 2113 ], - "commit": "f9e69bf42eb8108aeee020ed3f58f456e042967f", - "sha256": "1hycs3aaqw6ss3ccbjd8p3fpb4aslm9hk3b9cwqnz4lxcxvqbfvj" + "commit": "a6e46f436495fb54ba57832450995425ad8dbc26", + "sha256": "0zm3ks1j60vdm9fqspa06fcgcz5mmz1pz4fgr21q001bi3wg8vfq" }, "stable": { "version": [ 2, - 13, - 1 + 14, + 0 ], - "commit": "91827971f655936d8a8df95c9d2f39eaee667c97", - "sha256": "1bvvj25shkasy4b14ifkvh195w401xggmhjkflld5frzp7pm6zvp" + "commit": "0d7f7d36f6ae8130a9bd40845f156a3e3b30eb49", + "sha256": "1bpfxfgq5q022rx592wkigj5chq8ihry8lgrni4rsqbbmbrc1h4b" } }, { @@ -106984,19 +107385,19 @@ "repo": "joostkremers/visual-fill-column", "unstable": { "version": [ - 20210404, - 2152 + 20210419, + 857 ], - "commit": "6854932d7fe689caf5cbc1ab65271fcfd46590bd", - "sha256": "02ijylplnv8qzh6r2ci6h4sdm61vn0d2iajmbqyn91hs0695661j" + "commit": "6fa9e7912af412533aec0da8b8f62c227f9f3f54", + "sha256": "1wfww6bqdphv871in80fc84ml8gkl04il6w51z2ycx99km8b723l" }, "stable": { "version": [ 2, - 2 + 4 ], - "commit": "68784162d758fbe6a91d04e9caa8f05683fb6ba9", - "sha256": "1wjb4zm9mx07v0qx2fxmclg4pg0ssgnf8lp89wc56kmc0s40jhii" + "commit": "6fa9e7912af412533aec0da8b8f62c227f9f3f54", + "sha256": "1wfww6bqdphv871in80fc84ml8gkl04il6w51z2ycx99km8b723l" } }, { @@ -107007,14 +107408,14 @@ "repo": "benma/visual-regexp.el", "unstable": { "version": [ - 20190414, - 814 + 20210502, + 2019 ], "deps": [ "cl-lib" ], - "commit": "3e3ed81a3cbadef1f1f4cb16f9112a58641d70ca", - "sha256": "12p3rlhdphwmx1kxsjzcl2wj3i6qgpvw8iwhg1whs6yqgaxivixd" + "commit": "48457d42a5e0fe10fa3a9c15854f1f127ade09b5", + "sha256": "1z2cz6f8ymzrb7fdmw6824y7n5y7rmac5ljl03a6csdhp1yz5c2z" }, "stable": { "version": [ @@ -107189,11 +107590,11 @@ "repo": "jcs-elpa/vs-dark-theme", "unstable": { "version": [ - 20201025, - 1148 + 20210427, + 727 ], - "commit": "3d087e1c48872b5b623ac72c85a9bd3d80ec02cd", - "sha256": "1j326w78drqsr4bxq2sjfnf3ax3hwk1k63flbqj8vfq5w1pc5iy0" + "commit": "5a826e6ea3e9edd9241e3253ce97333955c8ae1a", + "sha256": "0q94crd6m6m000gjxwv92jz9rphmnr5wg7jzf6yig1hlhfqjgw9v" }, "stable": { "version": [ @@ -107212,11 +107613,11 @@ "repo": "jcs-elpa/vs-light-theme", "unstable": { "version": [ - 20201025, - 1148 + 20210427, + 727 ], - "commit": "4e6501118bafb62ecfca8797b6c6d81310d95fd2", - "sha256": "17n9c6fj70rgrc63g72vdxnv8xjnqa6w0rrvh6ih3z2xmky91b2a" + "commit": "e324120248c1d513a6516edff250d161f876aad9", + "sha256": "1jw9cbbvm76ijvcrkkn27r3n6qw14jxbirdc0bryv4k12yiwla9m" }, "stable": { "version": [ @@ -107250,20 +107651,20 @@ "repo": "ianpan870102/vscode-dark-plus-emacs-theme", "unstable": { "version": [ - 20210331, - 1541 + 20210430, + 819 ], - "commit": "3c349f64ff8f12348b865b8c6896db05386cdc49", - "sha256": "0f2dlgjczy45dygyw6was5m74fldrbf3l29bss370qcaj3h2bm3z" + "commit": "24c4cb28042b3b9cc8f4e5294d7597f986aa6fae", + "sha256": "0b85sm6n2ahyyj220k5mqd5ar3x8204p0cfxjyhlk2f989jvfm3i" }, "stable": { "version": [ - 1, - 5, + 2, + 0, 0 ], - "commit": "c64d5f7088f1295df0bd8f1dc87a532e00647fbe", - "sha256": "09a6plb2dqayj4m456ldh43a654jbkg8zjiky7bkj5m0kpdc5426" + "commit": "41772165b3b1195a7e86747ea5b316b16be4c7ef", + "sha256": "1vcaqvhdgr91pr7kqskbscs8awm8jp6dkh79h6w36i9ipmc4l4hl" } }, { @@ -107405,8 +107806,8 @@ "s", "versuri" ], - "commit": "16f9d9ee4744f4170ab9eab361783e3e32e3b627", - "sha256": "19pfxdg4kmvir6fgn9i4mqqlqk7lq77170kva6avxz12jz36i22r" + "commit": "43b9364042922950f612ac57d8c526921a01b291", + "sha256": "14432mnm5lvccb9x3fymzi53kxfh2if92c5q14llz6pbbif8x3vh" }, "stable": { "version": [ @@ -107432,20 +107833,21 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20210329, - 605 + 20210503, + 624 ], "deps": [ "org", "org-roam", "s" ], - "commit": "b394b82cb463f67932dae0fbe3a67daa4d647ea6", - "sha256": "0ssh12jrqfk7llfcfdf6dn9pq0hiqi5f7zp75v1j56qfpijzcbl0" + "commit": "0f73528e603b1901cbe36eccd536a9113ef0439d", + "sha256": "030aglgmph8p9qi160ws6qv288mkwpyhhj0m946q72y7hmsc5xxp" }, "stable": { "version": [ 0, + 1, 1 ], "deps": [ @@ -107453,8 +107855,8 @@ "org-roam", "s" ], - "commit": "4088c95bdd64ca1afbc59bacee571c7260988175", - "sha256": "03kynwkl4q91xz9wsmyx8g3aqgls1r8p5dxhixg586sr9xr4xck0" + "commit": "c4f39b853c54cbfab48876812012e040b56838ee", + "sha256": "1dgmxbdvyb9vdha2swg4ahai6xvfvlr7d03y3c2c3db2jbr00aw5" } }, { @@ -107524,11 +107926,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210409, - 626 + 20210507, + 231 ], - "commit": "8bab3dc89d36b55ba26ae5941f294c57805d24b2", - "sha256": "15kp2lsfci6p8wkrda12m4vf12p13xd9x5rh3ypc6yvz1snypgyy" + "commit": "2f95627b93dd49023b1d982329b4ccf8b7854109", + "sha256": "0l2dh75v1vmkh738iq5japh3fmqcinsb5s7qqirxlq54gznl7qm5" } }, { @@ -107698,15 +108100,15 @@ "repo": "cmpitg/wand", "unstable": { "version": [ - 20200302, - 1536 + 20210511, + 725 ], "deps": [ "dash", "s" ], - "commit": "731b5ca33269fe563239bff16da6c41489432b80", - "sha256": "0r5mbslwf3x0mrndz65w4pp88xii019zg5p6x214zxpr87s75zdp" + "commit": "08c3d9156517a31dd98ea64bfc269fae730b643c", + "sha256": "18xgi1anficjl6cnhhv197zbrnb0p63pnj8gshvixb6fr4ybw8k0" } }, { @@ -107837,19 +108239,20 @@ "repo": "bnbeckwith/wc-mode", "unstable": { "version": [ - 20200108, - 1841 + 20210418, + 47 ], - "commit": "79107d1130e8be3e1db4619373b98045b4fd9033", - "sha256": "01icd63mb2hg1bgbmkq3jm8kc3ic8whfy2awcgx53zqkmyz87qxc" + "commit": "63be1433b8a63cdc3239cc751e36360429c42b51", + "sha256": "1wzgb4z2qyyv223x5fc7ff2fn5xpz4s7lr1q1y33q8878a7w9d45" }, "stable": { "version": [ 1, - 4 + 4, + 1 ], - "commit": "79107d1130e8be3e1db4619373b98045b4fd9033", - "sha256": "01icd63mb2hg1bgbmkq3jm8kc3ic8whfy2awcgx53zqkmyz87qxc" + "commit": "63be1433b8a63cdc3239cc751e36360429c42b51", + "sha256": "1wzgb4z2qyyv223x5fc7ff2fn5xpz4s7lr1q1y33q8878a7w9d45" } }, { @@ -108115,6 +108518,36 @@ "sha256": "0a6nirdn1l7cymjycbns38ja9an1z4l5lwjk5h428aly3pmkvdqj" } }, + { + "ename": "weblio", + "commit": "eb75b14af27dbadba064b601ed06fd6124be3a8b", + "sha256": "0zgcnq6f978aly36xdzk5fzwsm6qymcscbxsmpmjkhhkggl24ll7", + "fetcher": "github", + "repo": "pzel/weblio", + "unstable": { + "version": [ + 20210511, + 2105 + ], + "deps": [ + "request" + ], + "commit": "ba0b745c3c11a93eaac826f74232f9eefbbae7a1", + "sha256": "00agkipgf6hc1bsrq460lydql8f04y42h4lh764k1fwg7x1a8pm2" + }, + "stable": { + "version": [ + 0, + 3, + 3 + ], + "deps": [ + "request" + ], + "commit": "ba0b745c3c11a93eaac826f74232f9eefbbae7a1", + "sha256": "00agkipgf6hc1bsrq460lydql8f04y42h4lh764k1fwg7x1a8pm2" + } + }, { "ename": "weblogger", "commit": "e8ccb10a5d1f4db3b20f96dee3c14ee64f4674e2", @@ -108141,14 +108574,14 @@ "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20210410, - 421 + 20210430, + 2251 ], "deps": [ "templatel" ], - "commit": "66bf957ace451ad0140e77d2fea235aefcd9ae26", - "sha256": "0qjrwpdi1zg8xbi9xnq5kpiw8dns1g899jh9vrsfqmkvr9vsm220" + "commit": "11ec801222eeb468878e6585efb55721592dbfe8", + "sha256": "01ipk5fwx5phsd6kr7kvdckhd19hly4szwlwl1a0jaxy0ab6iv54" }, "stable": { "version": [ @@ -108327,11 +108760,11 @@ "repo": "jstaursky/weyland-yutani-theme", "unstable": { "version": [ - 20210331, - 1857 + 20210511, + 1320 ], - "commit": "998c171becf2e589e65aae0283ebfee90c03d6df", - "sha256": "18zbawhrv9904frg686hlvqr4zqx62ay85igrwm8fr41wipxxhz6" + "commit": "4fedd7e72d200c1d36b4fa0bab10c68ef72f7135", + "sha256": "1x3cfx0v9m1fx7r1k9rjc77514isznsz31vwsidanyrd6cflk8wm" } }, { @@ -108511,10 +108944,10 @@ "version": [ 3, 5, - 1 + 2 ], - "commit": "c0608e812a8d1bc7aefeacdfaeb56a7272eabf44", - "sha256": "1g07i6hyv9glhk6xq1z9vn81vi2f0byy7dp3rg4gw22sm6f6d1al" + "commit": "5fb30301cb3b4fca5a0e1ce8ec1ef59290b79199", + "sha256": "1wgygby4zwlbx6ry6asraaixl169qdz092zgk1brvg63w7f8vkkb" } }, { @@ -108613,11 +109046,11 @@ "repo": "purcell/whitespace-cleanup-mode", "unstable": { "version": [ - 20200304, - 2227 + 20210510, + 533 ], - "commit": "3c5a7161c0dd0caa65e9a61640b06aff101be848", - "sha256": "1i4xnl178lbaqnrxxk9qxzz3v0krj4wawh8zyprh2xirgxqspks8" + "commit": "b108b73ddf8f7e747d5a20a681560171e02ad037", + "sha256": "13il7yi6j0cd995xzadbilhg50zcvzbpcqvivh9r1qbqq3q5aw1y" }, "stable": { "version": [ @@ -108660,19 +109093,19 @@ "repo": "lassik/emacs-whois", "unstable": { "version": [ - 20200715, - 1715 + 20210429, + 805 ], - "commit": "11d01c483ab3ba78b6ea1e195bda65b5e35f2d4c", - "sha256": "14w1cchij7i8a9m9z71dsz76aphidmvp8lbai4gaxxi4qiyvkcn3" + "commit": "6ce65ec5c992b1e1cb538610f1c3708e9d467c39", + "sha256": "0cz5c0zy4lz0534nfr2xf7p0d09ppcfdmry4335gx19vz47fj60n" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "7cc7e2734ec823bed6eb923387b3b33a1cde0c86", - "sha256": "0d8q8as85fjn2v65i25xv9bzg03mlk4jhxrbqrcg5ywjiv5i2ljg" + "commit": "6ce65ec5c992b1e1cb538610f1c3708e9d467c39", + "sha256": "0cz5c0zy4lz0534nfr2xf7p0d09ppcfdmry4335gx19vz47fj60n" } }, { @@ -109012,27 +109445,27 @@ "repo": "bmag/emacs-purpose", "unstable": { "version": [ - 20210411, - 1700 + 20210423, + 454 ], "deps": [ "imenu-list", "let-alist" ], - "commit": "dc4f8a00a8b0c1cf6242e1bf47f82e08c508a51e", - "sha256": "0h5s448dgpqi24fpmkbalw4w96jf9ny5gar8qjw0kqmcfxxny9b0" + "commit": "1a556294131a78b557f88bd28d42b43d5c6bd79a", + "sha256": "15v3225irmgg6zsv4h3zyqrbcgx9kbr6rzx5v5hgf9h16fgibi8j" }, "stable": { "version": [ 1, - 7 + 8 ], "deps": [ "imenu-list", "let-alist" ], - "commit": "a302340e183d20baa4445858d321f43449298829", - "sha256": "1dpy8hkjn87wbdkzyabhay4jx4dgc0ab2flyf0rjq1qaazk393sc" + "commit": "8f84defbb4d80ecaada37a2bbde2c1d8699f98af", + "sha256": "1bq0s56wj6ibyh625zfnisy8yniz72dpg4mcgq55azsbnd4fblqq" } }, { @@ -109211,8 +109644,8 @@ 20210405, 1410 ], - "commit": "4b4a8f05401bd08092518ddccdf35461f1124f5a", - "sha256": "16aknbzmh3a4lb0bzkljl70yx8v8g74vfji4h4iqvx013vwvqyp2" + "commit": "c67784cc0c44dc7c590f1f1f5a979a36b1e8c11d", + "sha256": "0pisq1b2yjfplv64xn33lw38ymmpr8wah84pfnwvzqnlfsn5s1hs" } }, { @@ -109253,11 +109686,11 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20210319, - 1930 + 20210427, + 1244 ], - "commit": "ebcbd3b137154e6c5a2b976bacbb89d48ddfa242", - "sha256": "0qir7kzvnlchpvmpl8gj11yqly6j5m260mmxny9xxwx0dzwaya4k" + "commit": "86bdff68a106bc9d383fdab3bbf1ad4b703a52f0", + "sha256": "1rk8vza2g8gxybhjk10xj3pw9whc80cs9qv4avyv926g7dw60as9" }, "stable": { "version": [ @@ -109580,8 +110013,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20210309, - 1513 + 20210504, + 1132 ], "deps": [ "ace-link", @@ -109589,8 +110022,8 @@ "swiper", "zoutline" ], - "commit": "fff12d4d3bb1ddf70cd0abb78aecd9133b367990", - "sha256": "1fbi0rv9pvh9bf72fjc3pfql9xfnw7zif0rsw0r2gn4sdn7202id" + "commit": "c99ef5478183d0ab56b0abe943206491c802e003", + "sha256": "1qbs5dvqcip7y77f8sdyr7zw64vgxlybj4isi7x841j4z7kh5m11" }, "stable": { "version": [ @@ -109630,11 +110063,11 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20210402, - 1450 + 20210511, + 1128 ], - "commit": "b182bf853ec408de014ba35527177c7cab90d620", - "sha256": "11rmv6wc7brw1la73y9dvmmx2pqaxxwm4087qkgr9vjg5h02k67d" + "commit": "f74a58f3cfb2e94cee4c4527b2f7aeb8fa5ab46c", + "sha256": "0m50xxi5nz08byxjdp5k20d075anv88lsdk1z2q66y2jqaqbxian" }, "stable": { "version": [ @@ -109740,20 +110173,20 @@ "repo": "bnbeckwith/writegood-mode", "unstable": { "version": [ - 20180525, - 1343 + 20210418, + 110 ], - "commit": "b71757ec337e226909fb0422f0224e31acc71733", - "sha256": "038gliy6l931r02bf2dbhmp188sgk1rq46ngg9nhf5q5rkf3pi8p" + "commit": "ed42d918d98826ad88928b7af9f2597502afc6b0", + "sha256": "1nwngnddlkcvix7qx39fadab7hqzg8snb0k63kwpr8v57lyrm48z" }, "stable": { "version": [ 2, 0, - 3 + 4 ], - "commit": "b71757ec337e226909fb0422f0224e31acc71733", - "sha256": "038gliy6l931r02bf2dbhmp188sgk1rq46ngg9nhf5q5rkf3pi8p" + "commit": "ed42d918d98826ad88928b7af9f2597502afc6b0", + "sha256": "1nwngnddlkcvix7qx39fadab7hqzg8snb0k63kwpr8v57lyrm48z" } }, { @@ -109894,11 +110327,11 @@ "repo": "ag91/writer-word-goals", "unstable": { "version": [ - 20210405, - 1155 + 20210503, + 656 ], - "commit": "77435ca396e7cc2685f4962e959070dbe1f70db1", - "sha256": "0kblcf1qfa06bwqm6pwwdmmpcipn3yjcjw09hmryipzhgf97zfxa" + "commit": "ef94f78b2c4e4fcf1a59d492637cbc84396cb032", + "sha256": "0xf2nvwvag21ds566r90rlf98hf80mz3zj2svhwmqrj6nm70p6z3" } }, { @@ -109979,26 +110412,26 @@ "repo": "skeeto/x86-lookup", "unstable": { "version": [ - 20210409, - 2313 + 20210412, + 2022 ], "deps": [ "cl-lib" ], - "commit": "5e194fdac8a1e12d87b8ed4edeb887eb5543c34d", - "sha256": "0f76qsb8hiryfgwkpymw5sicbmz1p48s0dxai1fmjlvaimrw56mm" + "commit": "1573d61cc4457737b94624598a891c837fb52c16", + "sha256": "16y13bwsfx4mm8p1n09f4443kh03hl7jvfvkbwdrm6dlbywiqq8m" }, "stable": { "version": [ 1, 2, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "609b2ba70dc5a246ac9b4b5f89eb5ef4331519bf", - "sha256": "19zgq7mcc3wx847xc911fibvphbsws99m2l3k54xdjp8mb5qfdzm" + "commit": "1573d61cc4457737b94624598a891c837fb52c16", + "sha256": "16y13bwsfx4mm8p1n09f4443kh03hl7jvfvkbwdrm6dlbywiqq8m" } }, { @@ -110099,11 +110532,11 @@ "repo": "xahlee/xah-math-input", "unstable": { "version": [ - 20210403, - 2312 + 20210419, + 1833 ], - "commit": "bc1ff04a11be7c3b728aa012324377305d48e087", - "sha256": "0q9civwf4mxapmq6hzrf3wimc7pfp28yipx007abchwimpdxvwws" + "commit": "6ccd3ca21aa71a2c1f831fabbdfc9e32c02e180d", + "sha256": "1bibdx0sawgsdzdiivy4x7rf4s5hnz2ypllwz9sk2fdmjyv8d08c" } }, { @@ -110159,11 +110592,11 @@ "url": "https://depp.brause.cc/xbm-life.git", "unstable": { "version": [ - 20201116, - 1119 + 20210508, + 1640 ], - "commit": "c5f442b152c46e5f31632e87be5c3a3c157a5ab1", - "sha256": "1481g835hk0j296jvjyawjcyj6lkvsjwz01r329i5bzhyvyn6lm5" + "commit": "ec6abb0182068294a379cb49ad5346b1d757457d", + "sha256": "19xh1pzh5kgfjjckg73ljylv14912an536rl04jahaxfknf4ypm6" }, "stable": { "version": [ @@ -110250,20 +110683,19 @@ "repo": "dandavison/xenops", "unstable": { "version": [ - 20210103, - 1339 + 20210504, + 1106 ], "deps": [ "aio", "auctex", "avy", "dash", - "dash-functional", "f", "s" ], - "commit": "5812aa55a816bb66d90443a6a634069d9fbfecf1", - "sha256": "1nwhrbpqgbcv1467zyjwww6r04k965fkrkc5v3iqzkg88ld43sj0" + "commit": "4994ae4a660ee94d341ce1905c12b4cf39fee574", + "sha256": "0cqvz8bkpjc4fmdn10zq70q3bvixx25yn13ihxygsdi1mjmn30fh" } }, { @@ -110560,11 +110992,7 @@ 1123 ], "commit": "8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503; retrying in 322 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503; retrying in 540 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503; retrying in 1079 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503; retrying in 2268 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503\n" - ] + "sha256": "07i9x2f1mgfr3d5v507ln5z8mh59zdzqv53yyyrcbhvr7j9vi1p3" } }, { @@ -110859,8 +111287,17 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20210406, - 156 + 20210424, + 2033 + ], + "commit": "d0abc17e3ddf42624d87fa6d2d3e1ba1dd175035", + "sha256": "19937d26gvj5ir1absb8rxyv35ac85xwvgb0nqcldmnqxqa2h66p" + }, + "stable": { + "version": [ + 0, + 2, + 1 ], "commit": "d8ac09e8cad7f67339e19c53e77da1cd0ff98d36", "sha256": "0wkrvhb5yhb38sf7w1njxij1x0pfxp56hn97j2bk4w58dz94fxir" @@ -110904,11 +111341,11 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20201109, - 1026 + 20210508, + 1641 ], - "commit": "fc5e1c58f94472944c4aa838f00f6adcac6fa992", - "sha256": "0gsa153yp8lmwrvcc3nzpw5lj037y7q2nm23k5k404r5as4k355l" + "commit": "3a57058468211f3cb18e71aecc630dcacb87636b", + "sha256": "1p09vzl6miafjhl9aw67day304wc27g72b0vcbr3barfgczypzsa" }, "stable": { "version": [ @@ -111108,11 +111545,11 @@ "repo": "emacsorphanage/yascroll", "unstable": { "version": [ - 20210108, - 1826 + 20210427, + 645 ], - "commit": "b9061340cc15a3ace3ca8c6e54512b481c71acf1", - "sha256": "1vr0p3q5pnnqpdfvnz29v8sjsldp22hghqb16gmj7l0n2xnlvyv3" + "commit": "bd20a61ab7cd610625137c051c7f15e7404b7829", + "sha256": "0mxl8qxj9vdr8cg9xkh2v901n8m1drk0wzf4di34vkgkmrlkigyg" }, "stable": { "version": [ @@ -111192,14 +111629,13 @@ "stable": { "version": [ 0, - 23 + 24 ], "deps": [ - "s", "yasnippet" ], - "commit": "e5ebfcdb38eb79a6d6705107d07f7bab2e2b5c38", - "sha256": "18pcnjnqvcky6i49p38vy3ms5xiisn27vy47pc3vsgr3r2n87mqb" + "commit": "be823d7e1a1a46454d60a9f3dabb16b68b5dd853", + "sha256": "0ak0drxlg3m2v4ya5chpgl82rcl7ic2nmnybhpw1qk51mcmv643y" } }, { @@ -111472,11 +111908,11 @@ "repo": "ryuslash/yoshi-theme", "unstable": { "version": [ - 20210324, - 1847 + 20210509, + 520 ], - "commit": "4ea0f4d8128951432169b1e6db3dd4ac42492e93", - "sha256": "177zh0d6ax9j1fdv569b0adnb873b2913b9pmj26y8ipsbg4iwa6" + "commit": "9a26f361083ed1d0dd56e659fae913ffea51c739", + "sha256": "1da39wyb8zhpyvqxld19cna0jdjhpdiwsmac6ari7nw8i8dvbbhw" }, "stable": { "version": [ @@ -111545,30 +111981,30 @@ "repo": "tuedachu/ytdl", "unstable": { "version": [ - 20201017, - 1024 + 20210506, + 914 ], "deps": [ "async", "dash", "transient" ], - "commit": "8ef80b85f766cc1f93a932e64604998cfe7f6f03", - "sha256": "1xv93ny942gha1ipic5r6z4icjsb7src7ssdck9983kks3zacjk7" + "commit": "23da64f5c38b8cb83dbbadf704171b86cc0fa937", + "sha256": "010arhvibyw50lqhsr8bm0vj3pzry1h1vgcvxnmyryirk3dv40jl" }, "stable": { "version": [ 1, 3, - 5 + 6 ], "deps": [ "async", "dash", "transient" ], - "commit": "8ef80b85f766cc1f93a932e64604998cfe7f6f03", - "sha256": "1xv93ny942gha1ipic5r6z4icjsb7src7ssdck9983kks3zacjk7" + "commit": "23da64f5c38b8cb83dbbadf704171b86cc0fa937", + "sha256": "010arhvibyw50lqhsr8bm0vj3pzry1h1vgcvxnmyryirk3dv40jl" } }, { @@ -111880,15 +112316,15 @@ "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20210409, - 2126 + 20210506, + 2009 ], "deps": [ "ace-window", "deft" ], - "commit": "c21705202180d16fa9f3a652e6e3af9ddc868a3b", - "sha256": "1ghrbz9azzddmgidbiqg3c0mqidgsjhryy03id0ln3bnv1z51vwn" + "commit": "3f9c95df6009620425e8b41e7345835a40dd9862", + "sha256": "0jk11s6pbkisxlhl1940gyhrc5cngzar45w45h9pnsg7922vv7b1" }, "stable": { "version": [ @@ -111942,11 +112378,11 @@ "repo": "ziglang/zig-mode", "unstable": { "version": [ - 20201022, - 955 + 20210412, + 1428 ], - "commit": "6f10653cc17b9c74150ac2f6833eaaaf55488398", - "sha256": "00mz9z181ppr6ad9614k24vlzi4b6flqzzwc1f8vlp7ixnk9i47g" + "commit": "2d0eb23e6b5c12b946f12c23803157605c90f02f", + "sha256": "0lpsqclk37nx8i9jfskbnvxrhvh6vaflgh63xijhv9ajx2iwpw0r" } }, { @@ -112012,14 +112448,14 @@ "repo": "nnicandro/emacs-zmq", "unstable": { "version": [ - 20210402, - 2340 + 20210424, + 1943 ], "deps": [ "cl-lib" ], - "commit": "0a186a732b78aeb86599ea8123b36c4885789c7d", - "sha256": "0i6ghqwh35gnyz5b8ipbk030byibcmiy207pvplgszz39sjjjfp6" + "commit": "790033363cf0e78c616cfe117a2f681381e96f29", + "sha256": "0vssi5d02s7f9rhsgqnbh4ql2nvjcc4hsrmihwrk1ij50pn927yj" }, "stable": { "version": [ @@ -112048,8 +112484,8 @@ "deps": [ "cl-lib" ], - "commit": "e795739ec182d217ffaf3c595819c308911540ee", - "sha256": "108bw2k255rkngfkp5iff1frsirc06j70ar1gcrh9lc3fcxdawlp" + "commit": "57d89fc1e17d94a8e9f3365b0d647a80520cc4a8", + "sha256": "0vbpc5lav8pw7caa4442z15a5s1l9wzjv68dgrbjnjvpn6yz3pay" } }, { @@ -112107,14 +112543,14 @@ "url": "https://depp.brause.cc/zone-nyan.git", "unstable": { "version": [ - 20200506, - 1207 + 20210508, + 1642 ], "deps": [ "esxml" ], - "commit": "253a0484ea5076c0f485c561a3f8370ba560f4f2", - "sha256": "094kn0yxgzl9c39qm12h9cp6yia2rhaxwf9zmq2lk5x93nnss6m5" + "commit": "38b6e9f1f5871e9166b00a1db44680caa56773be", + "sha256": "10zb1ffq98jxzzym1ss9ly9ydbkrqynlkwn6s2hbc3h0av5ymmaq" }, "stable": { "version": [ @@ -112287,20 +112723,30 @@ "repo": "fvdbeek/emacs-zotero", "unstable": { "version": [ - 20210406, - 2204 + 20210512, + 820 ], "deps": [ "ht", "oauth", "s" ], - "commit": "bee8196c5db26b75abc1359a5a7cb8a2b1f192ad", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503; retrying in 324 ms\nwarning: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503; retrying in 632 ms\nwarning: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503; retrying in 1159 ms\nwarning: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503; retrying in 2278 ms\nerror: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503\n" - ] + "commit": "15eb7a8d099c93440f0a8920499633103f00fc83", + "sha256": "13mrssrkcjrrpc470rjpb3mwjfdsyvr4i8niqza54rzk0zxj2m95" + }, + "stable": { + "version": [ + 0, + 2, + 2 + ], + "deps": [ + "ht", + "oauth", + "s" + ], + "commit": "15eb7a8d099c93440f0a8920499633103f00fc83", + "sha256": "13mrssrkcjrrpc470rjpb3mwjfdsyvr4i8niqza54rzk0zxj2m95" } }, { @@ -112318,8 +112764,8 @@ "deferred", "request" ], - "commit": "a760009b9ecfa0b3362e77a6b44453821768d02e", - "sha256": "0vfdpgb0ln3xrx4i32mqisaj7qm2yx73rhagx6adr8hjw78gysfy" + "commit": "45961801f9e0350d7457d0d84c5004f63aed9070", + "sha256": "18hi6m2ngl9yz599q5bhifafi4vz1adc06bjl0bhb3rs62vbkwk2" }, "stable": { "version": [ @@ -112417,14 +112863,14 @@ "repo": "fourier/ztree", "unstable": { "version": [ - 20210409, - 1841 + 20210415, + 1947 ], "deps": [ "cl-lib" ], - "commit": "c9ad9136d52ca5a81475693864e255d29448f43f", - "sha256": "03i5pa3nfdz6g0yrdk7r2qcn679w0s85cc5kcmgrwlnhdzakgr80" + "commit": "f05677f9696e573c8c607e8876fb4a0cccbc491f", + "sha256": "1kav7xiarm0dgvgxf49qqcy2jp388b51x3qb92dyd3i73n6bk09j" } }, { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix index 412ed59f2a..8e29fd48c8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -1,30 +1,42 @@ -{ lib, stdenv, fetchgit, emacs }: +{ lib +, stdenv +, fetchFromGitHub +, emacs +}: -stdenv.mkDerivation { - name = "sunrise-commander-6r435"; +stdenv.mkDerivation rec { + pname = "sunrise-commander"; + version = "0.0.0-unstable=2021-04-23"; - src = fetchgit { - url = "https://github.com/escherdragon/sunrise-commander.git"; - rev = "7a44ca7abd9fe79f87934c78d00dc2a91419a4f1"; - sha256 = "2909beccc9daaa79e70876ac6547088c2459b624c364dda1886fe4d7adc7708b"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "db880fbea03d2db00db1398c91918c3c6f0392e3"; + hash = "sha256-IGHCKYQaGUapaA9vxq0xO58KCpBPOiQpHqrEaHK0usE="; }; - buildInputs = [ emacs ]; + buildInputs = [ + emacs + ]; buildPhase = '' - emacs -L . --batch -f batch-byte-compile *.el + runHook preBuild + emacs -q --no-splash --directory=. --batch --file=batch-byte-compile *.el + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir -p $out/share/emacs/site-lisp install *.el* $out/share/emacs/site-lisp + runHook postInstall ''; - meta = { - description = "Two-pane file manager for Emacs based on Dired and inspired by MC"; - homepage = "http://www.emacswiki.org/emacs/Sunrise_Commander"; - license = lib.licenses.gpl3Plus; - - platforms = lib.platforms.all; + meta = with lib; { + homepage = "https://github.com/sunrise-commander/sunrise-commander/"; + description = "Orthodox (two-pane) file manager for Emacs"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix index 4c32106544..7502bcc2fe 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix @@ -29,7 +29,7 @@ let in [ promise semaphore ]); in pkgs.mkShell { - buildInputs = [ + packages = [ pkgs.git pkgs.nix pkgs.bash diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix index 6726790d50..ad044d3968 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix @@ -7,7 +7,7 @@ , patches ? [ ] }: { stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm -, Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, libungif +, Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , jansson, harfbuzz @@ -94,8 +94,8 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ])); in '' substituteInPlace lisp/emacs-lisp/comp.el --replace \ - "(defcustom comp-native-driver-options nil" \ - "(defcustom comp-native-driver-options '(${backendPath})" + "(defcustom native-comp-driver-options nil" \ + "(defcustom native-comp-driver-options '(${backendPath})" '')) "" ]; @@ -108,7 +108,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext jansson harfbuzz.dev ] ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ] ++ lib.optionals withX - [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff libXft + [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg giflib libtiff libXft gconf cairo ] ++ lib.optionals (withX || withNS) [ librsvg ] ++ lib.optionals withImageMagick [ imagemagick ] @@ -175,7 +175,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { (comp-trampoline-compile (intern (pop argv))))" mkdir -p $out/share/emacs/native-lisp $out/bin/emacs --batch \ - --eval "(add-to-list 'comp-eln-load-path \"$out/share/emacs/native-lisp\")" \ + --eval "(add-to-list 'native-comp-eln-load-path \"$out/share/emacs/native-lisp\")" \ -f batch-native-compile $out/share/emacs/site-lisp/site-start.el ''; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/macport.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/macport.nix index b8fcc678fa..8c395219ae 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/macport.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/macport.nix @@ -5,20 +5,20 @@ stdenv.mkDerivation rec { pname = "emacs"; - version = "27.1"; + version = "27.2"; emacsName = "emacs-${version}"; - macportVersion = "8.0"; + macportVersion = "8.2"; name = "emacs-mac-${version}-${macportVersion}"; src = fetchurl { url = "mirror://gnu/emacs/${emacsName}.tar.xz"; - sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a"; + sha256 = "1ff182gjw9wqsbx1kj5gl2r5pbqhp4ar54g04j33fgz6g17cr9xl"; }; macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; - sha256 = "0rjk82k9qp1g701pfd4f0q2myzvsnp9q8xzphlxwi5yzwbs91kjq"; + sha256 = "1bgm2g3ky7rkj1l27wnmyzqsqxzjng7y9bf72ym37wiyhyi2a9za"; }; hiresSrc = fetchurl { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/site-start.el b/third_party/nixpkgs/pkgs/applications/editors/emacs/site-start.el index 01a6422d73..3f9ec25d99 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/site-start.el +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/site-start.el @@ -47,11 +47,11 @@ least specific (the system profile)" ;;; Set up native-comp load path. (when (featurep 'comp) ;; Append native-comp subdirectories from `NIX_PROFILES'. - (setq comp-eln-load-path + (setq native-comp-eln-load-path (append (mapcar (lambda (profile-dir) (concat profile-dir "/share/emacs/native-lisp/")) (nix--profile-paths)) - comp-eln-load-path))) + native-comp-eln-load-path))) ;;; Make `woman' find the man pages (defvar woman-manpath) diff --git a/third_party/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix b/third_party/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix index 2249009af7..d23b42811b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "ghostwriter"; - version = "2.0.0-rc5"; + version = "2.0.1"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = version; - sha256 = "sha256-Gc0/AHxxJd5Cq3dBQ0Xy2TF78CBmQFYUzm4s7q1aHEE="; + sha256 = "sha256-bNVhYwX60F3lrP9UmZSntfz83vbmHe9tu/4nUgzUWR4="; }; nativeBuildInputs = [ qmake pkg-config qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix index da7b70cecd..998341d6bb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix @@ -6,7 +6,7 @@ , docbook_xml_dtd_43 , fetchurl , flatpak -, gnome3 +, gnome , libgit2-glib , gobject-introspection , glade @@ -34,16 +34,16 @@ , webkitgtk , wrapGAppsHook , dbus -, xvfb_run +, xvfb-run }: stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.38.2"; + version = "3.40.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "jFNco64yoZC1TZbTIHGVf+wBYYQHo2JRiMZFHngzYTs="; + sha256 = "16kikslvcfjqj4q3j857mq9i8cyd965b3lvfzcwijc91x3ylr15j"; }; nativeBuildInputs = [ @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ ctags flatpak - gnome3.devhelp + gnome.devhelp glade libgit2-glib libpeas @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { checkInputs = [ dbus - xvfb_run + xvfb-run ]; outputs = [ "out" "devdoc" ]; @@ -99,7 +99,6 @@ stdenv.mkDerivation rec { ''; mesonFlags = [ - "-Dpython_libprefix=${python3.libPrefix}" "-Ddocs=true" # Making the build system correctly detect clang header and library paths @@ -135,7 +134,10 @@ stdenv.mkDerivation rec { done ''; - passthru.updateScript = gnome3.updateScript { packageName = pname; }; + passthru.updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; meta = with lib; { description = "An IDE for writing GNOME-based software"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix new file mode 100644 index 0000000000..534466db8d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix @@ -0,0 +1,117 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, python3, perl, bison +, texinfo, desktop-file-utils, wrapGAppsHook, docbook2x, docbook-xsl-nons +, inform7, gettext, libossp_uuid, gtk3, gobject-introspection, vala, gtk-doc +, webkitgtk, gtksourceview3, gspell, libxml2, goocanvas2, libplist, glib +, gst_all_1 }: + +# Neither gnome-inform7 nor its dependencies ratify and chimara have tagged releases in the GTK3 branch yet. + +let + ratify = (stdenv.mkDerivation { + pname = "ratify"; + version = "unstable-2021-02-21"; + src = fetchFromGitHub { + owner = "ptomato"; + repo = "ratify"; + rev = "f4d2d60ec73d5588e953650b3879e69a727f30ca"; + sha256 = "eRh/9pYvdfbdbdJQ7pYMLq5p91I+rtyb/AqEGfakjKs="; + }; + nativeBuildInputs = [ + meson + ninja + pkg-config + docbook2x + docbook-xsl-nons + ]; + buildInputs = [ + gtk3 + gobject-introspection + vala gtk-doc + wrapGAppsHook + ]; + }); + + chimara = (stdenv.mkDerivation { + pname = "chimara"; + version = "unstable-2021-04-06"; + src = fetchFromGitHub { + owner = "chimara"; + repo = "Chimara"; + rev = "9934b142af508c75c0f1eed597990f39495b1af4"; + sha256 = "aRz1XX8XaSLTBIrMIIMS3QNMm6Msi+slrZ6+KYlyRMo="; + }; + nativeBuildInputs = [ + meson + ninja + pkg-config + perl + bison + texinfo + python3 + glib + wrapGAppsHook + ]; + buildInputs = [ + gtk3 + gobject-introspection + vala + gtk-doc + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + glib + ]; + preConfigure = '' + patchShebangs build-aux/meson_post_install.py + ''; + }); + +in stdenv.mkDerivation { + pname = "gnome-inform7"; + version = "unstable-2021-04-06"; + src = fetchFromGitHub { + owner = "ptomato"; + repo = "gnome-inform7"; + # build from revision in the GTK3 branch as mainline requires webkit-1.0 + rev = "c37e045c159692aae2e4e79b917e5f96cfefa66a"; + sha256 = "Q4xoITs3AYXhvpWaABRAvJaUWTtUl8lYQ1k9zX7FrNw="; + }; + nativeBuildInputs = [ + meson + ninja + pkg-config + inform7 + python3 + desktop-file-utils + wrapGAppsHook + ]; + buildInputs = [ + gettext + libossp_uuid + gtk3 + gtksourceview3 + gspell + webkitgtk + libxml2 + goocanvas2 + libplist + ratify + chimara + ]; + preConfigure = '' + cp ${inform7}/libexec/ni ./src/ni + patchShebangs build-aux/* src/generate-resource-xml.{py,sh} + ''; + + meta = with lib; { + description = "Inform 7 for the Gnome platform"; + longDescription = '' + This version of Inform 7 for the Gnome platform was created by Philip Chimento, based on a design by Graham Nelson and Andrew Hunter. + ''; + homepage = "https://github.com/ptomato/gnome-inform7"; + license = licenses.gpl3Only; + maintainers = [ maintainers.fitzgibbon ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix index 7967b78f13..8fc6feecd5 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix @@ -1,21 +1,49 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee -, tepl, amtk, gnome3, glib, pkg-config, intltool, itstool, libxml2 }: -let +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, gtk-doc +, vala +, gobject-introspection +, wrapGAppsHook +, gsettings-desktop-schemas +, gspell +, gtksourceview4 +, libgee +, tepl +, amtk +, gnome +, glib +, pkg-config +, intltool +, itstool +, libxml2 +}: + +stdenv.mkDerivation rec { version = "3.38.0"; pname = "gnome-latex"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xqd49pgi82dygqnxj08i1v22b0vwwhx3zvdinhrx4jny339yam8"; }; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - configureFlags = ["--disable-dconf-migration"]; + patches = [ + # Fix build with latest tepl. + (fetchpatch { + url = "https://gitlab.gnome.org/Archive/gnome-latex/commit/e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9.patch"; + sha256 = "H8cbp5hDZoXytEdKE2D/oYHNKIbEFwxQoEaC4JMfGHY="; + }) + ]; nativeBuildInputs = [ pkg-config + autoreconfHook + gtk-doc + vala + gobject-introspection wrapGAppsHook itstool intltool @@ -23,7 +51,7 @@ in stdenv.mkDerivation { buildInputs = [ amtk - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme glib gsettings-desktop-schemas gspell @@ -33,9 +61,18 @@ in stdenv.mkDerivation { tepl ]; + configureFlags = [ + "--disable-dconf-migration" + ]; + doCheck = true; - passthru.updateScript = gnome3.updateScript { packageName = pname; }; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + passthru.updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; meta = with lib; { homepage = "https://wiki.gnome.org/Apps/GNOME-LaTeX"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/gobby/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gobby/default.nix index 27047f8e95..35e96c89da 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gobby/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gobby/default.nix @@ -1,6 +1,6 @@ { avahiSupport ? false # build support for Avahi in libinfinity , lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook, yelp-tools -, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }: +, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome }: let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/jove/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jove/default.nix index 0b60b9474b..c262527166 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jove/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jove/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "jove"; - version = "4.17.3.6"; + version = "4.17.3.7"; src = fetchFromGitHub { owner = "jonmacs"; repo = "jove"; rev = version; - sha256 = "sha256-uQRNKV06ipOHrOsvsceqIFGGlRv5qOQy18q0tFkR6Kg="; + sha256 = "sha256-fD87FIWZlfJE2tVX+0QaiGGqu+tJFHheXe1guJR/Hxg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/jucipp/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jucipp/default.nix index 7304219e23..140bf04c9f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jucipp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jucipp/default.nix @@ -56,8 +56,8 @@ stdenv.mkDerivation rec { e = "\");"; v = lib.getVersion llvmPackages.clang; in - p+llvmPackages.libcxx+"/include/c++/v1"+e - +p+llvmPackages.clang-unwrapped+"/lib/clang/"+v+"/include/"+e + p+llvmPackages.libcxx.dev+"/include/c++/v1"+e + +p+llvmPackages.clang-unwrapped.lib+"/lib/clang/"+v+"/include/"+e +p+glibc.dev+"/include"+e; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/overrides.nix index 2ca24cf661..fb1287ba49 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/overrides.nix @@ -34,13 +34,13 @@ self: super: { kak-ansi = stdenv.mkDerivation rec { pname = "kak-ansi"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "eraserhd"; repo = "kak-ansi"; rev = "v${version}"; - sha256 = "pO7M3MjKMJQew9O20KALEvsXLuCKPYGGTtuN/q/kj8Q="; + sha256 = "kFjTYFy0KF5WWEHU4hHFAnD/03/d3ptjqMMbTSaGImE="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix b/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix index b54015de7b..8894707643 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -23,7 +23,7 @@ mkDerivation rec { buildInputs = [ kdevelop-pg-qt - llvmPackages.llvm llvmPackages.clang-unwrapped + llvmPackages.llvm llvmPackages.libclang ]; propagatedBuildInputs = [ @@ -37,7 +37,7 @@ mkDerivation rec { # https://cgit.kde.org/kdevelop.git/commit/?id=716372ae2e8dff9c51e94d33443536786e4bd85b # required as nixos seems to be unable to find CLANG_BUILTIN_DIR cmakeFlags = [ - "-DCLANG_BUILTIN_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${lib.getVersion llvmPackages.clang}/include" + "-DCLANG_BUILTIN_DIR=${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include" ]; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/Cargo.lock b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/Cargo.lock new file mode 100644 index 0000000000..4e37d0fbfa --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/Cargo.lock @@ -0,0 +1,3292 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9fe5e32de01730eb1f6b7f5b51c17e03e2325bf40a74f754f04f130043affff" + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + +[[package]] +name = "ahash" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29661b60bec623f0586702976ff4d0c9942dcb6723161c2df0eea78455cfedfb" +dependencies = [ + "const-random", +] + +[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + +[[package]] +name = "andrew" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7f09f89872c2b6b29e319377b1fbe91c6f5947df19a25596e121cf19a7b35e" +dependencies = [ + "bitflags", + "line_drawing", + "rusttype 0.7.9", + "walkdir", + "xdg", + "xml-rs", +] + +[[package]] +name = "andrew" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4afb09dd642feec8408e33f92f3ffc4052946f6b20f32fb99c1f58cd4fa7cf" +dependencies = [ + "bitflags", + "rusttype 0.9.2", + "walkdir", + "xdg", + "xml-rs", +] + +[[package]] +name = "android_log-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8052e2d8aabbb8d556d6abbcce2a22b9590996c5f849b9c7ce4544a2e3b984e" + +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "anyhow" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" + +[[package]] +name = "approx" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ash" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c69a8137596e84c22d57f3da1b5de1d4230b1742a710091c85f4d7ce50f00f38" +dependencies = [ + "libloading 0.6.7", +] + +[[package]] +name = "ash-window" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905c4ca25f752e7ab3c3e8f2882625f876e4c3ea5feffbc83f81d697e043afd6" +dependencies = [ + "ash", + "raw-window-handle", + "raw-window-metal", +] + +[[package]] +name = "async-trait" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "autocfg" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "bindgen" +version = "0.55.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b13ce559e6433d360c26305643803cb52cfbabbc2b9c47ce04a58493dfb443" +dependencies = [ + "bitflags", + "cexpr", + "cfg-if 0.1.10", + "clang-sys", + "clap", + "env_logger", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "proc-macro2 1.0.26", + "quote 1.0.9", + "regex", + "rustc-hash", + "shlex", + "which 3.1.1", +] + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" +dependencies = [ + "byteorder", + "iovec", +] + +[[package]] +name = "bytes" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + +[[package]] +name = "calloop" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aa2097be53a00de9e8fc349fea6d76221f398f5c4fa550d420669906962d160" +dependencies = [ + "mio", + "mio-extras", + "nix 0.14.1", +] + +[[package]] +name = "calloop" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b036167e76041694579972c28cf4877b4f92da222560ddb49008937b6a6727c" +dependencies = [ + "log", + "nix 0.18.0", +] + +[[package]] +name = "cargo-husky" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b02b629252fe8ef6460461409564e2c21d0c8e77e0944f3d189ff06c4e932ad" + +[[package]] +name = "cc" +version = "1.0.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" + +[[package]] +name = "cexpr" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +dependencies = [ + "nom 5.1.2", +] + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "time", + "winapi 0.3.9", +] + +[[package]] +name = "clang-sys" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c" +dependencies = [ + "glob", + "libc", + "libloading 0.7.0", +] + +[[package]] +name = "clap" +version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim 0.8.0", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ + "bitflags", +] + +[[package]] +name = "cmake" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855" +dependencies = [ + "cc", +] + +[[package]] +name = "cocoa" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c49e86fc36d5704151f5996b7b3795385f50ce09e3be0f47a0cfde869681cf8" +dependencies = [ + "bitflags", + "block", + "core-foundation 0.7.0", + "core-graphics 0.19.2", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c54201c07dcf3a5ca33fececb8042aed767ee4bfd5a0235a8ceabcda956044b2" +dependencies = [ + "bitflags", + "block", + "cocoa-foundation", + "core-foundation 0.9.1", + "core-graphics 0.22.2", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832" +dependencies = [ + "bitflags", + "block", + "cocoa-foundation", + "core-foundation 0.9.1", + "core-graphics 0.22.2", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" +dependencies = [ + "bitflags", + "block", + "core-foundation 0.9.1", + "core-graphics-types", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "const-random" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40" +dependencies = [ + "getrandom 0.2.2", + "lazy_static", + "proc-macro-hack", + "tiny-keccak", +] + +[[package]] +name = "core-foundation" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +dependencies = [ + "core-foundation-sys 0.7.0", + "libc", +] + +[[package]] +name = "core-foundation" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +dependencies = [ + "core-foundation-sys 0.8.2", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" + +[[package]] +name = "core-foundation-sys" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" + +[[package]] +name = "core-graphics" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" +dependencies = [ + "bitflags", + "core-foundation 0.7.0", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "269f35f69b542b80e736a20a89a05215c0ce80c2c03c514abb2e318b78379d86" +dependencies = [ + "bitflags", + "core-foundation 0.9.1", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +dependencies = [ + "bitflags", + "core-foundation 0.9.1", + "foreign-types", + "libc", +] + +[[package]] +name = "core-text" +version = "19.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" +dependencies = [ + "core-foundation 0.9.1", + "core-graphics 0.22.2", + "foreign-types", + "libc", +] + +[[package]] +name = "core-video-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828" +dependencies = [ + "cfg-if 0.1.10", + "core-foundation-sys 0.7.0", + "core-graphics 0.19.2", + "libc", + "objc", +] + +[[package]] +name = "crc32fast" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crossbeam" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" +dependencies = [ + "cfg-if 0.1.10", + "crossbeam-channel 0.4.4", + "crossbeam-deque 0.7.3", + "crossbeam-epoch 0.8.2", + "crossbeam-queue", + "crossbeam-utils 0.7.2", +] + +[[package]] +name = "crossbeam-channel" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +dependencies = [ + "crossbeam-utils 0.7.2", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.4", +] + +[[package]] +name = "crossbeam-deque" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" +dependencies = [ + "crossbeam-epoch 0.8.2", + "crossbeam-utils 0.7.2", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch 0.9.4", + "crossbeam-utils 0.8.4", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +dependencies = [ + "autocfg 1.0.1", + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", + "lazy_static", + "maybe-uninit", + "memoffset 0.5.6", + "scopeguard", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52fb27eab85b17fbb9f6fd667089e07d6a2eb8743d02639ee7f6a7a7729c9c94" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.4", + "lazy_static", + "memoffset 0.6.3", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +dependencies = [ + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-utils" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +dependencies = [ + "autocfg 1.0.1", + "cfg-if 0.1.10", + "lazy_static", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278" +dependencies = [ + "autocfg 1.0.1", + "cfg-if 1.0.0", + "lazy_static", +] + +[[package]] +name = "crossfire" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8434f61eb40fc72030b18a370f7a06b428d27de66b0281977967216312b14dc7" +dependencies = [ + "async-trait", + "crossbeam", + "futures 0.3.15", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "curl" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adba2012502267c1fdde381e0e3acc44bf8be96b2f7d455089dcc2c8ad2f67bd" +dependencies = [ + "curl-sys", + "libc", + "openssl-probe", + "openssl-sys", + "schannel", + "socket2", + "winapi 0.3.9", +] + +[[package]] +name = "curl-sys" +version = "0.4.43+curl-7.76.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a802c7a9828b7d139efaed1bc92471ab6681ed86d19a105605f5eadcb0837d11" +dependencies = [ + "cc", + "libc", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", + "winapi 0.3.9", +] + +[[package]] +name = "darling" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2 1.0.26", + "quote 1.0.9", + "strsim 0.9.3", + "syn 1.0.72", +] + +[[package]] +name = "darling_macro" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +dependencies = [ + "darling_core", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "deflate" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" +dependencies = [ + "adler32", + "byteorder", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "derive-new" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "difference" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" + +[[package]] +name = "dirs" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +dependencies = [ + "cfg-if 0.1.10", + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dlib" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76" +dependencies = [ + "libloading 0.6.7", +] + +[[package]] +name = "dlib" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" +dependencies = [ + "libloading 0.7.0", +] + +[[package]] +name = "downcast" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bb454f0228b18c7f4c3b0ebbee346ed9c52e7443b0999cd543ff3571205701d" + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "dwrote" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" +dependencies = [ + "lazy_static", + "libc", + "winapi 0.3.9", + "wio", +] + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "encoding_rs" +version = "0.8.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "euclid" +version = "0.20.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb7ef65b3777a325d1eeefefab5b6d4959da54747e33bd6258e789640f307ad" +dependencies = [ + "num-traits", +] + +[[package]] +name = "expat-sys" +version = "2.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" +dependencies = [ + "cmake", + "pkg-config", +] + +[[package]] +name = "filetime" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.2.8", + "winapi 0.3.9", +] + +[[package]] +name = "flate2" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" +dependencies = [ + "cfg-if 1.0.0", + "crc32fast", + "libc", + "miniz_oxide", +] + +[[package]] +name = "flexi_logger" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "515fb7f6541dafe542c87c12a7ab6a52190cccb6c348b5951ef62d9978189ae8" +dependencies = [ + "chrono", + "glob", + "log", + "regex", +] + +[[package]] +name = "float-cmp" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "float-ord" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "font-kit" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f9042cb45150fb2b2a012fc03d0f1d2071f18e90397b9d2a5ec8ade8464bf20" +dependencies = [ + "bitflags", + "byteorder", + "core-foundation 0.9.1", + "core-graphics 0.22.2", + "core-text", + "dirs", + "dwrote", + "float-ord", + "freetype", + "lazy_static", + "libc", + "log", + "pathfinder_geometry", + "pathfinder_simd", + "servo-fontconfig", + "walkdir", + "winapi 0.3.9", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "fragile" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2" + +[[package]] +name = "freetype" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6" +dependencies = [ + "freetype-sys", + "libc", +] + +[[package]] +name = "freetype-sys" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" +dependencies = [ + "cmake", + "libc", + "pkg-config", +] + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] +name = "futures" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" + +[[package]] +name = "futures" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" + +[[package]] +name = "futures-executor" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" + +[[package]] +name = "futures-macro" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" +dependencies = [ + "autocfg 1.0.1", + "proc-macro-hack", + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "futures-sink" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" + +[[package]] +name = "futures-task" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" + +[[package]] +name = "futures-util" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" +dependencies = [ + "autocfg 1.0.1", + "futures 0.1.31", + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite 0.2.6", + "pin-utils", + "proc-macro-hack", + "proc-macro-nested", + "slab", + "tokio-io", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.10.2+wasi-snapshot-preview1", +] + +[[package]] +name = "gif" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "471d90201b3b223f3451cd4ad53e34295f16a1df17b1edf3736d47761c3981af" +dependencies = [ + "color_quant", + "lzw", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "harfbuzz" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "776caa9519beb53f697d578b6777eebd1262265c84ae797620b7f8f9b3648d91" +dependencies = [ + "harfbuzz-sys", +] + +[[package]] +name = "harfbuzz-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf8c27ca13930dc4ffe474880040fe9e0f03c2121600dc9c95423624cab3e467" +dependencies = [ + "cc", + "core-graphics 0.22.2", + "core-text", + "foreign-types", + "freetype", + "pkg-config", +] + +[[package]] +name = "hashbrown" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead" +dependencies = [ + "ahash", + "autocfg 0.1.7", +] + +[[package]] +name = "heck" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +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 = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "image" +version = "0.22.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08ed2ada878397b045454ac7cfb011d73132c59f31a955d230bd1f1c2e68eb4a" +dependencies = [ + "byteorder", + "gif", + "jpeg-decoder", + "num-iter", + "num-rational", + "num-traits", + "png", + "scoped_threadpool", + "tiff", +] + +[[package]] +name = "inflate" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" +dependencies = [ + "adler32", +] + +[[package]] +name = "instant" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "itoa" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jpeg-decoder" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" +dependencies = [ + "rayon", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" + +[[package]] +name = "libloading" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" +dependencies = [ + "cfg-if 1.0.0", + "winapi 0.3.9", +] + +[[package]] +name = "libloading" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" +dependencies = [ + "cfg-if 1.0.0", + "winapi 0.3.9", +] + +[[package]] +name = "libz-sys" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "line_drawing" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc7ad3d82c845bdb5dde34ffdcc7a5fb4d2996e1e1ee0f19c33bc80e15196b9" +dependencies = [ + "num-traits", +] + +[[package]] +name = "lock_api" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "lock_api" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "lru" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0609345ddee5badacf857d4f547e0e5a2e987db77085c24cd887f73573a04237" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "lzw" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + +[[package]] +name = "memchr" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" + +[[package]] +name = "memmap" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "memmap2" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" +dependencies = [ + "autocfg 1.0.1", +] + +[[package]] +name = "memoffset" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d" +dependencies = [ + "autocfg 1.0.1", +] + +[[package]] +name = "miniz_oxide" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +dependencies = [ + "adler", + "autocfg 1.0.1", +] + +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow 0.2.2", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "mio-extras" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" +dependencies = [ + "lazycell", + "log", + "mio", + "slab", +] + +[[package]] +name = "mio-named-pipes" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" +dependencies = [ + "log", + "mio", + "miow 0.3.7", + "winapi 0.3.9", +] + +[[package]] +name = "mio-uds" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" +dependencies = [ + "iovec", + "libc", + "mio", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] +name = "miow" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "mockall" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01458f8a19b10cb28195290942e3149161c75acf67ebc8fbf714ab67a2b943bc" +dependencies = [ + "cfg-if 0.1.10", + "downcast", + "fragile", + "lazy_static", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a673cb441f78cd9af4f5919c28576a3cc325fb6b54e42f7047dacce3c718c17b" +dependencies = [ + "cfg-if 0.1.10", + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "ndk" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a356cafe20aee088789830bfea3a61336e84ded9e545e00d3869ce95dcb80c" +dependencies = [ + "jni-sys", + "ndk-sys 0.1.0", + "num_enum", +] + +[[package]] +name = "ndk" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eb167c1febed0a496639034d0c76b3b74263636045db5489eee52143c246e73" +dependencies = [ + "jni-sys", + "ndk-sys 0.2.1", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-glue" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1730ee2e3de41c3321160a6da815f008c4006d71b095880ea50e17cf52332b8" +dependencies = [ + "android_log-sys", + "lazy_static", + "libc", + "log", + "ndk 0.1.0", + "ndk-sys 0.1.0", +] + +[[package]] +name = "ndk-glue" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdf399b8b7a39c6fb153c4ec32c72fd5fe789df24a647f229c239aa7adb15241" +dependencies = [ + "lazy_static", + "libc", + "log", + "ndk 0.2.1", + "ndk-macro", + "ndk-sys 0.2.1", +] + +[[package]] +name = "ndk-macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" +dependencies = [ + "darling", + "proc-macro-crate", + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "ndk-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2820aca934aba5ed91c79acc72b6a44048ceacc5d36c035ed4e051f12d887d" + +[[package]] +name = "ndk-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d" + +[[package]] +name = "neovide" +version = "0.7.0" +dependencies = [ + "anyhow", + "async-trait", + "cargo-husky", + "cfg-if 0.1.10", + "crossfire", + "derive-new", + "dirs", + "euclid", + "flexi_logger", + "font-kit", + "futures 0.3.15", + "image", + "lazy_static", + "log", + "lru", + "mockall", + "neovide-derive", + "nvim-rs", + "parking_lot 0.10.2", + "pin-project", + "rand", + "rmpv", + "rust-embed", + "sdl2-sys", + "skia-safe", + "skribo", + "skulpin", + "tokio", + "unicode-segmentation", + "which 4.1.0", + "winapi 0.3.9", + "winres", +] + +[[package]] +name = "neovide-derive" +version = "0.1.0" +dependencies = [ + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "net2" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "nix" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" +dependencies = [ + "bitflags", + "cc", + "cfg-if 0.1.10", + "libc", + "void", +] + +[[package]] +name = "nix" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055" +dependencies = [ + "bitflags", + "cc", + "cfg-if 0.1.10", + "libc", +] + +[[package]] +name = "nix" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" +dependencies = [ + "bitflags", + "cc", + "cfg-if 1.0.0", + "libc", +] + +[[package]] +name = "nom" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +dependencies = [ + "memchr", + "version_check", +] + +[[package]] +name = "nom" +version = "6.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +dependencies = [ + "memchr", + "version_check", +] + +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + +[[package]] +name = "num-derive" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", +] + +[[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ + "autocfg 1.0.1", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" +dependencies = [ + "autocfg 1.0.1", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" +dependencies = [ + "autocfg 1.0.1", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg 1.0.1", +] + +[[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 = "num_enum" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4" +dependencies = [ + "derivative", + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d" +dependencies = [ + "proc-macro-crate", + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "nvim-rs" +version = "0.1.1-alpha.0" +source = "git+https://github.com/kethku/nvim-rs#109feea9e345fcbb2674384b0d6914ba4b8fc61e" +dependencies = [ + "async-trait", + "futures 0.3.15", + "log", + "pin-project", + "rmp", + "rmpv", + "tokio", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "once_cell" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" + +[[package]] +name = "openssl-probe" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" + +[[package]] +name = "openssl-sys" +version = "0.9.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98" +dependencies = [ + "autocfg 1.0.1", + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "ordered-float" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" +dependencies = [ + "num-traits", +] + +[[package]] +name = "owned_ttf_parser" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f923fb806c46266c02ab4a5b239735c144bdeda724a50ed058e5226f594cde3" +dependencies = [ + "ttf-parser", +] + +[[package]] +name = "parking_lot" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" +dependencies = [ + "lock_api 0.3.4", + "parking_lot_core 0.7.2", +] + +[[package]] +name = "parking_lot" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +dependencies = [ + "instant", + "lock_api 0.4.4", + "parking_lot_core 0.8.3", +] + +[[package]] +name = "parking_lot_core" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" +dependencies = [ + "cfg-if 0.1.10", + "cloudabi", + "libc", + "redox_syscall 0.1.57", + "smallvec", + "winapi 0.3.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", + "redox_syscall 0.2.8", + "smallvec", + "winapi 0.3.9", +] + +[[package]] +name = "pathfinder_geometry" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3" +dependencies = [ + "log", + "pathfinder_simd", +] + +[[package]] +name = "pathfinder_simd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b451513912d6b3440e443aa75a73ab22203afedc4a90df8526d008c0f86f7cb3" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "pin-project" +version = "0.4.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "0.4.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "pin-project-lite" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" + +[[package]] +name = "pin-project-lite" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" + +[[package]] +name = "png" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef859a23054bbfee7811284275ae522f0434a3c8e7f4b74bd4a35ae7e1c4a283" +dependencies = [ + "bitflags", + "crc32fast", + "deflate", + "inflate", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "predicates" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" +dependencies = [ + "difference", + "float-cmp", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[package]] +name = "predicates-core" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" + +[[package]] +name = "predicates-tree" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2" +dependencies = [ + "predicates-core", + "treeline", +] + +[[package]] +name = "proc-macro-crate" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +dependencies = [ + "toml", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro-nested" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" + +[[package]] +name = "proc-macro2" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +dependencies = [ + "unicode-xid 0.1.0", +] + +[[package]] +name = "proc-macro2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" +dependencies = [ + "unicode-xid 0.2.2", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +dependencies = [ + "proc-macro2 0.4.30", +] + +[[package]] +name = "quote" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ + "proc-macro2 1.0.26", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "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 0.1.16", +] + +[[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 = "raw-window-handle" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a441a7a6c80ad6473bd4b74ec1c9a4c951794285bf941c2126f607c72e48211" +dependencies = [ + "libc", +] + +[[package]] +name = "raw-window-metal" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cd21ed1cdef7f1b1579b972148ba6058b5b545959a14d91ea83c4f0ea9f289b" +dependencies = [ + "cocoa 0.24.0", + "core-graphics 0.22.2", + "objc", + "raw-window-handle", +] + +[[package]] +name = "rayon" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" +dependencies = [ + "autocfg 1.0.1", + "crossbeam-deque 0.8.0", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" +dependencies = [ + "crossbeam-channel 0.5.1", + "crossbeam-deque 0.8.0", + "crossbeam-utils 0.8.4", + "lazy_static", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + +[[package]] +name = "redox_syscall" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +dependencies = [ + "getrandom 0.2.2", + "redox_syscall 0.2.8", +] + +[[package]] +name = "regex" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "rmp" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f55e5fa1446c4d5dd1f5daeed2a4fe193071771a2636274d0d7a3b082aa7ad6" +dependencies = [ + "byteorder", + "num-traits", +] + +[[package]] +name = "rmpv" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c760afe11955e16121e36485b6b828326c3f0eaff1c31758d96dbeb5cf09fd5" +dependencies = [ + "num-traits", + "rmp", +] + +[[package]] +name = "rust-embed" +version = "5.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fe1fe6aac5d6bb9e1ffd81002340363272a7648234ec7bdfac5ee202cb65523" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "5.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed91c41c42ef7bf687384439c312e75e0da9c149b0390889b94de3c7d9d9e66" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "rust-embed-utils", + "syn 1.0.72", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a512219132473ab0a77b52077059f1c47ce4af7fbdc94503e9862a34422876d" +dependencies = [ + "walkdir", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver", +] + +[[package]] +name = "rusttype" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5" +dependencies = [ + "rusttype 0.8.3", +] + +[[package]] +name = "rusttype" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f61411055101f7b60ecf1041d87fb74205fb20b0c7a723f07ef39174cf6b4c0" +dependencies = [ + "approx", + "ordered-float", + "stb_truetype", +] + +[[package]] +name = "rusttype" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc7c727aded0be18c5b80c1640eae0ac8e396abf6fa8477d96cb37d18ee5ec59" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +dependencies = [ + "lazy_static", + "winapi 0.3.9", +] + +[[package]] +name = "scoped-tls" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" + +[[package]] +name = "scoped_threadpool" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "sdl2" +version = "0.34.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deecbc3fa9460acff5a1e563e05cb5f31bba0aa0c214bb49a43db8159176d54b" +dependencies = [ + "bitflags", + "lazy_static", + "libc", + "raw-window-handle", + "sdl2-sys", +] + +[[package]] +name = "sdl2-sys" +version = "0.34.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41a29aa21f175b5a41a6e26da572d5e5d1ee5660d35f9f9d0913e8a802098f74" +dependencies = [ + "cfg-if 0.1.10", + "cmake", + "flate2", + "libc", + "tar", + "unidiff", + "version-compare", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" + +[[package]] +name = "serde_json" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "servo-fontconfig" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" +dependencies = [ + "libc", + "servo-fontconfig-sys", +] + +[[package]] +name = "servo-fontconfig-sys" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" +dependencies = [ + "expat-sys", + "freetype-sys", + "pkg-config", +] + +[[package]] +name = "shlex" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" + +[[package]] +name = "signal-hook-registry" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" +dependencies = [ + "libc", +] + +[[package]] +name = "skia-bindings" +version = "0.35.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e158e83da2315e0b82eaf21e8aa771b9d32c7fd92ce56f247a8c63be8acc7a3e" +dependencies = [ + "bindgen", + "cc", + "curl", + "flate2", + "heck", + "regex", + "serde_json", + "tar", + "toml", +] + +[[package]] +name = "skia-safe" +version = "0.35.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85dd8abb714b094d5cb22b53aecc5d23aaa7219067d2347fbc9a7c3bc5118633" +dependencies = [ + "bitflags", + "lazy_static", + "skia-bindings", +] + +[[package]] +name = "skribo" +version = "0.1.0" +source = "git+https://github.com/linebender/skribo#62fabc1257e4ba4460a7e32087026e85e694ecc6" +dependencies = [ + "font-kit", + "harfbuzz", + "harfbuzz-sys", + "log", + "pathfinder_geometry", + "unicode-normalization", +] + +[[package]] +name = "skulpin" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d11f1c75af5e20eaa1dd985692b42b697b49f3581eb8088526688120a951b1ad" +dependencies = [ + "log", + "skulpin-app-winit", + "skulpin-renderer", + "skulpin-renderer-sdl2", + "skulpin-renderer-winit", +] + +[[package]] +name = "skulpin-app-winit" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf156763a67080ce9a8965bba2b1c7cdee9f51f4e1fdb2b3ef6dcf7d9fbf63f" +dependencies = [ + "log", + "skulpin-renderer", + "skulpin-renderer-winit", +] + +[[package]] +name = "skulpin-renderer" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19f77569926563e91b3e8a5b1b77d192be6a8db8e3f0c4e05e887843998dd47e" +dependencies = [ + "ash", + "log", + "skia-bindings", + "skia-safe", +] + +[[package]] +name = "skulpin-renderer-sdl2" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2391513a1fcb62aad9e95fa0c7ab2ecaf0565dd68fee8bf096f1ed9a25abf936" +dependencies = [ + "ash-window", + "log", + "raw-window-handle", + "sdl2", + "skulpin-renderer", +] + +[[package]] +name = "skulpin-renderer-winit" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc972e8252690259199c00f3e0a307082c6b666e57b72d629cf608e0396a0f01" +dependencies = [ + "ash-window", + "log", + "raw-window-handle", + "skulpin-renderer", + "winit 0.22.2", + "winit 0.23.0", +] + +[[package]] +name = "slab" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" + +[[package]] +name = "smallvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" + +[[package]] +name = "smithay-client-toolkit" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "421c8dc7acf5cb205b88160f8b4cc2c5cfabe210e43b2f80f009f4c1ef910f1d" +dependencies = [ + "andrew 0.2.1", + "bitflags", + "dlib 0.4.2", + "lazy_static", + "memmap", + "nix 0.14.1", + "wayland-client 0.23.6", + "wayland-protocols 0.23.6", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4750c76fd5d3ac95fa3ed80fe667d6a3d8590a960e5b575b98eea93339a80b80" +dependencies = [ + "andrew 0.3.1", + "bitflags", + "calloop 0.6.5", + "dlib 0.4.2", + "lazy_static", + "log", + "memmap2", + "nix 0.18.0", + "wayland-client 0.28.5", + "wayland-cursor", + "wayland-protocols 0.28.5", +] + +[[package]] +name = "socket2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "stb_truetype" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51" +dependencies = [ + "byteorder", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "strsim" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" + +[[package]] +name = "syn" +version = "0.15.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "unicode-xid 0.1.0", +] + +[[package]] +name = "syn" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "unicode-xid 0.2.2", +] + +[[package]] +name = "tar" +version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "termcolor" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "tiff" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b7c2cfc4742bd8a32f2e614339dd8ce30dbcf676bb262bd63a2327bc5df57d" +dependencies = [ + "byteorder", + "lzw", + "num-derive", + "num-traits", +] + +[[package]] +name = "time" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tinyvec" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" +dependencies = [ + "bytes 0.5.6", + "fnv", + "iovec", + "lazy_static", + "libc", + "memchr", + "mio", + "mio-named-pipes", + "mio-uds", + "num_cpus", + "pin-project-lite 0.1.12", + "signal-hook-registry", + "slab", + "tokio-macros", + "winapi 0.3.9", +] + +[[package]] +name = "tokio-io" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" +dependencies = [ + "bytes 0.4.12", + "futures 0.1.31", + "log", +] + +[[package]] +name = "tokio-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "treeline" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" + +[[package]] +name = "ttf-parser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc" + +[[package]] +name = "unicode-normalization" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" + +[[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.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "unidiff" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a62719acf1933bfdbeb73a657ecd9ecece70b405125267dd549e2e2edc232c" +dependencies = [ + "encoding_rs", + "lazy_static", + "regex", +] + +[[package]] +name = "vcpkg" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version-compare" +version = "0.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" + +[[package]] +name = "version_check" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" + +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi 0.3.9", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[package]] +name = "wayland-client" +version = "0.23.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1080ebe0efabcf12aef2132152f616038f2d7dcbbccf7b2d8c5270fe14bcda" +dependencies = [ + "bitflags", + "calloop 0.4.4", + "downcast-rs", + "libc", + "mio", + "nix 0.14.1", + "wayland-commons 0.23.6", + "wayland-scanner 0.23.6", + "wayland-sys 0.23.6", +] + +[[package]] +name = "wayland-client" +version = "0.28.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ca44d86554b85cf449f1557edc6cc7da935cc748c8e4bf1c507cbd43bae02c" +dependencies = [ + "bitflags", + "downcast-rs", + "libc", + "nix 0.20.0", + "scoped-tls", + "wayland-commons 0.28.5", + "wayland-scanner 0.28.5", + "wayland-sys 0.28.5", +] + +[[package]] +name = "wayland-commons" +version = "0.23.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb66b0d1a27c39bbce712b6372131c6e25149f03ffb0cd017cf8f7de8d66dbdb" +dependencies = [ + "nix 0.14.1", + "wayland-sys 0.23.6", +] + +[[package]] +name = "wayland-commons" +version = "0.28.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bd75ae380325dbcff2707f0cd9869827ea1d2d6d534cff076858d3f0460fd5a" +dependencies = [ + "nix 0.20.0", + "once_cell", + "smallvec", + "wayland-sys 0.28.5", +] + +[[package]] +name = "wayland-cursor" +version = "0.28.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b37e5455ec72f5de555ec39b5c3704036ac07c2ecd50d0bffe02d5fe2d4e65ab" +dependencies = [ + "nix 0.20.0", + "wayland-client 0.28.5", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.23.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cc286643656742777d55dc8e70d144fa4699e426ca8e9d4ef454f4bf15ffcf9" +dependencies = [ + "bitflags", + "wayland-client 0.23.6", + "wayland-commons 0.23.6", + "wayland-scanner 0.23.6", +] + +[[package]] +name = "wayland-protocols" +version = "0.28.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95df3317872bcf9eec096c864b69aa4769a1d5d6291a5b513f8ba0af0efbd52c" +dependencies = [ + "bitflags", + "wayland-client 0.28.5", + "wayland-commons 0.28.5", + "wayland-scanner 0.28.5", +] + +[[package]] +name = "wayland-scanner" +version = "0.23.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93b02247366f395b9258054f964fe293ddd019c3237afba9be2ccbe9e1651c3d" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "xml-rs", +] + +[[package]] +name = "wayland-scanner" +version = "0.28.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "389d680d7bd67512dc9c37f39560224327038deb0f0e8d33f870900441b68720" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "xml-rs", +] + +[[package]] +name = "wayland-sys" +version = "0.23.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d94e89a86e6d6d7c7c9b19ebf48a03afaac4af6bc22ae570e9a24124b75358f4" +dependencies = [ + "dlib 0.4.2", + "lazy_static", +] + +[[package]] +name = "wayland-sys" +version = "0.28.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2907bd297eef464a95ba9349ea771611771aa285b932526c633dc94d5400a8e2" +dependencies = [ + "dlib 0.5.0", + "lazy_static", + "pkg-config", +] + +[[package]] +name = "which" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" +dependencies = [ + "libc", +] + +[[package]] +name = "which" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55551e42cbdf2ce2bedd2203d0cc08dba002c27510f86dab6d0ce304cba3dfe" +dependencies = [ + "either", + "libc", +] + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "winit" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e4ccbf7ddb6627828eace16cacde80fc6bf4dbb3469f88487262a02cf8e7862" +dependencies = [ + "bitflags", + "cocoa 0.20.2", + "core-foundation 0.7.0", + "core-graphics 0.19.2", + "core-video-sys", + "dispatch", + "instant", + "lazy_static", + "libc", + "log", + "mio", + "mio-extras", + "ndk 0.1.0", + "ndk-glue 0.1.0", + "ndk-sys 0.1.0", + "objc", + "parking_lot 0.10.2", + "percent-encoding", + "raw-window-handle", + "smithay-client-toolkit 0.6.6", + "wayland-client 0.23.6", + "winapi 0.3.9", + "x11-dl", +] + +[[package]] +name = "winit" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5bc559da567d8aa671bbcd08304d49e982c7bf2cb91e10288b9188931c1b772" +dependencies = [ + "bitflags", + "cocoa 0.23.0", + "core-foundation 0.9.1", + "core-graphics 0.22.2", + "core-video-sys", + "dispatch", + "instant", + "lazy_static", + "libc", + "log", + "mio", + "mio-extras", + "ndk 0.2.1", + "ndk-glue 0.2.1", + "ndk-sys 0.2.1", + "objc", + "parking_lot 0.11.1", + "percent-encoding", + "raw-window-handle", + "smithay-client-toolkit 0.12.3", + "wayland-client 0.28.5", + "winapi 0.3.9", + "x11-dl", +] + +[[package]] +name = "winres" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4fb510bbfe5b8992ff15f77a2e6fe6cf062878f0eda00c0f44963a807ca5dc" +dependencies = [ + "toml", +] + +[[package]] +name = "wio" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "x11-dl" +version = "2.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf981e3a5b3301209754218f962052d4d9ee97e478f4d26d4a6eced34c1fef8" +dependencies = [ + "lazy_static", + "libc", + "maybe-uninit", + "pkg-config", +] + +[[package]] +name = "xattr" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" +dependencies = [ + "libc", +] + +[[package]] +name = "xcursor" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a9a231574ae78801646617cefd13bfe94be907c0e4fa979cfd8b770aa3c5d08" +dependencies = [ + "nom 6.1.2", +] + +[[package]] +name = "xdg" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" + +[[package]] +name = "xml-rs" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a" diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix new file mode 100644 index 0000000000..b4c12304a9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix @@ -0,0 +1,115 @@ +{ rustPlatform +, runCommand +, lib +, fetchFromGitHub +, fetchgit +, makeWrapper +, pkg-config +, python2 +, expat +, openssl +, SDL2 +, vulkan-loader +, fontconfig +, ninja +, gn +, llvmPackages +, makeFontsConf +}: +rustPlatform.buildRustPackage rec { + pname = "neovide"; + version = "20210515"; + + src = + let + repo = fetchFromGitHub { + owner = "Kethku"; + repo = "neovide"; + rev = "0b976c3d28bbd24e6c83a2efc077aa96dde1e9eb"; + sha256 = "sha256-asaOxcAenKdy/yJvch3HFfgnrBnQagL02UpWYnz7sa8="; + }; + in + runCommand "source" { } '' + cp -R ${repo} $out + chmod -R +w $out + # Reasons for patching Cargo.toml: + # - I got neovide built with latest compatible skia-save version 0.35.1 + # and I did not try to get it with 0.32.1 working. Changing the skia + # version is time consuming, because of manual dependecy tracking and + # long compilation runs. + sed -i $out/Cargo.toml \ + -e '/skia-safe/s;0.32.1;0.35.1;' + cp ${./Cargo.lock} $out/Cargo.lock + ''; + + cargoSha256 = "sha256-XMPRM3BAfCleS0LXQv03A3lQhlUhAP8/9PdVbAUnfG0="; + + SKIA_OFFLINE_SOURCE_DIR = + let + repo = fetchFromGitHub { + owner = "rust-skia"; + repo = "skia"; + # see rust-skia/Cargo.toml#package.metadata skia + rev = "m86-0.35.0"; + sha256 = "sha256-uTSgtiEkbE9e08zYOkRZyiHkwOLr/FbBYkr2d+NZ8J0="; + }; + # The externals for skia are taken from skia/DEPS + externals = lib.mapAttrs (n: v: fetchgit v) (lib.importJSON ./skia-externals.json); + in + runCommand "source" { } ('' + cp -R ${repo} $out + chmod -R +w $out + + mkdir -p $out/third_party/externals + cd $out/third_party/externals + '' + (builtins.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "cp -ra ${value} ${name}") externals))); + + SKIA_OFFLINE_NINJA_COMMAND = "${ninja}/bin/ninja"; + SKIA_OFFLINE_GN_COMMAND = "${gn}/bin/gn"; + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + # test needs a valid fontconfig file + FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + + nativeBuildInputs = [ + pkg-config + makeWrapper + python2 # skia-bindings + llvmPackages.clang # skia + ]; + + # All tests passes but at the end cargo prints for unknown reason: + # error: test failed, to rerun pass '--bin neovide' + # Increasing the loglevel did not help. In a nix-shell environment + # the failure do not occure. + doCheck = false; + + buildInputs = [ + expat + openssl + SDL2 + fontconfig + ]; + + postFixup = '' + wrapProgram $out/bin/neovide \ + --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + ''; + + postInstall = '' + for n in 16x16 32x32 48x48 256x256; do + install -m444 -D "assets/neovide-$n.png" \ + "$out/share/icons/hicolor/$n/apps/neovide.png" + done + install -m444 -Dt $out/share/icons/hicolor/scalable/apps assets/neovide.svg + install -m444 -Dt $out/share/applications assets/neovide.desktop + ''; + + meta = with lib; { + description = "This is a simple graphical user interface for Neovim."; + homepage = "https://github.com/Kethku/neovide"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ck3d ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/skia-externals.json b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/skia-externals.json new file mode 100644 index 0000000000..be1fdb181c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/skia-externals.json @@ -0,0 +1,37 @@ +{ + "expat": { + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", + "rev": "e976867fb57a0cd87e3b0fe05d59e0ed63c6febb", + "sha256": "sha256-akSh/Vo7s7m/7qePamGA7oiHEHT3D6JhCFMc27CgDFI=" + }, + "libjpeg-turbo": { + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", + "rev": "64fc43d52351ed52143208ce6a656c03db56462b", + "sha256": "sha256-rk22wE83hxKbtZLhGwUIF4J816jHvWovgICdrKZi2Ig=" + }, + "icu": { + "url": "https://chromium.googlesource.com/chromium/deps/icu.git", + "rev": "dbd3825b31041d782c5b504c59dcfb5ac7dda08c", + "sha256": "sha256-voMH+TdNx3dBHeH5Oky5OYmmLGJ2u+WrMrmAkjXJRTE=" + }, + "zlib": { + "url": "https://chromium.googlesource.com/chromium/src/third_party/zlib", + "rev": "eaf99a4e2009b0e5759e6070ad1760ac1dd75461", + "sha256": "sha256-B4PgeSVBU/MSkPkXTu9jPIa37dNJPm2HpmiVf6XuOGE=" + }, + "harfbuzz": { + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", + "rev": "3a74ee528255cc027d84b204a87b5c25e47bff79", + "sha256": "sha256-/4UdoUj0bxj6+EfNE8ofjtWOn2VkseEfvdFah5rwwBM=" + }, + "libpng": { + "url": "https://skia.googlesource.com/third_party/libpng.git", + "rev": "386707c6d19b974ca2e3db7f5c61873813c6fe44", + "sha256": "sha256-67kf5MBsnBBi0bOfX/RKL52xpaCWm/ampltAI+EeQ+c=" + }, + "libgifcodec": { + "url": "https://skia.googlesource.com/libgifcodec", + "rev": "d06d2a6d42baf6c0c91cacc28df2542a911d05fe", + "sha256": "sha256-ke1X5iyj2ah2NqGVdFv8GuoRAzXg1aCeTdZwUM8wvCI=" + } +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix index 6d04fa6851..3e6e88dd22 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix @@ -58,10 +58,11 @@ let # add to nvim's 'embedded rc' this: # let g:_host_prog=$out/bin/nvim- # Or this: - # let g:loaded_${prog}_provider=1 + # let g:loaded_${prog}_provider=0 # While the latter tells nvim that this provider is not available hostprog_check_table = { node = withNodeJs; + python = false; python3 = withPython3; ruby = withRuby; }; @@ -107,7 +108,7 @@ let if withProg then "let g:${prog}_host_prog='${placeholder "out"}/bin/nvim-${prog}'" else - "let g:loaded_${prog}_provider=1" + "let g:loaded_${prog}_provider=0" ; # to keep backwards compatibility diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/clang-location.patch b/third_party/nixpkgs/pkgs/applications/editors/rstudio/clang-location.patch index 402abdd856..700ed754d2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/clang-location.patch +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/clang-location.patch @@ -7,7 +7,7 @@ index ec12a3a1ff..8c81b633ae 100644 // we need to add in the associated libclang headers as // they are not discovered / used by default during compilation - FilePath llvmPath = s_libraryPath.parent().parent(); -+ FilePath llvmPath("@clang@"); ++ FilePath llvmPath("@libclang@"); boost::format fmt("%1%/lib/clang/%2%/include"); fmt % llvmPath.absolutePath() % version.asString(); std::string includePath = fmt.str(); diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix index 00d0259a7a..76d9c2e594 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix @@ -42,8 +42,8 @@ mkDerivation rec { postPatch = '' substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} substituteInPlace src/cpp/core/libclang/LibClang.cpp \ - --replace '@clang@' ${llvmPackages.clang.cc} \ - --replace '@libclang.so@' ${llvmPackages.clang.cc.lib}/lib/libclang.so + --replace '@libclang@' ${llvmPackages.libclang.lib} \ + --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so ''; ginSrc = fetchurl { diff --git a/third_party/nixpkgs/pkgs/applications/editors/scite/default.nix b/third_party/nixpkgs/pkgs/applications/editors/scite/default.nix index 3d6ec9ece9..ab0fef9be2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/scite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/scite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "scite"; - version = "4.0.5"; + version = "5.0.2"; src = fetchurl { - url = "https://www.scintilla.org/scite405.tgz"; - sha256 = "0h16wk2986nkkhhdv5g4lxlcn02qwyja24x1r6vf02r1hf46b9q2"; + url = "https://www.scintilla.org/scite502.tgz"; + sha256 = "00n2gr915f7kvp2250dzn6n0p6lhr6qdlm1m7y2xi6qrrky0bpan"; }; nativeBuildInputs = [ pkg-config ]; @@ -14,6 +14,8 @@ stdenv.mkDerivation { sourceRoot = "scintilla/gtk"; buildPhase = '' + make + cd ../../lexilla/src make cd ../../scite/gtk make prefix=$out/ diff --git a/third_party/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix b/third_party/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix index 6e3580a563..ec713d9937 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { description = "Level editor for SuperTux"; homepage = "https://github.com/SuperTux/supertux-editor"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ mathnerd314 ]; platforms = platforms.linux; + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index f517f95a81..6ae837105a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "08151qdhf4chg9gfbs0dl0v0k5vla2gz5dfy439jzdg1d022d5rw"; - x86_64-darwin = "1vlxxkv3wvds3xl3ir93l5q5yq2d7mcragsicfayj9x9r49ilqn3"; - aarch64-linux = "0rxw1wsi555z41ak817sxqyyan0rm7hma640zsh8dz0yvhzdv1h8"; - armv7l-linux = "1ijvd7r2fxxlw4zv3zx5h70b3d0b4gcq3aljsi02v1lr2zm8f8gb"; + x86_64-linux = "08qrag9nzmngzzvs2cgbmc4zzxlb9kwn183v8caj6dvcrjvfqgbv"; + x86_64-darwin = "0rlyr08lla3xadlh373xqcks8a9akk3x2cmakgn17q2b16988fmq"; + aarch64-linux = "1m277940xsasqac4i88s05xrqsab99jhl3ka0zzfbixrgr2dj8q1"; + armv7l-linux = "1qm4cggjj50vdnrx848x810gz3ahh0hndra22lsvcjdbsw8g35rk"; }.${system}; in callPackage ./generic.nix rec { @@ -25,7 +25,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.55.2"; + version = "1.56.2"; 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 4850a9cd7d..da29daa635 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "12mdila9gspj6b9s6488j0ba264vm4a46546kplma7s6gkkpz4zx"; - x86_64-darwin = "15wdznihc2ra2fjy9p4j898vazjr4h5yighaxh7jk9kcvarg1658"; - aarch64-linux = "0plw1an1z3v333irbc53skrmq2klas21srriiqkvmkgkfvpx1rq2"; - armv7l-linux = "1ys82pa18qshpinaqqrskxvljzap20xwj5ncffn031yacg1y2qx2"; + x86_64-linux = "1gw2273ab0gdyav6mz7wk7d6g6cwcdvx0xaghvm610m1pvkbvxkz"; + x86_64-darwin = "1zfzsr8gybmpmxc3jlfj6sx3m6ny6hc3dxvpgffni7k5zgv651df"; + aarch64-linux = "079bp48h0qfpsbyir2qg3w1f43dc68ngmxqdqb3jnkx721affjzs"; + armv7l-linux = "1d9243hk07xawv44909lk6y6bnvy0wjhy8xl13n3a11pg3djn5bm"; }.${system}; sourceRoot = { @@ -33,7 +33,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.55.2"; + version = "1.56.2"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/zile/default.nix b/third_party/nixpkgs/pkgs/applications/editors/zile/default.nix index 3d0e98602a..cb1307d7ff 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/zile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/zile/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "zile"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { url = "mirror://gnu/zile/${pname}-${version}.tar.gz"; - hash = "sha256-v7rN33aOORc6J0Z5JP5AmZCj6XvjYyoCl5hl+7mvAnc="; + hash = "sha256-d+t9r/PJi9yI2qGsBA3MynK4HcMvwxZuB53Xpj5Cx0E="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index a8dd7787a5..3669cf0771 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -19,7 +19,7 @@ let urllib3 pygments pyqt5 - sip + sip_4 owslib six ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix index c77e60950c..cafad76c27 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 -, ApplicationServices +, ApplicationServices, Foundation }: let @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "6.9.12-8"; + version = "6.9.12-12"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; rev = version; - sha256 = "sha256-ZFCmoZOdZ3jbM5S90zBNiMGJKFylMLO0r3DB25wu3MM="; + sha256 = "sha256-yqMYuayQjPlTqi3+CtwP5CdsAGud/fHR0I2LwUPIq00="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -50,7 +50,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] - ++ lib.optional stdenv.isDarwin ApplicationServices; + ++ lib.optionals stdenv.isDarwin + [ ApplicationServices Foundation ]; propagatedBuildInputs = [ bzip2 freetype libjpeg lcms2 fftw ] 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 e0b75e7406..c4e1f3406f 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -2,6 +2,8 @@ , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices +, Foundation +, testVersion, imagemagick }: let @@ -16,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.0.11-8"; + version = "7.0.11-9"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-h9hoFXnxuLVQRVtEh83P7efz2KFLLqOXKD6nVJEhqiM="; + sha256 = "sha256-eL9zFrgkLb3pS8/UlQB5+p50UG8j3Q7TNDwcO/3BuXo="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -50,7 +52,10 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] - ++ lib.optional stdenv.isDarwin ApplicationServices; + ++ lib.optionals stdenv.isDarwin [ + ApplicationServices + Foundation + ]; propagatedBuildInputs = [ bzip2 freetype libjpeg lcms2 ] @@ -72,6 +77,9 @@ stdenv.mkDerivation rec { done ''; + passthru.tests.version = + testVersion { package = imagemagick; }; + meta = with lib; { homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix index 0e4f182ea5..2693f03972 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, makeDesktopItem, fetchurl, unzip -, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3 +, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome , xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa }: stdenv.mkDerivation rec { pname = "avocode"; - version = "4.12.0"; + version = "4.14.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "sha256-qbG0Ii3Xmj1UGGS+n+LdiNPAHBkpQZMGEzrDvOcaUNA="; + sha256 = "sha256-BDW87UVN1Jub0sJFvtkZr5ssz835Yf2CNn5kHCn70cE="; }; libPath = lib.makeLibraryPath (with xorg; [ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [makeWrapper wrapGAppsHook unzip]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; # src is producing multiple folder on unzip so we must # override unpackCmd to extract it into newly created folder diff --git a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix index 2ff712851b..469437c6c9 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix @@ -2,7 +2,7 @@ , cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg , libpng, librsvg, libtiff, openexr, osm-gps-map, pkg-config, sqlite, libxslt -, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 +, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome , ocl-icd, pcre, gtk-mac-integration, isocodes, llvmPackages }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt libsoup graphicsmagick json-glib openjpeg lua pugixml - libwebp libsecret gnome3.adwaita-icon-theme osm-gps-map pcre isocodes + libwebp libsecret gnome.adwaita-icon-theme osm-gps-map pcre isocodes ] ++ lib.optionals stdenv.isLinux [ colord colord-gtk libX11 ocl-icd ] ++ lib.optional stdenv.isDarwin gtk-mac-integration diff --git a/third_party/nixpkgs/pkgs/applications/graphics/emulsion/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/emulsion/default.nix index 9792ce4d6d..3012250b9c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/emulsion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/emulsion/default.nix @@ -37,16 +37,16 @@ let in rustPlatform.buildRustPackage rec { pname = "emulsion"; - version = "8.0"; + version = "9.0"; src = fetchFromGitHub { owner = "ArturKovacs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xv3q59HobunrFyc+CPLztpsQd20Eu4+JI+iYhlGI0bc="; + sha256 = "sha256-Cdi+PQDHxMQG7t7iwDi6UWfDwQjjA2yiOf9p/ahBlOw="; }; - cargoSha256 = "sha256-37xtdFbtbfGUqaSpzlxDQfe1+0ESHz/rgO1iTPBEBLc="; + cargoSha256 = "sha256-2wiLamnGqACx1r4WJbWPCN3tvhww/rRWz8fcvAbjYE0="; nativeBuildInputs = [ installShellFiles @@ -63,17 +63,10 @@ rustPlatform.buildRustPackage rec { OpenGL ]; - installPhase = '' - runHook preInstall - install -D $releaseDir/emulsion $out/bin/emulsion - '' + lib.optionalString stdenv.isLinux '' - patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion - '' + '' - runHook postInstall + postFixup = lib.optionalString stdenv.isLinux '' + patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion ''; - dontPatchELF = true; - meta = with lib; { description = "A fast and minimalistic image viewer"; homepage = "https://arturkovacs.github.io/emulsion-website/"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fbida/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/fbida/default.nix index 9ed6ee7515..f2d2e26759 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/fbida/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/fbida/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm +{ lib, stdenv, fetchurl, libjpeg, libexif, giflib, libtiff, libpng, libwebp, libdrm , pkg-config, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm , epoxy, poppler, mesa, lirc }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config which ]; buildInputs = [ - libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp + libexif libjpeg libpng giflib freetype fontconfig libtiff libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc mesa ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix index 40ae023560..139f29c315 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix @@ -7,11 +7,11 @@ with lib; stdenv.mkDerivation rec { pname = "feh"; - version = "3.6.3"; + version = "3.7"; src = fetchurl { url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Q3Qg838RYU4AjQZuKjve/Px4FEyCEpmLK6zdXSHqI7Q="; + sha256 = "0hdvlrlpjxvmhnjvr32nxgpsw0366higg0gh9h37fxrvdh3v3k87"; }; outputs = [ "out" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix index 04ac87c55d..c2cb4c92d4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -57,18 +58,15 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; - }; - - meta = with lib; { - description = "Find the most beautiful wallpapers for your desktop"; homepage = "https://github.com/calo001/fondo"; + description = "Find the most beautiful wallpapers for your desktop"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix index 440cc7fa38..25a9458243 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix @@ -46,13 +46,13 @@ mkDerivation rec { pname = "freecad"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; rev = version; - hash = "sha256-itIrO+/mKXOPNs+2POKT8u4YZuqx/QAwVBWrHgKP1qQ="; + hash = "sha256-XZ+fRl3CPCIFu3nHeMTLibwwFBlG/cWpKJlI58hTAuU="; }; nativeBuildInputs = [ @@ -102,6 +102,7 @@ mkDerivation rec { ]; cmakeFlags = [ + "-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on "-DBUILD_FLAT_MESH:BOOL=ON" "-DBUILD_QT5=ON" "-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include" @@ -110,7 +111,7 @@ mkDerivation rec { + ";${pyside2}/include/PySide2/QtCore" + ";${pyside2}/include/PySide2/QtWidgets" + ";${pyside2}/include/PySide2/QtGui" - ) + ) "-DPYSIDE_LIBRARY=PySide2::pyside2" ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix index 2491d8d3a8..08d3f122aa 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , substituteAll , autoreconfHook , pkg-config @@ -34,6 +33,7 @@ , libexif , gettext , makeWrapper +, gtk-doc , xorg , glib-networking , libmypaint @@ -53,13 +53,13 @@ let python = python2.withPackages (pp: [ pp.pygtk ]); in stdenv.mkDerivation rec { pname = "gimp"; - version = "2.10.22"; + version = "2.10.24"; outputs = [ "out" "dev" ]; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1fqqyshakvdarf1jipk2n33ibqr23ni22z3d8srq13bpydblpf1d"; + sha256 = "17lq6ns5qhspd171zqh76yf98xnn5n0hcl7hbhbx63cc6ribf6xx"; }; patches = [ @@ -73,12 +73,6 @@ in stdenv.mkDerivation rec { # Use absolute paths instead of relying on PATH # to make sure plug-ins are loaded by the correct interpreter. ./hardcode-plugin-interpreters.patch - - # Fix crash without dot. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/f83fd22c4b8701ffc4ce14383e5e22756a4bce04.patch"; - sha256 = "POuvBhOSStO7hBGp4HgNx5F9pElFRoqN3W+i3u4zOnk="; - }) ]; nativeBuildInputs = [ @@ -87,6 +81,7 @@ in stdenv.mkDerivation rec { intltool gettext makeWrapper + gtk-doc ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix index 307866c377..2b8dbbc4d2 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix @@ -38,7 +38,7 @@ let } // attrs // { - name = "${gimp.name}-plugin-${name}"; + name = "${gimp.pname}-plugin-${name}"; buildInputs = [ gimp gimp.gtk diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix b/third_party/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix index bb81a374fe..679e9136c4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}: +{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome, plugins ? null}: let allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); @@ -18,7 +18,7 @@ in symlinkJoin { wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ --set GIMP2_DATADIR "$out/share/gimp/2.0" \ - --prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ + --prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \ ${toString extraArgs} done set +x diff --git a/third_party/nixpkgs/pkgs/applications/graphics/glabels/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/glabels/default.nix index 3333773936..c2ce284037 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/glabels/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/glabels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, barcode, gnome3, autoreconfHook +{ lib, stdenv, fetchurl, barcode, gnome, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas , intltool, itstool, makeWrapper, pkg-config, yelp-tools }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ]; buildInputs = [ barcode gtk3 gtk-doc yelp-tools - gnome3.gnome-common gsettings-desktop-schemas + gnome.gnome-common gsettings-desktop-schemas itstool libxml2 librsvg libe-book libtool ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/glimpse/wrapper.nix b/third_party/nixpkgs/pkgs/applications/graphics/glimpse/wrapper.nix index daa540d31e..361b2ba38b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/glimpse/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/glimpse/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome3, plugins ? null }: +{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome, plugins ? null }: let allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues glimpsePlugins); @@ -19,7 +19,7 @@ symlinkJoin { wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/glimpse/2.0" \ --set GIMP2_DATADIR "$out/share/glimpse/2.0" \ - --prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ + --prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \ ${toString extraArgs} done diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix index a710d6c1e4..f091139540 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , at-spi2-core , babl , dbus @@ -14,7 +13,7 @@ , gfbgraph , glib , gnome-online-accounts -, gnome3 +, gnome , gobject-introspection , grilo , grilo-plugins @@ -22,6 +21,7 @@ , gtk3 , itstool , libdazzle +, libhandy , libgdata , libxml2 , meson @@ -36,32 +36,17 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "3.38.0"; + version = "40.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1i64w69kk3sdf9vn7npnwrhy8qjwn0vizq200x3pgmbrfm3kjzv6"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1bzi79plw6ji6qlckhxnwfnswy6jpnhzmmyanml2i2xg73hp6bg0"; }; patches = [ ./installed-tests-path.patch - - # Port to Tracker 3 - # https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/135 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/f39a85bb1a82093f4ba615494ff7e95609674fc2.patch"; - sha256 = "M5r5WuB1JpUBVN3KxNvpMiPWj0pIpT+ImQMOiGtUgT4="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/3d847ff80d429cadf0bc59aa50caa37bf27c0201.patch"; - sha256 = "zGjSL1qpWVJ/5Ifgh2CbhFSBR/WDAra8F+YUOemyxyU="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/2eb923726147b05c936dee64b205d833525db1df.patch"; - sha256 = "vCA6NXHzmNf2GoLqzWwIyziC6puJgJ0QTLeKWsAEFAE="; - }) ]; nativeBuildInputs = [ @@ -93,12 +78,13 @@ stdenv.mkDerivation rec { gfbgraph glib gnome-online-accounts - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme grilo grilo-plugins gsettings-desktop-schemas gtk3 libdazzle + libhandy libgdata tracker tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema @@ -122,7 +108,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix index 616a0b7135..a44d4f6408 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix @@ -4,17 +4,17 @@ # runtime dependencies imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, pdftk, # test dependencies - xvfb_run, liberation_ttf, file, tesseract }: + xvfb-run, liberation_ttf, file, tesseract }: with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.11.1"; + version = "2.12.1"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "0aigngfi5dbjihn43c6sg865i1ybfzj0w81zclzy8r9nqiqq0wma"; + sha256 = "0x20wpqqw6534rn73660zdfy4c3jpg2n31py566k0x2nd6g0mhg5"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -94,7 +94,7 @@ perlPackages.buildPerlPackage rec { unpaper pdftk - xvfb_run + xvfb-run file tesseract # tests are expecting tesseract 3.x precisely ] ++ (with perlPackages; [ @@ -112,6 +112,12 @@ perlPackages.buildPerlPackage rec { # t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100) rm t/169_import_scan.t + # Disable a test which passes but reports an incorrect status + # t/0601_Dialog_Scan.t .......................... All 14 subtests passed + # t/0601_Dialog_Scan.t (Wstat: 139 Tests: 14 Failed: 0) + # Non-zero wait status: 139 + rm t/0601_Dialog_Scan.t + xvfb-run -s '-screen 0 800x600x24' \ make test ''; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix index 26de91ee22..cd3a6f368e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, gnome3 +, gnome , pkg-config , meson , ninja @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.10.2"; + version = "3.11.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/erkKBg3j5s8qwBgTu61t8Cnpez+ad4IuZOGd0ZDXJM="; + sha256 = "11bvcimamdcksgqj1ymh54yzhpwc5j8glda8brqqhwq3h2wj0j9d"; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { clutter-gtk exiv2 glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas gst_all_1.gst-plugins-base (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) @@ -95,8 +95,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index 56ebbeb372..c7d4a77ea2 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -9,14 +9,14 @@ pythonPackages.buildPythonPackage rec { pname = "hydrus"; - version = "436"; + version = "438"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-FXm8VUEY0OZ6/dc/qNwOXekhv5H2C9jjg/eNDoMvMn0=="; + sha256 = "sha256-iBJkbVUlsjt26SbDe92eIrWKQwWBhkjjeLM14Pm/obc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix index 11340fa746..bea288e295 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix @@ -5,6 +5,7 @@ , cmake , double-conversion , fetchurl +, fetchpatch , gettext , gdl , ghostscript @@ -71,6 +72,13 @@ stdenv.mkDerivation rec { # e.g., those from the "Effects" menu. python3 = "${python3Env}/bin/python"; }) + + # Fix build with glib 2.68 + # https://gitlab.com/inkscape/inkscape/-/merge_requests/2790 + (fetchpatch { + url = "https://gitlab.com/inkscape/inkscape/-/commit/eb24388f1730918edd9565d9e5d09340ec0b3b08.patch"; + sha256 = "d2FHRWcOzi0Vsr6t0MuLu3rWpvhFKuuvoXd4/NKUSJI="; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix index cac930dae1..b974e271a6 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix @@ -22,9 +22,10 @@ stdenv.mkDerivation { ''; makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" "MOZJPEG_PREFIX=${mozjpeg}" - "LIBJPEG=${mozjpeg}/lib/libjpeg.so" + "LIBJPEG=${mozjpeg}/lib/libjpeg${stdenv.hostPlatform.extensions.sharedLibrary}" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix index 294b6c4ca7..4b9b93505a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { meta = with lib; { description = "A Graphviz dot graph viewer for KDE"; license = licenses.gpl2; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix index 282db23f47..0c5a0fe6e3 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, stdenv, makeWrapper, fetchurl, cmake, extra-cmake-modules , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem -, kio, kcrash +, kio, kcrash, breeze-icons , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib , openjpeg, opencolorio, vc, poppler, curl, ilmbase , qtmultimedia, qtx11extras, quazip @@ -17,11 +17,11 @@ mkDerivation rec { sha256 = "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl"; }; - nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; + nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ]; buildInputs = [ karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons - ki18n kitemmodels kitemviews kwindowsystem kio kcrash + ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib openjpeg opencolorio poppler curl ilmbase qtmultimedia qtx11extras quazip diff --git a/third_party/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix index 4dae4dd3f9..82eab9757c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix @@ -63,6 +63,6 @@ in stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/lazpaint/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix index 3d8a4c2bce..dbcf0fba29 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix @@ -5,8 +5,8 @@ , ninja , pkg-config , wrapGAppsHook -, gtk3 -, gnome3 +, epoxy +, gtk4 , zbar , tiffSupport ? true , libraw @@ -26,20 +26,22 @@ let in stdenv.mkDerivation rec { pname = "megapixels"; - version = "0.16.0"; + version = "1.0.1"; src = fetchFromSourcehut { owner = "~martijnbraam"; repo = "megapixels"; rev = version; - sha256 = "0z7sx76x18yqf7carq6mg9lib0zbz0yrd1dsg9qd6hbf5niqis37"; + sha256 = "0k9a5dpr5z0g7ngbhk4j22sbs1ffxiwg8wmbzgggdc9xvwmkgppr"; }; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme zbar ] - ++ optional tiffSupport libraw - ++ optional jpgSupport graphicsmagick; + buildInputs = [ + epoxy + gtk4 + zbar + ]; preFixup = optionalString (tiffSupport || jpgSupport) '' gappsWrapperArgs+=( @@ -52,7 +54,7 @@ stdenv.mkDerivation rec { homepage = "https://sr.ht/~martijnbraam/Megapixels"; changelog = "https://git.sr.ht/~martijnbraam/megapixels/refs/${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ OPNA2608 ]; + maintainers = with maintainers; [ OPNA2608 dotlambda ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/meme/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/meme-image-generator/default.nix similarity index 62% rename from third_party/nixpkgs/pkgs/applications/graphics/meme/default.nix rename to third_party/nixpkgs/pkgs/applications/graphics/meme-image-generator/default.nix index d06ff027c5..7418aa07c7 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/meme/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/meme-image-generator/default.nix @@ -1,24 +1,21 @@ { lib -, unstableGitUpdater , buildGoModule , fetchFromGitHub }: -buildGoModule { - pname = "meme"; - version = "unstable-2020-05-28"; +buildGoModule rec { + pname = "meme-image-generator"; + version = "1.0.1"; src = fetchFromGitHub { owner = "nomad-software"; repo = "meme"; - rev = "33a8b7d0de6996294a0464a605dacc17b26a6b02"; - sha256 = "05h8d6pjszhr49xqg02nw94hm95kb7w1i7nw8jxi582fxxm2qbnm"; + rev = "v${version}"; + sha256 = "089r0v5az2d2njn0s3d3wd0861pcs4slg6zl0rj4cm1k5cj8yd1k"; }; vendorSha256 = null; - passthru.updateScript = unstableGitUpdater { }; - meta = with lib; { description = "A command line utility for creating image macro style memes"; homepage = "https://github.com/nomad-software/meme"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ocrfeeder/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ocrfeeder/default.nix index ff5d4bdf41..da5f1c5dcc 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ocrfeeder/default.nix @@ -8,7 +8,7 @@ , intltool , itstool , libxml2 -, gnome3 +, gnome , python3 , gobject-introspection , wrapGAppsHook diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix index e3ab0c772a..0d3a86663b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -12,13 +12,14 @@ buildPythonPackage rec { pname = "pick-colour-picker"; - version = "unstable-2019-10-11"; # "1.5.0-3ec940" + version = "unstable-2021-01-19"; src = fetchFromGitHub { owner = "stuartlangridge"; repo = "ColourPicker"; - rev = "3ec9406d787ce373f6db0d520ed38a921edb9473"; - sha256 = "04l8ch9297nhkgcmyhsbg0il424c8vy0isns1c7aypn0zp0dc4zd"; + rev = "dec8f144918aa7964aaf86a346161beb7e997f09"; + sha256 = "hW2rarfchZ3M0JVfz5RbJRvMhv2PpyLNEMyMAp2gC+o="; + fetchSubmodules = false; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pqiv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pqiv/default.nix index 7948ef0f08..f678af7061 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pqiv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pqiv/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config -, ffmpeg_3, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler +, ffmpeg, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler }: stdenv.mkDerivation (rec { @@ -14,14 +14,14 @@ stdenv.mkDerivation (rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg_3 gtk3 imagemagick libarchive libspectre libwebp poppler ]; + buildInputs = [ ffmpeg gtk3 imagemagick libarchive libspectre libwebp poppler ]; prePatch = "patchShebangs ."; meta = with lib; { description = "Powerful image viewer with minimal UI"; - homepage = "http://www.pberndt.com/Programme/Linux/pqiv"; - license = licenses.gpl3; + homepage = "https://www.pberndt.com/Programme/Linux/pqiv"; + license = licenses.gpl3Plus; maintainers = []; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix index 626610728a..597bd1f170 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.12"; + version = "1.13"; pname = "renderdoc"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "4k0WsTsz4WwPZC8Dj85l2ntJOZkLgmBBOJcX9Bb4U7I="; + sha256 = "MBvdnB1YPeCaXSgqqtGs0SMocbarjmaWtIUkBBCvufc="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix index 204d87a59c..78b30ad44e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix @@ -12,7 +12,7 @@ , sqlite , webkitgtk , pkg-config -, gnome3 +, gnome , gst_all_1 , libgudev , libraw @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { librsvg librest gcr - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libgdata libchamplain libsecret @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/solvespace/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/solvespace/default.nix index b00f7f3321..73c5a038aa 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/solvespace/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/solvespace/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { pname = "solvespace"; - version = "v3.0.rc2"; + version = "v3.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1z0873gwcr0hybrpqy4hwislir6k2zb4s62lbsivq5nbkizy7gjm"; + sha256 = "04aympdsjp37vp0p13mb8nwkc080hp9cdrjpyy5m1mhwkm8jm9k9"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix index 3f29d25fbe..2b9fee974b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 , libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkg-config -, imagemagick, intltool, autoreconfHook, which, gnome3 +, imagemagick, intltool, autoreconfHook, which, gnome }: let @@ -107,7 +107,7 @@ stdenv.mkDerivation { buildInputs = [ ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 - synfig which gnome3.adwaita-icon-theme + synfig which gnome.adwaita-icon-theme ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix index 3c48bbab0b..6c9cee8514 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , cmake, wrapGAppsHook -, libX11, libzip, glfw, libpng, xorg, gnome3 +, libX11, libzip, glfw, libpng, xorg, gnome }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/tev \ "''${gappsWrapperArgs[@]}" \ - --prefix PATH ":" "${gnome3.zenity}/bin" + --prefix PATH ":" "${gnome.zenity}/bin" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vimiv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/vimiv/default.nix index b5e9d0b8cf..a6320f774f 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/vimiv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/vimiv/default.nix @@ -1,8 +1,8 @@ { lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead -, gnome3 +, gnome # Test requirements -, dbus, xvfb_run, xdotool +, dbus, xvfb-run, xdotool }: python3Packages.buildPythonApplication rec { @@ -37,8 +37,8 @@ python3Packages.buildPythonApplication rec { vimiv/imageactions.py ''; - checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ]; - buildInputs = [ gnome3.adwaita-icon-theme librsvg ]; + checkInputs = [ python3Packages.nose dbus.daemon xvfb-run xdotool ]; + buildInputs = [ gnome.adwaita-icon-theme librsvg ]; propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; makeWrapperArgs = [ diff --git a/third_party/nixpkgs/pkgs/applications/kde/k3b.nix b/third_party/nixpkgs/pkgs/applications/kde/k3b.nix index cc9763961f..eed3a4fac1 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/k3b.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/k3b.nix @@ -4,7 +4,7 @@ , flac, lame, libmad, libmpcdec, libvorbis , libsamplerate, libsndfile, taglib , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager -, ffmpeg_3, libmusicbrainz3, normalize, sox, transcode, kinit +, ffmpeg, libmusicbrainz3, normalize, sox, transcode, kinit }: mkDerivation { @@ -25,7 +25,7 @@ mkDerivation { # cd/dvd cdparanoia libdvdcss libdvdread # others - ffmpeg_3 libmusicbrainz3 shared-mime-info + ffmpeg libmusicbrainz3 shared-mime-info ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; postFixup = diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdeconnect-kde.nix b/third_party/nixpkgs/pkgs/applications/kde/kdeconnect-kde.nix index 8c7b2b635c..c2b465303b 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kdeconnect-kde.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kdeconnect-kde.nix @@ -22,6 +22,7 @@ , qtgraphicaleffects , qtmultimedia , qtx11extras +, breeze-icons , sshfs }: @@ -47,6 +48,8 @@ mkDerivation { qtgraphicaleffects qtmultimedia qtx11extras + # otherwise buttons are blank on non-kde + breeze-icons ]; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix index 4bfb6a65ed..afe15949ee 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "1.8.0"; + version = "1.9.1"; src = if stdenv.isLinux then fetchzip { url = { @@ -11,21 +11,21 @@ stdenv.mkDerivation rec { "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm_v${version}.zip"; }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "teoxscan+EZ76Q0sfKT6nt1w/LSsmDoiN2oh+NGO/4A="; - "x86_64-linux" = "nRK2GSwhQe5OgcAdR1fg0vUp3fzEkhwU/teIwsEEemw="; - "aarch64-linux" = "0932bspm1likky1n0rg15d01gspkm1fns2ma82qyb91yr6d18ddk"; + "i686-linux" = "1x5khnp6yqrjf513x3y6l38rb121nib7d4aiz4cz7fh029kxjhd1"; + "x86_64-linux" = "1ar8lzkndl7xzcinv93rzg8q25vb23fggbjkhgchgc5x9wkwk8hw"; + "aarch64-linux" = "1q81pk6qmp96p1dbhx1ijln8f54rac8r81d4ghqx9v756s9szrr1"; }.${stdenv.hostPlatform.system}; stripRoot = false; } else fetchurl { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; - sha256 = "0pycia75vdfh6gxfd2hr32cxrryfxydid804n0v76l2fpr9v9v3d"; + sha256 = "0904wwy3wdhfvbkvpdap8141a9gqmn0dw45ikrzsqpg7pv1r2zch"; }; buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ]; unpackPhase = lib.optionalString stdenv.isDarwin '' xar -xf $src - zcat Payload | cpio -i + zcat op.pkg/Payload | cpio -i ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix index c753721adb..cc6b1eab5d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/JustArchiNET/ArchiSteamFarm"; license = licenses.asl20; platforms = dotnetCorePackages.aspnetcore_3_1.meta.platforms; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; hydraPlatforms = []; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix b/third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix index eb5dc8950f..a4ef9b3431 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix @@ -8,7 +8,7 @@ , gcr , gettext , glib -, gnome3 +, gnome , gpgme , gtk3 , gtksourceview3 @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; # it is quite odd }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix index 42c0f7d05f..c61b8b6010 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "1ifq5bk7782b9m6bl111x33fn38rpppdrww7hfavqia9a9gi2sl5"; + sha256 = "sha256-yhUc1r7HulOUQvH7fLXaoJa0mKxJwyC3y59pnJcHUpk="; }; nativeBuildInputs = [ pkg-config pcre ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index 95a0e41d2a..8d345cdefe 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { patches = lib.optional stdenv.isDarwin ./darwin.patch; - nativeBuildInputs = [ cmake makeWrapper python3Packages.wrapPython ] + nativeBuildInputs = [ cmake makeWrapper python3Packages.wrapPython llvmPackages.llvm.dev ] ++ optionals cudaSupport [ addOpenGLRunpath ]; buildInputs = [ boost ffmpeg gettext glew ilmbase diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix index de90e9d670..f5c4acb1f9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -25,11 +25,11 @@ mkDerivation rec { pname = "calibre"; - version = "5.16.1"; + version = "5.17.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-lTXCW0MGNOezecaGO9c2JGU4ylwpPmBaMXTY3nLNcrE="; + hash = "sha256-rdiBL3Y3q/0wFfWGE4jGkWakgV8hA9HjDcKXso6tVrs="; }; patches = [ @@ -45,7 +45,7 @@ mkDerivation rec { prePatch = '' sed -i "s/\[tool.sip.project\]/[tool.sip.project]\nsip-include-dirs = [\"${escaped_pyqt5_dir}\/share\/sip\/PyQt5\"]/g" \ setup/build.py - sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${python3Packages.sip_5.platform_tag}\"]/g" \ + sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${python3Packages.sip.platform_tag}\"]/g" \ setup/build.py # Remove unneeded files and libs @@ -95,7 +95,7 @@ mkDerivation rec { pyqtwebengine python regex - sip_5 + sip zeroconf # the following are distributed with calibre, but we use upstream instead odfpy @@ -114,7 +114,6 @@ mkDerivation rec { export FC_LIB_DIR=${fontconfig.lib}/lib export PODOFO_INC_DIR=${podofo.dev}/include/podofo export PODOFO_LIB_DIR=${podofo.lib}/lib - export SIP_BIN=${python3Packages.sip}/bin/sip export XDG_DATA_HOME=$out/share export XDG_UTILS_INSTALL_MODE="user" diff --git a/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix b/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix index e79d989e22..4d6a6943cd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix @@ -1,16 +1,20 @@ -{ lib, appimageTools, fetchurl }: +{ lib, appimageTools, fetchurl, gtk3, gsettings-desktop-schemas }: let pname = "chrysalis"; - version = "0.7.9"; + version = "0.8.4"; in appimageTools.wrapType2 rec { name = "${pname}-${version}-binary"; src = fetchurl { - url = "https://github.com/keyboardio/${pname}/releases/download/${pname}-${version}/${pname}-${version}.AppImage"; - sha256 = "12w4vv7dwfpvxpc8kpfas90y7yy8mb8dj2096z3vw1bli5lrn3zi"; + url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; + sha256 = "b41f3e23dac855b1588cff141e3d317f96baff929a0543c79fccee0c6f095bc7"; }; + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + multiPkgs = null; extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.glib diff --git a/third_party/nixpkgs/pkgs/applications/misc/clipcat/default.nix b/third_party/nixpkgs/pkgs/applications/misc/clipcat/default.nix index 497e5616e8..95f50998f3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/clipcat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/clipcat/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1ffgvhkdj8wkhlgi0cj0njdm9ycxq2qda4b5qn8bmaygzr2zkwpd"; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix index d62d96e530..66d73c94b4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "cointop"; - version = "1.6.3"; + version = "1.6.5"; src = fetchFromGitHub { owner = "miguelmota"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h4102oWYSuY4uq/Pyo9u25Pdsai7AK2W9yUmS/zdjrw="; + sha256 = "sha256-pnh4z7vk8xazdBPNbwR5BrKFbi8df8UTM2SOU+KDvsk="; }; goPackagePath = "github.com/miguelmota/cointop"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix index f213faa441..32ca4b0e06 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix @@ -5,6 +5,7 @@ , karchive , kauth , libdrm +, hwdata , mesa-demos , procps , util-linux @@ -20,13 +21,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.1.1"; + version = "1.1.3"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-YQDrxPqCa3OzNKd3UiAffqqvOrgbXmDFJGjYPetolyY="; + sha256 = "sha256-xRyc7FYzG8MnhQ8DjIUHYLeUZCZQdi4j1v1fG7F0+G8="; }; nativeBuildInputs = [ @@ -50,7 +51,9 @@ stdenv.mkDerivation rec{ qtxmlpatterns ]; - runtimeDeps = [ mesa-demos vulkan-tools ]; + cmakeFlags = [ "-DWITH_PCI_IDS_PATH=${hwdata}/share/hwdata/pci.ids" ]; + + runtimeDeps = [ hwdata mesa-demos vulkan-tools ]; binPath = lib.makeBinPath runtimeDeps; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix index 2de06f8c03..8f68a512c2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = src.meta.homepage; license = licenses.gpl3; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/cura/lulzbot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cura/lulzbot/default.nix index 229966561c..360ef47ecf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cura/lulzbot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cura/lulzbot/default.nix @@ -10,10 +10,10 @@ let }; libarcusLulzbot = callPackage ./libarcus.nix { - inherit (python3.pkgs) buildPythonPackage sip pythonOlder; + inherit (python3.pkgs) buildPythonPackage sip_4 pythonOlder; }; libsavitarLulzbot = callPackage ./libsavitar.nix { - inherit (python3.pkgs) buildPythonPackage sip pythonOlder; + inherit (python3.pkgs) buildPythonPackage sip_4 pythonOlder; }; inherit (python3.pkgs) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/third_party/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix index 7b1dbf4d85..15e221a8f7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }: +{ lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip_4, protobuf, pythonOlder }: buildPythonPackage { pname = "libarcus"; @@ -13,7 +13,7 @@ buildPythonPackage { disabled = pythonOlder "3.4.0"; - propagatedBuildInputs = [ sip ]; + propagatedBuildInputs = [ sip_4 ]; nativeBuildInputs = [ cmake ]; buildInputs = [ protobuf ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/third_party/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix index f12059e631..dd84173ffc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }: +{ lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip_4 }: buildPythonPackage { pname = "libsavitar-lulzbot"; @@ -19,7 +19,7 @@ buildPythonPackage { nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ sip ]; + propagatedBuildInputs = [ sip_4 ]; disabled = pythonOlder "3.4.0"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/curaengine/default.nix b/third_party/nixpkgs/pkgs/applications/misc/curaengine/default.nix index 76947c1ed9..05f63c5480 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/curaengine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.9.0"; + version = "4.9.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "0b82hwn7pb73h1azaandq93bkzlzskhgk71pwf4yws0j9bm6z084"; + sha256 = "sha256-1hCjtnI1EnfyQ0QfU8qZoSLIjE5pyDYpu8H4J91cWYM="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix index 3f4e77bdd0..ded30233d4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "0nxdyd0zg4w1zr8p9z2x88h36vbn7ryk7160zszdiwh5qmdlv47v"; + sha256 = "sha256-XJSWdXGa1qkkMfETUV8xx9oaMdNVFdO27/GvDvczjG8="; }; vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index 234ed7410f..3227598e8c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - pname = "dbeaver-ce"; - version = "21.0.4"; # When updating also update fetchedMavenDeps.sha256 + pname = "dbeaver"; + version = "21.0.5"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-jV7Pe4MsLQnIrkDnlI2SrPzSjiDHM59GbMy4G7oeQK8="; + sha256 = "sha256-WMXhGXGHNjMJqob6A5S4+t9MDdJydAjdoY0u7T3ANbw="; }; fetchedMavenDeps = stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/applications/misc/devdocs-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/devdocs-desktop/default.nix index fe15d90f25..85298bc3c7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/devdocs-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/devdocs-desktop/default.nix @@ -1,13 +1,13 @@ { lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: let - version = "0.7.1"; + version = "0.7.2"; pname = "devdocs-desktop"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/egoist/devdocs-desktop/releases/download/v${version}/DevDocs-${version}.AppImage"; - sha256 = "5bba99a34c90a65eff67aface0b7446cbf43d620a1c195f27e7bb33ab6d3d0c2"; + sha256 = "sha256-4ugpzh0Dweae6tKb6uqRhEW9HT+iVIo8MQRbVKTdRFw="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15142.patch b/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15142.patch deleted file mode 100644 index 89ff375945..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15142.patch +++ /dev/null @@ -1,72 +0,0 @@ -commit 970fb11a296b5bbdc5e8425851253d2c5913c45e -Author: Leon Bottou -Date: Tue Mar 26 20:36:31 2019 -0400 - - Fix bug#296 - -diff --git a/libdjvu/DjVmDir.cpp b/libdjvu/DjVmDir.cpp -index a6a39e0..0a0fac6 100644 ---- a/libdjvu/DjVmDir.cpp -+++ b/libdjvu/DjVmDir.cpp -@@ -299,42 +299,44 @@ DjVmDir::decode(const GP &gstr) - memcpy((char*) strings+strings_size, buffer, length); - } - DEBUG_MSG("size of decompressed names block=" << strings.size() << "\n"); -- if (strings[strings.size()-1] != 0) -- { -- int strings_size=strings.size(); -- strings.resize(strings_size+1); -- strings[strings_size] = 0; -- } -+ int strings_size=strings.size(); -+ strings.resize(strings_size+3); -+ memset((char*) strings+strings_size, 0, 4); - -- // Copy names into the files -+ // Copy names into the files - const char * ptr=strings; - for(pos=files_list;pos;++pos) - { - GP file=files_list[pos]; -- -+ if (ptr >= (const char*)strings + strings_size) -+ G_THROW( "DjVu document is corrupted (DjVmDir)" ); - file->id=ptr; - ptr+=file->id.length()+1; - if (file->flags & File::HAS_NAME) - { -- file->name=ptr; -- ptr+=file->name.length()+1; -- } else -+ file->name=ptr; -+ ptr+=file->name.length()+1; -+ } -+ else - { - file->name=file->id; - } - if (file->flags & File::HAS_TITLE) - { -- file->title=ptr; -- ptr+=file->title.length()+1; -- } else -- file->title=file->id; -- /* msr debug: multipage file, file->title is null. -+ file->title=ptr; -+ ptr+=file->title.length()+1; -+ } -+ else -+ { -+ file->title=file->id; -+ } -+ /* msr debug: multipage file, file->title is null. - DEBUG_MSG(file->name << ", " << file->id << ", " << file->title << ", " << - file->offset << ", " << file->size << ", " << - file->is_page() << "\n"); */ - } - -- // Check that there is only one file with SHARED_ANNO flag on -+ // Check that there is only one file with SHARED_ANNO flag on - int shared_anno_cnt=0; - for(pos=files_list;pos;++pos) - { diff --git a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15143.patch b/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15143.patch deleted file mode 100644 index ef1905338f..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15143.patch +++ /dev/null @@ -1,39 +0,0 @@ -commit b1f4e1b2187d9e5010cd01ceccf20b4a11ce723f -Author: Leon Bottou -Date: Tue Mar 26 20:45:46 2019 -0400 - - fix for bug #297 - -diff --git a/libdjvu/DjVmDir.cpp b/libdjvu/DjVmDir.cpp -index 0a0fac6..5a49015 100644 ---- a/libdjvu/DjVmDir.cpp -+++ b/libdjvu/DjVmDir.cpp -@@ -309,7 +309,7 @@ DjVmDir::decode(const GP &gstr) - { - GP file=files_list[pos]; - if (ptr >= (const char*)strings + strings_size) -- G_THROW( "DjVu document is corrupted (DjVmDir)" ); -+ G_THROW( ByteStream::EndOfFile ); - file->id=ptr; - ptr+=file->id.length()+1; - if (file->flags & File::HAS_NAME) -diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp -index 0e487f0..c2fdbe4 100644 ---- a/libdjvu/GBitmap.cpp -+++ b/libdjvu/GBitmap.cpp -@@ -890,11 +890,13 @@ GBitmap::read_rle_raw(ByteStream &bs) - int c = 0; - while (n >= 0) - { -- bs.read(&h, 1); -+ if (bs.read(&h, 1) <= 0) -+ G_THROW( ByteStream::EndOfFile ); - int x = h; - if (x >= (int)RUNOVERFLOWVALUE) - { -- bs.read(&h, 1); -+ if (bs.read(&h, 1) <= 0) -+ G_THROW( ByteStream::EndOfFile ); - x = h + ((x - (int)RUNOVERFLOWVALUE) << 8); - } - if (c+x > ncolumns) diff --git a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15144.patch b/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15144.patch deleted file mode 100644 index 6094be8833..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15144.patch +++ /dev/null @@ -1,111 +0,0 @@ -commit e15d51510048927f172f1bf1f27ede65907d940d -Author: Leon Bottou -Date: Mon Apr 8 22:25:55 2019 -0400 - - bug 299 fixed - -diff --git a/libdjvu/GContainer.h b/libdjvu/GContainer.h -index 96b067c..0140211 100644 ---- a/libdjvu/GContainer.h -+++ b/libdjvu/GContainer.h -@@ -550,52 +550,61 @@ public: - template void - GArrayTemplate::sort(int lo, int hi) - { -- if (hi <= lo) -- return; -- if (hi > hibound || lo hibound || lo=lo) && !(data[j]<=tmp)) -- data[j+1] = data[j]; -- data[j+1] = tmp; -+ for (int i=lo+1; i<=hi; i++) -+ { -+ int j = i; -+ TYPE tmp = data[i]; -+ while ((--j>=lo) && !(data[j]<=tmp)) -+ data[j+1] = data[j]; -+ data[j+1] = tmp; -+ } -+ return; - } -- return; -- } -- // -- determine suitable quick-sort pivot -- TYPE tmp = data[lo]; -- TYPE pivot = data[(lo+hi)/2]; -- if (pivot <= tmp) -- { tmp = pivot; pivot=data[lo]; } -- if (data[hi] <= tmp) -- { pivot = tmp; } -- else if (data[hi] <= pivot) -- { pivot = data[hi]; } -- // -- partition set -- int h = hi; -- int l = lo; -- while (l < h) -- { -- while (! (pivot <= data[l])) l++; -- while (! (data[h] <= pivot)) h--; -- if (l < h) -+ // -- determine median-of-three pivot -+ TYPE tmp = data[lo]; -+ TYPE pivot = data[(lo+hi)/2]; -+ if (pivot <= tmp) -+ { tmp = pivot; pivot=data[lo]; } -+ if (data[hi] <= tmp) -+ { pivot = tmp; } -+ else if (data[hi] <= pivot) -+ { pivot = data[hi]; } -+ // -- partition set -+ int h = hi; -+ int l = lo; -+ while (l < h) - { -- tmp = data[l]; -- data[l] = data[h]; -- data[h] = tmp; -- l = l+1; -- h = h-1; -+ while (! (pivot <= data[l])) l++; -+ while (! (data[h] <= pivot)) h--; -+ if (l < h) -+ { -+ tmp = data[l]; -+ data[l] = data[h]; -+ data[h] = tmp; -+ l = l+1; -+ h = h-1; -+ } -+ } -+ // -- recurse, small partition first -+ // tail-recursion elimination -+ if (h - lo <= hi - l) { -+ sort(lo,h); -+ lo = l; // sort(l,hi) -+ } else { -+ sort(l,hi); -+ hi = h; // sort(lo,h) - } - } -- // -- recursively restart -- sort(lo, h); -- sort(l, hi); - } - - template inline TYPE& diff --git a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15145.patch b/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15145.patch deleted file mode 100644 index 01108f9ee7..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-15145.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 9658b01431cd7ff6344d7787f855179e73fe81a7 -Author: Leon Bottou -Date: Mon Apr 8 22:55:38 2019 -0400 - - fix bug #298 - -diff --git a/libdjvu/GBitmap.h b/libdjvu/GBitmap.h -index e8e0c9b..ca89a19 100644 ---- a/libdjvu/GBitmap.h -+++ b/libdjvu/GBitmap.h -@@ -566,7 +566,7 @@ GBitmap::operator[](int row) - { - if (!bytes) - uncompress(); -- if (row<0 || row>=nrows) { -+ if (row<0 || row>=nrows || !bytes) { - #ifndef NDEBUG - if (zerosize < bytes_per_row + border) - G_THROW( ERR_MSG("GBitmap.zero_small") ); -@@ -581,7 +581,7 @@ GBitmap::operator[](int row) const - { - if (!bytes) - ((GBitmap*)this)->uncompress(); -- if (row<0 || row>=nrows) { -+ if (row<0 || row>=nrows || !bytes) { - #ifndef NDEBUG - if (zerosize < bytes_per_row + border) - G_THROW( ERR_MSG("GBitmap.zero_small") ); diff --git a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-18804.patch b/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-18804.patch deleted file mode 100644 index 132fed7948..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2019-18804.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit c8bec6549c10ffaa2f2fbad8bbc629efdf0dd125 -Author: Leon Bottou -Date: Thu Oct 17 22:20:31 2019 -0400 - - Fixed bug 309 - -diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp -index 00752a0..f81eaeb 100644 ---- a/libdjvu/IW44EncodeCodec.cpp -+++ b/libdjvu/IW44EncodeCodec.cpp -@@ -405,7 +405,7 @@ filter_fv(short *p, int w, int h, int rowsize, int scale) - int y = 0; - int s = scale*rowsize; - int s3 = s+s+s; -- h = ((h-1)/scale)+1; -+ h = (h>0) ? ((h-1)/scale)+1 : 0; - y += 1; - p += s; - while (y-3 < h) -diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp -index 6d0df3b..7109952 100644 ---- a/tools/ddjvu.cpp -+++ b/tools/ddjvu.cpp -@@ -279,7 +279,7 @@ render(ddjvu_page_t *page, int pageno) - prect.h = (ih * 100) / dpi; - } - /* Process aspect ratio */ -- if (flag_aspect <= 0) -+ if (flag_aspect <= 0 && iw>0 && ih>0) - { - double dw = (double)iw / prect.w; - double dh = (double)ih / prect.h; diff --git a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/djvulibre/default.nix index d4384e829c..5119dd48e0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/djvulibre/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "djvulibre"; - version = "3.5.27"; + version = "3.5.28"; src = fetchurl { url = "mirror://sourceforge/djvu/${pname}-${version}.tar.gz"; - sha256 = "0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6"; + sha256 = "1p1fiygq9ny8aimwc4vxwjc6k9ykgdsq1sq06slfbzalfvm0kl7w"; }; outputs = [ "bin" "dev" "out" ]; @@ -24,21 +24,10 @@ stdenv.mkDerivation rec { libiconv ]; - patches = [ - ./CVE-2019-18804.patch - # This one is needed to make the following - # two CVE patches apply cleanly - ./fix_hongfuzz_crash.patch - ./CVE-2019-15142.patch - ./CVE-2019-15143.patch - ./CVE-2019-15144.patch - ./CVE-2019-15145.patch - ]; - meta = with lib; { description = "The big set of CLI tools to make/modify/optimize/show/export DJVU files"; homepage = "http://djvu.sourceforge.net"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ Anton-Latukha ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/fix_hongfuzz_crash.patch b/third_party/nixpkgs/pkgs/applications/misc/djvulibre/fix_hongfuzz_crash.patch deleted file mode 100644 index 609b41cd9d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/fix_hongfuzz_crash.patch +++ /dev/null @@ -1,51 +0,0 @@ -commit 89d71b01d606e57ecec2c2930c145bb20ba5bbe3 -Author: Leon Bottou -Date: Fri Jul 13 08:46:22 2018 -0400 - - fix hongfuzz crash. - -diff --git a/libdjvu/DjVmDir.cpp b/libdjvu/DjVmDir.cpp -index d322323..a6a39e0 100644 ---- a/libdjvu/DjVmDir.cpp -+++ b/libdjvu/DjVmDir.cpp -@@ -299,7 +299,13 @@ DjVmDir::decode(const GP &gstr) - memcpy((char*) strings+strings_size, buffer, length); - } - DEBUG_MSG("size of decompressed names block=" << strings.size() << "\n"); -- -+ if (strings[strings.size()-1] != 0) -+ { -+ int strings_size=strings.size(); -+ strings.resize(strings_size+1); -+ strings[strings_size] = 0; -+ } -+ - // Copy names into the files - const char * ptr=strings; - for(pos=files_list;pos;++pos) -diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp -index 6a5cd90..828addc 100644 ---- a/libdjvu/miniexp.cpp -+++ b/libdjvu/miniexp.cpp -@@ -1065,7 +1065,7 @@ print_c_string(const char *s, char *d, int flags, size_t len) - c = (unsigned char)(*s++); - if (char_quoted(c, flags)) - { -- char buffer[10]; -+ char buffer[16]; /* 10+1 */ - static const char *tr1 = "\"\\tnrbf"; - static const char *tr2 = "\"\\\t\n\r\b\f"; - buffer[0] = buffer[1] = 0; -diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp -index 7ed13ad..fab9472 100644 ---- a/tools/csepdjvu.cpp -+++ b/tools/csepdjvu.cpp -@@ -1834,7 +1834,7 @@ main(int argc, const char **argv) - ByteStream::create(GURL::Filename::UTF8(arg),"rb"); - BufferByteStream ibs(*fbs); - do { -- char pagename[16]; -+ char pagename[20]; - sprintf(pagename, "p%04d.djvu", ++pageno); - if (opts.verbose > 1) - DjVuPrintErrorUTF8("%s","--------------------\n"); diff --git a/third_party/nixpkgs/pkgs/applications/misc/dwmblocks/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dwmblocks/default.nix index 45757787c7..c31a1a4b06 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dwmblocks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dwmblocks/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { homepage = "https://github.com/torrinfail/dwmblocks"; license = licenses.isc; maintainers = with maintainers; [ sophrosyne ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/feedbackd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/feedbackd/default.nix index 1cf2fee371..4cdf339913 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/feedbackd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/feedbackd/default.nix @@ -1,46 +1,65 @@ { lib , stdenv , fetchFromGitLab +, docbook-xsl-nons +, gobject-introspection +, gtk-doc +, libxslt , meson , ninja , pkg-config +, vala , wrapGAppsHook , glib , gsound -, libgudev , json-glib -, vala -, gobject-introspection +, libgudev +, dbus }: stdenv.mkDerivation rec { - pname = "feedbackd-unstable"; - version = "2021-01-25"; + pname = "feedbackd"; + # Not an actual upstream project release, + # only a Debian package release that is tagged in the upstream repo + version = "0.0.0+git20210426"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "feedbackd"; - rev = "v0.0.0+git${builtins.replaceStrings ["-"] [""] version}"; - sha256 = "184ag10sfzrka533inv6f38x6z769kq5jj56vdkcm65j5h786w5v"; + rev = "v${version}"; + sha256 = "12kdchv11c5ynpv6fbagcx755x5p2kd7acpwjxi9khwdwjsqxlmn"; }; nativeBuildInputs = [ + docbook-xsl-nons + gobject-introspection + gtk-doc + libxslt meson ninja pkg-config - wrapGAppsHook vala - gobject-introspection + wrapGAppsHook ]; buildInputs = [ glib gsound - libgudev json-glib + libgudev ]; + mesonFlags = [ "-Dgtk_doc=true" "-Dman=true" ]; + + checkInputs = [ + dbus + ]; + + doCheck = true; + postInstall = '' mkdir -p $out/lib/udev/rules.d sed "s|/usr/libexec/|$out/libexec/|" < $src/debian/feedbackd.udev > $out/lib/udev/rules.d/90-feedbackd.rules @@ -54,4 +73,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix b/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix index b116fbbbd7..5274e606dd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }: rustPlatform.buildRustPackage rec { pname = "flavours"; @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-rDy859jg+F8XC4sJogIgdn1FoT8cf7S+KORt+7kboAc="; }; + buildInputs = [ ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; + cargoSha256 = "sha256-cAXiAPhHdxdd8pFQ0Gq7eHO2p/Dam53gDbE583UYY/k="; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix b/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix index 766ec9a55d..29399ab2f5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix @@ -1,20 +1,61 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, gettext, python3, - pkg-config, libxml2, json-glib , sqlite, itstool, yelp-tools, - vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection, - libsoup, webkitgtk +{ lib +, stdenv +, fetchFromGitHub +, meson +, fetchpatch +, ninja +, gettext +, python3 +, pkg-config +, libxml2 +, json-glib +, sqlite +, itstool +, yelp-tools +, vala +, gsettings-desktop-schemas +, gtk3 +, gnome +, desktop-file-utils +, wrapGAppsHook +, gobject-introspection +, libsoup +, glib-networking +, webkitgtk }: stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.8.5-1"; + version = "0.8.6"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "1p0hfnf06892hn25a6zv8fnhbh4ln11nn2fv1vjqs63rr59fprbk"; + sha256 = "0a18rbdy9d0fj0vnsc2rm7xlh17vjqn4kdyrq0ldzlzkb6zbdk2k"; }; + patches = [ + # Fix some Desktop Settings with GNOME 40. + # https://github.com/FontManager/font-manager/issues/215 + (fetchpatch { + url = "https://github.com/FontManager/font-manager/commit/b28f325d7951a66ebf1a2a432ee09fd22048a033.patch"; + sha256 = "dKbrXGb9a4JuG/4x9vprMlh5J17HKJFifRWq9BWp1ow="; + }) + (fetchpatch { + url = "https://github.com/FontManager/font-manager/commit/2147204d4c4c6b58161230500186c3a5d4eeb1c1.patch"; + sha256 = "2/PFLwf7h76fIIN4+lyjg/L0KVU1hhRQCfwCAGDpb00="; + }) + (fetchpatch { + url = "https://github.com/FontManager/font-manager/commit/3abc541ef8606727c72af7631c021809600336ac.patch"; + sha256 = "rJPnW+7uuFLxTf5tk+Rzo+xkw2+uzU6BkzPXLeR/RGc="; + }) + (fetchpatch { + url = "https://github.com/FontManager/font-manager/commit/03a822f0d7b72442cd2ffcc8668da265d3535e0d.patch"; + sha256 = "3Z2UqK5VV2bIwpGd1tA7fivd7ooIuV6CxTJhzgOAkIM="; + }) + ]; + nativeBuildInputs = [ pkg-config meson @@ -34,12 +75,18 @@ stdenv.mkDerivation rec { libxml2 json-glib sqlite + gsettings-desktop-schemas # for font settings gtk3 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libsoup + glib-networking # for SSL so that Google Fonts can load webkitgtk ]; + mesonFlags = [ + "-Dreproducible=true" # Do not hardcode build directory… + ]; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py diff --git a/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix b/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix index 4ae1e8aede..dab8ccb29b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dU8c+tpt+4nCWQj3P2rl6CJNtWFcXaYb3ZESg8hAllQ="; + sha256 = "sha256-2TOYvZBI2EW9xjbjA4Bh+TgjbyEXRzOByalLYBW8Ba8="; }; nativeBuildInputs = [ copyDesktopItems pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix index f03e856971..71c494d311 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fuzzel"; - version = "1.5.3"; + version = "1.5.4"; src = fetchzip { url = "https://codeberg.org/dnkl/fuzzel/archive/${version}.tar.gz"; - sha256 = "sha256-n2eXS4NdOBgn48KOJ+0sQeNMKL7OxB8tUB99narQG0o="; + sha256 = "sha256-Zg9KrRf2ntg2FU6lhllt/Fd63KJak6zB7hu4ujj/9AI="; }; nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index ad0970e0fe..854b8a5f9b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.17.1"; + version = "1.17.4"; src = fetchPypi { inherit pname version; - sha256 = "1cfaa3a617d5d222d4b9b41634b1bdede2673a8620d6b0e62fb755ae224ca2ac"; + sha256 = "4df80fd923b03b2413a3d1c50e32c3006d100ed5acc1400ace69d8dc2162d293"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/getxbook/default.nix b/third_party/nixpkgs/pkgs/applications/misc/getxbook/default.nix index a69f8d7f05..15b7c37244 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/getxbook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/getxbook/default.nix @@ -9,11 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs"; }; - NIX_CFLAGS_COMPILE = builtins.toString [ - "-Wno-error=format-truncation" - "-Wno-error=deprecated-declarations" - "-Wno-error=stringop-overflow" - ]; + NIX_CFLAGS_COMPILE = builtins.toString ( + [ "-Wno-error=deprecated-declarations" ] + ++ lib.optionals (!stdenv.cc.isClang) [ + "-Wno-error=format-truncation" + "-Wno-error=stringop-overflow" + ] + ); buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix b/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix index f8ebd8aed7..cc13ad5933 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, check, dbus, xvfb_run, glib, gtk, gettext, libiconv, json_c, libintl +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, check, dbus, xvfb-run, glib, gtk, gettext, libiconv, json_c, libintl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1n3i960b458172mc3pkq7m9dn5qxry6fms3c3k06v27cjp5whsyf"; }; - nativeBuildInputs = [ meson ninja pkg-config gettext check dbus xvfb_run ]; + nativeBuildInputs = [ meson ninja pkg-config gettext check dbus xvfb-run ]; buildInputs = [ libintl libiconv json_c ]; propagatedBuildInputs = [ glib gtk ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gksu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gksu/default.nix index 9d8ce3cc48..c1a4ea2b67 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gksu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gksu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome3, libgksu, +{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome, libgksu, intltool, libstartup_notification, gtk-doc, wrapGAppsHook }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 gnome2.GConf libstartup_notification gnome3.libgnome-keyring + gtk2 gnome2.GConf libstartup_notification gnome.libgnome-keyring ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-multi-writer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gnome-multi-writer/default.nix index 89a967d718..31d81a3327 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gnome-multi-writer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gnome-multi-writer/default.nix @@ -4,7 +4,7 @@ , desktop-file-utils , gettext , glib -, gnome3 +, gnome , gtk3 , gusb , libcanberra-gtk3 @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnome-multi-writer"; - version = "3.32.1"; + version = "3.35.90"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1apdd8yi12zagf82k376a9wmdm27wzwdxpm2wf2pnwkaf786rmdw"; + sha256 = "07vgzjjdrxcp7h73z13h9agafxb4vmqx5i81bcfyw0ilw9kkdzmp"; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-recipes/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gnome-recipes/default.nix index 168d5b9fb5..b35319c386 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gnome-recipes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gnome-recipes/default.nix @@ -3,7 +3,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , desktop-file-utils , gettext , itstool @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix index bbd272754c..a1b9257267 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix @@ -12,7 +12,7 @@ , gtk3 , libgtop , libdazzle -, gnome3 +, gnome , tracker , libhandy }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gtk3 libdazzle libgtop @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix index 70645202a4..583a8a1931 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "20.3"; + version = "20.4"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "sha256-hmAksLPQxzB4O+ET+O/pmL/J4FG4+Dt0ulSsgjBWKxw="; + sha256 = "sha256-ZTYkKyu0/axf2uLUmQHRW/2bQ6p2zK7xBF66ozbPS2c="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix index 89a4198a74..1619f7f433 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: +{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gpx-viewer"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { intltool pkg-config wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; - buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme libxml2 ]; + buildInputs = [ gdl libchamplain gnome.adwaita-icon-theme libxml2 ]; meta = with lib; { homepage = "https://blog.sarine.nl/tag/gpxviewer/"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix index e6350dfb7c..3204a4a0e8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.4.10"; + version = "3.5.0"; src = fetchzip { - url = "http://www-eu.apache.org/dist/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-4/EcVjIc+8OMkll8OxE5oXiqk+w9k1Nv9ld8N7oFFp0="; + url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; + sha256 = "sha256-aVhDbOYhgYaWjttGjJvBKbov7OGWh2/llBTePFPGXDM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix index f0416e232d..c36f50b1cb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, pkgs -, glib, gnome3, gtk3, gtksourceview3, gtkspell3, poppler, texlive +, glib, gnome, gtk3, gtksourceview3, gtkspell3, poppler, texlive , pkg-config, intltool, autoreconfHook, wrapGAppsHook }: diff --git a/third_party/nixpkgs/pkgs/applications/misc/gxkb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gxkb/default.nix index ea1f6b9715..7f2b93f149 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gxkb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gxkb/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gxkb"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "zen-tools"; repo = "gxkb"; rev = "v${version}"; - sha256 = "sha256-pRVzhNoTMtiwqaxCGVImbvdRmLbZ2bst1IdMA2IKpYc="; + sha256 = "sha256-KIlosBNfGSYCgtxBuSVeSfHaLsANdLgG/P5UtAL6Hms="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix index 5d9fb0f30d..3fd80d4eff 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "sha256-5cepT9Tfr/3nYbxRAMqKSUDB+suEyojnexWxZ0i7GBw="; + sha256 = "sha256-CY7n9eq/FtQ6srZ9L31nJi0b9rOQq60kNOY3iTFws/E="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hello/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hello/default.nix index a885b1643f..b446fe6223 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hello/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hello/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, testVersion +, hello +}: stdenv.mkDerivation rec { pname = "hello"; @@ -11,6 +16,9 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.version = + testVersion { package = hello; }; + meta = with lib; { description = "A program that produces a familiar, friendly greeting"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/imag/default.nix b/third_party/nixpkgs/pkgs/applications/misc/imag/default.nix index 09f734df9a..5c1e87612e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/imag/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/imag/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optional stdenv.isDarwin Security; checkInputs = [ gitMinimal util-linuxMinimal ]; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; cargoSha256 = "0n8cw70qh8g4hfwfaxwwxbrrx5hm2z037z8kdhvdpqkxljl9189x"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/index-fm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/index-fm/default.nix index 328db96500..149e571fea 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/index-fm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/index-fm/default.nix @@ -3,27 +3,28 @@ , fetchFromGitLab , cmake , extra-cmake-modules -, breeze-icons +, applet-window-buttons , karchive , kcoreaddons , ki18n , kio , kirigami2 , mauikit +, mauikit-filebrowsing , qtmultimedia , qtquickcontrols2 }: mkDerivation rec { pname = "index"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "index-fm"; rev = "v${version}"; - sha256 = "1v6z44c88cqgr3b758yq6l5d2zj1vhlnaq7v8rrhs7s5dsimzlx8"; + sha256 = "sha256-N9/Jt18QRqDMWtEfxWn22e5Ud3YMwJ9B7OQRwTvwX8g="; }; nativeBuildInputs = [ @@ -32,13 +33,14 @@ mkDerivation rec { ]; buildInputs = [ - breeze-icons + applet-window-buttons karchive kcoreaddons ki18n kio kirigami2 mauikit + mauikit-filebrowsing qtmultimedia qtquickcontrols2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jekyll/default.nix index 54857d6142..8c25e3774b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/default.nix @@ -49,7 +49,7 @@ in bundlerApp { homepage = "https://jekyllrb.com/"; #changelog = "https://raw.githubusercontent.com/jekyll/jekyll/v${version}/History.markdown"; license = licenses.mit; - maintainers = with maintainers; [ primeos pesterhazy ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix b/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix index af259c199d..fe09345349 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix @@ -23,6 +23,7 @@ , qtsvg , qtx11extras , quazip +, readline , wrapQtAppsHook , yubikey-personalization , zlib @@ -51,13 +52,13 @@ stdenv.mkDerivation rec { sha256 = "02ajfkw818cmalvkl0kqvza85rgdgs59kw2v7b3c4v8kv00c41j3"; }; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [ + NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang [ "-Wno-old-style-cast" "-Wno-error" "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" ]; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; + NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; patches = [ ./darwin.patch @@ -108,12 +109,14 @@ stdenv.mkDerivation rec { qtbase qtsvg qtx11extras + readline yubikey-personalization zlib ] - ++ lib.optional withKeePassKeeShareSecure quazip - ++ lib.optional stdenv.isDarwin qtmacextras - ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication; + ++ optional withKeePassKeeShareSecure quazip + ++ optional stdenv.isDarwin qtmacextras + ++ optional (stdenv.isDarwin && withKeePassTouchID) + darwin.apple_sdk.frameworks.LocalAuthentication; preFixup = optionalString stdenv.isDarwin '' # Make it work without Qt in PATH. @@ -123,8 +126,14 @@ stdenv.mkDerivation rec { passthru.tests = nixosTests.keepassxc; meta = { - description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications"; - longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI, CLI, and browser integration with the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser)."; + description = "Offline password manager with many features."; + longDescription = '' + A community fork of KeePassX, which is itself a port of KeePass Password Safe. + The goal is to extend and improve KeePassX with new features and bugfixes, + to provide a feature-rich, fully cross-platform and modern open-source password manager. + Accessible via native cross-platform GUI, CLI, has browser integration + using the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser) + ''; homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jonafato turion ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix index 333f008fed..479c5bf1d8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; platforms = platforms.linux; # It's meant for river, a wayland compositor maintainers = with maintainers; [ fortuneteller2k ]; + mainProgram = "kile"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix new file mode 100644 index 0000000000..65b32c4586 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix @@ -0,0 +1,42 @@ +{ fetchFromGitHub, buildGoModule, lib, stdenv }: + +buildGoModule rec { + pname = "kratos"; + version = "0.6.0-alpha.2"; + + src = fetchFromGitHub { + owner = "ory"; + repo = "kratos"; + rev = "v${version}"; + sha256 = "0zg6afzqi5fmr7hmy1cd7fknd1bcplz3h0f7z67l75v8k2n73md1"; + }; + + vendorSha256 = "16qg44k97l6719hib8vbv0j15x6gvs9d6738d2y990a2qiqbsqpw"; + + subPackages = [ "." ]; + + buildFlags = [ "-tags sqlite" ]; + + doCheck = false; + + preBuild = '' + # Patch shebangs + files=( + test/e2e/run.sh + script/testenv.sh + script/test-envs.sh + persistence/sql/migratest/update_fixtures.sh + ) + patchShebangs "''${files[@]}" + + # patchShebangs doesn't work for this Makefile, do it manually + substituteInPlace Makefile --replace '/bin/bash' '${stdenv.shell}' + ''; + + meta = with lib; { + maintainers = with maintainers; [ mrmebelman ]; + homepage = "https://www.ory.sh/kratos/"; + license = licenses.asl20; + description = "An API-first Identity and User Management system that is built according to cloud architecture best practices"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/latte-dock/default.nix b/third_party/nixpkgs/pkgs/applications/misc/latte-dock/default.nix index 424da3ad36..1840804ce7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/latte-dock/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/latte-dock/default.nix @@ -3,11 +3,11 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.9.11"; + version = "0.9.12"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0x7a93a7axsa0fzpbkkv1z722k9za4p51xcpzdpnh5ih1zij0csi"; + sha256 = "sha256-srivjGnrEizLvph7AP/02dOsnMyTnL3a6f0xm8oGML4="; name = "${pname}-${version}.tar.xz"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix index b580fabf58..c7238fb015 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix @@ -5,7 +5,7 @@ let qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; - gnome3Deps = pkgs: with pkgs; [ gnome3.zenity gtksourceview gnome3.gnome-desktop gnome3.libgnome-keyring webkitgtk ]; + gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome.gnome-desktop gnome.libgnome-keyring webkitgtk ]; xorgDeps = pkgs: with pkgs.xorg; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite @@ -86,7 +86,7 @@ in buildFHSUserEnv { # ZDOOM soundfont-fluid bzip2 game-music-emu ] ++ qt5Deps pkgs - ++ gnome3Deps pkgs + ++ gnomeDeps pkgs ++ lib.optional steamSupport pkgs.steam; multiPkgs = pkgs: with pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/makeself/default.nix b/third_party/nixpkgs/pkgs/applications/misc/makeself/default.nix index 205d526ed9..e60e110087 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/makeself/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/makeself/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, which }: +{ lib, stdenv, fetchFromGitHub, which, zstd, pbzip2 }: stdenv.mkDerivation rec { version = "2.4.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - checkInputs = [ which ]; + checkInputs = [ which zstd pbzip2 ]; installPhase = '' mkdir -p $out/{bin,share/{${pname}-${version},man/man1}} diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix index de145efd44..f39b88f27d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "mediaelch"; - version = "2.8.8"; + version = "2.8.12"; src = fetchFromGitHub { owner = "Komet"; repo = "MediaElch"; rev = "v${version}"; - sha256 = "0yif0ibmlj0bhl7fnhg9yclxg2iyjygmjhffinp5kgqy0vaabkzw"; + sha256 = "1gx4m9cf81d0b2nk2rlqm4misz67f5bpkjqx7d1l76rw2pwc6azf"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/megacmd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/megacmd/default.nix index 23d34f30d6..9a8d26cc70 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/megacmd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/megacmd/default.nix @@ -1,11 +1,14 @@ -{ lib, stdenv +{ lib +, stdenv , autoconf , automake , c-ares , cryptopp , curl , fetchFromGitHub -, ffmpeg_3 + # build fails with latest ffmpeg, see https://github.com/meganz/MEGAcmd/issues/523. + # to be re-enabled when patch available + # , ffmpeg , freeimage , gcc-unwrapped , libmediainfo @@ -22,13 +25,13 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "0czyhsms0a0237d6h9b21n9p4nm4zkjanhhbvw26k6266g6c1nyr"; + sha256 = "sha256-Q1SZSDTPGgBA/W/ZVYfTQsiP41RE1LJ+esQ3PK9EjIc="; fetchSubmodules = true; }; @@ -43,13 +46,12 @@ stdenv.mkDerivation rec { c-ares cryptopp curl - ffmpeg_3 + # ffmpeg freeimage gcc-unwrapped libmediainfo libraw libsodium - libtool libuv libzen pcre-cpp @@ -67,7 +69,7 @@ stdenv.mkDerivation rec { "--with-cares" "--with-cryptopp" "--with-curl" - "--with-ffmpeg" + # "--with-ffmpeg" "--with-freeimage" "--with-libmediainfo" "--with-libuv" @@ -80,9 +82,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MEGA Command Line Interactive and Scriptable Application"; - homepage = "https://mega.nz/"; - license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ maintainers.wedens ]; + homepage = "https://mega.nz/cmd"; + license = with licenses; [ bsd2 gpl3Only ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ lunik1 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix b/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix index b379a04a51..07dc364fe0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix @@ -7,7 +7,7 @@ , curl , doxygen , fetchFromGitHub -, ffmpeg + #, ffmpeg , libmediainfo , libraw , libsodium @@ -52,7 +52,8 @@ mkDerivation rec { c-ares cryptopp curl - ffmpeg + # temporarily disable until patched for ffmpeg 4.4 + #ffmpeg libmediainfo libraw libsodium @@ -94,7 +95,8 @@ mkDerivation rec { "--with-cares" "--with-cryptopp" "--with-curl" - "--with-ffmpeg" + # temporarily disable until patched for ffmpeg 4.4 + #"--with-ffmpeg" "--without-freeimage" # unreferenced even when found "--without-readline" "--without-termcap" diff --git a/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix b/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix index 9fa4089c4c..dd3fb85459 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, fetchFromGitHub, cmake, perl , alsaLib, libevdev, libopus, udev, SDL2 -, ffmpeg_3, pkg-config, xorg, libvdpau, libpulseaudio, libcec +, ffmpeg, pkg-config, xorg, libvdpau, libpulseaudio, libcec , curl, expat, avahi, enet, libuuid, libva }: stdenv.mkDerivation rec { pname = "moonlight-embedded"; - version = "2.4.10"; + version = "2.4.11"; src = fetchFromGitHub { owner = "irtimmer"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "0m5i3q3hbjl51cndjpz5hxi3br6fvpn1fzdv0f6lxjxgw9z32413"; + sha256 = "19wm4gizj8q6j4jwqfcn3bkhms97d8afwxmqjmjnqqxzpd2gxc16"; fetchSubmodules = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ alsaLib libevdev libopus udev SDL2 - ffmpeg_3 pkg-config xorg.libxcb libvdpau libpulseaudio libcec + ffmpeg pkg-config xorg.libxcb libvdpau libpulseaudio libcec xorg.libpthreadstubs curl expat avahi enet libuuid libva ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix index 666009b99a..2393fe09b3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "moonlight-qt"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = pname; rev = "v${version}"; - sha256 = "e7fwb76zzidtF1COqrQ6gSF7bCX20j/CGjPu1Cb4HGc="; + sha256 = "1bz4wjl8zydw46bh2mdbrsx8prh2fw0cmzqliy912fdz5aal2b74"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix index 028b5c686f..9b96fea718 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "sha256-qcfSGV/+FkyWGAApekRZHWGmeB9gIURt11DKn7lEh+o="; + sha256 = "sha256-ngSZFYGE+Varul/qwavMO3xcMIp8w2WETWXc573wYhQ="; }; - cargoSha256 = "sha256-HpGzDZMIzO0lpussmm+kJNOU7zghcYrQWZo3WZ5FOmA="; + cargoSha256 = "sha256-qtxFTk0iCxPa4Z7H9+QWSii+iYrLUV2LfiAEbePdhOQ="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/nimbo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nimbo/default.nix new file mode 100644 index 0000000000..1bc45bc6ae --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/nimbo/default.nix @@ -0,0 +1,28 @@ +{ lib, setuptools, boto3, requests, click, pyyaml, pydantic, buildPythonApplication +, pythonOlder, fetchFromGitHub, awscli }: + +buildPythonApplication rec { + pname = "nimbo"; + version = "0.2.4"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "nimbo-sh"; + repo = pname; + rev = "v${version}"; + sha256 = "1fs28s9ynfxrb4rzba6cmik0kl0q0vkpb4zdappsq62jqf960k24"; + }; + + propagatedBuildInputs = [ setuptools boto3 awscli requests click pyyaml pydantic ]; + + # nimbo tests require an AWS instance + doCheck = false; + pythonImportsCheck = [ "nimbo" ]; + + meta = with lib; { + description = "Run machine learning jobs on AWS with a single command"; + homepage = "https://github.com/nimbo-sh/nimbo"; + license = licenses.bsl11; + maintainers = with maintainers; [ alex-eyre noreferences ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/notejot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/notejot/default.nix index 0b781f6136..bd30fa2bb2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/notejot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/notejot/default.nix @@ -1,15 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, vala, pkg-config, meson, ninja, python3, pantheon -, gtk3, gtksourceview, json-glib, libgee, wrapGAppsHook }: +{ lib +, stdenv +, fetchFromGitHub +, gtk4 +, gtksourceview +, json-glib +, libadwaita +, libgee +, meson +, ninja +, nix-update-script +, pantheon +, pkg-config +, python3 +, vala +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "notejot"; - version = "1.6.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "170dzgd6cnf2k3hfifjysmdggpskx6v1pjmblqgbwaj2d3snf3h8"; + hash = "sha256-p8rca3PsnT/3Lp6W30VvqR9aPr6EIuNrH5gsxL0lZ0Q="; }; nativeBuildInputs = [ @@ -20,31 +35,30 @@ stdenv.mkDerivation rec { python3 wrapGAppsHook ]; - buildInputs = [ - gtk3 + gtk4 gtksourceview json-glib + libadwaita libgee pantheon.elementary-icon-theme pantheon.granite ]; postPatch = '' - patchShebangs meson/post_install.py + chmod +x build-aux/post_install.py + patchShebangs build-aux/post_install.py ''; - passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; - }; - meta = with lib; { - description = "Stupidly-simple sticky notes applet"; homepage = "https://github.com/lainsce/notejot"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ worldofpeace ]; + description = "Stupidly-simple sticky notes applet"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/notify-osd-customizable/default.nix b/third_party/nixpkgs/pkgs/applications/misc/notify-osd-customizable/default.nix index e62b3a3348..b00ee18d5f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -2,7 +2,7 @@ , dbus-glib , fetchurl , glib -, gnome3 +, gnome , libnotify , libtool , libwnck3 @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libwnck3 libnotify dbus-glib makeWrapper - gsettings-desktop-schemas gnome3.gnome-common + gsettings-desktop-schemas gnome.gnome-common libtool ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix b/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix new file mode 100644 index 0000000000..c51306bb93 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix @@ -0,0 +1,68 @@ +{ lib +, python3 +, fetchFromSourcehut +, desktop-file-utils +, glib +, gobject-introspection +, gtk3 +, libhandy +, librsvg +, meson +, ninja +, pkg-config +, wrapGAppsHook +}: + +python3.pkgs.buildPythonApplication rec { + pname = "numberstation"; + version = "0.4.0"; + + format = "other"; + + src = fetchFromSourcehut { + owner = "~martijnbraam"; + repo = "numberstation"; + rev = version; + sha256 = "038yyffqknr274f7jh5z12y68pjxr37f8y2cn2pwhf605jmbmpwv"; + }; + + postPatch = '' + patchShebangs build-aux/meson + ''; + + nativeBuildInputs = [ + desktop-file-utils + glib + gtk3 + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + gtk3 + libhandy + librsvg + ]; + + propagatedBuildInputs = with python3.pkgs; [ + keyring + pygobject3 + pyotp + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "TOTP Authentication application for mobile"; + homepage = "https://sr.ht/~martijnbraam/numberstation/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index d7906c7dcb..39044301ec 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -30,17 +30,18 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.11.13"; + version = "0.12.3"; src = fetchurl { - url = - "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; - sha256 = "0QL1rP37pmdIdGM9eHa7PfW1GVrvn2fX4bQPqQ8FOpI="; + url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; + sha256 = "sha256-nwtQp7BkMZwMzfnA5wdcMAhfezM//Lm9cf0pbvnOVZE="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin makeWrapper ${electron}/bin/electron $out/bin/obsidian \ @@ -56,6 +57,8 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png done + + runHook postInstall ''; passthru.updateScript = updateScript; diff --git a/third_party/nixpkgs/pkgs/applications/misc/olifant/default.nix b/third_party/nixpkgs/pkgs/applications/misc/olifant/default.nix index fbaf140a9f..bde2ae07c9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/olifant/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/olifant/default.nix @@ -9,7 +9,7 @@ , python3 , libgee , gsettings-desktop-schemas -, gnome3 +, gnome , pantheon , wrapGAppsHook , gtk3 @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib glib-networking - gnome3.libsoup + gnome.libsoup gsettings-desktop-schemas gtk3 json-glib @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { description = "A simple Mastodon client designed for elementary OS, originally developed by @bleakgrey"; homepage = "https://github.com/cleac/olifant"; license = licenses.gpl3; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix index 71c7903dfe..e9646b9c21 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix @@ -22,6 +22,13 @@ stdenv.mkDerivation rec { # Enables SVG support by uncommenting the Makefile patches = [ ./000-enable-svg.patch ]; + # The strip options are not recognized by Darwin. + postPatch = lib.optionalString stdenv.isDarwin '' + sed -i -e '/strip -s/d' Makefile + ''; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + installFlags = [ "prefix=${placeholder "out"}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/openlp/lib.nix b/third_party/nixpkgs/pkgs/applications/misc/openlp/lib.nix index 6f0634b5c9..c044e76c59 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openlp/lib.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openlp/lib.nix @@ -5,7 +5,7 @@ # python deps , python, buildPythonPackage , alembic, beautifulsoup4, chardet, lxml, Mako, pyenchant -, pyqt5_with_qtwebkit, pyxdg, sip, sqlalchemy, sqlalchemy_migrate +, pyqt5_with_qtwebkit, pyxdg, sip_4, sqlalchemy, sqlalchemy_migrate }: buildPythonPackage rec { @@ -41,7 +41,7 @@ buildPythonPackage rec { pyenchant pyqt5_with_qtwebkit pyxdg - sip + sip_4 sqlalchemy sqlalchemy_migrate ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix b/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix index 72d68431b8..f8facbe01f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix @@ -12,7 +12,7 @@ , python , pygobject3 , gtk3 -, gnome3 +, gnome , substituteAll , at-spi2-atk , at-spi2-core @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.38.2"; + version = "40.0"; format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "UAX/LhHdH3E/WswZA6JwEZvFjDD9uMn4K8rHFJfGwjw="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0hq0zdcn80ficpcffbk667907v6m7dih3dhyc7ss01mrj3iyw000"; }; patches = [ @@ -92,7 +92,7 @@ buildPythonApplication rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; @@ -108,7 +108,7 @@ buildPythonApplication rec { GTK toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and WebKitGtk. AT-SPI support for the KDE Qt toolkit is being pursued. - Needs `services.gnome3.at-spi2-core.enable = true;` in `configuration.nix`. + Needs `services.gnome.at-spi2-core.enable = true;` in `configuration.nix`. ''; maintainers = with maintainers; [ berce ] ++ teams.gnome.members; license = licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/applications/misc/orca/fix-paths.patch b/third_party/nixpkgs/pkgs/applications/misc/orca/fix-paths.patch index ffb56dbe23..037b323c8c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/orca/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/applications/misc/orca/fix-paths.patch @@ -1,6 +1,8 @@ +diff --git a/src/orca/debug.py b/src/orca/debug.py +index e79482ed4..cbf3a24ec 100644 --- a/src/orca/debug.py +++ b/src/orca/debug.py -@@ -474,7 +474,7 @@ +@@ -502,7 +502,7 @@ def traceit(frame, event, arg): return traceit def getOpenFDCount(pid): @@ -9,7 +11,7 @@ procs = procs.decode('UTF-8').split('\n') files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs)) -@@ -482,7 +482,7 @@ +@@ -510,7 +510,7 @@ def getOpenFDCount(pid): def getCmdline(pid): try: @@ -18,7 +20,7 @@ cmdline = openFile.read() openFile.close() except: -@@ -492,7 +492,7 @@ +@@ -520,7 +520,7 @@ def getCmdline(pid): return cmdline def pidOf(procName): @@ -27,9 +29,11 @@ shell=True, stdout=subprocess.PIPE).stdout pids = openFile.read() +diff --git a/src/orca/orca.py b/src/orca/orca.py +index 2fe0a0bf2..087526556 100644 --- a/src/orca/orca.py +++ b/src/orca/orca.py -@@ -239,7 +239,7 @@ +@@ -285,7 +285,7 @@ def updateKeyMap(keyboardEvent): def _setXmodmap(xkbmap): """Set the keyboard map using xkbcomp.""" @@ -38,7 +42,7 @@ stdin=subprocess.PIPE, stdout=None, stderr=None) p.communicate(xkbmap) -@@ -297,7 +297,7 @@ +@@ -363,7 +363,7 @@ def _storeXmodmap(keyList): """ global _originalXmodmap @@ -47,7 +51,7 @@ def _restoreXmodmap(keyList=[]): """Restore the original xmodmap values for the keys in keyList. -@@ -309,7 +309,7 @@ +@@ -375,7 +375,7 @@ def _restoreXmodmap(keyList=[]): global _capsLockCleared _capsLockCleared = False @@ -56,9 +60,11 @@ stdin=subprocess.PIPE, stdout=None, stderr=None) p.communicate(_originalXmodmap) +diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in +index 8c9d40153..eec0d5437 100644 --- a/src/orca/orca_bin.py.in +++ b/src/orca/orca_bin.py.in -@@ -59,7 +59,7 @@ +@@ -62,7 +62,7 @@ class ListApps(argparse.Action): name = "[DEAD]" try: @@ -67,12 +73,12 @@ except: cmdline = '(exception encountered)' else: -@@ -192,7 +192,7 @@ +@@ -197,7 +197,7 @@ def inGraphicalDesktop(): def otherOrcas(): """Returns the pid of any other instances of Orca owned by this user.""" -- openFile = subprocess.Popen('pgrep -u %s orca' % os.getuid(), -+ openFile = subprocess.Popen('@pgrep@ -u %s orca' % os.getuid(), +- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(), ++ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(), shell=True, stdout=subprocess.PIPE).stdout pids = openFile.read() diff --git a/third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix b/third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix index 537ae3741e..80a423a3c8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix @@ -1,9 +1,8 @@ -{ lib, buildGoPackage, fetchFromGitHub, tmux, which, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub, tmux, which, makeWrapper }: -buildGoPackage rec { +buildGoModule rec { pname = "overmind"; - version = "2.2.0"; - goPackagePath = "github.com/DarthSim/overmind"; + version = "2.2.2"; nativeBuildInputs = [ makeWrapper ]; @@ -15,10 +14,10 @@ buildGoPackage rec { owner = "DarthSim"; repo = pname; rev = "v${version}"; - sha256 = "00v6l4138vv32bqfkzrhk4hfl52a00rlg9ywhp4difgrnz7zj6xb"; + sha256 = "zDjIwnhDoUj+zTAhtBa94dx7QhYMCTxv2DNUpeP8CP0="; }; - goDeps = ./deps.nix; + vendorSha256 = "KDMzR6qAruscgS6/bHTN6RnHOlLKCm9lxkr9k3oLY+Y="; meta = with lib; { homepage = "https://github.com/DarthSim/overmind"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/overmind/deps.nix b/third_party/nixpkgs/pkgs/applications/misc/overmind/deps.nix deleted file mode 100644 index b4c9211a24..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/overmind/deps.nix +++ /dev/null @@ -1,129 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/DarthSim/godotenv"; - fetch = { - type = "git"; - url = "https://github.com/DarthSim/godotenv"; - rev = "v1.3.1"; - sha256 = "0fb9nl5qrnv7f9w0pgg00ak34afw9kjgcql0l38z22faz2bhgl1q"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "f79a8a8ca69d"; - sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "2bc1f35cddc0"; - sha256 = "1pvrbrvmrf4mx0fxbfaphbzgqgwn8v6lkfk2vyrs0znxrs1xyc5r"; - }; - } - { - goPackagePath = "github.com/matoous/go-nanoid"; - fetch = { - type = "git"; - url = "https://github.com/matoous/go-nanoid"; - rev = "eab626deece6"; - sha256 = "1a82lclk56y7c44jg7wn5vq733dmn0g20r5yqbchrxnpfl75dw89"; - }; - } - { - 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/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v2.0.1"; - sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; - }; - } - { - goPackagePath = "github.com/sevlyar/go-daemon"; - fetch = { - type = "git"; - url = "https://github.com/sevlyar/go-daemon"; - rev = "v0.1.5"; - sha256 = "1y3gnxaifykcjcbzx91lz9bc93b95w3xj4rjxjbii26pm3j7gqyk"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "v1.0.0"; - sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.22.2"; - sha256 = "10mcnvi5qmn00vpyk6si8gjka7p654wr9hac4zc9w5h3ickhvbdc"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "88737f569e3a"; - sha256 = "02vkqfd6kc28zm6lffagw8nr78sayv6jabfgk9dcifl7826vi3k7"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "81d4e9dc473e"; - sha256 = "0074zjpkhclz5qbgjv0zmdwy6hmf5k2ri5yagnm6i12ahxaa48dr"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix index 474fddb252..a8b407dd7b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkg-config -, wrapGAppsHook, gnome3, withGtk3 ? true, gtk2, gtk3 }: +, wrapGAppsHook, gnome, withGtk3 ? true, gtk2, gtk3 }: let libfm' = libfm.override { inherit withGtk3; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc="; }; - buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ]; + buildInputs = [ glib gtk libfm' libX11 pango gnome.adwaita-icon-theme ]; nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix index 6ef88fb07c..2e3f323051 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix @@ -8,7 +8,7 @@ , python3 , wrapGAppsHook , libinput -, gnome3 +, gnome , glib , gtk3 , wayland @@ -60,9 +60,9 @@ in stdenv.mkDerivation rec { libinput glib gtk3 - gnome3.gnome-desktop + gnome.gnome-desktop # For keybindings settings schemas - gnome3.mutter + gnome.mutter wayland phocWlroots ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/plank/default.nix b/third_party/nixpkgs/pkgs/applications/misc/plank/default.nix index b462e5f134..30d9533d45 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/plank/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/plank/default.nix @@ -5,7 +5,7 @@ , cairo , dconf , glib -, gnome3 +, gnome , gtk3 , libwnck3 , libX11 @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext - gnome3.gnome-common + gnome.gnome-common libxml2 # xmllint pkg-config vala diff --git a/third_party/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix index bb365ecfef..e8bc572e28 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -2,17 +2,18 @@ stdenv.mkDerivation rec { pname = "plasma-applet-volumewin7mixer"; - version = "25"; + version = "26"; src = fetchFromGitHub { owner = "Zren"; repo = "plasma-applet-volumewin7mixer"; rev = "v${version}"; - sha256 = "1nvz0a06qb3pfk8dfh5n5vgf3psd6k0j3vms9pskr511qsxw0dfi"; + sha256 = "sha256-VMOUNtAURTHDuJBOGz2N0+3VzxBmVNC1O8dVuyUZAa4="; }; + # Adds the CMakeLists.txt not provided by upstream patches = [ ./cmake.patch ]; - postPatch = "rm build "; + postPatch = "rm build"; nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ plasma-framework kwindowsystem plasma-pa ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix index 44b2cd700e..05cc834591 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix @@ -2,7 +2,7 @@ , python3 , fetchFromGitHub , gdk-pixbuf -, gnome3 +, gnome , gpsbabel , glib-networking , glibcLocales @@ -13,7 +13,7 @@ , tzdata , webkitgtk , wrapGAppsHook -, xvfb_run +, xvfb-run }: let @@ -55,7 +55,7 @@ in python.pkgs.buildPythonApplication rec { gtk3 webkitgtk glib-networking - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gdk-pixbuf ]; @@ -66,7 +66,7 @@ in python.pkgs.buildPythonApplication rec { checkInputs = [ glibcLocales perl - xvfb_run + xvfb-run ] ++ (with python.pkgs; [ mysqlclient psycopg2 diff --git a/third_party/nixpkgs/pkgs/applications/misc/qdirstat/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qdirstat/default.nix index bba78bf753..d5450f0e5c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qdirstat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qdirstat/default.nix @@ -51,7 +51,7 @@ mkDerivation { description = "Graphical disk usage analyzer"; homepage = src.meta.homepage; license = licenses.gpl2Plus; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix index e2a5f348da..11373756f8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rmapi"; - version = "0.0.13"; + version = "0.0.15"; src = fetchFromGitHub { owner = "juruen"; repo = "rmapi"; rev = "v${version}"; - sha256 = "0qq8x37p7yxhcp5d5xss3pv5186xgg0hd6lbkqivhy5yjsd54c7b"; + sha256 = "sha256-ju54JSd3Zyye5YGLPEOkhY93ONh0b7eDSnvJlIawizE="; }; - vendorSha256 = "1pa75rjns1kknl2gmfprdzc3f2z8dk44jkz6dmf8f3prj0z7x88c"; + vendorSha256 = "sha256-SE/0a8QUJsWoGwkSiZqYx1eXuOIL3avJujyg8iSdcBU="; doCheck = false; @@ -19,7 +19,7 @@ buildGoModule rec { description = "A Go app that allows access to the ReMarkable Cloud API programmatically"; homepage = "https://github.com/juruen/rmapi"; changelog = "https://github.com/juruen/rmapi/blob/v${version}/CHANGELOG.md"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = [ maintainers.nickhu ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix b/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix index d866b643ef..179ebd33d8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg +{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg }: let inherit (python3Packages) python buildPythonApplication fetchPypi croniter; @@ -16,8 +16,8 @@ in buildPythonApplication rec { buildInputs = [ gtk3 gobject-introspection - gnome3.adwaita-icon-theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix index cc7d4c3771..e299ec2ac8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , makeWrapper , pkg-config , which @@ -16,29 +15,17 @@ stdenv.mkDerivation rec { pname = "sc-im"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "andmarti1424"; repo = "sc-im"; rev = "v${version}"; - sha256 = "sha256-AIYa3d1ml1f5GNLKijeFPX+UabgEqzdXiP60BGvBPsQ="; + sha256 = "sha256-H+GQUpouiXc/w6GWdkSVvTXZ/Dtb7sUmBLGcpxG3Mts="; }; sourceRoot = "${src.name}/src"; - patches = [ - # libxls and libxlsxwriter are not found without the patch - # https://github.com/andmarti1424/sc-im/pull/542 - (fetchpatch { - name = "use-pkg-config-for-libxls-and-libxlsxwriter.patch"; - url = "https://github.com/andmarti1424/sc-im/commit/b62dc25eb808e18a8ab7ee7d8eb290e34efeb075.patch"; - sha256 = "1yn32ps74ngzg3rbkqf8dn0g19jv4xhxrfgx9agnywf0x8gbwjh3"; - }) - ]; - - patchFlags = [ "-p2" ]; - nativeBuildInputs = [ makeWrapper pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/misc/slade/git.nix b/third_party/nixpkgs/pkgs/applications/misc/slade/git.nix index dfbfbe5566..f263c4ee74 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/slade/git.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/slade/git.nix @@ -1,18 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: +{ lib, stdenv, fetchFromGitHub +, cmake +, pkg-config +, wxGTK +, sfml +, fluidsynth +, curl +, freeimage +, ftgl +, glew +, zip +, lua +, fmt +, mpg123 +}: stdenv.mkDerivation { - name = "slade-git-3.1.2.2018.01.29"; + name = "slade-git-3.2.0.2021.05.13"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; - rev = "f7409c504b40c4962f419038db934c32688ddd2e"; - sha256 = "14icxiy0r9rlcc10skqs1ylnxm1f0f3irhzfmx4sazq0pjv5ivld"; + rev = "d2e249c89062a44c912a9b86951526edc8735ba0"; + sha256 = "08dsvx7m7c97jm8fxzivmi1fr47hj53y0lv57clqc35bh2gi62dg"; }; - cmakeFlags = ["-DNO_WEBVIEW=1"]; + cmakeFlags = [ + "-DwxWidgets_CONFIG_EXECUTABLE=${wxGTK}/bin/wx-config" + "-DWX_GTK3=OFF" + "-DNO_WEBVIEW=1" + ]; nativeBuildInputs = [ cmake pkg-config zip ]; - buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; + buildInputs = [ wxGTK wxGTK.gtk sfml fluidsynth curl freeimage ftgl glew lua fmt mpg123 ]; meta = with lib; { description = "Doom editor"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/snapper-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/snapper-gui/default.nix index 5beacfad2f..2c63431593 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/snapper-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/snapper-gui/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3, python3Packages -, gnome3, gtk3, wrapGAppsHook, gtksourceview3, snapper +, gnome, gtk3, wrapGAppsHook, gtksourceview3, snapper , gobject-introspection }: @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 gobject-introspection - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; doCheck = false; # it doesn't have any tests diff --git a/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix index f92fe87b94..bb1573f74c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix @@ -1,46 +1,59 @@ { fetchFromGitHub, lib, gobject-introspection, gtk3, python3Packages }: -# Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of -# adding this to services.udev.packages on NixOS + +# Although we copy in the udev rules here, you probably just want to use +# logitech-udev-rules instead of adding this to services.udev.packages on NixOS python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.0.2"; + version = "1.0.5"; + src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = version; - sha256 = "0k5z9dap6rawiafkg1x7zjx51ala7wra6j6lvc2nn0y8r79yp7a9"; + sha256 = "sha256-k87DqIkvy5CVEsHT82ZArSM2JBi5sYdSCPfP4KjI850="; }; - propagatedBuildInputs = with python3Packages; [ gobject-introspection gtk3 pygobject3 pyudev ]; + propagatedBuildInputs = with python3Packages; [ + gobject-introspection + gtk3 + psutil + pygobject3 + pyudev + pyyaml + xlib + ]; + makeWrapperArgs = [ + "--prefix PYTHONPATH : $PYTHONPATH" + "--prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH" + ]; + + # the -cli symlink is just to maintain compabilility with older versions where + # there was a difference between the GUI and CLI versions. postInstall = '' - wrapProgram "$out/bin/solaar" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" - wrapProgram "$out/bin/solaar-cli" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" + ln -s $out/bin/solaar $out/bin/solaar-cli - install -Dm644 -t $out/etc/udev/rules.d rules.d/*.rules + install -Dm444 -t $out/etc/udev/rules.d rules.d/*.rules ''; - enableParallelBuilding = true; + # No tests + doCheck = false; + meta = with lib; { description = "Linux devices manager for the Logitech Unifying Receiver"; longDescription = '' - Solaar is a Linux device manager for Logitech’s Unifying Receiver - peripherals. It is able to pair/unpair devices to the receiver, and for - most devices read battery status. + Solaar is a Linux manager for many Logitech keyboards, mice, and trackpads that + connect wirelessly to a USB Unifying, Lightspeed, or Nano receiver, connect + directly via a USB cable, or connect via Bluetooth. Solaar does not work with + peripherals from other companies. - It comes in two flavors, command-line and GUI. Both are able to list the - devices paired to a Unifying Receiver, show detailed info for each - device, and also pair/unpair supported devices with the receiver. + Solaar can be used as a GUI application or via its command-line interface. - To be able to use it, make sure you have access to /dev/hidraw* files. + This tool requires either to be run with root/sudo or alternatively to have the udev rules files installed. On NixOS this can be achieved by setting `hardware.logitech.wireless.enable`. ''; - license = licenses.gpl2; homepage = "https://pwr-solaar.github.io/Solaar/"; - platforms = platforms.linux; + license = licenses.gpl2Only; maintainers = with maintainers; [ spinus ysndr ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix index 1221db1ad9..697d13c8c0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 mesa_glu libspnav ]; - configureFlags = [ "--disable-debug" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/misc/spnavcfg/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spnavcfg/default.nix index caeaa42192..253549099d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/spnavcfg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/spnavcfg/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + meta = with lib; { homepage = "http://spacenav.sourceforge.net/"; description = "Interactive configuration GUI for space navigator input devices"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix b/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix index 9d93c8ae43..5f108049c3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stork"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "jameslittle230"; repo = "stork"; rev = "v${version}"; - sha256 = "sha256-gPrXeS7XT38Dil/EBwmeKIJrmPlEK+hmiyHi4p28tl0="; + sha256 = "sha256-rox8X+lYiiCXO66JemW+R2I6y/IxdK6qpaiFXYoL6nY="; }; - cargoSha256 = "sha256-9YKCtryb9mTPz9iWE7Iuk2SKgV0knWRbaouF+1DCjv8="; + cargoSha256 = "sha256-ujmBAld6DCc1l+yUu9qhRF8pS5HoIlstcdPTeTAyyXs="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sunwait/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sunwait/default.nix index c9581fe79f..2d1f8f46f5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sunwait/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sunwait/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation { sha256 = "0cs8rdcnzsl10zia2k49a6c2z6gvp5rnf31sgn3hn5c7kgy7l3ax"; }; + makeFlags = [ "C=${stdenv.cc.targetPrefix}c++" ]; + installPhase = '' install -Dm755 sunwait -t $out/bin ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix index 0b97110b1d..387177a8c4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix @@ -1,19 +1,17 @@ { lib , stdenv , fetchurl -, fetchsvn , makeWrapper , makeDesktopItem -# sweethome3d 6.4.2 does not yet build with jdk 9 and later. -# this is fixed on trunk (7699?) but let's build with jdk8 until then. +# sweethome3d 6.5.2 does not yet fully build&run with jdk 9 and later? , jdk8 -# it can run on the latest stable jre fine though -, jre +, jre8 , ant , gtk3 , gsettings-desktop-schemas , p7zip , libXxf86vm +, unzip }: let @@ -49,7 +47,7 @@ let patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so ''; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ ant jdk8 p7zip gtk3 gsettings-desktop-schemas ]; buildPhase = '' @@ -77,7 +75,7 @@ let # without it a "Profiles [GL4bc, GL3bc, GL2, GLES1] not available on device null" # exception is thrown on startup. # https://discourse.nixos.org/t/glx-not-recognised-after-mesa-update/6753 - makeWrapper ${jre}/bin/java $out/bin/$exec \ + makeWrapper ${jre8}/bin/java $out/bin/$exec \ --set MESA_GL_VERSION_OVERRIDE 2.1 \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}" @@ -102,14 +100,13 @@ in { application = mkSweetHome3D rec { pname = lib.toLower module + "-application"; - version = "6.4.2"; + version = "6.5.2"; module = "SweetHome3D"; description = "Design and visualize your future home"; license = lib.licenses.gpl2Plus; - src = fetchsvn { - url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/"; - sha256 = "13rczayakwb5246hqnp8lnw61p0p7ywr2294bnlp4zwsrz1in9z4"; - rev = "7504"; + src = fetchurl { + url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip"; + sha256 = "1j0xm2vmcxxjmf12k8rfnisq9hd7hqaiyxrfbrbjxis9iq3kycp3"; }; desktopName = "Sweet Home 3D"; icons = { diff --git a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix index f5dbd0510a..783ea3e794 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,17 +1,17 @@ { lib , stdenv -, fetchcvs +, fetchurl , makeWrapper , makeDesktopItem -# sweethome3d 6.4.2 does not yet build with jdk 9 and later. -# this is fixed on trunk (7699?) but let's build with jdk8 until then. +# sweethome3d 6.5.2 does not yet fully build&run with jdk 9 and later? , jdk8 -# it can run on the latest stable jre fine though -, jre +, jre8 , ant , gtk3 , gsettings-desktop-schemas -, sweethome3dApp }: +, sweethome3dApp +, unzip +}: let @@ -20,6 +20,14 @@ let + removeSuffix "libraryeditor" (toLower m) + "-editor"; + applicationSrc = stdenv.mkDerivation { + name = "application-src"; + src = sweethome3dApp.src; + nativeBuildInputs = [ unzip ]; + buildPhase = ""; + installPhase = "cp -r . $out"; + }; + mkEditorProject = { pname, module, version, src, license, description, desktopName }: @@ -35,18 +43,18 @@ let categories = "Graphics;2DGraphics;3DGraphics;"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ant jre jdk8 gtk3 gsettings-desktop-schemas ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ ant jre8 jdk8 gtk3 gsettings-desktop-schemas ]; postPatch = '' - sed -i -e 's,../SweetHome3D,${application.src},g' build.xml + sed -i -e 's,../SweetHome3D,${applicationSrc},g' build.xml sed -i -e 's,lib/macosx/java3d-1.6/jogl-all.jar,lib/java3d-1.6/jogl-all.jar,g' build.xml ''; buildPhase = '' runHook preBuild - ant -lib ${application.src}/libtest -lib ${application.src}/lib -lib ${jdk8}/lib + ant -lib ${applicationSrc}/libtest -lib ${applicationSrc}/lib -lib ${jdk8}/lib runHook postBuild ''; @@ -56,7 +64,7 @@ let mkdir -p $out/share/{java,applications} cp ${module}-${version}.jar $out/share/java/. cp "${editorItem}/share/applications/"* $out/share/applications - makeWrapper ${jre}/bin/java $out/bin/$exec \ + makeWrapper ${jre8}/bin/java $out/bin/$exec \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}" ''; @@ -78,31 +86,27 @@ let in { textures-editor = mkEditorProject rec { - version = "1.5"; + version = "1.7"; module = "TexturesLibraryEditor"; pname = module; description = "Easily create SH3T files and edit the properties of the texture images it contain"; license = lib.licenses.gpl2Plus; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; - sha256 = "15wxdns3hc8yq362x0rj53bcxran2iynxznfcb9js85psd94zq7h"; - module = module; - tag = "V_" + d2u version; + src = fetchurl { + url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip"; + sha256 = "03vb9y645qzffxxdhgbjb0d98k3lafxckg2vh2s86j62b6357d0h"; }; desktopName = "Sweet Home 3D - Textures Library Editor"; }; furniture-editor = mkEditorProject rec { - version = "1.19"; + version = "1.27"; module = "FurnitureLibraryEditor"; pname = module; description = "Quickly create SH3F files and edit the properties of the 3D models it contain"; license = lib.licenses.gpl2; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; - sha256 = "0rr4nqil1mngak3ds5vz7f1whrgcgzpk6fb0qcr5ljms0jx0ylvs"; - module = module; - tag = "V_" + d2u version; + src = fetchurl { + url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip"; + sha256 = "1zxbcn9awgax8lalzkc05f5yfwbgnrayc17fkyv5i19j4qb3r2a0"; }; desktopName = "Sweet Home 3D - Furniture Library Editor"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/timew-sync-server/default.nix b/third_party/nixpkgs/pkgs/applications/misc/timew-sync-server/default.nix new file mode 100644 index 0000000000..86a428df38 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/timew-sync-server/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "timew-sync-server"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "timewarrior-synchronize"; + repo = pname; + rev = "v${version}"; + sha256 = "041j618c2bcryhgi2j2w5zlfcxcklgbir2xj3px4w7jxbbg6p68n"; + }; + + vendorSha256 = "0wbd4cpswgbr839sk8qwly8gjq4lqmq448m624akll192mzm9wj7"; + + meta = with lib; { + homepage = "https://github.com/timewarrior-synchronize/timew-sync-server"; + description = "Server component of timewarrior synchronization application"; + license = licenses.mit; + maintainers = [ maintainers.joachimschmidt557 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/tootle/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tootle/default.nix index 0f6747d69f..63ac88ecac 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tootle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tootle/default.nix @@ -9,7 +9,7 @@ , python3 , libgee , gsettings-desktop-schemas -, gnome3 +, gnome , pantheon , wrapGAppsHook , gtk3 @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib glib-networking - gnome3.libsoup + gnome.libsoup gsettings-desktop-schemas gtk3 json-glib diff --git a/third_party/nixpkgs/pkgs/applications/misc/tuir/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tuir/default.nix index c086cdb950..fb1a85b1e4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tuir/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tuir/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { checkInputs = [ coverage coveralls docopt mock pylint pytest vcrpy ]; - propagatedBuildInputs = [ beautifulsoup4 decorator kitchen requests ]; + propagatedBuildInputs = [ beautifulsoup4 decorator kitchen requests six ]; meta = with lib; { description = "Browse Reddit from your Terminal (fork of rtv)"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix index 989649ec41..ebfaaa1db5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix @@ -4,7 +4,7 @@ , python3Packages , gdk-pixbuf , glib -, gnome3 +, gnome , gobject-introspection , gtk3 , wrapGAppsHook @@ -14,7 +14,7 @@ , libappindicator , intltool , wmctrl -, xvfb_run +, xvfb-run , librsvg }: @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gdk-pixbuf glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gobject-introspection gtk3 keybinder3 @@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec { mock pytest pytest-mock - xvfb_run + xvfb-run ]; patches = [ @@ -115,6 +115,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://ulauncher.io/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ aaronjanse worldofpeace ]; + maintainers = with maintainers; [ aaronjanse ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix b/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix index 9b8821b511..6a60e81933 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.5.0.1"; + version = "5.5.0.11"; src = fetchurl { - url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_5_0_1_291c031686ed44ff/${pname}_${version}_amd64.deb"; - sha256 = "49192ecfb10929b5b51cf8899186059649c894109ec172695cd7cfaa50923f6a"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_5_0_11_61df9c99b6df4e7b/${pname}_${version}_amd64.deb"; + sha256 = "db83d5fb1b5383992c6156284f6f3cd3a6b23f727ce324ba90c82817553fb4f7"; }; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix index fc609b280f..ad49a1b291 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -15,13 +15,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.2.1"; + version = "2.4"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "1gkvnywjg0n3n7d855ivclsj3d8mzihhkgv9a18srcszkmyix903"; + sha256 = "0mvf2603d9b0s6rh7sl7mg4ipbh0nk05xgh1078mwvx31qjsmq1i"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/xneur/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xneur/default.nix index bb4e1727f6..2d8af0465a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xneur/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xneur/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, xorg, pcre, gst_all_1, glib +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, xorg, pcre, gst_all_1, glib , xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }: stdenv.mkDerivation { @@ -21,6 +21,14 @@ stdenv.mkDerivation { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; + patches = [ + (fetchpatch { + name = "gcc-10.patch"; + url = "https://salsa.debian.org/debian/xneur/-/raw/da38ad9c8e1bf4e349f5ed4ad909f810fdea44c9/debian/patches/gcc-10.patch"; + sha256 = "0pc17a4sdrnrc4z7gz28889b9ywqsm5mzm6m41h67j2f5zh9k3fy"; + }) + ]; + postPatch = '' sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix index bcb5beff28..8c6994b030 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix @@ -1,17 +1,17 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchCrate, libiconv }: rustPlatform.buildRustPackage rec { - name = "xplr"; - version = "0.5.12"; + pname = "xplr"; + version = "0.9.1"; - src = fetchFromGitHub { - owner = "sayanarijit"; - repo = name; - rev = "v${version}"; - sha256 = "0dmqa56sxyvrq03rpf9yczp75zk44s79ilz6kbykdghp0d9lyldf"; + src = fetchCrate { + inherit pname version; + sha256 = "0ca6r0xkcdg1ha0n79kzxqh2ks5q3l3hgylqqy62vk51c6yrjx9x"; }; - cargoSha256 = "1mb1rfax91cbi2wvshl8jsfykx9kfwff8fkqa7rc4plqxnz0qxkx"; + buildInputs = lib.optional stdenv.isDarwin libiconv; + + cargoSha256 = "1c29dakcff130fvavgq2kpy2ncpgxkil2mi14q2m9jpsrvhqcdvk"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix index 5690dc0db1..0b6a57492c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ] ++ optional stdenv.isLinux libseccomp ++ optional stdenv.isDarwin gtk-mac-integration; - doCheck = true; + doCheck = !stdenv.isDarwin; meta = { homepage = "https://git.pwmt.org/pwmt/zathura"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix index 3d7f562912..77ff11b986 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "1.8.7"; + version = "1.8.9"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "0zbmlk5qk92b3zycs0bmdwgc8fn4a4dv1yvq9q8q2wxz4ammx6c0"; + sha256 = "sha256-1cU9HdPXrJ4ibSjOitO8iJfMIaGub/jjlb2lssYFfcU="; }; appimageContents = appimageTools.extractType2 { inherit name src; diff --git a/third_party/nixpkgs/pkgs/applications/networking/3proxy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/3proxy/default.nix index 6636691468..f9221d06d0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/3proxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/3proxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, coreutils }: +{ lib, stdenv, fetchFromGitHub, coreutils, nixosTests }: stdenv.mkDerivation rec { pname = "3proxy"; @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { "DESTDIR=${placeholder "out"}" ]; + passthru.tests = { + smoke-test = nixosTests._3proxy; + }; + meta = with lib; { description = "Tiny free proxy server"; homepage = "https://github.com/z3APA3A/3proxy"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix index f6006468d8..e9e22741c4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix @@ -33,6 +33,7 @@ , libXrandr , libXrender , libXtst +, libxkbcommon , libsecret , libuuid , libxcb @@ -81,6 +82,7 @@ let libXrandr libXrender libXtst + libxkbcommon libsecret libuuid libxcb @@ -97,11 +99,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "5.3.3"; + version = "5.4.0"; src = fetchurl { url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "1854m93mr2crg68zhh1pgwwis0dqdv0778wqrb8dz9sdz940rza8"; + sha256 = "sha256-2DzZ5JnFGBeaHtDf7CAXb/qv6kVI+sYMW5Nc25E3eNA="; }; dontConfigure = true; @@ -170,9 +172,14 @@ stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "$ORIGIN:$out/opt/appgate/service/:$out/opt/appgate/:${rpath}" $binary done + # fail if there are missing dependencies + ldd $out/opt/appgate/appgate | grep -i 'not found' && exit 1 + ldd $out/opt/appgate/service/appgateservice.bin | grep -i 'not found' && exit 1 + ldd $out/opt/appgate/appgate-driver | grep -i 'not found' && exit 1 + wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${lib.makeBinPath [ iproute2 networkmanager dnsmasq ]} wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH - wrapProgram $out/bin/appgate --prefix PATH : ${xdg-utils}/bin + wrapProgram $out/bin/appgate --prefix PATH : ${lib.makeBinPath [ xdg-utils ]} ''; meta = with lib; { description = "Appgate SDP (Software Defined Perimeter) desktop client"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index 1138c1e292..d7f2d9c58d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -13,7 +13,7 @@ , gdk-pixbuf , glib , gnome2 -, gnome3 +, gnome , gsettings-desktop-schemas , gtk3 , libpulseaudio @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.23.71"; + version = "1.24.85"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "17ajn1vx5xwlp2yvjf1hr8vw3b7hiribv5gaipyb37zrhkff241h"; + sha256 = "jE9INGYz78Vyvps4ESimtH1rL4GdboAUtMx1p31XQGk="; }; dontConfigure = true; @@ -104,11 +104,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg wrapGAppsHook ]; - buildInputs = [ glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; + buildInputs = [ glib gsettings-desktop-schemas gnome.adwaita-icon-theme ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; installPhase = '' + runHook preInstall + mkdir -p $out $out/bin cp -R usr/share $out @@ -148,6 +150,8 @@ stdenv.mkDerivation rec { # Replace xdg-settings and xdg-mime ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime + + runHook postInstall ''; installCheckPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 73ce022915..f84ce23309 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -7,7 +7,7 @@ , xdg-utils, yasm, nasm, minizip, libwebp , libusb1, pciutils, nss, re2 -, python2Packages, python3Packages, perl, pkg-config +, python2, python3, perl, pkg-config , nspr, systemd, libkrb5 , util-linux, alsaLib , bison, gperf @@ -20,12 +20,13 @@ , pipewire , libva , libdrm, wayland, mesa, libxkbcommon # Ozone +, curl # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport # package customization -, gnomeSupport ? false, gnome ? null +, gnomeSupport ? false, gnome2 ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true , cupsSupport ? true @@ -42,16 +43,12 @@ with lib; let jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - # TODO: Python 3 support is incomplete and "python3 ../../build/util/python2_action.py" - # currently doesn't work due to mixed Python 2/3 dependencies: - pythonPackages = if chromiumVersionAtLeast "93" - then python3Packages - else python2Packages; - forcePython3Patch = (githubPatch - # Reland #8 of "Force Python 3 to be used in build."": - "a2d3c362802d9e6b62f895fcda75a3695b77b1b8" - "1r9spr2wmjk9x9l3m1gzn6692mlvbxdz0r5hlr5rfwiwr900rxi2" - ); + python2WithPackages = python2.withPackages(ps: with ps; [ + ply jinja2 setuptools + ]); + python3WithPackages = python3.withPackages(ps: with ps; [ + ply jinja2 setuptools + ]); # The additional attributes for creating derivations based on the chromium # source tree. @@ -137,10 +134,12 @@ let }; nativeBuildInputs = [ + ninja pkg-config + python2WithPackages perl nodejs + gnutar which llvmPackages.lldClang.bintools - ninja which pythonPackages.python perl pkg-config - pythonPackages.ply pythonPackages.jinja2 nodejs - gnutar pythonPackages.setuptools + ] ++ lib.optionals (chromiumVersionAtLeast "92") [ + python3WithPackages ]; buildInputs = defaultDependencies ++ [ @@ -155,8 +154,9 @@ let pipewire libva libdrm wayland mesa.drivers libxkbcommon + curl ] ++ optional gnomeKeyringSupport libgnome-keyring3 - ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] + ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; @@ -172,8 +172,6 @@ let postPatch = lib.optionalString (chromiumVersionAtLeast "91") '' # Required for patchShebangs (unsupported): chmod -x third_party/webgpu-cts/src/tools/deno - '' + optionalString (chromiumVersionAtLeast "92") '' - patch -p1 --reverse < ${forcePython3Patch} '' + '' # remove unused third-party for lib in ${toString gnSystemLibraries}; do @@ -311,7 +309,7 @@ let # This is to ensure expansion of $out. libExecPath="${libExecPath}" - python build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} + ${python2}/bin/python2 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index e921169cf0..14ee3290c7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,6 +1,6 @@ { newScope, config, stdenv, fetchurl, makeWrapper , llvmPackages_11, llvmPackages_12, ed, gnugrep, coreutils, xdg-utils -, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit +, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire , gcc, nspr, nss, runCommand @@ -9,7 +9,7 @@ # package customization # Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) , channel ? "stable" -, gnomeSupport ? false, gnome ? null +, gnomeSupport ? false, gnome2 ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true , enableWideVine ? false @@ -31,7 +31,7 @@ let upstream-info = (lib.importJSON ./upstream-info.json).${channel}; mkChromiumDerivation = callPackage ./common.nix ({ - inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs + inherit channel gnome2 gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport ungoogled; gnChromium = gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; @@ -156,7 +156,7 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; outputs = ["out" "sandbox"]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index 61877fa0ed..8bb9114c87 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "90.0.4430.93", - "sha256": "0zimr975vp0v12zz1nqjwag3f0q147wrmdhpzgi4yf089rgwfbjk", - "sha256bin64": "1vifcrrfv69i0q7qnnml43xr0c20bi22hfw6lygq3k2x70zdzgl6", + "version": "90.0.4430.212", + "sha256": "17nmhrkl81qqvzbh861k2mmifncx4wg1mv1fmn52f8gzn461vqdb", + "sha256bin64": "1y33c5829s22yfj0qmsj8fpcxnjhcm3fsxz7744csfsa9cy4fjr7", "deps": { "gn": { "version": "2021-02-09", @@ -18,9 +18,9 @@ } }, "beta": { - "version": "91.0.4472.27", - "sha256": "09mhrzfza9a2zfsnxskbdbk9cwxnswgprhnyv3pj0f215cva20sq", - "sha256bin64": "1iwjf993pmhm9r92h4hskfxqc9fhky3aabvmdsqys44251j3hvwg", + "version": "91.0.4472.69", + "sha256": "0yqc7py5x48wqg5x90j57vp07qfc20w1j0f30rmyxbgl6v346s0z", + "sha256bin64": "1z82i6pq4wbx44d6ij32dkappywdpaxlfp23kl3p7x4x9hv1c0yq", "deps": { "gn": { "version": "2021-04-06", @@ -31,22 +31,22 @@ } }, "dev": { - "version": "92.0.4491.6", - "sha256": "0dwmcqzr7ysy7555l5amzppz8rxgxbgf6fy8lq4ykn2abx4m8n8a", - "sha256bin64": "041j6nm49w03qadwlsav50avdp6pwf1a8asybgvkjaxy4fpck376", + "version": "92.0.4503.0", + "sha256": "1fp4xz6x80m3ipcy4myzazyy1yj95qamyl6wf38mk2i6302gi2gb", + "sha256bin64": "0fwq8rn3v1dijj9xh6z7jw3xx2ihq0qcyh3bbcdd066w5ny6padm", "deps": { "gn": { - "version": "2021-04-06", + "version": "2021-05-07", "url": "https://gn.googlesource.com/gn", - "rev": "dba01723a441c358d843a575cb7720d54ddcdf92", - "sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x" + "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810", + "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4" } } }, "ungoogled-chromium": { - "version": "90.0.4430.93", - "sha256": "0zimr975vp0v12zz1nqjwag3f0q147wrmdhpzgi4yf089rgwfbjk", - "sha256bin64": "1vifcrrfv69i0q7qnnml43xr0c20bi22hfw6lygq3k2x70zdzgl6", + "version": "90.0.4430.212", + "sha256": "17nmhrkl81qqvzbh861k2mmifncx4wg1mv1fmn52f8gzn461vqdb", + "sha256bin64": "1y33c5829s22yfj0qmsj8fpcxnjhcm3fsxz7744csfsa9cy4fjr7", "deps": { "gn": { "version": "2021-02-09", @@ -55,8 +55,8 @@ "sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn" }, "ungoogled-patches": { - "rev": "90.0.4430.93-1", - "sha256": "11adnd96iwkkri3yyzvxsq43gqsc12fvd87rvqqflj0irrdk98a0" + "rev": "90.0.4430.212-1", + "sha256": "05jh05a4g50ws7pr18dl5pwi95knygh6xywp7kyydir7wy1pbin8" } } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix index 874a73dae8..f6dc79a2a0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,7 +1,7 @@ { lib, fetchgit, meson, ninja, pkg-config, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils -, gobject-introspection, wrapGAppsHook, gnome3 }: +, gobject-introspection, wrapGAppsHook, gnome }: python3.pkgs.buildPythonApplication rec { pname = "eolie"; @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-base gst-plugins-ugly gstreamer - gnome3.gnome-settings-daemon + gnome.gnome-settings-daemon gtk3 gtkspell3 hunspell @@ -76,7 +76,7 @@ python3.pkgs.buildPythonApplication rec { description = "A new GNOME web browser"; homepage = "https://wiki.gnome.org/Apps/Eolie"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ samdroid-apps worldofpeace ]; + maintainers = with maintainers; [ samdroid-apps ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index ffba1096d1..fc70299333 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -28,7 +28,7 @@ , libXt , libcanberra , libnotify -, gnome3 +, gnome , libGLU, libGL , nspr , nss @@ -139,7 +139,7 @@ stdenv.mkDerivation { inherit gtk3; - buildInputs = [ wrapGAppsHook gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ wrapGAppsHook gtk3 gnome.adwaita-icon-theme ]; # "strip" after "patchelf" may break binaries. # See: https://github.com/NixOS/patchelf/issues/10 diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 6b8079d524..db1b6eccef 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,975 +1,975 @@ { - version = "88.0"; + version = "88.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ach/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ach/firefox-88.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "12d09c3e723cf3853792d11bfa3344a3cf63cbfea150de441c46e552248d1532"; + sha256 = "fbe4ef0bfa83e9e90930de50c565eb7759e5f57dcc3421c09704461e1bab3211"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/af/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/af/firefox-88.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "60a0fee46e702ae161639eb3d06e893f157516667606fda241b997ffd356e768"; + sha256 = "12d3645ba8482adea46ffb3fac4b0da13e6b95987b9a3725c758268f9b7919bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/an/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/an/firefox-88.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "6b0583486643dc144c42b369cb54cac5ec28ac997e58ca3c29c0dc12701702cd"; + sha256 = "4617ff8785b07993c7c81ad277c08ed3cde61ae64fd2700707b413f52085b5fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ar/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ar/firefox-88.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "149f7789dc5b356c336ef48788cff922bc69e9daa3bd4c32550cda0683695108"; + sha256 = "6647d9d711be4cc63ea5a302666dd69be48dcb089884ba0f9855c6cc32ba9beb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ast/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ast/firefox-88.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "55259f1a56bfb5867a17751d8ed8bfd673aaf26c4c97a70dcf99c88e427605d2"; + sha256 = "0e2e27f7357d2598b681ba029e63fb752f63c557da18b3e1d2a65678528246be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/az/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/az/firefox-88.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "36cc39d24f416717c1b07ab3aec2803c2811603a394c5e7cc3d6545655a883bd"; + sha256 = "66f48578e7a4ebd2b64c3c11a803bd668aa63d5c72dcac8cb8e5e610ace3c54c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/be/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/be/firefox-88.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "06cc01d0f235d423301dd220941d8f67745a1208015f5d2ba0dfceabc5252dad"; + sha256 = "050da876d2fa8875a57a0246c2d72337f2b386f0a9f429906b5f1933f35edb64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/bg/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/bg/firefox-88.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a8753152946e55be48d55858a4aab8052f94fc9a6fa9192fc59a7664677fb85a"; + sha256 = "ff37f9a70ead543dc7b5b36c5c99e3f1bffd474ff154cbba854270793240317f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/bn/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/bn/firefox-88.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "12daf255bb459ea1e576aef02f008dbceb752700eb91f569761e5d3b10e17891"; + sha256 = "cdc0248a70211e73efd73d4c2a202b9d68837f1e9b6eff23c46a114da6a30c45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/br/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/br/firefox-88.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "8811d1da23da1286a4e2aca81e898a0466665386de80ff1217cac0f399396eaa"; + sha256 = "30cd2111be00e2cf7526910d02b90f0b7440ebc47e76a447ac41ac073797de64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/bs/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/bs/firefox-88.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "1386daaf4d583a980a57a0d8c3a631ed28b46f3988a0184ed0c5c8a03e44e7d6"; + sha256 = "2880580aec6a53f9b9341d3d31acf82bba3934d5086eed84649b4ff4d5874ccc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ca-valencia/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ca-valencia/firefox-88.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "15fbee8c563462b43c128c2c0d7c74d9453db32f078e6d49ff0600e73eefe4d1"; + sha256 = "81826cc131a301933bbce8b1bd5629265657b27193ab264434fadf4cd1db6b18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ca/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ca/firefox-88.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0120c9adddfe03e4ed476ca290a0f59cc8fef4064984cde4016bbf12bcbb4730"; + sha256 = "8ed6ff9b83193b815a9ee3ba066ecd7b9841d1022ce4edcdb0d18ab283c406a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/cak/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/cak/firefox-88.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "7c0d355eb7ab709df66f5b77ede2824e3fdda646b61fd50df7762027c55dc971"; + sha256 = "b74da38062d948de36f58f33146e1cfe2a114000c041b3d13863ca4d0fb7b072"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/cs/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/cs/firefox-88.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4b39fd4bc0c214f3409a446abe13d749a6c25908811f788513d850ebef648b41"; + sha256 = "86ccaa52061c1c0740cf49e9f6566fd64e447c51a2f3d4576341a728631e51d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/cy/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/cy/firefox-88.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "40ca21bb7c715c4adfaee536a42929b10af1faefb73f8103e927b7e8cc1367fd"; + sha256 = "2ada972ae4bb948e7968a2e647cabb4e9a0de0f25b878894288e0c456a7c10c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/da/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/da/firefox-88.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b311e549c38b5a49cef0c9a597e208d8d929cc828617e662b289f0d455f4bf46"; + sha256 = "d1b75371b0104dc9c845108abe73194675aa59d7034c23fe223e4aee73ad1933"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/de/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/de/firefox-88.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "8916772413c5a615ae4b8ddc2721d5af5ff64cc4c5799fe00873f0a29854f64a"; + sha256 = "727e5845111ed3650d71f1a73567a2a08983a60200ecdba51fb56a0818a7c139"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/dsb/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/dsb/firefox-88.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "c0b1c757f55dfb6657fd4090b5e3084af3cca1c2526f9a90efcab844fa5ea974"; + sha256 = "0c22bee8cce6f437fd656be89f223fd5e5ca9b1103104410902aa54849c1f9a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/el/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/el/firefox-88.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "04251f33971a40988df8cbdb2875bf2f24e8c878a11661568a45ed7d4b040de2"; + sha256 = "882791aee0b2d41468199e432aa075f139ff18f7849a8104c5734e98f9064dee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/en-CA/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/en-CA/firefox-88.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "5505a96cfe87f15df89b908f6a769766767d86f98ec878324e5eb26963666ffe"; + sha256 = "92f2d7fc7f73af9d649d51e99d9a116e1624911a018f10a1d5e98372a70b0390"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/en-GB/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/en-GB/firefox-88.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "e3a8649ef6107c61c6638317f367db5157acc8ce8989730d2fab7a3bd8c38d95"; + sha256 = "b8714d6c55b9daad6aee75aa923efb90ae49298e6da24a6b917aeaf340d9cf7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/en-US/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/en-US/firefox-88.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "043e9ded27d8f86ff881c1f95a2626b5bbd7361990d7977320f8e9beaea63c93"; + sha256 = "cd2dcac9fb08ab63738b35b143696ce05f42ead465003e6164f7a090ffc72416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/eo/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/eo/firefox-88.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "0deeafcdd14dddc9c31e8f68c819bdebd54e8fe6a480c6dfd723ee90da409fb4"; + sha256 = "c6cb9b0c77712246307c4753c1af3a73031e7bc8fd519c00bbc9fd57c179e0f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/es-AR/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/es-AR/firefox-88.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "b7dd60ba63a4408d94b015ee1529cc5f0c0ee4dfcfe515ed1f8eb7e183973022"; + sha256 = "eb1d036f9610eef44af2d32e758c9a29bfb9bc545033e467efc4f1a42b6a82d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/es-CL/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/es-CL/firefox-88.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "35fd7dc8d273c73c7fd334ec726da2415140497e81004a453fe144aabb8c9317"; + sha256 = "0f485aedeaaba00409cb1967c78206c67e488813599f75f2a4dba9e70843672f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/es-ES/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/es-ES/firefox-88.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c7f801a3d4cfe52b3a9c29c9f2d633d078e13b85fde25fe837e887865040f52d"; + sha256 = "b529792912d9cb51bb0ff6718e3306433e3ce60d2411eb2096f148356f53dcd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/es-MX/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/es-MX/firefox-88.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "9e295a332dc7e043dce50f3a7092c89b1fd2ffbcfe99d25f9df34eed33b7b34e"; + sha256 = "b85b49e105589866a09371258091af3d07b1a6ba9f3e602352d0647dab6d239f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/et/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/et/firefox-88.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "c023f6c1a279c3e3d0043b535d3e1666f44a7b079905f0c0ebc4dec3edeee8fa"; + sha256 = "fc1d6961720be961f92991c1881fdf884629ebeaec9b3dc994b8a554d6c74ce8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/eu/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/eu/firefox-88.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "ee39a51081690cc9d13dc68d9cec458ad1c7055ae765ebb26299ae5267c8c8aa"; + sha256 = "85479fe2eeea6e87ed42a11447cecb002b454367a1ca5d0474a07a0537bacd06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/fa/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/fa/firefox-88.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "c61aff504e777a48272d61fe0648584f57b509a21f0f2f1269918ed5450e1131"; + sha256 = "e6a82eb02c3a55b098137303a634c74a728011a50952842021772d5d98740496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ff/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ff/firefox-88.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "39e47a89cb93b9cfa11030cb227cd9bfaf20434c7a70b91e5aa1ef4afbdf89cc"; + sha256 = "b0f5370a62f414c469b14cb046ab8da2391325215e4025fc28998f3b7ac2b015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/fi/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/fi/firefox-88.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e71195871fe81b3b6125b8fa2415fd3fc9dd51a01f82ed7ba7f76840b58607b1"; + sha256 = "977bdef5c8c249fb347792553bcc8df45d918847ab8be8acf2c0ed693149f10a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/fr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/fr/firefox-88.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "2341c8cdd77a355e83d795e007ee1b5f3da783c090f2424914681666e72939d8"; + sha256 = "116e04692aa319a97ec8d459006bba6306f47b35ab4851d58c8cb458a41c67b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/fy-NL/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/fy-NL/firefox-88.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "23f3ef8f9ca2552c2aa4c3159ff266b49e113888c855553fcec3920e8c317e23"; + sha256 = "c7ad0294c58dcbfebb086e0831fcf9fe6a97451cedc2c19da5eefc6c288d5196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ga-IE/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ga-IE/firefox-88.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "52b5cba15c62fa709f56d9f767e6f6eb8741480eb8e325e9a9a2c4c4d72a63ce"; + sha256 = "8b828caf41bb1ac0b4696a84f5a83d43bb0345cada7877f6889b7b1b057bc167"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/gd/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/gd/firefox-88.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "0a9ee7c11ff6d16d2b98fb6933102a310261e2a1f715935e162f535328662d3e"; + sha256 = "877a2c355503b27d80945b81050269ceda6514629b196dbd89158406965b07fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/gl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/gl/firefox-88.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "795d38d83d728f550b6fe3efd238a7eb2760e9724bb86ba146190b141dbce8db"; + sha256 = "a286beeaf4d40f5b0d37c9323985521ba8f86a67f7f48420e5cf6c461e920b1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/gn/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/gn/firefox-88.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "ffff3d3bd7b0ff27629c3a9776b5e4eb16eb1ddd14aa01dc4073e573ac2674b8"; + sha256 = "508c3424921cfce56148199a133e0dd1704ebbdb2d20c5169d23c42ecb5d449e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/gu-IN/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/gu-IN/firefox-88.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "7a745004a27a87c965c3b3c7a3c9179bcffb8114fae7d90a51d0bc092884da43"; + sha256 = "2975ba7be697f7592b1f8c8b0f4099b06363a72096935b7483881f62739a37e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/he/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/he/firefox-88.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "76ff3a975d0092bcfc98094e5ebfc638a192b0053b2d3c85be96d3dfe63e910c"; + sha256 = "06bc66687abc0a4451aa636c9415e066081ff7d80203fc08556a7a590d948d37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/hi-IN/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hi-IN/firefox-88.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "6136353eff44b6234a111e622fda3882221107fd54ea0910fc659a9ad9afecfc"; + sha256 = "d80a4be0f997a9dc84509f87160e7f915845c8adae99eeb5e40f704b07fa9ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/hr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hr/firefox-88.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "a71b3730bb4916214122daf8ad3847a58d7d4fc0b4ff583080f64c6721962c83"; + sha256 = "603a831c5f88c6f7a3c3ac7b5236c4818cd89027374ef6fe518012f721ae710b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/hsb/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hsb/firefox-88.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "9128347b9d06a6025b4dd4d7f864b0c8a8a3f49b786e79106e39514bffa14a87"; + sha256 = "3f88023c28b4ed29d5b4cd24db70c5a4aafd661763f17e563fd50a2d52df8e06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/hu/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hu/firefox-88.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "489550b063134a992e284d895e738c994109f700338b9158ef8c91c171ce66ec"; + sha256 = "0796975d470dd462812babb11089c5686bee7a47c499cf2064a9030386d8205d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/hy-AM/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hy-AM/firefox-88.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "16b015356550f9a73ba2fcbb9e0a36936204da476da359f2e3bae57c08353e29"; + sha256 = "3d6bb583508b0c2523519852c8bdca1d8c522e4c7ee52e16cc40a3bbcfb2f28c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ia/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ia/firefox-88.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "9a543e14b7974e94e8ac6dab92a860b7cec778910f91060207c576cfd5ea1bd4"; + sha256 = "5cb92b254d22838db46edfe62bdd566a3d34bfba58deaa7d36a4efd7e257c8eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/id/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/id/firefox-88.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "970652219ba2228cbdd187d45a49f64cb8020220ac94e798896c5668bea90a44"; + sha256 = "aabf5e60d4cb953c712538326beaf053693a61008e00551d46e5261d284d804e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/is/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/is/firefox-88.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "d7011bb2ddb09d6f446ae9d8f790f0bb5382605385c8dbf04e200fe6e63c495a"; + sha256 = "31131cb9fe7500c7f83aac790b08ad87aeede79d59ef2ebbf19c7fa376140e6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/it/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/it/firefox-88.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "a58681975cf3a79e32413d9b21655b6ace0ee2ab0df9ac45485344bf2f2f3fc7"; + sha256 = "4de9bba3bd048e96980abbf2180ca6664566f88b0b095c4dcd5eb940d9eb1137"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ja/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ja/firefox-88.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "b86e095903bc54db0bf0c6bbdc25184768c1537d57ccacf71a0da1d946bcf398"; + sha256 = "a073f1e1c466b875da47e46c55bc2b784b3f407273089db33025a9d99da5d7b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ka/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ka/firefox-88.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "e7e5277b9e239a8738f96378c87de3e204df9f530936a535aad991b6690f541d"; + sha256 = "c834937d4a011ec3bf1c08b93e66cc8b6f7fcbdb2f2f64db09e1fe39b39698c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/kab/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/kab/firefox-88.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "27b5edd4248feeb06f7c342a6f48b63ed98bfcd1d44f8ff467a204019b80263b"; + sha256 = "031907892957f23243df5d037111ba838af23adae39c62965376915b0b85c68a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/kk/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/kk/firefox-88.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "3187839a8941b3ceb64c42e084837ed5c9d01f0c518378fe21e5956bf5d4859d"; + sha256 = "43154e9101e01dafb91103d8f5f1fe12ea6b84039feab5b3ea12fe8b776db5de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/km/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/km/firefox-88.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "6c0df74570cae46c379ee7271608449a31f46c3bce030613cb04edf1ff6d16f8"; + sha256 = "7e5e996c2a12a5f849d989e46cfd762858abc2580fbed99c70b5c2e007114880"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/kn/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/kn/firefox-88.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "30116c65417489496836aa71771a3e4d01ef420d12d080ab8f5d02e6c713a513"; + sha256 = "b9cd7bc9d57b599532f38e1cf2332e6c5284f04c63e45c47480657b84522e657"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ko/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ko/firefox-88.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "e73f7ee38b5061ab6b89b6c9817d1f70c85e4b6eacc22f6780a72c308bd8dfe9"; + sha256 = "500bb904657afda7fd5f723cdd03337a1ceb2f00a17f9a6f107b363c26eb44c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/lij/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/lij/firefox-88.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "c98b27de29c3f98e13b4b3803233f3d99eebe04f33d6761c64464872941a978e"; + sha256 = "061bd89c3b9d9b9c4a76f0df31a17248029482f44679096233a85ab005dbe6ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/lt/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/lt/firefox-88.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "bb12e24f967b51b0ad2c7cfd0111f6c128f854a61d99e8262d64a5a4b2b972f2"; + sha256 = "4c9609e7a9bb11db56c8216f1e4e3e480ccce4cd012ccc590c01396d589f9c8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/lv/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/lv/firefox-88.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "65e19afa82c25c3793297db156bc72fae45754bf709cf15f4a6cd6aebf8af314"; + sha256 = "541c09d7aadcc77306045ce53c0b735887e270c42c53a5066c5dd4408ff8452b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/mk/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/mk/firefox-88.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "f7717adeb13e7592f3940867b47ad6a53172c7b99dbe5904dc78838d7230d22a"; + sha256 = "da4749a1c1417b0c4d00b54571a6e4a86eec5295dd886ed71d5d8287512e6af9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/mr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/mr/firefox-88.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "db9cc5d8f42595824792ff2cf80e67eab5f54a9cda7f87a0a81582d53c72ab61"; + sha256 = "1bbf941693b2ce0165240aff245c7287536276b84d3592f63f3f42385e79fcfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ms/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ms/firefox-88.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "3daa35a19a5fad78ad81381f48c1e27ebe70f5be03634594f30097645f061593"; + sha256 = "447449f63e8a02e137b02de708c0c6999788b456d838b3b503ad37ac997640f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/my/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/my/firefox-88.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "de0f442f18cd82669b222bfd30aab14d1130e55765aee6992f7632f9b681284d"; + sha256 = "22ce8c15e71c270477f391282792cf9a1375ee377b6c19f0170630c62999da7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/nb-NO/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/nb-NO/firefox-88.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "207136b91b4c830ed9c2bf4ba11b6a9f42696a3cd5b6815de1b9b4d8f265817f"; + sha256 = "7f27637af6797bdfc10a208e76552db8283e1aae82f4d985859b9dbfee377b51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ne-NP/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ne-NP/firefox-88.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "47d3322091d3663d4544d7551ff1127e01b64a773770651fb320f56379b24e9f"; + sha256 = "9853db886cfe679a7f81e17b2e8223f40fee642c0c769cfb0f089b97fe26ee5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/nl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/nl/firefox-88.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "d4e06fd6bc83235dbd1ec49cd8e4bb0a0a62d735221196770f1268c79228b5be"; + sha256 = "e6b99f1b76d4a768d656c062cc044b2fa0a5af66bdfabacc669f5af6b408be0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/nn-NO/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/nn-NO/firefox-88.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "57e49d9d199bb48ba594e21e5b57931785b9404d32259a45164a24123d9d1bb8"; + sha256 = "e1a7400a6a1a49de0a24e2797dea2e3111f1712e6fb855192f82475918df7354"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/oc/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/oc/firefox-88.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "1108761ce4c7cb13077c4ebc6d9704923aa91f5affbae618768b9c855cadd784"; + sha256 = "23d166c8d9ca49331699131390e3653442a014f08b0e8dab51a26156c695b7c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/pa-IN/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/pa-IN/firefox-88.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "bef979c51a367f733a365b3e7153dc7fa7b150d797ec15ed818983d81eaa4044"; + sha256 = "b725c7a5d8e415ba00fe0aab7afd24cad9c1edc6e7edd7e550a89b3004ea1b31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/pl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/pl/firefox-88.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "69bc8bbca55a74d243fecc95d60d2c6075b911375b0bdebf6a4e238ee4f5b2ca"; + sha256 = "b835f1c5dc1da4082a4ff3f6d5ce66b90abc19f465c6f2ff0284b14fc2b44cca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/pt-BR/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/pt-BR/firefox-88.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "c75ff2eca174e9ca9787c6e56e6e956c65027d111e8e05fa80a67df36b438dd7"; + sha256 = "494f7ce43f33ae5d3e7da325b2956b5aa520c99753826a525ac023191212c025"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/pt-PT/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/pt-PT/firefox-88.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "fae035e106d4fd6fc19bcb0c081bb62bc328820b09f2ca40b30eb9542a7de046"; + sha256 = "50ed069473845929d46af61e3fbbfcf9e94db70a54ef0fedd08349c4b7cd1120"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/rm/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/rm/firefox-88.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "cd0ddd73f2281d88b5ecb6a6a92aac7ecb3a0d73074a3f8fc03d16cdcf30cc17"; + sha256 = "c6da3d38bcb69ebccf373159fdfdb9fac2fe3613c321a38d5182baea03e3818c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ro/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ro/firefox-88.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "6d028e81212cfc2e450ce7824771292706b458b6fd6c63764fae2b0804a8ed7e"; + sha256 = "b34610eb3f654053e053375f7c0c93730bb38ee436b1a7970e5375698e9a9ef0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ru/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ru/firefox-88.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "bff057c7306cc5d2c553fc744552bdb249e32a381d34007fd469247a4f22960f"; + sha256 = "dca61fde2dbe956ba0ebe63d461f0a2b816c98567abdeefbb6e451824c22cd21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/si/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/si/firefox-88.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "c73e53ce7498ac770a236f1f606dad29ce3ea6fc03713a223997b6e272cdb5c1"; + sha256 = "24dbd2c0b4b3361c3af2fd3eff703f74fb47ac27a81eee98877c3692fcaa6097"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/sk/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sk/firefox-88.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ceafe41adedf9b9a354ddc9117a879b72f4331e4f7ff3ca3cbcce153b6cc7e42"; + sha256 = "2f222a2dd627796a9be5345534450a4b18e4b181c5cea09742b27cd7fff40e8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/sl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sl/firefox-88.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "3b39bdecfc71fff21040e28301b0c8193119f38e1a0877b168504f31dcc33d19"; + sha256 = "5060e2da8fec071b6f4799c88a2f2e156a9943c9640e35f2958bbeb79a6b8254"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/son/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/son/firefox-88.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "437a98ebc049dd93537a52cfb56e19b1dd1142a61e9eaf0272e5bf490cb82022"; + sha256 = "2ce56f65cddd20c74162b68b7594053dc156fa713d2a5ffcbc4f0aa34b6a4287"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/sq/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sq/firefox-88.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "51b5da749c31fa8ca7af7b11d67f4b4d15c6924abed95d54c74c3107ba4b8fa2"; + sha256 = "cf68aea0c36405738962057f01c86323d1f71968aaa5eec693b52af55ebfdfcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/sr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sr/firefox-88.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c8a99c7a3a2a7bb2a2e6958f0e7d0d5e13441e758a024a7a2129e6adaaa41cc4"; + sha256 = "5ba52f0c4546532d75668cafd129137543764dad21480d897a99558ad6e3c5d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/sv-SE/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sv-SE/firefox-88.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a2ec634c6f269de30f6020946e76a42ddb592da4636bfa64d87dd4711a1adbe6"; + sha256 = "8b17ba3c4dc2c625a59b44c64d887377cd7a3472f4562f1e0341b02d2f5daecc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/szl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/szl/firefox-88.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "4bf6b15dd8fd99ed8d144091ae1e6ed4a1d9922d50c9bab6f5569b73ef695213"; + sha256 = "46d70b4b572b48e387083ea199f49e716c559c3331d1cb85999e619f3419576d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ta/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ta/firefox-88.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "959cd948b386e2416c905eb13de3b22b94cf3d6592458dbe52106e6eaef9837f"; + sha256 = "19405af9598548d36ba0cec286829eb6810aad3a5ceda3d038e53c947716f776"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/te/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/te/firefox-88.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "8e1b26c7c4340665ede28290ae8298a877a735f078bf9440fefc65d13c0675d4"; + sha256 = "84e059d870b748b0cccce94180be5b35e0130443a3e31b3e78b16512a0069d25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/th/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/th/firefox-88.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "d724ccdebe9a34909bd379d06c4af9beba245525374ccc090c492c3a95d65115"; + sha256 = "dab86d509bb31c262bab2ec4e9193658e42ff3ef517a69c3757830d947de9798"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/tl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/tl/firefox-88.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "76ec33e8f4a2b75e8f2b3c115c9b366d3c508ad9f1a33c942a7a6062525e51c8"; + sha256 = "e6b94d304eb6e10314abd8b1f893b0b704939250c823bc9ee56575612815fb44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/tr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/tr/firefox-88.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "6aad672d2b197a23418fcc98347829fa00b9099b8e48812b05c6da5a57ecc175"; + sha256 = "214338ab9d55c50e667d1b79f7735adcfa848e95902f8a50e7c817f6a5096387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/trs/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/trs/firefox-88.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "061c0feb9d7cdc622d5eef97b8b4fe5153f0900358349c1ec1ca95d7c4a8f744"; + sha256 = "a021fe8271e5a39dee0c4a695a70f52206de3cab0300358966c33c5339147c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/uk/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/uk/firefox-88.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "77b603973f98b6ccd577a1daad05351b41a04d00b91a144ae9385d76a7c87c42"; + sha256 = "49fc053833d0ab39767ff035edad9ae6c50a5e18e32e627af6bd6bf5a71b0f96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ur/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ur/firefox-88.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "e1f814600f1fecf237ba80870c8b70f548e994827618d2cc9c220b4ef15c6404"; + sha256 = "8c3ce3d99d31c1ead914d7b70761cecfe0ca6e11c3f6546ed19e03ed1c823f13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/uz/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/uz/firefox-88.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "032c603683f2e26956809835d38abe4676d9383917d56f5e64735754784161a6"; + sha256 = "a8667b0c2289847b59aeef4d7809b1834872e8702a9a7cd7988afad5778c1261"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/vi/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/vi/firefox-88.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "3504f2c00d2b2225167200a7f1b809a71d2168d6c2cb048c94d221f40417a1a5"; + sha256 = "c885bd7b03ec6bf9f8842c67e34e790d458fe4746eb4f9d28e8fcb402d393c37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/xh/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/xh/firefox-88.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "68611d455147c4aaefaf1ad026d42a9600af923bd261b3326eb4395c7791ba60"; + sha256 = "5f6e840eb00573c70328c05d9caf44ac36c48fca7611ac9a60491df80933def7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/zh-CN/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/zh-CN/firefox-88.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "cbe315c6e9e4c05ee308a04d352c2573d9197b3aa200cfd82195fce852c017f5"; + sha256 = "c6c72206aadd6b54b5456ec7021a5480d5acb33941d371e36c449db229c8e4b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/zh-TW/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/zh-TW/firefox-88.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "e130ed291b9833c687ba1c11c6abb192c8ea258ee5f7300a5cd5f0154d634d5f"; + sha256 = "d98c58530a4c1a66cae84430b9263f0317221ea217e26a67390faf147a3afb61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ach/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ach/firefox-88.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "099c38d992da934be008e40b4ea0cce6e46f45f838cfb64b5e0b129a10f9f9af"; + sha256 = "3ced1adf6b286ba44757d7b01fddd80dcc733bf9d442589f07c8725ed8d0afa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/af/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/af/firefox-88.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "56a0573fe7cb11133264363307ce3810177c6f03415ed3bee895765a4e737652"; + sha256 = "ee141cebc464565c4cc45d04a5c6f12220fa693bd4f3b631a029df57a2f514cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/an/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/an/firefox-88.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "f0e12115504b079863d30ffc7e19f497c4563723023a3ad40b293c2d305921c0"; + sha256 = "d14907a7a14ed3263da99f3cec6616e8a3aa91f75366afd15a6018a197139309"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ar/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ar/firefox-88.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "2793fbba47c73a9c86bdb6665c7d28e7af5a0c6145b6751eb0bd38a3ec890818"; + sha256 = "8054273b82ca17b1b1e0d5e838c1de8b363bfc5b8f3ea72e4ba6c17523e1ae66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ast/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ast/firefox-88.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "e55e686603b6b827c49e87d52b547952b09ef0ceb105224b6ede539a5b269c8f"; + sha256 = "bccb4d0af2f07204c7d44771c09d5ab458098b6f388f1a57ded76c91425bdb67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/az/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/az/firefox-88.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "a491479be97c794fc89184e32dec3fb6bd1775139ec0e02fcf0b8679ce8d9697"; + sha256 = "f22ec26b5a52e857869cc22af13672f297878836d7a3969dfa65902f366df918"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/be/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/be/firefox-88.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "5561e4e9730ac83d94e0e19cb7509cbc8986559e49d4386059021ec776b7ce60"; + sha256 = "ca7cf7a1be8fa0043e7fffbf7f28dcc04b27bb0c7b8865e877293e898292ee2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/bg/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/bg/firefox-88.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "8ffbce4041bba8a69fc3cde897e816c2f71a675a0935415d219835535a4644b9"; + sha256 = "f7672b0d6a94dd8bf1b4c997a0cdc8884d4af4e3d30a071a449cd2565bb9ae5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/bn/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/bn/firefox-88.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "826eed8716f6b02858f17d75da1dd39b7914c9b487c074c9065fb49917825b12"; + sha256 = "94608024f27db272438321d59c1dd447288c241a16c87ff958a110c13dcc1add"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/br/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/br/firefox-88.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3c2dc18b43a925d8bd0c46e3c108a74e07fb122ae72e723c108b9fdf8e0b70a1"; + sha256 = "56baf6c6f57c68bbd7b69ad925e6fe1da4d46b8d2f8711850f31c1e31c3ff793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/bs/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/bs/firefox-88.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "459bd06be3caa151b38fd3260405a8ef9d13fc445be4c6a218fe0074ad7140bf"; + sha256 = "2350f1ad88129e8eeee7179b6bd28a06aa6173125807fbe7896afbf04ecab359"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ca-valencia/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ca-valencia/firefox-88.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "506d8950cdfc9ecea83789d9116c2fbdc7541d756f7e07db710b7dbf7eb51118"; + sha256 = "8ac160032f48d637bf198e0bc06ddb7921d2eead3d14bb056fdb4c3195aacfad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ca/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ca/firefox-88.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c0ae65141073ebccd18c0e053198db998225150c4c1724bf0d07cf8954198e41"; + sha256 = "f2a94bcbe73b43c9258412514bf02fa834d0018af6c15bb99927236b04d24e90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/cak/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/cak/firefox-88.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "5cc2ed5014cedec417a1cdfe193364031163b0c03c26af49293e54401c071ae1"; + sha256 = "ba366df74b7062c14803427c0c69bb7c28f66e78f6cd9beb81a1fa492f73fda3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/cs/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/cs/firefox-88.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "49ab8e8599bc78d1c7613d6b58f1a3da63af6ad6a4029fcb1977c3181eb190ef"; + sha256 = "7a30c5e10de398f28228af82916d41f0cb8848db29fe7dd034d0ce8bd0bdabba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/cy/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/cy/firefox-88.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "1ded8c796d12aac6d0767b1694f1a3ba7a852c8d9feaa1b1f3158c561539e553"; + sha256 = "4f711ad9dfaf59a35e99284b8eb4cbcf3f459b9f9085b101de70d1a148c5d4b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/da/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/da/firefox-88.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "f17e25561c7cc08b70dc66eb7904f9f4d27eda7ab1e79beca813b6ec86b8774b"; + sha256 = "e064c9517420b95ff16a9d3e7346d21f9a42f506b476762c6372978ed8c16e73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/de/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/de/firefox-88.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "6fdbff1eed3657ef9979d1e63941ed4e9340de8741c03c46075841f1acb10e95"; + sha256 = "c334d22f7e28b188ec50c6aa1269f1c409181747953c157281c2a77b9e173439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/dsb/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/dsb/firefox-88.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "2a8ad12cf7487892097a6673fa9dade3fb30163c5d5fe5ad61c7ec417aba8363"; + sha256 = "da4fadd3a07c19ec04ad1e8a9ed6de780114cd8859419b8119bfb12d6dacc044"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/el/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/el/firefox-88.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "e7b74c223382724059e70608bc62946a792203b5c688d4802de70d25955485e5"; + sha256 = "e44ba8ab5ca51bc7efe4823a0a70b43adbfc75e63932ffbfe47a6fd0af1a7b3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/en-CA/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/en-CA/firefox-88.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "eac978e84c34544bcea96a6c57b59644d7d282c4250942b7acf8365aadbf8e5b"; + sha256 = "1a67ce9de292df925ebec96fd47133735e725b844cdca8a62864f7aac4e16e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/en-GB/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/en-GB/firefox-88.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "c1c69617ea1e048a2f141592b602745d2e9e556172f896379d5fdfb2b2c5c3c7"; + sha256 = "5350e887e76e323b7c81ab887b679cbb2d49c7d30c618f65c3426ac4717d0612"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/en-US/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/en-US/firefox-88.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "a6f45b2aac37f917c0e3b8450cce94646f8734215d8f04a896f21cdbca7ba77b"; + sha256 = "6f4e0157594d46d10edc3f73e401e31338356d731b8a2673a0726609c675be42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/eo/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/eo/firefox-88.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "73f658ca036879f9a70a1f9205c7da2899b1c1c59e58d957e165ea7bbcd5e34b"; + sha256 = "8b0343f789d3faca9290a33d72fff1ab9664eafc6ad56cf029156ae12cd7abe5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/es-AR/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/es-AR/firefox-88.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "6a5aa32bfb51de74b2d5c3567550ae0ed2820fbc302a48449a3ddc1f65eb279f"; + sha256 = "76f317e2f262cfac1bb0b41be3e108d51174b8532aecc2250f82d17badcd7d1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/es-CL/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/es-CL/firefox-88.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "4c2d5cead45a8535a6c2e1a64bde129cf104ef1d4cf4d85a673c7b3500c1609f"; + sha256 = "160e6d9e69122f2ddfdde25a234f6bea63fe8c7367225cd4dcb6009f0eaceec4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/es-ES/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/es-ES/firefox-88.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "8f8c2bb4af01cb144f751ecc9dd010ea24f557b75d7c08a09eeb023945c4cb62"; + sha256 = "6e205028086cacaf99234afc9f0621da65401651b0a43699dec688f271e1642f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/es-MX/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/es-MX/firefox-88.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "4dedabb4b1e51e22e2eeedbb448f96c4f7e6dd44b3e5fc414a81a22b1e03c73f"; + sha256 = "37eb7eef32fafd273855727fd9bfb6d510c682c94751cc5f4b7b29919215b8c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/et/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/et/firefox-88.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "23b5abc7775a964ba1ee5752f8b61c7edf4c1e1eaf8962b66f13ac638da9ed25"; + sha256 = "633e0339a52de8fd6f77a8066312b2daf57b45bde6cd57adcd0f6ee23240a1ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/eu/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/eu/firefox-88.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "3c87dc6406ca147713e5530b773581333d0c0835cab15d3e3254a4dab5e74e0f"; + sha256 = "3a3504b6b2c05ebd3e62c59a5d601725867986aea7b6a78466068bcdf7e8f064"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/fa/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/fa/firefox-88.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "b20949a6b54614935ca46ab5c7f2d3116ac3323a775ad812096d964cbd05dbc4"; + sha256 = "779667c40298064d4d6cb85b2c9e8f75b5a54874e101899385efb53be4732e60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ff/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ff/firefox-88.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "6f26c249f264b714e22402dc079d54fef92e1092a3ce12fbd61be283835c32a8"; + sha256 = "f372af781709a6e07db786f27fbcbeca71868ff6adca3019a53e51a63115d0f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/fi/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/fi/firefox-88.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "f6bdd115eb26dad32b019c8e854e2bc1f67b7a3d56cd044199ef0cb4c79a3d29"; + sha256 = "a2e622bf0c5ddf95530fb8e02547a7c6f5e23edc61f5b5e387a0144f7d7eb5ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/fr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/fr/firefox-88.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "bdf941c1a60dd2018d341e439acb7746401298b7492ec1e93b2fc744f3ace4b2"; + sha256 = "92fb6b1a095048633e12033d701190762cfda7a0ca1126e1122f8ae90793e237"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/fy-NL/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/fy-NL/firefox-88.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "cfb472e1e98f0ec8a9a6b24e8f31113ab25fcb7d1a01ddde09004414a0ac7954"; + sha256 = "3fafb1d37961b75f63d46cb43c8dd4e4fa25471d47f1d75601940ea0df87f5fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ga-IE/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ga-IE/firefox-88.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "20aaafb2d88eb09863ffb17c88df2d31aa20089672eef91e19c26795fb083de7"; + sha256 = "0c562ee44f470672ae36f0e383c8ee77f982c9fc3c302572b6fb22ad1e4ad721"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/gd/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/gd/firefox-88.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "af7d5ff85091ffb76cf15c0ed10e1148356fa5c3985e81a38c08c04f5c281064"; + sha256 = "5e29a4496f69c35d1cb2b69cd86091f368faf598a959052023a46366001a22a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/gl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/gl/firefox-88.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "28b4c52dd5191a5990a540029df8bc5ac40d5e38c23e2bbb0a2f9bd73623e74f"; + sha256 = "5f9caa18bc2425943ed6aba3974b5bf8578004b262797402d10ea10fad939afc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/gn/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/gn/firefox-88.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "5834d96a0daaf084c0ddf33490287ec2a3c376420db87904e550cf341953567b"; + sha256 = "38eb2039f153a6e0178b70bf2df455568927888935ab4c1cff7f7d3a31a9c56c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/gu-IN/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/gu-IN/firefox-88.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "025f19f373cbb3bb26029e119653a8fb1b8451166959493a75cbe89e16ae6d0c"; + sha256 = "1a7559932d13c6aa7b1dda6baa384269683de7ea3d37880592615513ee5835d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/he/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/he/firefox-88.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "3f6433e730b5a5ba0d1da4cc1d69e497b115394f5be5a8f91888bcfccfd35d92"; + sha256 = "9819474d9fc40886ec70f5fdc84a84ad2f9244cb43f1cbe6dc9954f51686d913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/hi-IN/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hi-IN/firefox-88.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "7ad200b8615fd8a703fd142314d72e4769f07ba420b62009d0985ff850305a4d"; + sha256 = "fb9d266b9d80b685176d8ef3711a7f91aef2b79d4f46a3201f14492c433ac579"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/hr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hr/firefox-88.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "b1dbefc5e048a496ea95abf5f25ace36e1d901a0ce4d1525606eb1337ef73212"; + sha256 = "4ea28d2eb6a0c5d888d581d0bd15557d4cce3dc5a09b8c858ccc7cbbeee10c2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/hsb/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hsb/firefox-88.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "54d82c14cd3dcba66b1efd8d9e44f69827c51f7ffa6bbfcfaa82be3c0881d2f7"; + sha256 = "837f0c17da85db3194385717e13e36e41f01b3f735d33c48794831762b4dbfd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/hu/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hu/firefox-88.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "e70da56c35e3f133a8942a08a97fc0905887e722d684138329d45195d4281254"; + sha256 = "f9cc01711910a92379872131ec8ba7f0620edf4b83f43308bbd9f7d2f0b4ebab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/hy-AM/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hy-AM/firefox-88.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "ec8a7e6a0efe5715be61344116489215177dbaf103412a5f726006afcd2c9907"; + sha256 = "9dff255e306dac4d98b12d0d3dc556152ccdcfb8f61e2f3314393fae39eb827d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ia/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ia/firefox-88.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "fe534973e0c2a86425c6d3abfd15d29fda8281924ec5d1c6cf32d067cfc439d5"; + sha256 = "855dd75e2fd4d14158bfe5ac2377105ee4c3a5e2a04fdd6fff1eed939f332a65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/id/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/id/firefox-88.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "6e82306244398be24cd82790ddca2885b14cb1d909e416ef7b2f569a09bdbd34"; + sha256 = "4fde420623110fe68b126d09c3ee72ddc88b1ce8a0f9b0d27990f619933db399"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/is/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/is/firefox-88.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "83c237806e5ae3f6ae926e215caa74ad22e13e375c9b462de663fd836a819a3a"; + sha256 = "d3c352ed8d91105449e50847ca80f484f93ae0d23ff6e7a21f9f66b7c39748bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/it/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/it/firefox-88.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "ff72131ccce409524b044d32fdd18150524033db8841876bfcf39d43c376ce8d"; + sha256 = "6e52fbeda5410c5169ed3a6a6f4279659cf873ac474f4c43d9f78deb740ea853"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ja/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ja/firefox-88.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "6392b53788f0908da45ef6e321445430c8a9db385a134a95c63826fdc0ad289f"; + sha256 = "520f31cd27c1dfebe4fefc1b3fd6de17a4ff7f589e0ba4f8822c968e3a22e7d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ka/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ka/firefox-88.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "a24cd3fd2c46dbe764a4af86f5f79a97d1ef0c3a37bfb61883556c48d987a067"; + sha256 = "74b52e2eb83b0f7f73ab049fcf8b8cc446ccd75d55feaf363f46ecedb35c119d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/kab/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/kab/firefox-88.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "68ea95f04d07ed0c0f0fb92f4ab3ace4abd0c43a878548ffcbed61024efb8a8f"; + sha256 = "c77b40df85b97a7cb41b22188d158f100946b813850371d04a9db0702a3c43e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/kk/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/kk/firefox-88.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "6e190c44a82faa476214369e0b32c2d70d6ec4394a7c289c8c73e8d1b70b1de6"; + sha256 = "0c8a89395c091f2c56e7b992db7dc48f5116cf9c54e179fee976e2f5d9ea07b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/km/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/km/firefox-88.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "532ee78e0cb774ff3a131e6bb48e27701fa136297eb3c119ac9644e05b66bf4b"; + sha256 = "1b5198b18f01ef509943dacd6f9c02fd52c5196c466a054efd5464ee091a75db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/kn/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/kn/firefox-88.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "547b191ab90c4b81209e519f675ced74cc2579f7776005c9f2e8fb677a79ed54"; + sha256 = "91a1facfc9abb247b428c1598cc32f4c932bd8ea3e9c0affdafb156747789611"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ko/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ko/firefox-88.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d8567c735f37308db5e541cbc44bd69aac0b5e86a5e55bb1915f10ab8cac32f6"; + sha256 = "6d98305b42ef4744681fd07031c71b38d10a847981fdf1b5b094c74d1c367817"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/lij/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/lij/firefox-88.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "e70a068ff713889d452cefde7bf19be4bf65349099026c57074d4cd035ba3c1d"; + sha256 = "431aa8855b211010f88efeb95ee46e05f38176e5656ad0c050922bce2ae4a81a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/lt/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/lt/firefox-88.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "9c2a6ebc75cc6becd5d8b73a8c47674ea71a4b97fdde973c2832d9bb76f91f4e"; + sha256 = "da7f416e9223ec1770b28d3d902785cd626496f82e5fd76c3ab091c4a2668a37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/lv/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/lv/firefox-88.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "ad628812c1db1ee9b7ff0f9d2f308db2480427bbdf5b6430474400cf70a82696"; + sha256 = "364742b8aca7ea82e393f9194401f8acbf203dcbb0f8b13cf119d2324e3577de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/mk/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/mk/firefox-88.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "17b3c4004f149f66c0f6feb5a2a644b7b815d2b440fac9df597bed0cafdb06e7"; + sha256 = "0048ddc6ea21b6c06890e914f5fa457435adcd4ec6f57c98a73262fdb8079e2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/mr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/mr/firefox-88.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "406e1c0435c4ff1233c9da0931ba4ba5a23a3cd1f05ed7202123ca04497f3a83"; + sha256 = "cbeb8be98074c6f57ccd0c917005ff04b8deda3ae8ef03126becd40591295ecc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ms/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ms/firefox-88.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "a312c23b1069438c8b0534007bf17c0b9e5b63d768b3cf24acefda1a257f0f5d"; + sha256 = "cdabbad9cf3b6012b086b5f3997c9338574a57315a5330b602a5ad2bcd40aa59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/my/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/my/firefox-88.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "93c9db14e9e462d89f04e928ac8ef3e3abdc682dc82a1781e76dcd62a2122c2b"; + sha256 = "4f44d11d8a15dd2f5f827377e4a6f64d68440fa5a3595011ee58715b9bce802d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/nb-NO/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/nb-NO/firefox-88.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "321068345667a18ae07435d78371931c55c306df14bccf74e1dbaa582d3e46fc"; + sha256 = "d61b79587b55540f845800462ca1cd52bfc7b380f60dd1bb51f15c16c511c066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ne-NP/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ne-NP/firefox-88.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "fe92879652c7eccde08e9017f37daaca5f387be0fd7784051d2c0b7e9c83f298"; + sha256 = "3f076d3def39e76a68d12e9e8b2ce7c6d60892fc6187b660f24abe454382a347"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/nl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/nl/firefox-88.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "a8dbdf538cf310d2918026e907e8422a4b5cccb943323f1ec3b391c61341818c"; + sha256 = "003d8a9b1e7e641b8c8eda226a43342f9c4c05fd616f50dd8fb0bcf7a07ef704"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/nn-NO/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/nn-NO/firefox-88.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "5a7ef37d7a2d13a2188781b69c01fc1b648c198aafc6ace0e7c818f58bea6e2d"; + sha256 = "0cca3c831508fb2040b57fd710823dd6c8051defe1c2c71e94b168feefb24b4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/oc/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/oc/firefox-88.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "083eef36f466362ea6726170be55e6410b3394b316d3c0ee866c5a1200db6949"; + sha256 = "b4a2ff73e2bb3f81b3e1522c2cd87b36b3406a961eed68d43972784cb7467474"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/pa-IN/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/pa-IN/firefox-88.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ed57e8e612d677f69776e3bafcdb174ac73e35d493151e282eb2f7f8a062c62f"; + sha256 = "14b692ec9884d2eee7b6f790413472943e90f80da2fca35121210ee0f9cfc23b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/pl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/pl/firefox-88.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "83523f00d01f1e41b6777789026e820de1a94f9fd413f5c2e9279d4da21697cf"; + sha256 = "a70084487dcdf2a6f5ad386284cf9dc97f7db971a5905e9460ed76bc4db47d20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/pt-BR/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/pt-BR/firefox-88.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "8d5e40ef90329e0fdc39d09b4f2a1492120182020c77a78b588e8eb66515876f"; + sha256 = "038641582e1a02b241860c99f4256e868b5feff4f0392b2c9107d2885894934c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/pt-PT/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/pt-PT/firefox-88.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "571539f8fee1519abd04900ac6ede845f0a500f612cb1b0e0a9b0415174eb45a"; + sha256 = "5bfb803863b648d99cb7a61f1f3a667f66a371e896265003162594c7f769bef0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/rm/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/rm/firefox-88.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "7e1ec5a0f813e8c1415f6a85e3f38bc03a8699a88573f1735345eb4099a0bd66"; + sha256 = "64705af1fa78953feb1281eff94a38be82e2320f6013fe45abf593af2ef9a014"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ro/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ro/firefox-88.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "5618fabc43c88e541160e8d6c515a04dc5a6c0a9aae4302b7be2f906c2559fa3"; + sha256 = "7d9ba545a17b3d4aaa4bd79a990ad931ccddc88aae76a6d3fb95675f38f77f6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ru/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ru/firefox-88.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "aca739451ce91482029101c0010d2fa8f92bb155abd96c601df495dcc1894706"; + sha256 = "2efcc64a1159f30ff00e495eeecde0d9243b0c75a4762f3e6fdd47ebdcbe1e70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/si/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/si/firefox-88.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "6ce0ccfc444784d1a91bb860fe3bf4910cc6a1ac12074d6b113f23028ded5d23"; + sha256 = "b4467e9ff46e28caea70472d9fa25f03137978508f0342d1e646aa77e8916018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/sk/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sk/firefox-88.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "eac64804e893db4ef8a241ae1fc33b9cddd6f91e37418977c7879a0b620b56ad"; + sha256 = "536f535124a6052e8d627928d3607cfa0301f90ed87de7701821f14f5fde40dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/sl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sl/firefox-88.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "0d2531fdaa0259b02264a3b45b5bef081aa196526259dbb1560c53e0683991af"; + sha256 = "2f50d761df9f8e4883972134ec989e8fbafebc29a4712bb4467eb0f2bb17f603"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/son/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/son/firefox-88.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "dd384928a67803465f0a040cf9ce6b8680e44aec0bf8bb940b56026d550b5ba7"; + sha256 = "55e11dde97be10ca510ac23e301a46e5314832bef10cd32e39503cb105d5b489"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/sq/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sq/firefox-88.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "01523311694f7de9d035b838d94b28083c5800b55ff3ff5ea853c4e668a28495"; + sha256 = "10b41cd2ba7789182902196153491b4fed86d1a655fe1b3fb22cc3bfe95bd7b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/sr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sr/firefox-88.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "5e6253d7c7f9f335fa2fd96562ebac2d78091264034f6673c3398fc725496e38"; + sha256 = "133a16999527f53b57123d47a191ba415c04fae837d735a295569e64492ac3b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/sv-SE/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sv-SE/firefox-88.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "6f8864ffa2195578543b2c36c782cf7fb7ba4bcd7096245695cd8ba89ed0bcc3"; + sha256 = "d0fcfd1cdbdb051cd48cc141e826993ea429683199bf88fbf12ac2372a2a5c03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/szl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/szl/firefox-88.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "b4ccf73a518f9f4ff64adaecaedb4a7dfe116ac9f579cc1713086bc00a62c2bf"; + sha256 = "b9bb3914f6918b64249f3b32f744a8f089bfd37eaebbe983748bff288f54a6d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ta/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ta/firefox-88.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "5e0e58a52836e13f2cd49acd026feaff2d27059c9525501df3892bb29364ca4a"; + sha256 = "0d74e3c6e73fbb99dd6269925567e5127569fb3dded3de80d55a10b45e8a595b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/te/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/te/firefox-88.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "55c0dff310e6a8e239540aa04777a2eab384b4876a78354a87b0b5b51b7994e6"; + sha256 = "d76e37e73ceea536957373bb774e4971041d09fbfb361274b90d763d39fda134"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/th/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/th/firefox-88.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "2a62c240946d8330166371d42fe9c04f246953a61958a9a66d28382bbad902fe"; + sha256 = "fd81d3ec70a449f3122fea36edbc519cf06ef12bebc776ec746d980386ce3c94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/tl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/tl/firefox-88.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "ed76eb7e7c221bfa0ab06446a3b5ba40728bb61c92a303cdf2ca4099a0f4f8fe"; + sha256 = "53c67df49f0c01f5b2f8cd0e990b4d7794f2363740fa4ec2e61fbf6763830c35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/tr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/tr/firefox-88.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "36d3142aee1011b41b8a91fb8b5f1e7cbf6011b55acb93b0a24b9fcdb41077ad"; + sha256 = "3d95619bf046b7afa7e8dcdd3b61b6eff44f7e96a2bb4bfe8abe518a729a24bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/trs/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/trs/firefox-88.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "2f8f414f0c0ca102e359df2b24090e23d9a440b971506058be4ab14d2c72e88c"; + sha256 = "2ea46a3f91c465514cd1721f6fc4ff96014b364a8120ef3c5782411c307b2a06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/uk/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/uk/firefox-88.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "671523abb993c10c355f23029dee6f718b1c3934b9dc84c9c9c67a1fea97c08a"; + sha256 = "7ad249c8355e8fab698cc9451f0716b0d88bb26fa7f7f95862c14d79f0b5210f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ur/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ur/firefox-88.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "e88871cd7d3bb4eed5a466d46f19b7564bacc2274fd9dca198abf690c09f1173"; + sha256 = "d0f6f7aab4499c7b01a1f2ba6a36f00f83cb3fc7c4f8d477f0cbf9c7df4f9dee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/uz/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/uz/firefox-88.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "d8c6d54bf364fdfce2c47554f2e476dc1578334b5fc7f2c35fe5e75729d0a759"; + sha256 = "49ce46676f8d1735d8a0439a9e0149a66aee20f3bbcd26308f00ab394cc4ac71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/vi/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/vi/firefox-88.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ef62bf56b514342e96c846a8d60da76b13955cab1a65c9d5e06e5add80676d4b"; + sha256 = "afacb2c2cb34b2791f14cb9ebe13a38cc87863b0de15e81f92e65e41b51d8a53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/xh/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/xh/firefox-88.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "30c97916ef8964ec1b15ab08bed806867262fecf07d0e486e8b4821f2839a214"; + sha256 = "c08da22b2ede0799cd802a6750f1b05150e2089521f74100cdac873802a7e39e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/zh-CN/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/zh-CN/firefox-88.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "6aca619cf86cec55e4712c2365e0ffa06c3a13b9df0cf64df80ea6ac07036400"; + sha256 = "55e00d8106a2516bb23f2dc48978a96e5102dffc100790103491447e48834810"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/zh-TW/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/zh-TW/firefox-88.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "4c60f41d35bc74fdda6b3cbdd0b7bb19883bb2e977bcd04bb50ae014d0f8c3d4"; + sha256 = "849c7e52452bf72983e5e7ce1b958ffc20cdddd4a401b320b3d1a817c027db78"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 24195e578b..4872324932 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -248,8 +248,8 @@ buildStdenv.mkDerivation ({ $(< ${buildStdenv.cc}/nix-support/libc-cflags) \ $(< ${buildStdenv.cc}/nix-support/cc-cflags) \ $(< ${buildStdenv.cc}/nix-support/libcxx-cxxflags) \ - ${lib.optionalString buildStdenv.cc.isClang "-idirafter ${buildStdenv.cc.cc}/lib/clang/${lib.getVersion buildStdenv.cc.cc}/include"} \ - ${lib.optionalString buildStdenv.cc.isGNU "-isystem ${buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc} -isystem ${buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc}/${buildStdenv.hostPlatform.config}"} \ + ${lib.optionalString buildStdenv.cc.isClang "-idirafter ${buildStdenv.cc.cc.lib}/lib/clang/${lib.getVersion buildStdenv.cc.cc}/include"} \ + ${lib.optionalString buildStdenv.cc.isGNU "-isystem ${lib.getDev buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc} -isystem ${buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc}/${buildStdenv.hostPlatform.config}"} \ $NIX_CFLAGS_COMPILE" echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG @@ -282,7 +282,7 @@ buildStdenv.mkDerivation ({ "--disable-updater" "--enable-jemalloc" "--enable-default-toolkit=${default-toolkit}" - "--with-libclang-path=${llvmPackages.libclang}/lib" + "--with-libclang-path=${llvmPackages.libclang.lib}/lib" "--with-system-nspr" "--with-system-nss" ] diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 9629c59012..05f2524f94 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "88.0"; + ffversion = "88.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "f58f44f2f0d0f54eae5ab4fa439205feb8b9209b1bf2ea2ae0c9691e9e583bae2cbd4033edb5bdf4e37eda5b95fca688499bed000fe26ced8ff4bbc49347ce31"; + sha512 = "e2d7fc950ba49f225c83ee1d799d6318fcf16c33a3b7f40b85c49d5b7865f7e632c703e5fd227a303b56e2565d0796283ebb12d7fd1a02781dcaa45e84cea934"; }; meta = { @@ -32,10 +32,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.10.0esr"; + ffversion = "78.10.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "5e2cf137dc781855542c29df6152fa74ba749801640ade3cf01487ce993786b87a4f603d25c0af9323e67c7e15c75655523428c1c1426527b8623c7ded9f5946"; + sha512 = "a22773d9b3f0dca253805257f358a906769d23f15115e3a8851024f701e27dee45f056f7d34ebf1fcde0a3f91ec299639c2a12556e938a232cdea9e59835fde1"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 62bb722652..793e8688a5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -3,7 +3,7 @@ ## various stuff that can be plugged in , ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify -, gnome3/*.gnome-shell*/ +, gnome/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native , fx_cast_bridge @@ -269,7 +269,7 @@ let --set MOZ_ENABLE_WAYLAND "1" \ ''}${lib.optionalString (browser ? gtk3) ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' + --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' '' } ############################# diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix index 36d97b5a87..a7b9ddd07d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -38,7 +38,7 @@ , chromium , gsettings-desktop-schemas -, gnome3 +, gnome # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder) , libvaSupport ? true, libva @@ -88,7 +88,7 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix index 93e5da02e5..c9846d92b8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -10,23 +10,24 @@ , pcre , SDL2 , AppKit +, zlib }: stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.3.4"; + version = "1.4.0"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-hPNqyTH2oMPytvYAF9sjEQ9ibaJYDODA33ZrDuWnloU="; + sha256 = "sha256-l8k81w+ilkOk8iQTc46+HK40JQZ0dCYVAvkGTrEpZSQ="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libunistring mpg123 openssl pcre SDL2 ] + buildInputs = [ libunistring mpg123 openssl pcre SDL2 zlib ] ++ lib.optional stdenv.isDarwin AppKit; hardeningDisable = lib.optional (!stdenv.cc.isClang) "format"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix index 9bc9727dd1..63f1958f4a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix @@ -142,6 +142,8 @@ stdenv.mkDerivation rec { ac_add_options --enable-jemalloc ac_add_options --enable-strip ac_add_options --enable-devtools + # Missing from build instructions, https://forum.palemoon.org/viewtopic.php?f=5&t=25843#p214767 + ac_add_options --enable-av1 ac_add_options --disable-eme ac_add_options --disable-webrtc @@ -159,8 +161,6 @@ stdenv.mkDerivation rec { ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]} - export MOZ_PKG_SPECIAL=gtk$_GTK_VERSION - # # NixOS-specific adjustments # diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix index 26cbc92ada..7bf3ee9e75 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix @@ -7,12 +7,13 @@ stdenv.mkDerivation rec { pname = "surf"; - version = "unstable-2019-02-08"; + version = "2.1"; + # tarball is missing file common.h src = fetchgit { url = "git://git.suckless.org/surf"; - rev = "d068a3878b6b9f2841a49cd7948cdf9d62b55585"; - sha256 = "0pjsv2q8c74sdmqsalym8wa2lv55lj4pd36miam5wd12769xw68m"; + rev = version; + sha256 = "1v926hiayddylq79n8l7dy51bm0dsa9n18nx9bkhg666cx973x4z"; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index acd10e0ea3..72b17400df 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -36,7 +36,7 @@ # Wrapper runtime , coreutils , glibcLocales -, gnome3 +, gnome , runtimeShell , shared-mime-info , gsettings-desktop-schemas @@ -246,7 +246,7 @@ stdenv.mkDerivation rec { "${graphene-hardened-malloc}/lib/libhardened_malloc.so"} WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme shared-mime-info ]} WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix index 495c2bb15d..6e56333895 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix @@ -2,13 +2,13 @@ mkYarnPackage rec { pname = "vieb"; - version = "3.4.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "jelmerro"; repo = pname; rev = version; - sha256 = "0h5yzmvs9zhhpg9l7rrgwd4rqd9n00n2ifwqf05kpymzliy6xsnk"; + sha256 = "sha256-7/oB2Inj+iMXzigqbCNJUY7dNrFBals2BOOl+Lp+ESs="; }; packageJSON = ./package.json; @@ -51,8 +51,8 @@ mkYarnPackage rec { meta = with lib; { homepage = "https://vieb.dev/"; description = "Vim Inspired Electron Browser"; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner fortuneteller2k ]; platforms = platforms.unix; - license = licenses.gpl3; + license = licenses.gpl3Plus; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json index cf04c6892c..90bcdb9014 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json @@ -1,11 +1,13 @@ { "name": "vieb", "productName": "Vieb", - "version": "3.4.0", + "version": "4.5.1", "description": "Vim Inspired Electron Browser", + "bin": "app.js", "main": "app/index.js", "scripts": { - "test": "jest -u && eslint .", + "test": "jest --coverage --collectCoverageFrom 'app/**/*.js' -u && eslint app && echo 'All good :)'", + "dev": "electron app --datafolder ./ViebData/", "start": "electron app", "build": "node build.js", "buildall": "node build.js --linux --win --mac", @@ -16,24 +18,29 @@ "repository": "https://github.com/Jelmerro/Vieb", "homepage": "https://vieb.dev", "keywords": [ + "Vim", "Electron", "Browser", "Internet" ], "author": "Jelmer van Arnhem", "email": "Jelmerro@users.noreply.github.com", - "license": "GPL-3.0+", + "license": "GPL-3.0-or-later", "devDependencies": { - "archiver": "^5.2.0", - "electron": "^11.2.1", - "electron-builder": "^22.10.4", - "eslint": "^7.19.0", - "jest": "^26.6.3" + "archiver": "5.3.0", + "electron": "12.0.5", + "electron-builder": "22.10.5", + "eslint": "7.25.0", + "eslint-plugin-compat": "^3.9.0", + "jest": "26.6.3" }, "dependencies": { - "@cliqz/adblocker-electron": "^1.20.0", - "darkreader": "^4.9.27", - "is-svg": "^4.2.1", - "rimraf": "^3.0.2" - } + "7zip-bin": "5.1.1", + "@cliqz/adblocker-electron": "1.20.4", + "is-svg": "4.3.1", + "rimraf": "3.0.2" + }, + "browserslist": [ + "last 2 Chrome versions" + ] } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock index 45858ae2b2..5db7b52a5a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"7zip-bin@5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" + integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== + "7zip-bin@~5.0.3": version "5.0.3" resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f" @@ -21,36 +26,51 @@ dependencies: "@babel/highlight" "^7.12.13" +"@babel/compat-data@^7.13.15": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919" + integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q== + "@babel/core@^7.1.0", "@babel/core@^7.7.5": - version "7.12.16" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.16.tgz#8c6ba456b23b680a6493ddcfcd9d3c3ad51cab7c" - integrity sha512-t/hHIB504wWceOeaOoONOhu+gX+hpjfeN6YRBT209X/4sibZQfSF1I0HFRRlBe97UZZosGx5XwUg1ZgNbelmNw== + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.0.tgz#47299ff3ec8d111b493f1a9d04bf88c04e728d88" + integrity sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw== dependencies: "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.12.15" - "@babel/helper-module-transforms" "^7.12.13" - "@babel/helpers" "^7.12.13" - "@babel/parser" "^7.12.16" + "@babel/generator" "^7.14.0" + "@babel/helper-compilation-targets" "^7.13.16" + "@babel/helper-module-transforms" "^7.14.0" + "@babel/helpers" "^7.14.0" + "@babel/parser" "^7.14.0" "@babel/template" "^7.12.13" - "@babel/traverse" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/traverse" "^7.14.0" + "@babel/types" "^7.14.0" convert-source-map "^1.7.0" debug "^4.1.0" - gensync "^1.0.0-beta.1" + gensync "^1.0.0-beta.2" json5 "^2.1.2" - lodash "^4.17.19" - semver "^5.4.1" + semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.12.13", "@babel/generator@^7.12.15": - version "7.12.15" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.15.tgz#4617b5d0b25cc572474cc1aafee1edeaf9b5368f" - integrity sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ== +"@babel/generator@^7.14.0": + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.1.tgz#1f99331babd65700183628da186f36f63d615c93" + integrity sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.14.1" jsesc "^2.5.1" source-map "^0.5.0" +"@babel/helper-compilation-targets@^7.13.16": + version "7.13.16" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c" + integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA== + dependencies: + "@babel/compat-data" "^7.13.15" + "@babel/helper-validator-option" "^7.12.17" + browserslist "^4.14.5" + semver "^6.3.0" + "@babel/helper-function-name@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a" @@ -67,34 +87,33 @@ dependencies: "@babel/types" "^7.12.13" -"@babel/helper-member-expression-to-functions@^7.12.13": - version "7.12.16" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.16.tgz#41e0916b99f8d5f43da4f05d85f4930fa3d62b22" - integrity sha512-zYoZC1uvebBFmj1wFAlXwt35JLEgecefATtKp20xalwEK8vHAixLBXTGxNrVGEmTT+gzOThUgr8UEdgtalc1BQ== +"@babel/helper-member-expression-to-functions@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72" + integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.13.12" -"@babel/helper-module-imports@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0" - integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g== +"@babel/helper-module-imports@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977" + integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.13.12" -"@babel/helper-module-transforms@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz#01afb052dcad2044289b7b20beb3fa8bd0265bea" - integrity sha512-acKF7EjqOR67ASIlDTupwkKM1eUisNAjaSduo5Cz+793ikfnpe7p4Q7B7EWU2PCoSTPWsQkR7hRUWEIZPiVLGA== +"@babel/helper-module-transforms@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz#8fcf78be220156f22633ee204ea81f73f826a8ad" + integrity sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw== dependencies: - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-replace-supers" "^7.12.13" - "@babel/helper-simple-access" "^7.12.13" + "@babel/helper-module-imports" "^7.13.12" + "@babel/helper-replace-supers" "^7.13.12" + "@babel/helper-simple-access" "^7.13.12" "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/helper-validator-identifier" "^7.12.11" + "@babel/helper-validator-identifier" "^7.14.0" "@babel/template" "^7.12.13" - "@babel/traverse" "^7.12.13" - "@babel/types" "^7.12.13" - lodash "^4.17.19" + "@babel/traverse" "^7.14.0" + "@babel/types" "^7.14.0" "@babel/helper-optimise-call-expression@^7.12.13": version "7.12.13" @@ -104,26 +123,26 @@ "@babel/types" "^7.12.13" "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.8.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz#174254d0f2424d8aefb4dd48057511247b0a9eeb" - integrity sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA== + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af" + integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ== -"@babel/helper-replace-supers@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz#00ec4fb6862546bd3d0aff9aac56074277173121" - integrity sha512-pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg== +"@babel/helper-replace-supers@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804" + integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw== dependencies: - "@babel/helper-member-expression-to-functions" "^7.12.13" + "@babel/helper-member-expression-to-functions" "^7.13.12" "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/traverse" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/traverse" "^7.13.0" + "@babel/types" "^7.13.12" -"@babel/helper-simple-access@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4" - integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA== +"@babel/helper-simple-access@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6" + integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.13.12" "@babel/helper-split-export-declaration@^7.12.13": version "7.12.13" @@ -132,33 +151,38 @@ dependencies: "@babel/types" "^7.12.13" -"@babel/helper-validator-identifier@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" - integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== +"@babel/helper-validator-identifier@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288" + integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A== -"@babel/helpers@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.13.tgz#3c75e993632e4dadc0274eae219c73eb7645ba47" - integrity sha512-oohVzLRZ3GQEk4Cjhfs9YkJA4TdIDTObdBEZGrd6F/T0GPSnuV6l22eMcxlvcvzVIPH3VTtxbseudM1zIE+rPQ== +"@babel/helper-validator-option@^7.12.17": + version "7.12.17" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831" + integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw== + +"@babel/helpers@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62" + integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg== dependencies: "@babel/template" "^7.12.13" - "@babel/traverse" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/traverse" "^7.14.0" + "@babel/types" "^7.14.0" "@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c" - integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww== + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf" + integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg== dependencies: - "@babel/helper-validator-identifier" "^7.12.11" + "@babel/helper-validator-identifier" "^7.14.0" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.12.16": - version "7.12.16" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.16.tgz#cc31257419d2c3189d394081635703f549fc1ed4" - integrity sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.0": + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.1.tgz#1bd644b5db3f5797c4479d89ec1817fe02b84c47" + integrity sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -253,28 +277,26 @@ "@babel/parser" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.13.tgz#689f0e4b4c08587ad26622832632735fb8c4e0c0" - integrity sha512-3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.0.tgz#cea0dc8ae7e2b1dec65f512f39f3483e8cc95aef" + integrity sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA== dependencies: "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.12.13" + "@babel/generator" "^7.14.0" "@babel/helper-function-name" "^7.12.13" "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/parser" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/parser" "^7.14.0" + "@babel/types" "^7.14.0" debug "^4.1.0" globals "^11.1.0" - lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.13.tgz#8be1aa8f2c876da11a9cf650c0ecf656913ad611" - integrity sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ== +"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.12", "@babel/types@^7.14.0", "@babel/types@^7.14.1", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz#095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db" + integrity sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA== dependencies: - "@babel/helper-validator-identifier" "^7.12.11" - lodash "^4.17.19" + "@babel/helper-validator-identifier" "^7.14.0" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -282,45 +304,45 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cliqz/adblocker-content@^1.20.0": - version "1.20.0" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.20.0.tgz#fcfa2845a577ba8d9af282afbae2fc437b3f1c70" - integrity sha512-KcokmK2B+tAnVMi7nGHgzXUVf78wAODG1Uk+K3tBPf9VAo3mwldYZ472uTj6LUfZv5oeTwe4PwfmPWXWZy3Eew== +"@cliqz/adblocker-content@^1.20.5": + version "1.20.5" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.20.5.tgz#eed410510574cfc83b9b391b95026c880e5a3521" + integrity sha512-Ozp4mQytY3qmiQBsJfpObu1vwRAc8tV2kYqMS81Fx7ShjadYk3S0FtIG1zYcS7uzfQK5qTlFUsORcAEUC4kdAQ== dependencies: - "@cliqz/adblocker-extended-selectors" "^1.20.0" + "@cliqz/adblocker-extended-selectors" "^1.20.5" -"@cliqz/adblocker-electron-preload@^1.20.0": - version "1.20.0" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.20.0.tgz#997b694fbb1b1206e04b1fd570690234cc7ef630" - integrity sha512-brNQFjIoGTMClmFphtoK0EnjOlbqfxr6sA3CrOZiHfG0e07Id5GoU95re8+s8xA+/nd1GrJl/k5/b4aks+S9Gw== +"@cliqz/adblocker-electron-preload@^1.20.4": + version "1.20.5" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.20.5.tgz#0d69ee6cf4ed6865bc4a125d95e10d5b132d5680" + integrity sha512-B58O8DbFfzqxA7RmRStL0El3Vr22CwqFcgchw5FLINq2jw0VFENpLSofyxtspuwyzHoFQSYVhUo8ugbPwqsMYQ== dependencies: - "@cliqz/adblocker-content" "^1.20.0" + "@cliqz/adblocker-content" "^1.20.5" -"@cliqz/adblocker-electron@^1.20.0": - version "1.20.0" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.20.0.tgz#bacfb9feaf1d3dab339b992e3defa111a4b5ed3c" - integrity sha512-zD881g+YxxO4BM6NB5qZtSevg9Cj7QtlCJ4tkcKZnD9MDQsNXQVIFFEWwqhd00kLkTUS0+jT0px9b81cigAPNg== +"@cliqz/adblocker-electron@1.20.4": + version "1.20.4" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.20.4.tgz#6d7de52cff013ef3cd0f4a7850ebfc31f6240a46" + integrity sha512-HaHexPnJL1BBvloXuqmSh8WtpPKYHyZ+o6f+9SciySN4dJAX9BIGTk9D/V6eJWLmy6+wY7/Bpcn2Q4nrYXsqBw== dependencies: - "@cliqz/adblocker" "^1.20.0" - "@cliqz/adblocker-electron-preload" "^1.20.0" + "@cliqz/adblocker" "^1.20.4" + "@cliqz/adblocker-electron-preload" "^1.20.4" tldts-experimental "^5.6.21" -"@cliqz/adblocker-extended-selectors@^1.20.0": - version "1.20.0" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.20.0.tgz#95ede657b670f627b39f92d85a97093cecee6ffe" - integrity sha512-dnBPIngGe1eDWvYX49eP2yyCE2AY1QD5E+8SaXW6lslnjS0GQnkcXCAkkGR2am4Qdk78HAiWTXL65Zt9hdkupA== +"@cliqz/adblocker-extended-selectors@^1.20.5": + version "1.20.5" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.20.5.tgz#5d55aa72281db6f57657f9bffad5bc24fc93087a" + integrity sha512-vJUFZWB3SZuviI4yBxEsz9hejALFl/vZLrhzVm2TKGSYvR42g/thhlTCwqmhszPY11UXznWPMyaE9M5WdpBWFw== -"@cliqz/adblocker@^1.20.0": - version "1.20.0" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.20.0.tgz#514746e9ee72fcd886f1e2e1aaf13b28fc63f232" - integrity sha512-lkEj0Pj1ikwMURrvoFv0YnLfaXFuJI+jexI7zdh4fDmlwRppzDDgOhPXgCczoAlYacJk5x2mf7pan6JybRD9Kw== +"@cliqz/adblocker@^1.20.4": + version "1.20.5" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.20.5.tgz#04edcb9a52897d371a41a2351aa492186019b92a" + integrity sha512-QItVcxe1NkFvANXcDRjX40sq20fSf4Zo8DIyL3QO7nExEGowS12zj0J+6zRaoBCUxFoWgLDg4HQF0+0V7DTHNQ== dependencies: - "@cliqz/adblocker-content" "^1.20.0" - "@cliqz/adblocker-extended-selectors" "^1.20.0" + "@cliqz/adblocker-content" "^1.20.5" + "@cliqz/adblocker-extended-selectors" "^1.20.5" "@remusao/guess-url-type" "^1.1.2" "@remusao/small" "^1.1.2" "@remusao/smaz" "^1.7.1" - "@types/chrome" "^0.0.128" + "@types/chrome" "^0.0.136" "@types/firefox-webext-browser" "^82.0.0" tldts-experimental "^5.6.21" @@ -367,10 +389,10 @@ dir-compare "^2.4.0" fs-extra "^9.0.1" -"@eslint/eslintrc@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz#d736d6963d7003b6514e6324bec9c602ac340318" - integrity sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg== +"@eslint/eslintrc@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547" + integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog== dependencies: ajv "^6.12.4" debug "^4.1.1" @@ -379,7 +401,6 @@ ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" - lodash "^4.17.20" minimatch "^3.0.4" strip-json-comments "^3.1.1" @@ -577,6 +598,13 @@ dependencies: cross-spawn "^7.0.1" +"@mdn/browser-compat-data@^2.0.7": + version "2.0.7" + resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-2.0.7.tgz#72ec37b9c1e00ce0b4e0309d753be18e2da12ee3" + integrity sha512-GeeM827DlzFFidn1eKkMBiqXFD2oLsnZbaiGhByPl0vcapsRzUL+t9hDoov1swc9rB2jw64R+ihtzC8qOE9wXw== + dependencies: + extend "3.0.2" + "@remusao/guess-url-type@^1.1.2": version "1.2.1" resolved "https://registry.yarnpkg.com/@remusao/guess-url-type/-/guess-url-type-1.2.1.tgz#b3e7c32abdf98d0fb4f93cc67cad580b5fe4ba57" @@ -618,9 +646,9 @@ integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== "@sinonjs/commons@^1.7.0": - version "1.8.2" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz#858f5c4b48d80778fde4b9d541f27edc0d56488b" - integrity sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw== + version "1.8.3" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" + integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ== dependencies: type-detect "4.0.8" @@ -639,9 +667,9 @@ defer-to-connect "^1.0.1" "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": - version "7.1.12" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d" - integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ== + version "7.1.14" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz#faaeefc4185ec71c389f4501ee5ec84b170cc402" + integrity sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -665,16 +693,16 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0" - integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg== + version "7.11.1" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz#654f6c4f67568e24c23b367e947098c6206fa639" + integrity sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw== dependencies: "@babel/types" "^7.3.0" -"@types/chrome@^0.0.128": - version "0.0.128" - resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.128.tgz#5dbd8b2539a367353fbe4386f119b510105f8b6a" - integrity sha512-eGc599TDtersMBW1cSnExHm0IHrXrO5xdk6Sa2Dq30ED+hR1rpT1ez0NNcCgvGO52nmktGfyvd3Uyquzv3LL4g== +"@types/chrome@^0.0.136": + version "0.0.136" + resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.136.tgz#7c011b9f997b0156f25a140188a0c5689d3f368f" + integrity sha512-XDEiRhLkMd+SB7Iw3ZUIj/fov3wLd4HyTdLltVszkgl1dBfc3Rb7oPMVZ2Mz2TLqnF7Ow+StbR8E7r9lqpb4DA== dependencies: "@types/filesystem" "*" "@types/har-format" "*" @@ -685,26 +713,26 @@ integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== "@types/filesystem@*": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.29.tgz#ee3748eb5be140dcf980c3bd35f11aec5f7a3748" - integrity sha512-85/1KfRedmfPGsbK8YzeaQUyV1FQAvMPMTuWFQ5EkLd2w7szhNO96bk3Rh/SKmOfd9co2rCLf0Voy4o7ECBOvw== + version "0.0.30" + resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.30.tgz#a7373a2edf34d13e298baf7ee1101f738b2efb7e" + integrity sha512-NCoRgmGmLpTT9VFL6Bb6z0jQuqI3d0E5FGl7M0JOv/J5RQYo9s5aOItPYnpckx9MbYQk1APLXcF8f20Vqnf2yA== dependencies: "@types/filewriter" "*" "@types/filewriter@*": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.28.tgz#c054e8af4d9dd75db4e63abc76f885168714d4b3" - integrity sha1-wFTor02d11205jq8dviFFocU1LM= + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.29.tgz#a48795ecadf957f6c0d10e0c34af86c098fa5bee" + integrity sha512-BsPXH/irW0ht0Ji6iw/jJaK8Lj3FJemon2gvEqHKpCdDCeemHa+rI3WBGq5z7cDMZgoLjY40oninGxqk+8NzNQ== "@types/firefox-webext-browser@^82.0.0": version "82.0.0" resolved "https://registry.yarnpkg.com/@types/firefox-webext-browser/-/firefox-webext-browser-82.0.0.tgz#4d0f5cfebd7321d2cbf0ccfb6032570f0138b958" integrity sha512-zKHePkjMx42KIUUZCPcUiyu1tpfQXH9VR4iDYfns3HvmKVJzt/TAFT+DFVroos8BI9RH78YgF3Hi/wlC6R6cKA== -"@types/fs-extra@^9.0.5": - version "9.0.7" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.7.tgz#a9ef2ffdab043def080c5bec94c03402f793577f" - integrity sha512-YGq2A6Yc3bldrLUlm17VNWOnUbnEzJ9CMgOeLFtQF3HOCN5lQBO8VyjG00a5acA5NNSM30kHVGp1trZgnVgi1Q== +"@types/fs-extra@^9.0.7": + version "9.0.11" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.11.tgz#8cc99e103499eab9f347dbc6ca4e99fb8d2c2b87" + integrity sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA== dependencies: "@types/node" "*" @@ -748,19 +776,19 @@ "@types/istanbul-lib-report" "*" "@types/minimatch@*": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" - integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21" + integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== "@types/node@*": - version "14.14.27" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.27.tgz#c7127f8da0498993e13b1a42faf1303d3110d2f2" - integrity sha512-Ecfmo4YDQPwuqTCl1yBxLV5ihKfRlkBmzUEDcfIRvDxOTGQEeikr317Ln7Gcv0tjA8dVgKI3rniqW2G1OyKDng== + version "15.0.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67" + integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA== -"@types/node@^12.0.12": - version "12.20.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.0.tgz#692dfdecd6c97f5380c42dd50f19261f9f604deb" - integrity sha512-0/41wHcurotvSOTHQUFkgL702c3pyWR1mToSrrX3pGPvGfpHTv3Ksx0M4UVuU5VJfjVb62Eyr1eKO1tWNUCg2Q== +"@types/node@^14.6.2": + version "14.14.44" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz#df7503e6002847b834371c004b372529f3f85215" + integrity sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -776,9 +804,9 @@ xmlbuilder ">=11.0.1" "@types/prettier@^2.0.0": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.1.tgz#374e31645d58cb18a07b3ecd8e9dede4deb2cccd" - integrity sha512-DxZZbyMAM9GWEzXL+BMZROWz9oo6A9EilwwOMET2UVu2uZTqMWS5S69KVtuVKaRjCUpcrOXRalet86/OpG4kqw== + version "2.2.3" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0" + integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA== "@types/stack-utils@^2.0.0": version "2.0.0" @@ -795,14 +823,14 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9" integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== -"@types/yargs@^15.0.0", "@types/yargs@^15.0.12": +"@types/yargs@^15.0.0", "@types/yargs@^15.0.13": version "15.0.13" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc" integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ== dependencies: "@types/yargs-parser" "*" -abab@^2.0.3: +abab@^2.0.3, abab@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== @@ -830,6 +858,11 @@ acorn@^7.1.1, acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== +acorn@^8.1.0: + version "8.2.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz#caba24b08185c3b56e3168e97d15ed17f4d31fd0" + integrity sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg== + ajv-keywords@^3.4.1: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" @@ -845,10 +878,10 @@ ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.3, ajv@^6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^7.0.2: - version "7.1.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.1.0.tgz#f982ea7933dc7f1012eae9eec5a86687d805421b" - integrity sha512-svS9uILze/cXbH0z2myCK2Brqprx/+JJYK5pHicT/GQiBfzzhUVAIT6MwqJg8y4xV/zoGsUeuPuwtoiKSGE15g== +ajv@^8.0.1: + version "8.2.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602" + integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -868,11 +901,11 @@ ansi-colors@^4.1.1: integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== ansi-escapes@^4.2.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" - integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== + version "4.3.2" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== dependencies: - type-fest "^0.11.0" + type-fest "^0.21.3" ansi-regex@^3.0.0: version "3.0.0" @@ -912,9 +945,9 @@ anymatch@^2.0.0: normalize-path "^2.1.1" anymatch@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" @@ -924,27 +957,27 @@ app-builder-bin@3.5.12: resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.12.tgz#bbe174972cc1f481f73d6d92ad47a8b4c7eb4530" integrity sha512-lQARM2AielmFoBeIo6LZigAe+58Wwe07ZWkt+wVeDxzyieNmeWjlvz/V5dKzinydwdHd+CNswN86sww46yijjA== -app-builder-lib@22.10.4: - version "22.10.4" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.4.tgz#3fc70821b76beb9c8279d9de22960ef2174da153" - integrity sha512-q7B1cr8Ry4a7o08EKShLfwsnIVf5By7YhVwcoqgEwPKxtoj1qF0kB4wyBP79rJylYi0Zj2cSkJJ/gD/ef9xhoQ== +app-builder-lib@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.5.tgz#24a88581c891e5b187a0d569aa44e7c4a0dc8de2" + integrity sha512-/W8nlGamJCtKlQtsMWwU9vb+cX4pTNY+rJWCuc7oXUykVSMS50W7LhQusIjCelNfymUQ1XCu6cXEY/ylqhX12A== dependencies: "7zip-bin" "~5.0.3" "@develar/schema-utils" "~2.6.5" "@electron/universal" "1.0.4" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.10.4" + builder-util "22.10.5" builder-util-runtime "8.7.3" chromium-pickle-js "^0.2.0" - debug "^4.3.1" - ejs "^3.1.5" - electron-publish "22.10.4" - fs-extra "^9.0.1" - hosted-git-info "^3.0.7" + debug "^4.3.2" + ejs "^3.1.6" + electron-publish "22.10.5" + fs-extra "^9.1.0" + hosted-git-info "^3.0.8" is-ci "^2.0.0" - isbinaryfile "^4.0.6" - js-yaml "^3.14.1" + istextorbinary "^5.12.0" + js-yaml "^4.0.0" lazy-val "^1.0.4" minimatch "^3.0.4" normalize-package-data "^3.0.0" @@ -969,18 +1002,18 @@ archiver-utils@^2.1.0: normalize-path "^3.0.0" readable-stream "^2.0.0" -archiver@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.2.0.tgz#25aa1b3d9febf7aec5b0f296e77e69960c26db94" - integrity sha512-QEAKlgQuAtUxKeZB9w5/ggKXh21bZS+dzzuQ0RPBC20qtDCbTyzqmisoeJP46MP39fg4B4IcyvR+yeyEBdblsQ== +archiver@5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz#dd3e097624481741df626267564f7dd8640a45ba" + integrity sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg== dependencies: archiver-utils "^2.1.0" async "^3.2.0" buffer-crc32 "^0.2.1" readable-stream "^3.6.0" readdir-glob "^1.0.0" - tar-stream "^2.1.4" - zip-stream "^4.0.4" + tar-stream "^2.2.0" + zip-stream "^4.1.0" argparse@^1.0.7: version "1.0.10" @@ -989,6 +1022,11 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" @@ -1038,6 +1076,11 @@ assign-symbols@^1.0.0: resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= +ast-metadata-inferer@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/ast-metadata-inferer/-/ast-metadata-inferer-0.4.0.tgz#6be85ceeffcf267bd79db8e1ae731da44880b45f" + integrity sha512-tKHdBe8N/Vq2nLAm4YPBVREVZjMux6KrqyPfNQgIbDl0t7HaNSmy8w4OyVHYg/cvyn5BW7o7pVwpjPte89Zhcg== + astral-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" @@ -1145,11 +1188,11 @@ babel-preset-jest@^26.6.2: babel-preset-current-node-syntax "^1.0.0" balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -base64-js@^1.2.3, base64-js@^1.3.1: +base64-js@^1.3.1, base64-js@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== @@ -1174,6 +1217,11 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" +binaryextensions@^4.15.0: + version "4.15.0" + resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-4.15.0.tgz#c63a502e0078ff1b0e9b00a9f74d3c2b0f8bd32e" + integrity sha512-MkUl3szxXolQ2scI1PM14WOT951KnaTNJ0eMKg7WzOI4kvSxyNo/Cygx4LOBNhwyINhAuSQpJW1rYD9aBSxGaw== + bl@^4.0.3: version "4.1.0" resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" @@ -1196,14 +1244,14 @@ bluebird@^3.5.5: integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== boolean@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570" - integrity sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g== + version "3.0.3" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.3.tgz#0fee0c9813b66bef25a8a6a904bb46736d05f024" + integrity sha512-EqrTKXQX6Z3A2nRmMEIlAIfjQOgFnVO2nqZGpbcsPnYGWBwpFqzlrozU1dy+S2iqfYDLh26ef4KrgTxu9xQrxA== boxen@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.0.0.tgz#64fe9b16066af815f51057adcc800c3730120854" - integrity sha512-5bvsqw+hhgUi3oYGK0Vf4WpIkyemp60WBInn7+WNfoISzAqk/HX4L7WNROq38E6UR/y3YADpv6pEm4BfkeEAdA== + version "5.0.1" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.0.1.tgz#657528bdd3f59a772b8279b831f27ec2c744664b" + integrity sha512-49VBlw+PrWEF51aCmy7QIteYPIFZxSpvqBdP/2itCPPlJ49kj9zg/XPRFrdkne2W+CfwXUls8exMvu1RysZpKA== dependencies: ansi-align "^3.0.0" camelcase "^6.2.0" @@ -1250,6 +1298,17 @@ browser-process-hrtime@^1.0.0: resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== +browserslist@^4.12.2, browserslist@^4.14.5: + version "4.16.6" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" + integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== + dependencies: + caniuse-lite "^1.0.30001219" + colorette "^1.2.2" + electron-to-chromium "^1.3.723" + escalade "^3.1.1" + node-releases "^1.1.71" + bser@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" @@ -1288,22 +1347,22 @@ builder-util-runtime@8.7.3: debug "^4.3.2" sax "^1.2.4" -builder-util@22.10.4: - version "22.10.4" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.4.tgz#54e8be83dd0dec28073d866ff087cee8e7ce6cf6" - integrity sha512-XdcbFG3otEkNRKxW2wS1npNviCb/IrzusEQ55lMB+6YEHxBOfTbf8vnPt0pDumfwmxls9xczABU+mfqN/W4uDw== +builder-util@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.5.tgz#8d0b04a3be6acc74938679aa90dcb3181b1ae86b" + integrity sha512-/MkLhmyo1gU3xMwXJxccQaRj/9tm5eTd6ZyebTf8SYouY4r3hRser+LxhOm/f8Z9W6oJvfPe0jc9TFsxYfMcsg== dependencies: "7zip-bin" "~5.0.3" "@types/debug" "^4.1.5" - "@types/fs-extra" "^9.0.5" + "@types/fs-extra" "^9.0.7" app-builder-bin "3.5.12" bluebird-lst "^1.0.9" builder-util-runtime "8.7.3" chalk "^4.1.0" - debug "^4.3.1" - fs-extra "^9.0.1" + debug "^4.3.2" + fs-extra "^9.1.0" is-ci "^2.0.0" - js-yaml "^3.14.1" + js-yaml "^4.0.0" source-map-support "^0.5.19" stat-mode "^1.0.0" temp-file "^3.3.7" @@ -1351,6 +1410,11 @@ camelcase@^6.0.0, camelcase@^6.2.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== +caniuse-lite@^1.0.30001166, caniuse-lite@^1.0.30001219: + version "1.0.30001223" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz#39b49ff0bfb3ee3587000d2f66c47addc6e14443" + integrity sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA== + capture-exit@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4" @@ -1373,9 +1437,9 @@ chalk@^2.0.0, chalk@^2.4.2: supports-color "^5.3.0" chalk@^4.0.0, chalk@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + version "4.1.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" + integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -1490,6 +1554,11 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +colorette@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" + integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== + colors@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" @@ -1519,10 +1588,10 @@ component-emitter@^1.2.1: resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== -compress-commons@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.2.tgz#d6896be386e52f37610cef9e6fa5defc58c31bd7" - integrity sha512-qhd32a9xgzmpfoga1VQEiLEwdKZ6Plnpx5UCgIsf89FSolyJ7WnifY4Gtjgv5WR6hWAyRaHxC5MiEhU/38U70A== +compress-commons@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.0.tgz#25ec7a4528852ccd1d441a7d4353cd0ece11371b" + integrity sha512-ofaaLqfraD1YRTkrRKPCrGJ1pFeDG/MVCkVVV2FNGeWquSlqw5wOrwOfPQ1xF2u+blpeWASie5EubHz+vsNIgA== dependencies: buffer-crc32 "^0.2.13" crc32-stream "^4.0.1" @@ -1577,9 +1646,9 @@ copy-descriptor@^0.1.0: integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= core-js@^3.6.5: - version "3.8.3" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz#c21906e1f14f3689f93abcc6e26883550dd92dd0" - integrity sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q== + version "3.11.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.11.3.tgz#2835b1f4d10f6d0400bf820cfe6fe64ad067dd3f" + integrity sha512-DFEW9BllWw781Op5KdYGtXfj3s9Cmykzt16bY6elaVuqXHCUwF/5pv0H3IJ7/I3BGjK7OeU+GrjD1ChCkBJPuA== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -1644,18 +1713,13 @@ cssom@~0.3.6: resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== -cssstyle@^2.2.0: +cssstyle@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== dependencies: cssom "~0.3.6" -darkreader@^4.9.27: - version "4.9.27" - resolved "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.27.tgz#69b641d6a3c22b07fb0424406dfd9a3661b37197" - integrity sha512-DG8zsicuCbAYKaKvLUaiikeei5jN5dIpe0jyaPw4kDa2L5zVnWc/ZxNUYOFriKVAmicwqE5gH5EOfyI0MVt3KA== - dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -1698,7 +1762,7 @@ decamelize@^1.2.0: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= -decimal.js@^10.2.0: +decimal.js@^10.2.1: version "10.2.1" resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3" integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw== @@ -1775,9 +1839,9 @@ detect-newline@^3.0.0: integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== detect-node@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" - integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw== + version "2.0.5" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.5.tgz#9d270aa7eaa5af0b72c4c9d9b814e7f4ce738b79" + integrity sha512-qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw== diff-sequences@^26.6.2: version "26.6.2" @@ -1794,16 +1858,16 @@ dir-compare@^2.4.0: commander "2.9.0" minimatch "3.0.4" -dmg-builder@22.10.4: - version "22.10.4" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.4.tgz#8dab30754346791eb728091359558fd4a8dbb45f" - integrity sha512-+28HZgKAuyCQnQwLSAwkHUqtMB/egHF5ACUABCB4Nev02/ZfjFPUTF/WloTaEbue34zLLUGxPXh+BJF8Xw26ow== +dmg-builder@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.5.tgz#65a33c106ead5a350c7de8997c546559bd6e0e7c" + integrity sha512-58FEpfH8PEFqjbUNka4bYr52snRT8+LSXrP4gy6EZWOVICbOlmTOYj988pfoLam5C5iXb3odmyUQqwWOxlsEUw== dependencies: - app-builder-lib "22.10.4" - builder-util "22.10.4" - fs-extra "^9.0.1" + app-builder-lib "22.10.5" + builder-util "22.10.5" + fs-extra "^9.1.0" iconv-lite "^0.6.2" - js-yaml "^3.14.1" + js-yaml "^4.0.0" sanitize-filename "^1.6.3" optionalDependencies: dmg-license "^1.0.8" @@ -1850,9 +1914,9 @@ dotenv-expand@^5.1.0: integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== dotenv@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" - integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== + version "8.6.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" + integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== duplexer3@^0.1.4: version "0.1.4" @@ -1867,54 +1931,67 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -ejs@^3.1.5: +editions@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/editions/-/editions-6.1.0.tgz#ba6c6cf9f4bb571d9e53ea34e771a602e5a66549" + integrity sha512-h6nWEyIocfgho9J3sTSuhU/WoFOu1hTX75rPBebNrbF38Y9QFDjCDizYXdikHTySW7Y3mSxli8bpDz9RAtc7rA== + dependencies: + errlop "^4.0.0" + version-range "^1.0.0" + +ejs@^3.1.6: version "3.1.6" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== dependencies: jake "^10.6.1" -electron-builder@^22.10.4: - version "22.10.4" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.4.tgz#e1f400cf41ebb632fbf79aa86c5e0ab1ea1ed7e5" - integrity sha512-V+JtiizJd3kt24TT+0OHG7+oPAzjhhjmQVn9G6OC2WE7VBJxrDuD6lMVRgo6WlU8uvDCh7fTRUsdh0Tnu0GeQA== +electron-builder@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.5.tgz#03b156b93e6012609027c3aaa69201a3ad21e454" + integrity sha512-0q/289UUJUhRou6lZKDz/wzK6WprIQ6VXMTmaI+w9qXvSNugPC9UA5s2zXInOkjZOvO/xKnjeyiavrVSHYF3tA== dependencies: - "@types/yargs" "^15.0.12" - app-builder-lib "22.10.4" + "@types/yargs" "^15.0.13" + app-builder-lib "22.10.5" bluebird-lst "^1.0.9" - builder-util "22.10.4" + builder-util "22.10.5" builder-util-runtime "8.7.3" chalk "^4.1.0" - dmg-builder "22.10.4" - fs-extra "^9.0.1" + dmg-builder "22.10.5" + fs-extra "^9.1.0" is-ci "^2.0.0" lazy-val "^1.0.4" read-config-file "6.0.0" sanitize-filename "^1.6.3" - update-notifier "^5.0.1" + update-notifier "^5.1.0" yargs "^16.2.0" -electron-publish@22.10.4: - version "22.10.4" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.4.tgz#944b00aa6a7746c31ce900ffd8106d243326dca8" - integrity sha512-cjVM0+9DQoV4TWfH8lVWoelJ89O2i5yDARVp5GCMHrB43XEU0Nr5eKYysgsbOSnZk5W8z1vfGpFWHj+AeAEDYg== +electron-publish@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.5.tgz#9cbe46266b6c79d8c6e99840755682e2262d3543" + integrity sha512-dHyuazv3P3j1Xyv7pdwTwAvxWab2pCb0G0Oa6qWQoCc4b1/mRGY00M7AvYW1cPuUijj9zYAf1HmXfM6MifaMlA== dependencies: - "@types/fs-extra" "^9.0.5" + "@types/fs-extra" "^9.0.7" bluebird-lst "^1.0.9" - builder-util "22.10.4" + builder-util "22.10.5" builder-util-runtime "8.7.3" chalk "^4.1.0" - fs-extra "^9.0.1" + fs-extra "^9.1.0" lazy-val "^1.0.4" - mime "^2.4.7" + mime "^2.5.0" -electron@^11.2.1: - version "11.2.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz#8ad1d9858436cfca0e2e5ea7fea326794ae58ebb" - integrity sha512-6yxOc42nDAptHKNlUG/vcOh2GI9x2fqp2nQbZO0/3sz2CrwsJkwR3i3oMN9XhVJaqI7GK1vSCJz0verOkWlXcQ== +electron-to-chromium@^1.3.723: + version "1.3.727" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf" + integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg== + +electron@12.0.5: + version "12.0.5" + resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.5.tgz#005cf4375d2ee4563f5e75dc4da4ef871846a8be" + integrity sha512-z0xYB3sPr0qZcDrHUUWqooPKe3yUzBDxQcgQe3f2TLstA84JIFXBoaIJCPh/fJW0+JdF/ZFVeK2SNgLhYtRV+Q== dependencies: "@electron/get" "^1.0.1" - "@types/node" "^12.0.12" + "@types/node" "^14.6.2" extract-zip "^1.0.3" emittery@^0.7.1: @@ -1952,9 +2029,14 @@ enquirer@^2.3.5: ansi-colors "^4.1.1" env-paths@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" - integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA== + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== + +errlop@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/errlop/-/errlop-4.1.0.tgz#8e7b8f4f1bf0a6feafce4d14f0c0cf4bf5ef036b" + integrity sha512-vul6gGBuVt0M2TPi1/WrcL86+Hb3Q2Tpu3TME3sbVhZrYf7J1ZMHCodI25RQKCVurh56qTfvgM0p3w5cT4reSQ== error-ex@^1.3.1: version "1.3.2" @@ -1993,18 +2075,32 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -escodegen@^1.14.1: - version "1.14.3" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" - integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== +escodegen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" + integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== dependencies: esprima "^4.0.1" - estraverse "^4.2.0" + estraverse "^5.2.0" esutils "^2.0.2" optionator "^0.8.1" optionalDependencies: source-map "~0.6.1" +eslint-plugin-compat@^3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-compat/-/eslint-plugin-compat-3.9.0.tgz#a7a224e09b102b58e7f7dff52c936428ff3e0186" + integrity sha512-lt3l5PHFHVEYSZ5zijcoYvtQJPsBifRiH5N0Et57KwVu7l/yxmHhSG6VJiLMa/lXrg93Qu8049RNQOMn0+yJBg== + dependencies: + "@mdn/browser-compat-data" "^2.0.7" + ast-metadata-inferer "^0.4.0" + browserslist "^4.12.2" + caniuse-lite "^1.0.30001166" + core-js "^3.6.5" + find-up "^4.1.0" + lodash.memoize "4.1.2" + semver "7.3.2" + eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" @@ -2026,17 +2122,17 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== eslint-visitor-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" - integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint@^7.19.0: - version "7.20.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.20.0.tgz#db07c4ca4eda2e2316e7aa57ac7fc91ec550bdc7" - integrity sha512-qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw== +eslint@7.25.0: + version "7.25.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67" + integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw== dependencies: "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.3.0" + "@eslint/eslintrc" "^0.4.0" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -2049,10 +2145,10 @@ eslint@^7.19.0: espree "^7.3.1" esquery "^1.4.0" esutils "^2.0.2" - file-entry-cache "^6.0.0" + file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" glob-parent "^5.0.0" - globals "^12.1.0" + globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -2060,7 +2156,7 @@ eslint@^7.19.0: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.20" + lodash "^4.17.21" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" @@ -2101,7 +2197,7 @@ esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.1.1: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== @@ -2117,9 +2213,9 @@ esutils@^2.0.2: integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== exec-sh@^0.3.2: - version "0.3.4" - resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5" - integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A== + version "0.3.6" + resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc" + integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w== execa@^1.0.0: version "1.0.0" @@ -2199,7 +2295,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@~3.0.2: +extend@3.0.2, extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== @@ -2253,6 +2349,11 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= +fast-xml-parser@^3.19.0: + version "3.19.0" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz#cb637ec3f3999f51406dd8ff0e6fc4d83e520d01" + integrity sha512-4pXwmBplsCPv8FOY1WRakF970TjNGnGnfbOnLqjlYvMiF1SR3yOHyxMR/YCXpPTOspNF5gwudqktIP4VsWkvBg== + fb-watchman@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" @@ -2267,10 +2368,10 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" -file-entry-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a" - integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA== +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== dependencies: flat-cache "^3.0.4" @@ -2359,7 +2460,7 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^9.0.1: +fs-extra@^9.0.1, fs-extra@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== @@ -2389,7 +2490,7 @@ functional-red-black-tree@^1.0.1: resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= -gensync@^1.0.0-beta.1: +gensync@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== @@ -2431,9 +2532,9 @@ getpass@^0.1.1: assert-plus "^1.0.0" glob-parent@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" - integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" @@ -2450,9 +2551,9 @@ glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: path-is-absolute "^1.0.0" global-agent@^2.0.2: - version "2.1.12" - resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz#e4ae3812b731a9e81cbf825f9377ef450a8e4195" - integrity sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg== + version "2.2.0" + resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz#566331b0646e6bf79429a16877685c4a1fbf76dc" + integrity sha512-+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg== dependencies: boolean "^3.0.1" core-js "^3.6.5" @@ -2491,10 +2592,17 @@ globals@^12.1.0: dependencies: type-fest "^0.8.1" +globals@^13.6.0: + version "13.8.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3" + integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q== + dependencies: + type-fest "^0.20.2" + globalthis@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz#40116f5d9c071f9e8fb0037654df1ab3a83b7ef9" - integrity sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw== + version "1.0.2" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz#2a235d34f4d8036219f7e34929b5de9e18166b8b" + integrity sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ== dependencies: define-properties "^1.1.3" @@ -2597,21 +2705,23 @@ has@^1.0.3: function-bind "^1.1.1" hosted-git-info@^2.1.4: - version "2.8.8" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" - integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== -hosted-git-info@^3.0.6, hosted-git-info@^3.0.7: +hosted-git-info@^3.0.8: version "3.0.8" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d" integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw== dependencies: lru-cache "^6.0.0" -html-comment-regex@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7" - integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ== +hosted-git-info@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" + integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== + dependencies: + lru-cache "^6.0.0" html-encoding-sniffer@^2.0.1: version "2.0.1" @@ -2725,11 +2835,6 @@ ini@^1.3.4, ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -ip-regex@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" - integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= - is-accessor-descriptor@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" @@ -2762,9 +2867,9 @@ is-ci@^2.0.0: ci-info "^2.0.0" is-core-module@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" - integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== + version "2.3.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887" + integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw== dependencies: has "^1.0.3" @@ -2801,9 +2906,9 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2: kind-of "^6.0.2" is-docker@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156" - integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw== + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" @@ -2875,9 +2980,9 @@ is-obj@^2.0.0: integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== is-path-inside@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017" - integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg== + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" @@ -2887,9 +2992,9 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: isobject "^3.0.1" is-potential-custom-element-name@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397" - integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== is-stream@^1.1.0: version "1.1.0" @@ -2901,12 +3006,12 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== -is-svg@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-4.2.1.tgz#095b496e345fec9211c2a7d5d021003e040d6f81" - integrity sha512-PHx3ANecKsKNl5y5+Jvt53Y4J7MfMpbNZkv384QNiswMKAWIbvcqbPz+sYbFKJI8Xv3be01GSFniPmoaP+Ai5A== +is-svg@4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-4.3.1.tgz#8c63ec8c67c8c7f0a8de0a71c8c7d58eccf4406b" + integrity sha512-h2CGs+yPUyvkgTJQS9cJzo9lYK06WgRiXUqBBHtglSzVKAuH4/oWsqk7LGfbSa1hGk9QcZ0SyQtVggvBA8LZXA== dependencies: - html-comment-regex "^1.1.2" + fast-xml-parser "^3.19.0" is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" @@ -2935,11 +3040,6 @@ isarray@1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= -isbinaryfile@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b" - integrity sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg== - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -3003,6 +3103,15 @@ istanbul-reports@^3.0.2: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" +istextorbinary@^5.12.0: + version "5.12.0" + resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-5.12.0.tgz#2f84777838668fdf524c305a2363d6057aaeec84" + integrity sha512-wLDRWD7qpNTYubk04+q3en1+XZGS4vYWK0+SxNSXJLaITMMEK+J3o/TlOMyULeH1qozVZ9uUkKcyMA8odyxz8w== + dependencies: + binaryextensions "^4.15.0" + editions "^6.1.0" + textextensions "^5.11.0" + jake@^10.6.1: version "10.8.2" resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" @@ -3377,7 +3486,7 @@ jest-worker@^26.6.2: merge-stream "^2.0.0" supports-color "^7.0.0" -jest@^26.6.3: +jest@26.6.3: version "26.6.3" resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef" integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q== @@ -3391,7 +3500,7 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.13.1, js-yaml@^3.14.1: +js-yaml@^3.13.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -3399,41 +3508,48 @@ js-yaml@^3.13.1, js-yaml@^3.14.1: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= jsdom@^16.4.0: - version "16.4.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb" - integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w== + version "16.5.3" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.3.tgz#13a755b3950eb938b4482c407238ddf16f0d2136" + integrity sha512-Qj1H+PEvUsOtdPJ056ewXM4UJPCi4hhLA8wpiz9F2YvsRBhuFsXxtrIFAgGBDynQA9isAMGE91PfUYbdMPXuTA== dependencies: - abab "^2.0.3" - acorn "^7.1.1" + abab "^2.0.5" + acorn "^8.1.0" acorn-globals "^6.0.0" cssom "^0.4.4" - cssstyle "^2.2.0" + cssstyle "^2.3.0" data-urls "^2.0.0" - decimal.js "^10.2.0" + decimal.js "^10.2.1" domexception "^2.0.1" - escodegen "^1.14.1" + escodegen "^2.0.0" html-encoding-sniffer "^2.0.1" is-potential-custom-element-name "^1.0.0" nwsapi "^2.2.0" - parse5 "5.1.1" + parse5 "6.0.1" request "^2.88.2" - request-promise-native "^1.0.8" - saxes "^5.0.0" + request-promise-native "^1.0.9" + saxes "^5.0.1" symbol-tree "^3.2.4" - tough-cookie "^3.0.1" + tough-cookie "^4.0.0" w3c-hr-time "^1.0.2" w3c-xmlserializer "^2.0.0" webidl-conversions "^6.1.0" whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" - whatwg-url "^8.0.0" - ws "^7.2.3" + whatwg-url "^8.5.0" + ws "^7.4.4" xml-name-validator "^3.0.0" jsesc@^2.5.1: @@ -3597,6 +3713,11 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= + lodash.defaults@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" @@ -3617,20 +3738,25 @@ lodash.isplainobject@^4.0.6: resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= -lodash.sortby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" - integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= +lodash.memoize@4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= + +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= lodash.union@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= -lodash@^4.17.10, lodash@^4.17.19, lodash@^4.17.20: - version "4.17.20" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" - integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== +lodash@^4.17.10, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" @@ -3707,29 +3833,29 @@ micromatch@^3.1.4: to-regex "^3.0.2" micromatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== dependencies: braces "^3.0.1" - picomatch "^2.0.5" + picomatch "^2.2.3" -mime-db@1.45.0: - version "1.45.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea" - integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w== +mime-db@1.47.0: + version "1.47.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c" + integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw== mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.28" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd" - integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ== + version "2.1.30" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d" + integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg== dependencies: - mime-db "1.45.0" + mime-db "1.47.0" -mime@^2.4.7: - version "2.5.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz#2b4af934401779806ee98026bb42e8c1ae1876b1" - integrity sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag== +mime@^2.5.0: + version "2.5.2" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" + integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== mimic-fn@^2.1.0: version "2.1.0" @@ -3821,9 +3947,9 @@ node-modules-regexp@^1.0.0: integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= node-notifier@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1" - integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA== + version "8.0.2" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5" + integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg== dependencies: growly "^1.3.0" is-wsl "^2.2.0" @@ -3832,6 +3958,11 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" +node-releases@^1.1.71: + version "1.1.71" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb" + integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg== + normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -3843,13 +3974,13 @@ normalize-package-data@^2.5.0: validate-npm-package-license "^3.0.1" normalize-package-data@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.0.tgz#1f8a7c423b3d2e85eb36985eaf81de381d01301a" - integrity sha512-6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw== + version "3.0.2" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699" + integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg== dependencies: - hosted-git-info "^3.0.6" - resolve "^1.17.0" - semver "^7.3.2" + hosted-git-info "^4.0.1" + resolve "^1.20.0" + semver "^7.3.4" validate-npm-package-license "^3.0.1" normalize-path@^2.1.1: @@ -4028,10 +4159,10 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse5@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" - integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== +parse5@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== pascalcase@^0.1.1: version "0.1.1" @@ -4073,10 +4204,10 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -picomatch@^2.0.4, picomatch@^2.0.5: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== +picomatch@^2.0.4, picomatch@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d" + integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== pify@^3.0.0: version "3.0.0" @@ -4098,13 +4229,13 @@ pkg-dir@^4.2.0: find-up "^4.0.0" plist@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c" - integrity sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ== + version "3.0.2" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.2.tgz#74bbf011124b90421c22d15779cee60060ba95bc" + integrity sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ== dependencies: - base64-js "^1.2.3" + base64-js "^1.5.1" xmlbuilder "^9.0.7" - xmldom "0.1.x" + xmldom "^0.5.0" posix-character-classes@^0.1.0: version "0.1.1" @@ -4152,9 +4283,9 @@ progress@^2.0.0, progress@^2.0.3: integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== prompts@^2.0.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7" - integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ== + version "2.4.1" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61" + integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ== dependencies: kleur "^3.0.3" sisteransi "^1.0.5" @@ -4164,7 +4295,7 @@ proto-list@~1.2.1: resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= -psl@^1.1.28: +psl@^1.1.28, psl@^1.1.33: version "1.8.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== @@ -4205,9 +4336,9 @@ rc@^1.2.8: strip-json-comments "~2.0.1" react-is@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" - integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== read-config-file@6.0.0: version "6.0.0" @@ -4301,9 +4432,9 @@ remove-trailing-separator@^1.0.1: integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= repeat-element@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" - integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== + version "1.1.4" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" + integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== repeat-string@^1.6.1: version "1.6.1" @@ -4317,7 +4448,7 @@ request-promise-core@1.1.4: dependencies: lodash "^4.17.19" -request-promise-native@^1.0.8: +request-promise-native@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28" integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g== @@ -4389,7 +4520,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.10.0, resolve@^1.17.0, resolve@^1.18.1: +resolve@^1.10.0, resolve@^1.18.1, resolve@^1.20.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -4409,7 +4540,7 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== -rimraf@^3.0.0, rimraf@^3.0.2: +rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -4482,7 +4613,7 @@ sax@^1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -saxes@^5.0.0: +saxes@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== @@ -4501,20 +4632,25 @@ semver-diff@^3.1.1: dependencies: semver "^6.3.0" -"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0: +"semver@2 || 3 || 4 || 5", semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== +semver@7.3.2: + version "7.3.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" + integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== + semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== semver@^7.2.1, semver@^7.3.2, semver@^7.3.4: - version "7.3.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" - integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" @@ -4758,9 +4894,9 @@ stealthy-require@^1.1.1: integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= string-length@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" - integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw== + version "4.0.2" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" + integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ== dependencies: char-regex "^1.0.2" strip-ansi "^6.0.0" @@ -4783,9 +4919,9 @@ string-width@^3.0.0: strip-ansi "^5.1.0" string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" - integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" @@ -4873,9 +5009,9 @@ supports-color@^7.0.0, supports-color@^7.1.0: has-flag "^4.0.0" supports-hyperlinks@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" - integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" + integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== dependencies: has-flag "^4.0.0" supports-color "^7.0.0" @@ -4886,16 +5022,19 @@ symbol-tree@^3.2.4: integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== table@^6.0.4: - version "6.0.7" - resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34" - integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g== + version "6.6.0" + resolved "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz#905654b79df98d9e9a973de1dd58682532c40e8e" + integrity sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg== dependencies: - ajv "^7.0.2" - lodash "^4.17.20" + ajv "^8.0.1" + lodash.clonedeep "^4.5.0" + lodash.flatten "^4.4.0" + lodash.truncate "^4.4.2" slice-ansi "^4.0.0" string-width "^4.2.0" + strip-ansi "^6.0.0" -tar-stream@^2.1.4: +tar-stream@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== @@ -4936,22 +5075,27 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= +textextensions@^5.11.0: + version "5.12.0" + resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-5.12.0.tgz#b908120b5c1bd4bb9eba41423d75b176011ab68a" + integrity sha512-IYogUDaP65IXboCiPPC0jTLLBzYlhhw2Y4b0a2trPgbHNGGGEfuHE6tds+yDcCf4mpNDaGISFzwSSezcXt+d6w== + throat@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== -tldts-core@^5.7.6: - version "5.7.6" - resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.6.tgz#af99b4ab79761dfa6c44d1d61a3f76bb5c3def8b" - integrity sha512-VfRarBs7nbY9Af3In4O1A3d7T6eZh+w/IjRPpBo8VgRHAo7LJ+GrzCVo1yoOPmm3tdO1vUXtwBnchWN0dpL6lQ== +tldts-core@^5.7.33: + version "5.7.33" + resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.33.tgz#b2364f30d16e34b48961911408e9dbe3ae94ebdb" + integrity sha512-rESuFr/uhdKG8kXDsR6YBAbvV0k1lEn1ep4PKkej7ubkcWM84P7oqT+eTrr7170inds8jPTtkQBWIqDtwlIrvQ== tldts-experimental@^5.6.21: - version "5.7.6" - resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.6.tgz#10c255872af89ab68659c3a345c7a65015920024" - integrity sha512-FRpjSRsxsa46/PRc2erEx8B9uZQYsdBQPG/s3B7IGhWxi1VG6GOwTJWGyfFBy3LWfge7Kw3Yrh89ZS01tUKMIQ== + version "5.7.33" + resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.33.tgz#4959da5cd345a6167c69815fb6e34471387178b9" + integrity sha512-MlImbiWIutHEAB26JM7sBZLhp0D0Lw1xw+tr382Wz5WtTQGa3zoJ8CE0r63oZq8hj/JLP4gLFlavwrkbxB5H+Q== dependencies: - tldts-core "^5.7.6" + tldts-core "^5.7.33" tmpl@1.0.x: version "1.0.4" @@ -5008,14 +5152,14 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" -tough-cookie@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2" - integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg== +tough-cookie@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" + integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== dependencies: - ip-regex "^2.1.0" - psl "^1.1.28" + psl "^1.1.33" punycode "^2.1.1" + universalify "^0.1.2" tr46@^2.0.2: version "2.0.2" @@ -5067,11 +5211,6 @@ type-detect@4.0.8: resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== -type-fest@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" - integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== - type-fest@^0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" @@ -5082,6 +5221,11 @@ type-fest@^0.20.2: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== + type-fest@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" @@ -5121,7 +5265,7 @@ unique-string@^2.0.0: dependencies: crypto-random-string "^2.0.0" -universalify@^0.1.0: +universalify@^0.1.0, universalify@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== @@ -5139,7 +5283,7 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" -update-notifier@^5.0.1: +update-notifier@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== @@ -5204,14 +5348,14 @@ uuid@^8.3.0: integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== v8-compile-cache@^2.0.3: - version "2.2.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132" - integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== v8-to-istanbul@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz#5b95cef45c0f83217ec79f8fc7ee1c8b486aee07" - integrity sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g== + version "7.1.2" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1" + integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -5234,6 +5378,18 @@ verror@1.10.0, verror@^1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" +version-compare@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/version-compare/-/version-compare-1.1.0.tgz#7b3e67e7e6cec5c72d9c9e586f8854e419ade17c" + integrity sha512-zVKtPOJTC9x23lzS4+4D7J+drq80BXVYAmObnr5zqxxFVH7OffJ1lJlAS7LYsQNV56jx/wtbw0UV7XHLrvd6kQ== + +version-range@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/version-range/-/version-range-1.1.0.tgz#1c233064202ee742afc9d56e21da3b2e15260acf" + integrity sha512-R1Ggfg2EXamrnrV3TkZ6yBNgITDbclB3viwSjbZ3+eK0VVNK4ajkYJTnDz5N0bIMYDtK9MUBvXJUnKO5RWWJ6w== + dependencies: + version-compare "^1.0.0" + w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" @@ -5277,12 +5433,12 @@ whatwg-mimetype@^2.3.0: resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== -whatwg-url@^8.0.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837" - integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw== +whatwg-url@^8.0.0, whatwg-url@^8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz#7752b8464fc0903fec89aa9846fc9efe07351fd3" + integrity sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg== dependencies: - lodash.sortby "^4.7.0" + lodash "^4.7.0" tr46 "^2.0.2" webidl-conversions "^6.1.0" @@ -5350,10 +5506,10 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" -ws@^7.2.3: - version "7.4.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd" - integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA== +ws@^7.4.4: + version "7.4.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" + integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== xdg-basedir@^4.0.0: version "4.0.0" @@ -5380,20 +5536,20 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -xmldom@0.1.x: - version "0.1.31" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff" - integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ== +xmldom@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e" + integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA== y18n@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" - integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== + version "4.0.3" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" + integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== y18n@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" - integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== yallist@^4.0.0: version "4.0.0" @@ -5409,9 +5565,9 @@ yargs-parser@^18.1.2: decamelize "^1.2.0" yargs-parser@^20.2.2: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + version "20.2.7" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" + integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== yargs@^15.4.1: version "15.4.1" @@ -5451,11 +5607,11 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" -zip-stream@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz#3a8f100b73afaa7d1ae9338d910b321dec77ff3a" - integrity sha512-a65wQ3h5gcQ/nQGWV1mSZCEzCML6EK/vyVPcrPNynySP1j3VBbQKh3nhC8CbORb+jfl2vXvh56Ul5odP1bAHqw== +zip-stream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz#51dd326571544e36aa3f756430b313576dc8fc79" + integrity sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A== dependencies: archiver-utils "^2.1.0" - compress-commons "^4.0.2" + compress-commons "^4.1.0" readable-stream "^3.6.0" diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix index e4bfdf7261..a6b67955ad 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -1,6 +1,14 @@ { fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ + { + name = "7zip_bin___7zip_bin_5.1.1.tgz"; + path = fetchurl { + name = "7zip_bin___7zip_bin_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz"; + sha1 = "9274ec7460652f9c632c59addf24efb1684ef876"; + }; + } { name = "7zip_bin___7zip_bin_5.0.3.tgz"; path = fetchurl { @@ -26,19 +34,35 @@ }; } { - name = "_babel_core___core_7.12.16.tgz"; + name = "_babel_compat_data___compat_data_7.14.0.tgz"; path = fetchurl { - name = "_babel_core___core_7.12.16.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.12.16.tgz"; - sha1 = "8c6ba456b23b680a6493ddcfcd9d3c3ad51cab7c"; + name = "_babel_compat_data___compat_data_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz"; + sha1 = "a901128bce2ad02565df95e6ecbf195cf9465919"; }; } { - name = "_babel_generator___generator_7.12.15.tgz"; + name = "_babel_core___core_7.14.0.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.12.15.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.15.tgz"; - sha1 = "4617b5d0b25cc572474cc1aafee1edeaf9b5368f"; + name = "_babel_core___core_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.0.tgz"; + sha1 = "47299ff3ec8d111b493f1a9d04bf88c04e728d88"; + }; + } + { + name = "_babel_generator___generator_7.14.1.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.1.tgz"; + sha1 = "1f99331babd65700183628da186f36f63d615c93"; + }; + } + { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; + path = fetchurl { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz"; + sha1 = "6e91dccf15e3f43e5556dffe32d860109887563c"; }; } { @@ -58,27 +82,27 @@ }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.16.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.16.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.16.tgz"; - sha1 = "41e0916b99f8d5f43da4f05d85f4930fa3d62b22"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz"; + sha1 = "dfe368f26d426a07299d8d6513821768216e6d72"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.12.13.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz"; - sha1 = "ec67e4404f41750463e455cc3203f6a32e93fcb0"; + name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; + sha1 = "c6a369a6f3621cb25da014078684da9196b61977"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.12.13.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.0.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz"; - sha1 = "01afb052dcad2044289b7b20beb3fa8bd0265bea"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz"; + sha1 = "8fcf78be220156f22633ee204ea81f73f826a8ad"; }; } { @@ -90,27 +114,27 @@ }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.12.13.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz"; - sha1 = "174254d0f2424d8aefb4dd48057511247b0a9eeb"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; + sha1 = "806526ce125aed03373bc416a828321e3a6a33af"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.12.13.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.13.12.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz"; - sha1 = "00ec4fb6862546bd3d0aff9aac56074277173121"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz"; + sha1 = "6442f4c1ad912502481a564a7386de0c77ff3804"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.12.13.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz"; - sha1 = "8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4"; + name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; + sha1 = "dd6c538afb61819d205a012c31792a39c7a5eaf6"; }; } { @@ -122,35 +146,43 @@ }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; - sha1 = "c9a1f021917dcb5ccf0d4e453e399022981fc9ed"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; + sha1 = "d26cad8a47c65286b15df1547319a5d0bcf27288"; }; } { - name = "_babel_helpers___helpers_7.12.13.tgz"; + name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.13.tgz"; - sha1 = "3c75e993632e4dadc0274eae219c73eb7645ba47"; + name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; + sha1 = "d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"; }; } { - name = "_babel_highlight___highlight_7.12.13.tgz"; + name = "_babel_helpers___helpers_7.14.0.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz"; - sha1 = "8ab538393e00370b26271b01fa08f7f27f2e795c"; + name = "_babel_helpers___helpers_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz"; + sha1 = "ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"; }; } { - name = "_babel_parser___parser_7.12.16.tgz"; + name = "_babel_highlight___highlight_7.14.0.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.12.16.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.16.tgz"; - sha1 = "cc31257419d2c3189d394081635703f549fc1ed4"; + name = "_babel_highlight___highlight_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz"; + sha1 = "3197e375711ef6bf834e67d0daec88e4f46113cf"; + }; + } + { + name = "_babel_parser___parser_7.14.1.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.1.tgz"; + sha1 = "1bd644b5db3f5797c4479d89ec1817fe02b84c47"; }; } { @@ -258,19 +290,19 @@ }; } { - name = "_babel_traverse___traverse_7.12.13.tgz"; + name = "_babel_traverse___traverse_7.14.0.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.13.tgz"; - sha1 = "689f0e4b4c08587ad26622832632735fb8c4e0c0"; + name = "_babel_traverse___traverse_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.0.tgz"; + sha1 = "cea0dc8ae7e2b1dec65f512f39f3483e8cc95aef"; }; } { - name = "_babel_types___types_7.12.13.tgz"; + name = "_babel_types___types_7.14.1.tgz"; path = fetchurl { - name = "_babel_types___types_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.12.13.tgz"; - sha1 = "8be1aa8f2c876da11a9cf650c0ecf656913ad611"; + name = "_babel_types___types_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz"; + sha1 = "095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db"; }; } { @@ -282,43 +314,43 @@ }; } { - name = "_cliqz_adblocker_content___adblocker_content_1.20.0.tgz"; + name = "_cliqz_adblocker_content___adblocker_content_1.20.5.tgz"; path = fetchurl { - name = "_cliqz_adblocker_content___adblocker_content_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.20.0.tgz"; - sha1 = "fcfa2845a577ba8d9af282afbae2fc437b3f1c70"; + name = "_cliqz_adblocker_content___adblocker_content_1.20.5.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.20.5.tgz"; + sha1 = "eed410510574cfc83b9b391b95026c880e5a3521"; }; } { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.20.0.tgz"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.20.5.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.20.0.tgz"; - sha1 = "997b694fbb1b1206e04b1fd570690234cc7ef630"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.20.5.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.20.5.tgz"; + sha1 = "0d69ee6cf4ed6865bc4a125d95e10d5b132d5680"; }; } { - name = "_cliqz_adblocker_electron___adblocker_electron_1.20.0.tgz"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.20.4.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron___adblocker_electron_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.20.0.tgz"; - sha1 = "bacfb9feaf1d3dab339b992e3defa111a4b5ed3c"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.20.4.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.20.4.tgz"; + sha1 = "6d7de52cff013ef3cd0f4a7850ebfc31f6240a46"; }; } { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.20.0.tgz"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.20.5.tgz"; path = fetchurl { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.20.0.tgz"; - sha1 = "95ede657b670f627b39f92d85a97093cecee6ffe"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.20.5.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.20.5.tgz"; + sha1 = "5d55aa72281db6f57657f9bffad5bc24fc93087a"; }; } { - name = "_cliqz_adblocker___adblocker_1.20.0.tgz"; + name = "_cliqz_adblocker___adblocker_1.20.5.tgz"; path = fetchurl { - name = "_cliqz_adblocker___adblocker_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.20.0.tgz"; - sha1 = "514746e9ee72fcd886f1e2e1aaf13b28fc63f232"; + name = "_cliqz_adblocker___adblocker_1.20.5.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.20.5.tgz"; + sha1 = "04edcb9a52897d371a41a2351aa492186019b92a"; }; } { @@ -354,11 +386,11 @@ }; } { - name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; + name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz"; - sha1 = "d736d6963d7003b6514e6324bec9c602ac340318"; + name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; + sha1 = "99cc0a0584d72f1df38b900fb062ba995f395547"; }; } { @@ -473,6 +505,14 @@ sha1 = "504af200af6b98e198bce768bc1730c6936ae01d"; }; } + { + name = "_mdn_browser_compat_data___browser_compat_data_2.0.7.tgz"; + path = fetchurl { + name = "_mdn_browser_compat_data___browser_compat_data_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-2.0.7.tgz"; + sha1 = "72ec37b9c1e00ce0b4e0309d753be18e2da12ee3"; + }; + } { name = "_remusao_guess_url_type___guess_url_type_1.2.1.tgz"; path = fetchurl { @@ -530,11 +570,11 @@ }; } { - name = "_sinonjs_commons___commons_1.8.2.tgz"; + name = "_sinonjs_commons___commons_1.8.3.tgz"; path = fetchurl { - name = "_sinonjs_commons___commons_1.8.2.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz"; - sha1 = "858f5c4b48d80778fde4b9d541f27edc0d56488b"; + name = "_sinonjs_commons___commons_1.8.3.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz"; + sha1 = "3802ddd21a50a949b6721ddd72da36e67e7f1b2d"; }; } { @@ -554,11 +594,11 @@ }; } { - name = "_types_babel__core___babel__core_7.1.12.tgz"; + name = "_types_babel__core___babel__core_7.1.14.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.12.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz"; - sha1 = "4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"; + name = "_types_babel__core___babel__core_7.1.14.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz"; + sha1 = "faaeefc4185ec71c389f4501ee5ec84b170cc402"; }; } { @@ -578,19 +618,19 @@ }; } { - name = "_types_babel__traverse___babel__traverse_7.11.0.tgz"; + name = "_types_babel__traverse___babel__traverse_7.11.1.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz"; - sha1 = "b9a1efa635201ba9bc850323a8793ee2d36c04a0"; + name = "_types_babel__traverse___babel__traverse_7.11.1.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz"; + sha1 = "654f6c4f67568e24c23b367e947098c6206fa639"; }; } { - name = "_types_chrome___chrome_0.0.128.tgz"; + name = "_types_chrome___chrome_0.0.136.tgz"; path = fetchurl { - name = "_types_chrome___chrome_0.0.128.tgz"; - url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.128.tgz"; - sha1 = "5dbd8b2539a367353fbe4386f119b510105f8b6a"; + name = "_types_chrome___chrome_0.0.136.tgz"; + url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.136.tgz"; + sha1 = "7c011b9f997b0156f25a140188a0c5689d3f368f"; }; } { @@ -602,19 +642,19 @@ }; } { - name = "_types_filesystem___filesystem_0.0.29.tgz"; + name = "_types_filesystem___filesystem_0.0.30.tgz"; path = fetchurl { - name = "_types_filesystem___filesystem_0.0.29.tgz"; - url = "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.29.tgz"; - sha1 = "ee3748eb5be140dcf980c3bd35f11aec5f7a3748"; + name = "_types_filesystem___filesystem_0.0.30.tgz"; + url = "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.30.tgz"; + sha1 = "a7373a2edf34d13e298baf7ee1101f738b2efb7e"; }; } { - name = "_types_filewriter___filewriter_0.0.28.tgz"; + name = "_types_filewriter___filewriter_0.0.29.tgz"; path = fetchurl { - name = "_types_filewriter___filewriter_0.0.28.tgz"; - url = "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.28.tgz"; - sha1 = "c054e8af4d9dd75db4e63abc76f885168714d4b3"; + name = "_types_filewriter___filewriter_0.0.29.tgz"; + url = "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.29.tgz"; + sha1 = "a48795ecadf957f6c0d10e0c34af86c098fa5bee"; }; } { @@ -626,11 +666,11 @@ }; } { - name = "_types_fs_extra___fs_extra_9.0.7.tgz"; + name = "_types_fs_extra___fs_extra_9.0.11.tgz"; path = fetchurl { - name = "_types_fs_extra___fs_extra_9.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.7.tgz"; - sha1 = "a9ef2ffdab043def080c5bec94c03402f793577f"; + name = "_types_fs_extra___fs_extra_9.0.11.tgz"; + url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.11.tgz"; + sha1 = "8cc99e103499eab9f347dbc6ca4e99fb8d2c2b87"; }; } { @@ -682,27 +722,27 @@ }; } { - name = "_types_minimatch___minimatch_3.0.3.tgz"; + name = "_types_minimatch___minimatch_3.0.4.tgz"; path = fetchurl { - name = "_types_minimatch___minimatch_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"; + name = "_types_minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "f0ec25dbf2f0e4b18647313ac031134ca5b24b21"; }; } { - name = "_types_node___node_14.14.27.tgz"; + name = "_types_node___node_15.0.2.tgz"; path = fetchurl { - name = "_types_node___node_14.14.27.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.27.tgz"; - sha1 = "c7127f8da0498993e13b1a42faf1303d3110d2f2"; + name = "_types_node___node_15.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz"; + sha1 = "51e9c0920d1b45936ea04341aa3e2e58d339fb67"; }; } { - name = "_types_node___node_12.20.0.tgz"; + name = "_types_node___node_14.14.44.tgz"; path = fetchurl { - name = "_types_node___node_12.20.0.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.20.0.tgz"; - sha1 = "692dfdecd6c97f5380c42dd50f19261f9f604deb"; + name = "_types_node___node_14.14.44.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz"; + sha1 = "df7503e6002847b834371c004b372529f3f85215"; }; } { @@ -722,11 +762,11 @@ }; } { - name = "_types_prettier___prettier_2.2.1.tgz"; + name = "_types_prettier___prettier_2.2.3.tgz"; path = fetchurl { - name = "_types_prettier___prettier_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.1.tgz"; - sha1 = "374e31645d58cb18a07b3ecd8e9dede4deb2cccd"; + name = "_types_prettier___prettier_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz"; + sha1 = "ef65165aea2924c9359205bf748865b8881753c0"; }; } { @@ -801,6 +841,14 @@ sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; }; } + { + name = "acorn___acorn_8.2.4.tgz"; + path = fetchurl { + name = "acorn___acorn_8.2.4.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz"; + sha1 = "caba24b08185c3b56e3168e97d15ed17f4d31fd0"; + }; + } { name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; path = fetchurl { @@ -818,11 +866,11 @@ }; } { - name = "ajv___ajv_7.1.0.tgz"; + name = "ajv___ajv_8.2.0.tgz"; path = fetchurl { - name = "ajv___ajv_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-7.1.0.tgz"; - sha1 = "f982ea7933dc7f1012eae9eec5a86687d805421b"; + name = "ajv___ajv_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz"; + sha1 = "c89d3380a784ce81b2085f48811c4c101df4c602"; }; } { @@ -842,11 +890,11 @@ }; } { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; + name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; path = fetchurl { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; - sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; + name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; + sha1 = "6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"; }; } { @@ -898,11 +946,11 @@ }; } { - name = "anymatch___anymatch_3.1.1.tgz"; + name = "anymatch___anymatch_3.1.2.tgz"; path = fetchurl { - name = "anymatch___anymatch_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz"; - sha1 = "c55ecf02185e2469259399310c173ce31233b142"; + name = "anymatch___anymatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; + sha1 = "c0557c096af32f106198f4f4e2a383537e378716"; }; } { @@ -914,11 +962,11 @@ }; } { - name = "app_builder_lib___app_builder_lib_22.10.4.tgz"; + name = "app_builder_lib___app_builder_lib_22.10.5.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_22.10.4.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.4.tgz"; - sha1 = "3fc70821b76beb9c8279d9de22960ef2174da153"; + name = "app_builder_lib___app_builder_lib_22.10.5.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.5.tgz"; + sha1 = "24a88581c891e5b187a0d569aa44e7c4a0dc8de2"; }; } { @@ -930,11 +978,11 @@ }; } { - name = "archiver___archiver_5.2.0.tgz"; + name = "archiver___archiver_5.3.0.tgz"; path = fetchurl { - name = "archiver___archiver_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/archiver/-/archiver-5.2.0.tgz"; - sha1 = "25aa1b3d9febf7aec5b0f296e77e69960c26db94"; + name = "archiver___archiver_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz"; + sha1 = "dd3e097624481741df626267564f7dd8640a45ba"; }; } { @@ -945,6 +993,14 @@ sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; }; } + { + name = "argparse___argparse_2.0.1.tgz"; + path = fetchurl { + name = "argparse___argparse_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; + sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"; + }; + } { name = "arr_diff___arr_diff_4.0.0.tgz"; path = fetchurl { @@ -1009,6 +1065,14 @@ sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; } + { + name = "ast_metadata_inferer___ast_metadata_inferer_0.4.0.tgz"; + path = fetchurl { + name = "ast_metadata_inferer___ast_metadata_inferer_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/ast-metadata-inferer/-/ast-metadata-inferer-0.4.0.tgz"; + sha1 = "6be85ceeffcf267bd79db8e1ae731da44880b45f"; + }; + } { name = "astral_regex___astral_regex_2.0.0.tgz"; path = fetchurl { @@ -1122,11 +1186,11 @@ }; } { - name = "balanced_match___balanced_match_1.0.0.tgz"; + name = "balanced_match___balanced_match_1.0.2.tgz"; path = fetchurl { - name = "balanced_match___balanced_match_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; }; } { @@ -1153,6 +1217,14 @@ sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; } + { + name = "binaryextensions___binaryextensions_4.15.0.tgz"; + path = fetchurl { + name = "binaryextensions___binaryextensions_4.15.0.tgz"; + url = "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-4.15.0.tgz"; + sha1 = "c63a502e0078ff1b0e9b00a9f74d3c2b0f8bd32e"; + }; + } { name = "bl___bl_4.1.0.tgz"; path = fetchurl { @@ -1178,19 +1250,19 @@ }; } { - name = "boolean___boolean_3.0.2.tgz"; + name = "boolean___boolean_3.0.3.tgz"; path = fetchurl { - name = "boolean___boolean_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz"; - sha1 = "df1baa18b6a2b0e70840475e1d93ec8fe75b2570"; + name = "boolean___boolean_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/boolean/-/boolean-3.0.3.tgz"; + sha1 = "0fee0c9813b66bef25a8a6a904bb46736d05f024"; }; } { - name = "boxen___boxen_5.0.0.tgz"; + name = "boxen___boxen_5.0.1.tgz"; path = fetchurl { - name = "boxen___boxen_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/boxen/-/boxen-5.0.0.tgz"; - sha1 = "64fe9b16066af815f51057adcc800c3730120854"; + name = "boxen___boxen_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/boxen/-/boxen-5.0.1.tgz"; + sha1 = "657528bdd3f59a772b8279b831f27ec2c744664b"; }; } { @@ -1225,6 +1297,14 @@ sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626"; }; } + { + name = "browserslist___browserslist_4.16.6.tgz"; + path = fetchurl { + name = "browserslist___browserslist_4.16.6.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz"; + sha1 = "d7901277a5a88e554ed305b183ec9b0c08f66fa2"; + }; + } { name = "bser___bser_2.1.1.tgz"; path = fetchurl { @@ -1274,11 +1354,11 @@ }; } { - name = "builder_util___builder_util_22.10.4.tgz"; + name = "builder_util___builder_util_22.10.5.tgz"; path = fetchurl { - name = "builder_util___builder_util_22.10.4.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.4.tgz"; - sha1 = "54e8be83dd0dec28073d866ff087cee8e7ce6cf6"; + name = "builder_util___builder_util_22.10.5.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.5.tgz"; + sha1 = "8d0b04a3be6acc74938679aa90dcb3181b1ae86b"; }; } { @@ -1321,6 +1401,14 @@ sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809"; }; } + { + name = "caniuse_lite___caniuse_lite_1.0.30001223.tgz"; + path = fetchurl { + name = "caniuse_lite___caniuse_lite_1.0.30001223.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz"; + sha1 = "39b49ff0bfb3ee3587000d2f66c47addc6e14443"; + }; + } { name = "capture_exit___capture_exit_2.0.0.tgz"; path = fetchurl { @@ -1346,11 +1434,11 @@ }; } { - name = "chalk___chalk_4.1.0.tgz"; + name = "chalk___chalk_4.1.1.tgz"; path = fetchurl { - name = "chalk___chalk_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; - sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; + name = "chalk___chalk_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; + sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; }; } { @@ -1489,6 +1577,14 @@ sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; }; } + { + name = "colorette___colorette_1.2.2.tgz"; + path = fetchurl { + name = "colorette___colorette_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz"; + sha1 = "cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"; + }; + } { name = "colors___colors_1.0.3.tgz"; path = fetchurl { @@ -1530,11 +1626,11 @@ }; } { - name = "compress_commons___compress_commons_4.0.2.tgz"; + name = "compress_commons___compress_commons_4.1.0.tgz"; path = fetchurl { - name = "compress_commons___compress_commons_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.2.tgz"; - sha1 = "d6896be386e52f37610cef9e6fa5defc58c31bd7"; + name = "compress_commons___compress_commons_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.0.tgz"; + sha1 = "25ec7a4528852ccd1d441a7d4353cd0ece11371b"; }; } { @@ -1586,11 +1682,11 @@ }; } { - name = "core_js___core_js_3.8.3.tgz"; + name = "core_js___core_js_3.11.3.tgz"; path = fetchurl { - name = "core_js___core_js_3.8.3.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz"; - sha1 = "c21906e1f14f3689f93abcc6e26883550dd92dd0"; + name = "core_js___core_js_3.11.3.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.11.3.tgz"; + sha1 = "2835b1f4d10f6d0400bf820cfe6fe64ad067dd3f"; }; } { @@ -1673,14 +1769,6 @@ sha1 = "ff665a0ddbdc31864b09647f34163443d90b0852"; }; } - { - name = "darkreader___darkreader_4.9.27.tgz"; - path = fetchurl { - name = "darkreader___darkreader_4.9.27.tgz"; - url = "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.27.tgz"; - sha1 = "69b641d6a3c22b07fb0424406dfd9a3661b37197"; - }; - } { name = "dashdash___dashdash_1.14.1.tgz"; path = fetchurl { @@ -1834,11 +1922,11 @@ }; } { - name = "detect_node___detect_node_2.0.4.tgz"; + name = "detect_node___detect_node_2.0.5.tgz"; path = fetchurl { - name = "detect_node___detect_node_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz"; - sha1 = "014ee8f8f669c5c58023da64b8179c083a28c46c"; + name = "detect_node___detect_node_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.5.tgz"; + sha1 = "9d270aa7eaa5af0b72c4c9d9b814e7f4ce738b79"; }; } { @@ -1858,11 +1946,11 @@ }; } { - name = "dmg_builder___dmg_builder_22.10.4.tgz"; + name = "dmg_builder___dmg_builder_22.10.5.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_22.10.4.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.4.tgz"; - sha1 = "8dab30754346791eb728091359558fd4a8dbb45f"; + name = "dmg_builder___dmg_builder_22.10.5.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.5.tgz"; + sha1 = "65a33c106ead5a350c7de8997c546559bd6e0e7c"; }; } { @@ -1906,11 +1994,11 @@ }; } { - name = "dotenv___dotenv_8.2.0.tgz"; + name = "dotenv___dotenv_8.6.0.tgz"; path = fetchurl { - name = "dotenv___dotenv_8.2.0.tgz"; - url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz"; - sha1 = "97e619259ada750eea3e4ea3e26bceea5424b16a"; + name = "dotenv___dotenv_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz"; + sha1 = "061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"; }; } { @@ -1929,6 +2017,14 @@ sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; } + { + name = "editions___editions_6.1.0.tgz"; + path = fetchurl { + name = "editions___editions_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/editions/-/editions-6.1.0.tgz"; + sha1 = "ba6c6cf9f4bb571d9e53ea34e771a602e5a66549"; + }; + } { name = "ejs___ejs_3.1.6.tgz"; path = fetchurl { @@ -1938,27 +2034,35 @@ }; } { - name = "electron_builder___electron_builder_22.10.4.tgz"; + name = "electron_builder___electron_builder_22.10.5.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_22.10.4.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.4.tgz"; - sha1 = "e1f400cf41ebb632fbf79aa86c5e0ab1ea1ed7e5"; + name = "electron_builder___electron_builder_22.10.5.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.5.tgz"; + sha1 = "03b156b93e6012609027c3aaa69201a3ad21e454"; }; } { - name = "electron_publish___electron_publish_22.10.4.tgz"; + name = "electron_publish___electron_publish_22.10.5.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_22.10.4.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.4.tgz"; - sha1 = "944b00aa6a7746c31ce900ffd8106d243326dca8"; + name = "electron_publish___electron_publish_22.10.5.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.5.tgz"; + sha1 = "9cbe46266b6c79d8c6e99840755682e2262d3543"; }; } { - name = "electron___electron_11.2.3.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.727.tgz"; path = fetchurl { - name = "electron___electron_11.2.3.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz"; - sha1 = "8ad1d9858436cfca0e2e5ea7fea326794ae58ebb"; + name = "electron_to_chromium___electron_to_chromium_1.3.727.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz"; + sha1 = "857e310ca00f0b75da4e1db6ff0e073cc4a91ddf"; + }; + } + { + name = "electron___electron_12.0.5.tgz"; + path = fetchurl { + name = "electron___electron_12.0.5.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-12.0.5.tgz"; + sha1 = "005cf4375d2ee4563f5e75dc4da4ef871846a8be"; }; } { @@ -2010,11 +2114,19 @@ }; } { - name = "env_paths___env_paths_2.2.0.tgz"; + name = "env_paths___env_paths_2.2.1.tgz"; path = fetchurl { - name = "env_paths___env_paths_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz"; - sha1 = "cdca557dc009152917d6166e2febe1f039685e43"; + name = "env_paths___env_paths_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz"; + sha1 = "420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"; + }; + } + { + name = "errlop___errlop_4.1.0.tgz"; + path = fetchurl { + name = "errlop___errlop_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/errlop/-/errlop-4.1.0.tgz"; + sha1 = "8e7b8f4f1bf0a6feafce4d14f0c0cf4bf5ef036b"; }; } { @@ -2074,11 +2186,19 @@ }; } { - name = "escodegen___escodegen_1.14.3.tgz"; + name = "escodegen___escodegen_2.0.0.tgz"; path = fetchurl { - name = "escodegen___escodegen_1.14.3.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz"; - sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503"; + name = "escodegen___escodegen_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz"; + sha1 = "5e32b12833e8aa8fa35e1bf0befa89380484c7dd"; + }; + } + { + name = "eslint_plugin_compat___eslint_plugin_compat_3.9.0.tgz"; + path = fetchurl { + name = "eslint_plugin_compat___eslint_plugin_compat_3.9.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-compat/-/eslint-plugin-compat-3.9.0.tgz"; + sha1 = "a7a224e09b102b58e7f7dff52c936428ff3e0186"; }; } { @@ -2106,19 +2226,19 @@ }; } { - name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; - sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303"; }; } { - name = "eslint___eslint_7.20.0.tgz"; + name = "eslint___eslint_7.25.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.20.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.20.0.tgz"; - sha1 = "db07c4ca4eda2e2316e7aa57ac7fc91ec550bdc7"; + name = "eslint___eslint_7.25.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz"; + sha1 = "1309e4404d94e676e3e831b3a3ad2b050031eb67"; }; } { @@ -2178,11 +2298,11 @@ }; } { - name = "exec_sh___exec_sh_0.3.4.tgz"; + name = "exec_sh___exec_sh_0.3.6.tgz"; path = fetchurl { - name = "exec_sh___exec_sh_0.3.4.tgz"; - url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz"; - sha1 = "3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"; + name = "exec_sh___exec_sh_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz"; + sha1 = "ff264f9e325519a60cb5e273692943483cca63bc"; }; } { @@ -2313,6 +2433,14 @@ sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; } + { + name = "fast_xml_parser___fast_xml_parser_3.19.0.tgz"; + path = fetchurl { + name = "fast_xml_parser___fast_xml_parser_3.19.0.tgz"; + url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz"; + sha1 = "cb637ec3f3999f51406dd8ff0e6fc4d83e520d01"; + }; + } { name = "fb_watchman___fb_watchman_2.0.1.tgz"; path = fetchurl { @@ -2330,11 +2458,11 @@ }; } { - name = "file_entry_cache___file_entry_cache_6.0.0.tgz"; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; path = fetchurl { - name = "file_entry_cache___file_entry_cache_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz"; - sha1 = "7921a89c391c6d93efec2169ac6bf300c527ea0a"; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027"; }; } { @@ -2530,11 +2658,11 @@ }; } { - name = "glob_parent___glob_parent_5.1.1.tgz"; + name = "glob_parent___glob_parent_5.1.2.tgz"; path = fetchurl { - name = "glob_parent___glob_parent_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; - sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; + name = "glob_parent___glob_parent_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; + sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; }; } { @@ -2546,11 +2674,11 @@ }; } { - name = "global_agent___global_agent_2.1.12.tgz"; + name = "global_agent___global_agent_2.2.0.tgz"; path = fetchurl { - name = "global_agent___global_agent_2.1.12.tgz"; - url = "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz"; - sha1 = "e4ae3812b731a9e81cbf825f9377ef450a8e4195"; + name = "global_agent___global_agent_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz"; + sha1 = "566331b0646e6bf79429a16877685c4a1fbf76dc"; }; } { @@ -2586,11 +2714,19 @@ }; } { - name = "globalthis___globalthis_1.0.1.tgz"; + name = "globals___globals_13.8.0.tgz"; path = fetchurl { - name = "globalthis___globalthis_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz"; - sha1 = "40116f5d9c071f9e8fb0037654df1ab3a83b7ef9"; + name = "globals___globals_13.8.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz"; + sha1 = "3e20f504810ce87a8d72e55aecf8435b50f4c1b3"; + }; + } + { + name = "globalthis___globalthis_1.0.2.tgz"; + path = fetchurl { + name = "globalthis___globalthis_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz"; + sha1 = "2a235d34f4d8036219f7e34929b5de9e18166b8b"; }; } { @@ -2706,11 +2842,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; - sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha1 = "dffc0bf9a21c02209090f2aa69429e1414daf3f9"; }; } { @@ -2722,11 +2858,11 @@ }; } { - name = "html_comment_regex___html_comment_regex_1.1.2.tgz"; + name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; path = fetchurl { - name = "html_comment_regex___html_comment_regex_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz"; - sha1 = "97d4688aeb5c81886a364faa0cad1dda14d433a7"; + name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; + sha1 = "5e425507eede4fea846b7262f0838456c4209961"; }; } { @@ -2873,14 +3009,6 @@ sha1 = "a29da425b48806f34767a4efce397269af28432c"; }; } - { - name = "ip_regex___ip_regex_2.1.0.tgz"; - path = fetchurl { - name = "ip_regex___ip_regex_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz"; - sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; - }; - } { name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; path = fetchurl { @@ -2922,11 +3050,11 @@ }; } { - name = "is_core_module___is_core_module_2.2.0.tgz"; + name = "is_core_module___is_core_module_2.3.0.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz"; - sha1 = "97037ef3d52224d85163f5597b2b63d9afed981a"; + name = "is_core_module___is_core_module_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz"; + sha1 = "d341652e3408bca69c4671b79a0954a3d349f887"; }; } { @@ -2962,11 +3090,11 @@ }; } { - name = "is_docker___is_docker_2.1.1.tgz"; + name = "is_docker___is_docker_2.2.1.tgz"; path = fetchurl { - name = "is_docker___is_docker_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz"; - sha1 = "4125a88e44e450d384e09047ede71adc2d144156"; + name = "is_docker___is_docker_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz"; + sha1 = "33eeabe23cfe86f14bde4408a02c0cfb853acdaa"; }; } { @@ -3066,11 +3194,11 @@ }; } { - name = "is_path_inside___is_path_inside_3.0.2.tgz"; + name = "is_path_inside___is_path_inside_3.0.3.tgz"; path = fetchurl { - name = "is_path_inside___is_path_inside_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz"; - sha1 = "f5220fc82a3e233757291dddc9c5877f2a1f3017"; + name = "is_path_inside___is_path_inside_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; + sha1 = "d231362e53a07ff2b0e0ea7fed049161ffd16283"; }; } { @@ -3082,11 +3210,11 @@ }; } { - name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; path = fetchurl { - name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz"; - sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397"; + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz"; + sha1 = "171ed6f19e3ac554394edf78caa05784a45bebb5"; }; } { @@ -3106,11 +3234,11 @@ }; } { - name = "is_svg___is_svg_4.2.1.tgz"; + name = "is_svg___is_svg_4.3.1.tgz"; path = fetchurl { - name = "is_svg___is_svg_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/is-svg/-/is-svg-4.2.1.tgz"; - sha1 = "095b496e345fec9211c2a7d5d021003e040d6f81"; + name = "is_svg___is_svg_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/is-svg/-/is-svg-4.3.1.tgz"; + sha1 = "8c63ec8c67c8c7f0a8de0a71c8c7d58eccf4406b"; }; } { @@ -3153,14 +3281,6 @@ sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; } - { - name = "isbinaryfile___isbinaryfile_4.0.6.tgz"; - path = fetchurl { - name = "isbinaryfile___isbinaryfile_4.0.6.tgz"; - url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz"; - sha1 = "edcb62b224e2b4710830b67498c8e4e5a4d2610b"; - }; - } { name = "isexe___isexe_2.0.0.tgz"; path = fetchurl { @@ -3233,6 +3353,14 @@ sha1 = "d593210e5000683750cb09fc0644e4b6e27fd53b"; }; } + { + name = "istextorbinary___istextorbinary_5.12.0.tgz"; + path = fetchurl { + name = "istextorbinary___istextorbinary_5.12.0.tgz"; + url = "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-5.12.0.tgz"; + sha1 = "2f84777838668fdf524c305a2363d6057aaeec84"; + }; + } { name = "jake___jake_10.8.2.tgz"; path = fetchurl { @@ -3481,6 +3609,14 @@ sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; }; } + { + name = "js_yaml___js_yaml_4.1.0.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; + sha1 = "c1fb65f8f5017901cdd2c951864ba18458a10602"; + }; + } { name = "jsbn___jsbn_0.1.1.tgz"; path = fetchurl { @@ -3490,11 +3626,11 @@ }; } { - name = "jsdom___jsdom_16.4.0.tgz"; + name = "jsdom___jsdom_16.5.3.tgz"; path = fetchurl { - name = "jsdom___jsdom_16.4.0.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz"; - sha1 = "36005bde2d136f73eee1a830c6d45e55408edddb"; + name = "jsdom___jsdom_16.5.3.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.3.tgz"; + sha1 = "13a755b3950eb938b4482c407238ddf16f0d2136"; }; } { @@ -3705,6 +3841,14 @@ sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; }; } + { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + path = fetchurl { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + } { name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; path = fetchurl { @@ -3738,11 +3882,19 @@ }; } { - name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; + name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; path = fetchurl { - name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; - sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; + name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; + sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; + }; + } + { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + path = fetchurl { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; }; } { @@ -3754,11 +3906,11 @@ }; } { - name = "lodash___lodash_4.17.20.tgz"; + name = "lodash___lodash_4.17.21.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.20.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; - sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; }; } { @@ -3842,35 +3994,35 @@ }; } { - name = "micromatch___micromatch_4.0.2.tgz"; + name = "micromatch___micromatch_4.0.4.tgz"; path = fetchurl { - name = "micromatch___micromatch_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz"; - sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"; + name = "micromatch___micromatch_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; + sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9"; }; } { - name = "mime_db___mime_db_1.45.0.tgz"; + name = "mime_db___mime_db_1.47.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.45.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz"; - sha1 = "cceeda21ccd7c3a745eba2decd55d4b73e7879ea"; + name = "mime_db___mime_db_1.47.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz"; + sha1 = "8cb313e59965d3c05cfbf898915a267af46a335c"; }; } { - name = "mime_types___mime_types_2.1.28.tgz"; + name = "mime_types___mime_types_2.1.30.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.28.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz"; - sha1 = "1160c4757eab2c5363888e005273ecf79d2a0ecd"; + name = "mime_types___mime_types_2.1.30.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz"; + sha1 = "6e7be8b4c479825f85ed6326695db73f9305d62d"; }; } { - name = "mime___mime_2.5.0.tgz"; + name = "mime___mime_2.5.2.tgz"; path = fetchurl { - name = "mime___mime_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz"; - sha1 = "2b4af934401779806ee98026bb42e8c1ae1876b1"; + name = "mime___mime_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz"; + sha1 = "6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"; }; } { @@ -3986,11 +4138,19 @@ }; } { - name = "node_notifier___node_notifier_8.0.1.tgz"; + name = "node_notifier___node_notifier_8.0.2.tgz"; path = fetchurl { - name = "node_notifier___node_notifier_8.0.1.tgz"; - url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz"; - sha1 = "f86e89bbc925f2b068784b31f382afdc6ca56be1"; + name = "node_notifier___node_notifier_8.0.2.tgz"; + url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz"; + sha1 = "f3167a38ef0d2c8a866a83e318c1ba0efeb702c5"; + }; + } + { + name = "node_releases___node_releases_1.1.71.tgz"; + path = fetchurl { + name = "node_releases___node_releases_1.1.71.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz"; + sha1 = "cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"; }; } { @@ -4002,11 +4162,11 @@ }; } { - name = "normalize_package_data___normalize_package_data_3.0.0.tgz"; + name = "normalize_package_data___normalize_package_data_3.0.2.tgz"; path = fetchurl { - name = "normalize_package_data___normalize_package_data_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.0.tgz"; - sha1 = "1f8a7c423b3d2e85eb36985eaf81de381d01301a"; + name = "normalize_package_data___normalize_package_data_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz"; + sha1 = "cae5c410ae2434f9a6c1baa65d5bc3b9366c8699"; }; } { @@ -4210,11 +4370,11 @@ }; } { - name = "parse5___parse5_5.1.1.tgz"; + name = "parse5___parse5_6.0.1.tgz"; path = fetchurl { - name = "parse5___parse5_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz"; - sha1 = "f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"; + name = "parse5___parse5_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz"; + sha1 = "e1a1c085c569b3dc08321184f19a39cc27f7c30b"; }; } { @@ -4282,11 +4442,11 @@ }; } { - name = "picomatch___picomatch_2.2.2.tgz"; + name = "picomatch___picomatch_2.2.3.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; - sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; + name = "picomatch___picomatch_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz"; + sha1 = "465547f359ccc206d3c48e46a1bcb89bf7ee619d"; }; } { @@ -4314,11 +4474,11 @@ }; } { - name = "plist___plist_3.0.1.tgz"; + name = "plist___plist_3.0.2.tgz"; path = fetchurl { - name = "plist___plist_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz"; - sha1 = "a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c"; + name = "plist___plist_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/plist/-/plist-3.0.2.tgz"; + sha1 = "74bbf011124b90421c22d15779cee60060ba95bc"; }; } { @@ -4386,11 +4546,11 @@ }; } { - name = "prompts___prompts_2.4.0.tgz"; + name = "prompts___prompts_2.4.1.tgz"; path = fetchurl { - name = "prompts___prompts_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz"; - sha1 = "4aa5de0723a231d1ee9121c40fdf663df73f61d7"; + name = "prompts___prompts_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz"; + sha1 = "befd3b1195ba052f9fd2fde8a486c4e82ee77f61"; }; } { @@ -4450,11 +4610,11 @@ }; } { - name = "react_is___react_is_17.0.1.tgz"; + name = "react_is___react_is_17.0.2.tgz"; path = fetchurl { - name = "react_is___react_is_17.0.1.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz"; - sha1 = "5b3531bd76a645a4c9fb6e693ed36419e3301339"; + name = "react_is___react_is_17.0.2.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz"; + sha1 = "e691d4a8e9c789365655539ab372762b0efb54f0"; }; } { @@ -4546,11 +4706,11 @@ }; } { - name = "repeat_element___repeat_element_1.1.3.tgz"; + name = "repeat_element___repeat_element_1.1.4.tgz"; path = fetchurl { - name = "repeat_element___repeat_element_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz"; - sha1 = "782e0d825c0c5a3bb39731f84efee6b742e6b1ce"; + name = "repeat_element___repeat_element_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz"; + sha1 = "be681520847ab58c7568ac75fbfad28ed42d39e9"; }; } { @@ -4777,6 +4937,14 @@ sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; }; } + { + name = "semver___semver_7.3.2.tgz"; + path = fetchurl { + name = "semver___semver_7.3.2.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz"; + sha1 = "604962b052b81ed0786aae84389ffba70ffd3938"; + }; + } { name = "semver___semver_6.3.0.tgz"; path = fetchurl { @@ -4786,11 +4954,11 @@ }; } { - name = "semver___semver_7.3.4.tgz"; + name = "semver___semver_7.3.5.tgz"; path = fetchurl { - name = "semver___semver_7.3.4.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz"; - sha1 = "27aaa7d2e4ca76452f98d3add093a72c943edc97"; + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; }; } { @@ -5074,11 +5242,11 @@ }; } { - name = "string_length___string_length_4.0.1.tgz"; + name = "string_length___string_length_4.0.2.tgz"; path = fetchurl { - name = "string_length___string_length_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz"; - sha1 = "4a973bf31ef77c4edbceadd6af2611996985f8a1"; + name = "string_length___string_length_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz"; + sha1 = "a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"; }; } { @@ -5098,11 +5266,11 @@ }; } { - name = "string_width___string_width_4.2.0.tgz"; + name = "string_width___string_width_4.2.2.tgz"; path = fetchurl { - name = "string_width___string_width_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; - sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; + name = "string_width___string_width_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; + sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; }; } { @@ -5210,11 +5378,11 @@ }; } { - name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz"; + name = "supports_hyperlinks___supports_hyperlinks_2.2.0.tgz"; path = fetchurl { - name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz"; - sha1 = "f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"; + name = "supports_hyperlinks___supports_hyperlinks_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz"; + sha1 = "4f77b42488765891774b70c79babd87f9bd594bb"; }; } { @@ -5226,11 +5394,11 @@ }; } { - name = "table___table_6.0.7.tgz"; + name = "table___table_6.6.0.tgz"; path = fetchurl { - name = "table___table_6.0.7.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz"; - sha1 = "e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"; + name = "table___table_6.6.0.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz"; + sha1 = "905654b79df98d9e9a973de1dd58682532c40e8e"; }; } { @@ -5273,6 +5441,14 @@ sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; }; } + { + name = "textextensions___textextensions_5.12.0.tgz"; + path = fetchurl { + name = "textextensions___textextensions_5.12.0.tgz"; + url = "https://registry.yarnpkg.com/textextensions/-/textextensions-5.12.0.tgz"; + sha1 = "b908120b5c1bd4bb9eba41423d75b176011ab68a"; + }; + } { name = "throat___throat_5.0.0.tgz"; path = fetchurl { @@ -5282,19 +5458,19 @@ }; } { - name = "tldts_core___tldts_core_5.7.6.tgz"; + name = "tldts_core___tldts_core_5.7.33.tgz"; path = fetchurl { - name = "tldts_core___tldts_core_5.7.6.tgz"; - url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.6.tgz"; - sha1 = "af99b4ab79761dfa6c44d1d61a3f76bb5c3def8b"; + name = "tldts_core___tldts_core_5.7.33.tgz"; + url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.33.tgz"; + sha1 = "b2364f30d16e34b48961911408e9dbe3ae94ebdb"; }; } { - name = "tldts_experimental___tldts_experimental_5.7.6.tgz"; + name = "tldts_experimental___tldts_experimental_5.7.33.tgz"; path = fetchurl { - name = "tldts_experimental___tldts_experimental_5.7.6.tgz"; - url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.6.tgz"; - sha1 = "10c255872af89ab68659c3a345c7a65015920024"; + name = "tldts_experimental___tldts_experimental_5.7.33.tgz"; + url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.33.tgz"; + sha1 = "4959da5cd345a6167c69815fb6e34471387178b9"; }; } { @@ -5362,11 +5538,11 @@ }; } { - name = "tough_cookie___tough_cookie_3.0.1.tgz"; + name = "tough_cookie___tough_cookie_4.0.0.tgz"; path = fetchurl { - name = "tough_cookie___tough_cookie_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz"; - sha1 = "9df4f57e739c26930a018184887f4adb7dca73b2"; + name = "tough_cookie___tough_cookie_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz"; + sha1 = "d822234eeca882f991f0f908824ad2622ddbece4"; }; } { @@ -5433,14 +5609,6 @@ sha1 = "7646fb5f18871cfbb7749e69bd39a6388eb7450c"; }; } - { - name = "type_fest___type_fest_0.11.0.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.11.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; - sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; - }; - } { name = "type_fest___type_fest_0.13.1.tgz"; path = fetchurl { @@ -5457,6 +5625,14 @@ sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; }; } + { + name = "type_fest___type_fest_0.21.3.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.21.3.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz"; + sha1 = "d260a24b0198436e133fa26a524a6d65fa3b2e37"; + }; + } { name = "type_fest___type_fest_0.6.0.tgz"; path = fetchurl { @@ -5602,19 +5778,19 @@ }; } { - name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; - sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"; + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha1 = "2de19618c66dc247dcfb6f99338035d8245a2cee"; }; } { - name = "v8_to_istanbul___v8_to_istanbul_7.1.0.tgz"; + name = "v8_to_istanbul___v8_to_istanbul_7.1.2.tgz"; path = fetchurl { - name = "v8_to_istanbul___v8_to_istanbul_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz"; - sha1 = "5b95cef45c0f83217ec79f8fc7ee1c8b486aee07"; + name = "v8_to_istanbul___v8_to_istanbul_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz"; + sha1 = "30898d1a7fa0c84d225a2c1434fb958f290883c1"; }; } { @@ -5633,6 +5809,22 @@ sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; } + { + name = "version_compare___version_compare_1.1.0.tgz"; + path = fetchurl { + name = "version_compare___version_compare_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/version-compare/-/version-compare-1.1.0.tgz"; + sha1 = "7b3e67e7e6cec5c72d9c9e586f8854e419ade17c"; + }; + } + { + name = "version_range___version_range_1.1.0.tgz"; + path = fetchurl { + name = "version_range___version_range_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/version-range/-/version-range-1.1.0.tgz"; + sha1 = "1c233064202ee742afc9d56e21da3b2e15260acf"; + }; + } { name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; path = fetchurl { @@ -5690,11 +5882,11 @@ }; } { - name = "whatwg_url___whatwg_url_8.4.0.tgz"; + name = "whatwg_url___whatwg_url_8.5.0.tgz"; path = fetchurl { - name = "whatwg_url___whatwg_url_8.4.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz"; - sha1 = "50fb9615b05469591d2b2bd6dfaed2942ed72837"; + name = "whatwg_url___whatwg_url_8.5.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz"; + sha1 = "7752b8464fc0903fec89aa9846fc9efe07351fd3"; }; } { @@ -5770,11 +5962,11 @@ }; } { - name = "ws___ws_7.4.3.tgz"; + name = "ws___ws_7.4.5.tgz"; path = fetchurl { - name = "ws___ws_7.4.3.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz"; - sha1 = "1f9643de34a543b8edb124bdcbc457ae55a6e5cd"; + name = "ws___ws_7.4.5.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz"; + sha1 = "a484dd851e9beb6fdb420027e3885e8ce48986c1"; }; } { @@ -5818,27 +6010,27 @@ }; } { - name = "xmldom___xmldom_0.1.31.tgz"; + name = "xmldom___xmldom_0.5.0.tgz"; path = fetchurl { - name = "xmldom___xmldom_0.1.31.tgz"; - url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz"; - sha1 = "b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"; + name = "xmldom___xmldom_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz"; + sha1 = "193cb96b84aa3486127ea6272c4596354cb4962e"; }; } { - name = "y18n___y18n_4.0.1.tgz"; + name = "y18n___y18n_4.0.3.tgz"; path = fetchurl { - name = "y18n___y18n_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz"; - sha1 = "8db2b83c31c5d75099bb890b23f3094891e247d4"; + name = "y18n___y18n_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz"; + sha1 = "b5f259c82cd6e336921efd7bfd8bf560de9eeedf"; }; } { - name = "y18n___y18n_5.0.5.tgz"; + name = "y18n___y18n_5.0.8.tgz"; path = fetchurl { - name = "y18n___y18n_5.0.5.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz"; - sha1 = "8769ec08d03b1ea2df2500acef561743bbb9ab18"; + name = "y18n___y18n_5.0.8.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; + sha1 = "7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"; }; } { @@ -5858,11 +6050,11 @@ }; } { - name = "yargs_parser___yargs_parser_20.2.4.tgz"; + name = "yargs_parser___yargs_parser_20.2.7.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_20.2.4.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz"; - sha1 = "b42890f14566796f85ae8e3a25290d205f154a54"; + name = "yargs_parser___yargs_parser_20.2.7.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz"; + sha1 = "61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"; }; } { @@ -5890,11 +6082,11 @@ }; } { - name = "zip_stream___zip_stream_4.0.4.tgz"; + name = "zip_stream___zip_stream_4.1.0.tgz"; path = fetchurl { - name = "zip_stream___zip_stream_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz"; - sha1 = "3a8f100b73afaa7d1ae9338d910b321dec77ff3a"; + name = "zip_stream___zip_stream_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz"; + sha1 = "51dd326571544e36aa3f756430b313576dc8fc79"; }; } ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index 2ff0d2d5df..dabe0fd373 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr -, alsaLib, dbus, cups, libexif, ffmpeg_3, systemd +, alsaLib, dbus, cups, libexif, ffmpeg, systemd , freetype, fontconfig, libXft, libXrender, libxcb, expat , libuuid , libxml2 @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg_3 systemd + atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr libxml2 pango cairo gnome2.GConf libdrm mesa diff --git a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix index 8937404e91..52e1bc5060 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix @@ -17,10 +17,11 @@ , desktop-file-utils , appstream-glib , libpeas +, libgdata , dbus , vala , wrapGAppsHook -, xvfb_run +, xvfb-run , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 @@ -65,11 +66,12 @@ stdenv.mkDerivation rec { callaudiod gtk3 libpeas + libgdata # required by some dependency transitively ]; checkInputs = [ dbus - xvfb_run + xvfb-run ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix index 9cf0e715e0..517bd1e01c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , glib , gtk3 @@ -22,14 +23,14 @@ }: stdenv.mkDerivation rec { - version = "1.3.2"; + version = "1.4.1"; pname = "cawbird"; src = fetchFromGitHub { owner = "IBBoard"; repo = "cawbird"; rev = "v${version}"; - sha256 = "1baw3h5wq2ib4bnphazq7n9c9wc94g0n6v4y5kg71n1dir0c3jkh"; + sha256 = "0lmrgcj1ky1vhzynl36k6ba3ws089x4qdrnkjk3lbr334kicx9na"; }; nativeBuildInputs = [ @@ -69,11 +70,18 @@ stdenv.mkDerivation rec { patchShebangs data/meson_post_install.py ''; + # supply Twitter API keys + # use default keys supplied by upstream, see https://github.com/IBBoard/cawbird/blob/master/README.md#preparation + mesonFlags = [ + "-Dconsumer_key_base64=VmY5dG9yRFcyWk93MzJEZmhVdEk5Y3NMOA==" + "-Dconsumer_secret_base64=MThCRXIxbWRESDQ2Y0podzVtVU13SGUyVGlCRXhPb3BFRHhGYlB6ZkpybG5GdXZaSjI=" + ]; + meta = with lib; { description = "Native GTK Twitter client for the Linux desktop"; longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird."; homepage = "https://ibboard.co.uk/cawbird/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with lib.maintainers; [ jonafato schmittlauch ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index 8310d05849..f78d4ecc9c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.3.3"; + version = "2021.5.7"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-St2WBdy76OVFlYoY1RGwQj1WsUpPtsL7yX1MFwztKgs="; + sha256 = "sha256-ekQ5cfQo6/IUIhYaVgyAqbHAaHABL55zhIpqLy6tQ8g="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index 959b0a9877..f68018702f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "3.0.2"; + version = "3.0.4"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-+LuBz58hTzi/hGwqX/0VMNYn/+SRYgnNefn3B3i7eEs="; + sha256 = "sha256-zswX6nt7AxxTMznbY4Rk0A8j2PpSNht+gbTMbDr2yuY="; }; vendorSha256 = "sha256-YjVAoMyGKMHLGEPeOOkCKCzeWFiUsXfJIKcw5GYoljg="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index 4a338ac9a4..d7cf0a933d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.13.2"; + version = "0.13.4"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; @@ -19,10 +19,10 @@ buildGoModule rec { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "sha256-yWcoHUHEiRp4YxTDxi+inJkpb8dnTVTwSO3MgFyhvps="; + sha256 = "sha256-edyqxVl8oIwKp/eqFIbu+qn9zhYEnKJKwUbYZ7uxx0I="; }; - vendorSha256 = "sha256-hSnTM89s3R7UDn1gLlb1gu6rhTPqVKJpWKCz1SDyfmg="; + vendorSha256 = "sha256-keIzuqaLppu6+XK3MFiU0en+SVxWVLpfkKEKOAVOz7k="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix index 659e8ee417..ef93b5cbdb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, which, maven, cmake, jre, jdk8, bash -, coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl, openssl_1_0_2 +, coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl, openssl_1_0_2, fetchpatch, libtirpc }: let @@ -38,8 +38,19 @@ let }; nativeBuildInputs = [ maven cmake pkg-config ]; - buildInputs = [ fuse snappy zlib bzip2 opensslPkg protobuf2_5 ]; + buildInputs = [ fuse snappy zlib bzip2 opensslPkg protobuf2_5 libtirpc ]; + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + NIX_LDFLAGS = [ "-ltirpc" ]; + # most of the hardcoded pathes are fixed in 2.9.x and 3.0.0, this list of patched files might be reduced when 2.7.x and 2.8.x will be deprecated + + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/apache/hadoop/pull/2886.patch"; + sha256 = "1fim1d8va050za5i8a6slphmx015fzvhxkc2wi4rwg7kbj31sv0r"; + }) + ]; + postPatch = '' for file in hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java \ hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java \ 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 3c6d667690..90aa944799 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.138.7"; + version = "0.139.6"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-LFNsSd+S+mQiTk7bCnSD/Kp/D0Jefxo80eRsGkStBhs="; + sha256 = "sha256-pAo8MmQqqSICB4rguhkGHJqyB9fBBzpp7NEaa59rVb4="; }; - vendorSha256 = "sha256-WlV6moJymQ7VyZXXuViCNN1WP4NzBUszavxpKjQR8to="; + vendorSha256 = "sha256-Hs09CT/KSwYL2AKLseOjWB5Xvvr5TvbzwDywsGQ9kMw="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix index ed828feefd..595dd3c61a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.6.6"; + version = "3.6.11"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-SGVch7mMtHi5GYFOrSss4dk29aRTQmBzkPYOetPdF88="; + sha256 = "sha256-9G/A6eADt9jP0CZC6MTZnQOmGOItJFI0zTfmC7HXSaI="; }; - vendorSha256 = "sha256-mktq5Dnk1mBO2yy5SeMDxa/akXdO5i2WafMTGtH53H8="; + vendorSha256 = "sha256-icX8mOc8g+DhfAjD1pzneLWTXY17lXyAjdPOWAxkHwI="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix index d0afe6d2e4..f66e5f88e7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -11,6 +11,13 @@ buildGoModule rec { sha256 = "1iqgpmljqx6rhmvsir2675waj78amcfiw08knwvlmavjgpxx2ysw"; }; + patches = [ + # Use $HOME instead of the OS user database. + # Upstream PR: https://github.com/xetys/hetzner-kube/pull/346 + # Unfortunately, the PR patch does not apply against release. + ./fix-home.patch + ]; + vendorSha256 = "1jh2f66ys6rmrrwrf5zqfprgcvziyq6l4z8bfqwxgf1ysnxx525h"; doCheck = false; @@ -25,6 +32,8 @@ buildGoModule rec { ]; postInstall = '' + # Need a writable home, because it fails if unable to write config. + export HOME=$TMP $out/bin/hetzner-kube completion bash > hetzner-kube $out/bin/hetzner-kube completion zsh > _hetzner-kube installShellCompletion --zsh _hetzner-kube diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/fix-home.patch b/third_party/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/fix-home.patch new file mode 100644 index 0000000000..1b3bbae65f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/fix-home.patch @@ -0,0 +1,53 @@ +diff --git a/cmd/cluster_kubeconfig.go b/cmd/cluster_kubeconfig.go +index 54cc0c9..fab288a 100644 +--- a/cmd/cluster_kubeconfig.go ++++ b/cmd/cluster_kubeconfig.go +@@ -6,7 +6,7 @@ import ( + "io/ioutil" + "log" + "os" +- "os/user" ++ "path/filepath" + "strings" + + "github.com/spf13/cobra" +@@ -52,9 +52,8 @@ Example 4: hetzner-kube cluster kubeconfig -n my-cluster -p > my-conf.yaml # pri + } else { + fmt.Println("create file") + +- usr, _ := user.Current() +- dir := usr.HomeDir +- path := fmt.Sprintf("%s/.kube", dir) ++ dir, _ := os.UserHomeDir() ++ path := filepath.Join(dir, ".kube") + + if _, err := os.Stat(path); os.IsNotExist(err) { + os.MkdirAll(path, 0755) +diff --git a/cmd/config.go b/cmd/config.go +index ce0f3e5..a03c4ba 100644 +--- a/cmd/config.go ++++ b/cmd/config.go +@@ -8,7 +8,6 @@ import ( + "io/ioutil" + "log" + "os" +- "os/user" + "path/filepath" + + "github.com/hetznercloud/hcloud-go/hcloud" +@@ -28,13 +27,8 @@ type AppSSHClient struct { + // NewAppConfig creates a new AppConfig struct using the locally saved configuration file. If no local + // configuration file is found a new config will be created. + func NewAppConfig() AppConfig { +- usr, err := user.Current() +- if err != nil { +- return AppConfig{} +- } +- if usr.HomeDir != "" { +- DefaultConfigPath = filepath.Join(usr.HomeDir, ".hetzner-kube") +- } ++ dir, _ := os.UserHomeDir() ++ DefaultConfigPath = filepath.Join(dir, ".hetzner-kube") + + appConf := AppConfig{ + Context: context.Background(), diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix index d0ffb22217..85b6c623ae 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-gCI4LRUjsE6V7fomWaQsseX1Xi2f+2ZgtvWBDarpXvw="; + sha256 = "sha256-QyiGDk9lA9Y49VpRNRGNbir/ql/Vzp6wsZ1LGodGTks="; }; - vendorSha256 = "sha256-yJHYyRPl1V1WNV0nJoR3bRTTGRTQaT/tG4TSQeL5U88="; + vendorSha256 = "sha256-N+7xajNkxuaC1yDTkPCg80bl2gRy2+Sa4Qq1A8zSGD8="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix index 4053a042bf..878d7e1184 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix @@ -44,14 +44,16 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.20.6+k3s1"; # k3s git tag - traefikChartVersion = "1.81.0"; # taken from ./scripts/download at the above k3s tag - k3sRootVersion = "0.8.1"; # taken from ./scripts/download at the above k3s tag - k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at the above k3s tag + k3sVersion = "1.21.0+k3s1"; # k3s git tag + k3sCommit = "2705431d9645d128441c578309574cd262285ae6"; # k3s git commit at the above version + + traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION + k3sRootVersion = "0.8.1"; # taken from ./scripts/download at ROOT_VERSION + k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at VERSION_CNIPLUGINS # bundled into the k3s binary traefikChart = fetchurl { - url = "https://kubernetes-charts.storage.googleapis.com/traefik-${traefikChartVersion}.tgz"; - sha256 = "1aqpzgjlvqhil0g3angz94zd4xbl4iq0qmpjcy5aq1xv9qciwdi9"; + url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz"; + sha256 = "sha256-9d7p0ngyMN27u4OPgz7yI14Zj9y36t9o/HMX5wyDpUI="; }; # so, k3s is a complicated thing to package # This derivation attempts to avoid including any random binaries from the @@ -95,8 +97,7 @@ let k3sRepo = fetchgit { url = "https://github.com/k3s-io/k3s"; rev = "v${k3sVersion}"; - leaveDotGit = true; # ./scripts/version.sh depends on git - sha256 = "sha256-IIZotJKQ/+WNmfcEJU5wFtZBufWjUp4MeVCRk4tSjyQ="; + sha256 = "sha256-xsXxf2ZYrkpOHlSFqTsHwWF3kChUjxWRjyDR3Dhg2ho="; }; # Stage 1 of the k3s build: # Let's talk about how k3s is structured. @@ -134,9 +135,13 @@ let # those. patches = [ ./patches/0002-Add-nixpkgs-patches.patch ]; - nativeBuildInputs = [ git pkg-config ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp ]; + # Versioning info for build script + DRONE_TAG = "v${version}"; + DRONE_COMMIT = k3sCommit; + buildPhase = '' pushd go/src/${goPackagePath} @@ -175,7 +180,7 @@ let # See the above comment in k3sBuildStage1 patches = [ ./patches/0002-Add-nixpkgs-patches.patch ]; - nativeBuildInputs = [ git pkg-config zstd ]; + nativeBuildInputs = [ pkg-config zstd ]; # These dependencies are embedded as compressed files in k3s at runtime. # Propagate them to avoid broken runtime references to libraries. propagatedBuildInputs = [ k3sPlugins k3sBuildStage1 runc ]; @@ -186,6 +191,9 @@ let else if stdenv.hostPlatform.system == "aarch64-linux" then "-arm64" else throw "k3s isn't being built for ${stdenv.hostPlatform.system} yet."; + DRONE_TAG = "v${version}"; + DRONE_COMMIT = k3sCommit; + # In order to build the thick k3s binary (which is what # ./scripts/package-cli does), we need to get all the binaries that script # expects in place. 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 ee16f923b7..8d515528a0 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.24.6"; + version = "0.24.8"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-uqtjAvtsF+4cz3M60Xj9sCNotaoPzaeeTKnXQUB4CIo="; + sha256 = "sha256-6RGm2uiYvsdpWdhNwDTw4z1O6uNErkWTuyOiwKIvXOY="; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "sha256-/4Aof09MYHPc4VJJV2EyB7T9zNFtYY4JeDGJi67FQic="; + vendorSha256 = "sha256-lzxGTubm+qQes5QKaamfmSkXs4qquHHjIhts8YmKlYI="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix index 9b1a155a25..6358a7565c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix @@ -44,7 +44,7 @@ let homepage = "https://github.com/kubernetes/kops"; changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases"; license = licenses.asl20; - maintainers = with maintainers; [ offline zimbatm ]; + maintainers = with maintainers; [ offline zimbatm diegolelis ]; platforms = platforms.unix; }; } // attrs'; @@ -63,9 +63,14 @@ rec { sha256 = "0fmrzjz163hda6sl1jkl7cmg8fw6mmqb9953048jnhmd3w428xlz"; }; - kops_1_18 = mkKops rec { + kops_1_18 = mkKops { version = "1.18.2"; sha256 = "17na83j6sfhk69w9ssvicc0xd1904z952ad3zzbpha50lcy6nlhp"; + }; + + kops_1_19 = mkKops rec { + version = "1.19.2"; + sha256 = "15csxih1xy8myky37n5dyzp5mc31pc4bq9asaw6zz51mgw8ad5r9"; rev = "v${version}"; }; } 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 decb586045..1265448fc6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube3d"; - version = "4.4.2"; + version = "4.4.3"; src = fetchFromGitHub { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-6BDetNPWyAVZOsnCWs90HljVpfUlAytFDPQ/SqPxwgg="; + sha256 = "sha256-G8oaJtfsbSi5WaJobxUpNu9DchHfzbkpPvq23GYM99s="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix index 4fda7db9f1..7c04f6e9eb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.18.0"; in +let version = "0.20.0"; in buildGoPackage { pname = "kubecfg"; @@ -10,7 +10,7 @@ buildGoPackage { owner = "bitnami"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "sha256-TJbuJZDj9ZwEaN8LV/M30+5+IgN8EZCTTBBDB0OgdEE="; + sha256 = "sha256-7lBIqaozVBoiYYOTqAxq9h2N+Y3JFwLaunCykILOmPU="; }; goPackagePath = "github.com/bitnami/kubecfg"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix index 12127e223a..60d5dec48a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.20.5"; + version = "1.21.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-RDaD7tlTtAucW8ido9FumKb5E9n6F9H8HwxQ9TPyOLk="; + sha256 = "sha256-gJjCw28SqU49kIiRH+MZgeYN4VBgKVEaRPr5A/2c5Pc="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix index cf0c845142..15670188f1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-wzaNFM/4V2mWqhkqeT70ieQuhgNK79U2b7PhxKqn/X0="; + sha256 = "sha256-+9yOBrq34VCy1yAkSh1iHbgtckuz2FcHokH/Cb/Heus="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubetail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubetail/default.nix index 7e6a66eea5..e0ced9e2a8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubetail/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kubetail"; - version = "1.6.12"; + version = "1.6.13"; src = fetchFromGitHub { owner = "johanhaleby"; repo = "kubetail"; rev = version; - sha256 = "0hayfd7yvdhd2klfmhvl04hfqk0nfsimjyg3kbq8c5dbgbpz05nd"; + sha256 = "sha256-EkOewNInzEEEgMOffYoRaKwhgYuBXgHaCkVgWg2mIDE="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix index a4dac9dd62..e6af0146ca 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix @@ -2,12 +2,12 @@ let pname = "lens"; - version = "4.2.0"; + version = "4.2.4"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.x86_64.AppImage"; - sha256 = "0g60d1h2dn41qdzdnqavwknqynjqil7s8kcqy01h021r81rdpn2q"; + sha256 = "0fzhv8brwwl1ihx6jqq4pi77489hr6f9hpppqq3n8d2imjsqgvlw"; name="${pname}.AppImage"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix index 11b62f479c..0dd6363d07 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix @@ -22,5 +22,6 @@ buildGoModule { homepage = "https://linkerd.io/"; license = licenses.asl20; maintainers = with maintainers; [ Gonzih ]; + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index 897428a757..929c254a1b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , buildGoModule , fetchFromGitHub , go-bindata @@ -11,9 +12,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.19.0"; + version = "1.20.0"; - vendorSha256 = "sha256-WGW2uz3YJIUjLsYQ6rXNvgJGLrZSIkEEk07llLzMVXA="; + vendorSha256 = "sha256-ncgf2C4PZMoVMZIMDn9LwP2EDqg7T/WbUPRd/SqGGnU="; doCheck = false; @@ -21,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-F+nPSWX9gs/hvOR6g8MW4b+JW+w3ScDaaF/FLHbLspY="; + sha256 = "sha256-TnvbO8OLjnI5WGy3QR4OZbesOBat2VsL7ElCnj2Tkmk="; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix index 357424cddd..5dd183a7fa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-It/p2Hk4/fkYgHTPynf7p7zs4ajjo0Fv3yTzhrWUusE="; + sha256 = "sha256-GPOrC9gL9lPv5SUldFxTS8ZT9YboPoDdqOAfwD0qGBQ="; }; - vendorSha256 = "sha256-Vg6SHyQkeUvd2hT0JV32y+F0t/qb81MrgOFcr785a8M="; + vendorSha256 = "sha256-S3Gp7HkBIZNZ8rkp64XaUQUj1TggGwI9FMrVkyLCQWA="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/shell.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/shell.nix index 3fc06b0bc7..0139cb2c81 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/shell.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/shell.nix @@ -1,7 +1,7 @@ -{ pkgs ? import {} }: +{ pkgs ? import { } }: pkgs.mkShell { - buildInputs = [ + packages = [ pkgs.poetry2nix.cli pkgs.pkg-config pkgs.libvirt diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix index 82f508c63e..cf4a9cde52 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "0.12.10"; - sha256 = "12hlzjkay7y1502nmfvq2qkhp9pq7vp4zxypawnh98qvxbzv149l"; + version = "0.12.12"; + sha256 = "0hz5fsqv8jh22zhs0r1yk0c4qf4sf11hmqg4db91kp2xrq72a0qg"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix index 99c43aeeee..f4551d1e82 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.4"; - sha256 = "0znaxz9mzbqb59p6rwa5h89m344m2ci39jsx8dfh1v5fc17r0fcq"; + version = "1.0.5"; + sha256 = "06l56fi4fhplvl8v0i88q18yh1hwwd12fngnrflb91janbyk6p4l"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix index 6f97be468f..d032577ce1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "octant"; - version = "0.19.0"; + version = "0.20.0"; src = let @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { x86_64-linux = "Linux-64bit"; aarch64-linux = "Linux-arm64"; x86_64-darwin = "macOS-64bit"; + aarch64-darwin = "macOS-arm64"; }.${system} or (throw "Unsupported system: ${system}"); fetchsrc = version: sha256: fetchzip { url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/octant_${version}_${suffix}.tar.gz"; @@ -18,9 +19,10 @@ stdenv.mkDerivation rec { }; in fetchsrc version { - x86_64-linux = "sha256-TKvUBof4TLcHr9hg6AOLjVd1NcAX9HHVuuABdFKRNQA="; - aarch64-linux = "sha256-BJb7h6kJZ3QhdlEqNHkiFp91uYLXzYHvKftxEAhjY38="; - x86_64-darwin = "sha256-Ig98IqLmlN9D4iXrP9SXYwTrQOvbtQ/tQW+uEmntm+I="; + x86_64-linux = "sha256-VFlZP5d6/YhzVIhveqMc4HfapBt0K/XjtqjCQNc514A="; + aarch64-linux = "sha256-RfdMfimmoHG4ixBtUVJ/V+mDhQ9aD+yeohkeUMUP8Zg="; + x86_64-darwin = "sha256-2Qgl3RdA4mMRTqR7o3Q86Zip5wtgvFp1vZn689FUtSI="; + aarch64-darwin = "sha256-+eZVg+B5YYf+XnDhNd6OU4+yFM9GtyiavcAr/EXh7XE="; }; dontConfigure = true; @@ -59,6 +61,6 @@ stdenv.mkDerivation rec { ''; license = licenses.asl20; maintainers = with maintainers; [ jk ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/desktop.nix index 5917d9ce03..8bc7683475 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/desktop.nix @@ -2,7 +2,7 @@ let pname = "octant-desktop"; - version = "0.19.0"; + version = "0.20.0"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -15,8 +15,8 @@ let src = fetchurl { url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-1XFb0zuyOy8XEUd9hoexItjq4assuWlWIzqw7pZxHx0="; - x86_64-darwin = "sha256-e3v5BFX7wnx4sAQrOq+dBIDVPJYzQZKKvKjSX+dis2U="; + x86_64-linux = "sha256-mPD5qa/IYsakjcoPnWVpkmhgkhnRK0qTGQ6hanzDt/Y="; + x86_64-darwin = "sha256-nxpwBRUeLSPqNEFjF8hKzRhA2ahqh/KyAitnSxYdyJ8="; }.${system}; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix index 89802f12be..67fde535f5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix @@ -2,26 +2,25 @@ buildGoModule rec { pname = "popeye"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "1rslmcdjs53zvv0xaf00vxqsfc3jh2p584j3q6nfgrghc978xmpf"; + sha256 = "sha256-GSH9q0hnyuGiJAdbFWKbaaYoHKl4e0SNmBkOvpn5a6s="; }; buildFlagsArray = '' -ldflags= -s -w -X github.com/derailed/popeye/cmd.version=${version} - -X github.com/derailed/popeye/cmd.commit=022c3104b642aab6bdb287468fb79068a33e1b0d - -X github.com/derailed/popeye/cmd.date=2020-10-31T16:44:45Z + -X github.com/derailed/popeye/cmd.commit=${version} ''; - vendorSha256 = "08195dnka7rs38py3kjii9zh9nifg2fnbi1wzjl0pc38i2bbrz0k"; + vendorSha256 = "sha256-pK04vGL9Izv1aK8UA+/3lSt/SjLyckjnfSCrOalRj3c="; - doCheck = false; + doCheck = true; meta = with lib; { description = "A Kubernetes cluster resource sanitizer"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix index 3aa583f3ae..86b48633c2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -8,6 +8,7 @@ , dmidecode , util-linux , bashInteractive +, overrideEtc ? true }: let @@ -64,6 +65,9 @@ buildGoPackage rec { --replace '"script"' '"${util-linux}/bin/script"' echo "${version}" > VERSION + '' + lib.optionalString overrideEtc '' + substituteInPlace agent/appconfig/constants_unix.go \ + --replace '"/etc/amazon/ssm/"' '"${placeholder "out"}/etc/amazon/ssm/"' ''; preBuild = '' @@ -96,6 +100,20 @@ buildGoPackage rec { popd ''; + # These templates retain their `.template` extensions on installation. The + # amazon-ssm-agent.json.template is required as default configuration when an + # amazon-ssm-agent.json isn't present. Here, we retain the template to show + # we're using the default configuration. + + # seelog.xml isn't actually required to run, but it does ship as a template + # with debian packages, so it's here for reference. Future work in the nixos + # module could use this template and substitute a different log level. + postInstall = '' + mkdir -p $out/etc/amazon/ssm + cp go/src/${goPackagePath}/amazon-ssm-agent.json.template $out/etc/amazon/ssm/amazon-ssm-agent.json.template + cp go/src/${goPackagePath}/seelog_unix.xml $out/etc/amazon/ssm/seelog.xml.template + ''; + postFixup = '' wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bashInteractive}/bin ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix index 313bd46a51..54520b54c8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-docs"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "terraform-docs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zQFPuHxfFvfwPVV0vPeA+A6XCw2Vt4tY4S2JBGcqaBQ="; + sha256 = "sha256-lx+yp0ybgZfmxvPM2BY2yq39qA6XebcKGrFd0AJa4yg="; }; - vendorSha256 = "sha256-HO2E8i5A/2Xi7Pq+Mqb/2ogK1to8IvZjRuDXfzGvOXk="; + vendorSha256 = "sha256-qoZUgSSr7jsDVVPBUyfN5Uw4CnH9EnD/4tX+TCSNV0Q="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index 33fba6e5a0..2ff13a9a59 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -76,28 +76,31 @@ "version": "3.27.0" }, "azuread": { - "owner": "terraform-providers", + "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v0.10.0", - "sha256": "0i9xrsqgh1024189hihm2nqrcy2pcyf1bwxnamwmwph5cas6hfb3", - "version": "0.10.0" + "rev": "v1.4.0", + "sha256": "13y0h8af37gfsjhccbfsnj6kqcn61lr1znmsxipjr5h9ka5lc209", + "vendorSha256": null, + "version": "1.4.0" }, "azurerm": { "owner": "terraform-providers", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v2.13.0", - "sha256": "0aj19vy1flpb2233rxaypjcfimjr1wfqri1m3p15dy1r108q84r7", - "version": "2.13.0" + "rev": "v2.58.0", + "sha256": "1zy3q5d63pz2rdczcs9xnxzasb2jbzhyg8nbk2r252mdnhx6h9vh", + "vendorSha256": null, + "version": "2.58.0" }, "azurestack": { - "owner": "terraform-providers", + "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurestack", "repo": "terraform-provider-azurestack", - "rev": "v0.9.0", - "sha256": "1msm7jwzry0vmas3l68h6p0migrsm6d18zpxcncv197m8xbvg324", - "version": "0.9.0" + "rev": "v0.10.0", + "sha256": "0lcwrp6n3l1nink06wq2nrirs6k3wwjmya1w06x14pvqqdj1d5c8", + "vendorSha256": null, + "version": "0.10.0" }, "baiducloud": { "owner": "terraform-providers", @@ -433,6 +436,15 @@ "sha256": "0jhx9rap4128j8sfkvpp8lbdmvdba0rkd3nxvy38wr3n18m7v1xg", "version": "1.2.0" }, + "hydra": { + "owner": "DeterminateSystems", + "provider-source-address": "registry.terraform.io/DeterminateSystems/hydra", + "repo": "terraform-provider-hydra", + "rev": "v0.1.0", + "sha256": "18c9j54fy1f2sfz317rlv8z7fb18bpc1a0baw1bgl72x5sgil5kv", + "vendorSha256": null, + "version": "0.1.0" + }, "ibm": { "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", @@ -495,6 +507,7 @@ }, "keycloak": { "owner": "mrparkers", + "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", "rev": "v3.0.0", "sha256": "1q9vzmj9c7mznv6al58d3rs5kk1fh28k1qccx46hcbk82z52da3a", 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 754dac6a93..2a4f10a8f1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -164,9 +164,9 @@ in rec { }); terraform_0_15 = pluggable (generic { - version = "0.15.1"; - sha256 = "02bqg05wsqld9xybvg7swvmympq5bggkw8vcq91z6vkpawm8z3kg"; - vendorSha256 = "1lnz6b2kjilidvs4flx9vj5j6dxliqdxni96fn2537nqaz4hc7l2"; + version = "0.15.4"; + sha256 = "14pxnmxy0c7idn8vgns70fxm2835gbz5vd1hmwzvhm394vr62frp"; + vendorSha256 = "12hrpxay6k3kz89ihyhl91c4lw4wp821ppa245w9977fq09fhnx0"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }); diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch index 1896d6018f..318df9ab69 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch @@ -1,6 +1,6 @@ -diff -Naur terraform.old/command/init.go terraform.new/command/init.go ---- terraform.old/command/init.go -+++ terraform.new/command/init.go +diff -Naur terraform.old/internal/command/init.go terraform.new/internal/command/init.go +--- terraform.old/internal/command/init.go ++++ terraform.new/internal/command/init.go @@ -3,6 +3,7 @@ import ( "context" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 4cab638ba6..ca10fdcf9b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.29.1"; + version = "0.29.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fr33DRFZrUZQELYMf8z5ShOZobwylgoiW+yi6qdtFP4="; + sha256 = "sha256-e4DwMphX8I37MShMt5nnoizfL919mJaFCkDGNeGXHbQ="; }; vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix index d21219f438..2a534c2fb8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix @@ -1,20 +1,20 @@ -{ lib, buildGoModule, fetchFromGitHub, go-bindata }: +{ lib, buildGoModule, fetchFromGitHub, go-bindata, installShellFiles }: buildGoModule rec { pname = "waypoint"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WzKUVfc7oGMh0TamL5b6gsm/BAfSCZ6EB3Hg4Tg/3Hw="; + sha256 = "sha256-57DHImPYVFK+MXWGeArvc5fwHmqa3zodLytfDoAxglo="; }; deleteVendor = true; - vendorSha256 = "sha256-VxKUYD92DssoSjWxR+1gZLq34vCVM/4U2ju5felLWzI="; + vendorSha256 = "sha256-HxrY35SqfUbT6VCCXkLUjAsxgtMzpOeoicAGLwD2OyA="; - nativeBuildInputs = [ go-bindata ]; + nativeBuildInputs = [ go-bindata installShellFiles ]; # GIT_{COMMIT,DIRTY} filled in blank to prevent trying to run git and ending up blank anyway buildPhase = '' @@ -23,9 +23,29 @@ buildGoModule rec { runHook postBuild ''; + doCheck = false; + installPhase = '' runHook preInstall + + local INSTALL="$out/bin/waypoint" install -D waypoint $out/bin/waypoint + + # Write to a file as it doesn't like EOF within <() + cat > waypoint.fish <test-runner < $out/share/applications/thunderbird.desktop < gtk3Support == true; - -stdenv.mkDerivation rec { - pname = "thunderbird"; - version = "68.12.0"; - - src = fetchurl { - url = - "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = - "33350vjgzvsg6sdhdld92z75k1xcf1wmngdcvzsj4f3y3aal73pyw03mlvgg6y36bm0j8fhaxvgbbg5zm7hxhn779z78970m4v9amg7"; - }; - - nativeBuildInputs = [ - autoconf213 - cargo - copyDesktopItems - gnused - llvmPackages.llvm - m4 - nasm - nodejs - perl - pkg-config - python2 - python3 - rust-cbindgen - rustc - which - yasm - unzip - ] ++ lib.optional gtk3Support wrapGAppsHook; - - buildInputs = [ - bzip2 - dbus - dbus-glib - file - fontconfig - freetype - glib - gtk2 - icu - jemalloc - libGL - libGLU - libevent - libjpeg - libnotify - libpng - libstartup_notification - libvpx - libwebp - nspr - nss - pango - perl - sqlite - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcursor - xorg.libXext - xorg.libXft - xorg.libXi - xorg.libXrender - xorg.libXt - xorg.pixman - xorg.xorgproto - zip - zlib - ] ++ lib.optional alsaSupport alsaLib - ++ lib.optional gtk3Support gtk3 - ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional waylandSupport libxkbcommon; - - NIX_CFLAGS_COMPILE =[ - "-I${glib.dev}/include/gio-unix-2.0" - "-I${nss.dev}/include/nss" - ]; - - patches = [ - ./no-buildconfig-68.patch - ]; - - postPatch = '' - rm -rf obj-x86_64-pc-linux-gnu - ''; - - hardeningDisable = [ "format" ]; - - preConfigure = '' - # remove distributed configuration files - rm -f configure - rm -f js/src/configure - rm -f .mozconfig* - - configureScript="$(realpath ./mach) configure" - # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 - unset AS - - export MOZCONFIG=$(pwd)/mozconfig - - # Set C flags for Rust's bindgen program. Unlike ordinary C - # compilation, bindgen does not invoke $CC directly. Instead it - # uses LLVM's libclang. To make sure all necessary flags are - # included we need to look in a few places. - # TODO: generalize this process for other use-cases. - - BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ - $(< ${stdenv.cc}/nix-support/cc-cflags) \ - $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ - ${ - lib.optionalString stdenv.cc.isClang - "-idirafter ${stdenv.cc.cc}/lib/clang/${ - lib.getVersion stdenv.cc.cc - }/include" - } \ - ${ - lib.optionalString stdenv.cc.isGNU - "-isystem ${stdenv.cc.cc}/include/c++/${ - lib.getVersion stdenv.cc.cc - } -isystem ${stdenv.cc.cc}/include/c++/${ - lib.getVersion stdenv.cc.cc - }/${stdenv.hostPlatform.config}" - } \ - $NIX_CFLAGS_COMPILE" - - echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG - ''; - - configureFlags = let - toolkitSlug = if gtk3Support then - "3${lib.optionalString waylandSupport "-wayland"}" - else - "2"; - toolkitValue = "cairo-gtk${toolkitSlug}"; - in [ - "--enable-application=comm/mail" - - "--with-system-bz2" - "--with-system-icu" - "--with-system-jpeg" - "--with-system-libevent" - "--with-system-nspr" - "--with-system-nss" - "--with-system-png" # needs APNG support - "--with-system-icu" - "--with-system-zlib" - "--with-system-webp" - "--with-system-libvpx" - - "--enable-rust-simd" - "--enable-crashreporter" - "--enable-default-toolkit=${toolkitValue}" - "--enable-js-shell" - "--enable-necko-wifi" - "--enable-startup-notification" - "--enable-system-ffi" - "--enable-system-pixman" - "--enable-system-sqlite" - - "--disable-gconf" - "--disable-tests" - "--disable-updater" - "--enable-jemalloc" - ] ++ (if debugBuild then [ - "--enable-debug" - "--enable-profiling" - ] else [ - "--disable-debug" - "--enable-release" - "--disable-debug-symbols" - "--enable-optimize" - "--enable-strip" - ]) ++ lib.optionals (!stdenv.hostPlatform.isi686) [ - # on i686-linux: --with-libclang-path is not available in this configuration - "--with-libclang-path=${llvmPackages.libclang}/lib" - "--with-clang-path=${llvmPackages.clang}/bin/clang" - ] ++ lib.optional alsaSupport "--enable-alsa" - ++ lib.optional calendarSupport "--enable-calendar" - ++ lib.optional enableOfficialBranding "--enable-official-branding" - ++ lib.optional pulseaudioSupport "--enable-pulseaudio"; - - enableParallelBuilding = true; - - postConfigure = '' - cd obj-* - ''; - - makeFlags = lib.optionals enableOfficialBranding [ - "MOZILLA_OFFICIAL=1" - "BUILD_OFFICIAL=1" - ]; - - doCheck = false; - - desktopItems = [ - (makeDesktopItem { - categories = lib.concatStringsSep ";" [ "Application" "Network" ]; - desktopName = "Thunderbird"; - genericName = "Mail Reader"; - name = "thunderbird"; - exec = "thunderbird %U"; - icon = "$out/lib/thunderbird/chrome/icons/default/default256.png"; - mimeType = lib.concatStringsSep ";" [ - # Email - "x-scheme-handler/mailto" - "message/rfc822" - # Feeds - "x-scheme-handler/feed" - "application/rss+xml" - "application/x-extension-rss" - # Newsgroups - "x-scheme-handler/news" - "x-scheme-handler/snews" - "x-scheme-handler/nntp" - ]; - }) - ]; - postInstall = '' - # TODO: Move to a dev output? - rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl - ''; - - preFixup = '' - # Needed to find Mozilla runtime - gappsWrapperArgs+=( - --argv0 "$out/bin/thunderbird" - --set MOZ_APP_LAUNCHER thunderbird - # https://github.com/NixOS/nixpkgs/pull/61980 - --set SNAP_NAME "thunderbird" - --set MOZ_LEGACY_PROFILES 1 - --set MOZ_ALLOW_DOWNGRADE 1 - ) - ''; - - # FIXME: The XUL portion of this can probably be removed as soon as we - # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)? - postFixup = '' - local xul="$out/lib/thunderbird/libxul.so" - patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul - ''; - - doInstallCheck = true; - installCheckPhase = '' - "$out/bin/thunderbird" --version - ''; - - disallowedRequisites = [ - stdenv.cc - ]; - - passthru.updateScript = import ./../../browsers/firefox/update.nix { - attrPath = "thunderbird"; - baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; - inherit writeScript lib common-updater-scripts xidel coreutils gnused - gnugrep curl runtimeShell; - }; - - meta = with lib; { - description = "A full-featured e-mail client"; - homepage = "https://www.thunderbird.net"; - maintainers = with maintainers; [ - eelco - lovesegfault - pierron - vcunat - ]; - platforms = platforms.linux; - license = licenses.mpl20; - knownVulnerabilities = [ "Support ended around Semptember 2020." ]; - }; -} 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 8e176638da..34799f3898 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -73,13 +73,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.10.0"; + version = "78.10.2"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "0nywhw1y9g78fpfgmcp6vphdidpnhfxif18qx23j7p20ayymvi2gd3smm4qfr6rlb0dkzyk1vxc2dj47zd8169wlkvr6l1kfsgvrj49"; + "3sc6n3n9bqnsq9qn9myanvxpgdx20c803prla3p236hwidz7snmyp2097ggn42xp765km55n11drxalnslsxdypgjikbfdqal05hf5r"; }; nativeBuildInputs = [ @@ -242,7 +242,7 @@ stdenv.mkDerivation rec { "--enable-strip" ]) ++ lib.optionals (!stdenv.hostPlatform.isi686) [ # on i686-linux: --with-libclang-path is not available in this configuration - "--with-libclang-path=${llvmPackages.libclang}/lib" + "--with-libclang-path=${llvmPackages.libclang.lib}/lib" "--with-clang-path=${llvmPackages.clang}/bin/clang" ] ++ lib.optional alsaSupport "--enable-alsa" ++ lib.optional calendarSupport "--enable-calendar" diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch deleted file mode 100644 index 482c10bd1c..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch +++ /dev/null @@ -1,36 +0,0 @@ -Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. -diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp ---- a/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200 -+++ b/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200 -@@ -32,8 +32,6 @@ - {"about", "chrome://global/content/aboutAbout.xhtml", 0}, - {"addons", "chrome://mozapps/content/extensions/extensions.xul", - nsIAboutModule::ALLOW_SCRIPT}, -- {"buildconfig", "chrome://global/content/buildconfig.html", -- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, - {"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT}, -diff -ru -x '*~' a/toolkit/content/jar.mn b/toolkit/content/jar.mn ---- a/toolkit/content/jar.mn 2017-07-31 18:20:52.000000000 +0200 -+++ b/toolkit/content/jar.mn 2017-09-26 22:01:42.383350314 +0200 -@@ -39,7 +39,6 @@ - content/global/plugins.css - content/global/browser-child.js - content/global/browser-content.js --* content/global/buildconfig.html - content/global/buildconfig.css - content/global/contentAreaUtils.js - content/global/datepicker.xhtml ---- a/comm/mail/base/jar.mn -+++ b/comm/mail/base/jar.mn -@@ -117,9 +117,7 @@ - % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js - % override chrome://mozapps/content/profile/profileDowngrade.xul chrome://messenger/content/profileDowngrade.xul - --* content/messenger/buildconfig.html (content/buildconfig.html) - content/messenger/buildconfig.css (content/buildconfig.css) --% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html - % override chrome://global/content/buildconfig.css chrome://messenger/content/buildconfig.css - - # L10n resources and overrides. diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix index b27598c40e..68a9362b87 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2021.2"; + version = "2021.3"; src = fetchurl { url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; - sha256 = "sha256-nNZK11MckiQ+z8NDgDc7aJ6yrXWI1hPOvMZkrGwDDgU="; + sha256 = "sha256-f7ZCDZ/RN+Z0Szmnx8mbzhKZiRPjqXTsgClfWViFYzo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix index b65ba8d94c..a27f1fdad2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nextdns"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-hMI6zq176p7MI4cjMSeQ8T8UvibJW60lzsPmeAOi3ow="; + sha256 = "sha256-gnWFgzfMMnn8O7zDN5LW3cMIz5/wmgEW9fI9aJBEah8="; }; vendorSha256 = "sha256-kmszMqkDMaL+Z6GcZmQyeRShKKS/VGdn9vabYPW/kCc="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/nym/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nym/default.nix index 528db85092..b7bffcd694 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nym/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nym/default.nix @@ -1,38 +1,31 @@ -{ lib +{ stdenv +, lib , rustPlatform , fetchFromGitHub , pkg-config , openssl -, libredirect -, writeText +, Security +, libiconv }: rustPlatform.buildRustPackage rec { pname = "nym"; - version = "0.8.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "nymtech"; repo = "nym"; rev = "v${version}"; - sha256 = "0wzk9qzjyax73lfjbbag412vw1fgk2wmhhry5hdlvdbkim42m5bn"; + sha256 = "sha256-7x+B+6T0cnEOjXevA5n1k/SY1Q2tcu0bbZ9gIGoljw0="; }; - # fix outdated Cargo.lock - cargoPatches = [ (writeText "fix-nym-cargo-lock.patch" '' - --- a/Cargo.lock - +++ b/Cargo.lock - @@ -1826 +1826 @@ - -version = "0.8.0" - +version = "0.8.1" - '') ]; - - cargoSha256 = "0zr5nzmglmvn6xfqgvipbzy8nw5cl3nf7zjmghkqdwi6zj9p9272"; + cargoSha256 = "0a7yja0ihjc66fqlshlaxpnpcpdy7h7gbv6120w2cr605qdnqvkx"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; + patches = [ ./ignore-networking-tests.patch ]; checkType = "debug"; passthru.updateScript = ./update.sh; @@ -46,6 +39,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://nymtech.net"; license = licenses.asl20; maintainers = [ maintainers.ehmry ]; - platforms = with platforms; intersectLists (linux ++ darwin) (concatLists [ x86 x86_64 aarch64 arm ]); + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/nym/ignore-networking-tests.patch b/third_party/nixpkgs/pkgs/applications/networking/nym/ignore-networking-tests.patch new file mode 100644 index 0000000000..e971557e7c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/nym/ignore-networking-tests.patch @@ -0,0 +1,123 @@ +diff --git a/service-providers/network-requester/src/allowed_hosts.rs b/service-providers/network-requester/src/allowed_hosts.rs +index 3026b4ee..fd156682 100644 +--- a/service-providers/network-requester/src/allowed_hosts.rs ++++ b/service-providers/network-requester/src/allowed_hosts.rs +@@ -306,6 +306,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn leaves_a_com_alone() { + let filter = setup(); + assert_eq!( +@@ -315,6 +316,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn trims_subdomains_from_com() { + let filter = setup(); + assert_eq!( +@@ -324,6 +326,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn works_for_non_com_roots() { + let filter = setup(); + assert_eq!( +@@ -333,6 +336,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn works_for_non_com_roots_with_subdomains() { + let filter = setup(); + assert_eq!( +@@ -342,12 +346,14 @@ mod tests { + } + + #[test] ++ #[ignore] + fn returns_none_on_garbage() { + let filter = setup(); + assert_eq!(None, filter.get_domain_root("::/&&%@")); + } + + #[test] ++ #[ignore] + fn returns_none_on_nonsense_domains() { + let filter = setup(); + assert_eq!(None, filter.get_domain_root("flappappa")); +@@ -368,6 +374,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn are_not_allowed() { + let host = "unknown.com"; + let mut filter = setup(); +@@ -375,6 +382,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn get_appended_once_to_the_unknown_hosts_list() { + let host = "unknown.com"; + let mut filter = setup(); +@@ -405,6 +413,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn are_allowed() { + let host = "nymtech.net"; + +@@ -413,6 +422,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn are_allowed_for_subdomains() { + let host = "foomp.nymtech.net"; + +@@ -421,6 +431,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn are_not_appended_to_file() { + let mut filter = setup(&["nymtech.net"]); + +@@ -436,6 +447,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn are_allowed_for_ipv4_addresses() { + let address_good = "1.1.1.1"; + let address_good_port = "1.1.1.1:1234"; +@@ -448,6 +460,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn are_allowed_for_ipv6_addresses() { + let ip_v6_full = "2001:0db8:85a3:0000:0000:8a2e:0370:7334"; + let ip_v6_full_rendered = "2001:0db8:85a3::8a2e:0370:7334"; +@@ -477,6 +490,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn are_allowed_for_ipv4_address_ranges() { + let range1 = "127.0.0.1/32"; + let range2 = "1.2.3.4/24"; +@@ -495,6 +509,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn are_allowed_for_ipv6_address_ranges() { + let range = "2620:0:2d0:200::7/32"; + diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/opentracker/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/opentracker/default.nix index 4e127a1e7b..f08e5c42e1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/opentracker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, libowfat, zlib }: +{ lib, stdenv, fetchgit, libowfat, zlib, nixosTests }: stdenv.mkDerivation { name = "opentracker-2018-05-26"; @@ -23,6 +23,10 @@ stdenv.mkDerivation { runHook postInstall ''; + passthru.tests = { + bittorrent-integration = nixosTests.bittorrent; + }; + meta = with lib; { homepage = "https://erdgeist.org/arts/software/opentracker/"; license = licenses.beerware; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix deleted file mode 100644 index a39b4aab83..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkg-config, protobuf, bzip2 -, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg_3 -, qtmultimedia, qtx11extras, qttools }: - -stdenv.mkDerivation rec { - pname = "retroshare"; - version = "0.6.2"; - - src = fetchFromGitHub { - owner = "RetroShare"; - repo = "RetroShare"; - rev = "v${version}"; - sha256 = "0hly2x87wdvqzzwf3wjzi7092bj8fk4xs6302rkm8gp9bkkmiiw8"; - }; - - # NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" "-I${sqlcipher}/include/sqlcipher" ]; - - patchPhase = '' - # Fix build error - sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \ - libretroshare/src/upnp/UPnPBase.cpp - ''; - - nativeBuildInputs = [ pkg-config qmake ]; - buildInputs = [ - speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools - protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg_3 - ]; - - preConfigure = '' - qmakeFlags="$qmakeFlags DESTDIR=$out" - ''; - - # gui/settings/PluginsPage.h:25:28: fatal error: ui_PluginsPage.h: No such file or directory - enableParallelBuilding = false; - - postInstall = '' - mkdir -p $out/bin - mv $out/RetroShare06-nogui $out/bin/RetroShare-nogui - mv $out/RetroShare06 $out/bin/Retroshare - ln -s $out/bin/RetroShare-nogui $out/bin/retroshare-nogui - - # plugins - mkdir -p $out/share/retroshare - mv $out/lib* $out/share/retroshare - - # BT DHT bootstrap - cp libbitdht/src/bitdht/bdboot.txt $out/share/retroshare - ''; - - meta = with lib; { - description = ""; - homepage = "http://retroshare.sourceforge.net/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ ]; - broken = true; # broken by libupnp: 1.6.21 -> 1.8.3 (#41684) - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix index 363e5f7cfb..cfccff689f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix @@ -17,10 +17,12 @@ , wrapGAppsHook , enableQt ? false , qt5 +, nixosTests , enableSystemd ? stdenv.isLinux , enableDaemon ? true , enableCli ? true , installLib ? false +, apparmorRulesFromClosure }: let @@ -38,6 +40,8 @@ in stdenv.mkDerivation { fetchSubmodules = true; }; + outputs = [ "out" "apparmor" ]; + cmakeFlags = let mkFlag = opt: if opt then "ON" else "OFF"; @@ -74,6 +78,35 @@ in stdenv.mkDerivation { NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; + postInstall = '' + mkdir $apparmor + cat >$apparmor/bin.transmission-daemon < + $out/bin/transmission-daemon { + include + include + include + include "${apparmorRulesFromClosure { name = "transmission-daemon"; } ([ + curl libevent openssl pcre zlib + ] ++ lib.optionals enableSystemd [ systemd ] + ++ lib.optionals stdenv.isLinux [ inotify-tools ] + )}" + r @{PROC}/sys/kernel/random/uuid, + r @{PROC}/sys/vm/overcommit_memory, + r @{PROC}/@{pid}/environ, + r @{PROC}/@{pid}/mounts, + rwk /tmp/tr_session_id_*, + r /run/systemd/resolve/stub-resolv.conf, + + include + } + EOF + ''; + + passthru.tests = { + smoke-test = nixosTests.bittorrent; + }; + meta = { description = "A fast, easy and free BitTorrent client"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix new file mode 100644 index 0000000000..54581a6070 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix @@ -0,0 +1,29 @@ +{ pkgs, buildGoModule, fetchFromGitHub, lib, perl }: + +buildGoModule rec { + pname = "XD"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "majestrate"; + repo = "XD"; + rev = "v${version}"; + sha256 = "sha256-fXENoqhR04TYS/kAJUqsqa0+j+KyzdsMlXIZ2GMPMhc="; + }; + + vendorSha256 = "1wg3cym2rwrhjsqlgd38l8mdq5alccz808465117n3vyga9m35lq"; + + checkInputs = [ perl ]; + + postInstall = '' + ln -s $out/bin/XD $out/bin/XD-CLI + ''; + + meta = with lib; { + description = "i2p bittorrent client"; + homepage = "https://xd-torrent.github.io"; + maintainers = with maintainers; [ nixbitcoin ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix index 6cff01c1cc..4b1eca3275 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix @@ -21,7 +21,7 @@ # Runtime dependencies; # A few additional ones (e.g. Node) are already shipped together with the # AppImage, so we don't have to duplicate them here. - alsaLib, dbus-glib, fuse, gnome3, gtk3, libdbusmenu-gtk2, libXdamage, udev, nss + alsaLib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, udev, nss }: let @@ -94,7 +94,7 @@ in stdenv.mkDerivation { # This is required for the file picker dialog - otherwise pcloud just # crashes - export XDG_DATA_DIRS="${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome3.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" + export XDG_DATA_DIRS="${gnome.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" exec "$out/app/pcloud" EOF diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix index f88a2e3d8e..4a741ab2b1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript -, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg +, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg, minizip , lsb-release, freetype, fontconfig, polkit, polkit_gnome , pulseaudio }: @@ -18,14 +18,14 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { urls = [ "https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz" ]; - sha256 = "1qbq6r0yanjappsi8yglw8r54bwf32bjb2i63awmr6pk5kmhhy3r"; + sha256 = "1ai58fsivb8al1279bayl800qavy0kfj40rjhf87g902ap3p4bhh"; }; passthru = { @@ -43,8 +43,8 @@ in stdenv.mkDerivation rec { buildInputs = [ atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango - gnome2.gtkglext libGLU libGL freetype fontconfig - polkit polkit_gnome pulseaudio + gnome2.gtkglext libGLU libGL minizip freetype + fontconfig polkit polkit_gnome pulseaudio ] ++ (with xorg; [ libxcb libxkbfile libX11 libXdamage libXext libXfixes libXi libXmu libXrandr libXtst libXt libICE libSM libXrender diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 8b1ef3c586..8a96cf8475 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more -, file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome3, gtk2-x11, gtk3 +, file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { freetype gdk-pixbuf gnome2.gtkglext - gnome3.webkitgtk + gnome.webkitgtk gtk2 gtk2-x11 gtk3 diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix index acf1d7cc2d..e2ee9428ad 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,4 +1,5 @@ -{lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkg-config, autoreconfHook +{ lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1 +, nettle, gnutls, pkg-config, autoreconfHook, libiconv , enableCredssp ? (!stdenv.isDarwin) } : @@ -15,7 +16,8 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [pkg-config autoreconfHook]; buildInputs = [openssl libX11 libXcursor libtasn1 nettle gnutls] - ++ lib.optional enableCredssp krb5; + ++ lib.optional enableCredssp krb5 + ++ lib.optional stdenv.isDarwin libiconv; configureFlags = [ "--with-ipv6" diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix index 5d0195b62f..e2f1cf2c8a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix @@ -6,7 +6,7 @@ , libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz # The themes here are soft dependencies; only icons are missing without them. -, gnome3 +, gnome }: with lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pcre2 libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core - openssl gnome3.adwaita-icon-theme json-glib libsodium webkitgtk + openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk harfbuzz ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/seafile-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seafile-client/default.nix index 3e58e83143..6b73f03531 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seafile-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seafile-client/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, qtbase, qttools +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, qtbase, qttools , seafile-shared, jansson, libsearpc , withShibboleth ? true, qtwebengine }: @@ -13,6 +13,15 @@ mkDerivation rec { sha256 = "2vV+6ZXjVg81JVLfWeD0UK+RdmpBxBU2Ozx790WFSyw="; }; + patches = [ + # Fix compilation failure with "error: template with C linkage", fixes #122505 + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_glib2.diff?h=seafile-client&id=7be253aaa2bdb6771721f45aa08bc875c8001c5a"; + name = "fix_build_with_glib2.diff"; + sha256 = "0hl7rcqfr8k62c1pr133bp3j63b905izaaggmgvr1af4jibal05v"; + }) + ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ qtbase qttools seafile-shared jansson libsearpc ] ++ lib.optional withShibboleth qtwebengine; @@ -29,6 +38,6 @@ mkDerivation rec { description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ eduardosm ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix index 61f318009f..86a3e48ae8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , buildGoModule -, runCommand +, testVersion , seaweedfs }: @@ -20,10 +20,8 @@ buildGoModule rec { subPackages = [ "weed" ]; - passthru.tests.check-version = runCommand "weed-version" { meta.timeout = 3; } '' - ${seaweedfs}/bin/weed version | grep -Fw ${version} - touch $out - ''; + passthru.tests.version = + testVersion { package = seaweedfs; command = "weed version"; }; meta = with lib; { description = "Simple and highly scalable distributed file system"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix index 54eb1216b0..7a8f35b76b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -9,23 +9,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "12g9067knppkci2acc4w9xcismgw2w1zd0f1swbzdnx8bxl3vg9i"; + sha256 = "07gfi0l9l19cy7304v18knbfhs7zqhfglw0jjhcmxa79dg6wzdia"; }; - patches = [ - # Fix missing multierr package on go.mod - ./fix-go-mod-deps.patch - ]; - modRoot = "./agent"; - vendorSha256 = "0z5qvgmmrwwvhpmhjxdvgdfsd60a24q9ld68ggnkv36qln0gw7p4"; + vendorSha256 = "0rcb384yxk1dsip15qh32rkd07i2zzr1k53wcfpnrgi6jpixvsvi"; buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/fix-go-mod-deps.patch b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/fix-go-mod-deps.patch deleted file mode 100644 index 7e99eccb04..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/fix-go-mod-deps.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff --git a/agent/go.mod b/agent/go.mod -index c075083..b79726e 100644 ---- a/agent/go.mod -+++ b/agent/go.mod -@@ -28,6 +28,7 @@ require ( - github.com/pkg/errors v0.9.1 - github.com/shellhub-io/shellhub v0.5.2 - github.com/sirupsen/logrus v1.8.1 -+ go.uber.org/multierr v1.6.0 // indirect - golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 - golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 // indirect - golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 -diff --git a/agent/go.sum b/agent/go.sum -index e65c9ad..0f9afcd 100644 ---- a/agent/go.sum -+++ b/agent/go.sum -@@ -62,7 +62,6 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw - github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= - github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= - github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= --github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= - github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= - github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= - github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -@@ -73,7 +72,6 @@ github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= - github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= - github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= - github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= --github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM= - github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= - github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= - github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -@@ -87,9 +85,7 @@ github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dv - github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= - github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= - github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= --github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= - github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= --github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= - github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= - github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= - github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= -@@ -113,7 +109,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN - github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= - github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= - github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= --github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= - github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= - github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= - github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -@@ -124,15 +119,18 @@ github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9 - github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= - github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= - github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= --github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= - github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= --github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= -+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= - github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= - github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= - github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= - github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= - github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -+go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= -+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -+go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= -+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= - golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= - golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= - golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -@@ -148,7 +146,6 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r - golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= - golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= - golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= --golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ= - golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= - golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= - golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -@@ -169,17 +166,13 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7w - golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= - golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 h1:8qxJSnu+7dRq6upnbntrmriWByIakBuct5OM/MdQC1M= - golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM= - golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= - golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= - golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= --golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= - golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= --golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= - golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= - golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= - golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -@@ -197,14 +190,12 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY - golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= - golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= - golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= --golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= - golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= - google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= - google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= - google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= --google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= - google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= - google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= - google.golang.org/genproto v0.0.0-20210224155714-063164c882e6 h1:bXUwz2WkXXrXgiLxww3vWmoSHLOGv4ipdPdTvKymcKw= -@@ -223,7 +214,6 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi - google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= - google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= - google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= --google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA= - google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= - google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= - google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -@@ -233,7 +223,6 @@ gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXa - gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= - gopkg.in/go-playground/validator.v9 v9.31.0 h1:bmXmP2RSNtFES+bn4uYuHT7iJFJv7Vj+an+ZQdDaD1M= - gopkg.in/go-playground/validator.v9 v9.31.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= --gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= - gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/etherape/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/etherape/default.nix index 1e3f2635f4..db54231ecf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/etherape/default.nix @@ -2,10 +2,10 @@ popt, itstool, libxml2 }: stdenv.mkDerivation rec { - name = "etherape-0.9.19"; + name = "etherape-0.9.20"; src = fetchurl { url = "mirror://sourceforge/etherape/${name}.tar.gz"; - sha256 = "0w63vg2q6if3wvy2md66in8b6cdw9q40hny5xy6yrxky58l4kmg7"; + sha256 = "sha256-9UsQtWOXB1yYofGS4rMIF+ISWBsJKd0DBOFfqOr1n5Y="; }; nativeBuildInputs = [ itstool pkg-config (lib.getBin libxml2) ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/soju/default.nix b/third_party/nixpkgs/pkgs/applications/networking/soju/default.nix new file mode 100644 index 0000000000..5940b7cb19 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/soju/default.nix @@ -0,0 +1,38 @@ +{ lib, buildGoModule, fetchFromSourcehut, installShellFiles, scdoc }: + +buildGoModule rec { + pname = "soju"; + version = "0.1.2"; + + src = fetchFromSourcehut { + owner = "~emersion"; + repo = "soju"; + rev = "v${version}"; + sha256 = "sha256-dauhGfwSjjRt1vl2+OPhtcme/QaRNTs43heQVnI7oRU="; + }; + + vendorSha256 = "sha256-0JLbqqybLZ/cYyHAyNR4liAVJI2oIsHELJLWlQy0qjE="; + + subPackages = [ + "cmd/soju" + "cmd/sojuctl" + "contrib/znc-import.go" + ]; + + nativeBuildInputs = [ + scdoc + installShellFiles + ]; + + postInstall = '' + scdoc < doc/soju.1.scd > doc/soju.1 + installManPage doc/soju.1 + ''; + + meta = with lib; { + description = "A user-friendly IRC bouncer"; + homepage = "https://soju.im"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ malvo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/third_party/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index 045120813f..fbf742c5e2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -1,44 +1,37 @@ -{ lib, fetchFromGitHub, python27Packages, geoip }: +{ lib, fetchFromGitHub, python3Packages, gettext, gdk-pixbuf +, gobject-introspection, gtk3, wrapGAppsHook }: with lib; -python27Packages.buildPythonApplication { +python3Packages.buildPythonApplication rec { pname = "nicotine-plus"; - version = "1.4.1"; + version = "3.0.6"; src = fetchFromGitHub { owner = "Nicotine-Plus"; repo = "nicotine-plus"; - rev = "4e057d64184885c63488d4213ade3233bd33e67b"; - sha256 = "11j2qm67sszfqq730czsr2zmpgkghsb50556ax1vlpm7rw3gm33c"; + rev = version; + sha256 = "sha256-NL6TXFRB7OeqNEfdANkEqh+MCOF1+ehR+6RO1XsIix8="; }; - propagatedBuildInputs = with python27Packages; [ - pygtk - miniupnpc - mutagen - notify - (GeoIP.override { inherit geoip; }) - ]; + nativeBuildInputs = [ gettext wrapGAppsHook ]; - # Insert real docs directory. - # os.getcwd() is not needed - postPatch = '' - substituteInPlace ./pynicotine/gtkgui/frame.py \ - --replace "paths.append(os.getcwd())" "paths.append('"$out"/doc')" - ''; + propagatedBuildInputs = [ gtk3 gdk-pixbuf gobject-introspection ] + ++ (with python3Packages; [ pygobject3 ]); - postFixup = '' - mkdir -p $out/doc/ - mv ./doc/NicotinePlusGuide $out/doc/ + postInstall = '' mv $out/bin/nicotine $out/bin/nicotine-plus + substituteInPlace $out/share/applications/org.nicotine_plus.Nicotine.desktop \ + --replace "Exec=nicotine" "Exec=$out/bin/nicotine-plus" ''; + doCheck = false; + meta = { description = "A graphical client for the SoulSeek peer-to-peer system"; homepage = "https://www.nicotine-plus.org"; - license = licenses.gpl3; - maintainers = with maintainers; [ klntsky ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ehmry klntsky ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix index 7bc5563d47..0223c153f5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix @@ -2,12 +2,12 @@ let pname = "ssb-patchwork"; - version = "3.18.0"; + version = "3.18.1"; name = "Patchwork-${version}"; src = fetchurl { url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage"; - sha256 = "1sb9q1qj5mj4cf8d9dsc498mg8a1ri2y0p9qbh44i8ykby8jkgjc"; + sha256 = "F8n6LLbgkg3z55lSY60T+pn2lra8aPt6Ztepw1gf2rI="; }; binary = appimageTools.wrapType2 { @@ -47,7 +47,7 @@ in ''; homepage = "https://www.scuttlebutt.nz/"; license = licenses.agpl3; - maintainers = with maintainers; [ asymmetric ninjatrappeur ]; + maintainers = with maintainers; [ asymmetric ninjatrappeur cyplo ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix index 300214e58b..b7e9f220f0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.10"; + version = "2.4.11"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - sha256 = "sha256:0dvxjkni66g82j9wr6yy07sn7d7yr7bbc0py89pxybvsbid88l65"; + sha256 = "sha256-ioOrkhVeHHqIjoEXcYo8ATJW+2+nZOehf3XbAJUEXpY="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncthing-gtk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncthing-gtk/default.nix index 015033d6ca..158999f86f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook -, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 +, gnome, buildPythonApplication, dateutil, pyinotify, pygobject3 , bcrypt, gobject-introspection, gsettings-desktop-schemas , pango, gdk-pixbuf, atk }: @@ -24,7 +24,7 @@ buildPythonApplication rec { buildInputs = [ gtk3 librsvg libappindicator-gtk3 - libnotify gnome3.adwaita-icon-theme + libnotify gnome.adwaita-icon-theme # Schemas with proxy configuration gsettings-desktop-schemas ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/vnstat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/vnstat/default.nix index 60b24a6619..f85f00bf0a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/vnstat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/vnstat/default.nix @@ -1,12 +1,20 @@ -{ lib, stdenv, fetchurl, pkg-config, gd, ncurses, sqlite, check }: +{ lib, stdenv +, fetchFromGitHub +, pkg-config +, gd, ncurses +, sqlite +, check +}: stdenv.mkDerivation rec { pname = "vnstat"; - version = "2.6"; + version = "2.7"; - src = fetchurl { - sha256 = "1xvzkxkq1sq33r2s4f1967f4gnca4xw411sbapdkx541f856w9w9"; - url = "https://humdi.net/${pname}/${pname}-${version}.tar.gz"; + src = fetchFromGitHub { + owner = "vergoh"; + repo = pname; + rev = "v${version}"; + sha256 = "105krrc7hl5mbj89i1k3w8yzqrg4f0q96lmyv4rc7fhhds5zam2h"; }; postPatch = '' @@ -32,5 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://humdi.net/vnstat/"; license = licenses.gpl2Plus; platforms = platforms.linux; + maintainers = with maintainers; [ evils ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix index 3de0d450de..a5edbac135 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "Know the forecast of the next hours & days"; homepage = "https://gitlab.com/bitseater/meteo"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/abiword/default.nix b/third_party/nixpkgs/pkgs/applications/office/abiword/default.nix index 4e83f36ea5..e32502749d 100644 --- a/third_party/nixpkgs/pkgs/applications/office/abiword/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/abiword/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, gtk3, fribidi , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl -, boost, libxslt, goffice, wrapGAppsHook, gnome3 +, boost, libxslt, goffice, wrapGAppsHook, gnome }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 librsvg bzip2 fribidi libpng popt - libgsf enchant wv libjpeg perl boost libxslt goffice gnome3.adwaita-icon-theme + libgsf enchant wv libjpeg perl boost libxslt goffice gnome.adwaita-icon-theme ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix b/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix index 4e8bcaee01..351609d8c0 100644 --- a/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix @@ -1,39 +1,50 @@ -{ lib, mkDerivation, fetchFromGitHub, installShellFiles, - qmake, qtbase, poppler, qtmultimedia }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, + qmake, qtbase, qtmultimedia, wrapQtAppsHook, + poppler, mupdf, freetype, jbig2dec, openjpeg, gumbo, + renderer ? "mupdf" }: -mkDerivation rec { +let + renderers = { + mupdf.buildInputs = [ mupdf freetype jbig2dec openjpeg gumbo ]; + poppler.buildInputs = [ poppler ]; + }; + +in + +stdenv.mkDerivation rec { pname = "beamerpresenter"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "stiglers-eponym"; repo = "BeamerPresenter"; rev = "v${version}"; - sha256 = "1nbcqrfdjcsc6czqk1v163whka4x1w883b1298aws8yi7vac4f1i"; + sha256 = "10i5nc5b5syaqvsixam4lmfiz3b5cphbjfgfqavi5jilq769792a"; }; - nativeBuildInputs = [ qmake installShellFiles ]; - buildInputs = [ qtbase qtmultimedia poppler ]; + nativeBuildInputs = [ qmake installShellFiles wrapQtAppsHook ]; + buildInputs = [ qtbase qtmultimedia ] ++ renderers.${renderer}.buildInputs; + + qmakeFlags = [ "RENDERER=${renderer}" ]; postPatch = '' - # Fix location of poppler-*.h shopt -s globstar - for f in **/*.{h,cpp}; do - substituteInPlace $f --replace '#include =26', + 'ofxclient', +- "ofxparse @ https://github.com/jseutter/ofxparse/tarball/3236cfd96434feb6bc79a8b66f3400f18e2ad3c4" ++ 'ofxparse' + ], + + extras_require={ \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix index c9b1099f8b..1c5327ebc6 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, gnome3, glib, ncurses, epoxy, gpgme +, gnome, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null @@ -399,7 +399,7 @@ in (mkDrv rec { mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux librevenge libe-book libmwaw glm ncurses epoxy - libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext + libodfgen CoinMP librdf_rasqal gnome.adwaita-icon-theme gettext ] ++ (with gst_all_1; [ gstreamer diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix index 3b8bba9ac1..f6243476f1 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -637,11 +637,11 @@ md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; } { - name = "neon-0.31.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/neon-0.31.1.tar.gz"; - sha256 = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d"; + name = "neon-0.31.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/neon-0.31.2.tar.gz"; + sha256 = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678"; md5 = ""; - md5name = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d-neon-0.31.1.tar.gz"; + md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz"; } { name = "nss-3.55-with-nspr-4.27.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix index d3fbc261c3..3870c478c8 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,7 +8,7 @@ rec { major = "7"; minor = "1"; - patch = "2"; + patch = "3"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1y19p9701msf6jjzp9d5ighvmyjzj68qzhm2bk3l5p16ys8qk9bb"; + sha256 = "1gr9c8kv7nc9kaag1sw9r36843pfba1my80afx7p0lxj0k8pzbrm"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "1j5251lbc35d521d92w52lgps0v5pg8mhr8y3r6x2nl9p0gvw957"; + sha256 = "09xkr6jmnwq55savw9xjsy8l8zcyflnsg4nfwhknvm3ls8sqj4w6"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "1bsrkmzhhpyrmi7akmdfvz4zb543fc093az9965k14rp8l6rhnvf"; + sha256 = "0dc981vmxfdwlyfgq84axkr99d8chm1ypknj39v0cmaqn56lpwg0"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/mytetra/default.nix b/third_party/nixpkgs/pkgs/applications/office/mytetra/default.nix index 3e2383fb35..cb90af5244 100644 --- a/third_party/nixpkgs/pkgs/applications/office/mytetra/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/mytetra/default.nix @@ -33,7 +33,7 @@ in mkDerivation { description = "Smart manager for information collecting"; homepage = "https://webhamster.ru/site/page/index/articles/projectcode/138"; license = licenses.gpl3; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/notes-up/default.nix b/third_party/nixpkgs/pkgs/applications/office/notes-up/default.nix index 7ab5bc838e..8271b2974c 100644 --- a/third_party/nixpkgs/pkgs/applications/office/notes-up/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/notes-up/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { + lib.optionalString withPantheon " - built with Contractor support"; homepage = "https://github.com/Philip-Scott/Notes-up"; license = licenses.gpl2; - maintainers = with maintainers; [ davidak worldofpeace ]; + maintainers = with maintainers; [ davidak ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix index 847287c8c8..e619683919 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -2,9 +2,9 @@ , python3Packages , gtk3 , cairo -, gnome3 +, gnome , librsvg -, xvfb_run +, xvfb-run , dbus , libnotify , wrapGAppsHook @@ -12,6 +12,7 @@ , which , gettext , gobject-introspection +, gdk-pixbuf }: python3Packages.buildPythonApplication rec { @@ -53,17 +54,18 @@ python3Packages.buildPythonApplication rec { done ''; - checkInputs = [ xvfb_run dbus.daemon ]; + checkInputs = [ xvfb-run dbus.daemon ]; nativeBuildInputs = [ wrapGAppsHook gobject-introspection (lib.getBin gettext) which + gdk-pixbuf # for the setup hook ]; buildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libnotify librsvg gtk3 diff --git a/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix b/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix new file mode 100644 index 0000000000..f4f83ce8e7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix @@ -0,0 +1,89 @@ +{ lib +, fetchurl +, python3 +, gettext +, makeDesktopItem +, copyDesktopItems +}: + +python3.pkgs.buildPythonApplication rec { + pname = "timeline"; + version = "2.4.0"; + + src = fetchurl { + url = "mirror://sourceforge/thetimelineproj/${pname}-${version}.zip"; + sha256 = "1pa0whqci6c2p20xf7gbndrrpr1xg42ixhql595ibdd4p3l37v23"; + }; + + nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ]; + + pythonPath = with python3.pkgs; [ + wxPython_4_0 # not compatible with wxPython_4_1. reported upstream https://github.com/wxWidgets/Phoenix/issues/1956 + humblewx + icalendar + markdown + pysvg-py3 + pillow + ]; + + checkInputs = [ + gettext + python3.pkgs.mock + ]; + + desktopItems = [ + (makeDesktopItem { + desktopName = "Timeline"; + name = "timeline"; + comment = "Display and navigate information on a timeline"; + icon = "timeline"; + terminal = false; + exec = "timeline"; + categories = "Office;Calendar;"; + }) + ]; + + dontBuild = true; + doCheck = false; + + patchPhase = '' + sed -i "s|_ROOT =.*|_ROOT = \"$out/usr/share/timeline/\"|" source/timelinelib/config/paths.py + ''; + + installPhase = '' + runHook preInstall + + site_packages=$out/${python3.pkgs.python.sitePackages} + install -D -m755 source/timeline.py $out/bin/timeline + mkdir -p $site_packages + cp -r source/timelinelib $site_packages/ + + mkdir -p $out/usr/share/timeline/locale + cp -r icons $out/usr/share/timeline/ + cp -r translations/ $out/usr/share/timeline/ + + mkdir -p $out/share/icons/hicolor/{48x48,32x32,16x16}/apps + cp icons/48.png $out/share/icons/hicolor/48x48/apps/timeline.png + cp icons/32.png $out/share/icons/hicolor/32x32/apps/timeline.png + cp icons/16.png $out/share/icons/hicolor/16x16/apps/timeline.png + + runHook postInstall + ''; + + # tests fail because they need an x server + # Unable to access the X Display, is $DISPLAY set properly? + checkPhase = '' + runHook preCheck + ${python3.interpreter} tools/execute-specs.py + runHook postCheck + ''; + + meta = with lib; { + homepage = "http://thetimelineproj.sourceforge.net/"; + changelog = "http://thetimelineproj.sourceforge.net/changelog.html"; + description = "Display and navigate information on a timeline"; + license = with licenses; [ gpl3Only cc-by-sa-30 ]; + platforms = with platforms; unix; + maintainers = with maintainers; [ davidak ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/tryton/default.nix b/third_party/nixpkgs/pkgs/applications/office/tryton/default.nix index 65eb48f3b2..b3a5ae44c9 100644 --- a/third_party/nixpkgs/pkgs/applications/office/tryton/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/tryton/default.nix @@ -6,7 +6,7 @@ , atk , gtk3 , gtkspell3 -, gnome3 +, gnome , glib , goocanvas2 , gdk-pixbuf @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { atk gdk-pixbuf glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme goocanvas2 fontconfig freetype diff --git a/third_party/nixpkgs/pkgs/applications/office/watson/default.nix b/third_party/nixpkgs/pkgs/applications/office/watson/default.nix index c305c77141..b6e318ec08 100644 --- a/third_party/nixpkgs/pkgs/applications/office/watson/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/watson/default.nix @@ -4,13 +4,13 @@ with pythonPackages; buildPythonApplication rec { pname = "watson"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "TailorDev"; repo = "Watson"; rev = version; - sha256 = "1yxqjirv7cpg4hqj4l3a53p3p3kl82bcx6drgvl9v849vcc3l7s0"; + sha256 = "0radf5afyphmzphfqb4kkixahds2559nr3yaqvni4xrisdaiaymz"; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/zim/default.nix b/third_party/nixpkgs/pkgs/applications/office/zim/default.nix index f34a3e806a..4cf3c3d78c 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome3 }: +{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome }: # # TODO: Declare configuration options for the following optional dependencies: @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { sha256 = "13vhwsgv6mscgixypc0ixkgj0y7cpcm7z7wn1vmdrwp7kn8m3xgx"; }; - buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix index 1584972cbe..53f021344d 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -26,7 +26,7 @@ , libXrender , libXt , libnotify -, gnome3 +, gnome , libGLU, libGL , nspr , nss @@ -36,15 +36,15 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.96"; + version = "5.0.96.2"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-W8Iu8UoTqC3aK7lB4bq1L7cNmjaEvjEK+ODcZ9kk3f8="; + sha256 = "sha256-ZT+qxNLjdG29DhyV0JXtgDHDi2gYPyKrZwgJOro5III="; }; nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs= [ gsettings-desktop-schemas glib gtk3 gnome3.adwaita-icon-theme dconf ]; + buildInputs= [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; dontConfigure = true; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/radio/ebook2cw/Makefile.patch b/third_party/nixpkgs/pkgs/applications/radio/ebook2cw/Makefile.patch deleted file mode 100644 index be6c32e414..0000000000 --- a/third_party/nixpkgs/pkgs/applications/radio/ebook2cw/Makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Makefile b/Makefile -index 005d60d..f69c7fe 100644 ---- a/Makefile -+++ b/Makefile -@@ -41,6 +41,7 @@ install: - install -d -v $(DESTDIR)/bin/ - install -d -v $(DESTDIR)/share/doc/ebook2cw/ - install -d -v $(DESTDIR)/share/doc/ebook2cw/examples/ -+ install -d -v $(DESTDIR)/share/locale/de/LC_MESSAGES/ - install -s -m 0755 ebook2cw $(DESTDIR)/bin/ - install -m 0644 ebook2cw.1 $(DESTDIR)/share/man/man1/ - install -m 0644 README $(DESTDIR)/share/doc/ebook2cw/ diff --git a/third_party/nixpkgs/pkgs/applications/radio/ebook2cw/default.nix b/third_party/nixpkgs/pkgs/applications/radio/ebook2cw/default.nix index 4c8cd53ebd..6c3fbc16c4 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/ebook2cw/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/ebook2cw/default.nix @@ -1,18 +1,24 @@ -{ lib, stdenv, fetchgit, lame, libvorbis, gettext }: +{ lib, stdenv, fetchgit, fetchpatch, lame, libvorbis, gettext }: stdenv.mkDerivation rec { pname = "ebook2cw"; - version = "0.8.3"; + version = "0.8.4"; src = fetchgit { url = "https://git.fkurz.net/dj1yfk/ebook2cw.git"; rev = "${pname}-${version}"; - sha256 = "0jqmnjblv3wzr0ppqzndzd8wg02nlkvzg1fqw14vyyp76sdjsh46"; + sha256 = "0h7lg59m3dcydzkc8szipnwzag8fqwwvppa9fspn5xqd4blpcjd5"; }; - buildInputs = [ lame libvorbis gettext ]; + patches = [ + # Fixes non-GCC compilers and a missing directory in the install phase. + (fetchpatch { + url = "https://git.fkurz.net/dj1yfk/ebook2cw/commit/eb5742e70b042cf98a04440395c34390b171c035.patch"; + sha256 = "1m5f819cj3fj1piss0a5ciib3jqrqdc14lp3i3dszw4bg9v1pgyd"; + }) + ]; - patches = [ ./Makefile.patch ]; + buildInputs = [ lame libvorbis gettext ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix index d255b199bc..7dcb6d467d 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix @@ -4,7 +4,7 @@ , unwrapped # If it's a minimal build, we don't want to wrap it with lndir and # wrapProgram.. -, wrap ? true +, doWrap ? true # For the wrapper , makeWrapper # For lndir @@ -96,7 +96,7 @@ let ] ++ lib.optionals (unwrapped.hasFeature "gr-qtgui" unwrapped.features) # 3.7 builds with qt4 - (if unwrapped.versionAttr.major == "3.8" then + (if lib.versionAtLeast unwrapped.versionAttr.major "3.8" then [ "--prefix" "QT_PLUGIN_PATH" ":" "${ @@ -138,7 +138,7 @@ let ; pkgs = packages; }; - self = if wrap then + self = if doWrap then stdenv.mkDerivation { inherit name passthru; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/rtl_433/default.nix b/third_party/nixpkgs/pkgs/applications/radio/rtl_433/default.nix index b926e29bc4..72aa865176 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/rtl_433/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/rtl_433/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "20.11"; + version = "21.05"; pname = "rtl_433"; src = fetchFromGitHub { owner = "merbanan"; repo = "rtl_433"; rev = version; - sha256 = "093bxjxkg7yf78wqj5gpijbfa2p05ny09qqsj84kzi1svnzsa369"; + sha256 = "sha256-01mXOwLv16yTR65BboN+TFm2aE2EMfW1D5teDdW2wLg="; }; nativeBuildInputs = [ pkg-config cmake ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Decode traffic from devices that broadcast on 433.9 MHz, 868 MHz, 315 MHz, 345 MHz and 915 MHz"; homepage = "https://github.com/merbanan/rtl_433"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ earldouglas ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix index cd7405ae09..861dc66293 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,20 +14,13 @@ mkDerivation rec { pname = "kstars"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-iX7rMQbctdK3AeH4ZvH+T4rv1ZHwn55urJh150KoXXU="; + sha256 = "sha256-kgUsG2k2YSAAH7ea2qfGw4gON5CFdUoQ3EwOnATXZ5g="; }; - patches = [ - # Patches ksutils.cpp to use nix store prefixes to find program binaries of - # indilib and xplanet dependencies. Without the patch, Ekos is unable to spawn - # indi servers for local telescope/camera control. - ./fs-fixes.patch - ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kdoctools kguiaddons ki18n kinit kiconthemes kio @@ -41,8 +34,8 @@ mkDerivation rec { ]; cmakeFlags = [ - "-DINDI_NIX_ROOT=${indi-full}" - "-DXPLANET_NIX_ROOT=${xplanet}" + "-DINDI_PREFIX=${indi-full}" + "-DXPLANET_PREFIX=${xplanet}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/fs-fixes.patch b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/fs-fixes.patch deleted file mode 100644 index b9bdfc0c5d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/fs-fixes.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- kstars-3.5.0/CMakeLists.txt.old 2020-11-24 12:36:37.967433937 -0600 -+++ kstars-3.5.0/CMakeLists.txt 2020-11-24 13:36:56.275263691 -0600 -@@ -5,6 +5,9 @@ - set (KSTARS_BUILD_RELEASE "Stable") - set (CMAKE_CXX_STANDARD 11) - -+add_definitions(-DINDI_NIX_ROOT=${INDI_NIX_ROOT}) -+add_definitions(-DXPLANET_NIX_ROOT=${XPLANET_NIX_ROOT}) -+ - # Build KStars Lite with -DBUILD_KSTARS_LITE=ON - option(BUILD_KSTARS_LITE "Build KStars Lite" OFF) - ---- kstars-3.5.0/kstars/auxiliary/ksutils.old.cpp 2020-11-24 12:22:14.397319680 -0600 -+++ kstars-3.5.0/kstars/auxiliary/ksutils.cpp 2020-11-24 13:32:22.946477798 -0600 -@@ -1081,6 +1081,10 @@ - // We support running within Snaps, Flatpaks, and AppImage - // The path should accomodate the differences between the different - // packaging solutions -+ #define STR_EXPAND(x) #x -+ #define STR(x) STR_EXPAND(x) -+ QString indi_prefix = QString(STR(INDI_NIX_ROOT)); -+ QString xplanet_prefix = QString(STR(XPLANET_NIX_ROOT)); - QString snap = QProcessEnvironment::systemEnvironment().value("SNAP"); - QString flat = QProcessEnvironment::systemEnvironment().value("FLATPAK_DEST"); - QString appimg = QProcessEnvironment::systemEnvironment().value("APPDIR"); -@@ -1110,21 +1114,21 @@ - #if defined(Q_OS_OSX) - return "/usr/local/bin/indiserver"; - #endif -- return prefix + "/bin/indiserver"; -+ return indi_prefix + "/bin/indiserver"; - } - else if (option == "INDIHubAgent") - { - #if defined(Q_OS_OSX) - return "/usr/local/bin/indihub-agent"; - #endif -- return prefix + "/bin/indihub-agent"; -+ return indi_prefix + "/bin/indihub-agent"; - } - else if (option == "indiDriversDir") - { - #if defined(Q_OS_OSX) - return "/usr/local/share/indi"; - #elif defined(Q_OS_LINUX) -- return prefix + "/share/indi"; -+ return indi_prefix + "/share/indi"; - #else - return QStandardPaths::locate(QStandardPaths::GenericDataLocation, "indi", QStandardPaths::LocateDirectory); - #endif -@@ -1181,7 +1185,7 @@ - #if defined(Q_OS_OSX) - return "/usr/local/bin/xplanet"; - #endif -- return prefix + "/bin/xplanet"; -+ return xplanet_prefix + "/bin/xplanet"; - } - else if (option == "ASTAP") - { diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix index e51d181266..fd49957aa3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, wrapGAppsHook +{ lib, stdenv, fetchFromGitLab, fetchpatch, pkg-config, meson, ninja , git, criterion, gtk3, libconfig, gnuplot, opencv, json-glib , fftwFloat, cfitsio, gsl, exiv2, librtprocess, wcslib, ffmpeg -, libraw, libtiff, libpng, libjpeg, libheif, ffms +, libraw, libtiff, libpng, libjpeg, libheif, ffms, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -15,6 +15,14 @@ stdenv.mkDerivation rec { sha256 = "0h3slgpj6zdc0rwmyr9zb0vgf53283hpwb7h26skdswmggsk90i5"; }; + patches = [ + # Backport fix for broken build on glib-2.68 + (fetchpatch { + url = "https://gitlab.com/free-astro/siril/-/commit/d319fceca5b00f156e1c5e3512d3ac1f41beb16a.diff"; + sha256 = "00lq9wq8z48ly3hmkgzfqbdjaxr0hzyl2qwbj45bdnxfwqragh5m"; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config git criterion wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix index 715f5bb8bf..4f5872de07 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bowtie2"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "11apzq7l1lk3yxw97g9dfr0gwnvfh58x6apifcblgd66gbip3y1y"; + sha256 = "sha256-uEKTB8935YY6lpXv2tJBQ1hrRk63vALLQb6SUXsVyhQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/cd-hit/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/cd-hit/default.nix index bed562abe2..ba1d6c27cc 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/cd-hit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/cd-hit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, zlib, perl, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, zlib, perl, perlPackages, openmp }: stdenv.mkDerivation rec { version = "4.8.1"; @@ -14,8 +14,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ perl perlPackages.TextNSP perlPackages.PerlMagick ]; nativeBuildInputs = [ zlib makeWrapper ]; + buildInputs = lib.optional stdenv.cc.isClang openmp; - makeFlags = [ "PREFIX=$(out)/bin" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}c++" # remove once https://github.com/weizhongli/cdhit/pull/114 is merged + "PREFIX=$(out)/bin" + ]; preInstall = "mkdir -p $out/bin"; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/est-sfs/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/est-sfs/default.nix index 814baa45d8..fe4a3e4993 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/est-sfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/est-sfs/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ gsl ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + installPhase = '' mkdir -p $out/bin mkdir -p $out/share/doc/${pname} diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix index b61a0764f2..95912d3a7c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix @@ -1,28 +1,16 @@ -{lib, stdenv, fetchpatch, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, xz, pkg-config}: +{lib, stdenv, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, xz, pkg-config}: stdenv.mkDerivation rec { pname = "octopus"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "luntergroup"; repo = "octopus"; rev = "v${version}"; - sha256 = "sha256-sPOBZ0YrEdjMNVye/xwqwA5IpsLy2jWN3sm/ce1fLg4="; + sha256 = "sha256-FAogksVxUlzMlC0BqRu22Vchj6VX+8yNlHRLyb3g1sE="; }; - patches = [ - # Backport TZ patchs (https://github.com/luntergroup/octopus/issues/149) - (fetchpatch { - url = "https://github.com/luntergroup/octopus/commit/3dbd8cc33616129ad356e99a4dae82e4f6702250.patch"; - sha256 = "sha256-UCufVU9x+L1zCEhkr/48KFYRvh8w26w8Jr+O+wULKK8="; - }) - (fetchpatch { - url = "https://github.com/luntergroup/octopus/commit/af5a66a2792bd098fb53eb79fb4822625f09305e.patch"; - sha256 = "sha256-r8jv6EZHfTWVLYUBau3F+ilOd9IeH8rmatorEY5LXP4="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost gmp htslib zlib xz ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/samblaster/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/samblaster/default.nix index 48c19666ba..4315dd2767 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/samblaster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/samblaster/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0g24fq5hplnfgqkh3xqpg3lgx3wmxwnh9c7m6yw7pbi40lmgl1jv"; }; + makeFlags = [ "CPP=${stdenv.cc.targetPrefix}c++" ]; + installPhase = '' mkdir -p $out/bin cp samblaster $out/bin diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix index 74a6b49558..ca80262eb7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -35,10 +35,10 @@ in stdenv.mkDerivation rec { pname = "gwyddion"; - version = "2.57"; + version = "2.58"; src = fetchurl { url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; - sha256 = "sha256-kx/WqtNDaJQyVehxZ3weddXyaM1knX+fCuv47A9GaH0="; + sha256 = "sha256-0xNnzYkuW3nEsO2o+0WEA+Z71XWoq6FYXm342OWO9Sw="; }; nativeBuildInputs = [ pkg-config file ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix index 2da5a070ee..d8f7bd5eb5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.36"; + version = "14.31.38"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-YwXgRRUZ75l1ZptscsZae2mwkRkYXJeWSrPvw+R6TkI="; + sha256 = "sha256-yXJ1KtTH3bi24GFiVXu8zzQkreDkqbCxgm7fVoSJepg="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix index cc9202493b..af646b514a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchFromGitLab, cmake, gfortran, perl , openblas, hdf5-cpp, python3, texlive , armadillo, mpi, globalarrays, openssh -, makeWrapper, fetchpatch +, makeWrapper } : let - version = "20.10"; - gitLabRev = "v${version}"; + version = "21.02"; + # The tag keeps moving, fix a hash instead + gitLabRev = "41cee871945ac712e86ee971425a49a8fc60a936"; python = python3.withPackages (ps : with ps; [ six pyparsing ]); @@ -18,13 +19,13 @@ in stdenv.mkDerivation { owner = "Molcas"; repo = "OpenMolcas"; rev = gitLabRev; - sha256 = "0xr9plgb0cfmxxqmd3wrhvl0hv2jqqfqzxwzs1jysq2m9cxl314v"; + sha256 = "0cap53gy1wds2qaxbijw09fqhvfxphfkr93nhp9xdq84yxh4wzv6"; }; patches = [ # Required to handle openblas multiple outputs ./openblasPath.patch -]; + ]; nativeBuildInputs = [ perl cmake texlive.combined.scheme-minimal makeWrapper ]; buildInputs = [ @@ -57,6 +58,10 @@ in stdenv.mkDerivation { export PATH=$PATH:$out/bin ''; + postInstall = '' + mv $out/pymolcas $out/bin + ''; + postFixup = '' # Wrong store path in shebang (no Python pkgs), force re-patching sed -i "1s:/.*:/usr/bin/env python:" $out/bin/pymolcas diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/gnucap/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/gnucap/default.nix index c51e5de93d..0ec10f2444 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/gnucap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/gnucap/default.nix @@ -21,6 +21,7 @@ It performs nonlinear dc and transient analyses, fourier analysis, and ac analys changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${version}"; license = licenses.gpl3Plus; platforms = platforms.all; + broken = stdenv.isDarwin; # Relies on LD_LIBRARY_PATH maintainers = [ maintainers.raboof ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix index 3a3994d9ad..af5441f07e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.108"; + version = "3.3.109"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "sha256-LtlexZKih+Si/pH3oQpWdpzfZ6j+41Otgfx7nLMfFSQ="; + sha256 = "sha256-NUYezNm4tEcMqnirmo8U7Ky8ye/2MDPY3OWAk+eG3rc="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix index 1a5c0de5fb..9848eb5839 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix @@ -15,84 +15,124 @@ , boost , pkg-config , doxygen +, graphviz , pcre , libpthreadstubs , libXdmcp , lndir +, util-linux +, libselinux +, libsepol +, libthai +, libdatrie +, libxkbcommon +, epoxy +, dbus +, at-spi2-core +, libXtst + +, swig +, python +, wxPython +, opencascade +, opencascade-occt +, libngspice +, valgrind + , stable , baseName , kicadSrc , kicadVersion , i18n , withOCE -, opencascade , withOCC -, opencascade-occt , withNgspice -, libngspice , withScripting -, swig -, python -, wxPython , debug -, valgrind +, sanitizeAddress +, sanitizeThreads , withI18n -, gtk3 }: assert lib.asserts.assertMsg (!(withOCE && stdenv.isAarch64)) "OCE fails a test on Aarch64"; assert lib.asserts.assertMsg (!(withOCC && withOCE)) "Only one of OCC and OCE may be enabled"; +assert lib.assertMsg (!(stable && (sanitizeAddress || sanitizeThreads))) + "Only kicad-unstable(-small) supports address/thread sanitation"; +assert lib.assertMsg (!(sanitizeAddress && sanitizeThreads)) + "'sanitizeAddress' and 'sanitizeThreads' are mutually exclusive, use one."; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "kicad-base"; - version = kicadVersion; + version = if (stable) then kicadVersion else builtins.substring 0 10 src.rev; src = kicadSrc; # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here - # "-1" appended to indicate we're adding a patch postPatch = '' substituteInPlace CMakeModules/KiCadVersion.cmake \ - --replace "unknown" "${builtins.substring 0 10 src.rev}-1" \ - --replace "${version}" "${version}-1" + --replace "unknown" "${builtins.substring 0 10 src.rev}" \ ''; - makeFlags = optional (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; + makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; - cmakeFlags = - optionals (withScripting) [ - "-DKICAD_SCRIPTING=ON" - "-DKICAD_SCRIPTING_MODULES=ON" - "-DKICAD_SCRIPTING_PYTHON3=ON" - "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" - ] - ++ optional (!withScripting) - "-DKICAD_SCRIPTING=OFF" - ++ optional (withNgspice) "-DKICAD_SPICE=ON" - ++ optional (!withOCE) "-DKICAD_USE_OCE=OFF" - ++ optional (!withOCC) "-DKICAD_USE_OCC=OFF" - ++ optionals (withOCE) [ - "-DKICAD_USE_OCE=ON" - "-DOCE_DIR=${opencascade}" - ] - ++ optionals (withOCC) [ - "-DKICAD_USE_OCC=ON" - "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" - ] - ++ optionals (debug) [ - "-DCMAKE_BUILD_TYPE=Debug" - "-DKICAD_STDLIB_DEBUG=ON" - "-DKICAD_USE_VALGRIND=ON" - ] - ; + cmakeFlags = optionals (withScripting) [ + "-DKICAD_SCRIPTING=ON" + "-DKICAD_SCRIPTING_MODULES=ON" + "-DKICAD_SCRIPTING_PYTHON3=ON" + "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" + ] + ++ optional (!withScripting) + "-DKICAD_SCRIPTING=OFF" + ++ optional (withNgspice) "-DKICAD_SPICE=ON" + ++ optional (!withOCE) "-DKICAD_USE_OCE=OFF" + ++ optional (!withOCC) "-DKICAD_USE_OCC=OFF" + ++ optionals (withOCE) [ + "-DKICAD_USE_OCE=ON" + "-DOCE_DIR=${opencascade}" + ] + ++ optionals (withOCC) [ + "-DKICAD_USE_OCC=ON" + "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" + ] + ++ optionals (debug) [ + "-DCMAKE_BUILD_TYPE=Debug" + "-DKICAD_STDLIB_DEBUG=ON" + "-DKICAD_USE_VALGRIND=ON" + ] + ++ optionals (sanitizeAddress) [ + "-DKICAD_SANITIZE_ADDRESS=ON" + ] + ++ optionals (sanitizeThreads) [ + "-DKICAD_SANITIZE_THREADS=ON" + ]; - nativeBuildInputs = [ cmake doxygen pkg-config lndir ]; + nativeBuildInputs = [ + cmake + doxygen + graphviz + pkg-config + lndir + ] + # wanted by configuration on linux, doesn't seem to affect performance + # no effect on closure size + ++ optionals (stdenv.isLinux) [ + util-linux + libselinux + libsepol + libthai + libdatrie + libxkbcommon + epoxy + dbus.daemon + at-spi2-core + libXtst + ]; buildInputs = [ libGLU @@ -100,6 +140,7 @@ stdenv.mkDerivation rec { zlib libX11 wxGTK + wxGTK.gtk pcre libXdmcp gettext @@ -110,7 +151,6 @@ stdenv.mkDerivation rec { curl openssl boost - gtk3 ] ++ optionals (withScripting) [ swig python wxPython ] ++ optional (withNgspice) libngspice diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix index 76048733a6..770b73c712 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitLab -, gnome3 +, gnome , dconf , wxGTK30 , wxGTK31 @@ -25,6 +25,8 @@ , withScripting ? true , python3 , debug ? false +, sanitizeAddress ? false +, sanitizeThreads ? false , with3d ? true , withI18n ? true , srcs ? { } @@ -146,28 +148,28 @@ let }; python = python3; - wxPython = python.pkgs.wxPython_4_0; + wxPython = if (stable) + then python.pkgs.wxPython_4_0 + else python.pkgs.wxPython_4_1; inherit (lib) concatStringsSep flatten optionalString optionals; in stdenv.mkDerivation rec { # Common libraries, referenced during runtime, via the wrapper. - passthru.libraries = callPackages ./libraries.nix { inherit libSrc libVersion; }; - passthru.i18n = callPackage ./i18n.nix { - src = i18nSrc; - version = i18nVersion; - }; + passthru.libraries = callPackages ./libraries.nix { inherit libSrc; }; + passthru.i18n = callPackage ./i18n.nix { src = i18nSrc; }; base = callPackage ./base.nix { inherit stable baseName; inherit kicadSrc kicadVersion; inherit (passthru) i18n; inherit wxGTK python wxPython; - inherit debug withI18n withOCC withOCE withNgspice withScripting; + inherit withI18n withOCC withOCE withNgspice withScripting; + inherit debug sanitizeAddress sanitizeThreads; }; inherit pname; - version = kicadVersion; + version = if (stable) then kicadVersion else builtins.substring 0 10 src.src.rev; src = base; dontUnpack = true; @@ -187,20 +189,37 @@ stdenv.mkDerivation rec { makeWrapperArgs = with passthru.libraries; [ "--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" - "--prefix XDG_DATA_DIRS : ${gnome3.adwaita-icon-theme}/share" + "--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share" "--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}" "--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" # wrapGAppsHook did these two as well, no idea if it matters... "--prefix XDG_DATA_DIRS : ${cups}/share" "--prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules" - + # required to open a bug report link in firefox-wayland + "--set-default MOZ_DBUS_REMOTE 1" + ] + ++ optionals (stable) + [ "--set-default KISYSMOD ${footprints}/share/kicad/modules" "--set-default KICAD_SYMBOL_DIR ${symbols}/share/kicad/library" "--set-default KICAD_TEMPLATE_DIR ${templates}/share/kicad/template" "--prefix KICAD_TEMPLATE_DIR : ${symbols}/share/kicad/template" "--prefix KICAD_TEMPLATE_DIR : ${footprints}/share/kicad/template" ] - ++ optionals (with3d) [ "--set-default KISYS3DMOD ${packages3d}/share/kicad/modules/packages3d" ] + ++ optionals (stable && with3d) [ "--set-default KISYS3DMOD ${packages3d}/share/kicad/modules/packages3d" ] + ++ optionals (!stable) + [ + "--set-default KICAD6_FOOTPRINT_DIR ${footprints}/share/kicad/modules" + "--set-default KICAD6_SYMBOL_DIR ${symbols}/share/kicad/library" + "--set-default KICAD6_TEMPLATE_DIR ${templates}/share/kicad/template" + "--prefix KICAD6_TEMPLATE_DIR : ${symbols}/share/kicad/template" + "--prefix KICAD6_TEMPLATE_DIR : ${footprints}/share/kicad/template" + ] + ++ optionals (!stable && with3d) + [ + "--set-default KISYS3DMOD ${packages3d}/share/kicad/3dmodels" + "--set-default KICAD6_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" + ] ++ optionals (withNgspice) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] # infinisil's workaround for #39493 @@ -240,6 +259,10 @@ stdenv.mkDerivation rec { ln -s ${base}/share/applications $out/share/applications ln -s ${base}/share/icons $out/share/icons ln -s ${base}/share/mime $out/share/mime + '' + optionalString (stable) '' + ln -s ${base}/share/appdata $out/share/appdata + '' + optionalString (!stable) '' + ln -s ${base}/share/metainfo $out/share/metainfo ''; # can't run this for each pname @@ -260,8 +283,7 @@ stdenv.mkDerivation rec { The Programs handle Schematic Capture, and PCB Layout with Gerber output. ''; license = lib.licenses.gpl3Plus; - # berce seems inactive... - maintainers = with lib.maintainers; [ evils kiwi berce ]; + maintainers = with lib.maintainers; [ evils kiwi ]; # kicad is cross platform platforms = lib.platforms.all; # despite that, nipkgs' wxGTK for darwin is "wxmac" diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/i18n.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/i18n.nix index 9a93e4ca7c..c9a70a0060 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/i18n.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/i18n.nix @@ -2,13 +2,13 @@ , cmake , gettext , src -, version }: stdenv.mkDerivation { - inherit src version; + inherit src; pname = "kicad-i18n"; + version = builtins.substring 0 10 src.rev; nativeBuildInputs = [ cmake gettext ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix index e98f2e4957..9591cbc31c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix @@ -2,13 +2,12 @@ , cmake , gettext , libSrc -, libVersion }: let mkLib = name: stdenv.mkDerivation { pname = "kicad-${name}"; - version = libVersion; + version = builtins.substring 0 10 (libSrc name).rev; src = libSrc name; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix index 8a5e5d8f5f..c30c074a5d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,17 +3,17 @@ { "kicad" = { kicadVersion = { - version = "5.1.9"; + version = "5.1.10"; src = { - rev = "73d0e3b20dec05c4350efa5b69916eb29a7bfcb5"; - sha256 = "1cqh3bc9y140hbryfk9qavs2y3lj5sm9q0qjxcf4mm472afzckky"; + rev = "88a1d61d58fdd62149bd1e00984e01540148ca1b"; + sha256 = "10ix560bqy0lprnik1bprxw9ix4g8w2ipvyikx551ak9ryvgwjcc"; }; }; libVersion = { - version = "5.1.9"; + version = "5.1.10"; libSources = { - i18n.rev = "04f3231f60d55400cb81564b2cd465a57d5192d5"; - i18n.sha256 = "04jq1dcag6i2ljjfqrib65mn4wg4c4nmi7i946l3bywc0rkqsx1f"; + i18n.rev = "f081afe79be4660d5c49a9d674e3cb666d76d4d0"; + i18n.sha256 = "0y51l0r62cnxkvpc21732p3cx7pjvaqjih8193502hlv9kv1j9p6"; symbols.rev = "6dec5004b6a2679c19d4857bda2f90c5ab3a5726"; symbols.sha256 = "0n25rq32jwyigfw26faqraillwv6zbi2ywy26dkz5zqlf5xp56ad"; templates.rev = "1ccbaf3704e8ff4030d0915f71e051af621ef7d7"; @@ -27,23 +27,23 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2020-12-23"; + version = "2021-05-16"; src = { - rev = "912657dd238ad78cfc5d9d5e426ea850d5554fb3"; - sha256 = "1p5kr4d4zpajwdmya1f351y1ix8qmvsx1hrnvhzh7yc3g72kgxah"; + rev = "c33b2cfa8d16072b9d1bce558e443c4afa889d06"; + sha256 = "1fvbxjpf880ikjqjhzj8wlxj0845gzrj1yv35rk7akbg4vl9ph72"; }; }; libVersion = { - version = "2020-12-23"; + version = "2021-05-16"; libSources = { i18n.rev = "e89d9a89bec59199c1ade56ee2556591412ab7b0"; i18n.sha256 = "04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl"; - symbols.rev = "e538abb015b4f289910a6f26b2f1b9cb8bf2efdb"; - symbols.sha256 = "117y4cm46anlrnw6y6mdjgl1a5gab6h6m7cwx3q7qb284m9bs5gi"; - templates.rev = "32a4f6fab863976fdcfa232e3e08fdcf3323a954"; - templates.sha256 = "13r94dghrh9slpj7nkzv0zqv5hk49s6pxm4q5ndqx0y8037ivmhk"; - footprints.rev = "15ffd67e01257d4d8134dbd6708cb58977eeccbe"; - footprints.sha256 = "1ad5k3wh2zqfibrar7pd3g363jk2q51dvraxnq3zlxa2x4znh7mw"; + symbols.rev = "32de73ea01347a005790119eb4102c550815685c"; + symbols.sha256 = "0gj10v06rkxlxngc40d1sfmlcagy5p7jfxid0lch4w0wxfjmks7z"; + templates.rev = "073d1941c428242a563dcb5301ff5c7479fe9c71"; + templates.sha256 = "14p06m2zvlzzz2w74y83f2zml7mgv5dhy2nyfkpblanxawrzxv1x"; + footprints.rev = "8fa36dfa3423d8777472e3475c1c2b0b2069624f"; + footprints.sha256 = "138xfkr0prxw2djkwc1m4mlp9km99v12sivbqhm1jkq5yxngdbin"; packages3d.rev = "d8b7e8c56d535f4d7e46373bf24c754a8403da1f"; packages3d.sha256 = "0dh8ixg0w43wzj5h3164dz6l1vl4llwxhi3qcdgj1lgvrs28aywd"; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/pulseview/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/pulseview/default.nix index 00c830fcd3..e9496ce60c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/pulseview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/pulseview/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkg-config, cmake, glib, boost, libsigrok +{ mkDerivation, lib, fetchurl, fetchpatch, pkg-config, cmake, glib, boost, libsigrok , libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm , pcre, librevisa, python3, qtbase, qtsvg }: @@ -20,6 +20,15 @@ mkDerivation rec { qtbase qtsvg ]; + patches = [ + # Allow building with glib 2.68 + # PR at https://github.com/sigrokproject/pulseview/pull/39 + (fetchpatch { + url = "https://github.com/sigrokproject/pulseview/commit/fb89dd11f2a4a08b73c498869789e38677181a8d.patch"; + sha256 = "07ifsis9jlc0jjp2d11f7hvw9kaxcbk0a57h2m4xsv1d7vzl9yfh"; + }) + ]; + meta = with lib; { description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)"; homepage = "https://sigrok.org/"; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix index 20a17b1122..9d6212fef1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -9,7 +9,7 @@ , customOCamlPackages ? null , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses , buildIde ? true -, glib, gnome3, wrapGAppsHook +, glib, gnome, wrapGAppsHook , csdp ? null , version, coq-version ? null, }@args: @@ -128,7 +128,7 @@ self = stdenv.mkDerivation { buildInputs = [ ncurses ] ++ ocamlBuildInputs ++ optionals buildIde (if versionAtLeast "8.10" - then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.adwaita-icon-theme wrapGAppsHook ] + then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme wrapGAppsHook ] else [ ocamlPackages.lablgtk ]); postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq2html/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq2html/default.nix index 46f2ebd775..393b846408 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/coq2html/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq2html/default.nix @@ -1,20 +1,17 @@ -{ lib, stdenv, fetchgit, ocaml }: +{ lib, stdenv, fetchFromGitHub, ocaml }: -let - version = "20170720"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "coq2html"; - inherit version; + version = "1.2"; - src = fetchgit { - url = "https://github.com/xavierleroy/coq2html"; - rev = "e2b94093c6b9a877717f181765e30577de22439e"; - sha256 = "1x466j0pyjggyz0870pdllv9f5vpnfrgkd0w7ajvm9rkwyp3f610"; + src = fetchFromGitHub { + owner = "xavierleroy"; + repo = "coq2html"; + rev = "v${version}"; + sha256 = "sha256-ty/6A3wivjDCrmlZAcZyaIwQQ+vPBJm9MhtW6nZcV3s="; }; - buildInputs = [ ocaml ]; + nativeBuildInputs = [ ocaml ]; installPhase = '' mkdir -p $out/bin @@ -32,8 +29,8 @@ stdenv.mkDerivation { "Proof" keyword. ''; homepage = "https://github.com/xavierleroy/coq2html"; - license = licenses.gpl2; - maintainers = with maintainers; [ jwiegley ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jwiegley siraben ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix index 45a1345de8..d20be86daf 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl -, openssl, gmp, zlib, fetchFromGitHub, rustPlatform }: +, openssl, gmp, zlib, fetchFromGitHub, rustPlatform, libiconv }: let libPath = lib.makeLibraryPath [ gmp ]; @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config makeWrapper ]; OPENSSL_NO_VENDOR = 1; - buildInputs = [ curl zlib openssl ]; + buildInputs = [ curl zlib openssl ] + ++ lib.optional stdenv.isDarwin libiconv; cargoBuildFlags = [ "--features no-self-update" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix index 531081beaf..e9b0cc7540 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix @@ -5,7 +5,7 @@ , ant , jre , makeWrapper -, runCommand +, testVersion , key }: @@ -51,10 +51,13 @@ in stdenv.mkDerivation rec { --add-flags "-cp $out/share/java/KeY.jar de.uka.ilkd.key.core.Main" ''; - passthru.tests.check-version = runCommand "key-help" {} '' - ${key}/bin/KeY --help | grep 2.5 # Wrong version in the code. On next version change to ${version} - touch $out - ''; + passthru.tests.version = + testVersion { + package = key; + command = "KeY --help"; + # Wrong '2.5' version in the code. On next version change to ${version} + version = "2.5"; + }; meta = with lib; { description = "Java formal verification tool"; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/petrinizer/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/petrinizer/default.nix index 38039f61fd..e28137dde7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/petrinizer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/petrinizer/default.nix @@ -1,12 +1,8 @@ -{ mkDerivation, callPackage, buildPackages +{ mkDerivation , async, base, bytestring, containers, fetchFromGitLab, mtl -, parallel-io, parsec, lib, stm, transformers +, parallel-io, parsec, lib, stm, transformers, sbv_7_13, z3 }: -let - z3 = callPackage ./z3.nix { gomp = null; z3 = buildPackages.z3; }; -in let - sbv = callPackage ./sbv-7.13.nix { inherit z3; }; -in + mkDerivation rec { pname = "petrinizer"; version = "0.9.1.1"; @@ -22,10 +18,11 @@ mkDerivation rec { isLibrary = false; isExecutable = true; executableHaskellDepends = [ - async base bytestring containers mtl parallel-io parsec sbv stm + async base bytestring containers mtl parallel-io parsec sbv_7_13 stm transformers ]; description = "Safety and Liveness Analysis of Petri Nets with SMT solvers"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ raskin ]; + inherit (sbv_7_13.meta) platforms; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix b/third_party/nixpkgs/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix deleted file mode 100644 index f0c8dd2490..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ mkDerivation, array, async, base, bytestring, containers -, crackNum, deepseq, directory, doctest, filepath, generic-deriving -, ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random -, lib, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck -, template-haskell, time, z3 -}: -mkDerivation { - pname = "sbv"; - version = "7.13"; - sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array async base containers crackNum deepseq directory filepath - generic-deriving ghc mtl pretty process QuickCheck random syb - template-haskell time - ]; - testHaskellDepends = [ - base bytestring containers crackNum directory doctest filepath Glob - hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit - tasty-quickcheck template-haskell - ]; - testSystemDepends = [ z3 ]; - homepage = "http://leventerkok.github.com/sbv/"; - description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; - license = lib.licenses.bsd3; -} diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/petrinizer/z3.nix b/third_party/nixpkgs/pkgs/applications/science/logic/petrinizer/z3.nix deleted file mode 100644 index a20ccea16d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/logic/petrinizer/z3.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ mkDerivation, fetchpatch -, base, containers, gomp, hspec, QuickCheck, lib -, transformers, z3 -}: -mkDerivation { - pname = "z3"; - version = "408.0"; - sha256 = "13qkzy9wc17rm60i24fa9sx15ywbxq4a80g33w20887gvqyc0q53"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers transformers ]; - librarySystemDepends = [ gomp z3 ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "https://github.com/IagoAbal/haskell-z3"; - description = "Bindings for the Z3 Theorem Prover"; - license = lib.licenses.bsd3; - doCheck = false; - patches = [ - (fetchpatch { - url = "https://github.com/IagoAbal/haskell-z3/commit/b10e09b8a809fb5bbbb1ef86aeb62109ece99cae.patch"; - sha256 = "13fnrs27mg3985r3lwks8fxfxr5inrayy2cyx2867d92pnl3yry4"; - }) - ]; -} diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/poly/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/poly/default.nix index 15e89138c6..d0344a3737 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/poly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/poly/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "libpoly"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "libpoly"; # they've pushed to the release branch, use explicit tag rev = "refs/tags/v${version}"; - sha256 = "1n3gijksnl2ybznq4lkwm2428f82423sxq18gnb2g1kiwqlzdaa3"; + sha256 = "sha256-E2lHo8Bt4ujoGQ623fjkQbqRnDYJYilXdRt4lnF4wJk="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix index d217e2b9b5..a77f2dbac4 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -92,4 +92,8 @@ mkDerivation (common "tamarin-prover" src // { tamarin-prover-term tamarin-prover-theory ]; + + # tamarin-prover 1.6 is incompatible with maude 3.1. + hydraPlatforms = lib.platforms.none; + broken = true; }) diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix index 50d0aa6f9d..620ccfb084 100644 --- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -15,7 +15,7 @@ propagatedBuildInputs = with python3Packages; [ pyqt5 lxml - sip + sip_4 ]; preBuild = '' make qt5py3 diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/starspace/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/starspace/default.nix index b511b4ea42..d5a6cb796a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/starspace/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/starspace/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ boost165 ]; + makeFlags = [ + "CXX=${stdenv.cc.targetPrefix}c++" + "BOOST_DIR=${boost165.dev}/include" + ]; + installPhase = '' mkdir -p $out/bin mv starspace $out/bin diff --git a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix index 8905df8cce..827c817fd1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix @@ -69,8 +69,8 @@ stdenv.mkDerivation rec { --disable-R-framework --without-x OBJC="clang" - CPPFLAGS="-isystem ${libcxx}/include/c++/v1" - LDFLAGS="-L${libcxx}/lib" + CPPFLAGS="-isystem ${lib.getDev libcxx}/include/c++/v1" + LDFLAGS="-L${lib.getLib libcxx}/lib" '' + '' ) echo >>etc/Renviron.in "TCLLIBPATH=${tk}/lib" diff --git a/third_party/nixpkgs/pkgs/applications/science/math/bcal/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/bcal/default.nix index 8cbf90a718..1494b53248 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/bcal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/bcal/default.nix @@ -1,6 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, readline, bc }: - -with lib; +{ lib +, stdenv +, fetchFromGitHub +, readline +, bc +, python3Packages +}: stdenv.mkDerivation rec { pname = "bcal"; @@ -13,23 +17,21 @@ stdenv.mkDerivation rec { sha256 = "4vR5rcbNkoEdSRNoMH9qMHP3iWFxejkVfXNiYfwbo/A="; }; - nativeBuildInputs = [ python3Packages.pytest ]; - buildInputs = [ readline ]; + installFlags = [ "PREFIX=$(out)" ]; + doCheck = true; - checkInputs = [ bc ]; - checkPhase = '' - python3 -m pytest test.py - ''; - installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + checkInputs = [ bc python3Packages.pytestCheckHook ]; - meta = { + pytestFlagsArray = [ "test.py" ]; + + meta = with lib; { description = "Storage conversion and expression calculator"; homepage = "https://github.com/jarun/bcal"; license = licenses.gpl3Only; - platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ jfrankenau ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/cntk/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/cntk/default.nix index e15e2a43d7..c007490c94 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/cntk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/cntk/default.nix @@ -33,6 +33,9 @@ in stdenv.mkDerivation rec { # Force OpenMPI to use g++ in PATH. OMPI_CXX = "g++"; + # Uses some deprecated tensorflow functions + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + buildInputs = [ openblas opencv3 libzip boost protobuf mpi ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn; @@ -40,7 +43,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-opencv=${opencv3}" "--with-libzip=${libzip.dev}" - "--with-openblas=${openblas}" + "--with-openblas=${openblas.dev}" "--with-boost=${boost.dev}" "--with-protobuf=${protobuf}" "--with-mpi=${mpi}" diff --git a/third_party/nixpkgs/pkgs/applications/science/math/eukleides/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/eukleides/default.nix index 5f7fe58465..b5a9fc3fa8 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/eukleides/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/eukleides/default.nix @@ -1,26 +1,57 @@ -{ lib, stdenv, fetchurl, bison, flex, texinfo, readline, texLive }: +{ lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo, readline, texLive }: -let - name = "eukleides"; +lib.fix (eukleides: stdenv.mkDerivation rec { + pname = "eukleides"; version = "1.5.4"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; src = fetchurl { - url = "http://www.eukleides.org/files/${name}-${version}.tar.bz2"; + url = "http://www.eukleides.org/files/${pname}-${version}.tar.bz2"; sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q"; }; - buildInputs = [bison flex texinfo readline texLive]; + # use $CC instead of hardcoded gcc + patches = [ ./use-CC.patch ]; - preConfigure = "sed -i 's/ginstall-info/install-info/g' doc/Makefile"; - installPhase = "mkdir -p $out/bin ; make PREFIX=$out install"; + nativeBuildInputs = [ bison flex texinfo makeWrapper ]; + + buildInputs = [ readline texLive ]; + + preConfigure = '' + substituteInPlace Makefile \ + --replace mktexlsr true + + substituteInPlace doc/Makefile \ + --replace ginstall-info install-info + + substituteInPlace Config \ + --replace '/usr/local' "$out" \ + --replace '$(SHARE_DIR)/texmf' "$tex" + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + postInstall = '' + wrapProgram $out/bin/euktoeps \ + --set-default TEXINPUTS : \ + --prefix TEXINPUTS : "$tex/tex/latex/eukleides" \ + --prefix PATH : "${texLive}/bin" + wrapProgram $out/bin/euktopdf \ + --set-default TEXINPUTS : \ + --prefix TEXINPUTS : "$tex/tex/latex/eukleides" \ + --prefix PATH : "${texLive}/bin" + ''; + + outputs = [ "out" "doc" "tex" ]; + + passthru.tlType = "run"; + passthru.pkgs = [ eukleides.tex ]; meta = { description = "Geometry Drawing Language"; homepage = "http://www.eukleides.org/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl3Plus; longDescription = '' Eukleides is a computer language devoted to elementary plane @@ -31,7 +62,7 @@ stdenv.mkDerivation { circles and conics. ''; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.peti ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/math/eukleides/use-CC.patch b/third_party/nixpkgs/pkgs/applications/science/math/eukleides/use-CC.patch new file mode 100644 index 0000000000..08bd71ec9d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/math/eukleides/use-CC.patch @@ -0,0 +1,11 @@ +--- a/build/Makefile ++++ b/build/Makefile +@@ -11,7 +11,7 @@ LEX = flex + LFLAGS = -8 + YACC = bison + YFLAGS = -d +-CC = gcc ++CC ?= gcc + IFLAGS = -I$(COMMON_DIR) -I$(MAIN_DIR) -I$(BUILD_DIR) + ifneq ($(strip $(LOCALES)),) + MOFLAGS = -DMO_DIR=\"$(MO_DIR)\" diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gap/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gap/default.nix index 3b3d8a58b5..c309423f14 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/gap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/gap/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , makeWrapper , readline , gmp @@ -35,7 +34,7 @@ let "autpgrp-*" "alnuth-*" "crisp-*" - "ctbllib" + "ctbllib-*" "FactInt-*" "fga" "irredsol-*" @@ -62,11 +61,11 @@ in stdenv.mkDerivation rec { pname = "gap"; # https://www.gap-system.org/Releases/ - version = "4.11.0"; + version = "4.11.1"; src = fetchurl { - url = "https://files.gap-system.org/gap-${lib.versions.major version}.${lib.versions.minor version}/tar.bz2/gap-${version}.tar.bz2"; - sha256 = "sha256-vwcKENwqxgWT/mXfD4c9ctTWdQHobrJipva9SPyGhgI="; + url = "https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz"; + sha256 = "sha256-ZjXF2n2CdV+DOUhrnKwzdm9YcS8pfoI0+6QIGJAuowQ="; }; # remove all non-essential packages (which take up a lot of space) @@ -84,23 +83,6 @@ stdenv.mkDerivation rec { makeWrapper ]; - patches = [ - # Fix for locale specific tests causing issues. Already upstream. - # Backport of https://github.com/gap-system/gap/pull/4022 - (fetchpatch { - name = "remove-locale-specific-tests.patch"; - url = "https://github.com/gap-system/gap/commit/c18b0c4215b5212a2cc4f305e2d5b94ba716bee8.patch"; - sha256 = "sha256-De+T9Y7ewRT6plJrj2VR8axRvD/JCTYKOBWB7Bw0oq0="; - }) - - # fixes aarch64 gc crashes: https://github.com/gap-system/gap/pull/3965 - (fetchpatch { - name = "mark-genstackfuncbags-as-noinline.patch"; - url = "https://github.com/gap-system/gap/commit/f0a8f49ff8dad0a5fa77253d45457c6f40f96778.patch"; - sha256 = "sha256-GU9tOP1stX2vn8m8kXOBupEpxIYArA76ibKL8eLn0MY="; - }) - ]; - # "teststandard" is a superset of testinstall. It takes ~1h instead of ~1min. # tests are run twice, once with all packages loaded and once without # checkTarget = "teststandard"; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch b/third_party/nixpkgs/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch deleted file mode 100644 index 3a2f7231c0..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gasman.c b/src/gasman.c -index 417811401..314a74190 100644 ---- a/src/gasman.c -+++ b/src/gasman.c -@@ -1861,7 +1861,7 @@ void SparcStackFuncBags( void ) - #endif - - --void GenStackFuncBags ( void ) -+NOINLINE void GenStackFuncBags ( void ) - { - Bag * top; /* top of stack */ - Bag * p; /* loop variable */ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/glsurf/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/glsurf/default.nix index 599d4bac8e..208bb95f93 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/glsurf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/glsurf/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, ocamlPackages, libGLU, libGL, freeglut -, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib +{ lib, stdenv, fetchurl, ocamlPackages, libGLU, libGL, freeglut, giflib +, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng }: stdenv.mkDerivation { @@ -10,10 +10,10 @@ stdenv.mkDerivation { sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ freeglut libGLU libGL libmysqlclient mpfr gmp - libtiff libjpeg libpng giflib ] + buildInputs = [ freeglut libGLU libGL libmysqlclient mpfr giflib gmp + libtiff libjpeg libpng ] ++ (with ocamlPackages; [ - ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl + ocaml findlib ocaml_mysql lablgl camlimages_4_1_2 mlgmpidl ]); installPhase = '' @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = "https://raffalli.eu/~christophe/glsurf/"; description = "A program to draw implicit surfaces and curves"; - license = lib.licenses.lgpl21; + license = lib.licenses.gpl2Plus; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix index b85f8ba47a..84f7ca72a3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix @@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.8.3"; + version = "4.8.4"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "sha256-JvJIsSmgDR6gZY8CRBDCSQvNneckVFoRRKCSxgQnZ3U="; + sha256 = "sha256-dg29wHLqo8gtBmxbo7BurN0zBOsqlzc/5K2pUJ8Las4="; }; buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gretl/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gretl/default.nix index cc9fe7c4d2..450021925b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/gretl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/gretl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gretl"; - version = "2021a"; + version = "2021b"; src = fetchurl { url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; - sha256 = "sha256-BDaTv6PORiBnsEaU7uXJIKuxTqIgpY44vUmSViyME0A="; + sha256 = "sha256-3KSAA0UPx3cqMXf/G5nrlCfLjWcDiGtzvJe/syRyE6c="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch b/third_party/nixpkgs/pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch new file mode 100644 index 0000000000..0bc29b9aab --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch @@ -0,0 +1,12 @@ +diff --git a/ion/src/simulator/linux/Makefile b/ion/src/simulator/linux/Makefile +index ca7da03fa..b05bba115 100644 +--- a/ion/src/simulator/linux/Makefile ++++ b/ion/src/simulator/linux/Makefile +@@ -28,7 +28,6 @@ ion_src += $(addprefix ion/src/simulator/shared/, \ + collect_registers.cpp \ + haptics.cpp \ + journal.cpp \ +- platform_action_modifier_ctrl.cpp \ + state_file.cpp \ + ) + diff --git a/third_party/nixpkgs/pkgs/applications/science/math/numworks-epsilon/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/numworks-epsilon/default.nix index 9ec41386da..a90ebc67b6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/numworks-epsilon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/numworks-epsilon/default.nix @@ -2,6 +2,8 @@ , lib , fetchFromGitHub , libpng +, libjpeg +, freetype , xorg , python3 , imagemagick @@ -11,18 +13,20 @@ stdenv.mkDerivation rec { pname = "numworks-epsilon"; - version = "15.3.2"; + version = "15.5.0"; src = fetchFromGitHub { owner = "numworks"; repo = "epsilon"; rev = version; - sha256 = "1q34dilyypiggjs16486jm122yf20wcigqxvspc77ig9albaxgh5"; + sha256 = "fPBO3FzZ4k5OxG+Ifc6R/au4Te974HNKAEdHz+aFdSg="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng + libjpeg + freetype xorg.libXext python3 imagemagick @@ -33,6 +37,12 @@ stdenv.mkDerivation rec { "PLATFORM=simulator" ]; + patches = [ + # Remove make rule Introduced in cba596dde7 + # which causes it to not build with nix + ./0001-ion-linux-makerules.patch + ]; + installPhase = '' runHook preInstall @@ -44,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Emulator for Epsilon, a High-performance graphing calculator operating system"; + description = "Simulator for Epsilon, a High-performance graphing calculator operating system"; homepage = "https://numworks.com/"; license = licenses.cc-by-nc-sa-40; maintainers = with maintainers; [ erikbackman ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix index a99cbbbe0d..fc1a2e0abf 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix @@ -12,14 +12,23 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; - version = "2.11.4"; + version = "2.13.1"; src = fetchurl { - # Versions with current majorMinor values are at http://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz - url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-v8iPxPc1L0hA5uNSxy8DacvqikVAOxg0piafNwmXCxw="; + urls = [ + "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz" + # old versions are at the url below + "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz" + ]; + sha256 = "sha256-gez31wzNquIwFlz/Ynyc4uwpe48i+fQHQiedhfht/LE="; }; + patches = [ + # rebased version of 3edb98db78, see + # https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2284 + ./rnfdisc.patch + ]; + buildInputs = [ gmp readline diff --git a/third_party/nixpkgs/pkgs/applications/science/math/pari/rnfdisc.patch b/third_party/nixpkgs/pkgs/applications/science/math/pari/rnfdisc.patch new file mode 100644 index 0000000000..6acac96481 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/math/pari/rnfdisc.patch @@ -0,0 +1,51 @@ +commit 0d8a3ac970291c62b56104172418b3f2ca30927c +Author: Bill Allombert +Date: Sun Mar 28 13:27:24 2021 +0200 + + rnfdisc_factored: remove spurious Q_primpart [#2284] + +diff --git a/src/basemath/base2.c b/src/basemath/base2.c +index 7e7d0db9d..c461826f4 100644 +--- a/src/basemath/base2.c ++++ b/src/basemath/base2.c +@@ -3582,7 +3582,7 @@ rnfdisc_factored(GEN nf, GEN pol, GEN *pd) + + nf = checknf(nf); + pol = rnfdisc_get_T(nf, pol, &lim); +- disc = nf_to_scalar_or_basis(nf, nfX_disc(nf, Q_primpart(pol))); ++ disc = nf_to_scalar_or_basis(nf, nfX_disc(nf, pol)); + pol = nfX_to_monic(nf, pol, NULL); + fa = idealfactor_partial(nf, disc, lim); + P = gel(fa,1); l = lg(P); +diff --git a/src/test/32/rnf b/src/test/32/rnf +index 1e743f415..c016dce00 100644 +--- a/src/test/32/rnf ++++ b/src/test/32/rnf +@@ -853,9 +853,10 @@ error("inconsistent dimensions in idealtwoelt.") + 0 + 0 + 1 +-[[7361, 3786, 318, 5823; 0, 1, 0, 0; 0, 0, 1, 0; 0, 0, 0, 1], [-3, 6, -2, 0] +-~] +-[2, -1] ++[[433, 322, 318, 1318/17; 0, 1, 0, 12/17; 0, 0, 1, 5/17; 0, 0, 0, 1/17], [25 ++/17, -12/17, 12/17, 16/17]~] ++[1, -1] ++[[12, 0, 0, 0; 0, 12, 4, 0; 0, 0, 4, 0; 0, 0, 0, 4], [6, 5, -1, 2]~] + *** at top-level: rnfdedekind(nf,P,pr2,1) + *** ^----------------------- + *** rnfdedekind: sorry, Dedekind in the difficult case is not yet implemented. +diff --git a/src/test/in/rnf b/src/test/in/rnf +index 7851ae291..318d5349e 100644 +--- a/src/test/in/rnf ++++ b/src/test/in/rnf +@@ -212,6 +212,9 @@ k = nfinit(y^4 + 10*y^2 + 17); + rnfdisc(k, x^2 - x + 1/Mod(y,k.pol)) + rnfdisc(k, x^2 - x + 1/2) + ++k = nfinit(y^4 - 10*y^2 + 1); ++rnfdisc(k,x^2-(y^3/2+y^2-5*y/2+1)) ++ + \\ ERRORS, keep at end of file + rnfdedekind(nf, P, pr2, 1) + rnfdedekind(nf, P) diff --git a/third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix index 9cdcd2b9ea..54e26cd2ee 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix @@ -22,23 +22,44 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { - name = "handle_factor.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/handle_factor.patch?h=9.3.rc3"; - sha256 = "sha256-U1lb5qwBqZZgklfDMhBX4K5u8bz5x42O4w7hyNy2YVw="; - }) + # the five patches below are included with sage 9.3. since pynac + # is a self-described "Sage Math support library", we include them + # here. + # https://trac.sagemath.org/ticket/30688 (fetchpatch { name = "power_inf_loop.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/power_inf_loop.patch?h=9.3.rc3"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/power_inf_loop.patch?h=9.3"; sha256 = "sha256-VYeaJl8u2wl7FQ/6xnpZv1KpdNYEmJoPhuMrBADyTRs="; }) + # https://trac.sagemath.org/ticket/31479 + (fetchpatch { + name = "disable_poly_mul_expand.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/disable_poly_mul_expand.patch?h=9.3"; + sha256 = "sha256-gRjoltU9Tzj7fjNyE25fY+iyDxERzSTOMigzxFpUqPo="; + }) + + # https://trac.sagemath.org/ticket/31530 (fetchpatch { name = "too_much_sub.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/too_much_sub.patch?h=9.3.rc3"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/too_much_sub.patch?h=9.3"; sha256 = "sha256-lw7xSQ/l+rzPu+ghWF4omYF0mKksGGPuuHJTktvbdis="; }) + + # https://trac.sagemath.org/ticket/31554 + (fetchpatch { + name = "handle_factor.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/handle_factor.patch?h=9.3"; + sha256 = "sha256-U1lb5qwBqZZgklfDMhBX4K5u8bz5x42O4w7hyNy2YVw="; + }) + + # https://trac.sagemath.org/ticket/31645 + (fetchpatch { + name = "seriesbug.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/seriesbug.patch?h=9.3"; + sha256 = "sha256-b3//oirN7JHDYqrvE+tDYcnKpSYQJ08yBzcNlII2Dts="; + }) ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix index 91e855777f..36715764d0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix @@ -24,14 +24,14 @@ let ); in stdenv.mkDerivation rec { - version = "9.3.rc4"; + version = "9.3"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "sha256-LDY07By2j6JagkgT9zeDJ93+m2/oXXEnDRTDzmR8ftk="; + sha256 = "sha256-l9DX8jcDdKA7GJ6xU+nBsmlZxrcZ9ZUAJju621ooBEo="; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -78,6 +78,18 @@ stdenv.mkDerivation rec { # ignore a deprecation warning for usage of `cmp` in the attrs library in the doctests ./patches/ignore-cmp-deprecation.patch + + # https://trac.sagemath.org/ticket/30801. this patch has + # positive_review but has not been merged upstream yet, so we + # don't use fetchSageDiff because it returns a file that contains + # each commit as a separate patch instead of a single diff, and + # some commits from the pari update branch are already in 9.3.rc5 + # (auto-resolvable merge conflicts). + (fetchpatch { + name = "pari-2.13.1.patch"; + url = "https://github.com/sagemath/sagetrac-mirror/compare/d6c5cd9be78cc448ee4c54bac93385b1244a234c...10a4531721d2700fd717e2b3a1364508ffd971c3.diff"; + sha256 = "sha256-zMjRMEReoiTvmt+vvV0Ij1jtyLSLwSXBEVXqgvmq1D4="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix index 695af3d174..df298aab21 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix @@ -31,11 +31,9 @@ stdenv.mkDerivation rec { owner = "Singular"; repo = "Singular"; - # 4.2.0p2 is not tagged, but the tarball matches commit - # 6f68939ddf612d96e3caaaaa8275f77613ac1da8. the commit below has - # two extra fixes. - rev = "3cda50c00a849455efa2502e56596955491a353a"; - sha256 = "sha256-OizPhGE6L2LTOrKfeDdDB6BSdvYkDVXvbbYjV14hnHM="; + # 4.2.0p2 is not tagged, but the tarball matches the commit below. + rev = "6f68939ddf612d96e3caaaaa8275f77613ac1da8"; + sha256 = "sha256-BJNzYylzDqD/5YjzjxPRb/c96tYiuGy9Y+A7qf3ZSG8="; # if a release is tagged it will be in the format below. # rev = "Release${lib.replaceStrings ["."] ["-"] version}"; @@ -60,6 +58,13 @@ stdenv.mkDerivation rec { # https://github.com/alsa-project/alsa-firmware/issues/3 for a # related issue. ./use-older-ax-prog-cc-for-build.patch + + # https://github.com/Singular/Singular/issues/1086 + (fetchpatch { + name = "schubert-lib-fails-with-too-many-cpus.patch"; + url = "https://github.com/Singular/Singular/commit/3cda50c00a849455efa2502e56596955491a353a.patch"; + sha256 = "sha256-fgYd+2vT32w5Ki8kKx6PfZn2e4QSJcYWOwEFXtc+lSA="; + }) ] ++ lib.optionals enableDocs [ # singular supports building without 4ti2, bertini, normaliz or # topcom just fine, but the docbuilding does not skip manual pages @@ -67,6 +72,13 @@ stdenv.mkDerivation rec { # doc2tex.pl::HandleLib, since it seems to ignore "-exclude" # argumens). skip them manually. ./disable-docs-for-optional-unpackaged-deps.patch + + # fix some non-ascii characters in doc/decodegb.doc + (fetchpatch { + name = "decodegb-ascii.patch"; + url = "https://github.com/Singular/Singular/commit/36966d9009de572ee4dbc487f3e5744098fe91be.patch"; + sha256 = "sha256-9WcEov/oOQRC584ag6WVHFwY2aCjbM75HWyvZoEwppw="; + }) ]; configureFlags = [ @@ -83,9 +95,6 @@ stdenv.mkDerivation rec { substituteInPlace Tst/regress.cmd --replace 'mysystem_catch("hostname")' 'nix_test_runner' patchShebangs . - '' + lib.optionalString enableDocs '' - # work around encoding problem - sed -i -e 's/\xb7/@cdot{}/g' doc/decodegb.doc ''; # For reference (last checked on commit 75f460d): @@ -149,7 +158,7 @@ stdenv.mkDerivation rec { # singular tests are a bit complicated, see # https://github.com/Singular/Singular/tree/spielwiese/Tst - # https://www.singular.uni-kl.de/forum/viewtopic.php&t=2773 + # https://www.singular.uni-kl.de/forum/viewtopic.php?f=10&t=2773 testsToRun = [ "Old/universal.lst" "Buch/buch.lst" @@ -181,7 +190,7 @@ stdenv.mkDerivation rec { 2>"$TMPDIR/out-err.log" # unfortunately regress.cmd always returns exit code 0, so check stderr - # https://www.singular.uni-kl.de/forum/viewtopic.php&t=2773 + # https://www.singular.uni-kl.de/forum/viewtopic.php?f=10&t=2773 if [[ -s "$TMPDIR/out-err.log" ]]; then cat "$TMPDIR/out-err.log" exit 1 diff --git a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix index 25215d7abb..94e675d7dd 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , wrapGAppsHook, cmake, gettext -, maxima, wxGTK, gnome3 }: +, maxima, wxGTK, gnome }: stdenv.mkDerivation rec { pname = "wxmaxima"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-5nvaaKsvSEs7QxOszjDK1Xkana2er1BCMZ83b1JZSqc="; }; - buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; + buildInputs = [ wxGTK maxima gnome.adwaita-icon-theme ]; nativeBuildInputs = [ wrapGAppsHook cmake gettext ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix index 232e13218c..fcacaefca4 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix @@ -1,4 +1,5 @@ -{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses +, libiconv, Security }: rustPlatform.buildRustPackage rec { version = "0.6.1"; @@ -14,7 +15,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0x4rvfnw3gl2aj6i006nkk3y1f8skyv8g0ss3z2v6qj9nhs7pyir"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ncurses ]; + buildInputs = [ ncurses ] + ++ (if stdenv.isDarwin then [ libiconv Security ] else [ openssl ]); # Some tests fail and/or attempt to use internet servers. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix index ab5352975f..20b239dc67 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0vrgi83hrw4n9zgx873fn4ba3vk54slrwk1cl4cc4plgxzv1y1kg"; }; - nativeBuildInputs = [ makeWrapper cmake pkg-config ]; + nativeBuildInputs = [ makeWrapper cmake pkg-config llvm_5.dev ]; buildInputs = [ ftgl gl2ps glew pcre zlib zstd llvm_5 libxml2 lz4 xz gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix index 51389d20b7..8d27446bd6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.34"; + version = "1.8.36"; src = fetchPypi { inherit pname version; - sha256 = "b922c9b6cf4719667e195a02d8364ccebbe7966a9c18666f8ac22eae9d9e7a2c"; + sha256 = "1gc92gp45d9pcxhmc03kbnar61jxfpx50v3jhdrsflpzhxyhjz5g"; }; postPatch = '' @@ -30,7 +30,7 @@ buildPythonApplication rec { meta = with lib; { description = "MAVLink proxy and command line ground station"; homepage = "https://github.com/ArduPilot/MAVProxy"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ lopsided98 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/mission-planner/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/mission-planner/default.nix index a299a66704..3dbb1a4bf5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/mission-planner/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/mission-planner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono6 }: +{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono }: let pname = "mission-planner"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { sha256 = "1cgpmsmmnbzw1lwsdafp8yklk1rwc61yf12vc1ahcc6bl7q2385x"; }; - nativeBuildInputs = [ makeWrapper mono6 unzip ]; + nativeBuildInputs = [ makeWrapper mono unzip ]; sourceRoot = "."; AOT_FILES = [ "MissionPlanner.exe" "MissionPlanner.*.dll" ]; @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { install -m 444 -D mpdesktop150.png $out/share/icons/mission-planner.png cp -r ${desktopItem}/share/applications $out/share/ mv * $out/opt/mission-planner - makeWrapper ${mono6}/bin/mono $out/bin/mission-planner \ + makeWrapper ${mono}/bin/mono $out/bin/mission-planner \ --add-flags $out/opt/mission-planner/MissionPlanner.exe runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix index c4d9605ddf..1b9304d49e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -6,7 +6,7 @@ mkDerivation rec { pname = "qgroundcontrol"; - version = "4.1.2"; + version = "4.1.3"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -63,7 +63,7 @@ mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "16q0g9b1kyan3qhhp5mmfnrx9h8q7qn83baplbiprqjgpvkxfll4"; + sha256 = "0fbf564vzckvy1dc8f6yd8vpnzwzsgynva13bl2ks06768rrq9fb"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix index 20d24a904e..62a338909f 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -52,16 +52,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VXV6w4OnhJBmvMKl7CynbhI9LclTKaSr+5DhHXMwSsc="; + sha256 = "sha256-9pQqnsLMkzhKTs7WGhf6lac/LGot6EmJQxgFBTrHA4E="; }; - cargoSha256 = "sha256-PWnNTMNZKxsfS1OAXe4G3zjfg5gK1SMTc0JJrW90iSM="; + cargoSha256 = "sha256-NtDeXS2g+5RzKHJdDrbzL5oReS42SzuEubkfZ4gbkFc="; nativeBuildInputs = [ cmake @@ -86,7 +86,7 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "terminfo" ]; postPatch = '' - substituteInPlace alacritty/src/config/mouse.rs \ + substituteInPlace alacritty/src/config/ui_config.rs \ --replace xdg-open ${xdg-utils}/bin/xdg-open ''; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/eterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/eterm/default.nix index 9e2afe5790..b5ca8b8895 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/eterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/eterm/default.nix @@ -1,26 +1,46 @@ -{ lib, stdenv, fetchurl -, libX11, libXext, libXaw -, pkg-config, imlib2, libast }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, imlib2 +, libX11 +, libXaw +, libXext +, libast +, pkg-config +}: stdenv.mkDerivation rec { pname = "eterm"; - version = "0.9.6"; - srcName = "Eterm-${version}"; + version = "0.9.6-unstable=2020-03-03"; - src = fetchurl { - url = "http://www.eterm.org/download/${srcName}.tar.gz"; - sha256 = "0g71szjklkiczxwzbjjfm59y6v9w4hp8mg7cy99z1g7qcjm0gfbj"; + src = fetchFromGitHub { + owner = "mej"; + repo = pname; + rev = "e8fb85b56da21113aaf0f5f7987ae647c4413b6c"; + sha256 = "sha256-pfXYrd6BamBTcnarvXj+C6D1WyGtj87GrW+Dl6AeiDE="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXext libXaw imlib2 ]; - propagatedBuildInputs = [ libast ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ + imlib2 + libX11 + libXaw + libXext + libast + ]; meta = with lib; { - description = "Terminal emulator"; homepage = "http://www.eterm.org"; + description = "Terminal emulator"; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; + knownVulnerabilities = [ + "Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix index 23531908a6..5062329834 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix @@ -104,7 +104,9 @@ stdenv.mkDerivation rec { tllist wayland-protocols pkg-config - ] ++ lib.optional stdenv.cc.isClang stdenv.cc.cc.llvm; + ] ++ lib.optionals (compilerName == "clang") [ + stdenv.cc.cc.libllvm.out + ]; buildInputs = [ fontconfig diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kgx/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kgx/default.nix index 4e8cf06c1f..dc5c651d50 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kgx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kgx/default.nix @@ -3,7 +3,7 @@ , genericBranding ? false , fetchFromGitLab , gettext -, gnome3 +, gnome , libgtop , gtk3 , libhandy @@ -35,7 +35,7 @@ stdenv.mkDerivation { buildInputs = [ gettext libgtop - gnome3.nautilus + gnome.nautilus gtk3 libhandy pcre2 diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix index 5324dc8a10..3b0d302804 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.20.2"; + version = "0.20.3"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "sha256-FquvC3tL565711OQmq2ddNwpyJQGgn4dhG/TYZdCRU0="; + sha256 = "sha256-rORIrbUqtQZuU6TjjYP7IZHfCPeLnrNy6wInnAwhG48="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix index 9462931434..b9f7d4ef67 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { "--enable-ind" #indic scripts "--enable-fribidi" #bidi scripts "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc" - #mlterm-menu and mlconfig depend on enabling gnome3.at-spi2-core + #mlterm-menu and mlconfig depend on enabling gnome.at-spi2-core #and configuring ~/.mlterm/key correctly. ] ++ lib.optionals (!stdenv.isDarwin) [ "--with-x=yes" diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mrxvt/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mrxvt/default.nix index b0b9ee6111..bd01b0843f 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mrxvt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mrxvt/default.nix @@ -36,5 +36,8 @@ stdenv.mkDerivation { homepage = "https://sourceforge.net/projects/materm"; license = licenses.gpl2; platforms = platforms.linux; + knownVulnerabilities = [ + "Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index 82536e4b87..02f1b100f4 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -9,7 +9,7 @@ let pname = "rxvt-unicode"; - version = "9.22"; + version = "9.26"; description = "A clone of the well-known terminal emulator rxvt"; desktopItem = makeDesktopItem { @@ -31,7 +31,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; - sha256 = "1pddjn5ynblwfrdmskylrsxb9vfnk3w4jdnq2l8xn2pspkljhip9"; + sha256 = "12y9p32q0v7n7rhjla0j2g9d5rj2dmwk20c9yhlssaaxlawiccb4"; }; buildInputs = diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt/default.nix index 0cd4f13e46..a6f4ab1321 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt/default.nix @@ -35,5 +35,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; license = licenses.gpl2; platforms = platforms.linux; + knownVulnerabilities = [ + "Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix index 82286289fb..6ddeffe68e 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix @@ -13,13 +13,13 @@ python3.pkgs.buildPythonApplication rec { pname = "terminator"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "gnome-terminator"; repo = "terminator"; rev = "v${version}"; - sha256 = "sha256-Rd5XieB7K2BkSzrAr6Kmoa30xuwvsGKpPrsG2wrU1o8="; + sha256 = "1pfrzna30xv9yri6dsny1j5k35417m4hsg97c455vssywyl9w4jr"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch b/third_party/nixpkgs/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch index 0a2c527222..fe04434f4a 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch @@ -21,7 +21,7 @@ +vte_terminal_get_selection(VteTerminal *terminal) noexcept +{ + g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); -+ return g_strdup (IMPL(terminal)->m_selection[VTE_SELECTION_PRIMARY]->str); ++ return g_strdup (IMPL(terminal)->m_selection[vte::to_integral(vte::platform::ClipboardType::PRIMARY)]->str); +} + /** diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/tilix/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/tilix/default.nix index c0f4ea3257..a5c4b4574d 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/tilix/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; homepage = "https://gnunn1.github.io/tilix-web"; license = licenses.mpl20; - maintainers = with maintainers; [ midchildan worldofpeace ]; + maintainers = with maintainers; [ midchildan ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix index dc79e48b24..c6f39effed 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation rec { pname = "wayst"; - version = "unstable-2020-10-12"; + version = "unstable-2021-04-05"; src = fetchFromGitHub { owner = "91861"; repo = pname; - rev = "b8c7ca00a785a748026ed1ba08bf3d19916ced18"; - hash = "sha256-wHAU1yxukxApzhLLLctZ/AYqF7t21HQc5omPBZyxra0="; + rev = "e72ca78ef72c7b1e92473a98d435a3c85d7eab98"; + hash = "sha256-UXAVSfVpk/8KSg4oMw2tVWImD6HqJ7gEioR2MqhUUoQ="; }; makeFlags = [ "INSTALL_DIR=\${out}/bin" ]; @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple terminal emulator"; + mainProgram = "wayst"; homepage = "https://github.com/91861/wayst"; license = licenses.mit; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix index 8b1031bb5b..b6d7dd763e 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -58,13 +58,13 @@ in rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20210407-nightly"; + version = "20210502-154244-3f7122cb"; src = fetchFromGitHub { owner = "wez"; repo = pname; - rev = "d2419fb99e567e3b260980694cc840a1a3b86922"; - sha256 = "4tVjrdDlrDPKzcbTYK9vRlzfC9tfvkD+D0aN19A8RWE="; + rev = version; + sha256 = "9HPhb7Vyy5DwBW1xeA6sEIBmmOXlky9lPShu6ZoixPw="; fetchSubmodules = true; }; @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { echo ${version} > .tag ''; - cargoSha256 = "sha256-UaXeeuRuQk+CWF936mEAaWTjZuTSRPmxbQ/9E2oZIqg="; + cargoSha256 = "sha256-cbZg2wc3G2ffMQBB6gd0vBbow5GRbXaj8Xh5ga1cMxU="; nativeBuildInputs = [ pkg-config 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 7dfca2cd80..bb3fcb3bb8 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.9.2"; + version = "1.10.2"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "0lx6sx3zkjq9855va1vxbd5g47viqkrchk5d2rb6xj7zywwm4mgb"; + sha256 = "sha256-hI4kV7Xj0oMEfD6SzZ+KWHmMp9yGtr18HPPwkOpr5JA="; }; - vendorSha256 = "1zmyd566xcksgqm0f7mq0rkfnxk0fmf39k13fcp9jy30c1y9681v"; + vendorSha256 = "sha256-A7Bo0HQ5Z2SXY32jWCYgwvvInD3xYLSXvipzeaQTDiM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 37c10bf2f9..707e0855d1 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }: let - inherit (python3Packages) buildPythonApplication pyqt5 sip pyinotify; + inherit (python3Packages) buildPythonApplication pyqt5 sip_4 pyinotify; in buildPythonApplication rec { pname = "git-cola"; @@ -15,7 +15,7 @@ in buildPythonApplication rec { }; buildInputs = [ git gettext ]; - propagatedBuildInputs = [ pyqt5 sip pyinotify ]; + propagatedBuildInputs = [ pyqt5 sip_4 pyinotify ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index 3143d7ef9c..e3845af892 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg, gawk }: let - version = "0.3.3"; + version = "0.4.0"; repo = "git-secret"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ in stdenv.mkDerivation { inherit repo; owner = "sobolevn"; rev = "v${version}"; - sha256 = "0hc7yavcp8jmn6b7wngjqhy8kl7f4191sfpik8ycvqghkvvimxj4"; + sha256 = "sha256-Mtuj+e/yCDr4XkmYkWUFJB3cqOT5yOMOq9P/QJV1S80="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index 9b2853551c..6c95d7e016 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , rustPlatform -, Security +, libiconv, Security , pkg-config, openssl }: @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-lvxEYjVMJoAFFRG5iVfGwxUeJObIxfEaWokk69l++nI="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; meta = with lib; { description = "Sync personal and work git repositories from multiple providers"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index a7df1645c7..aff39a6a44 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -14,6 +14,7 @@ , withpcre2 ? true , sendEmailSupport , darwin +, nixosTests , withLibsecret ? false , pkg-config, glib, libsecret , gzip # needed at runtime by gitweb.cgi @@ -334,6 +335,9 @@ stdenv.mkDerivation { stripDebugList = [ "lib" "libexec" "bin" "share/git/contrib/credential/libsecret" ]; + passthru.tests = { + buildbot-integration = nixosTests.buildbot; + }; meta = { homepage = "https://git-scm.com/"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitweb/default.nix index 1fa2ebc6f7..478d9aaf0c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitweb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitweb/default.nix @@ -22,6 +22,6 @@ in buildEnv { ++ [ "${git}/share/gitweb" ]; meta = git.meta // { - maintainers = with lib.maintainers; [ gnidorah ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix index 8e7e739e61..c810598d7c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "profclems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KkkP/qkIrwJUxmZTY8zxJKMbOiaGl8XqJhHAU7oejGs="; + sha256 = "sha256-UW6KYqqeDnswPSHrjprbClnIwpX5zA+ePq7kwlsWEfA="; }; - vendorSha256 = "sha256-DO8eH0DAitxX0NOYQBs4/ME9TFQYfXedwbld1DnBWXk="; + vendorSha256 = "sha256-5hVIwEG70r9EDyapQ/OBlHfA1Zw5y4KxEysX415t3xk="; runVend = true; # Tests are trying to access /homeless-shelter diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 520f33905c..264677dc1c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lefthook"; - version = "0.7.3"; + version = "0.7.5"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-VrAkmLRsYNDX5VfAxsvjsOv1bv7Nk53OjdaJm/D2GRk="; + sha256 = "sha256-IKrutZJhs2iuwhXoV+81rDoaSi/xdYRpIlF1YjGFGY4="; }; - vendorSha256 = "sha256-XR7xJZfgt0Hx2DccdNlwEmuduuVU8IBR0pcIUyRhdko="; + vendorSha256 = "sha256-Rp67FnFU27u85t02MIs7wZQoOa8oGsHVVPQ9OdIyTJg="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix index 766cb417b7..e2314687d8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -2,12 +2,12 @@ let pname = "radicle-upstream"; - version = "0.1.11"; + version = "0.2.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage"; - sha256 = "1j0xc9ns3andycbrrzkn6ql6739b1dimzlxq17wwpmqhni9nh673"; + sha256 = "sha256-SL6plXZ+o7JchY/t/1702FK57fVjxllHqB8ZOma/43c="; }; contents = appimageTools.extractType2 { inherit name src; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix index b8584f5a53..6f4173f30d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "stgit"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - sha256 = "16q8994widg040n1ag4m82kbn3r02n39ah7dvwa7aixhw5y35vlm"; + sha256 = "sha256-gfPf1yRmx1Mn1TyCBWmjQJBgXLlZrDcew32C9o6uNYk="; }; nativeBuildInputs = [ installShellFiles ]; @@ -24,7 +24,8 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "A patch manager implemented on top of Git"; homepage = "https://stacked-git.github.io/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; + maintainers = with maintainers; [ jshholland ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index 72f6d67c2f..cd6d9b0fd5 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.13.1"; + version = "2.14.5"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-D6gh14XOZ6Fjypfhg9l5ozPhyf6u6M0Wc8HdagdPM/Q="; + sha256 = "sha256-3FSkWpHda1jVhy/633B+ippWcbKd83IlQcJYS9Qx5wQ="; }; patches = [ ./import-ssl-module.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix index e67965f77d..e92a5a38a2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.14.1"; + version = "1.14.2"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "1hpwc5jmkbnn6qf3li8g38qz2l87vk6jq2zxijq92jyfp54kj03p"; + sha256 = "sha256-0EvKk0/ro1YAqvc5yCt8vn2LkRoIbXrFTwcQtomoWsM="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix index 7e4b7a8407..247bb9b53e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib -, libXfixes, atk, gtk3, libXrender, pango, gnome3, cairo, freetype, fontconfig +, libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus , makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.5.5"; + version = "7.6.0"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "0l40ap0ck2ywjarmn7lmpw4qbsdkx717d9kmx67p4qlmbwpimqhg"; + sha256 = "11818d8ph9qqisdpkv46afhr79qq128gaz5d0n7b48dx25ih1jb9"; }; dontBuild = true; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix index 51fc538261..1f798e33eb 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: +{ lib, stdenv, rustPlatform, cmake, fetchFromGitHub, pkg-config, openssl +, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "qt1IN/5+yw5lrQ00YsvXUcUXCxd97EtNf5JvxJVa7uc="; + sha256 = "12f5qrrfjfqp1aph2nmfi9nyzs1ndvgrb3y53mrszm9kf7fa6pyg"; }; - cargoSha256 = "mitUyf/z7EgjKzFy8ZER8Ceoe9tk6r0ctSYdDG87rIU="; + cargoSha256 = "0gw19zdxbkgnj1kcyqn1naj1dnhsx10j860m0xgs5z7bbvfg82p6"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = if stdenv.isDarwin + then [ libiconv Security ] + else [ openssl ]; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix index 89e3a5ea0b..9859163031 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix @@ -12,7 +12,7 @@ , gobject-introspection , gtk3 , gtksourceview4 -, gnome3 +, gnome , gsettings-desktop-schemas }: @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 gtksourceview4 gsettings-desktop-schemas - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3.pkgs; [ @@ -57,8 +57,9 @@ python3.pkgs.buildPythonApplication rec { strictDeps = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/4.9.nix b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/4.9.nix index d2511e2786..030a35212e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/4.9.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/4.9.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages, makeWrapper, unzip +{ lib, stdenv, fetchurl, python2Packages, makeWrapper , guiSupport ? false, tk ? null , ApplicationServices , mercurialSrc ? fetchurl rec { @@ -21,7 +21,7 @@ in python2Packages.buildPythonApplication { inherit python; # pass it so that the same version can be used in hg2git - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ docutils ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/monotone/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/monotone/default.nix index f20d827dc5..48af459260 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/monotone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/monotone/default.nix @@ -1,10 +1,11 @@ -{ lib, stdenv, fetchurl, boost, zlib, botan, libidn -, lua, pcre, sqlite, perl, pkg-config, expect +{ lib, stdenv, fetchurl, fetchFromGitHub, boost, zlib, botan2, libidn +, lua, pcre, sqlite, perl, pkg-config, expect, less , bzip2, gmp, openssl +, autoreconfHook, texinfo }: let - version = "1.1"; + version = "1.1-unstable-2021-05-01"; perlVersion = lib.getVersion perl; in @@ -14,22 +15,41 @@ stdenv.mkDerivation rec { pname = "monotone"; inherit version; - src = fetchurl { - url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2"; - sha256 = "124cwgi2q86hagslbk5idxbs9j896rfjzryhr6z63r6l485gcp7r"; + # src = fetchurl { + # url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2"; + # sha256 = "124cwgi2q86hagslbk5idxbs9j896rfjzryhr6z63r6l485gcp7r"; + # }; + + # My mirror of upstream Monotone repository + # Could fetchmtn, but circular dependency; snapshot requested + # https://lists.nongnu.org/archive/html/monotone-devel/2021-05/msg00000.html + src = fetchFromGitHub { + owner = "7c6f434c"; + repo = "monotone-mirror"; + rev = "b30b0e1c16def043d2dad57d1467d5bfdecdb070"; + hash = "sha256:1hfy8vaap3184cd7h3qhz0da7c992idkc6q2nz9frhma45c5vgmd"; }; patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ boost zlib botan libidn lua pcre sqlite expect - openssl gmp bzip2 ]; + postPatch = '' + sed -e 's@/usr/bin/less@${less}/bin/less@' -i src/unix/terminal.cc + ''; + + nativeBuildInputs = [ pkg-config autoreconfHook texinfo ]; + buildInputs = [ boost zlib botan2 libidn lua pcre sqlite expect + openssl gmp bzip2 perl ]; postInstall = '' mkdir -p $out/share/${pname}-${version} cp -rv contrib/ $out/share/${pname}-${version}/contrib mkdir -p $out/${perl.libPrefix}/${perlVersion} cp -v contrib/Monotone.pm $out/${perl.libPrefix}/${perlVersion} + + patchShebangs "$out/share/monotone" + patchShebangs "$out/share/${pname}-${version}" + + find "$out"/share/{doc/monotone,${pname}-${version}}/contrib/ -type f | xargs sed -e 's@! */usr/bin/@!/usr/bin/env @; s@! */bin/bash@!/usr/bin/env bash@' -i ''; #doCheck = true; # some tests fail (and they take VERY long) @@ -38,6 +58,6 @@ stdenv.mkDerivation rec { description = "A free distributed version control system"; maintainers = [ maintainers.raskin ]; platforms = platforms.unix; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix index 324c61ab19..3c0e540d22 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix @@ -4,7 +4,7 @@ , jre , gtk3 , glib -, gnome3 +, gnome , wrapGAppsHook , libXtst , which @@ -12,16 +12,16 @@ stdenv.mkDerivation rec { pname = "smartgithg"; - version = "19.1.1"; + version = "20.2.5"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "0i0dvyy9d63f4hk8czlyk83ai0ywhqp7wbdkq3s87l7irwgs42jy"; + sha256 = "05f3yhzf6mvr6c5v6qvjrx97pzrrnkh9mp444zlkbnpgnrsmdc6v"; }; nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = [ jre gnome3.adwaita-icon-theme gtk3 ]; + buildInputs = [ jre gnome.adwaita-icon-theme gtk3 ]; preFixup = with lib; '' gappsWrapperArgs+=( \ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix index 7fb26476d8..c8163caf8e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix @@ -1,24 +1,34 @@ -{ lib, fetchgit, buildPythonPackage +{ lib +, fetchFromSourcehut +, buildPythonPackage , buildGoModule -, srht, redis, celery, pyyaml, markdown }: - +, srht +, redis +, celery +, pyyaml +, markdown +, ansi2html +, python +}: let - version = "0.63.4"; + version = "0.66.7"; buildWorker = src: buildGoModule { inherit src version; pname = "builds-sr-ht-worker"; - vendorSha256 = "1sbcjp93gb0c4p7dd1gjhmhwr1pygxvrrzp954j2fvxvi38w6571"; + vendorSha256 = "sha256-giOaldV46aBqXyFH/cQVsbUr6Rb4VMhbBO86o48tRZY="; }; -in buildPythonPackage rec { +in +buildPythonPackage rec { inherit version; pname = "buildsrht"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "builds.sr.ht"; rev = version; - sha256 = "1w3rb685nqg2h0k3ag681svc400si9r1gy0sdim3wa2qh8glbqni"; + sha256 = "sha256-2MLs/DOXHjEYarXDVUcPZe3o0fmZbzVxn528SE72lhM="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -29,10 +39,12 @@ in buildPythonPackage rec { celery pyyaml markdown + ansi2html ]; preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; postInstall = '' @@ -44,8 +56,6 @@ in buildPythonPackage rec { cp ${buildWorker "${src}/worker"}/bin/worker $out/bin/builds.sr.ht-worker ''; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; description = "Continuous integration service for the sr.ht network"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix index 69f8a7d4e4..d359d524eb 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix @@ -1,24 +1,48 @@ -{ lib, fetchgit, fetchNodeModules, buildPythonPackage -, pgpy, flask, bleach, humanize, html5lib, markdown, psycopg2, pygments -, requests, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, prometheus_client -, celery, alembic, importlib-metadata, mistletoe -, sassc, nodejs -, writeText }: +{ lib +, fetchgit +, fetchNodeModules +, buildPythonPackage +, pgpy +, flask +, bleach +, misaka +, humanize +, html5lib +, markdown +, psycopg2 +, pygments +, requests +, sqlalchemy +, cryptography +, beautifulsoup4 +, sqlalchemy-utils +, prometheus_client +, celery +, alembic +, importlib-metadata +, mistletoe +, minio +, sassc +, nodejs +, redis +, writeText +}: buildPythonPackage rec { pname = "srht"; - version = "0.65.2"; + version = "0.67.4"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/core.sr.ht"; rev = version; - sha256 = "1jfp1vc8mink3c7ccacgnqx8hpkck82ipxiql38q1y9l8xcsah03"; + sha256 = "sha256-XvzFfcBK5Mq8p7xEBAF/eupUE1kkUBh5k+ByM/WA9bc="; + fetchSubmodules = true; }; node_modules = fetchNodeModules { src = "${src}/srht"; nodejs = nodejs; - sha256 = "0gwa2xb75g7fclrsr7r131kj8ri5gmhd96yw1iws5pmgsn2rlqi1"; + sha256 = "sha256-IWKahdWv3qJ5DNyb1GB9JWYkZxghn6wzZe68clYXij8="; }; patches = [ @@ -34,6 +58,7 @@ buildPythonPackage rec { pgpy flask bleach + misaka humanize html5lib markdown @@ -51,6 +76,8 @@ buildPythonPackage rec { celery alembic importlib-metadata + minio + redis ]; PKGVER = version; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix index 8d2e8ceed3..43d783e193 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix @@ -1,14 +1,16 @@ -{ python38, openssl -, callPackage, recurseIntoAttrs }: +{ python3 +, openssl +, callPackage +, recurseIntoAttrs +}: # To expose the *srht modules, they have to be a python module so we use `buildPythonModule` # Then we expose them through all-packages.nix as an application through `toPythonApplication` # https://github.com/NixOS/nixpkgs/pull/54425#discussion_r250688781 - let fetchNodeModules = callPackage ./fetchNodeModules.nix { }; - python = python38.override { + python = python3.override { packageOverrides = self: super: { srht = self.callPackage ./core.nix { inherit fetchNodeModules; }; @@ -26,7 +28,8 @@ let scmsrht = self.callPackage ./scm.nix { }; }; }; -in with python.pkgs; recurseIntoAttrs { +in +with python.pkgs; recurseIntoAttrs { inherit python; buildsrht = toPythonApplication buildsrht; dispatchsrht = toPythonApplication dispatchsrht; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix index 5ce140273e..637c6f9c1d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -1,14 +1,21 @@ -{ lib, fetchgit, buildPythonPackage -, srht, pyyaml, PyGithub }: +{ lib +, fetchFromSourcehut +, buildPythonPackage +, srht +, pyyaml +, PyGithub +, python +}: buildPythonPackage rec { pname = "dispatchsrht"; - version = "0.14.9"; + version = "0.15.8"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "dispatch.sr.ht"; rev = version; - sha256 = "JUffuJTKY4I8CrJc8tJWL+CbJCZtiqtUSO9SgYoeux0="; + sha256 = "sha256-zWCGPjIgMKHXHJUs9aciV7IFgo0rpahon6KXHDwcfss="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -21,10 +28,9 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://dispatch.sr.ht/~sircmpwn/dispatch.sr.ht"; description = "Task dispatcher and service integration tool for the sr.ht network"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix index a25a14f610..e44fb9cd6c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix @@ -1,20 +1,32 @@ -{ lib, fetchgit, buildPythonPackage +{ lib +, fetchFromSourcehut +, buildPythonPackage , buildGoModule -, srht, minio, pygit2, scmsrht }: - +, python +, srht +, pygit2 +, scmsrht +}: let - version = "0.61.10"; + version = "0.72.8"; + + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "git.sr.ht"; + rev = version; + sha256 = "sha256-AB2uzajO5PtcpJfbOOTfuDFM6is5K39v3AZJ1hShRNc="; + }; buildShell = src: buildGoModule { inherit src version; pname = "gitsrht-shell"; - vendorSha256 = "1abyv2s5l3bs0iylpgyj3jri2hh1iy8fiadxm7g6l2vl58h0b9ba"; + vendorSha256 = "sha256-aqUFICp0C2reqb2p6JCPAUIRsxzSv0t9BHoNWrTYfqk="; }; buildDispatcher = src: buildGoModule { inherit src version; pname = "gitsrht-dispatcher"; - vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9"; + vendorSha256 = "sha256-qWXPHo86s6iuRBhRMtmD5jxnAWKdrWHtA/iSUkdw89M="; }; buildKeys = src: buildGoModule { @@ -29,32 +41,24 @@ let vendorSha256 = "0fwzqpjv8x5y3w3bfjd0x0cvqjjak23m0zj88hf32jpw49xmjkih"; }; - buildAPI = src: buildGoModule { - inherit src version; - pname = "gitsrht-api"; - vendorSha256 = "0d6kmsbsgj2q5nddx4w675zbsiarffj9vqplwvqk7dwz4id2wnif"; - }; -in buildPythonPackage rec { - pname = "gitsrht"; - inherit version; + updateHook = buildUpdateHook "${src}/gitsrht-update-hook"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/git.sr.ht"; - rev = version; - sha256 = "0g7aj5wlns0m3kf2aajqjjb5fwk5vbb8frrkdfp4118235h3xcqy"; - }; +in +buildPythonPackage rec { + inherit src version; + pname = "gitsrht"; nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ srht - minio pygit2 scmsrht ]; preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; postInstall = '' @@ -62,11 +66,11 @@ in buildPythonPackage rec { cp ${buildShell "${src}/gitsrht-shell"}/bin/gitsrht-shell $out/bin/gitsrht-shell cp ${buildDispatcher "${src}/gitsrht-dispatch"}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch cp ${buildKeys "${src}/gitsrht-keys"}/bin/gitsrht-keys $out/bin/gitsrht-keys - cp ${buildUpdateHook "${src}/gitsrht-update-hook"}/bin/gitsrht-update-hook $out/bin/gitsrht-update-hook - cp ${buildAPI "${src}/api"}/bin/api $out/bin/gitsrht-api + cp ${updateHook}/bin/gitsrht-update-hook $out/bin/gitsrht-update-hook ''; - - dontUseSetuptoolsCheck = true; + passthru = { + inherit updateHook; + }; meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/git.sr.ht"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix index c8fa64c8b4..cddb76cabf 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix @@ -1,14 +1,21 @@ -{ lib, fetchhg, buildPythonPackage -, srht, hglib, scmsrht, unidiff }: +{ lib +, fetchhg +, buildPythonPackage +, srht +, hglib +, scmsrht +, unidiff +, python +}: buildPythonPackage rec { pname = "hgsrht"; - version = "0.26.19"; + version = "0.27.4"; src = fetchhg { url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht"; rev = version; - sha256 = "0dc0lgqq8zdaywbd50dlxypk1lv0nffvqr3889v10ycy45qcfymv"; + sha256 = "1c0qfi0gmbfngvds6917fy9ii2iglawn429757rh7b4bvzn7n6mr"; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -22,10 +29,9 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/hg.sr.ht"; description = "Mercurial repository hosting service for the sr.ht network"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix index 8b6d920199..17cb3fe4b6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix @@ -1,14 +1,18 @@ -{ lib, fetchgit, buildPythonPackage -, srht }: +{ lib +, fetchFromSourcehut +, buildPythonPackage +, srht +}: buildPythonPackage rec { pname = "hubsrht"; - version = "0.11.5"; + version = "0.13.1"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/hub.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "hub.sr.ht"; rev = version; - sha256 = "0cysdfy1z69jaizblbq0ywpcvcnx57rlzg42k98kd9w2mqzj5173"; + sha256 = "sha256-Kqzy4mh5Nn1emzHBco/LVuXro/tW3NX+OYqdEwBSQ/U="; }; nativeBuildInputs = srht.nativeBuildInputs; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix index 98191f564e..b419b49f7b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix @@ -1,14 +1,24 @@ -{ lib, fetchgit, buildPythonPackage -, srht, asyncpg, aiosmtpd, pygit2, emailthreads }: +{ lib +, fetchFromSourcehut +, buildPythonPackage +, srht +, asyncpg +, aiosmtpd +, pygit2 +, emailthreads +, redis +, python +}: buildPythonPackage rec { pname = "listssrht"; - version = "0.45.15"; + version = "0.48.19"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/lists.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "lists.sr.ht"; rev = version; - sha256 = "0f3yl5nf385j7mhcrmda7zk58i1y6fm00i479js90xxhjifmqkq6"; + sha256 = "sha256-bsakEMyvWaxiE4/SGcAP4mlGG9jkdHfFxpt9H+TJn/8="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -19,14 +29,14 @@ buildPythonPackage rec { asyncpg aiosmtpd emailthreads + redis ]; preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/lists.sr.ht"; description = "Mailing list service for the sr.ht network"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix index e3751a6d5c..bd331f000a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix @@ -1,14 +1,20 @@ -{ lib, fetchgit, buildPythonPackage -, srht, pygit2 }: +{ lib +, fetchFromSourcehut +, buildPythonPackage +, srht +, pygit2 +, python +}: buildPythonPackage rec { pname = "mansrht"; - version = "0.15.4"; + version = "0.15.12"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/man.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "man.sr.ht"; rev = version; - sha256 = "0spi0yy2myxw4kggy54yskda14c4vaq2ng9dd9krqsajnsy7anrw"; + sha256 = "sha256-MqH/8K9XRvEg6P7GHE6XXtWnhDP3wT8iGoNaFtYQbio="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -20,10 +26,9 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/man.sr.ht"; description = "Wiki service for the sr.ht network"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix index b5b15520d2..a285d484ed 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix @@ -1,26 +1,42 @@ -{ lib, fetchgit, buildPythonPackage +{ lib +, fetchFromSourcehut +, buildPythonPackage , buildGoModule -, pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache -, sshpubkeys, weasyprint }: - +, pgpy +, srht +, redis +, bcrypt +, qrcode +, stripe +, zxcvbn +, alembic +, pystache +, dnspython +, sshpubkeys +, weasyprint +, prometheus_client +, python +}: let - version = "0.51.2"; + version = "0.53.14"; - buildAPI = src: buildGoModule { + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "meta.sr.ht"; + rev = version; + sha256 = "sha256-/+r/XLDkcSTW647xPMh5bcJmR2xZNNH74AJ5jemna2k="; + }; + + buildApi = src: buildGoModule { inherit src version; pname = "metasrht-api"; - - vendorSha256 = "0k7i7j604wqvzjavmcsw7g2x059jkkgrgz1qyvzlqc0y4ws59xkq"; + vendorSha256 = "sha256-eZyDrr2VcNMxI++18qUy7LA1Q1YDlWCoRtl00L8lfR4="; }; -in buildPythonPackage rec { + +in +buildPythonPackage rec { pname = "metasrht"; - inherit version; - - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; - rev = version; - sha256 = "0c9y1hzx3dj0awxrhkzrcsmy6q9fqm6v6dbp9y1ria3v47xa3nv7"; - }; + inherit version src; nativeBuildInputs = srht.nativeBuildInputs; @@ -36,19 +52,20 @@ in buildPythonPackage rec { pystache sshpubkeys weasyprint + prometheus_client + dnspython ]; preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; postInstall = '' mkdir -p $out/bin - cp ${buildAPI "${src}/api"}/bin/api $out/bin/metasrht-api + cp ${buildApi "${src}/api/"}/bin/api $out/bin/metasrht-api ''; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; description = "Account management service for the sr.ht network"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix index dab518e70a..0d8c913549 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix @@ -1,14 +1,20 @@ -{ lib, fetchgit, buildPythonPackage -, srht, pyyaml }: +{ lib +, fetchFromSourcehut +, buildPythonPackage +, srht +, pyyaml +, python +}: buildPythonPackage rec { pname = "pastesrht"; - version = "0.11.2"; + version = "0.12.1"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/paste.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "paste.sr.ht"; rev = version; - sha256 = "15hm5165v8a7ryw6i0vlf189slw4rp22cfgzznih18pbml7d0c8s"; + sha256 = "sha256-QQhd2LeH9BLmlHilhsv+9fZ+RPNmEMSmOpFA3dsMBFc="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -20,10 +26,9 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/paste.sr.ht"; description = "Ad-hoc text file hosting service for the sr.ht network"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix index 615716d03a..1f38526536 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix @@ -1,15 +1,22 @@ -{ lib, fetchgit, buildPythonPackage -, srht, redis, pyyaml, buildsrht -, writeText }: +{ lib +, fetchFromSourcehut +, buildPythonPackage +, srht +, redis +, pyyaml +, buildsrht +, writeText +}: buildPythonPackage rec { pname = "scmsrht"; - version = "0.22.4"; + version = "0.22.9"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/scm.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "scm.sr.ht"; rev = version; - sha256 = "1djyrwa44wml9lj3njy6qbxyc3g1msswbh0y9jyjzxh2c02bl3jn"; + sha256 = "sha256-327G6C8FW+iZx+167D7TQsFtV6FGc8MpMVo9L/cUUqU="; }; nativeBuildInputs = srht.nativeBuildInputs; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix index 5e75efb088..85e1f5637b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix @@ -1,15 +1,24 @@ -{ lib, fetchgit, buildPythonPackage -, srht, redis, alembic, pystache -, pytest, factory_boy }: +{ lib +, fetchFromSourcehut +, buildPythonPackage +, srht +, redis +, alembic +, pystache +, pytest +, factory_boy +, python +}: buildPythonPackage rec { pname = "todosrht"; - version = "0.62.1"; + version = "0.64.14"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/todo.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "todo.sr.ht"; rev = version; - sha256 = "17fsv2z37sjzqzpvx39nc36xln1ayivzjg309d2vmb94aaym4nz2"; + sha256 = "sha256-huIAhn6h1F5w5ST4/yBwr82kAzyYwhLu+gpRuOQgnsE="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -23,6 +32,7 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; # pytest tests fail diff --git a/third_party/nixpkgs/pkgs/applications/video/aegisub/default.nix b/third_party/nixpkgs/pkgs/applications/video/aegisub/default.nix index e953b96638..7d041f60f4 100644 --- a/third_party/nixpkgs/pkgs/applications/video/aegisub/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/aegisub/default.nix @@ -76,6 +76,20 @@ stdenv.mkDerivation rec { url = "https://github.com/Aegisub/Aegisub/commit/6bd3f4c26b8fc1f76a8b797fcee11e7611d59a39.patch"; sha256 = "sha256-rG8RJokd4V4aSYOQw2utWnrWPVrkqSV3TAvnGXNhLOk="; }) + + # Compatibility with ffms2 + (fetchpatch { + url = "https://github.com/Aegisub/Aegisub/commit/1aa9215e7fc360de05da9b7ec2cd68f1940af8b2.patch"; + sha256 = "sha256-JsuI4hQTcT0TEqHHoSsGbuiTg4hMCH3Cxp061oLk8Go="; + }) + + ./update-ffms2.patch + + # Compatibility with X11 + (fetchpatch { + url = "https://github.com/Aegisub/Aegisub/commit/7a6da26be6a830f4e1255091952cc0a1326a4520.patch"; + sha256 = "sha256-/aTcIjFlZY4N9+IyHL4nwR0hUR4HTJM7ibbdKmNxq0w="; + }) ]; nativeBuildInputs = [ @@ -113,6 +127,10 @@ stdenv.mkDerivation rec { "relro" ]; + postPatch = '' + sed -i 's/-Wno-c++11-narrowing/-Wno-narrowing/' configure.ac src/Makefile + ''; + # compat with icu61+ # https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/aegisub/update-ffms2.patch b/third_party/nixpkgs/pkgs/applications/video/aegisub/update-ffms2.patch new file mode 100644 index 0000000000..affa46365c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/aegisub/update-ffms2.patch @@ -0,0 +1,105 @@ +commit 89c4e8d34ab77c3322f097b91fd9de22cbea7a37 +Author: Thomas Goyne +Date: Wed Nov 21 16:41:05 2018 -0800 + + Update ffmpeg and ffms2 + +diff --git a/src/video_provider_ffmpegsource.cpp b/src/video_provider_ffmpegsource.cpp +index 8bd68fbbf..f4ed6a2f2 100644 +--- a/src/video_provider_ffmpegsource.cpp ++++ b/src/video_provider_ffmpegsource.cpp +@@ -44,6 +44,23 @@ + #include + + namespace { ++typedef enum AGI_ColorSpaces { ++ AGI_CS_RGB = 0, ++ AGI_CS_BT709 = 1, ++ AGI_CS_UNSPECIFIED = 2, ++ AGI_CS_FCC = 4, ++ AGI_CS_BT470BG = 5, ++ AGI_CS_SMPTE170M = 6, ++ AGI_CS_SMPTE240M = 7, ++ AGI_CS_YCOCG = 8, ++ AGI_CS_BT2020_NCL = 9, ++ AGI_CS_BT2020_CL = 10, ++ AGI_CS_SMPTE2085 = 11, ++ AGI_CS_CHROMATICITY_DERIVED_NCL = 12, ++ AGI_CS_CHROMATICITY_DERIVED_CL = 13, ++ AGI_CS_ICTCP = 14 ++} AGI_ColorSpaces; ++ + /// @class FFmpegSourceVideoProvider + /// @brief Implements video loading through the FFMS library. + class FFmpegSourceVideoProvider final : public VideoProvider, FFmpegSourceProvider { +@@ -78,7 +95,7 @@ public: + if (matrix == RealColorSpace) + FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr); + else if (matrix == "TV.601") +- FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr); ++ FFMS_SetInputFormatV(VideoSource, AGI_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr); + else + return; + ColorSpace = matrix; +@@ -103,16 +120,16 @@ std::string colormatrix_description(int cs, int cr) { + std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV"; + + switch (cs) { +- case FFMS_CS_RGB: ++ case AGI_CS_RGB: + return "None"; +- case FFMS_CS_BT709: ++ case AGI_CS_BT709: + return str + ".709"; +- case FFMS_CS_FCC: ++ case AGI_CS_FCC: + return str + ".FCC"; +- case FFMS_CS_BT470BG: +- case FFMS_CS_SMPTE170M: ++ case AGI_CS_BT470BG: ++ case AGI_CS_SMPTE170M: + return str + ".601"; +- case FFMS_CS_SMPTE240M: ++ case AGI_CS_SMPTE240M: + return str + ".240M"; + default: + throw VideoOpenError("Unknown video color space"); +@@ -206,8 +223,10 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st + + // set thread count + int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt(); ++#if FFMS_VERSION < ((2 << 24) | (30 << 16) | (0 << 8) | 0) + if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF) + Threads = 1; ++#endif + + // set seekmode + // TODO: give this its own option? +@@ -235,18 +254,22 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st + else + DAR = double(Width) / Height; + +- CS = TempFrame->ColorSpace; ++ int VideoCS = CS = TempFrame->ColorSpace; + CR = TempFrame->ColorRange; + +- if (CS == FFMS_CS_UNSPECIFIED) +- CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG; ++ if (CS == AGI_CS_UNSPECIFIED) ++ CS = Width > 1024 || Height >= 600 ? AGI_CS_BT709 : AGI_CS_BT470BG; + RealColorSpace = ColorSpace = colormatrix_description(CS, CR); + + #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0) +- if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) { +- if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo)) ++ if (CS != AGI_CS_RGB && CS != AGI_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) { ++ CS = AGI_CS_BT470BG; ++ ColorSpace = colormatrix_description(AGI_CS_BT470BG, CR); ++ } ++ ++ if (CS != VideoCS) { ++ if (FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), &ErrInfo)) + throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer); +- ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR); + } + #endif diff --git a/third_party/nixpkgs/pkgs/applications/video/avxsynth/default.nix b/third_party/nixpkgs/pkgs/applications/video/avxsynth/default.nix deleted file mode 100644 index 3fd25bdf73..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/avxsynth/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config -, cairo, ffmpeg_3, ffms, libjpeg, log4cpp, pango -, avxeditSupport ? false, qt4 ? null -}: - -let - inherit (lib) enableFeature optional; -in - -stdenv.mkDerivation { - pname = "avxsynth"; - version = "2015-04-07"; - - src = fetchFromGitHub { - owner = "avxsynth"; - repo = "avxsynth"; - rev = "80dcb7ec8d314bc158130c92803308aa8e5e9242"; - sha256 = "0kckggvgv68b0qjdi7ms8vi97b46dl63n60qr96d2w67lf2nk87z"; - }; - - configureFlags = [ - "--enable-autocrop" - "--enable-framecapture" - "--enable-subtitle" - "--enable-ffms2" - (enableFeature avxeditSupport "avxedit") - "--with-jpeg=${libjpeg.out}/lib" - ]; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - buildInputs = [ cairo ffmpeg_3 ffms libjpeg log4cpp pango ] - ++ optional avxeditSupport qt4; - - meta = with lib; { - description = "A script system that allows advanced non-linear editing"; - homepage = "https://github.com/avxsynth/avxsynth"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ codyopel ]; - platforms = platforms.linux; - broken = true; # 2018-04-10 - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/video/byzanz/default.nix b/third_party/nixpkgs/pkgs/applications/video/byzanz/default.nix index 80e1c1260b..a9eee05d23 100644 --- a/third_party/nixpkgs/pkgs/applications/video/byzanz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/byzanz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkg-config, libtool, cairo, gtk3, gst_all_1, xorg }: +{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome, glib, intltool, pkg-config, libtool, cairo, gtk3, gst_all_1, xorg }: stdenv.mkDerivation { version = "0.2.3.alpha"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo xorg.libXdamage ] + buildInputs = [ which gnome.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo xorg.libXdamage ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/video/celluloid/default.nix b/third_party/nixpkgs/pkgs/applications/video/celluloid/default.nix index 57eaf91f2a..f6bc0561b0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/celluloid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/celluloid/default.nix @@ -1,42 +1,42 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, nix-update-script -, meson -, ninja -, python3 -, gettext -, pkg-config -, desktop-file-utils -, wrapGAppsHook , appstream-glib +, desktop-file-utils , epoxy +, gettext , glib , gtk3 +, meson , mpv +, ninja +, nix-update-script +, pkg-config +, python3 +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "celluloid"; - version = "0.20"; + version = "0.21"; src = fetchFromGitHub { owner = "celluloid-player"; repo = "celluloid"; rev = "v${version}"; - hash = "sha256-fEZnH8EqU6CykgKINXnKChuBUlisroa97B1vjcx2cWA="; + hash = "sha256-1Jeg1uqWxURGKR/Xg4j4roZ9Pg5MR7geyttdzlOU+rA="; }; nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext meson ninja - python3 - appstream-glib - gettext pkg-config - desktop-file-utils + python3 wrapGAppsHook ]; - buildInputs = [ epoxy glib @@ -50,22 +50,20 @@ stdenv.mkDerivation rec { doCheck = true; - passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; - }; - meta = with lib; { + homepage = "https://github.com/celluloid-player/celluloid"; description = "Simple GTK frontend for the mpv video player"; longDescription = '' - GNOME MPV interacts with mpv via the client API exported by libmpv, - allowing access to mpv's powerful playback capabilities through an - easy-to-use user interface. + Celluloid (formerly GNOME MPV) is a simple GTK+ frontend for mpv. + Celluloid interacts with mpv via the client API exported by libmpv, + allowing access to mpv's powerful playback capabilities. ''; - homepage = "https://github.com/celluloid-player/celluloid"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix b/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix index b24ff43ac6..5d331d1b4a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, makeDesktopItem, ffmpeg_3 +{ lib, fetchurl, makeDesktopItem, ffmpeg , qmake, qttools, mkDerivation , qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine }: @@ -13,19 +13,17 @@ mkDerivation rec { url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; - buildInputs = [ ffmpeg_3 qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; + buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; nativeBuildInputs = [ qmake qttools ]; - postPatch = lib.optionalString (ffmpeg_3 != null) '' + postPatch = lib.optionalString (ffmpeg != null) '' substituteInPlace converter_ffmpeg.cpp \ - --replace '"ffmpeg"' '"${ffmpeg_3.bin}/bin/ffmpeg"' \ - --replace '"ffmpeg ' '"${ffmpeg_3.bin}/bin/ffmpeg ' + --replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"' \ + --replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg ' ''; qmakeFlags = [ "clipgrab.pro" ]; - enableParallelBuilding = true; - desktopItem = makeDesktopItem rec { name = "clipgrab"; exec = name; @@ -37,9 +35,11 @@ mkDerivation rec { }; installPhase = '' + runHook preInstall install -Dm755 clipgrab $out/bin/clipgrab install -Dm644 icon.png $out/share/pixmaps/clipgrab.png cp -r ${desktopItem}/share/applications $out/share + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/video/devede/default.nix b/third_party/nixpkgs/pkgs/applications/video/devede/default.nix index 6a4d0dc1b8..e8fa11c914 100644 --- a/third_party/nixpkgs/pkgs/applications/video/devede/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/devede/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitLab, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor +{ lib, fetchFromGitLab, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor , gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }: let @@ -30,11 +30,11 @@ in buildPythonApplication rec { ]; buildInputs = [ - ffmpeg_3 + ffmpeg ]; propagatedBuildInputs = [ - gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg_3 mplayer dvdauthor vcdimager cdrkit urllib3 setuptools + gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3 setuptools ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/droidcam/default.nix b/third_party/nixpkgs/pkgs/applications/video/droidcam/default.nix index eed4c030cf..dfb110795f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/droidcam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/droidcam/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "droidcam"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "aramg"; repo = "droidcam"; rev = "v${version}"; - sha256 = "sha256-Ny/PJu+ifs9hQRDUv1pONBb6fKJzoiNtjPOFc4veU8c="; + sha256 = "sha256-Ok8FJweSzmewjYzfBJQ28xGHKK/Y32ng1hOCPVwc8eU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/dvdstyler/default.nix b/third_party/nixpkgs/pkgs/applications/video/dvdstyler/default.nix index 83c38b933d..81f3cac73e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/dvdstyler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/dvdstyler/default.nix @@ -6,11 +6,14 @@ , docbook5 , dvdauthor , dvdplusrwtools +, ffmpeg , flex , fontconfig , gettext +, libexif , makeWrapper , pkg-config +, wxGTK30 , wxSVG , xine-ui , xmlto @@ -42,11 +45,14 @@ in stdenv.mkDerivation rec { docbook5 dvdauthor dvdplusrwtools + ffmpeg flex fontconfig gettext + libexif makeWrapper wxSVG + wxGTK30 xine-ui xmlto zip @@ -67,6 +73,8 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/dvdstyler --prefix PATH ":" "${binPath}" ''; + enableParallelBuilding = true; + meta = with lib; { homepage = "https://www.dvdstyler.org/"; description = "A DVD authoring software"; diff --git a/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix b/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix index a9d56cc910..92c15fea9a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { version = "4.9.3"; src = fetchurl { - url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; - sha256 = "sha256-xgdCjo2RLp+EtUTfSiys7PURhnC00R9IOLPtz3427pA="; + url = "https://web.archive.org/web/20210326102451/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; + sha256 = "sha256-T+y8k757/qFCVOCc/SNc7a+KmyscPlowubNQYzMr8jY="; }; unpackPhase = "tar xvf $src"; diff --git a/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix b/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix index 65865c31df..335b8c1917 100644 --- a/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python3Packages, gtk3, gobject-introspection, ffmpeg_3, wrapGAppsHook }: +{ stdenv, lib, python3Packages, gtk3, gobject-introspection, ffmpeg, wrapGAppsHook }: with python3Packages; buildPythonApplication rec { @@ -21,7 +21,7 @@ buildPythonApplication rec { strictDeps = false; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg_3 ]}) + gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}) ''; # no tests 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 b44da238d1..62726dff41 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,12 +1,12 @@ -{ lib, stdenv, fetchurl, libhdhomerun, gcc, gnumake, pkg-config, gtk2 }: +{ lib, stdenv, fetchurl, libhdhomerun, pkg-config, gtk2 }: stdenv.mkDerivation rec { pname = "hdhomerun-config-gui"; - version = "20200907"; + version = "20210224"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/hdhomerun_config_gui_${version}.tgz"; - sha256 = "17zf0hzw68b0xdkh1maqhl96jb7171mbhd29y64as29nps9x4fmz"; + sha256 = "sha256-vzrSk742Ca2I8Uk0uGo44SxpEoVY1QBn62Ahwz8E7p8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix index 829cc4835e..f7abc95cb0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix @@ -26,18 +26,18 @@ mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-A3vo6678XFUV2RN1lcGYbIjCbBjR1oeORcidKZVnImg="; + sha256 = "sha256-u19WJupSqIzA8W0QG9mue8Ticy+HxBAniuKIUFl7ONs="; }; jmpDist = fetchzip { - url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.2-3/dist.zip"; - sha256 = "sha256-Rb0q3NFmnYkueq0JkIWkX0C/oL+gFrNOELCNfh9X/P4="; + url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.3/dist.zip"; + sha256 = "sha256-P7WEYbVvpaVLwMgqC2e8QtMOaJclg0bX78J1fdGzcCU="; }; patches = [ @@ -106,5 +106,6 @@ mkDerivation rec { license = with licenses; [ gpl2Only mit ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ jojosch ]; + mainProgram = "jellyfinmediaplayer"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/jftui/default.nix b/third_party/nixpkgs/pkgs/applications/video/jftui/default.nix index b050e2636c..baffc78948 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.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Aanok"; repo = pname; rev = "v${version}"; - sha256 = "0riwqfh5lyjg7as75kyx7jw6zq4gikbglhv8s05y7pzgsc9xy75j"; + sha256 = "sha256-/QVSywS0O+HZpwY9W3le3RK3OhCkmdLYMCGTyyBdsFw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kino/default.nix b/third_party/nixpkgs/pkgs/applications/video/kino/default.nix deleted file mode 100644 index 5f12dd6494..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/kino/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -# is this configure option of interest? -#--enable-udev-rules-dir=PATH -# Where to install udev rules (/etc/udev/rules.d) - -#TODO shared version? - - -# This is my config output.. Much TODO ? -#source path /tmp/nix-31998-1/kino-1.2.0/ffmpeg -#C compiler gcc -#make make -#.align is power-of-two no -#ARCH x86_64 (generic) -#build suffix -kino -#big-endian no -#MMX enabled yes -#CMOV enabled no -#CMOV is fast no -#gprof enabled no -#debug symbols yes -#strip symbols yes -#optimize yes -#static yes -#shared no -#postprocessing support no -#software scaler enabled yes -#video hooking no -#network support no -#threading support no -#SDL support no -#Sun medialib support no -#AVISynth enabled no -#liba52 support no -#liba52 dlopened no -#libdts support no -#libfaac enabled no -#libfaad enabled no -#faadbin enabled no -#libgsm enabled no -#libmp3lame enabled no -#libnut enabled no -#libogg enabled no -#libtheora enabled no -#libvorbis enabled no -#x264 enabled no -#XviD enabled no -#zlib enabled no -#AMR-NB float support no -#AMR-NB fixed support no -#AMR-WB float support no -#AMR-WB IF2 support no - -{ lib, stdenv, fetchurl, gtk2, libglade, libxml2, libraw1394, libsamplerate, libdv -, pkg-config, perlPackages, libavc1394, libiec61883, libXv, gettext -, libX11, glib, cairo, intltool, ffmpeg, libv4l -}: - -stdenv.mkDerivation { - name = "kino-1.3.4"; - - src = fetchurl { - url = "mirror://sourceforge/kino/kino-1.3.4.tar.gz"; - sha256 = "020s05k0ma83rq2kfs8x474pqicaqp9spar81qc816ddfrnh8k8i"; - }; - - buildInputs = [ gtk2 libglade libxml2 libraw1394 libsamplerate libdv - pkg-config libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ] # TODOoptional packages - ++ (with perlPackages; [ perl XMLParser ]); - - configureFlags = [ "--enable-local-ffmpeg=no" ]; - - hardeningDisable = [ "format" ]; - - NIX_LDFLAGS = "-lavcodec -lavutil"; - - patches = [ ./kino-1.3.4-v4l1.patch ./kino-1.3.4-libav-0.7.patch ./kino-1.3.4-libav-0.8.patch ]; #./kino-1.3.4-libavcodec-pkg-config.patch ]; - - postInstall = " - rpath=`patchelf --print-rpath \$out/bin/kino`; - for i in $buildInputs; do - echo adding \$i/lib - rpath=\$rpath\${rpath:+:}\$i/lib - done - for i in \$out/bin/*; do - patchelf --set-rpath \"\$rpath\" \"\$i\" - done - "; - - meta = { - description = "Non-linear DV editor for GNU/Linux"; - homepage = "http://www.kinodv.org/"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch b/third_party/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch deleted file mode 100644 index 65c5bc3827..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- kino-1.3.4.orig/src/frame.cc 2011-07-17 14:54:59.089481638 +0200 -+++ kino-1.3.4/src/frame.cc 2011-07-17 15:09:23.199481714 +0200 -@@ -1063,7 +1063,12 @@ - AVPicture dest; - int got_picture; - -- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); -+ AVPacket pkt; -+ av_init_packet(&pkt); -+ pkt.data = data; -+ pkt.size = GetFrameSize(); -+ -+ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); - if ( got_picture ) - { - avpicture_fill( &dest, static_cast( rgb ), PIX_FMT_RGB24, GetWidth(), GetHeight() ); -@@ -1123,7 +1128,12 @@ - AVPicture output; - int got_picture; - -- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); -+ AVPacket pkt; -+ av_init_packet(&pkt); -+ pkt.data = data; -+ pkt.size = GetFrameSize(); -+ -+ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); - if ( got_picture ) - { - avpicture_fill( &output, static_cast( yuv ), PIX_FMT_YUV422, GetWidth(), GetHeight() ); -@@ -1156,7 +1166,12 @@ - AVFrame *frame = avcodec_alloc_frame(); - int got_picture; - -- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); -+ AVPacket pkt; -+ av_init_packet(&pkt); -+ pkt.data = data; -+ pkt.size = GetFrameSize(); -+ -+ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); - - int width = GetWidth(), height = GetHeight(); - -@@ -1319,12 +1334,12 @@ - #if defined(HAVE_LIBAVCODEC) - if ( avformatEncoder == NULL ) - { -- avformatEncoder = av_alloc_format_context(); -+ avformatEncoder = avformat_alloc_context(); - if ( avformatEncoder ) - { -- avformatEncoder->oformat = guess_format( "dv", NULL, NULL ); -+ avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL ); - AVStream* vst = av_new_stream( avformatEncoder, 0 ); -- vst->codec->codec_type = CODEC_TYPE_VIDEO; -+ vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_DVVIDEO; - vst->codec->bit_rate = 25000000; - vst->start_time = 0; diff --git a/third_party/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch b/third_party/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch deleted file mode 100644 index f98cbda0bc..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- kino-1.3.4.orig/src/frame.cc 2012-05-14 19:55:42.153772418 -0700 -+++ kino-1.3.4/src/frame.cc 2012-05-14 20:28:34.448838653 -0700 -@@ -101,8 +101,9 @@ - #if defined(HAVE_LIBAVCODEC) - pthread_mutex_lock( &avcodec_mutex ); - av_register_all(); -- libavcodec = avcodec_alloc_context(); -- avcodec_open( libavcodec, avcodec_find_decoder( CODEC_ID_DVVIDEO ) ); -+ libavcodec = avcodec_alloc_context3(NULL); -+ avcodec_open2( libavcodec, -+ avcodec_find_decoder( CODEC_ID_DVVIDEO ), NULL ); - pthread_mutex_unlock( &avcodec_mutex ); - data = ( unsigned char* ) av_mallocz( 144000 ); - #if defined(HAVE_SWSCALE) -@@ -1338,7 +1339,7 @@ - if ( avformatEncoder ) - { - avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL ); -- AVStream* vst = av_new_stream( avformatEncoder, 0 ); -+ AVStream* vst = avformat_new_stream( avformatEncoder, NULL ); - vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_DVVIDEO; - vst->codec->bit_rate = 25000000; -@@ -1364,12 +1365,10 @@ - vst->sample_aspect_ratio = avcodecEncoder->sample_aspect_ratio; - #endif - avcodecEncoder->thread_count = 2; -- avcodec_thread_init( avcodecEncoder, avcodecEncoder->thread_count ); - avcodecEncoder->time_base= isPAL ? ( AVRational ){ 1, 25 } : ( AVRational ){ 1001, 30000 }; - avcodecEncoder->pix_fmt = isPAL ? PIX_FMT_YUV420P : PIX_FMT_YUV411P; - avcodecEncoder->flags |= CODEC_FLAG_INTERLACED_DCT; -- av_set_parameters( avformatEncoder, NULL ); -- avcodec_open( avcodecEncoder, avcodec_find_encoder( CODEC_ID_DVVIDEO ) ); -+ avcodec_open2( avcodecEncoder, avcodec_find_encoder( CODEC_ID_DVVIDEO ), NULL ); - av_new_packet( &avpacketEncoder, 144000 ); - tempImage = ( uint8_t* ) av_malloc( - avpicture_get_size( avcodecEncoder->pix_fmt, avcodecEncoder->width, avcodecEncoder->height ) ); -@@ -1475,16 +1474,16 @@ - - // Encode - bytesInFrame = avcodec_encode_video( avcodecEncoder, avpacketEncoder.data, size, output ); -- url_open_buf( &avformatEncoder->pb, data, bytesInFrame, URL_WRONLY ); -+ avformatEncoder->pb = avio_alloc_context(data, bytesInFrame, 0, NULL, NULL, NULL, NULL); - avpacketEncoder.size = bytesInFrame; - if ( !isEncoderHeaderWritten ) - { -- av_write_header( avformatEncoder ); -+ avformat_write_header( avformatEncoder, NULL ); - isEncoderHeaderWritten = true; - } - av_write_frame( avformatEncoder, &avpacketEncoder ); - #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0) -- url_close_buf( avformatEncoder->pb ); -+ avio_close( avformatEncoder->pb ); - #else - url_close_buf( &avformatEncoder->pb ); - #endif diff --git a/third_party/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch b/third_party/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch deleted file mode 100644 index d6a8953cf0..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/kino-1.3.4/configure.in 2009-09-08 02:35:23.000000000 -0400 -+++ b/kino-1.3.4/configure.in 2014-01-27 14:53:01.366063037 -0500 -@@ -221,7 +221,7 @@ - if (test "x$avcodec_include" != x) || (test "x$avcodec_lib" != x) ; then - local_legacy_ffmpeg_test - else -- PKG_CHECK_MODULES(AVCODEC, libavformat, -+ PKG_CHECK_MODULES(AVCODEC, [libavcodec libavformat libavutil], - [ - AC_DEFINE(HAVE_LIBAVCODEC, 1, [Enable FFMPEG libavcodec]) - AC_SUBST(AVCODEC_LIBS) diff --git a/third_party/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-v4l1.patch b/third_party/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-v4l1.patch deleted file mode 100644 index 05ec738670..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/kino/kino-1.3.4-v4l1.patch +++ /dev/null @@ -1,21 +0,0 @@ -no-1.3.3.orig/ffmpeg/libavdevice/v4l.c 2011-05-17 02:20:37.161004916 +0400 -+++ kino-1.3.3.orig/ffmpeg/libavdevice/v4l.c 2011-05-17 02:21:57.302377529 +0400 -@@ -26,7 +26,7 @@ - #include - #include - #define _LINUX_TIME_H 1 --#include -+#include - #include - - typedef struct { ---- kino-1.3.3.orig/src/v4l.h 2011-05-17 02:20:38.896969666 +0400 -+++ kino-1.3.3.orig/src/v4l.h 2011-05-17 02:21:39.922730395 +0400 -@@ -40,7 +40,7 @@ - - #define _DEVICE_H_ - #define _LINUX_TIME_H --#include -+#include - - #include "displayer.h" diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix index 10912e489e..1e91c26798 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-ffmpegdirect"; namespace = "inputstream.ffmpegdirect"; - version = "1.21.2"; + version = "1.21.3"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.ffmpegdirect"; rev = "${version}-${rel}"; - sha256 = "sha256-FXtjR/4/f434gp78PBSt+QrYtMYcnljO3Htxss/wH7U="; + sha256 = "sha256-OShd6sPGXXu0rlSwuQFMWqrLscE6Y0I2eV2YJYyZNMs="; }; extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/netflix/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/netflix/default.nix index e258270dad..1aac5f8e9b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/netflix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - sha256 = "1jibzzm8viqpanby6lqxpb95gw5hw3lfsw4jasjskiinbf8n469k"; + sha256 = "0c5cdi6s76vg2gyxzf0ylisxai1ii8vi6h4q4mznpfmplfdp667v"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/osmc-skin/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/osmc-skin/default.nix index c83fd66a43..7bbb62029b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/osmc-skin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/osmc-skin/default.nix @@ -15,7 +15,7 @@ buildKodiAddon rec { homepage = "https://github.com/osmc/skin.osmc"; description = "The default skin for OSMC"; platforms = platforms.all; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; license = licenses.cc-by-nc-sa-30; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix index 67e7b8bbc2..b6feec8ab0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix @@ -6,13 +6,13 @@ buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "7.6.2"; + version = "7.6.5"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "sha256-MdgPUKkbqNt/WKUTrYNetlyUBQcYLSn0J8EHH2Z9I+g="; + sha256 = "sha256-Z4H+5dUYJ3vAgodPxWmttVhPVdPVYTJbmYxo1lzLHNA="; }; extraBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix index 3e6b3dc51d..ba35c24ecf 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix @@ -38,15 +38,15 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20210219"; - kodiVersion = "19.0"; + kodiReleaseDate = "20210508"; + kodiVersion = "19.1"; rel = "Matrix"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "097dg6a7v4ia85jx1pmlpwzdpqcqxlrmniqd005q73zvgj67zc2p"; + sha256 = "0jh67vw3983lnfgqzqfislawwbpq0vxxk1ljsg7mar06mlwfxb7h"; }; ffmpeg = stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/video/kooha/default.nix b/third_party/nixpkgs/pkgs/applications/video/kooha/default.nix index 1531378db8..223ed132c9 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kooha/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kooha/default.nix @@ -4,14 +4,14 @@ python3.pkgs.buildPythonApplication rec { pname = "kooha"; - version = "1.1.2"; + version = "1.1.3"; format = "other"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Kooha"; rev = "v${version}"; - sha256 = "0jr55b39py9c8dc9rihn7ffx2yh71qqdk6pfn3c2ciiajjs74l17"; + sha256 = "14lrx6wplvlk3cg3wij88h4ydp3m69pw7lvvzrq3j9qnh431bs36"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/manim/default.nix b/third_party/nixpkgs/pkgs/applications/video/manim/default.nix index f2d33506ff..0f224a5b10 100644 --- a/third_party/nixpkgs/pkgs/applications/video/manim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/manim/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub, pythonOlder, file, fetchpatch -, cairo, ffmpeg_3, sox, xdg-utils, texlive +, cairo, ffmpeg, sox, xdg-utils, texlive , colour, numpy, pillow, progressbar, scipy, tqdm, opencv , pycairo, pydub , pbr, fetchPypi }: @@ -28,14 +28,14 @@ buildPythonApplication rec { pycairo pydub - cairo sox ffmpeg_3 xdg-utils + cairo sox ffmpeg xdg-utils ]; # Test with texlive to see whether it works but don't propagate # because it's huge and optional # TODO: Use smaller TexLive distribution # Doesn't need everything but it's hard to figure out what it needs - checkInputs = [ cairo sox ffmpeg_3 xdg-utils texlive.combined.scheme-full ]; + checkInputs = [ cairo sox ffmpeg xdg-utils texlive.combined.scheme-full ]; # Simple test and complex test with LaTeX checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/mplayer/default.nix b/third_party/nixpkgs/pkgs/applications/video/mplayer/default.nix index 0162a99970..b6bfa9d0dc 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mplayer/default.nix @@ -106,6 +106,8 @@ stdenv.mkDerivation rec { rm -rf ffmpeg ''; + patches = [ ./svn-r38199-ffmpeg44fix.patch ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config yasm ]; buildInputs = with lib; diff --git a/third_party/nixpkgs/pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch b/third_party/nixpkgs/pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch new file mode 100644 index 0000000000..4137989fcb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch @@ -0,0 +1,22 @@ +Index: libmpcodecs/ad_spdif.c +=================================================================== +diff --git a/libmpcodecs/ad_spdif.c b/libmpcodecs/ad_spdif.c +--- a/libmpcodecs/ad_spdif.c (revision 38198) ++++ b/libmpcodecs/ad_spdif.c (revision 38199) +@@ -298,14 +298,8 @@ + if (spdif_ctx->header_written) + av_write_trailer(lavf_ctx); + av_freep(&lavf_ctx->pb); +- if (lavf_ctx->streams) { +- av_freep(&lavf_ctx->streams[0]->codec); +- av_freep(&lavf_ctx->streams[0]->info); +- av_freep(&lavf_ctx->streams[0]); +- } +- av_freep(&lavf_ctx->streams); +- av_freep(&lavf_ctx->priv_data); ++ avformat_free_context(lavf_ctx); ++ lavf_ctx = NULL; + } +- av_freep(&lavf_ctx); + av_freep(&spdif_ctx); + } diff --git a/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix b/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix index 5951f4665e..c25e53b657 100644 --- a/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix @@ -18,7 +18,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { buildInputs = [ gtk3 ]; - propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip httplib2 pyzmq ]; + propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip_4 httplib2 pyzmq ]; dontWrapGApps = true; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/video/peek/default.nix b/third_party/nixpkgs/pkgs/applications/video/peek/default.nix index 2a1418cb37..edeb848867 100644 --- a/third_party/nixpkgs/pkgs/applications/video/peek/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/peek/default.nix @@ -16,7 +16,7 @@ , glib , cairo , keybinder3 -, ffmpeg_3 +, ffmpeg , python3 , libxml2 , gst_all_1 @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ which ffmpeg_3 gifski ]}) + gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ which ffmpeg gifski ]}) ''; passthru = { @@ -79,8 +79,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/phw/peek"; description = "Simple animated GIF screen recorder with an easy to use interface"; - license = licenses.gpl3; - maintainers = with maintainers; [ puffnfresh worldofpeace ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ puffnfresh ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix b/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix index 45c96fb180..b1be6035f9 100644 --- a/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix @@ -11,7 +11,7 @@ , gobject-introspection , libpeas , librsvg -, gnome3 +, gnome , libnotify , gsound , meson @@ -21,13 +21,13 @@ python3Packages.buildPythonApplication rec { pname = "pitivi"; - version = "2020.09.2"; + version = "2021.01"; format = "other"; src = fetchurl { - url = "mirror://gnome/sources/pitivi/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hzvv4wia4rk0kvq16y27imq2qd4q5lg3vx99hdcjdb1x3zqqfg0"; + url = "mirror://gnome/sources/pitivi/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0krzsrv19v3mwhbsm72ica6m3p8ijy0lbd0c3s87yd7pmbwld2c1"; }; patches = [ @@ -52,9 +52,9 @@ python3Packages.buildPythonApplication rec { gtk3 libpeas librsvg - gnome3.gnome-desktop + gnome.gnome-desktop gsound - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas libnotify ] ++ (with gst_all_1; [ @@ -89,7 +89,7 @@ python3Packages.buildPythonApplication rec { strictDeps = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "pitivi"; versionPolicy = "none"; # we are using dev version, since the stable one is too old }; diff --git a/third_party/nixpkgs/pkgs/applications/video/prism/default.nix b/third_party/nixpkgs/pkgs/applications/video/prism/default.nix new file mode 100644 index 0000000000..8cb6153b81 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/prism/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "prism"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "muesli"; + repo = pname; + rev = "v${version}"; + sha256 = "0q7q7aj3fm45bnx6hgl9c1ll8na16x6p7qapr0c4a6dhxwd7n511"; + }; + + vendorSha256 = "1mkd1s9zgzy9agy2rjjk8wfdga7nzv9cmwgiarfi4xrqzj4mbaxq"; + + meta = with lib; { + description = "An RTMP stream recaster/splitter"; + homepage = "https://github.com/muesli/prism"; + license = licenses.mit; + maintainers = with maintainers; [ paperdigits ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/qmediathekview/default.nix b/third_party/nixpkgs/pkgs/applications/video/qmediathekview/default.nix index d0f4141357..e37a8b1ed4 100644 --- a/third_party/nixpkgs/pkgs/applications/video/qmediathekview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/qmediathekview/default.nix @@ -1,13 +1,22 @@ -{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkg-config }: +{ lib +, stdenv +, mkDerivation +, fetchFromGitHub +, boost +, qtbase +, xz +, qmake +, pkg-config +}: mkDerivation rec { pname = "QMediathekView"; - version = "2019-01-06"; + version = "0.2.1"; src = fetchFromGitHub { owner = "adamreichold"; repo = pname; - rev = "e098aaec552ec4e367078bf19953a08067316b4b"; + rev = "v${version}"; sha256 = "0i9hac9alaajbra3lx23m0iiq6ww4is00lpbzg5x70agjrwj0nd6"; }; @@ -16,7 +25,7 @@ mkDerivation rec { --replace /usr "" ''; - buildInputs = [ qtbase qttools xz boost ]; + buildInputs = [ qtbase xz boost ]; nativeBuildInputs = [ qmake pkg-config ]; @@ -28,5 +37,6 @@ mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ dotlambda ]; + broken = stdenv.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/recapp/default.nix b/third_party/nixpkgs/pkgs/applications/video/recapp/default.nix new file mode 100644 index 0000000000..7ec88af821 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/recapp/default.nix @@ -0,0 +1,81 @@ +{ lib +, python3 +, fetchFromGitHub +, appstream-glib +, desktop-file-utils +, gettext +, glib +, gobject-introspection +, gtk3 +, gst_all_1 +, libnotify +, librsvg +, meson +, ninja +, pkg-config +, slop +, wrapGAppsHook +}: + +python3.pkgs.buildPythonApplication rec { + pname = "recapp"; + version = "1.1.1"; + + format = "other"; + + src = fetchFromGitHub { + owner = "amikha1lov"; + repo = "RecApp"; + rev = "v${version}"; + sha256 = "08bpfcqgw0lj6j7y5b2i18kffawlzp6pfk4wdpmk29vwmgk9s9yc"; + }; + + postPatch = '' + patchShebangs build-aux/meson + ''; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext + glib + gtk3 + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + libnotify + librsvg + gobject-introspection + gtk3 + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pulsectl + pydbus + pygobject3 + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + "--prefix" "PATH" ":" "${lib.makeBinPath [ gst_all_1.gstreamer.dev slop ]}" + ) + ''; + + meta = with lib; { + description = "User friendly Open Source screencaster for Linux written in GTK"; + homepage = "https://github.com/amikha1lov/RecApp"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix b/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix index eeb6162440..265ef82528 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.4.6"; + version = "2.4.7"; src = fetchgit { url = "git://git.tvdr.de/vdr.git"; - rev = "V20406"; - sha256 = "sha256-te9lMmnWpesv+np2gJUDL17pI0WyVxhUnoBsFSRtOco="; + rev = version; + sha256 = "sha256-hDJ/DemWuLddDvXGqxkSTIqATlWUjolcP7ojjhK2CDk="; }; enableParallelBuilding = true; @@ -51,6 +51,6 @@ description = "Video Disc Recorder"; maintainers = [ maintainers.ck3d ]; platforms = [ "i686-linux" "x86_64-linux" ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/xine-ui/default.nix b/third_party/nixpkgs/pkgs/applications/video/xine-ui/default.nix index 0a206befaf..ed60fad56c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/xine-ui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/xine-ui/default.nix @@ -46,8 +46,6 @@ stdenv.mkDerivation rec { xorgproto ]); - postPatch = "sed -e '/curl\/types\.h/d' -i src/xitk/download.c"; - configureFlags = [ "--with-readline=${readline.dev}" ]; LIRC_CFLAGS="-I${lirc}/include"; diff --git a/third_party/nixpkgs/pkgs/applications/video/xscast/default.nix b/third_party/nixpkgs/pkgs/applications/video/xscast/default.nix index 6501a39908..d740efe0c9 100644 --- a/third_party/nixpkgs/pkgs/applications/video/xscast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/xscast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, ffmpeg_3, imagemagick, dzen2, xorg }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }: stdenv.mkDerivation { pname = "xscast-unstable"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { patchShebangs $out/bin wrapProgram "$out/bin/xscast" \ - --prefix PATH : ${lib.makeBinPath [ ffmpeg_3 dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]} + --prefix PATH : ${lib.makeBinPath [ ffmpeg dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]} runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch b/third_party/nixpkgs/pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch new file mode 100644 index 0000000000..167dd65d05 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch @@ -0,0 +1,29 @@ +------------------------------------------------------------------------ +r13882 | vruppert | 2020-06-09 09:30:01 +0200 (Tue, 09 Jun 2020) | 2 lines + +Compilation fix for MSYS2 gcc 10.1.0 (narrowing conversion). + + +Index: iodev/display/voodoo_data.h +=================================================================== +--- a/iodev/display/voodoo_data.h (revision 13881) ++++ b/iodev/display/voodoo_data.h (revision 13882) +@@ -1837,11 +1837,11 @@ + + /* fifo content defines */ + #define FIFO_TYPES (7 << 29) +-#define FIFO_WR_REG (1 << 29) +-#define FIFO_WR_TEX (2 << 29) +-#define FIFO_WR_FBI_32 (3 << 29) +-#define FIFO_WR_FBI_16L (4 << 29) +-#define FIFO_WR_FBI_16H (5 << 29) ++#define FIFO_WR_REG (1U << 29) ++#define FIFO_WR_TEX (2U << 29) ++#define FIFO_WR_FBI_32 (3U << 29) ++#define FIFO_WR_FBI_16L (4U << 29) ++#define FIFO_WR_FBI_16H (5U << 29) + + BX_CPP_INLINE void fifo_reset(fifo_state *f) + { + +------------------------------------------------------------------------ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/bochs/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/bochs/default.nix index f2418d80d2..3a8e9dc0be 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/bochs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/bochs/default.nix @@ -26,7 +26,11 @@ stdenv.mkDerivation rec { sha256 = "0ql8q6y1k356li1g9gbvl21448mlxphxxi6kjb2b3pxvzd0pp2b3"; }; - patches = [ ./bochs-2.6.11-glibc-2.26.patch ./fix-build-smp.patch ]; + patches = [ + ./bochs-2.6.11-glibc-2.26.patch + ./fix-build-smp.patch + ./bochs_fix_narrowing_conv_warning.patch + ]; buildInputs = [ pkg-config libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index 5e84b883b6..2736d28f83 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.27"; + version = "2.0.28"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LMvhSoKd652XVPzuId8Ortf0f08FUP1zCn06PgtRwkA="; + sha256 = "sha256-lwR+XoB1LoW/pLjmvExUJKGnAqFhvcDs3sEKkw6pv48="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index 8a4302de64..fa50451151 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoPackage rec { pname = "containerd"; - version = "1.4.4"; + version = "1.5.1"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb"; + sha256 = "sha256-1u+H/gJaQhltf/pq7uaAPEUlQ5R6ZByall2neNkon8s="; }; goPackagePath = "github.com/containerd/containerd"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix index a632640e90..a8fbb1d09c 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv }: let - version = "0.24.2"; + version = "0.24.3"; suffix = { x86_64-linux = "x86_64"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "0l7x9sfyx52n0mwrmicdcnhm8z10q57kk1a5wf459l8lvp59xw08"; + x86_64-linux = "sha256-i6NMVFoLm4hQJH7RnhfC0t+0DJCINoP5b/iCv9JyRdk="; aarch64-linux = "0m7xs12g97z1ipzaf7dgknf3azlah0p6bdr9i454azvzg955238b"; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix index bc66791ad3..e747995744 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, +{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fetchpatch, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which, @@ -23,6 +23,18 @@ stdenv.mkDerivation rec { buildInputs = [ fuse glib icu libdnet libmspack libtirpc openssl pam procps rpcsvc-proto xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; + patches = [ + # Fix building with glib 2.68. Remove after next release. + # We drop AUTHORS due to conflicts when applying. + # https://github.com/vmware/open-vm-tools/pull/505 + (fetchpatch { + url = "https://github.com/vmware/open-vm-tools/commit/82931a1bcb39d5132910c7fb2ddc086c51d06662.patch"; + stripLen = 1; + excludes = [ "AUTHORS" ]; + sha256 = "0yz5hnngr5vd4416hvmh8734a9vxa18d2xd37kl7if0p9vik6zlg"; + }) + ]; + postPatch = '' # Build bugfix for 10.1.0, stolen from Arch PKGBUILD mkdir -p common-agent/etc/config diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix index de3d944bac..2a6d2a20c4 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix @@ -1,12 +1,19 @@ -{ lib, buildPythonApplication, fetchPypi, pyyaml }: +{ lib, buildPythonApplication, fetchFromGitHub, pyyaml }: buildPythonApplication rec { - version = "0.1.5"; + version = "0.2.0pre-2021-05-18"; pname = "podman-compose"; - src = fetchPypi { - inherit pname version; - sha256 = "1sgbc889zq127qhxa9frhswa1mid19fs5qnyzfihx648y5i968pv"; + # "This project is still under development." -- README.md + # + # As of May 2021, the latest release (0.1.5) has fewer than half of all + # commits. This project seems to have no release management, so the last + # commit is the best one until proven otherwise. + src = fetchFromGitHub { + repo = "podman-compose"; + owner = "containers"; + rev = "62d2024feecf312e9591cc145f49cee9c70ab4fe"; + sha256 = "17992imkvi6129wvajsp0iz5iicfmh53i20qy2mzz17kcz30r2pp"; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index 0c7cbd853a..f471ac8c06 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -17,6 +17,7 @@ , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen , cephSupport ? false, ceph +, glusterfsSupport ? false, glusterfs, libuuid , openGLSupport ? sdlSupport, mesa, epoxy, libdrm , virglSupport ? openGLSupport, virglrenderer , libiscsiSupport ? true, libiscsi @@ -72,6 +73,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] ++ optionals xenSupport [ xen ] ++ optionals cephSupport [ ceph ] + ++ optionals glusterfsSupport [ glusterfs libuuid ] ++ optionals openGLSupport [ mesa epoxy libdrm ] ++ optionals virglSupport [ virglrenderer ] ++ optionals libiscsiSupport [ libiscsi ] @@ -142,6 +144,7 @@ stdenv.mkDerivation rec { ++ optional gtkSupport "--enable-gtk" ++ optional xenSupport "--enable-xen" ++ optional cephSupport "--enable-rbd" + ++ optional glusterfsSupport "--enable-glusterfs" ++ optional openGLSupport "--enable-opengl" ++ optional virglSupport "--enable-virglrenderer" ++ optional tpmSupport "--enable-tpm" diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix index 152cbf6199..795971a749 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix @@ -16,13 +16,13 @@ buildGoPackage rec { pname = "runc"; - version = "1.0.0-rc93"; + version = "1.0.0-rc95"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "008d5wkznic80n5q1vwx727qn5ifalc7cydq68hc1gk9wrhna4v4"; + sha256 = "sha256-q4sXcvJO9gyo7m0vlaMrwh7ZZHYa58FJy3GatWndS6M="; }; goPackagePath = "github.com/opencontainers/runc"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/spice-vdagent/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/spice-vdagent/default.nix index 67ac8119fd..2abb16298d 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2"; sha256 = "0n8jlc1pv6mkry161y656b1nk9hhhminjq6nymzmmyjl7k95ymzx"; }; + + # FIXME: May no longer be needed with spice-vdagent versions over 0.21.0 + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix index 922d6fa9ff..f15a2e9149 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, python3Packages, intltool, file , wrapGAppsHook, gtk-vnc, vte, avahi, dconf , gobject-introspection, libvirt-glib, system-libvirt -, gsettings-desktop-schemas, libosinfo, gnome3 +, gsettings-desktop-schemas, libosinfo, gnome , gtksourceview4, docutils , spiceSupport ? true, spice-gtk ? null , cpio, e2fsprogs, findutils, gzip @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ wrapGAppsHook - libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi + libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtksourceview4 gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ] ++ optional spiceSupport spice-gtk; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/qt.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/qt.nix index 1633c8d66f..840ada805d 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/qt.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "virt-manager-qt"; - version = "0.71.95"; + version = "0.72.97"; src = fetchFromGitHub { owner = "F1ash"; repo = "qt-virt-manager"; rev = version; - sha256 = "1s8753bzsjyixpv1c2l9d1xjcn8i47k45qj7pr50prc64ldf5f47"; + sha256 = "0b2bx7ah35glcsiv186sc9cqdrkhg1vs9jz036k9byk61np0cb1i"; }; cmakeFlags = [ @@ -22,10 +22,9 @@ mkDerivation rec { patches = [ (fetchpatch { - # Maintainer note: Check whether this patch is still needed when a new version is released - name = "krdc-variable-name-changes.patch"; - url = "https://github.com/fadenb/qt-virt-manager/commit/4640f5f64534ed7c8a1ecc6851f1c7503988de6d.patch"; - sha256 = "1chl58nra1mj96n8jmnjbsyr6vlwkhn38afhwqsbr0bgyg23781v"; + # drop with next update + url = "https://github.com/F1ash/qt-virt-manager/commit/0d338b037ef58c376d468c1cd4521a34ea181edd.patch"; + sha256 = "1wjqyc5wsnxfwwjzgqjr9hcqhd867amwhjd712qyvpvz8x7p2s24"; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index fe19f1f4a3..4f792b4eb6 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -23,7 +23,7 @@ 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.18"; + version = "6.1.22"; iasl' = iasl.overrideAttrs (old: rec { inherit (old) pname; @@ -40,7 +40,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40"; + sha256 = "99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49"; }; outputs = [ "out" "modsrc" ]; @@ -103,8 +103,6 @@ in stdenv.mkDerivation { qtPluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}:${qtwayland.bin}/${qtbase.qtPluginPrefix}"; }) ++ [ - # NOTE: the patch for linux 5.11 can be removed when the next version of VirtualBox is released - ./linux-5-11.patch ./qtx11extras.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix index 4aa3ed1fd4..8c64337c6c 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 = "d609e35accff5c0819ca9be47de302abf094dc1b6d4c54da8fdda639671f267e"; + let value = "6d33d9cc1c5a8f8a2a70e5aaaa778a341322d2ba7eb34f7de420fb5f312b9e87"; in assert (builtins.stringLength value) == 64; value; meta = { 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 c35ebdb81d..218d4983ca 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 = "904432eb331d7ae517afaa4e4304e6492b7947b46ecb8267de7ef792c4921b4c"; + sha256 = "bffc316a7b8d5ed56d830e9f6aef02b4e5ffc28674032142e96ffbedd905f8c9"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/linux-5-11.patch b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/linux-5-11.patch deleted file mode 100644 index 66b70bf0d9..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/linux-5-11.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -index 7033b45..c8178a6 100644 ---- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -@@ -39,6 +39,7 @@ - #endif - #include - #include -+#include - #include - #include - #include diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix index de996f080e..d88bc0cdbd 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix @@ -9,7 +9,6 @@ , meson , ninja , nixosTests -, pandoc , pango , pixman , pkg-config @@ -23,20 +22,19 @@ stdenv.mkDerivation rec { pname = "cagebreak"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "project-repo"; repo = pname; rev = version; - hash = "sha256-HpAjJHu5sxZKof3ydnU3wcP5GpnH6Ax8m1T1vVoq+oI="; + hash = "sha256-1IztedN5/I/4TDKHLJ26fSrDsvJ5QAr+cbzS2PQITDE="; }; nativeBuildInputs = [ makeWrapper meson ninja - pandoc pkg-config scdoc wayland @@ -55,37 +53,33 @@ stdenv.mkDerivation rec { wlroots ]; - outputs = [ - "out" - "contrib" - ]; - mesonFlags = [ "-Dman-pages=true" "-Dversion_override=${version}" "-Dxwayland=${lib.boolToString withXwayland}" ]; + # TODO: investigate why is this happening postPatch = '' sed -i -e 's|||' *.c ''; postInstall = '' - mkdir -p $contrib/share/cagebreak - cp $src/examples/config $contrib/share/cagebreak/config + install -d $out/share/cagebreak/ + install -m644 $src/examples/config $out/share/cagebreak/ ''; postFixup = lib.optionalString withXwayland '' wrapProgram $out/bin/cagebreak --prefix PATH : "${xwayland}/bin" ''; - passthru.tests.basic = nixosTests.cagebreak; - meta = with lib; { - description = "A Wayland tiling compositor inspired by ratpoison"; homepage = "https://github.com/project-repo/cagebreak"; + description = "A Wayland tiling compositor inspired by ratpoison"; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ berbiche ]; + platforms = platforms.linux; }; + + passthru.tests.basic = nixosTests.cagebreak; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/cardboard/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/cardboard/default.nix new file mode 100644 index 0000000000..17ef08af5e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/cardboard/default.nix @@ -0,0 +1,118 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchurl +, fetchgit +, ffmpeg +, libGL +, libX11 +, libcap +, libdrm +, libinput +, libpng +, libxcb +, libxkbcommon +, mesa +, meson +, ninja +, pandoc +, pixman +, pkg-config +, unzip +, wayland +, wayland-protocols +, xcbutilerrors +, xcbutilimage +, xcbutilwm +}: + +let + # cereal.wrap + cereal-wrap = fetchurl { + name = "cereal-1.3.0.tar.gz"; + url = "https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz"; + hash = "sha256-Mp6j4xMLAmwDpKzFDhaOfa/05uZhvGp9/sDXe1cIUdU="; + }; + cereal-wrapdb = fetchurl { + name = "cereal-1.3.0-1-wrap.zip"; + url = "https://wrapdb.mesonbuild.com/v1/projects/cereal/1.3.0/1/get_zip"; + hash = "sha256-QYck5UT7fPLqtLDb1iOSX4Hnnns48Jj23Ae/LCfLSKY="; + }; + + # expected.wrap + expected-wrap = fetchgit { + name = "expected"; + url = "https://gitlab.com/cardboardwm/expected"; + rev = "0ee13cb2b058809aa9708c45ca18d494e72a759e"; + sha256 = "sha256-gYr4/pjuLlr3k6Jcrg2/SzJLtbgyA+ZN2oMHkHXANDo="; + }; + + # wlroots.wrap + wlroots-wrap = fetchgit { + name = "wlroots"; + url = "https://github.com/swaywm/wlroots"; + rev = "0.12.0"; + sha256 = "sha256-1rE3D+kQprjcjobc95/mQkUa5y1noY0MdoYJ/SpFQwY="; + }; +in +stdenv.mkDerivation rec { + pname = "cardboard"; + version = "0.0.0+unstable=2021-05-10"; + + src = fetchFromGitLab { + owner = "cardboardwm"; + repo = pname; + rev = "b54758d85164fb19468f5ca52588ebea576cd027"; + hash = "sha256-Kn5NyQSDyX7/nn2bKZPnsuepkoppi5XIkdu7IDy5r4w="; + }; + + nativeBuildInputs = [ + meson + ninja + pandoc + pkg-config + unzip + ]; + buildInputs = [ + ffmpeg + libGL + libX11 + libcap + libdrm + libinput + libpng + libxcb + libxkbcommon + mesa + pixman + wayland + wayland-protocols + xcbutilerrors + xcbutilimage + xcbutilwm + ]; + + postPatch = '' + (cd subprojects + tar xvf ${cereal-wrap} + unzip ${cereal-wrapdb} + cp -r ${expected-wrap} ${expected-wrap.name} + cp -r ${wlroots-wrap} ${wlroots-wrap.name} + ) + ''; + + # "Inherited" from Nixpkgs expression for wlroots + mesonFlags = [ + "-Dman=true" + "-Dwlroots:logind-provider=systemd" + "-Dwlroots:libseat=disabled" + ]; + + meta = with lib; { + homepage = "https://gitlab.com/cardboardwm/cardboard"; + description = "A scrollable, tiling Wayland compositor inspired on PaperWM"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix index d8f102ed76..04944a1e90 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix @@ -5,6 +5,7 @@ , libinput , libxcb , libxkbcommon +, pixman , wayland , wayland-protocols , wlroots @@ -16,32 +17,18 @@ }: let - # Add two patches to fix compile errors with wlroots 0.13: - totalPatches = patches ++ [ - # Fix the renamed constant WLR_KEY_PRESSED => WL_KEYBOARD_KEY_STATE_PRESSED - # https://github.com/djpohly/dwl/pull/66 - (fetchpatch { - url = "https://github.com/djpohly/dwl/commit/a42613db9d9f6debfa4fb2363d75af9457d238ed.patch"; - sha256 = "0h76hx1fhazi07gqg7sljh13f91v6bvjy7m9qqmimhvqgfwdcc0j"; - }) - # Use the new signature for wlr_backend_autocreate, which removes an argument: - # https://github.com/djpohly/dwl/pull/76 - (fetchpatch { - url = "https://github.com/djpohly/dwl/commit/0ff13cf216056a36a261f4eed53c6a864989a9fb.patch"; - sha256 = "18clpdb4il1vxf1b0cx0qrwild68s9dism8ab66zpmvxs5qag2dm"; - }) - ]; + totalPatches = patches ++ [ ]; in stdenv.mkDerivation rec { pname = "dwl"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "djpohly"; repo = pname; rev = "v${version}"; - sha256 = "gUaFTkpIQDswEubllMgvxPfCaEYFO7mODzjPyW7XsGQ="; + sha256 = "sha256-lfUAymLA4+E9kULZIueA+9gyVZYgaVS0oTX0LJjsSEs="; }; nativeBuildInputs = [ pkg-config ]; @@ -49,6 +36,7 @@ stdenv.mkDerivation rec { libinput libxcb libxkbcommon + pixman wayland wayland-protocols wlroots diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix index e32cd38ec2..ba284b7686 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -9,19 +9,19 @@ in rustPlatform.buildRustPackage rec { pname = "dwm-status"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "Gerschtli"; - repo = "dwm-status"; + repo = pname; rev = version; - sha256 = "172qkzbi37j6wx81pyqqffi9wxbg3bf8nis7d15ncn1yfd5r4gqh"; + sha256 = "sha256-Y1J0nCVEmGKgQP+GEtPqK8l3SRuls5yesvJuowLDzUo="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "041sd9zm1c3v6iihnwjcya2xg5yxb2y4biyxpjlfblz2srxa15dm"; + cargoSha256 = "sha256-8/vzJXZjSQmefHMo5BXKTRiLy2F3wfIn8VgPMJxtIvY="; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}" @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Gerschtli/dwm-status"; license = with licenses; [ mit ]; maintainers = with maintainers; [ gerschtli ]; + mainProgram = pname; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix index ce0b40c0bb..2ed6bc3036 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, freetype, asciidoc +{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, freetype, asciidoc , xdotool, xorgserver, xsetroot, xterm, runtimeShell , nixosTests }: stdenv.mkDerivation rec { pname = "herbstluftwm"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"; - sha256 = "0avfhr68f6fjnafjdcyxcx7dkg38f2nadmhpj971qyqzfq2f6i38"; + sha256 = "01f1bv9axjhw1l2gwhdwahljssj0h8q7a1bqwbpnwvln0ayv39qb"; }; outputs = [ @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { libXinerama libXrandr libXft + libXrender freetype ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix index 305c1d728f..70c6b9942d 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon -, xorgserver, xvfb_run }: +, xorgserver, xvfb-run }: stdenv.mkDerivation rec { pname = "i3"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.InlineC - xorgserver xvfb_run + xorgserver xvfb-run ]; configureFlags = [ "--disable-builddir" ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix index 88d035bce6..043c9f44bc 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.14.7"; + version = "0.20.1"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "1ndqh4bzwim32n8psgsgdd47xmlb45rhvcwla1wm506byb21nk4c"; + sha256 = "00gzm3g297s9bfp13vnb623p7dfac3g6cdhz2b3lc6l0kmnnqs1s"; }; - cargoSha256 = "098dzwqwbhcyswm73m880z0w03i7xrq56x79vfyvacw4k27q2zm9"; + cargoSha256 = "1dpklyv1b9h4n4k3ar5qbzivds8r4mml76986ic8zj71fy5fxn08"; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -29,8 +29,20 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features=notmuch" + "--features=maildir" + "--features=pulseaudio" ]; + prePatch = '' + substituteInPlace src/util.rs \ + --replace "/usr/share/i3status-rust" "$out/share" + ''; + + postInstall = '' + mkdir -p $out/share + cp -R files/* $out/share + ''; + postFixup = '' wrapProgram $out/bin/i3status-rs --prefix PATH : "${ethtool}/bin" ''; 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 8f1a920296..77ed0c561c 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix @@ -30,7 +30,7 @@ , libpthreadstubs , libsndfile , libtiff -, libungif +, giflib , libxcb , mkfontdir , pcre @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { pname = "icewm"; - version = "2.2.0"; + version = "2.3.4"; src = fetchFromGitHub { - owner = "bbidulock"; + owner = "ice-wm"; repo = pname; rev = version; - hash = "sha256-STM8t311lf0xIqs2Onmwg48xgE7V9VZrUfJrUzYRxL4="; + hash = "sha256-UyLefj0eY/m3Of51NdhMNMq3z+kaLK28zDe63hbDK5A="; }; nativeBuildInputs = [ @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { libpthreadstubs libsndfile libtiff - libungif + giflib libxcb mkfontdir pcre diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/kbdd/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/kbdd/default.nix index 8f684fec62..2aade36074 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/kbdd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/kbdd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "kbdd"; - version = "unstable-2017-01-29"; + version = "unstable-2021-04-26"; src = fetchFromGitHub { owner = "qnikst"; repo = "kbdd"; - rev = "0e1056f066ab6e3c74fd0db0c9710a9a2b2538c3"; - sha256 = "068iqkqxh7928xlmz2pvnykszn9bcq2qgkkiwf37k1vm8fdmgzlj"; + rev = "3145099e1fbbe65b27678be72465aaa5b5872874"; + sha256 = "1gzcjnflgdqnjgphiqpzwbcx60hm0h2cprncm7i8xca3ln5q6ba1"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Simple daemon and library to make per window layout using XKB"; homepage = "https://github.com/qnikst/kbdd"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.wedens ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix index 95faee74db..64677c8505 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix @@ -11,14 +11,14 @@ , pulseaudio , glib , gtk3 -, gnome3 +, gnome , gcr , pam , systemd , upower , wayland , dbus -, xvfb_run +, xvfb-run , phoc , feedbackd , networkmanager @@ -52,7 +52,7 @@ let [ -n "$WLR_BACKENDS" ] || WLR_BACKENDS=drm,libinput export WLR_BACKENDS exec "${phoc}/bin/phoc" -C "$PHOC_INI" \ - -E "bash -lc 'XDG_DATA_DIRS=$XDG_DATA_DIRS:\$XDG_DATA_DIRS ${gnome3.gnome-session}/bin/gnome-session $GNOME_SESSION_ARGS'" + -E "bash -lc 'XDG_DATA_DIRS=$XDG_DATA_DIRS:\$XDG_DATA_DIRS ${gnome.gnome-session}/bin/gnome-session $GNOME_SESSION_ARGS'" ''; in stdenv.mkDerivation rec { @@ -85,9 +85,9 @@ in stdenv.mkDerivation rec { gcr networkmanager polkit - gnome3.gnome-control-center - gnome3.gnome-desktop - gnome3.gnome-session + gnome.gnome-control-center + gnome.gnome-desktop + gnome.gnome-session gtk3 pam systemd @@ -98,7 +98,7 @@ in stdenv.mkDerivation rec { checkInputs = [ dbus - xvfb_run + xvfb-run ]; # Temporarily disabled - Test is broken (SIGABRT) @@ -131,7 +131,7 @@ in stdenv.mkDerivation rec { # Depends on GSettings schemas in gnome-shell preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share/gsettings-schemas/${gnome3.gnome-shell.name}" + --prefix XDG_DATA_DIRS : "${gnome.gnome-shell}/share/gsettings-schemas/${gnome.gnome-shell.name}" ) ''; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix index 9b40d34b6f..5c02484236 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix @@ -1,44 +1,71 @@ -{ lib, stdenv ,fetchFromGitHub -, zig, wayland, pkg-config, scdoc -, xwayland, wayland-protocols, wlroots -, libxkbcommon, pixman, udev, libevdev, libX11, libGL +{ lib +, stdenv +, fetchFromGitHub +, zig +, wayland +, pkg-config +, scdoc +, xwayland +, wayland-protocols +, wlroots +, libxkbcommon +, pixman +, udev +, libevdev +, libX11 +, libGL }: stdenv.mkDerivation rec { pname = "river"; - version = "unstable-2021-04-27"; + version = "unstable-2021-05-07"; src = fetchFromGitHub { owner = "ifreund"; repo = pname; - rev = "0c8e718d95a6a621b9cba0caa9158915e567b076"; - sha256 = "1jjh0dzxi7hy4mg8vag6ipfwb9qxm5lfc07njp1mx6m81nq76ybk"; + rev = "7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d"; + sha256 = "1z5qjid73lfn654f2k74nwgvpr88fpdfpbzhihybx9cyy1mqfz7j"; fetchSubmodules = true; }; - buildInputs = [ xwayland wayland-protocols wlroots pixman - libxkbcommon pixman udev libevdev libX11 libGL + nativeBuildInputs = [ zig wayland xwayland scdoc pkg-config ]; + + buildInputs = [ + wayland-protocols + wlroots + pixman + libxkbcommon + pixman + udev + libevdev + libX11 + libGL ]; + dontConfigure = true; + preBuild = '' export HOME=$TMPDIR ''; + installPhase = '' - zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install + runHook preInstall + zig build -Drelease-safe -Dtarget=${stdenv.hostPlatform.parsed.cpu.name}-native -Dxwayland -Dman-pages --prefix $out install + runHook postInstall ''; - nativeBuildInputs = [ zig wayland scdoc pkg-config ]; - + /* + Builder patch install dir into river to get default config + When installFlags is removed, river becomes half broken. + See https://github.com/ifreund/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56 + */ installFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { - description = "A dynamic tiling wayland compositor"; - longDescription = '' - river is a dynamic tiling wayland compositor that takes inspiration from dwm and bspwm. - ''; homepage = "https://github.com/ifreund/river"; + description = "A dynamic tiling wayland compositor"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ branwright1 ]; + maintainers = with maintainers; [ fortuneteller2k ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/stumpwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/stumpwm/default.nix deleted file mode 100644 index 0f8d933a06..0000000000 --- a/third_party/nixpkgs/pkgs/applications/window-managers/stumpwm/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ lib, stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 -, makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop -, extraModulePaths ? [] -, version }: - -let - contrib = (fetchgit { - url = "https://github.com/stumpwm/stumpwm-contrib.git"; - rev = "9bebe3622b2b6c31a6bada9055ef3862fa79b86f"; - sha256 = "1ml6mjk2fsfv4sf65fdbji3q5x0qiq99g1k8w7a99gsl2i8h60gc"; - }); - versionSpec = { - latest = { - name = "1.0.0"; - rev = "refs/tags/1.0.0"; - sha256 = "16r0lwhxl8g71masmfbjr7s7m7fah4ii4smi1g8zpbpiqjz48ryb"; - patches = []; - }; - "0.9.9" = { - name = "0.9.9"; - rev = "refs/tags/0.9.9"; - sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k"; - patches = [ ./fix-module-path.patch ]; - }; - git = { - name = "git-20170203"; - rev = "d20f24e58ab62afceae2afb6262ffef3cc318b97"; - sha256 = "1gi29ds1x6dq7lz8lamnhcvcrr3cvvrg5yappfkggyhyvib1ii70"; - patches = []; - }; - }.${version}; -in -stdenv.mkDerivation { - name = "stumpwm-${versionSpec.name}"; - - src = fetchgit { - url = "https://github.com/stumpwm/stumpwm"; - rev = versionSpec.rev; - sha256 = versionSpec.sha256; - }; - - # NOTE: The patch needs an update for the next release. - # `(stumpwm:set-module-dir "@MODULE_DIR@")' needs to be in it. - patches = versionSpec.patches; - - buildInputs = [ - texinfo4 makeWrapper autoconf - sbcl - lispPackages.clx - lispPackages.cl-ppcre - lispPackages.alexandria - xdpyinfo - ]; - - - # Stripping destroys the generated SBCL image - dontStrip = true; - - configurePhase = '' - ./autogen.sh - ./configure --prefix=$out --with-module-dir=$out/share/stumpwm/modules - ''; - - preBuild = '' - cp -r --no-preserve=mode ${contrib} modules - substituteInPlace head.lisp \ - --replace 'run-shell-command "xdpyinfo' 'run-shell-command "${xdpyinfo}/bin/xdpyinfo' - ''; - - installPhase = '' - mkdir -pv $out/bin - make install - - mkdir -p $out/share/stumpwm/modules - cp -r modules/* $out/share/stumpwm/modules/ - for d in ${lib.concatStringsSep " " extraModulePaths}; do - cp -r --no-preserve=mode "$d" $out/share/stumpwm/modules/ - done - - # Copy stumpish; - cp $out/share/stumpwm/modules/util/stumpish/stumpish $out/bin/ - chmod +x $out/bin/stumpish - wrapProgram $out/bin/stumpish \ - --prefix PATH ":" "${lib.makeBinPath [ rlwrap gnused gnugrep coreutils xprop ]}" - - # Paths in the compressed image $out/bin/stumpwm are not - # recognized by Nix. Add explicit reference here. - mkdir $out/nix-support - echo ${xdpyinfo} > $out/nix-support/xdpyinfo - ''; - - passthru = { - inherit sbcl lispPackages contrib; - }; - - meta = with lib; { - description = "A tiling window manager for X11"; - homepage = "https://github.com/stumpwm/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - broken = true; # 2018-04-11 - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/stumpwm/fix-module-path.patch b/third_party/nixpkgs/pkgs/applications/window-managers/stumpwm/fix-module-path.patch deleted file mode 100644 index 79bfaad3de..0000000000 --- a/third_party/nixpkgs/pkgs/applications/window-managers/stumpwm/fix-module-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/make-image.lisp.in b/make-image.lisp.in -index 121e9d6..2210242 100644 ---- a/make-image.lisp.in -+++ b/make-image.lisp.in -@@ -2,7 +2,10 @@ - - (load "load-stumpwm.lisp") - --#-ecl (stumpwm:set-module-dir "@CONTRIB_DIR@") -+(setf asdf::*immutable-systems* -+ (uiop:list-to-hash-set (asdf:already-loaded-systems))) -+ -+#-ecl (stumpwm:set-module-dir "@MODULE_DIR@") - - #+sbcl - (sb-ext:save-lisp-and-die "stumpwm" :toplevel (lambda () diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix index d8a1679bbe..03abea94a2 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix @@ -3,6 +3,9 @@ , libxkbcommon, pcre, json_c, dbus, libevdev , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , wlroots, wayland-protocols, libdrm +, nixosTests +# Used by the NixOS module: +, isNixOS ? false }: stdenv.mkDerivation rec { @@ -26,6 +29,10 @@ stdenv.mkDerivation rec { }) ]; + postPatch = lib.optionalString isNixOS '' + echo -e '\ninclude /etc/sway/config.d/*' >> config.in + ''; + nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ]; @@ -41,6 +48,8 @@ stdenv.mkDerivation rec { "-Dsd-bus-provider=libsystemd" ]; + passthru.tests.basic = nixosTests.sway; + meta = with lib; { description = "An i3-compatible tiling Wayland compositor"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix index 319023eb2e..07459295d7 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix @@ -4,6 +4,8 @@ , withBaseWrapper ? true, extraSessionCommands ? "", dbus , withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3 , extraOptions ? [] # E.g.: [ "--verbose" ] +# Used by the NixOS module: +, isNixOS ? false }: assert extraSessionCommands != "" -> withBaseWrapper; @@ -11,24 +13,26 @@ assert extraSessionCommands != "" -> withBaseWrapper; with lib; let + sway = sway-unwrapped.override { inherit isNixOS; }; baseWrapper = writeShellScriptBin "sway" '' set -o errexit if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then + export XDG_CURRENT_DESKTOP=sway ${extraSessionCommands} export _SWAY_WRAPPER_ALREADY_EXECUTED=1 fi if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then export DBUS_SESSION_BUS_ADDRESS - exec ${sway-unwrapped}/bin/sway "$@" + exec ${sway}/bin/sway "$@" else - exec ${dbus}/bin/dbus-run-session ${sway-unwrapped}/bin/sway "$@" + exec ${dbus}/bin/dbus-run-session ${sway}/bin/sway "$@" fi ''; in symlinkJoin { - name = "sway-${sway-unwrapped.version}"; + name = "sway-${sway.version}"; paths = (optional withBaseWrapper baseWrapper) - ++ [ sway-unwrapped ]; + ++ [ sway ]; nativeBuildInputs = [ makeWrapper ] ++ (optional withGtkWrapper wrapGAppsHook); @@ -48,5 +52,5 @@ in symlinkJoin { passthru.providedSessions = [ "sway" ]; - inherit (sway-unwrapped) meta; + inherit (sway) meta; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/taffybar/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/taffybar/default.nix index cc457f8158..7d9e5f9c1c 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/taffybar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/taffybar/default.nix @@ -1,7 +1,9 @@ -{ lib, stdenv, ghcWithPackages, makeWrapper, packages ? (x: []) }: +{ lib, stdenv, ghcWithPackages, taffybar, makeWrapper, packages ? (x: []) }: let -taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self); + taffybarEnv = ghcWithPackages (self: [ + self.taffybar + ] ++ packages self); in stdenv.mkDerivation { name = "taffybar-with-packages-${taffybarEnv.version}"; @@ -13,8 +15,14 @@ in stdenv.mkDerivation { --set NIX_GHC "${taffybarEnv}/bin/ghc" ''; - meta = { - platforms = lib.platforms.unix; - license = lib.licenses.bsd3; - }; + # Trivial derivation + preferLocalBuild = true; + allowSubstitutes = false; + + # For hacking purposes + passthru.env = taffybarEnv; + buildInputs = [ taffybarEnv ]; + shellHook = "eval $(egrep ^export ${taffybarEnv}/bin/ghc)"; + + inherit (taffybar) meta; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/waybox/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/waybox/default.nix index 007e4dcc56..ad3028b4ac 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/waybox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/waybox/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "waybox"; - version = "unstable-2020-05-01"; + version = "unstable-2021-04-07"; src = fetchFromGitHub { owner = "wizbright"; repo = pname; - rev = "93811898f0eea3035145f593938d49d5af759b46"; - sha256 = "IOdKOqAQD87Rs3td8NVEgMnRF6kQSuQ64UVqeVqMBSM="; + rev = "309ccd2faf08079e698104b19eff32b3a255b947"; + hash = "sha256-G32cGmOwmnuVlj1hCq9NRti6plJbkAktfzM4aYzQ+k8="; }; nativeBuildInputs = [ pkg-config meson ninja ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/windowmaker/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/windowmaker/default.nix index e56ff2512c..8c354c616f 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/windowmaker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/windowmaker/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config , libX11, libXext, libXft, libXmu, libXinerama, libXrandr, libXpm -, imagemagick, libpng, libjpeg, libexif, libtiff, libungif, libwebp }: +, imagemagick, libpng, libjpeg, libexif, libtiff, giflib, libwebp }: stdenv.mkDerivation rec { pname = "windowmaker"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXft libXmu libXinerama libXrandr libXpm - imagemagick libpng libjpeg libexif libtiff libungif libwebp ]; + imagemagick libpng libjpeg libexif libtiff giflib libwebp ]; configureFlags = [ "--with-x" diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wio/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wio/default.nix index c330bbe0e0..72fa23de9d 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wio/default.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { sha256 = "1vpvlahv6dmr7vfb11p5cc5ds2y2vfvcb877nkqx18yin6pg357l"; }; + patches = [ + # To fix the build with wlroots 0.13: + ./wlroots-0.13.patch + ]; + nativeBuildInputs = [ meson ninja pkg-config makeWrapper ]; buildInputs = [ cairo diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wio/wlroots-0.13.patch b/third_party/nixpkgs/pkgs/applications/window-managers/wio/wlroots-0.13.patch new file mode 100644 index 0000000000..989e812bb5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wio/wlroots-0.13.patch @@ -0,0 +1,254 @@ +commit 8a3f903b20d646ebb2472c4f094ca1bf225a96c7 +Author: Michael Weiss +Date: Fri May 14 19:19:05 2021 +0200 + + Fix the build with wlroots 0.13 + +diff --git a/main.c b/main.c +index 5d7dcda..870fdb0 100644 +--- a/main.c ++++ b/main.c +@@ -1,6 +1,7 @@ + #define _POSIX_C_SOURCE 200809L + #include + #include ++#include + #include + #include + #include +@@ -49,7 +50,7 @@ static void gen_menu_textures(struct wio_server *server) { + cairo_surface_flush(surf); + unsigned char *data = cairo_image_surface_get_data(surf); + server->menu.inactive_textures[i] = wlr_texture_from_pixels(renderer, +- WL_SHM_FORMAT_ARGB8888, ++ DRM_FORMAT_ARGB8888, + cairo_image_surface_get_stride(surf), + extents.width + 2, extents.height + 2, data); + } +@@ -66,7 +67,7 @@ static void gen_menu_textures(struct wio_server *server) { + cairo_surface_flush(surf); + unsigned char *data = cairo_image_surface_get_data(surf); + server->menu.active_textures[i] = wlr_texture_from_pixels(renderer, +- WL_SHM_FORMAT_ARGB8888, ++ DRM_FORMAT_ARGB8888, + cairo_image_surface_get_stride(surf), + extents.width + 2, extents.height + 2, data); + } +@@ -152,7 +153,7 @@ int main(int argc, char **argv) { + } + + server.wl_display = wl_display_create(); +- server.backend = wlr_backend_autocreate(server.wl_display, NULL); ++ server.backend = wlr_backend_autocreate(server.wl_display); + server.renderer = wlr_backend_get_renderer(server.backend); + wlr_renderer_init_wl_display(server.renderer, server.wl_display); + +diff --git a/protocols/wlr-layer-shell-unstable-v1.xml b/protocols/wlr-layer-shell-unstable-v1.xml +index 90b8bc8..d62fd51 100644 +--- a/protocols/wlr-layer-shell-unstable-v1.xml ++++ b/protocols/wlr-layer-shell-unstable-v1.xml +@@ -25,7 +25,7 @@ + THIS SOFTWARE. + + +- ++ + + Clients can use this interface to assign the surface_layer role to + wl_surfaces. Such surfaces are assigned to a "layer" of the output and +@@ -47,6 +47,12 @@ + or manipulate a buffer prior to the first layer_surface.configure call + must also be treated as errors. + ++ After creating a layer_surface object and setting it up, the client ++ must perform an initial commit without any buffer attached. ++ The compositor will reply with a layer_surface.configure event. ++ The client must acknowledge it and is then allowed to attach a buffer ++ to map the surface. ++ + You may pass NULL for output to allow the compositor to decide which + output to use. Generally this will be the one that the user most + recently interacted with. +@@ -82,17 +88,35 @@ + + + ++ ++ ++ ++ ++ ++ This request indicates that the client will not use the layer_shell ++ object any more. Objects that have been created through this instance ++ are not affected. ++ ++ + + +- ++ + + An interface that may be implemented by a wl_surface, for surfaces that + are designed to be rendered as a layer of a stacked desktop-like + environment. + +- Layer surface state (size, anchor, exclusive zone, margin, interactivity) +- is double-buffered, and will be applied at the time wl_surface.commit of +- the corresponding wl_surface is called. ++ Layer surface state (layer, size, anchor, exclusive zone, ++ margin, interactivity) is double-buffered, and will be applied at the ++ time wl_surface.commit of the corresponding wl_surface is called. ++ ++ Attaching a null buffer to a layer surface unmaps it. ++ ++ Unmapping a layer_surface means that the surface cannot be shown by the ++ compositor until it is explicitly mapped again. The layer_surface ++ returns to the state it had right after layer_shell.get_layer_surface. ++ The client can re-map the surface by performing a commit without any ++ buffer attached, waiting for a configure event and handling it as usual. + + + +@@ -127,14 +151,19 @@ + + + +- Requests that the compositor avoids occluding an area of the surface +- with other surfaces. The compositor's use of this information is ++ Requests that the compositor avoids occluding an area with other ++ surfaces. The compositor's use of this information is + implementation-dependent - do not assume that this region will not + actually be occluded. + +- A positive value is only meaningful if the surface is anchored to an +- edge, rather than a corner. The zone is the number of surface-local +- coordinates from the edge that is considered exclusive. ++ A positive value is only meaningful if the surface is anchored to one ++ edge or an edge and both perpendicular edges. If the surface is not ++ anchored, anchored to only two perpendicular edges (a corner), anchored ++ to only two parallel edges or anchored to all edges, a positive value ++ will be treated the same as zero. ++ ++ A positive zone is the distance from the edge in surface-local ++ coordinates to consider exclusive. + + Surfaces that do not wish to have an exclusive zone may instead specify + how they should interact with surfaces that do. If set to zero, the +@@ -174,21 +203,85 @@ + + + ++ ++ ++ Types of keyboard interaction possible for layer shell surfaces. The ++ rationale for this is twofold: (1) some applications are not interested ++ in keyboard events and not allowing them to be focused can improve the ++ desktop experience; (2) some applications will want to take exclusive ++ keyboard focus. ++ ++ ++ ++ ++ This value indicates that this surface is not interested in keyboard ++ events and the compositor should never assign it the keyboard focus. ++ ++ This is the default value, set for newly created layer shell surfaces. ++ ++ This is useful for e.g. desktop widgets that display information or ++ only have interaction with non-keyboard input devices. ++ ++ ++ ++ ++ Request exclusive keyboard focus if this surface is above the shell surface layer. ++ ++ For the top and overlay layers, the seat will always give ++ exclusive keyboard focus to the top-most layer which has keyboard ++ interactivity set to exclusive. If this layer contains multiple ++ surfaces with keyboard interactivity set to exclusive, the compositor ++ determines the one receiving keyboard events in an implementation- ++ defined manner. In this case, no guarantee is made when this surface ++ will receive keyboard focus (if ever). ++ ++ For the bottom and background layers, the compositor is allowed to use ++ normal focus semantics. ++ ++ This setting is mainly intended for applications that need to ensure ++ they receive all keyboard events, such as a lock screen or a password ++ prompt. ++ ++ ++ ++ ++ This requests the compositor to allow this surface to be focused and ++ unfocused by the user in an implementation-defined manner. The user ++ should be able to unfocus this surface even regardless of the layer ++ it is on. ++ ++ Typically, the compositor will want to use its normal mechanism to ++ manage keyboard focus between layer shell surfaces with this setting ++ and regular toplevels on the desktop layer (e.g. click to focus). ++ Nevertheless, it is possible for a compositor to require a special ++ interaction to focus or unfocus layer shell surfaces (e.g. requiring ++ a click even if focus follows the mouse normally, or providing a ++ keybinding to switch focus between layers). ++ ++ This setting is mainly intended for desktop shell components (e.g. ++ panels) that allow keyboard interaction. Using this option can allow ++ implementing a desktop shell that can be fully usable without the ++ mouse. ++ ++ ++ ++ + + +- Set to 1 to request that the seat send keyboard events to this layer +- surface. For layers below the shell surface layer, the seat will use +- normal focus semantics. For layers above the shell surface layers, the +- seat will always give exclusive keyboard focus to the top-most layer +- which has keyboard interactivity set to true. ++ Set how keyboard events are delivered to this surface. By default, ++ layer shell surfaces do not receive keyboard events; this request can ++ be used to change this. ++ ++ This setting is inherited by child surfaces set by the get_popup ++ request. + + Layer surfaces receive pointer, touch, and tablet events normally. If + you do not want to receive them, set the input region on your surface + to an empty region. + +- Events is double-buffered, see wl_surface.commit. ++ Keyboard interactivity is double-buffered, see wl_surface.commit. + +- ++ + + + +@@ -273,6 +366,7 @@ + + + ++ + + + +@@ -281,5 +375,16 @@ + + + ++ ++ ++ ++ ++ ++ Change the layer that the surface is rendered on. ++ ++ Layer is double-buffered, see wl_surface.commit. ++ ++ ++ + + diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/xmonad/log-applet/default.nix index 830242667d..2e41cc2c97 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib , desktopSupport ? "gnomeflashback", xorg , gtk2 -, gtk3, gnome3, mate +, gtk3, gnome, mate , libxfce4util, xfce4-panel }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib dbus-glib xorg.xcbutilwm ] - ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ] + ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome.gnome-panel ] ++ lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] ++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] ; diff --git a/third_party/nixpkgs/pkgs/build-support/agda/default.nix b/third_party/nixpkgs/pkgs/build-support/agda/default.nix index 984d61f1f7..ed7d11a131 100644 --- a/third_party/nixpkgs/pkgs/build-support/agda/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/agda/default.nix @@ -1,6 +1,6 @@ # Builder for Agda packages. -{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, mkShell, ghcWithPackages, nixosTests }: +{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, ghcWithPackages, nixosTests }: with lib.strings; diff --git a/third_party/nixpkgs/pkgs/build-support/appimage/default.nix b/third_party/nixpkgs/pkgs/build-support/appimage/default.nix index 7659c9f42a..3a820853b1 100644 --- a/third_party/nixpkgs/pkgs/build-support/appimage/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/appimage/default.nix @@ -61,7 +61,7 @@ rec { targetPkgs = pkgs: with pkgs; [ gtk3 bashInteractive - gnome3.zenity + gnome.zenity python2 xorg.xrandr which diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh index b402893100..2e62aef460 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -25,8 +25,9 @@ dontLink=0 nonFlagArgs=0 cc1=0 # shellcheck disable=SC2193 -[[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0 -cppInclude=1 +[[ "@prog@" = *++ ]] && isCxx=1 || isCxx=0 +cxxInclude=1 +cxxLibrary=1 cInclude=1 setDynamicLinker=1 @@ -50,15 +51,15 @@ while (( "$n" < "$nParams" )); do dontLink=1 elif [[ "$p" = -x && "$p2" = *-header ]]; then dontLink=1 - elif [[ "$p" = -x && "$p2" = c++* && "$isCpp" = 0 ]]; then - isCpp=1 + elif [[ "$p" = -x && "$p2" = c++* && "$isCxx" = 0 ]]; then + isCxx=1 elif [ "$p" = -nostdlib ]; then - isCpp=-1 + cxxLibrary=0 elif [ "$p" = -nostdinc ]; then cInclude=0 - cppInclude=0 + cxxInclude=0 elif [ "$p" = -nostdinc++ ]; then - cppInclude=0 + cxxInclude=0 elif [[ "$p" = -static || "$p" = -static-pie ]]; then setDynamicLinker=0 elif [[ "$p" != -?* ]]; then @@ -131,12 +132,13 @@ if [ "$NIX_ENFORCE_NO_NATIVE_@suffixSalt@" = 1 ]; then params=(${rest+"${rest[@]}"}) fi -if [[ "$isCpp" = 1 ]]; then - NIX_CFLAGS_LINK_@suffixSalt@+=" $NIX_CXXSTDLIB_LINK_@suffixSalt@" -fi - -if [[ "$cppInclude" = 1 ]]; then - NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@" +if [[ "$isCxx" = 1 ]]; then + if [[ "$cxxInclude" = 1 ]]; then + NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@" + fi + if [[ "$cxxLibrary" = 1 ]]; then + NIX_CFLAGS_LINK_@suffixSalt@+=" $NIX_CXXSTDLIB_LINK_@suffixSalt@" + fi fi source @out@/nix-support/add-hardening.sh diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index 14317cbe4c..36a98a180b 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix @@ -370,7 +370,7 @@ stdenv.mkDerivation { done '' + optionalString (libcxx.isLLVM or false) ('' - echo "-isystem ${libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags + echo "-isystem ${lib.getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags '' + lib.optionalString stdenv.targetPlatform.isLinux '' echo "-lc++abi" >> $out/nix-support/libcxx-ldflags @@ -404,7 +404,7 @@ stdenv.mkDerivation { echo "$ccLDFlags" >> $out/nix-support/cc-ldflags echo "$ccCFlags" >> $out/nix-support/cc-cflags '' + optionalString (targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false)) '' - echo " -L${libcxx}/lib" >> $out/nix-support/cc-ldflags + echo " -L${lib.getLib libcxx}/lib" >> $out/nix-support/cc-ldflags '' ## diff --git a/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix b/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix index fcbf5bcabe..571d0eb687 100644 --- a/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix +++ b/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix @@ -159,7 +159,7 @@ runCommand (add-to-list 'load-path "$out/share/emacs/site-lisp") (add-to-list 'exec-path "$out/bin") ${optionalString nativeComp '' - (add-to-list 'comp-eln-load-path "$out/share/emacs/native-lisp/") + (add-to-list 'native-comp-eln-load-path "$out/share/emacs/native-lisp/") ''} EOF # Link subdirs.el from the emacs distribution @@ -170,7 +170,7 @@ runCommand ${optionalString nativeComp '' $emacs/bin/emacs --batch \ - --eval "(add-to-list 'comp-eln-load-path \"$out/share/emacs/native-lisp/\")" \ + --eval "(add-to-list 'native-comp-eln-load-path \"$out/share/emacs/native-lisp/\")" \ -f batch-native-compile "$siteStart" "$subdirs" ''} ''; diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git b/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git index f2df9d9a86..661e0d674c 100755 --- a/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git @@ -47,6 +47,7 @@ Options: --deepClone Clone the entire repository. --no-deepClone Make a shallow clone of just the required ref. --leave-dotGit Keep the .git directories. + --fetch-lfs Fetch git Large File Storage (LFS) files. --fetch-submodules Fetch submodules. --builder Clone as fetchgit does, but url, rev, and out option are mandatory. --quiet Only print the final json summary. diff --git a/third_party/nixpkgs/pkgs/build-support/mkshell/default.nix b/third_party/nixpkgs/pkgs/build-support/mkshell/default.nix index a70dc0390c..7ca4cc23c1 100644 --- a/third_party/nixpkgs/pkgs/build-support/mkshell/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/mkshell/default.nix @@ -3,18 +3,22 @@ # A special kind of derivation that is only meant to be consumed by the # nix-shell. { - inputsFrom ? [], # a list of derivations whose inputs will be made available to the environment - buildInputs ? [], - nativeBuildInputs ? [], - propagatedBuildInputs ? [], - propagatedNativeBuildInputs ? [], - ... + # a list of packages to add to the shell environment + packages ? [ ] +, # propagate all the inputs from the given derivations + inputsFrom ? [ ] +, buildInputs ? [ ] +, nativeBuildInputs ? [ ] +, propagatedBuildInputs ? [ ] +, propagatedNativeBuildInputs ? [ ] +, ... }@attrs: let mergeInputs = name: lib.concatLists (lib.catAttrs name - ([attrs] ++ inputsFrom)); + ([ attrs ] ++ inputsFrom)); rest = builtins.removeAttrs attrs [ + "packages" "inputsFrom" "buildInputs" "nativeBuildInputs" @@ -26,15 +30,15 @@ in stdenv.mkDerivation ({ name = "nix-shell"; - phases = ["nobuildPhase"]; + phases = [ "nobuildPhase" ]; buildInputs = mergeInputs "buildInputs"; - nativeBuildInputs = mergeInputs "nativeBuildInputs"; + nativeBuildInputs = packages ++ (mergeInputs "nativeBuildInputs"); propagatedBuildInputs = mergeInputs "propagatedBuildInputs"; propagatedNativeBuildInputs = mergeInputs "propagatedNativeBuildInputs"; shellHook = lib.concatStringsSep "\n" (lib.catAttrs "shellHook" - (lib.reverseList inputsFrom ++ [attrs])); + (lib.reverseList inputsFrom ++ [ attrs ])); nobuildPhase = '' echo diff --git a/third_party/nixpkgs/pkgs/build-support/replace-secret/replace-secret.nix b/third_party/nixpkgs/pkgs/build-support/replace-secret/replace-secret.nix new file mode 100644 index 0000000000..e04d1aed5f --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/replace-secret/replace-secret.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, python3 }: + +stdenv.mkDerivation { + name = "replace-secret"; + buildInputs = [ python3 ]; + phases = [ "installPhase" "checkPhase" ]; + installPhase = '' + install -D ${./replace-secret.py} $out/bin/replace-secret + patchShebangs $out + ''; + doCheck = true; + checkPhase = '' + install -m 0600 ${./test/input_file} long_test + $out/bin/replace-secret "replace this" ${./test/passwd} long_test + $out/bin/replace-secret "and this" ${./test/rsa} long_test + diff ${./test/expected_long_output} long_test + + install -m 0600 ${./test/input_file} short_test + $out/bin/replace-secret "replace this" <(echo "a") short_test + $out/bin/replace-secret "and this" <(echo "b") short_test + diff ${./test/expected_short_output} short_test + ''; + meta = with lib; { + platforms = platforms.all; + maintainers = with maintainers; [ talyz ]; + license = licenses.mit; + description = "Replace a string in one file with a secret from a second file"; + longDescription = '' + Replace a string in one file with a secret from a second file. + + Since the secret is read from a file, it won't be leaked through + '/proc//cmdline', unlike when 'sed' or 'replace' is used. + ''; + }; +} diff --git a/third_party/nixpkgs/pkgs/build-support/replace-secret/replace-secret.py b/third_party/nixpkgs/pkgs/build-support/replace-secret/replace-secret.py new file mode 100755 index 0000000000..30ff41d491 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/replace-secret/replace-secret.py @@ -0,0 +1,28 @@ +#!/usr/bin/env python + +import argparse +from argparse import RawDescriptionHelpFormatter + +description = """ +Replace a string in one file with a secret from a second file. + +Since the secret is read from a file, it won't be leaked through +'/proc//cmdline', unlike when 'sed' or 'replace' is used. +""" + +parser = argparse.ArgumentParser( + description=description, + formatter_class=RawDescriptionHelpFormatter +) +parser.add_argument("string_to_replace", help="the string to replace") +parser.add_argument("secret_file", help="the file containing the secret") +parser.add_argument("file", help="the file to perform the replacement on") +args = parser.parse_args() + +with open(args.secret_file) as sf, open(args.file, 'r+') as f: + old = f.read() + secret = sf.read().strip("\n") + new_content = old.replace(args.string_to_replace, secret) + f.seek(0) + f.write(new_content) + f.truncate() diff --git a/third_party/nixpkgs/pkgs/build-support/replace-secret/test/expected_long_output b/third_party/nixpkgs/pkgs/build-support/replace-secret/test/expected_long_output new file mode 100644 index 0000000000..37bd66b905 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/replace-secret/test/expected_long_output @@ -0,0 +1,30 @@ +beginning +middle $6$UcbJUl5g$HRMfKNKsLTfVbcQb.P5o0bmZUfHDYkWseMSuZ8F5jSIGZZcI3Jnit23f8ZeZOGi4KL86HVM9RYqrpYySOu/fl0 not this +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAzrru6v5tfwQl6L+rOUjtLo8kbhMUlCLXP7TYngSGrkzPMWe+ +0gB04UAmiPZXfBmvj5fPqYiFjIaEDHE/SD41vJB/RJKKtId2gCAIHhBLkbr+4+60 +yEbLkJci5i4kJC1dt8OKFEzXkaVnwOSgjH+0NwO3bstZ+E70zMXS9+NS71qGsIEb +5J1TnacwW/u6CdFyakLljWOXOR14rLIpiPBBFLf+oZiepjIhlWXWHqsxZOb7zMI0 +T4W5WJ2dwGFsJ8rkYaGZ+A5qzYbi/KmHqaSPaNDsyoi7yJhAhKPByALJU916+8QO +xOnqZxWGki3PDzCslRwW4i3mGbZlBQMnlfbN3QIDAQABAoIBAHDn1W7QkFrLmCy6 +6bf6pVdFZF8d2qJhOPAZRClhTXFKj+pqv+QPzcXr9F/fMr6bhK/G+Oqdnlq2aM4m +16oMF+spe+impEyeo1CsreJFghBQcb9o8qFjUPBiKvROBP0hLcscZ4BYy29HSBgo +harWYEWfqQJA251q+fYQoP0z0WrZKddOZbRRnJ0ICRxAE7IEtDT6EYt8R9oGi2j4 +/rpdW+rYGjW3TcmzdR7lpVMJRLlbMbSdR8n6cI6rnfySygcoE5tFX5t/YZSNbBPg +GebKCbEHYNTTG8bC1qjUyzlbEQ6XYWvFO7HTKU7105XpjYTQFByeo0IVkin0o5KW +t7eQWb0CgYEA6zZUWsYoQ13nXEU6Ky89Q9uhesMfaJ/F2X5ikQSRqRvrR3QR+ULe +eNnCl10O9SiFpR4b5gSbLSHMffxGN60P1nEO4CiIKE+gOii8Kdk5htIJFy/dcZUc +PuPM+zD9/6Is5sAWUZo45bnT6685h6EjM2+6zNZtx/XMjSfWbHaY+HMCgYEA4QAy +6ZEgd6FHnNfM/q2o8XU3d6OCdhcu26u6ydnCalbSpPSKWOi6gnHK4ZnGdryXgIYw +hRkvYINfiONkShYytotIh4YxUbgpwdvJRyKa2ZdWhcMmtFzZOcEVzQTKBasFT74C +Wo0iybZ++XZh3M0+n7oyyx39aR7diZ+/zq6PnG8CgYB8B1QH4cHNdDDRqPd5WhmW +NLQ7xbREOSvc+hYDnkMoxz4TmZL4u1gQpdNEeZ+visSeQvg3HGqvK8lnDaYBKdLW +IxvS+8yAZSx6PoyqDI+XFh4RCf5dLGGOkBTAyB7Hs761lsiuEwK5sHmdJ/LQIBot +v1bjOJb/AA/yxvT8kLUtHQKBgGIA9iwqXJv/EfRNQytDdS0HQ4vHGtJZMr3YRVoa +kcZD3yieo4wqguLCsf4mPv4FE3CWAphW6f39+yTi9xIWLSy56nOtjdnsf7PDCh8E +AbL5amSFJly1fKDda6OLjHt/jKa5Osk6ZIa8CP6cA/BrLfXg4rL6cyDQouqJPMDH +5CHdAoGBAIChjbTyoYvANkoANCK4SuqLUYeiYREfiM3sqHe1xirK1PPHw03ZLITl +ltjo9qE6kPXWcTBVckTKGFlntyCT283FC0/vMmHo8dTdtxF4/wSbkqs3ORuJ3p5J +cNtLYGD3vgwLmg6tTur4U60XN+tYDzWGteez8J9GwTMfKJmuS9af +-----END RSA PRIVATE KEY----- +end diff --git a/third_party/nixpkgs/pkgs/build-support/replace-secret/test/expected_short_output b/third_party/nixpkgs/pkgs/build-support/replace-secret/test/expected_short_output new file mode 100644 index 0000000000..3c81b2e2f9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/replace-secret/test/expected_short_output @@ -0,0 +1,4 @@ +beginning +middle a not this +b +end diff --git a/third_party/nixpkgs/pkgs/build-support/replace-secret/test/input_file b/third_party/nixpkgs/pkgs/build-support/replace-secret/test/input_file new file mode 100644 index 0000000000..1e7eadfaab --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/replace-secret/test/input_file @@ -0,0 +1,4 @@ +beginning +middle replace this not this +and this +end diff --git a/third_party/nixpkgs/pkgs/build-support/replace-secret/test/passwd b/third_party/nixpkgs/pkgs/build-support/replace-secret/test/passwd new file mode 100644 index 0000000000..68f266226e --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/replace-secret/test/passwd @@ -0,0 +1 @@ +$6$UcbJUl5g$HRMfKNKsLTfVbcQb.P5o0bmZUfHDYkWseMSuZ8F5jSIGZZcI3Jnit23f8ZeZOGi4KL86HVM9RYqrpYySOu/fl0 diff --git a/third_party/nixpkgs/pkgs/build-support/replace-secret/test/rsa b/third_party/nixpkgs/pkgs/build-support/replace-secret/test/rsa new file mode 100644 index 0000000000..138cc99ed2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/replace-secret/test/rsa @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAzrru6v5tfwQl6L+rOUjtLo8kbhMUlCLXP7TYngSGrkzPMWe+ +0gB04UAmiPZXfBmvj5fPqYiFjIaEDHE/SD41vJB/RJKKtId2gCAIHhBLkbr+4+60 +yEbLkJci5i4kJC1dt8OKFEzXkaVnwOSgjH+0NwO3bstZ+E70zMXS9+NS71qGsIEb +5J1TnacwW/u6CdFyakLljWOXOR14rLIpiPBBFLf+oZiepjIhlWXWHqsxZOb7zMI0 +T4W5WJ2dwGFsJ8rkYaGZ+A5qzYbi/KmHqaSPaNDsyoi7yJhAhKPByALJU916+8QO +xOnqZxWGki3PDzCslRwW4i3mGbZlBQMnlfbN3QIDAQABAoIBAHDn1W7QkFrLmCy6 +6bf6pVdFZF8d2qJhOPAZRClhTXFKj+pqv+QPzcXr9F/fMr6bhK/G+Oqdnlq2aM4m +16oMF+spe+impEyeo1CsreJFghBQcb9o8qFjUPBiKvROBP0hLcscZ4BYy29HSBgo +harWYEWfqQJA251q+fYQoP0z0WrZKddOZbRRnJ0ICRxAE7IEtDT6EYt8R9oGi2j4 +/rpdW+rYGjW3TcmzdR7lpVMJRLlbMbSdR8n6cI6rnfySygcoE5tFX5t/YZSNbBPg +GebKCbEHYNTTG8bC1qjUyzlbEQ6XYWvFO7HTKU7105XpjYTQFByeo0IVkin0o5KW +t7eQWb0CgYEA6zZUWsYoQ13nXEU6Ky89Q9uhesMfaJ/F2X5ikQSRqRvrR3QR+ULe +eNnCl10O9SiFpR4b5gSbLSHMffxGN60P1nEO4CiIKE+gOii8Kdk5htIJFy/dcZUc +PuPM+zD9/6Is5sAWUZo45bnT6685h6EjM2+6zNZtx/XMjSfWbHaY+HMCgYEA4QAy +6ZEgd6FHnNfM/q2o8XU3d6OCdhcu26u6ydnCalbSpPSKWOi6gnHK4ZnGdryXgIYw +hRkvYINfiONkShYytotIh4YxUbgpwdvJRyKa2ZdWhcMmtFzZOcEVzQTKBasFT74C +Wo0iybZ++XZh3M0+n7oyyx39aR7diZ+/zq6PnG8CgYB8B1QH4cHNdDDRqPd5WhmW +NLQ7xbREOSvc+hYDnkMoxz4TmZL4u1gQpdNEeZ+visSeQvg3HGqvK8lnDaYBKdLW +IxvS+8yAZSx6PoyqDI+XFh4RCf5dLGGOkBTAyB7Hs761lsiuEwK5sHmdJ/LQIBot +v1bjOJb/AA/yxvT8kLUtHQKBgGIA9iwqXJv/EfRNQytDdS0HQ4vHGtJZMr3YRVoa +kcZD3yieo4wqguLCsf4mPv4FE3CWAphW6f39+yTi9xIWLSy56nOtjdnsf7PDCh8E +AbL5amSFJly1fKDda6OLjHt/jKa5Osk6ZIa8CP6cA/BrLfXg4rL6cyDQouqJPMDH +5CHdAoGBAIChjbTyoYvANkoANCK4SuqLUYeiYREfiM3sqHe1xirK1PPHw03ZLITl +ltjo9qE6kPXWcTBVckTKGFlntyCT283FC0/vMmHo8dTdtxF4/wSbkqs3ORuJ3p5J +cNtLYGD3vgwLmg6tTur4U60XN+tYDzWGteez8J9GwTMfKJmuS9af +-----END RSA PRIVATE KEY----- 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 3d2dc3733c..61cec2a6ab 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 @@ -92,7 +92,7 @@ in nettle-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle clang ]; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; }; openssl = attrs: { diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix index 4995efd9a4..0bf67d21b3 100644 --- a/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix @@ -438,6 +438,35 @@ rec { done < graph ''; + /* + Write the set of references to a file, that is, their immediate dependencies. + + This produces the equivalent of `nix-store -q --references`. + */ + writeDirectReferencesToFile = path: runCommand "runtime-references" + { + exportReferencesGraph = ["graph" path]; + inherit path; + } + '' + touch ./references + while read p; do + read dummy + read nrRefs + if [[ $p == $path ]]; then + for ((i = 0; i < nrRefs; i++)); do + read ref; + echo $ref >>./references + done + else + for ((i = 0; i < nrRefs; i++)); do + read ref; + done + fi + done < graph + sort ./references >$out + ''; + /* Print an error message if the file with the specified name and * hash doesn't exist in the Nix store. This function should only @@ -541,4 +570,37 @@ rec { phases = "unpackPhase patchPhase installPhase"; installPhase = "cp -R ./ $out"; }; + + /* Checks the command output contains the specified version + * + * Although simplistic, this test assures that the main program + * can run. While there's no substitute for a real test case, + * it does catch dynamic linking errors and such. It also provides + * some protection against accidentally building the wrong version, + * for example when using an 'old' hash in a fixed-output derivation. + * + * Examples: + * + * passthru.tests.version = testVersion { package = hello; }; + * + * passthru.tests.version = testVersion { + * package = seaweedfs; + * command = "weed version"; + * }; + * + * passthru.tests.version = testVersion { + * package = key; + * command = "KeY --help"; + * # Wrong '2.5' version in the code. Drop on next version. + * version = "2.5"; + * }; + */ + testVersion = + { package, + command ? "${package.meta.mainProgram or package.pname or package.name} --version", + version ? package.version, + }: runCommand "test-version" { nativeBuildInputs = [ package ]; meta.timeout = 60; } '' + ${command} | grep -Fw ${version} + touch $out + ''; } diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test.nix new file mode 100644 index 0000000000..204fb54fca --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test.nix @@ -0,0 +1,53 @@ +{ lib, nixosTest, pkgs, writeText, hello, figlet, stdenvNoCC }: + +# -------------------------------------------------------------------------- # +# +# trivial-builders test +# +# -------------------------------------------------------------------------- # +# +# This file can be run independently (quick): +# +# $ pkgs/build-support/trivial-builders/test.sh +# +# or in the build sandbox with a ~20s VM overhead +# +# $ nix-build -A tests.trivial-builders +# +# -------------------------------------------------------------------------- # + +let + invokeSamples = file: + lib.concatStringsSep " " ( + lib.attrValues (import file { inherit pkgs; }) + ); +in +nixosTest { + name = "nixpkgs-trivial-builders"; + nodes.machine = { ... }: { + virtualisation.writableStore = true; + + # Test runs without network, so we don't substitute and prepare our deps + nix.binaryCaches = lib.mkForce []; + environment.etc."pre-built-paths".source = writeText "pre-built-paths" ( + builtins.toJSON [hello figlet stdenvNoCC] + ); + environment.variables = { + SAMPLE = invokeSamples ./test/sample.nix; + REFERENCES = invokeSamples ./test/invoke-writeReferencesToFile.nix; + DIRECT_REFS = invokeSamples ./test/invoke-writeDirectReferencesToFile.nix; + }; + }; + testScript = '' + machine.succeed(""" + ${./test.sh} 2>/dev/console + """) + ''; + meta = { + license = lib.licenses.mit; # nixpkgs license + maintainers = with lib.maintainers; [ + roberth + ]; + description = "Run the Nixpkgs trivial builders tests"; + }; +} diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test.sh b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test.sh new file mode 100755 index 0000000000..b7c4726a9b --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test.sh @@ -0,0 +1,56 @@ +#!/usr/bin/env bash + +# -------------------------------------------------------------------------- # +# +# trivial-builders test +# +# -------------------------------------------------------------------------- # +# +# This file can be run independently (quick): +# +# $ pkgs/build-support/trivial-builders/test.sh +# +# or in the build sandbox with a ~20s VM overhead +# +# $ nix-build -A tests.trivial-builders +# +# -------------------------------------------------------------------------- # + +# strict bash +set -euo pipefail + +# debug +# set -x +# PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }' + +cd "$(dirname ${BASH_SOURCE[0]})" # nixpkgs root + +if [[ -z ${SAMPLE:-} ]]; then + sample=( `nix-build test/sample.nix` ) + directRefs=( `nix-build test/invoke-writeDirectReferencesToFile.nix` ) + references=( `nix-build test/invoke-writeReferencesToFile.nix` ) +else + # Injected by Nix (to avoid evaluating in a derivation) + # turn them into arrays + sample=($SAMPLE) + directRefs=($DIRECT_REFS) + references=($REFERENCES) +fi + +echo >&2 Testing direct references... +for i in "${!sample[@]}"; do + echo >&2 Checking '#'$i ${sample[$i]} ${directRefs[$i]} + diff -U3 \ + <(sort <${directRefs[$i]}) \ + <(nix-store -q --references ${sample[$i]} | sort) +done + +echo >&2 Testing closure... +for i in "${!sample[@]}"; do + echo >&2 Checking '#'$i ${sample[$i]} ${references[$i]} + diff -U3 \ + <(sort <${references[$i]}) \ + <(nix-store -q --requisites ${sample[$i]} | sort) +done + +echo 'OK!' diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/invoke-writeDirectReferencesToFile.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/invoke-writeDirectReferencesToFile.nix new file mode 100644 index 0000000000..ead3f7a2f5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/invoke-writeDirectReferencesToFile.nix @@ -0,0 +1,4 @@ +{ pkgs ? import ../../../.. { config = {}; overlays = []; } }: +pkgs.lib.mapAttrs + (k: v: pkgs.writeDirectReferencesToFile v) + (import ./sample.nix { inherit pkgs; }) diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/invoke-writeReferencesToFile.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/invoke-writeReferencesToFile.nix new file mode 100644 index 0000000000..99c6c2f7dc --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/invoke-writeReferencesToFile.nix @@ -0,0 +1,4 @@ +{ pkgs ? import ../../../.. { config = {}; overlays = []; } }: +pkgs.lib.mapAttrs + (k: v: pkgs.writeReferencesToFile v) + (import ./sample.nix { inherit pkgs; }) diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/sample.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/sample.nix new file mode 100644 index 0000000000..060be01109 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/sample.nix @@ -0,0 +1,15 @@ +{ pkgs ? import ../../../.. { config = {}; overlays = []; } }: +let + inherit (pkgs) + figlet + hello + writeText + ; +in +{ + hello = hello; + figlet = figlet; + norefs = writeText "hi" "hello"; + helloRef = writeText "hi" "hello ${hello}"; + helloFigletRef = writeText "hi" "hello ${hello} ${figlet}"; +} diff --git a/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix b/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix index 6e21220918..e76fee1a6e 100644 --- a/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , gettext -, gnome3 +, gnome , itstool , libxml2 , yelp-tools @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1h9lyn80zccmgi6gpymabgrcj7km0sb1axll5z490qnx74xbn37m"; + url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "09ld9r29nz64s04fmp3b2wwldmfnwxp4w36dkh7mbz5pdd3z7fwk"; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix index 5129cf2718..011e88dc1d 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,14 +1,12 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome }: -let +stdenv.mkDerivation rec { pname = "cantarell-fonts"; - version = "0.111"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.301"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "05hpnhihwm9sxlq1qn993g03pwkmpjbn0dvnba71r1gfjv0jp2w5"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83"; }; nativeBuildInputs = [ meson ninja gettext appstream-glib ]; @@ -21,10 +19,10 @@ in stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "12ps2gjv1lmzbmkv16vgjmaahl3ayadpniyrx0z31sqn443r57hq"; + outputHash = "1sczskw2kv3qy39i9mzw2lkl94a90bjgv5ln9acy5kh4gb2zmy7z"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/data/fonts/inter/default.nix b/third_party/nixpkgs/pkgs/data/fonts/inter/default.nix index ed8e9eb13a..00117840cd 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/inter/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/inter/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "3.15"; + version = "3.18"; in fetchzip { name = "inter-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "0dnxczy2avc47wq5fc3psd1zbxbsjz5w24rkh5ynrfgw6n0753n0"; + sha256 = "sha256-+wbN1vSS8v1Z1VIfDNeY9DB8Kr6v7UnFg37EPPAD7wI="; meta = with lib; { homepage = "https://rsms.me/inter/"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix index 77083268b0..ba9ad48e39 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix @@ -1,22 +1,27 @@ { lib, fetchzip }: let - version = "0.035"; + version = "0.039"; -in fetchzip { - name = "JuliaMono-${version}"; - url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono.zip"; - sha256 = "sha256:17w8rn37wadxnmakhd6mpmqdx14dsrc3qym4k9b47albl1a34i1j"; +in +fetchzip { + name = "JuliaMono-ttf-${version}"; + url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz"; + sha256 = "sha256-M9T78xnSN1hcHLXkut09eD2IFrgCRTG9fAPqMv4MXWY="; postFetch = '' mkdir -p $out/share/fonts/truetype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + tar xf $downloadedFile -C $out/share/fonts/truetype ''; meta = with lib; { description = "A monospaced font for scientific and technical computing"; longDescription = '' - JuliaMono is a monospaced typeface designed for use in text editing environments that require a wide range of specialist and technical Unicode characters. It was intended as a fun experiment to be presented at the 2020 JuliaCon conference in Lisbon, Portugal (which of course didn’t physically happen in Lisbon, but online). + JuliaMono is a monospaced typeface designed for use in text editing + environments that require a wide range of specialist and technical Unicode + characters. It was intended as a fun experiment to be presented at the + 2020 JuliaCon conference in Lisbon, Portugal (which of course didn’t + physically happen in Lisbon, but online). ''; maintainers = with maintainers; [ suhr ]; platforms = with platforms; all; diff --git a/third_party/nixpkgs/pkgs/data/fonts/open-sans/default.nix b/third_party/nixpkgs/pkgs/data/fonts/open-sans/default.nix index ecca50537f..0c9cf7b6a3 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/open-sans/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/open-sans/default.nix @@ -26,6 +26,6 @@ in fetchFromGitLab { homepage = "https://www.opensans.com"; license = licenses.asl20; platforms = platforms.all; - maintainers = [ maintainers.worldofpeace ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/stix-two/default.nix b/third_party/nixpkgs/pkgs/data/fonts/stix-two/default.nix index 53c4143842..c05c1273a4 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/stix-two/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/stix-two/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2.12"; + version = "2.13"; in fetchzip { name = "stix-two-${version}"; url = "https://github.com/stipub/stixfonts/raw/v${version}/zipfiles/STIX${builtins.replaceStrings [ "." ] [ "_" ] version}-all.zip"; - sha256 = "1a6v8p5zbjlv1gfhph0rzkvnmvxf4n1y0mdrdgng01yyl1nngrn9"; + sha256 = "sha256-cBtZe/oq4bQCscSAhJ4YuTSghDleD9O/+3MHOJyI50o="; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/third_party/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix index 6b7de57a4f..88184b585e 100644 --- a/third_party/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome3, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "arc-icon-theme"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ moka-icon-theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index dfcd2f5967..384086204c 100644 --- a/third_party/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ pantheon.elementary-icon-theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/humanity-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/humanity-icon-theme/default.nix index 13ee96d049..12e2d0a06d 100644 --- a/third_party/nixpkgs/pkgs/data/icons/humanity-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/humanity-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk3, gnome3, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, gtk3, gnome, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "humanity-icon-theme"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme hicolor-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix index c84369a8a4..a8eb1a8736 100644 --- a/third_party/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "paper-icon-theme"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix index cb7db20d67..1bcfab57b4 100644 --- a/third_party/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix @@ -4,7 +4,7 @@ , ninja , gtk3 , breeze-icons -, gnome3 +, gnome , pantheon , hicolor-icon-theme }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ breeze-icons - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme pantheon.elementary-icon-theme hicolor-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix b/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix index 2212b158c8..d79fc73d61 100644 --- a/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20201221"; + version = "20210505"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; rev = version; - sha256 = "1sryyjjad835mwc7a2avbij6myln8b824kjdr78gc9hh3p16929b"; + sha256 = "sha256-k0Bcf1I/g2sFnX3y4qyWG7Z3W7K6YeZ9trUFSJ4NhSo="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/data/misc/fedora-backgrounds/default.nix b/third_party/nixpkgs/pkgs/data/misc/fedora-backgrounds/default.nix index 31bc28a9f9..3089e721a7 100644 --- a/third_party/nixpkgs/pkgs/data/misc/fedora-backgrounds/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/fedora-backgrounds/default.nix @@ -20,4 +20,15 @@ in { # Fix broken symlinks in the Xfce background directory. patches = [ ./f33-fix-xfce-path.patch ]; }; + + f34 = fedoraBackground rec { + version = "34.0.1"; + src = fetchurl { + url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz"; + hash = "sha256-0gotgQ4N0yE8WZbsu7B3jmUIZrycbqjEMxZl01JcJj4="; + }; + # Fix broken symlinks in the Xfce background directory. + patches = [ ./f34-fix-xfce-path.patch ]; + }; + } diff --git a/third_party/nixpkgs/pkgs/data/misc/fedora-backgrounds/f34-fix-xfce-path.patch b/third_party/nixpkgs/pkgs/data/misc/fedora-backgrounds/f34-fix-xfce-path.patch new file mode 100644 index 0000000000..8479276671 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/misc/fedora-backgrounds/f34-fix-xfce-path.patch @@ -0,0 +1,13 @@ +diff --git a/default/Makefile b/default/Makefile +index 172d5d9..540a1c0 100644 +--- a/default/Makefile ++++ b/default/Makefile +@@ -1,7 +1,7 @@ + WP_NAME=f34 + WP_BIGNAME=F34 + WP_DIR=$(DESTDIR)/usr/share/backgrounds/$(WP_NAME) +-WP_DIR_LN=/usr/share/backgrounds/$(WP_NAME) ++WP_DIR_LN=$(DESTDIR)/usr/share/backgrounds/$(WP_NAME) + GNOME_BG_DIR=$(DESTDIR)/usr/share/gnome-background-properties + KDE_BG_DIR=$(DESTDIR)/usr/share/wallpapers + MATE_BG_DIR=$(DESTDIR)/usr/share/mate-background-properties diff --git a/third_party/nixpkgs/pkgs/data/misc/graphs/default.nix b/third_party/nixpkgs/pkgs/data/misc/graphs/default.nix index 19438d8356..93a0d75aaf 100644 --- a/third_party/nixpkgs/pkgs/data/misc/graphs/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/graphs/default.nix @@ -7,9 +7,7 @@ stdenv.mkDerivation rec { version = "20210214"; src = fetchurl { - url = "https://mirrors.mit.edu/sage/spkg/upstream/${pname}/${pname}-${version}.tar.bz2"; - # TODO: switch to the url below once Sage 9.3 is released - # url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2"; + url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2"; sha256 = "sha256-ByN8DZhTYRUFw4n9e7klAMh0P1YxurtND0Xf2DMvN0E="; }; diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix index d8599c50b1..e559281303 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,10 @@ +# Hackage database snapshot, used by maintainers/scripts/regenerate-hackage-packages.sh +# and callHackage { fetchurl }: - +let + pin = builtins.fromJSON (builtins.readFile ./pin.json); +in fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/d202e2aff06500ede787ed63544476f6d41e9eb7.tar.gz"; - sha256 = "00hmclrhr3a2h9vshsl909g0zgymlamx491lkhwr5kgb3qx9sfh2"; + inherit (pin) url sha256; + passthru.updateScript = ../../../../maintainers/scripts/haskell/update-hackage.sh; } diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json new file mode 100644 index 0000000000..43c45c95cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -0,0 +1,6 @@ +{ + "commit": "2295bd36e0d36af6e862dfdb7b0694fba2e7cb58", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2295bd36e0d36af6e862dfdb7b0694fba2e7cb58.tar.gz", + "sha256": "1bzqy6kbw0i1ryg3ia5spg6m62zkc46xhhn0h76pfq7mfmm3fqf8", + "msg": "Update from Hackage at 2021-05-12T11:46:04Z" +} diff --git a/third_party/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/third_party/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix index f487edba98..49755dbd8a 100644 --- a/third_party/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -1,16 +1,21 @@ -{ lib, stdenv, fetchurl, gnome3 }: +{ lib, stdenv, fetchurl, gnome, libxslt }: stdenv.mkDerivation rec { pname = "mobile-broadband-provider-info"; - version = "20190116"; + version = "20201225"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "16y5lc7pfdvai9c8xwb825zc3v46039gghbip13fqslf5gw11fic"; + sha256 = "1g9x2i4xjm2sagaha07n9psacbylrwfrmfqkp17gjwhpyi6w0zqd"; }; + nativeBuildInputs = [ + # fixes configure: error: xsltproc not found + libxslt + ]; + passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/data/themes/adapta/default.nix b/third_party/nixpkgs/pkgs/data/themes/adapta/default.nix index f67d689a4b..fc6e5b8c35 100644 --- a/third_party/nixpkgs/pkgs/data/themes/adapta/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/adapta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome }: stdenv.mkDerivation rec { pname = "adapta-gtk-theme"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inkscape libxml2 glib.dev - gnome3.gnome-shell + gnome.gnome-shell ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix b/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix index ace93fa449..2722c4fe20 100644 --- a/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix @@ -1,14 +1,24 @@ -{ mkDerivation, lib, fetchFromGitHub, nix-update-script, cmake, ninja, qtbase, pantheon }: +{ mkDerivation +, stdenv +, lib +, fetchFromGitHub +, nix-update-script +, cmake +, ninja +, qtbase +, qt5 +, xorg +}: mkDerivation rec { pname = "adwaita-qt"; - version = "1.1.4"; + version = "1.3.0"; src = fetchFromGitHub { owner = "FedoraQt"; repo = pname; rev = version; - sha256 = "19s97wm96g3828dp8m85j3lsn1n6h5h2zqk4652hcqcgq6xb6gv5"; + sha256 = "1fkivdiz4al84nhgg1srj33l109j9si63biw3asy339cyyzj28c9"; }; nativeBuildInputs = [ @@ -18,11 +28,14 @@ mkDerivation rec { buildInputs = [ qtbase + qt5.qtx11extras + ] ++ lib.optionals stdenv.isLinux [ + xorg.libxcb ]; postPatch = '' # Fix plugin dir - substituteInPlace style/CMakeLists.txt \ + substituteInPlace src/style/CMakeLists.txt \ --replace "DESTINATION \"\''${QT_PLUGINS_DIR}/styles" "DESTINATION \"$qtPluginPrefix/styles" ''; @@ -36,7 +49,7 @@ mkDerivation rec { description = "A style to bend Qt applications to look like they belong into GNOME Shell"; homepage = "https://github.com/FedoraQt/adwaita-qt"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ worldofpeace ]; - platforms = platforms.linux; + maintainers = teams.gnome.members ++ (with maintainers; [ ]); + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/data/themes/amber/default.nix b/third_party/nixpkgs/pkgs/data/themes/amber/default.nix index 258dcff326..e39f0e3f64 100644 --- a/third_party/nixpkgs/pkgs/data/themes/amber/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/amber/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "amber-theme"; - version = "3.36-2"; + version = "3.38-1"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "1g0hkv9sxfxfnpv8x7g64lr2by7wd4k216s3y9xpibsycdbwpyi5"; + sha256 = "sha256-OrdBeAD+gdIu6u8ESE9PtqYadSuJ8nx1Z8fB4D9y4W4="; }; nativeBuildInputs = [ meson ninja sassc ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/arc/default.nix b/third_party/nixpkgs/pkgs/data/themes/arc/default.nix index 8a283a0418..630d928e60 100644 --- a/third_party/nixpkgs/pkgs/data/themes/arc/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/arc/default.nix @@ -1,10 +1,12 @@ { lib, stdenv , fetchFromGitHub , sassc -, autoreconfHook +, meson +, ninja , pkg-config , gtk3 -, gnome3 +, glib +, gnome , gtk-engine-murrine , optipng , inkscape @@ -13,46 +15,46 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20210127"; + version = "20210412"; src = fetchFromGitHub { owner = "jnsh"; repo = pname; rev = version; - sha256 = "sha256-P7YZTD5bAWNWepL7qsZZAMf8ujzNbHOj/SLx8Fw3bi4="; + sha256 = "sha256-BNJirtBtdWsIzQfsJsZzg1zFbJEzZPq1j2qZ+1QjRH8="; }; nativeBuildInputs = [ - autoreconfHook + meson + ninja pkg-config sassc optipng inkscape gtk3 + glib # for glib-compile-resources ]; propagatedUserEnvPkgs = [ - gnome3.gnome-themes-extra + gnome.gnome-themes-extra gtk-engine-murrine ]; - enableParallelBuilding = true; - preBuild = '' # Shut up inkscape's warnings about creating profile directory export HOME="$NIX_BUILD_ROOT" ''; - configureFlags = [ - "--with-cinnamon=${cinnamon.cinnamon-common.version}" - "--with-gnome-shell=${gnome3.gnome-shell.version}" - "--disable-unity" + mesonFlags = [ + "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm" + "-Dvariants=light,darker,dark,lighter" + "-Dcinnamon_version=${cinnamon.cinnamon-common.version}" + "-Dgnome_shell_version=${gnome.gnome-shell.version}" + "-Dgtk3_version=${gtk3.version}" + # You will need to patch gdm to make use of this. + "-Dgnome_shell_gresource=true" ]; - postInstall = '' - install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md - ''; - meta = with lib; { description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell"; homepage = "https://github.com/jnsh/arc-theme"; diff --git a/third_party/nixpkgs/pkgs/data/themes/canta/default.nix b/third_party/nixpkgs/pkgs/data/themes/canta/default.nix index cf12231520..431522fa85 100644 --- a/third_party/nixpkgs/pkgs/data/themes/canta/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/canta/default.nix @@ -4,7 +4,7 @@ , librsvg , gtk-engine-murrine , gtk3 -, gnome3 +, gnome , gnome-icon-theme , numix-icon-theme-circle , hicolor-icon-theme @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme numix-icon-theme-circle hicolor-icon-theme diff --git a/third_party/nixpkgs/pkgs/data/themes/cdetheme/default.nix b/third_party/nixpkgs/pkgs/data/themes/cdetheme/default.nix index 466f7d0daf..a2d6568b9a 100644 --- a/third_party/nixpkgs/pkgs/data/themes/cdetheme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/cdetheme/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnome-look.org/p/1231025"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; hydraPlatforms = []; }; } diff --git a/third_party/nixpkgs/pkgs/data/themes/equilux-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/equilux-theme/default.nix index 162b878850..067c2b88a0 100644 --- a/third_party/nixpkgs/pkgs/data/themes/equilux-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/equilux-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: +{ lib, stdenv, fetchFromGitHub, gnome, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: stdenv.mkDerivation rec { pname = "equilux-theme"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ glib libxml2 bc ]; - buildInputs = [ gnome3.gnome-themes-extra gdk-pixbuf librsvg ]; + buildInputs = [ gnome.gnome-themes-extra gdk-pixbuf librsvg ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patchShebangs install.sh sed -i install.sh \ -e "s|if .*which gnome-shell.*;|if true;|" \ - -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome3.gnome-shell.version}|" + -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome.gnome-shell.version}|" mkdir -p $out/share/themes ./install.sh --dest $out/share/themes rm $out/share/themes/*/COPYING diff --git a/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix b/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix index 6eea90c711..f33fa2db54 100644 --- a/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.12"; + version = "1.13"; src = fetchurl { url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; - sha256 = "1pawdfyvpbvhb6fa27rgjp49vlbmix9pq192wjlv2wgq7v4ip9y8"; + sha256 = "04a9c56w4hm8lwa8hzy5lwj4yli19gzy5wp5iinsm61qas9xgy69"; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/data/themes/kde2/default.nix b/third_party/nixpkgs/pkgs/data/themes/kde2/default.nix index 04986b7dcc..1404a6ca86 100644 --- a/third_party/nixpkgs/pkgs/data/themes/kde2/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/kde2/default.nix @@ -25,6 +25,6 @@ mkDerivation rec { homepage = "https://github.com/repos-holder/kdecoration2-kde2"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/themes/lounge/default.nix b/third_party/nixpkgs/pkgs/data/themes/lounge/default.nix index 0c51b78333..ab945f5105 100644 --- a/third_party/nixpkgs/pkgs/data/themes/lounge/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/lounge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome3, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "lounge-gtk-theme"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; mesonFlags = [ - "-D gnome_version=${lib.versions.majorMinor gnome3.gnome-shell.version}" + "-D gnome_version=${lib.versions.majorMinor gnome.gnome-shell.version}" ]; postFixup = '' 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 4189f0ed48..d467526582 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.8"; + version = "2.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0zxj20inwdfxhsc7cq6b3ijkxmrhnrwvbmyb1lw4vfjs4p4wrws0"; + sha256 = "1si0gaa1njyf4194i6rbx4qjp31sw238svvb2x8r8cfhm8mkhm8d"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix index bcf6d69a65..5eeab87974 100644 --- a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -8,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "8.0"; + version = "9.2.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0ljigm5z13r0idfkjgy5ysq9pzdj66ql269p5phhp47aagmjcv3s"; + sha256 = "08392ybpxnbq3wswa7bvz8nnxryjg9aczvw3arnhfvmbigwq5q0s"; }; buildInputs = [ 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 d34ece5c94..f9e3463f2f 100644 --- a/third_party/nixpkgs/pkgs/data/themes/materia-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/materia-theme/default.nix @@ -3,7 +3,7 @@ , meson , ninja , sassc -, gnome3 +, gnome , gtk-engine-murrine , gdk-pixbuf , librsvg @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gnome-themes-extra + gnome.gnome-themes-extra gdk-pixbuf librsvg ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { dontBuild = true; mesonFlags = [ - "-Dgnome_shell_version=${lib.versions.majorMinor gnome3.gnome-shell.version}" + "-Dgnome_shell_version=${lib.versions.majorMinor gnome.gnome-shell.version}" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/data/themes/plano/default.nix b/third_party/nixpkgs/pkgs/data/themes/plano/default.nix index 5728dff6f9..9f05a19919 100644 --- a/third_party/nixpkgs/pkgs/data/themes/plano/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/plano/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "plano-theme"; - version = "3.36-2"; + version = "3.38-1"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "01dkjck9rlrf8wa30ad7kfv0gbpdf3l05rw7nxrvb1gh5d2vxig9"; + sha256 = "0g2mwvzc04z3dsdfhwqgw9s7987406pv22s9rbazfvprk4ddc5b6"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/qtcurve/default.nix b/third_party/nixpkgs/pkgs/data/themes/qtcurve/default.nix index 45a56f3355..0b639133a4 100644 --- a/third_party/nixpkgs/pkgs/data/themes/qtcurve/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/qtcurve/default.nix @@ -64,6 +64,6 @@ mkDerivation rec { description = "Widget styles for Qt5/Plasma 5 and gtk2"; platforms = platforms.linux; license = licenses.lgpl21Plus; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/themes/stilo/default.nix b/third_party/nixpkgs/pkgs/data/themes/stilo/default.nix index 54d6f2a6e3..bfcda04932 100644 --- a/third_party/nixpkgs/pkgs/data/themes/stilo/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/stilo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stilo-themes"; - version = "3.36-3"; + version = "3.38-1"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0haxzqxyfx3rc305w7f744fp2xb6j7yn28ldynnvmm47h7ga3as3"; + sha256 = "09xarzp0j0a8cqzcg0447jl5cgvl6ccj5f00dik1hy2nlrz7d8ad"; }; nativeBuildInputs = [ meson ninja sassc ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/ubuntu-themes/default.nix b/third_party/nixpkgs/pkgs/data/themes/ubuntu-themes/default.nix index 732c9a7457..fb23141a64 100644 --- a/third_party/nixpkgs/pkgs/data/themes/ubuntu-themes/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/ubuntu-themes/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , gnome-icon-theme -, gnome3 +, gnome , gtk-engine-murrine , gtk3 , hicolor-icon-theme @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gnome-icon-theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme humanity-icon-theme hicolor-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix b/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix index f0d2493473..c2f449e9f2 100644 --- a/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, - python3, gtk3, gnome3, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }: + python3, gtk3, gnome, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "yaru"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; - buildInputs = [ gtk3 gnome3.gnome-themes-extra ]; + buildInputs = [ gtk3 gnome.gnome-themes-extra ]; propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix b/third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix index 2a0769c92e..563a1b49e5 100644 --- a/third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix @@ -75,7 +75,7 @@ EOF description = "Common Desktop Environment"; homepage = "https://sourceforge.net/projects/cdesktopenv/"; license = licenses.lgpl2; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } 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 65eede2583..a5800b01a3 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -28,7 +28,7 @@ , wrapGAppsHook , libxml2 , gtk-doc -, gnome3 +, gnome , python3 , keybinder3 , cairo @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { # bindings cairo - gnome3.caribou + gnome.caribou keybinder3 upower xapps diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index c2e50c6555..4208b92ae2 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -18,7 +18,7 @@ , libxklavier , networkmanager , libwacom -, gnome3 +, gnome , wrapGAppsHook , tzdata , glibc diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 39dee473cc..b70673253e 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -12,7 +12,7 @@ , libxslt , gtk3 , libgnomekbd -, gnome3 +, gnome , libtool , wrapGAppsHook , gobject-introspection @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { cinnamon-desktop cinnamon-common libgnomekbd - gnome3.caribou + gnome.caribou # things iso-flags-png-320x420 diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix index 3c01d00393..2e1c739c0f 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix @@ -7,7 +7,7 @@ , wrapGAppsHook , python3 , cairo -, gnome3 +, gnome , xapps , keybinder3 , upower @@ -20,7 +20,7 @@ , meson , sysprof , dbus -, xvfb_run +, xvfb-run , ninja , makeWrapper , which @@ -58,14 +58,14 @@ stdenv.mkDerivation rec { ]; checkInputs = [ - xvfb_run + xvfb-run ]; propagatedBuildInputs = [ glib # bindings - gnome3.caribou + gnome.caribou keybinder3 upower xapps diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-x-icons/default.nix index f52b0556d5..f4a04cf33a 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , lib, stdenv -, gnome3 +, gnome , gnome-icon-theme , hicolor-icon-theme , gtk3 @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme humanity-icon-theme diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix index 8d55e81c58..e04a1baa66 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , lib, stdenv -, gnome3 +, gnome , gnome-icon-theme , hicolor-icon-theme , gtk3 @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix index 2df5f875b4..5470933d61 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix @@ -2,7 +2,7 @@ , cinnamon-desktop , glib , file -, gnome3 +, gnome , gnome-doc-utils , fetchpatch , gobject-introspection @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { xorg.xkeyboardconfig libxkbcommon - gnome3.zenity + gnome.zenity libinput libstartup_notification libXtst diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix deleted file mode 100644 index 82c40fc429..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - pname = "gnome-getting-started-docs"; - version = "3.38.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-getting-started-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "EPviPyw85CdTmk4wekYWlNOHCyMgBGT3BbfYGvmTyFk="; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-getting-started-docs"; attrPath = "gnome3.gnome-getting-started-docs"; }; - }; - - buildInputs = [ intltool itstool libxml2 ]; - - meta = with lib; { - homepage = "https://live.gnome.org/DocumentationProject"; - description = "Help a new user get started in GNOME"; - maintainers = teams.gnome.members; - license = licenses.cc-by-sa-30; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix deleted file mode 100644 index 34aed52fa8..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, meson -, ninja -, pkg-config -, python3 -, wrapGAppsHook -, gettext -, gnome3 -, glib -, gtk3 -, libpeas -, gnome-online-accounts -, gsettings-desktop-schemas -, evolution-data-server -, libxml2 -, libsoup -, libical -, librest -, json-glib -}: - -stdenv.mkDerivation rec { - pname = "gnome-todo"; - version = "3.28.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08ygqbib72jlf9y0a16k54zz51sncpq2wa18wp81v46q8301ymy7"; - }; - - patches = [ - # fix build with libecal 2.0 - (fetchpatch { - name = "gnome-todo-eds-libecal-2.0.patch"; - url = "https://src.fedoraproject.org/rpms/gnome-todo/raw/bed44b8530f3c79589982e03b430b3a125e9bceb/f/gnome-todo-eds-libecal-2.0.patch"; - sha256 = "1ghrz973skal36j90wm2z13m3panw983r6y0k7z9gpj5lxgz92mq"; - }) - ]; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - python3 - wrapGAppsHook - ]; - - buildInputs = [ - glib - gtk3 - libpeas - gnome-online-accounts - gsettings-desktop-schemas - gnome3.adwaita-icon-theme - # Plug-ins - evolution-data-server - libxml2 - libsoup - libical - librest - json-glib - ]; - - # Fix parallel building: missing dependency from src/gtd-application.c - # Probably remove for 3.30+ https://gitlab.gnome.org/GNOME/gnome-todo/issues/170 - preBuild = "ninja src/gtd-vcs-identifier.h"; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - description = "Personal task manager for GNOME"; - homepage = "https://wiki.gnome.org/Apps/Todo"; - license = licenses.gpl3Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/baobab/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/baobab/default.nix deleted file mode 100644 index 81faf79cbb..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/baobab/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, gettext, fetchurl, vala, desktop-file-utils -, meson, ninja, pkg-config, python3, gtk3, glib, libxml2 -, wrapGAppsHook, itstool, gnome3 }: - -let - pname = "baobab"; - version = "3.38.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ac3fbl15l836yvgw724q4whbkws9v4b6l2xy6bnp0b0g0a6i104"; - }; - - nativeBuildInputs = [ meson ninja pkg-config vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook python3 ]; - buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme ]; - - doCheck = true; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - - meta = with lib; { - description = "Graphical application to analyse disk usage in any GNOME environment"; - homepage = "https://wiki.gnome.org/Apps/DiskUsageAnalyzer"; - license = licenses.gpl2; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix deleted file mode 100644 index 1374cfc935..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, libxslt, pkg-config, glib, gtk3, gnome3, python3, dconf -, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }: - -stdenv.mkDerivation rec { - pname = "dconf-editor"; - version = "3.38.2"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ElPa2H5iE/vzE/+eydxDWKobECYfKAcsHcDgmXuS+DU="; - }; - - nativeBuildInputs = [ - meson ninja vala libxslt pkg-config wrapGAppsHook - gettext docbook_xsl libxml2 gobject-introspection python3 - ]; - - buildInputs = [ glib gtk3 dconf ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - platforms = platforms.linux; - maintainers = teams.gnome.members; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix deleted file mode 100644 index 36bf7b3e92..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome3, gettext }: - -stdenv.mkDerivation rec { - pname = "gnome-backgrounds"; - version = "3.38.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1qqygm15rcdgm36vz2iy7b9axndjzvpi29lmygyakjc07a3jlwgp"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome3.gnome-backgrounds"; }; - }; - - nativeBuildInputs = [ meson ninja pkg-config gettext ]; - - meta = with lib; { - platforms = platforms.unix; - maintainers = teams.gnome.members; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix deleted file mode 100644 index 2397b9d7be..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkg-config, gtk3, intltool, glib -, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobject-introspection -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3, gsettings-desktop-schemas }: - -let - pname = "gnome-bluetooth"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "3.34.3"; - - # TODO: split out "lib" - outputs = [ "out" "dev" "devdoc" "man" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "08k4jak4r72pvn5kjhm21planyc514j6c7jjj5lv9nmvvlxqw1ha"; - }; - - nativeBuildInputs = [ - meson ninja intltool itstool pkg-config libxml2 wrapGAppsHook gobject-introspection - gtk-doc docbook_xsl docbook_xml_dtd_43 python3 - ]; - buildInputs = [ - glib gtk3 udev libnotify libcanberra-gtk3 - gnome3.adwaita-icon-theme gsettings-desktop-schemas - ]; - - mesonFlags = [ - "-Dicon_update=false" - "-Dgtk_doc=true" - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; - description = "Application that let you manage Bluetooth in the GNOME destkop"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix deleted file mode 100644 index e033197b34..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkg-config, libxml2 -, gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3 -, gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas, libgee }: - -stdenv.mkDerivation rec { - pname = "gnome-calculator"; - version = "3.38.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0sri58cp6v07cqpdsf8dhf9dnykz305kvkx0l9dd25g06djcr0wc"; - }; - - nativeBuildInputs = [ - meson ninja pkg-config vala gettext itstool wrapGAppsHook python3 - gobject-introspection # for finding vapi files - ]; - - buildInputs = [ - gtk3 glib libxml2 gtksourceview4 mpfr gmp - gnome3.adwaita-icon-theme libgee - gsettings-desktop-schemas libsoup libmpc - ]; - - doCheck = true; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-calculator"; - attrPath = "gnome3.gnome-calculator"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Calculator"; - description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; - maintainers = teams.gnome.members; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix deleted file mode 100644 index c6d8b31930..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchurl, substituteAll, pkg-config, libxslt, ninja, gnome3, gtk3, glib -, gettext, libxml2, xkeyboard_config, isocodes, meson, wayland -, libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: - -stdenv.mkDerivation rec { - pname = "gnome-desktop"; - version = "3.38.4"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-desktop/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-P2A+pb/UdyLJLPybiFRGtGJg6gnIz7Y/a92f7+NC5Iw="; - }; - - nativeBuildInputs = [ - pkg-config meson ninja gettext libxslt libxml2 gobject-introspection - gtk-doc docbook_xsl glib - ]; - buildInputs = [ - bubblewrap xkeyboard_config isocodes wayland - gtk3 glib libseccomp systemd - ]; - - propagatedBuildInputs = [ gsettings-desktop-schemas ]; - - patches = [ - (substituteAll { - src = ./bubblewrap-paths.patch; - bubblewrap_bin = "${bubblewrap}/bin/bwrap"; - inherit (builtins) storeDir; - }) - ]; - - mesonFlags = [ - "-Dgtk_doc=true" - "-Ddesktop_docs=false" - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-desktop"; - attrPath = "gnome3.gnome-desktop"; - }; - }; - - meta = with lib; { - description = "Library with common API for various GNOME modules"; - license = with licenses; [ gpl2 lgpl2 ]; - platforms = platforms.linux; - maintainers = teams.gnome.members; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix deleted file mode 100644 index 5c573d2502..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, gettext, fetchurl, pkg-config, udisks2, libsecret, libdvdread -, meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify -, itstool, gnome3, libxml2, gsettings-desktop-schemas -, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality, systemd }: - -stdenv.mkDerivation rec { - pname = "gnome-disk-utility"; - version = "3.38.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-EL7d5UlL6zTjoiDW8w2TIMiCUv7rhCa9mM760YNteOk="; - }; - - nativeBuildInputs = [ - meson ninja pkg-config gettext itstool libxslt docbook_xsl - wrapGAppsHook python3 libxml2 - ]; - - buildInputs = [ - gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 - udisks2 gnome3.adwaita-icon-theme systemd - gnome3.gnome-settings-daemon gsettings-desktop-schemas - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-disk-utility"; - attrPath = "gnome3.gnome-disk-utility"; - }; - }; - - meta = with lib; { - homepage = "https://en.wikipedia.org/wiki/GNOME_Disks"; - description = "A udisks graphical front-end"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix deleted file mode 100644 index b2db2baf02..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ fetchFromGitLab }: - -let - # We need a gvc different then that which is shipped in the source tarball of - # whatever package that imports this file - gvc-src-with-ucm = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "libgnome-volume-control"; - rev = "7a621180b46421e356b33972e3446775a504139c"; - sha256 = "07rkgh9f7qcmlpy6jqh944axzh3z38f47g48ii842f2i3a1mrbw9"; - }; -in -'' - rm -r ./subprojects/gvc - cp -r ${gvc-src-with-ucm} ./subprojects/gvc -'' diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch deleted file mode 100755 index 1795f998c9..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/applicationsUtils.js b/applicationsUtils.js -index 728223b..aa9f291 100644 ---- a/applicationsUtils.js -+++ b/applicationsUtils.js -@@ -44,27 +44,24 @@ var Search = new Lang.Class({ - * @return {Void} - */ - _init: function () { -- let dir = [ -- "/usr/share/applications", -- GLib.get_home_dir() + "/.local/share/applications", -- ]; -- -- // listen object - file/monitor list -- this._listen = dir.map((path) => { -- let file = Gio.File.new_for_path(path); -- let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null); -- -- // refresh on each directory change -- monitor.connect( -- "changed", -- Lang.bind(this, this._handleMonitorChanged) -- ); -- -- return { -- file: file, -- monitor: monitor, -- }; -- }); -+ this._listen = [...new Set(GLib.get_system_data_dirs())] -+ .filter((path) => path.endsWith("/share")) -+ .map((path) => Gio.File.new_for_path(path + "/applications")) -+ .filter((file) => file.query_exists(null)) -+ .map((file) => { -+ let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null); -+ -+ // refresh on each directory change -+ monitor.connect( -+ "changed", -+ Lang.bind(this, this._handleMonitorChanged) -+ ); -+ -+ return { -+ file: file, -+ monitor: monitor, -+ }; -+ }); - this._interval = null; - this._data = {}; - \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-chess/default.nix deleted file mode 100644 index 918adc0ecc..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, wrapGAppsHook, gobject-introspection -, gettext, itstool, libxml2, python3, gnome3, glib, gtk3, librsvg }: - -stdenv.mkDerivation rec { - pname = "gnome-chess"; - version = "3.38.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-chess/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1bpmi5p5vvjdq2rlm5x9k4gpci8jbrjvdxr1q62h5znzq0vz0w0l"; - }; - - nativeBuildInputs = [ meson ninja vala pkg-config gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ]; - buildInputs = [ glib gtk3 librsvg gnome3.adwaita-icon-theme ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-chess"; - attrPath = "gnome3.gnome-chess"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Chess"; - description = "Play the classic two-player boardgame of chess"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix deleted file mode 100644 index 501b894a1d..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook -, librsvg, gsound, clutter-gtk, gettext, itstool, vala, python3 -, libxml2, libgee, libgnome-games-support, meson, ninja -, desktop-file-utils, hicolor-icon-theme}: - -stdenv.mkDerivation rec { - pname = "gnome-nibbles"; - version = "3.38.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1naknfbciydbym79a0jq039xf0033z8gyln48c0qsbcfr2qn8yj5"; - }; - - nativeBuildInputs = [ - meson ninja vala python3 - pkg-config wrapGAppsHook gettext itstool libxml2 - desktop-file-utils hicolor-icon-theme - ]; - buildInputs = [ - gtk3 librsvg gsound clutter-gtk gnome3.adwaita-icon-theme - libgee libgnome-games-support - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-nibbles"; - attrPath = "gnome3.gnome-nibbles"; - }; - }; - - meta = with lib; { - description = "Guide a worm around a maze"; - homepage = "https://wiki.gnome.org/Apps/Nibbles"; - license = licenses.gpl2; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-robots/default.nix deleted file mode 100644 index e9a079216b..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook -, librsvg, gsound, gettext, itstool, libxml2, libgnome-games-support -, libgee, meson, ninja, python3, desktop-file-utils, adwaita-icon-theme }: - -stdenv.mkDerivation rec { - pname = "gnome-robots"; - version = "3.38.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-robots/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1qpzpsyj9i5dsfy7anfb2dcm602bjkcgqj86fxvnxy6llx56ks0z"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-robots"; attrPath = "gnome3.gnome-robots"; }; - }; - - nativeBuildInputs = [ - pkg-config meson ninja python3 - libxml2 wrapGAppsHook gettext itstool desktop-file-utils - ]; - buildInputs = [ - gtk3 librsvg gsound libgnome-games-support libgee adwaita-icon-theme - ]; - - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Robots"; - description = "Avoid the robots and make them crash into each other"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix deleted file mode 100644 index 9b8c78d6e4..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook -, librsvg, gsound, gettext, itstool, libxml2 -, meson, ninja, vala, python3, desktop-file-utils -}: - -stdenv.mkDerivation rec { - pname = "gnome-taquin"; - version = "3.38.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-taquin/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0kw131q0ad0rbsp6qifjc8fjlhvjxyihil8a76kj8ya9mn7kvnwn"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-taquin"; attrPath = "gnome3.gnome-taquin"; }; - }; - - nativeBuildInputs = [ - pkg-config wrapGAppsHook meson ninja python3 - gettext itstool libxml2 vala desktop-file-utils - ]; - buildInputs = [ - gtk3 librsvg gsound - gnome3.adwaita-icon-theme - ]; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Taquin"; - description = "Move tiles so that they reach their places"; - maintainers = teams.gnome.members; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/swell-foop/default.nix deleted file mode 100644 index 33dd9de1b4..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, glib, gtk3, gnome3, desktop-file-utils -, clutter, clutter-gtk, gettext, itstool, libxml2, wrapGAppsHook, python3 }: - -let - pname = "swell-foop"; - version = "3.34.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1032psxm59nissi268bh3j964m4a0n0ah4dy1pf0ph27j3zvdik1"; - }; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - nativeBuildInputs = [ meson ninja vala pkg-config wrapGAppsHook python3 itstool gettext libxml2 desktop-file-utils ]; - buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme clutter clutter-gtk ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; - description = "Puzzle game, previously known as Same GNOME"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch b/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch deleted file mode 100644 index abd8772cf3..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/test/meson.build b/test/meson.build -index 6ea5e27a..450c03e3 100644 ---- a/test/meson.build -+++ b/test/meson.build -@@ -167,4 +167,4 @@ test_integration_bin = executable('test-integration', - ) - - test('engine-tests', test_engine_bin) --test('client-tests', test_client_bin) -+test('client-tests', test_client_bin, timeout: 300) diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix similarity index 91% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix index 2f8163adc7..d81b846619 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix @@ -1,7 +1,7 @@ { lib , fetchurl , pkg-config -, gnome3 +, gnome , gtk3 , wrapGAppsHook , gobject-introspection @@ -57,9 +57,10 @@ python3.pkgs.buildPythonApplication rec { strictDeps = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "accerciser"; - attrPath = "gnome3.accerciser"; + attrPath = "gnome.accerciser"; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix similarity index 77% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix index 04c6b31563..d0a9d6aaab 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix @@ -1,6 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , gettext , fetchurl +, fetchpatch , wrapGAppsHook , gnome-video-effects , libcanberra-gtk3 @@ -9,23 +11,19 @@ , glib , clutter-gtk , clutter-gst -, udev , gst_all_1 , itstool -, libgudev , vala , docbook_xml_dtd_43 -, docbook_xsl +, docbook-xsl-nons , appstream-glib , libxslt -, yelp-tools -, gnome-common , gtk-doc , adwaita-icon-theme , librsvg , totem , gdk-pixbuf -, gnome3 +, gnome , gnome-desktop , libxml2 , meson @@ -38,37 +36,37 @@ stdenv.mkDerivation rec { pname = "cheese"; version = "3.38.0"; + outputs = [ "out" "man" "devdoc" ]; + src = fetchurl { url = "mirror://gnome/sources/cheese/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8"; }; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { packageName = "cheese"; attrPath = "gnome3.cheese"; }; - }; + patches = [ + # Fix build with latest Vala or GLib + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/cheese/commit/7cf6268e54620bbbe5e6e61800c50fb0cb4bea57.patch"; + sha256 = "WJgGNrpZLTahe7Sxr8HdTl+4Mf4VcmJb6DdiInlDcT4="; + }) + ]; nativeBuildInputs = [ appstream-glib docbook_xml_dtd_43 - docbook_xsl + docbook-xsl-nons gettext - gnome-common gtk-doc itstool libxml2 - libxslt + libxslt # for xsltproc meson ninja pkg-config python3 vala wrapGAppsHook - yelp-tools + glib # for glib-compile-schemas ]; buildInputs = [ @@ -86,12 +84,13 @@ stdenv.mkDerivation rec { gst_all_1.gstreamer gtk3 libcanberra-gtk3 - libgudev librsvg - udev ]; - outputs = [ "out" "man" "devdoc" ]; + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; preFixup = '' gappsWrapperArgs+=( @@ -105,13 +104,18 @@ stdenv.mkDerivation rec { ) ''; - enableParallelBuilding = true; + passthru = { + updateScript = gnome.updateScript { + packageName = "cheese"; + attrPath = "gnome.cheese"; + }; + }; meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Cheese"; description = "Take photos and videos with your webcam, with fun graphical effects"; maintainers = teams.gnome.members; - license = licenses.gpl3; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/file-roller/default.nix similarity index 65% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/file-roller/default.nix index 02801cd5a7..6af1994fb0 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -1,20 +1,21 @@ -{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkg-config, gnome3, gettext, itstool, libxml2, libarchive -, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }: +{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkg-config, gnome, gettext, itstool, libxml2, libarchive +, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales +, unzip, cpio }: stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.38.1"; + version = "3.40.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mxwdbfqizakxq65fa8zlvjf48v5f44lv8ckjw8sl8fk2871784l"; + sha256 = "039w1dcpa5ypmv6sm634alk9vbcdkyvy595vkh5gn032jsiqca2a"; }; LANG = "en_US.UTF-8"; # postinstall.py nativeBuildInputs = [ meson ninja gettext itstool pkg-config libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ]; - buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus ]; + buildInputs = [ glib gtk3 json-glib libarchive file gnome.adwaita-icon-theme libnotify nautilus cpio ]; PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; @@ -24,10 +25,16 @@ stdenv.mkDerivation rec { patchShebangs data/set-mime-type-entry.py ''; + postFixup = '' + # Workaround because of https://gitlab.gnome.org/GNOME/file-roller/issues/40 + wrapProgram "$out/bin/file-roller" \ + --prefix PATH : ${lib.makeBinPath [ unzip ]} + ''; + passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "file-roller"; - attrPath = "gnome3.file-roller"; + attrPath = "gnome.file-roller"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gedit/default.nix similarity index 82% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/gedit/default.nix index 79d31c3b8c..a8479e9cdc 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gedit/default.nix @@ -13,7 +13,7 @@ , ninja , libsoup , tepl -, gnome3 +, gnome , gspell , perl , itstool @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "3.38.1"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gedit/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0kc48a399achcz6vlqq0jk0b8ixbrzyv9xb22s5av76m5hyqalq0"; + url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "149ngl9qw6h59546lir1pa7hvw23ppsnqlj9mfqphmmn5jl99qsm"; }; nativeBuildInputs = [ @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gedit"; - attrPath = "gnome3.gedit"; + attrPath = "gnome.gedit"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/ghex/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix similarity index 94% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/ghex/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix index fb8cf0a1a1..500e60feb7 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix @@ -5,7 +5,7 @@ , meson , ninja , python3 -, gnome3 +, gnome , desktop-file-utils , appstream-glib , gettext @@ -68,9 +68,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "ghex"; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-books/default.nix similarity index 76% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-books/default.nix index bff7c5fb28..0e8b322cf5 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-books/default.nix @@ -14,11 +14,11 @@ , webkitgtk , gnome-desktop , libgepub -, gnome3 +, gnome , gdk-pixbuf , gsettings-desktop-schemas , adwaita-icon-theme -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_42 , desktop-file-utils , python3 @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "gnome-books"; - version = "3.34.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "153vknqisjn5f105avzm933fsc3v0pjzzbwxlqxf8vjjksh1cmya"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0c41l8m2di8h39bmk2fnhpwglwp6qhljmwqqbihzp4ay9976zrc5"; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gettext libxslt desktop-file-utils - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_42 wrapGAppsHook python3 @@ -70,14 +70,13 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-books"; - attrPath = "gnome3.gnome-books"; + attrPath = "gnome.gnome-books"; }; }; meta = with lib; { - broken = true; # Tracker 3 not supported and it cannot start Tracker 2. homepage = "https://wiki.gnome.org/Apps/Books"; description = "An e-book manager application for GNOME"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix similarity index 84% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 302fb7f812..605275be7d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -19,7 +19,7 @@ , python3 , appstream-glib , spice-protocol -, libhandy_0 +, libhandy , libsoup , libosinfo , systemd @@ -31,7 +31,7 @@ , gmp , gdbm , cyrus_sasl -, gnome3 +, gnome , librsvg , desktop-file-utils , mtools @@ -53,11 +53,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1zjvng0izbws3506998l3dwsxjbm7wnhqipb8nmqzvi096czvajl"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "seKPLH+3a/T7uGLQ1S6BG5TL6f8W8GdAiWRWhpCILvg="; }; doCheck = true; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { glib glib-networking gmp - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gtk-vnc gtk3 gtksourceview4 @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { libcap libcap_ng libgudev - libhandy_0 + libhandy libosinfo librsvg libsecret @@ -129,16 +129,16 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; meta = with lib; { description = "Simple GNOME 3 application to access remote or virtual systems"; homepage = "https://wiki.gnome.org/Apps/Boxes"; - license = licenses.gpl3; + license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = teams.gnome.members; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix similarity index 65% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index e15125a00b..9c0b1f6597 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -12,7 +11,7 @@ , python3 , gettext , libxml2 -, gnome3 +, gnome , gtk3 , evolution-data-server , libsoup @@ -25,31 +24,23 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0SG7NLCLbqYB9du6Q6SxYTpuVJP8Cx4uzJDGZnEakS0="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "2M30n57uHDo8aZHDL4VjxKfE2w23ymPOUcyRjkM7M6U="; }; patches = [ - # Port to libhandy-1 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/commit/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch"; - sha256 = "Ue0pWwcbYyCZPHPPoR0dXW5n948/AZ3wVDMTIZDOnyE="; - }) - # https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84.patch"; - sha256 = "czG3uIHl3tBnjDUvCOPm8IRp2o7yZYCb0/jWtv3uzIY="; - }) + # A refactor has caused the PR patch to drift enough to need rebasing + ./gtk_image_reset_crash.patch ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch new file mode 100644 index 0000000000..5065295b57 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch @@ -0,0 +1,17 @@ +diff --git a/src/gui/views/gcal-year-view.c b/src/gui/views/gcal-year-view.c +index ac32a8f9..532425c1 100644 +--- a/src/gui/views/gcal-year-view.c ++++ b/src/gui/views/gcal-year-view.c +@@ -2158,7 +2158,11 @@ update_weather (GcalYearView *self) + if (!updated) + { + gtk_label_set_text (self->temp_label, ""); +- gtk_image_clear (self->weather_icon); ++ /* FIXME: This should never be NULL, but it somehow is. ++ * https://gitlab.gnome.org/GNOME/gnome-calendar/issues/299 ++ */ ++ if (self->weather_icon != NULL) ++ gtk_image_clear (self->weather_icon); + } + } + diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-characters/default.nix similarity index 80% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-characters/default.nix index 3a65be9440..5cbd58d602 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -1,10 +1,11 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , meson , ninja , pkg-config , gettext -, gnome3 +, gnome , glib , gtk3 , pango @@ -13,6 +14,7 @@ , gobject-introspection , gjs , libunistring +, libhandy , gsettings-desktop-schemas , adwaita-icon-theme , gnome-desktop @@ -20,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "3.34.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-characters/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mqaxsa7hcmvid3zbzvxpfkp7s01ghiq6kaibmd3169axrr8ahql"; + url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0z2xa4w921bzpzj6gv88pvbrijcnnwni6jxynwz0ybaravyzaqha"; }; nativeBuildInputs = [ @@ -46,6 +48,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk3 libunistring + libhandy pango ]; @@ -69,17 +72,17 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; meta = with lib; { - homepage = "https://wiki.gnome.org/Design/Apps/CharacterMap"; + homepage = "https://wiki.gnome.org/Apps/Characters"; description = "Simple utility application to find and insert unusual characters"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-clocks/default.nix similarity index 85% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index a2caaf068e..d9a749a24b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -18,7 +18,7 @@ , adwaita-icon-theme , gnome-desktop , geocode-glib -, gnome3 +, gnome , gdk-pixbuf , geoclue2 , libgweather @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "3.38.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-clocks/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0f24g76ax59qnms1rjfyf1i0sa84nadgbr0r6m26p90w1w2wnmnr"; + url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "02d3jg46sn8d9gd4dsaly22gg5vkbz2gpq4pmwpvncb4rsqk7sn2"; }; nativeBuildInputs = [ @@ -71,9 +71,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-clocks"; - attrPath = "gnome3.gnome-clocks"; + attrPath = "gnome.gnome-clocks"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-connections/default.nix similarity index 66% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-connections/default.nix index 17f11d0efd..a00b239641 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -1,46 +1,45 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, gnome3 , meson , ninja -, vala , pkg-config +, vala +, gettext +, itstool +, python3 +, appstream-glib +, desktop-file-utils +, wrapGAppsHook , glib , gtk3 -, python3 , libxml2 , gtk-vnc -, gettext -, desktop-file-utils -, appstream-glib -, gobject-introspection -, freerdp -, wrapGAppsHook +, gtk-frdp +, gnome }: stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "3.38.1"; + version = "40.0.1"; src = fetchurl { - url = "mirror://gnome/sources/connections/${lib.versions.majorMinor version}/connections-${version}.tar.xz"; - hash = "sha256-5c7uBFkh9Vsw6bWWUDjNTMDrrFqI5JEgYlsWpfyuTpA="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-vpvLoHzz+vWs4M5UzSL4YJtNx3ZuJe5f2cGAw5WbTRE="; }; nativeBuildInputs = [ - desktop-file-utils - gettext - glib # glib-compile-resources meson - appstream-glib ninja pkg-config - python3 vala + gettext + itstool + python3 + appstream-glib + desktop-file-utils + glib # glib-compile-resources wrapGAppsHook - - # for gtk-frdp subproject - gobject-introspection ]; buildInputs = [ @@ -48,9 +47,7 @@ stdenv.mkDerivation rec { gtk-vnc gtk3 libxml2 - - # for gtk-frdp subproject - freerdp + gtk-frdp ]; postPatch = '' @@ -59,9 +56,8 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { - packageName = "connections"; - attrPath = "gnome-connections"; + updateScript = gnome.updateScript { + packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-documents/default.nix similarity index 95% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-documents/default.nix index 3172ae2712..3f7ac34696 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-documents/default.nix @@ -18,7 +18,7 @@ , gnome-desktop , libzapojit , libgepub -, gnome3 +, gnome , gdk-pixbuf , libsoup , docbook_xsl @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { glib gsettings-desktop-schemas gdk-pixbuf - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme evince libsoup webkitgtk @@ -110,9 +110,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-logs/default.nix similarity index 92% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-logs/default.nix index 20b27b2ddd..da06eb4404 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-logs/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , glib , gtk3 , wrapGAppsHook @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { gtk3 systemd gsettings-desktop-schemas - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; mesonFlags = [ @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-logs"; - attrPath = "gnome3.gnome-logs"; + attrPath = "gnome.gnome-logs"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix similarity index 74% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix index f0a80bc525..2818215a4f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -5,7 +5,7 @@ , gettext , python3 , pkg-config -, gnome3 +, gnome , gtk3 , gobject-introspection , gdk-pixbuf @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "3.38.4"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1WQekf/kePsqqcpIliJczxjsLqTZjjV2UXmBin2+RKM="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-mAXUwFs6NpV0bTdisoFr/+bZ19VuF7y7nZ1B3C0CYxo="; }; doCheck = true; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { gfbgraph gjs gnome-online-accounts - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gobject-introspection gsettings-desktop-schemas gtk3 @@ -82,10 +82,15 @@ stdenv.mkDerivation rec { "Exec=$out/bin/gnome-maps" ''; + preCheck = '' + # “time.js” included by “timeTest” and “translationsTest” depends on “org.gnome.desktop.interface” schema. + export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:$XDG_DATA_DIRS" + ''; + passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix similarity index 84% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix index be456071e4..51e3d5a9cd 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -21,7 +21,7 @@ , desktop-file-utils , appstream-glib , itstool -, gnome3 +, gnome , gst_all_1 , libdazzle , libsoup @@ -30,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.38.2"; + version = "40.0"; format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0c2051wngf3jrifl5bv5kyqcci459n62vixxkryiryjcaqwbd1am"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1djqhd4jccvk352hwxjhiwjgbnv1qnpv450f2c6w6581vcn9pq38"; }; nativeBuildInputs = [ @@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { gnome-online-accounts gobject-introspection gdk-pixbuf - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme python3 grilo grilo-plugins @@ -97,9 +97,9 @@ python3.pkgs.buildPythonApplication rec { strictDeps = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-nettool/default.nix similarity index 82% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-nettool/default.nix index 6fca1c0eea..ca75b7aae0 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-nettool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook , libgtop, intltool, itstool, libxml2, nmap, inetutils }: stdenv.mkDerivation rec { @@ -13,15 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 wrapGAppsHook libgtop intltool itstool libxml2 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; propagatedUserEnvPkgs = [ nmap inetutils ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; versionPolicy = "none"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-notes/default.nix similarity index 73% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-notes/default.nix index c6d4a30ab0..6af206069e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-notes/default.nix @@ -12,11 +12,12 @@ , gtk3 , evolution-data-server , gnome-online-accounts +, json-glib , libuuid -, libhandy_0 +, curl +, libhandy , webkitgtk -, zeitgeist -, gnome3 +, gnome , libxml2 , gsettings-desktop-schemas , tracker @@ -24,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-notes"; - version = "3.38.0"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/bijiben/${lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; - sha256 = "H/bMCsbGKQe/KgmhchXt0vF7dNrKs6XIminDBJFyvis="; + url = "mirror://gnome/sources/bijiben/${lib.versions.major version}/bijiben-${version}.tar.xz"; + sha256 = "1gvvb2klkzbmyzwkjgmscdiqcl8lyz9b0rxb4igjz079csq6z805"; }; doCheck = true; @@ -53,26 +54,26 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 + json-glib libuuid - libhandy_0 # doesn't support libhandy-1 yet + curl + libhandy webkitgtk tracker gnome-online-accounts - zeitgeist gsettings-desktop-schemas evolution-data-server - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; mesonFlags = [ - "-Dzeitgeist=true" "-Dupdate_mimedb=false" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "bijiben"; - attrPath = "gnome3.gnome-notes"; + attrPath = "gnome.gnome-notes"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix similarity index 89% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix index cb79a772b7..0337f70a20 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix @@ -10,7 +10,7 @@ , python3 , desktop-file-utils , wrapGAppsHook -, gnome3 }: +, gnome }: let pname = "gnome-power-manager"; @@ -24,9 +24,9 @@ in stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { gtk3 glib upower - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix similarity index 79% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix index 6cc5c2ab78..29f7aa6e9e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix @@ -9,7 +9,7 @@ , gtk3 , gdk-pixbuf , gst_all_1 -, gnome3 +, gnome , meson , ninja , python3 @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnome-sound-recorder"; - version = "3.38.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "2Z6k+WPsEInpzVl6fUQ5ihHs7xMeQUInGhyQwVuqRSE="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "00b55vsfzx877b7mj744abzjws7zclz71wbvh0axsrbl9l84ranl"; }; nativeBuildInputs = [ @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-todo/default.nix new file mode 100644 index 0000000000..ae1334cd56 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-todo/default.nix @@ -0,0 +1,85 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkg-config +, python3 +, wrapGAppsHook +, gettext +, gnome +, glib +, gtk4 +, wayland +, libadwaita +, libpeas +, gnome-online-accounts +, gsettings-desktop-schemas +, libportal +, evolution-data-server +, libical +, librest +, json-glib +}: + +stdenv.mkDerivation rec { + pname = "gnome-todo"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "aAl8lvBnXHFCZn0QQ0ToNHLdf8xTj+wKzb9gJrucobE="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk4 + wayland # required by gtk header + libadwaita + libpeas + gnome-online-accounts + gsettings-desktop-schemas + gnome.adwaita-icon-theme + + # Plug-ins + libportal # background + evolution-data-server # eds + libical + librest # todoist + json-glib # todoist + ]; + + postPatch = '' + chmod +x build-aux/meson/meson_post_install.py + patchShebangs build-aux/meson/meson_post_install.py + + # https://gitlab.gnome.org/GNOME/gnome-todo/merge_requests/103 + substituteInPlace src/meson.build \ + --replace 'Gtk-3.0' 'Gtk-4.0' + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + description = "Personal task manager for GNOME"; + homepage = "https://wiki.gnome.org/Apps/Todo"; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix similarity index 58% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix index 9a5079dfc6..39c10e82a1 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -1,19 +1,49 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection -, libgweather, meson, ninja, geoclue2, gnome-desktop, python3, gsettings-desktop-schemas }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gnome +, gtk3 +, libhandy +, wrapGAppsHook +, gjs +, gobject-introspection +, libgweather +, meson +, ninja +, geoclue2 +, gnome-desktop +, python3 +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "3.36.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-weather/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11z75ky6xp9hx7lm24xng7ydr20bzh4d6p9sbi9c8ccz2m3fdrk8"; + url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1vxfcvga5waangq3rzwdrdxyy5sw40vv0l463lc651s0n8xafd9a"; }; - nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook python3 ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + wrapGAppsHook + python3 + ]; + buildInputs = [ - gtk3 gjs gobject-introspection gnome-desktop - libgweather gnome3.adwaita-icon-theme geoclue2 gsettings-desktop-schemas + gtk3 + libhandy + gjs + gobject-introspection + gnome-desktop + libgweather + gnome.adwaita-icon-theme + geoclue2 + gsettings-desktop-schemas ]; postPatch = '' @@ -30,9 +60,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-weather"; - attrPath = "gnome3.gnome-weather"; + attrPath = "gnome.gnome-weather"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/polari/default.nix similarity index 91% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/polari/default.nix index 727a82e5ff..0675ccb2f8 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/polari/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils , pkg-config, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib -, gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: +, gnome, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: let pname = "polari"; @@ -38,9 +38,9 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch b/third_party/nixpkgs/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix similarity index 77% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix index 60ec6792e5..d46aed7bbe 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -11,7 +11,7 @@ , itstool , gnupg , libsoup -, gnome3 +, gnome , gpgme , python3 , openldap @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "seahorse"; - version = "3.38.0.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-x0XdHebhog8ZorB6Q4uO98yiNaaqc0ENt/E3sCHpsqI="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-fscFezhousbqBB/aghQKOfXsnlsYi0UJFNRTvC1V0Cw="; }; doCheck = true; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { gcr gsettings-desktop-schemas gnupg - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gpgme libsecret avahi @@ -68,9 +68,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/vinagre/default.nix similarity index 76% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/apps/vinagre/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/apps/vinagre/default.nix index 49abb2f1a7..31e198783e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/vinagre/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, vte, libxml2, gtk-vnc, intltool , libsecret, itstool, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { @@ -12,15 +12,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool itstool wrapGAppsHook ]; buildInputs = [ - gtk3 vte libxml2 gtk-vnc libsecret gnome3.adwaita-icon-theme librsvg + gtk3 vte libxml2 gtk-vnc libsecret gnome.adwaita-icon-theme librsvg ]; NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "vinagre"; - attrPath = "gnome3.vinagre"; + attrPath = "gnome.vinagre"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix similarity index 72% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix index a1be29b018..04f8a7a3c3 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gnome3 +{ lib, stdenv, fetchurl, pkg-config, intltool, gnome , iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "3.38.0"; + version = "40.1.1"; src = fetchurl { - url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15xgz9wzk07442x3s3052as95g0223z4pp9qlsgcs323yama30v6"; + url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "C2xDbtatmIeoitofcqAZex63OwINjTRKurTH+nJQ+PY="; }; # For convenience, we can specify adwaita-icon-theme only in packages @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { postInstall = '' rm -rf "$out/locale" ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "adwaita-icon-theme"; - attrPath = "gnome3.adwaita-icon-theme"; + attrPath = "gnome.adwaita-icon-theme"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/baobab/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/baobab/default.nix new file mode 100644 index 0000000000..8d0f9459c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/baobab/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, lib +, gettext +, fetchurl +, vala +, desktop-file-utils +, meson +, ninja +, pkg-config +, python3 +, gtk3 +, libhandy +, glib +, libxml2 +, wrapGAppsHook +, itstool +, gnome +}: + +stdenv.mkDerivation rec { + pname = "baobab"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "19yii3bdgivxrcka1c4g6dpbmql5nyawwhzlsph7z6bs68nambm6"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gettext + itstool + libxml2 + desktop-file-utils + wrapGAppsHook + python3 + ]; + + buildInputs = [ + gtk3 + libhandy + glib + gnome.adwaita-icon-theme + ]; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + description = "Graphical application to analyse disk usage in any GNOME environment"; + homepage = "https://wiki.gnome.org/Apps/DiskUsageAnalyzer"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/caribou/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/caribou/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/caribou/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/caribou/default.nix index 88260f05ac..5985ff8226 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/caribou/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 +{ fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook , wrapGAppsHook, libgee }: @@ -38,9 +38,9 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/dconf-editor/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/dconf-editor/default.nix new file mode 100644 index 0000000000..165980d7e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/dconf-editor/default.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, vala +, libxslt +, pkg-config +, glib +, gtk3 +, gnome +, python3 +, dconf +, libxml2 +, gettext +, docbook-xsl-nons +, wrapGAppsHook +, gobject-introspection +}: + +stdenv.mkDerivation rec { + pname = "dconf-editor"; + version = "3.38.3"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-Vxr0x9rU8Em1PmzXKLea3fCMJ92ra8V7OW0hGGbueeM="; + }; + + nativeBuildInputs = [ + meson + ninja + vala + libxslt + pkg-config + wrapGAppsHook + gettext + docbook-xsl-nons + libxml2 + gobject-introspection + python3 + ]; + + buildInputs = [ + glib + gtk3 + dconf + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + description = "GSettings editor for GNOME"; + homepage = "https://wiki.gnome.org/Apps/DconfEditor"; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/empathy/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/empathy/default.nix similarity index 96% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/empathy/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/empathy/default.nix index 8ebb5c3f64..fbfee37cd1 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/empathy/default.nix @@ -7,7 +7,7 @@ , glib , file , librsvg -, gnome3 +, gnome , gdk-pixbuf , python3 , telepathy-glib @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { libcanberra-gtk3 telepathy-farstream farstream - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas librsvg @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "empathy"; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix similarity index 83% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix index cec0ac7a68..426a878335 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix @@ -9,7 +9,7 @@ , libjpeg , libpeas , libportal -, gnome3 +, gnome , gtk3 , glib , gsettings-desktop-schemas @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ilT9+T4wag9khToYgxrIwEg4IEdxBqrgvcAKrDc4bw4="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-e+CGA3/tm2v4S6yXqD48kYMBt+nJavEwsnJS0KURFok="; }; nativeBuildInputs = [ @@ -79,9 +79,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/epiphany/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix similarity index 82% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/epiphany/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix index 9f949b6073..f286d384c4 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix @@ -8,7 +8,7 @@ , glib , icu , wrapGAppsHook -, gnome3 +, gnome , libportal , libxml2 , libxslt @@ -19,6 +19,7 @@ , libsecret , gnome-desktop , libnotify +, libarchive , p11-kit , sqlite , gcr @@ -36,18 +37,13 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0v8iymg72m83ikxxyhapvz5v8zh8hlr1pw7n215cy3p8q6yg41cb"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1l0sb1xg16g4wg3z99xb0w2kbyczbn7q4mphs3w4lxq22xml4sk9"; }; - # Tests need an X display - mesonFlags = [ - "-Dunit_tests=disabled" - ]; - nativeBuildInputs = [ desktop-file-utils gettext @@ -68,7 +64,7 @@ stdenv.mkDerivation rec { glib glib-networking gnome-desktop - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gst_all_1.gst-libav gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base @@ -83,6 +79,7 @@ stdenv.mkDerivation rec { libhandy libportal libnotify + libarchive libsecret libsoup libxml2 @@ -92,13 +89,18 @@ stdenv.mkDerivation rec { webkitgtk ]; + # Tests need an X display + mesonFlags = [ + "-Dunit_tests=disabled" + ]; + postPatch = '' chmod +x post_install.py # patchShebangs requires executable file patchShebangs post_install.py ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; @@ -107,7 +109,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Epiphany"; description = "WebKit based web browser for GNOME"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix index 31828bad0a..3d7f3e0b83 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix @@ -13,12 +13,13 @@ , gdk-pixbuf , shared-mime-info , itstool -, gnome3 +, gnome , poppler , ghostscriptX , djvulibre , libspectre , libarchive +, libhandy , libsecret , wrapGAppsHook , librsvg @@ -43,13 +44,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.38.2"; + version = "40.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/evince/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "J9QZ1f7WMF4HRijtz94MtzT//aIF1jysMjORwEkDvZQ="; + url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0bfg7prmjk3z8irx1nfkkqph3igg3cy4pwd7pcxjxbshqdin6rks"; }; postPatch = '' @@ -86,6 +87,7 @@ stdenv.mkDerivation rec { gspell gtk3 libarchive + libhandy librsvg libsecret libspectre @@ -110,7 +112,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix similarity index 88% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix index dc43bdfd49..0ed3565d7f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome3, python3, gobject-introspection +{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome, python3, gobject-introspection , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr, p11-kit , db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre, vala, cmake, ninja , libkrb5, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.38.4"; + version = "3.40.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "rFPxay1R8+f/gCX5yhn0otTOOEHXKun+K7iX3ICZ1wU="; + sha256 = "08iykha7zhk21b3axsp3v1jfwda612v0m8rz8zlzppm5i8s5ziza"; }; patches = [ @@ -50,8 +50,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "evolution-data-server"; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix similarity index 86% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix index 324ab865b1..f304497734 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix @@ -13,7 +13,7 @@ , xorg , accountsservice , libX11 -, gnome3 +, gnome , systemd , dconf , gtk3 @@ -42,13 +42,13 @@ in stdenv.mkDerivation rec { pname = "gdm"; - version = "3.38.2.1"; + version = "40.0"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gdm/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "yliiBdXr/L2rVqEXFriY4Wrl3/Ia7nnQdgRkRGKOxNo="; + url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "XtdLc506Iy/7HkoTK8+WW9/pVdmVtSh3NYh3WwLylQ4="; }; mesonFlags = [ @@ -90,10 +90,13 @@ stdenv.mkDerivation rec { ]; patches = [ - # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/112 + # GDM fails to find g-s with the following error in the journal. + # gdm-x-session[976]: dbus-run-session: failed to exec 'gnome-session': No such file or directory + # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/92 (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/1d28d4b3568381b8590d2235737b924aefd1746c.patch"; - sha256 = "ZUXKZS4T0o0hzrApxaqcR0txCRv5zBgqeQ9K9fLNX1o="; + url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/ccecd9c975d04da80db4cd547b67a1a94fa83292.patch"; + sha256 = "5hKS9wjjhuSAYwXct5vS0dPbmPRIINJoLC0Zm1naz6Q="; + revert = true; }) # Change hardcoded paths to nix store paths. @@ -157,9 +160,9 @@ stdenv.mkDerivation rec { DESTDIR = "${placeholder "out"}/dest"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gdm"; - attrPath = "gnome3.gdm"; + attrPath = "gnome.gdm"; }; # Used in GDM NixOS module diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/gdm-session-worker_forward-vars.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/gdm-session-worker_forward-vars.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/gdm-x-session_extra_args.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/gdm-x-session_extra_args.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/gdm-x-session_session-wrapper.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/gdm-x-session_session-wrapper.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/org.gnome.login-screen.gschema.override similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/org.gnome.login-screen.gschema.override diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/reset-environment.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/reset-environment.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix new file mode 100644 index 0000000000..370cd14e46 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome, gettext }: + +stdenv.mkDerivation rec { + pname = "gnome-backgrounds"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "YN+KDaMBzkJbcEPUKuMuxAEf8I8Y4Pxi8pQBMF2jpw4="; + }; + + passthru = { + updateScript = gnome.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome.gnome-backgrounds"; }; + }; + + nativeBuildInputs = [ meson ninja pkg-config gettext ]; + + meta = with lib; { + platforms = platforms.unix; + maintainers = teams.gnome.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix new file mode 100644 index 0000000000..07b77c0499 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -0,0 +1,86 @@ +{ lib +, stdenv +, fetchurl +, gnome +, meson +, ninja +, pkg-config +, gtk3 +, gettext +, glib +, udev +, itstool +, libxml2 +, wrapGAppsHook +, libnotify +, libcanberra-gtk3 +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, python3 +, gsettings-desktop-schemas +}: + +stdenv.mkDerivation rec { + pname = "gnome-bluetooth"; + version = "3.34.5"; + + # TODO: split out "lib" + outputs = [ "out" "dev" "devdoc" "man" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1a9ynlwwkb3wpg293ym517vmrkk63y809mmcv9a21k5yr199x53c"; + }; + + nativeBuildInputs = [ + meson + ninja + gettext + itstool + pkg-config + libxml2 + wrapGAppsHook + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + python3 + ]; + + buildInputs = [ + glib + gtk3 + udev + libnotify + libcanberra-gtk3 + gnome.adwaita-icon-theme + gsettings-desktop-schemas + ]; + + mesonFlags = [ + "-Dicon_update=false" + "-Dgtk_doc=true" + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; + description = "Application that let you manage Bluetooth in the GNOME destkop"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix new file mode 100644 index 0000000000..7e19e9523c --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -0,0 +1,89 @@ +{ stdenv +, lib +, meson +, ninja +, vala +, gettext +, itstool +, fetchurl +, pkg-config +, libxml2 +, gtk3 +, glib +, gtksourceview4 +, wrapGAppsHook +, gobject-introspection +, python3 +, gnome +, mpfr +, gmp +, libsoup +, libmpc +, libhandy +, gsettings-desktop-schemas +, libgee +}: + +stdenv.mkDerivation rec { + pname = "gnome-calculator"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1xkazxbkpn1z5pfphhps7fc5q4yc8lp7f6b222n8bx5iyxhwbrkz"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gettext + itstool + wrapGAppsHook + python3 + gobject-introspection # for finding vapi files + ]; + + buildInputs = [ + gtk3 + glib + libxml2 + gtksourceview4 + mpfr + gmp + gnome.adwaita-icon-theme + libgee + gsettings-desktop-schemas + libsoup + libmpc + libhandy + ]; + + doCheck = true; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + preCheck = '' + # Currency conversion test tries to store currency data in $HOME/.cache. + export HOME=$TMPDIR + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-calculator"; + attrPath = "gnome.gnome-calculator"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Calculator"; + description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-color-manager/default.nix similarity index 92% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-color-manager/default.nix index 73db99f3d3..dae367f1d5 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-color-manager/default.nix @@ -6,7 +6,7 @@ , gettext , itstool , desktop-file-utils -, gnome3 +, gnome , glib , gtk3 , libexif @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-common/default.nix similarity index 80% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-common/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-common/default.nix index 53e3ed47eb..cb50396a40 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-common/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, which, gnome3, autoconf, automake }: +{ lib, stdenv, fetchurl, which, gnome, autoconf, automake }: stdenv.mkDerivation rec { pname = "gnome-common"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-common"; attrPath = "gnome3.gnome-common"; }; + updateScript = gnome.updateScript { packageName = "gnome-common"; attrPath = "gnome.gnome-common"; }; }; patches = [(fetchurl { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix similarity index 81% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix index ef5e564beb..62a43d20d5 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -17,8 +17,9 @@ , gnome-online-accounts , wrapGAppsHook , folks +, libgdata , libxml2 -, gnome3 +, gnome , vala , meson , ninja @@ -28,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "3.38.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hsq0dwxjahcaxnm1m4r1lync9k2fkwzybfmkchrmn95vqcwwvf9"; + url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0w2g5xhw65adzvwzakrj5kaim4sw1w7s8qqwm3nm6inq50znzpn9"; }; propagatedUserEnvPkgs = [ @@ -58,12 +59,13 @@ stdenv.mkDerivation rec { evolution-data-server gsettings-desktop-schemas folks + libgdata # required by some dependency transitively gnome-desktop libhandy libxml2 gnome-online-accounts cheese - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libchamplain clutter-gtk geocode-glib @@ -77,9 +79,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-contacts"; - attrPath = "gnome3.gnome-contacts"; + attrPath = "gnome.gnome-contacts"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/default.nix similarity index 82% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/default.nix index f8c458a3df..6170f53c71 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -1,6 +1,7 @@ { fetchurl -, fetchFromGitLab -, lib, stdenv +, fetchpatch +, lib +, stdenv , substituteAll , accountsservice , adwaita-icon-theme @@ -10,7 +11,7 @@ , colord , colord-gtk , cups -, docbook_xsl +, docbook-xsl-nons , fontconfig , gdk-pixbuf , gettext @@ -22,7 +23,7 @@ , gnome-desktop , gnome-online-accounts , gnome-settings-daemon -, gnome3 +, gnome , grilo , grilo-plugins , gsettings-desktop-schemas @@ -69,20 +70,32 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.38.4"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-SdxjeNTTXBxu1ZIk9WNpFsK2+km7+4tW6xmoTW6QzRk="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-zMmlc2UXOFEJrlpZkGwlgkTdh5t1A61ZhM9BZVyzAvE="; }; - # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html - prePatch = (import ../gvc-with-ucm-prePatch.nix { - inherit fetchFromGitLab; - }); + patches = [ + (substituteAll { + src = ./paths.patch; + gcm = gnome-color-manager; + gnome_desktop = gnome-desktop; + inherit glibc libgnomekbd tzdata; + inherit cups networkmanagerapplet; + }) + + # Fix startup assertion in power panel. + # https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/974 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/9acaa10567c94048657c69538e5d7813f82c4224.patch"; + sha256 = "59GeTPcG2UiVTL4VTS/TP0p0QkAQpm3VgvuAiw64wUU="; + }) + ]; nativeBuildInputs = [ - docbook_xsl + docbook-xsl-nons gettext libxslt meson @@ -142,16 +155,6 @@ stdenv.mkDerivation rec { upower ]; - patches = [ - (substituteAll { - src = ./paths.patch; - gcm = gnome-color-manager; - gnome_desktop = gnome-desktop; - inherit glibc libgnomekbd tzdata; - inherit cups networkmanagerapplet; - }) - ]; - postPatch = '' chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file patchShebangs build-aux/meson/meson_post_install.py @@ -172,9 +175,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/paths.patch similarity index 80% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/paths.patch index 361972f263..a6787477b8 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/paths.patch @@ -1,26 +1,26 @@ diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c -index 49ca35220..adefb87b9 100644 +index 603178efc..c363a6a5c 100644 --- a/panels/color/cc-color-panel.c +++ b/panels/color/cc-color-panel.c -@@ -599,7 +599,7 @@ gcm_prefs_calibrate_cb (GtkWidget *widget, CcColorPanel *prefs) +@@ -591,7 +591,7 @@ gcm_prefs_calibrate_cb (CcColorPanel *prefs) /* run with modal set */ argv = g_ptr_array_new_with_free_func (g_free); -- g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-calibrate", NULL)); +- g_ptr_array_add (argv, g_strdup ("gcm-calibrate")); + g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL)); g_ptr_array_add (argv, g_strdup ("--device")); g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device))); g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -1038,7 +1038,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile) +@@ -1029,7 +1029,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile) /* open up gcm-viewer as a info pane */ argv = g_ptr_array_new_with_free_func (g_free); -- g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-viewer", NULL)); +- g_ptr_array_add (argv, g_strdup ("gcm-viewer")); + g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-viewer", NULL)); g_ptr_array_add (argv, g_strdup ("--profile")); g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile))); g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -1288,15 +1288,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device) +@@ -1275,15 +1275,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device) static void gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device) { @@ -38,12 +38,12 @@ index 49ca35220..adefb87b9 100644 else gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE); diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h -index 96b25140c..1ad704d4a 100644 +index a2376f8a4..98769e08f 100644 --- a/panels/datetime/tz.h +++ b/panels/datetime/tz.h @@ -27,11 +27,7 @@ - #include + G_BEGIN_DECLS -#ifndef __sun -# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" @@ -55,25 +55,42 @@ index 96b25140c..1ad704d4a 100644 typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c -index 4541986db..da7826bfe 100644 +index bd0e07762..0e71351f8 100644 --- a/panels/info-overview/cc-info-overview-panel.c +++ b/panels/info-overview/cc-info-overview-panel.c -@@ -169,7 +169,7 @@ load_gnome_version (char **version, +@@ -172,7 +172,7 @@ load_gnome_version (char **version, gsize length; g_autoptr(VersionData) data = NULL; - + - if (!g_file_get_contents (DATADIR "/gnome/gnome-version.xml", + if (!g_file_get_contents ("@gnome_desktop@/share/gnome/gnome-version.xml", &contents, &length, &error)) +diff --git a/panels/keyboard/cc-input-list-box.c b/panels/keyboard/cc-input-list-box.c +index 6c2cb5614..8f57159cc 100644 +--- a/panels/keyboard/cc-input-list-box.c ++++ b/panels/keyboard/cc-input-list-box.c +@@ -223,10 +223,10 @@ row_layout_cb (CcInputListBox *self, + layout_variant = cc_input_source_get_layout_variant (source); + + if (layout_variant && layout_variant[0]) +- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", ++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", + layout, layout_variant); + else +- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", ++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", + layout); + + g_spawn_command_line_async (commandline, NULL); diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c -index 9390a3308..d30b4a68e 100644 +index 505b8ee25..62e94009f 100644 --- a/panels/network/connection-editor/net-connection-editor.c +++ b/panels/network/connection-editor/net-connection-editor.c -@@ -278,9 +278,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) +@@ -267,9 +267,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) g_autoptr(GError) error = NULL; - + if (self->is_new_connection) { - cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type); + cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type); @@ -84,19 +101,20 @@ index 9390a3308..d30b4a68e 100644 } diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c +index 74dfb0e9a..5f53d1a20 100644 --- a/panels/network/net-device-bluetooth.c +++ b/panels/network/net-device-bluetooth.c @@ -90,7 +90,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self) update_off_switch_from_device_state (self->device_off_switch, state, self); - + /* set up the Options button */ - path = g_find_program_in_path ("nm-connection-editor"); + path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL); } - + @@ -141,7 +141,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self) - + connection = net_device_get_find_connection (self->client, self->device); uuid = nm_connection_get_uuid (connection); - cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); @@ -105,19 +123,20 @@ diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-b if (!g_spawn_command_line_async (cmdline, &error)) g_warning ("Failed to launch nm-connection-editor: %s", error->message); @@ -185,7 +185,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self) - + gtk_widget_init_template (GTK_WIDGET (self)); - + - path = g_find_program_in_path ("nm-connection-editor"); + path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL); } - + diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c +index 34eb86241..50d0a2bed 100644 --- a/panels/network/net-device-mobile.c +++ b/panels/network/net-device-mobile.c -@@ -484,7 +484,7 @@ options_button_clicked_cb (NetDeviceMobile *self) - +@@ -508,7 +508,7 @@ options_button_clicked_cb (NetDeviceMobile *self) + connection = net_device_get_find_connection (self->client, self->device); uuid = nm_connection_get_uuid (connection); - cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); @@ -125,21 +144,21 @@ diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobi g_debug ("Launching '%s'\n", cmdline); if (!g_spawn_command_line_async (cmdline, &error)) g_warning ("Failed to launch nm-connection-editor: %s", error->message); -@@ -776,7 +776,7 @@ net_device_mobile_init (NetDeviceMobile *self) - +@@ -797,7 +797,7 @@ net_device_mobile_init (NetDeviceMobile *self) + self->cancellable = g_cancellable_new (); - + - path = g_find_program_in_path ("nm-connection-editor"); + path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL); } - + diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c -index f53ba217e..d24bcaeb9 100644 +index a31a606e3..ed5133d29 100644 --- a/panels/printers/pp-host.c +++ b/panels/printers/pp-host.c @@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask *task, - devices = g_new0 (PpDevicesList, 1); + devices = g_ptr_array_new_with_free_func (g_object_unref); argv = g_new0 (gchar *, 3); - argv[0] = g_strdup ("/usr/lib/cups/backend/snmp"); @@ -147,25 +166,8 @@ index f53ba217e..d24bcaeb9 100644 argv[1] = g_strdup (priv->hostname); /* Use SNMP to get printer's informations */ -diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c -index 35859526d..21486c917 100644 ---- a/panels/region/cc-region-panel.c -+++ b/panels/region/cc-region-panel.c -@@ -755,10 +755,10 @@ row_layout_cb (CcRegionPanel *self, - layout_variant = cc_input_source_get_layout_variant (source); - - if (layout_variant && layout_variant[0]) -- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", -+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", - layout, layout_variant); - else -- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", -+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", - layout); - - g_spawn_command_line_async (commandline, NULL); diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c -index 00239ce0f..617c98870 100644 +index 86f53d4fc..0b052856f 100644 --- a/panels/user-accounts/run-passwd.c +++ b/panels/user-accounts/run-passwd.c @@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/default.nix new file mode 100644 index 0000000000..56bd074c2c --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/default.nix @@ -0,0 +1,96 @@ +{ lib +, stdenv +, fetchurl +, substituteAll +, pkg-config +, libxslt +, ninja +, gnome +, gtk3 +, glib +, gettext +, libxml2 +, xkeyboard_config +, libxkbcommon +, isocodes +, meson +, wayland +, libseccomp +, systemd +, bubblewrap +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, gsettings-desktop-schemas +}: + +stdenv.mkDerivation rec { + pname = "gnome-desktop"; + version = "40.1"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-igeJcwUhnFaZVJriBI9xVVFe+Xx85NZYXd2hXVhZ4c8="; + }; + + patches = [ + (substituteAll { + src = ./bubblewrap-paths.patch; + bubblewrap_bin = "${bubblewrap}/bin/bwrap"; + inherit (builtins) storeDir; + }) + ]; + + nativeBuildInputs = [ + pkg-config + meson + ninja + gettext + libxslt + libxml2 + gobject-introspection + gtk-doc + docbook-xsl-nons + glib + ]; + + buildInputs = [ + bubblewrap + xkeyboard_config + libxkbcommon # for xkbregistry + isocodes + wayland + gtk3 + glib + libseccomp + systemd + ]; + + propagatedBuildInputs = [ + gsettings-desktop-schemas + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + "-Ddesktop_docs=false" + ]; + + separateDebugInfo = stdenv.isLinux; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-desktop"; + attrPath = "gnome.gnome-desktop"; + }; + }; + + meta = with lib; { + description = "Library with common API for various GNOME modules"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-desktop"; + license = with licenses; [ gpl2Plus lgpl2Plus ]; + platforms = platforms.linux; + maintainers = teams.gnome.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-dictionary/default.nix similarity index 50% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-dictionary/default.nix index bb602c8b3f..a399c4e853 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-dictionary/default.nix @@ -1,36 +1,28 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 -, gnome3, gtk3, glib, gsettings-desktop-schemas }: +, gnome, gtk3, glib, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gnome-dictionary"; - version = "3.26.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; + url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f"; }; - patches = [ - # fix AppStream validation - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-dictionary/commit/1c94d612030ef87c6e26a01a490470b71c39e341.patch"; - sha256 = "0cbswmhs9mks3gsc0iy4wnidsa8sfzzf4s1kgvb80qwffgxz5m8b"; - }) - ]; - doCheck = true; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook libxml2 gettext itstool desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome.adwaita-icon-theme ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-dictionary"; - attrPath = "gnome3.gnome-dictionary"; + attrPath = "gnome.gnome-dictionary"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix new file mode 100644 index 0000000000..c11a1df883 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -0,0 +1,85 @@ +{ lib +, stdenv +, gettext +, fetchurl +, pkg-config +, udisks2 +, libhandy +, libsecret +, libdvdread +, meson +, ninja +, gtk3 +, glib +, wrapGAppsHook +, python3 +, libnotify +, itstool +, gnome +, libxml2 +, gsettings-desktop-schemas +, libcanberra-gtk3 +, libxslt +, docbook-xsl-nons +, libpwquality +, systemd +}: + +stdenv.mkDerivation rec { + pname = "gnome-disk-utility"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-KkuZrBHKIzlLKMVYS56WKE6MWk2mXPBiB95U9Csf8UE="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + itstool + libxslt + docbook-xsl-nons + wrapGAppsHook + python3 + libxml2 + ]; + + buildInputs = [ + gtk3 + glib + libhandy + libsecret + libpwquality + libnotify + libdvdread + libcanberra-gtk3 + udisks2 + gnome.adwaita-icon-theme + systemd + gnome.gnome-settings-daemon + gsettings-desktop-schemas + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-disk-utility"; + attrPath = "gnome.gnome-disk-utility"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Disks"; + description = "A udisks graphical front-end"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix similarity index 73% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 83563c7d21..622a7de1bf 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -1,28 +1,28 @@ { lib, stdenv, meson, ninja, gettext, fetchurl -, pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme -, wrapGAppsHook, gnome3, harfbuzz }: +, pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme, libhandy +, wrapGAppsHook, gnome, harfbuzz }: stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "3.34.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12xrsqwmvid7hksiw4zhj4jd1qwxn8w0czskbq4yqfprwn1havxa"; + url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0hpyi0sz3gcqqs9lkwyk8b6hr39m3n27432x98kxr436jj37dk6j"; }; doCheck = true; nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook libxml2 ]; - buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz ]; + buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz libhandy ]; # Do not run meson-postinstall.sh preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-font-viewer"; - attrPath = "gnome3.gnome-font-viewer"; + attrPath = "gnome.gnome-font-viewer"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch similarity index 79% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch index d4065c1449..2323759522 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch @@ -5,29 +5,10 @@ Date: Sun, 20 Sep 2020 14:46:59 -0400 Subject: [PATCH] fix paths --- - data/gnome-welcome-tour | 4 ++-- gnome-initial-setup/pages/keyboard/cc-input-chooser.c | 6 +++--- gnome-initial-setup/pages/timezone/tz.h | 4 ++-- - 3 files changed, 7 insertions(+), 7 deletions(-) + 3 files changed, 5 insertions(+), 5 deletions(-) -diff --git a/data/gnome-welcome-tour b/data/gnome-welcome-tour -index 51c9b59..68ab0c4 100755 ---- a/data/gnome-welcome-tour -+++ b/data/gnome-welcome-tour -@@ -3,11 +3,11 @@ - cfgdir=${XDG_CONFIG_DIR:-$HOME/.config} - - # Don't do anything if gnome-tour isn't installed --gnome_tour_path=$(which gnome-tour 2>/dev/null) -+gnome_tour_path="@gnome_tour@" - if test -z "${gnome_tour_path}"; then - rm -f $cfgdir/run-welcome-tour - exit - fi - --gnome-tour -+@gnome_tour@ - rm -f $cfgdir/run-welcome-tour diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c index 196abf6..613d0e5 100644 --- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix similarity index 78% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index 435da4e372..6d57e29a59 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -6,7 +6,7 @@ , ninja , pkg-config , wrapGAppsHook -, gnome3 +, gnome , accountsservice , fontconfig , gdm @@ -14,7 +14,6 @@ , geocode-glib , glib , gnome-desktop -, gnome-getting-started-docs , gnome-online-accounts , gtk3 , libgweather @@ -32,18 +31,24 @@ , tzdata , libgnomekbd , gsettings-desktop-schemas -, gnome-tour }: stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "3.38.4"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "001jdzsvc541qracn68r609pr5qwymrh85xrqmvzzc1dbg5w3mlg"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "10zf87n6c947k9rkk2rqc9cbfwcvq23axq3rf7x1an7npv3414gi"; }; + patches = [ + (substituteAll { + src = ./0001-fix-paths.patch; + inherit tzdata libgnomekbd; + }) + ]; + nativeBuildInputs = [ gettext meson @@ -61,7 +66,6 @@ stdenv.mkDerivation rec { geocode-glib glib gnome-desktop - gnome-getting-started-docs gnome-online-accounts gsettings-desktop-schemas gtk3 @@ -78,14 +82,6 @@ stdenv.mkDerivation rec { webkitgtk ]; - patches = [ - (substituteAll { - src = ./0001-fix-paths.patch; - inherit tzdata libgnomekbd; - gnome_tour = "${gnome-tour}/bin/gnome-tour"; - }) - ]; - mesonFlags = [ "-Dcheese=disabled" "-Dibus=disabled" @@ -94,9 +90,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/vendor.conf similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/vendor.conf diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-keyring/default.nix similarity index 63% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-keyring/default.nix index 93453cc72e..8c9815509e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -1,51 +1,72 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, dbus, libgcrypt, pam, python2, glib, libxslt -, gettext, gcr, libcap_ng, libselinux, p11-kit, openssh, wrapGAppsHook -, docbook_xsl, docbook_xml_dtd_43, gnome3 }: +{ lib +, stdenv +, fetchurl +, pkg-config +, dbus +, libgcrypt +, pam +, python2 +, glib +, libxslt +, gettext +, gcr +, libcap_ng +, libselinux +, p11-kit +, openssh +, wrapGAppsHook +, docbook-xsl-nons +, docbook_xml_dtd_43 +, gnome +}: stdenv.mkDerivation rec { pname = "gnome-keyring"; - version = "3.36.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11sgffrrpss5cmv3b717pqlbhgq17l1xd33fsvqgsw8simxbar52"; - }; - - patches = [ - # version 3.36.0 is incompatible with libncap_ng >= 0.8.1. remove patch after update. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-keyring/-/commit/ebc7bc9efacc17049e54da8d96a4a29943621113.diff"; - sha256 = "07bx7zmdswqsa3dj37m729g35n1prhylkw7ya8a7h64i10la12cs"; - }) - ]; + version = "40.0"; outputs = [ "out" "dev" ]; - buildInputs = [ - glib libgcrypt pam openssh libcap_ng libselinux - gcr p11-kit - ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0cdrlcw814zayhvlaxqs1sm9bqlfijlp22dzzd0g5zg2isq4vlm3"; + }; nativeBuildInputs = [ - pkg-config gettext libxslt docbook_xsl docbook_xml_dtd_43 wrapGAppsHook + pkg-config + gettext + libxslt + docbook-xsl-nons + docbook_xml_dtd_43 + wrapGAppsHook ]; + buildInputs = [ + glib + libgcrypt + pam + openssh + libcap_ng + libselinux + gcr + p11-kit + ]; + + # In 3.20.1, tests do not support Python 3 + checkInputs = [ dbus python2 ]; + configureFlags = [ "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories "--with-pkcs11-modules=${placeholder "out"}/lib/pkcs11/" ]; - postPatch = '' - patchShebangs build - ''; - # Tends to fail non-deterministically. # - https://github.com/NixOS/nixpkgs/issues/55293 # - https://github.com/NixOS/nixpkgs/issues/51121 doCheck = false; - # In 3.20.1, tests do not support Python 3 - checkInputs = [ dbus python2 ]; + postPatch = '' + patchShebangs build + ''; checkPhase = '' export HOME=$(mktemp -d) @@ -65,9 +86,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-keyring"; - attrPath = "gnome3.gnome-keyring"; + attrPath = "gnome.gnome-keyring"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-online-miners/default.nix similarity index 96% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-online-miners/default.nix index 3cc85053bc..95fdf35b88 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-online-miners/default.nix @@ -5,7 +5,7 @@ , autoreconfHook , pkg-config , glib -, gnome3 +, gnome , libxml2 , libgdata , grilo @@ -100,9 +100,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-online-miners"; - attrPath = "gnome3.gnome-online-miners"; + attrPath = "gnome.gnome-online-miners"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix similarity index 72% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 8411b2edec..fda0f6e2ff 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -12,17 +12,20 @@ , libvncserver , libsecret , libnotify +, libxkbcommon , gdk-pixbuf , freerdp +, fuse3 +, gnome }: stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "0.1.9"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-8iZtp4tBRT7NNRKuzwop3rcMvq16RG/I2sAlEIsJ0M8="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-mvpuUlVwo3IJP5cwM4JwkDiU87H5+KnfX1eDbqHSnek="; }; nativeBuildInputs = [ @@ -36,11 +39,13 @@ stdenv.mkDerivation rec { buildInputs = [ cairo freerdp + fuse3 gdk-pixbuf # For libnotify glib libnotify libsecret libvncserver + libxkbcommon pipewire systemd ]; @@ -54,6 +59,13 @@ stdenv.mkDerivation rec { "-Dsystemd_user_unit_dir=${placeholder "out"}/lib/systemd/user" ]; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"; description = "GNOME Remote Desktop server"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-screenshot/default.nix similarity index 72% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-screenshot/default.nix index 432f7d9e2a..5b02fda3e3 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-screenshot/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, gettext, libxml2, libhandy, fetchurl, pkg-config, libcanberra-gtk3 , gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils -, gnome3, gsettings-desktop-schemas }: +, gnome, gsettings-desktop-schemas }: let pname = "gnome-screenshot"; - version = "3.38.0"; + version = "40.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1h4zsaybjrlkfcrvriyybg4gfr7v9d1ndh2p516k94ad2gfx6mp5"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${name}.tar.xz"; + sha256 = "1qm544ymwibk31s30k47vnn79xg30m18r7l4di0c57g375dak31n"; }; doCheck = true; @@ -22,14 +22,14 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; buildInputs = [ - gtk3 glib libcanberra-gtk3 libhandy gnome3.adwaita-icon-theme + gtk3 glib libcanberra-gtk3 libhandy gnome.adwaita-icon-theme gsettings-desktop-schemas ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/ctl.nix similarity index 79% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/ctl.nix index 05d28de768..6a274e35bf 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/ctl.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja @@ -10,13 +11,13 @@ stdenv.mkDerivation rec { pname = "gnome-session-ctl"; - version = "3.38.0"; + version = "40.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; - rev = "c20907fea27fa96568b8375a6756c40d0bfb9e40"; # main - hash = "sha256-y9/yOH6N8wf93+gPqnqzRzV/lPXYD0M6v7dsLFF8lWo="; + rev = version; + hash = "sha256-gvBmLx8Qoj1vPsOwaZsd9+pTDvU5D7uUts7ZT1pXwNo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/default.nix similarity index 73% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/default.nix index 1fa0a0b0fc..c1ebc43620 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -1,17 +1,16 @@ -{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome3, glib, gtk3, gsettings-desktop-schemas +{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome, glib, gtk3, gsettings-desktop-schemas , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 -, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl -, fetchpatch }: +, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }: stdenv.mkDerivation rec { pname = "gnome-session"; - version = "3.38.0"; + version = "40.1.1"; outputs = ["out" "sessions"]; src = fetchurl { - url = "mirror://gnome/sources/gnome-session/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rrxjk3vbqy3cdgnl7rw71dvcyrvhwq3m6s53dnkyjxsrnr0xk3v"; + url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "10nzyhmgkrzk6i70kj7690na0hmsv6qy5bmr10akxq9jxqlphy4w"; }; patches = [ @@ -22,12 +21,6 @@ stdenv.mkDerivation rec { grep = "${gnugrep}/bin/grep"; bash = "${bash}/bin/bash"; }) - # Fixes 2 minute delay at poweroff. - # https://gitlab.gnome.org/GNOME/gnome-session/issues/74 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-session/-/commit/9de6e40f12e8878f524f8d429d85724c156a0517.diff"; - sha256 = "19vrjdf7d6dfl7sqxvbc5h5lcgk1krgzg5rkssrdzd1h4ma6y8fz"; - }) ]; mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ]; @@ -39,8 +32,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome3.adwaita-icon-theme - gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy + glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome.adwaita-icon-theme + gnome.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy ]; postPatch = '' @@ -63,8 +56,8 @@ stdenv.mkDerivation rec { wrapProgram "$out/libexec/gnome-session-binary" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share"\ - --suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg" + --suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share"\ + --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" ''; # We move the GNOME sessions to another output since gnome-session is a dependency of @@ -80,9 +73,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-session"; - attrPath = "gnome3.gnome-session"; + attrPath = "gnome.gnome-session"; }; providedSessions = [ "gnome" "gnome-xorg" ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index e5923e6b56..e091cf2365 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -5,7 +5,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , perl , gettext , gtk3 @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "3.38.1"; + version = "40.0.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0r010wzw3dj87mapzvq15zv93i86wg0x0rpii3x2wapq3bcj30g2"; + url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "08bv32hvsmd8izw0llvldg0c2d71srch4hi8j94jwgm5d4dsrprp"; }; patches = [ @@ -119,9 +119,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/global-backlight-helper.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/global-backlight-helper.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix similarity index 65% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 8b882df3b0..6e8168a306 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -1,20 +1,23 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, spidermonkey_68, glib -, gnome3, gnome-menus, substituteAll }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, gettext +, pkg-config +, glib +, gnome +, gnome-menus +, substituteAll +}: stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hzn975v49rv3nsqp8m0mzv8gcm7nyvn54gj3zsml8ahlxwl592p"; - }; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; + url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "T7/OCtQ1e+5zrn3Bjqoe9MqnOF5PlPavuN/HJR/RqL8="; }; patches = [ @@ -24,14 +27,17 @@ stdenv.mkDerivation rec { }) ]; - doCheck = true; - # 60 is required for tests - # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.34.0/meson.build#L23 - checkInputs = [ spidermonkey_68 ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + glib + ]; - nativeBuildInputs = [ meson ninja pkg-config gettext glib ]; - - mesonFlags = [ "-Dextension_set=all" ]; + mesonFlags = [ + "-Dextension_set=all" + ]; preFixup = '' # The meson build doesn't compile the schemas. @@ -55,11 +61,18 @@ stdenv.mkDerivation rec { done ''; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GnomeShell/Extensions"; description = "Modify and extend GNOME Shell functionality and behavior"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gmenu.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gmenu.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix similarity index 85% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix index 97a72e379a..41d2fac5e6 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -5,7 +5,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , json-glib , gettext , libsecret @@ -22,8 +22,7 @@ , librsvg , geoclue2 , perl -, docbook_xml_dtd_42 -, docbook_xml_dtd_43 +, docbook_xml_dtd_45 , desktop-file-utils , libpulseaudio , libical @@ -46,6 +45,7 @@ , mutter , evolution-data-server , gtk3 +, gtk4 , sassc , systemd , pipewire @@ -66,13 +66,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.38.3"; + version = "40.1"; outputs = [ "out" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-U0W0GMsSqXKVXOXM6u1mYkgAJzNrXFHa6lcwV1tiHO0="; + url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-9j4r7Zm9iVjPMT2F9EoBjVn4UqBbqfKap8t0S+xvprc="; }; patches = [ @@ -97,6 +97,12 @@ stdenv.mkDerivation rec { revert = true; sha256 = "14h7ahlxgly0n3sskzq9dhxzbyb04fn80pv74vz1526396676dzl"; }) + + # Work around failing fingerprint auth + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/9a647c460b651aaec0b8a21f046cc289c1999416/f/0001-gdm-Work-around-failing-fingerprint-auth.patch"; + sha256 = "pFvZli3TilUt6YwdZztpB8Xq7O60XfuWUuPMMVSpqLw="; + }) ]; nativeBuildInputs = [ @@ -105,9 +111,7 @@ stdenv.mkDerivation rec { pkg-config gettext docbook-xsl-nons - # Switch to 4.5 in the 40. - docbook_xml_dtd_42 - docbook_xml_dtd_43 + docbook_xml_dtd_45 gtk-doc perl wrapGAppsHook @@ -137,6 +141,7 @@ stdenv.mkDerivation rec { evolution-data-server libical gtk3 + gtk4 gdm geoclue2 adwaita-icon-theme @@ -189,16 +194,16 @@ stdenv.mkDerivation rec { postFixup = '' # The services need typelibs. - for svc in org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do + for svc in org.gnome.ScreenSaver org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do wrapGApp $out/share/gnome-shell/$svc done ''; passthru = { mozillaPlugin = "/lib/mozilla/plugins"; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-shell"; - attrPath = "gnome3.gnome-shell"; + attrPath = "gnome.gnome-shell"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch similarity index 87% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch index 2d7bdf3031..6d888725b5 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch @@ -3,7 +3,7 @@ @@ -13,7 +13,7 @@ shew_sources = [ libshew = library(full_name, sources: shew_sources, - dependencies: [gtk_dep], + dependencies: [gtk_dep, x11_dep], - install_dir: pkglibdir, + install_dir: get_option('prefix') / pkglibdir, install: true, diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix similarity index 86% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix index ff80efaa4d..64cd214e80 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -6,13 +6,14 @@ , meson , ninja , gettext -, gnome3 +, gnome , wrapGAppsHook , packagekit , ostree , glib -, appstream-glib +, appstream , libsoup +, libhandy , polkit , isocodes , gspell @@ -42,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "3.38.0"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-software/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rjm486vgn6gi9mv1rqdcvr9cilmw6in4r6djqkxbxqll89cp2l7"; + url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "16q2902swxsjdxb1nj335sv1bb76rvq4w6dn4yszkwf3s0fd86in"; }; patches = [ @@ -76,8 +77,9 @@ stdenv.mkDerivation rec { gtk3 glib packagekit - appstream-glib + appstream libsoup + libhandy gsettings-desktop-schemas gnome-desktop gspell @@ -94,7 +96,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dubuntu_reviews=false" "-Dgudev=false" # FIXME: package malcontent parental controls "-Dmalcontent=false" @@ -103,9 +104,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.gnome-software"; + attrPath = "gnome.gnome-software"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix similarity index 53% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index db978f953b..77579be627 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -1,26 +1,63 @@ -{ lib, stdenv, gettext, fetchurl, pkg-config, gtkmm3, libxml2 -, bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3 -, gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }: +{ lib +, stdenv +, gettext +, fetchurl +, pkg-config +, gtkmm3 +, libxml2 +, bash +, gtk3 +, libhandy +, glib +, wrapGAppsHook +, meson +, ninja +, python3 +, gsettings-desktop-schemas +, itstool +, gnome +, librsvg +, gdk-pixbuf +, libgtop +, systemd +}: stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "3.38.0"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1x5gd30g87im7fnqj63njlac69zywfd1r0vgsxkjag2hsns7mgvk"; + url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "06hxd4igxas2kyind5jwfq5qbfkknykpdfy2sy3anylhcx1hzczx"; }; - doCheck = true; - nativeBuildInputs = [ - pkg-config gettext itstool wrapGAppsHook meson ninja python3 + pkg-config + gettext + itstool + wrapGAppsHook + meson + ninja + python3 ]; + buildInputs = [ - bash gtk3 glib libxml2 gtkmm3 libgtop gdk-pixbuf gnome3.adwaita-icon-theme librsvg - gsettings-desktop-schemas systemd + bash + gtk3 + libhandy + glib + libxml2 + gtkmm3 + libgtop + gdk-pixbuf + gnome.adwaita-icon-theme + librsvg + gsettings-desktop-schemas + systemd ]; + doCheck = true; + postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py @@ -28,9 +65,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-system-monitor"; - attrPath = "gnome3.gnome-system-monitor"; + attrPath = "gnome.gnome-system-monitor"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-terminal/default.nix similarity index 74% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 52aee2a004..ab3e3aecc0 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome3, dconf, nautilus +{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome, dconf, nautilus , gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala , desktop-file-utils, itstool, wrapGAppsHook, pcre2 , libxslt, docbook-xsl-nons }: stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.38.3"; + version = "3.40.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "EaWw1jXxX9znUINRpRD79OkqpTMVKlD/DHhF4xAuR2Q="; + sha256 = "1r6qd6w18gk83w32y6bvn4hg2hd7qvngak4ymwpgndyp41rwqw07"; }; buildInputs = [ @@ -26,16 +26,16 @@ stdenv.mkDerivation rec { # Silly ./configure, it looks for dbus file from gnome-shell in the # installation tree of the package it is configuring. postPatch = '' - substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" - substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" ''; configureFlags = [ "--disable-migration" ]; # TODO: remove this with 3.30 passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-terminal"; - attrPath = "gnome3.gnome-terminal"; + attrPath = "gnome.gnome-terminal"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix similarity index 78% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix index 7b42d72459..53f775833a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkg-config, pango, atk, gtk2 +{ lib, stdenv, fetchurl, intltool, gtk3, gnome, librsvg, pkg-config, pango, atk, gtk2 , gdk-pixbuf, hicolor-icon-theme }: let @@ -13,14 +13,14 @@ in stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf ]; - propagatedBuildInputs = [ gnome3.adwaita-icon-theme hicolor-icon-theme ]; + propagatedBuildInputs = [ gnome.adwaita-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-tour/default.nix similarity index 81% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-tour/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-tour/default.nix index 61f8761ce8..7440749e0a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-tour/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -13,7 +13,7 @@ , appstream-glib , wrapGAppsHook , python3 -, gnome3 +, gnome , libhandy , librsvg , rustc @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-tour"; - version = "3.38.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-hV/C/Lyz6e9zhe3FRw4Sox5gMqThDP57wVCTgcekjng="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-cGMiOGmgdHJ0FL7H23ONhQYhbuhMz8O8p9rFLkmMG/k="; }; cargoVendorDir = "vendor"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-user-share/default.nix similarity index 96% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-user-share/default.nix index 54fcf531c6..211326cfcd 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-user-share/default.nix @@ -15,7 +15,7 @@ , itstool , libnotify , mod_dnssd -, gnome3 +, gnome , libcanberra-gtk3 , python3 }: @@ -80,9 +80,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gucharmap/default.nix similarity index 97% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/gucharmap/default.nix index aac5a43e43..336a4d260c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -11,7 +11,7 @@ , desktop-file-utils , gtk-doc , wrapGAppsHook -, gnome3 +, gnome , itstool , libxml2 , yelp-tools @@ -93,7 +93,7 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/libgnome-keyring/default.nix similarity index 85% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/libgnome-keyring/default.nix index 65d2bbc215..aa3c7ed398 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome }: let pname = "libgnome-keyring"; @@ -17,13 +17,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - meta = { description = "Framework for managing passwords and other secrets"; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0002-drop-inheritable.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0002-drop-inheritable.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0003-Fix-glitches-in-gala.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0003-Fix-glitches-in-gala.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0007-fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0007-fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/default.nix similarity index 99% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/default.nix index 1f4ca5d321..42f07d45e6 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/default.nix @@ -3,7 +3,7 @@ , substituteAll , lib, stdenv , pkg-config -, gnome3 +, gnome , pantheon , gettext , gobject-introspection diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix similarity index 88% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix index 03c20e1ef6..4ad082dabf 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix @@ -1,10 +1,10 @@ { fetchurl -, fetchpatch , substituteAll , runCommand -, lib, stdenv +, lib +, stdenv , pkg-config -, gnome3 +, gnome , gettext , gobject-introspection , cairo @@ -45,19 +45,19 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "3.38.3"; + version = "40.1"; outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-sjIec9Hj/i6Q5jAfQrugf02UvGR1aivxPXWunW+qIB8="; + url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-pl8ycpYRM4KWh9QQcmfk4ZKQ5thueAf62H6rCDHB4MA="; }; patches = [ # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 - ./drop-inheritable.patch + # ./drop-inheritable.patch (substituteAll { src = ./fix-paths.patch; @@ -146,16 +146,16 @@ let self = stdenv.mkDerivation rec { ''; }; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; meta = with lib; { description = "A window manager for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/mutter"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/drop-inheritable.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/drop-inheritable.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/default.nix similarity index 83% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/default.nix index 5ca1efe1ca..f3ccdbce98 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/default.nix @@ -9,7 +9,9 @@ , python3 , wrapGAppsHook , gtk3 -, gnome3 +, libhandy +, libportal +, gnome , gnome-autoar , glib-networking , shared-mime-info @@ -32,11 +34,11 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19ln84d6s05h6cvx3c500bg5pvkz4k6p6ykmr2201rblq9afp76h"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0cwxr7bfa19dvzra81s9wfshzv0zv7ycpfffn4amigd0fh0vkkwf"; }; patches = [ @@ -67,10 +69,12 @@ stdenv.mkDerivation rec { gexiv2 glib-networking gnome-desktop - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas gst_all_1.gst-plugins-base gtk3 + libhandy + libportal libexif libnotify libseccomp @@ -98,9 +102,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/extension_dir.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/extension_dir.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/default.nix similarity index 94% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/default.nix index 75b2bd2927..f43df23f44 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/default.nix @@ -23,7 +23,7 @@ , systemd , tracker , shared-mime-info -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -93,9 +93,10 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/simple-scan/default.nix similarity index 83% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/simple-scan/default.nix index 64009cd75e..91ac4f14b2 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/simple-scan/default.nix @@ -14,21 +14,22 @@ , gtk3 , gusb , packagekit +, libhandy , libwebp , libxml2 , sane-backends , vala -, gnome3 +, gnome , gobject-introspection }: stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.38.2"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-qI2AcpaCiIZJzfzfqGkrCjSs3ladwICIjyea/DqcTQs="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-E4EbsqhhnmOkP8Lva3E1ny1cQITG1cizqtYXJLIHUa8="; }; nativeBuildInputs = [ @@ -48,9 +49,10 @@ stdenv.mkDerivation rec { gdk-pixbuf colord glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gusb gtk3 + libhandy libwebp packagekit sane-backends @@ -64,7 +66,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "simple-scan"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/sushi/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix similarity index 89% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/sushi/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix index f5e85a1f16..c42b6964bf 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix @@ -5,9 +5,7 @@ , gettext , gobject-introspection , glib -, clutter-gtk -, clutter-gst -, gnome3 +, gnome , gtksourceview4 , gjs , webkitgtk @@ -40,14 +38,13 @@ stdenv.mkDerivation rec { gobject-introspection wrapGAppsHook ]; + buildInputs = [ glib gtk3 - gnome3.evince + gnome.evince icu harfbuzz - clutter-gtk - clutter-gst gjs gtksourceview4 gdk-pixbuf @@ -70,9 +67,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "sushi"; - attrPath = "gnome3.sushi"; + attrPath = "gnome.sushi"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/totem/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix similarity index 95% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/totem/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix index a98265ff50..45b99680a1 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix @@ -17,7 +17,7 @@ , itstool , libxml2 , vala -, gnome3 +, gnome , grilo , grilo-plugins , libpeas @@ -25,7 +25,7 @@ , gnome-desktop , gsettings-desktop-schemas , gdk-pixbuf -, xvfb_run +, xvfb-run }: stdenv.mkDerivation rec { @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { ]; checkInputs = [ - xvfb_run + xvfb-run ]; mesonFlags = [ @@ -107,9 +107,9 @@ stdenv.mkDerivation rec { wrapPrefixVariables = [ "PYTHONPATH" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "totem"; - attrPath = "gnome3.totem"; + attrPath = "gnome.totem"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp-xsl/default.nix similarity index 74% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/yelp-xsl/default.nix index 22ce6c7201..7c9b4eb839 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp-xsl/default.nix @@ -5,16 +5,16 @@ , itstool , libxml2 , libxslt -, gnome3 +, gnome }: stdenv.mkDerivation rec { pname = "yelp-xsl"; - version = "3.38.3"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/yelp-xsl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-GTtqvUaXt7Qh6Yw21NMTXaCw/bUapT5gLtNo3YTR/QM="; + url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-Nh7NTTP8zbO7CKaH9g5cPpCdLp47Ai2ETgSYINDPYrA="; }; nativeBuildInputs = [ @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/yelp/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp/default.nix similarity index 67% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/yelp/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/yelp/default.nix index 754a774866..f4df80f561 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp/default.nix @@ -1,27 +1,27 @@ { lib, stdenv, gettext, fetchurl, webkitgtk, pkg-config, gtk3, glib -, gnome3, sqlite +, gnome, sqlite , itstool, libxml2, libxslt, gst_all_1 , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "yelp"; - version = "3.38.3"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/yelp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-r9RqTQrrRrtCXFIAcdgY+LKzLmnnVqv9mXlodpphVJ0="; + url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-B3dfoGzSg2Xs2Cm7FqhaaCiXqyHYzONFlrvvXNRVquA="; }; nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ]; buildInputs = [ gtk3 glib webkitgtk sqlite - libxml2 libxslt gnome3.yelp-xsl - gnome3.adwaita-icon-theme + libxml2 libxslt gnome.yelp-xsl + gnome.adwaita-icon-theme gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "yelp"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/zenity/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/core/zenity/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix index d02cb581cb..51ad81a77a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix @@ -2,7 +2,7 @@ , fetchurl , pkg-config , libxml2 -, gnome3 +, gnome , gtk3 , yelp-tools , gettext @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "zenity"; - attrPath = "gnome3.zenity"; + attrPath = "gnome.zenity"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/default.nix similarity index 96% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/default.nix index c4e203913b..b529a65026 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/default.nix @@ -20,7 +20,6 @@ lib.makeScope pkgs.newScope (self: with self; { libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; - gnome3 = self // { recurseForDerivations = false; }; # ISO installer # installerIso = callPackage ./installer.nix {}; @@ -176,8 +175,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-documents = callPackage ./apps/gnome-documents { }; - gnome-getting-started-docs = callPackage ./apps/gnome-getting-started-docs { }; - gnome-logs = callPackage ./apps/gnome-logs { }; gnome-maps = callPackage ./apps/gnome-maps { }; @@ -332,9 +329,9 @@ lib.makeScope pkgs.newScope (self: with self; { pidgin-im-gnome-shell-extension = pkgs.gnomeExtensions.pidgin-im-integration; # added 2019-08-01 # added 2019-08-25 - corePackages = throw "gnome3.corePackages is removed since 2019-08-25: please use `services.gnome3.core-shell.enable`"; - optionalPackages = throw "gnome3.optionalPackages is removed since 2019-08-25: please use `services.gnome3.core-utilities.enable`"; - gamesPackages = throw "gnome3.gamesPackages is removed since 2019-08-25: please use `services.gnome3.games.enable`"; + corePackages = throw "gnome.corePackages is removed since 2019-08-25: please use `services.gnome.core-shell.enable`"; + optionalPackages = throw "gnome.optionalPackages is removed since 2019-08-25: please use `services.gnome.core-utilities.enable`"; + gamesPackages = throw "gnome.gamesPackages is removed since 2019-08-25: please use `services.gnome.games.enable`"; nautilus-sendto = throw "nautilus-sendto is removed since 2019-09-17: abandoned upstream"; @@ -361,4 +358,9 @@ lib.makeScope pkgs.newScope (self: with self; { maintainers = lib.teams.gnome.members; mutter328 = throw "Removed as Pantheon is upgraded to mutter334."; + + gnome-getting-started-docs = throw "Removed in favour of gnome-tour."; + + # Added 2021-05-07 + gnome3 = self // { recurseForDerivations = false; }; }) diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/devtools/anjuta/default.nix similarity index 84% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/devtools/anjuta/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/devtools/anjuta/default.nix index 4802287cb1..5b841557b6 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/devtools/anjuta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, gjs, flex, bison, libxml2, intltool, +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, gjs, flex, bison, libxml2, intltool, gdl, libgda, gtksourceview, gsettings-desktop-schemas, itstool, python3, ncurses, makeWrapper }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "anjuta"; attrPath = "gnome3.anjuta"; }; + updateScript = gnome.updateScript { packageName = "anjuta"; attrPath = "gnome.anjuta"; }; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/devtools/devhelp/default.nix similarity index 79% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/devtools/devhelp/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/devtools/devhelp/default.nix index 173e4a9e5b..46491cffc5 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/devtools/devhelp/default.nix @@ -3,7 +3,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , gtk3 , wrapGAppsHook , glib @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "3.38.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/devhelp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13sa25mmlc49kn520hdfbskma65y7smvwmyhfggj0n9s3fazba2d"; + url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0zr64qp5c6jcc3x5hmfp7jhzpi96qwr6xplyfkmz4kjzvr9xidjd"; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { gtk3 webkitgtk amtk - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas ]; @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "devhelp"; - attrPath = "gnome3.devhelp"; + attrPath = "gnome.devhelp"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix similarity index 58% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix index bdbe73d2f8..501aaa91c9 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: +{ lib, stdenv, fetchurl, gnome, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { pname = "gnome-devel-docs"; - version = "3.38.2"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-devel-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1h6481hbz1c5p69r6h96hbgf560lhp1jibszscgw0s2yikdh6q8n"; + url = "mirror://gnome/sources/gnome-devel-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0zqp01ks8m3s6jn5xqd05rw4fwbvxy5qvcfg9g50b2ar2j7v1ar8"; }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome3.gnome-devel-docs"; }; + updateScript = gnome.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome.gnome-devel-docs"; }; }; buildInputs = [ intltool itstool libxml2 ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix similarity index 89% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix index fa1d89173f..57d78bf756 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome3, gettext }: +{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-EasyScreenCast"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-gi-path.patch; - gnomeShell = gnome3.gnome-shell; + gnomeShell = gnome.gnome-shell; }) ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/appindicator/default.nix similarity index 85% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/appindicator/default.nix index aaf8c92c67..65576d292a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/appindicator/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, gnome3 }: +{ lib, stdenv, fetchFromGitHub, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-appindicator"; - version = "36"; + version = "37"; src = fetchFromGitHub { owner = "Ubuntu"; repo = "gnome-shell-extension-appindicator"; rev = "v${version}"; - sha256 = "1nx1lgrrp3w5z5hymb91frjdvdkk7x677my5v4jjd330ihqa02dq"; + sha256 = "1yss91n94laakzhym409iyjs5gwhln2pkq0zrdrsxc3z70zlslxl"; }; # This package has a Makefile, but it's used for building a zip for @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "AppIndicator/KStatusNotifierItem support for GNOME Shell"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jonafato ]; - platforms = gnome3.gnome-shell.meta.platforms; + platforms = gnome.gnome-shell.meta.platforms; homepage = "https://github.com/Ubuntu/gnome-shell-extension-appindicator"; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/arcmenu/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/arcmenu/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/arcmenu/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/arcmenu/default.nix index 851a816c61..8fa29126a3 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/arcmenu/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-arcmenu"; - version = "5"; + version = "10"; src = fetchFromGitLab { owner = "arcmenu"; repo = "ArcMenu"; rev = "v${version}"; - sha256 = "1w4avvnp08l7lkf76vc7wvfn1cd81l4r4dhz8qnai49rvrjgqcg3"; + sha256 = "04kn3gnjz1wakp0pyiwm0alf0pwsralhis36miif9i6l5iv6a394"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/arcmenu/fix_gmenu.patch b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/arcmenu/fix_gmenu.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/caffeine/default.nix similarity index 83% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/caffeine/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/caffeine/default.nix index 41155391f8..8b2d538f4f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/caffeine/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/caffeine/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, glib, gettext, bash, gnome3 }: +{ lib, stdenv, fetchFromGitHub, glib, gettext, bash }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-caffeine"; - version = "37"; + version = "38"; src = fetchFromGitHub { owner = "eonpatapon"; repo = "gnome-shell-extension-caffeine"; rev = "v${version}"; - sha256 = "1mpa0fbpmv3pblb20dxj8iykn4ayvx89qffpcs67bzlq597zsbkb"; + sha256 = "0dyagnjmk91h96xr98mc177c473bqpxcv86qf6g3kyh3arwa9shs"; }; uuid = "caffeine@patapon.info"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fill the cup to inhibit auto suspend and screensaver"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ eperuffo ]; homepage = "https://github.com/eonpatapon/gnome-shell-extension-caffeine"; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix similarity index 91% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix index f6adf85de4..779d7506ab 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix @@ -4,7 +4,7 @@ , ninja , jq , python3 -, gnome3 +, gnome , wrapGAppsHook , gobject-introspection }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gnome-shell + gnome.gnome-shell python pygobject3 requests @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "chrome-gnome-shell"; }; }; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { description = "GNOME Shell integration for Chrome"; homepage = "https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"; longDescription = '' - To use the integration, install the browser extension, and then set to true. + To use the integration, install the browser extension, and then set to true. ''; license = licenses.gpl3; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix similarity index 65% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix index ee64fc5113..efdcab6a46 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix @@ -1,24 +1,26 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, gettext, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-clipboard-indicator"; - version = "37"; + version = "38"; src = fetchFromGitHub { owner = "Tudmotu"; repo = "gnome-shell-extension-clipboard-indicator"; rev = "v${version}"; - sha256 = "0npxhaam2ra2b9zh2gk2q0n5snlhx6glz86m3jf8hz037w920k41"; + sha256 = "FNrh3b6la2BuWCsriYP5gG0/KNbkFPuq/YTXTj0aJAI="; }; uuid = "clipboard-indicator@tudmotu.com"; - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r * $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; + nativeBuildInputs = [ + gettext + glib + ]; + + makeFlags = [ + "INSTALLPATH=${placeholder "out"}/share/gnome-shell/extensions/${uuid}/" + ]; meta = with lib; { description = "Adds a clipboard indicator to the top panel and saves clipboard history"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/clock-override/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/clock-override/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/clock-override/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/clock-override/default.nix index 6d3a752c88..3e02d33857 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/clock-override/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/clock-override/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, gnome3, gettext, glib }: +{ lib, stdenv, fetchzip, gnome, gettext, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-clock-override"; @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ rhoriguchi ]; homepage = "https://github.com/stuartlangridge/gnome-shell-clock-override"; - broken = versionOlder gnome3.gnome-shell.version "3.18"; + broken = versionOlder gnome.gnome-shell.version "3.18"; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/disable-unredirect/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix similarity index 82% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/disable-unredirect/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix index 0a9145de3d..166ab61565 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/disable-unredirect/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-disable-unredirect"; - version = "unstable-2021-01-17"; + version = "unstable-2021-04-13"; src = fetchFromGitHub { owner = "kazysmaster"; repo = "gnome-shell-extension-disable-unredirect"; - rev = "2ecb2f489ea3316b77d04f03a0c885f322c67e79"; - sha256 = "1rjyrg8qya0asndxr7189a9npww0rcxk02wkxrxjy7fdp5m89p7y"; + rev = "2a4c0e6a7a7a5f1aad9907ee2cf43d0725e10c19"; + sha256 = "06hbyy20xz0bvzg0vs5w4092nyfpg372c86cdm1akcjm72m5sim9"; }; uuid = "unredirect@vaina.lt"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix similarity index 88% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix index 0e0dab64be..90e8bffeec 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, gettext, gnome3 }: +{ lib, stdenv, fetchgit, gettext, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-draw-on-your-screen"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "A drawing extension for GNOME Shell"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ericdallo ahuzik ]; - platforms = gnome3.gnome-shell.meta.platforms; + platforms = gnome.gnome-shell.meta.platforms; homepage = "https://framagit.org/abakkk/DrawOnYourScreen"; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix similarity index 93% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix index 8cd567a590..a994e427fb 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, gjs, vte, gnome3 }: +{ lib, stdenv, fetchFromGitHub, substituteAll, gjs, vte, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-drop-down-terminal"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/drop-down-terminal/fix_vte_and_gjs.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/drop-down-terminal/fix_vte_and_gjs.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix similarity index 77% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix index bf637ecab1..aee636d453 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, gnome3, glib }: +{ lib, stdenv, fetchFromGitHub, gnome, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-dynamic-panel-transparency"; - version = "35"; + version = "unstable-2021-03-04"; src = fetchFromGitHub { owner = "ewlsh"; repo = "dynamic-panel-transparency"; - rev = "0800c0a921bb25f51f6a5ca2e6981b1669a69aec"; - sha256 = "0200mx861mlsi9lf7h108yam02jfqqw55r521chkgmk4fy6z99pq"; + rev = "f9e720e98e40c7a2d87928d09a7313c9ef2e832c"; + sha256 = "0njykxjiwlcmk0q8bsgqaznsryaw43fspfs6rzsjjz5p0xaq04nw"; }; uuid = "dynamic-panel-transparency@rockon999.github.io"; @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ rhoriguchi ]; homepage = "https://github.com/ewlsh/dynamic-panel-transparency"; - broken = versionOlder gnome3.gnome-shell.version "3.36"; + broken = versionOlder gnome.gnome-shell.version "3.36"; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/emoji-selector/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/emoji-selector/default.nix diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/freon/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/freon/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/freon/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/freon/default.nix diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix similarity index 67% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix index f8a8803435..9ba9ddaf09 100755 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix @@ -1,22 +1,20 @@ -{ lib, stdenv, fetchFromGitLab, gnome3, glib }: +{ lib, stdenv, fetchFromGitLab, gnome, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-fuzzy-app-search"; - version = "4"; + version = "4.0.1"; src = fetchFromGitLab { owner = "Czarlie"; repo = "gnome-fuzzy-app-search"; - rev = "da9c15d39958d9c3b38df3b616fd40b85aed24e5"; - sha256 = "1r3qha530s97x818znn1wi76f4x9bhlgi7jlxfwjnrwys62cv5fn"; + rev = "v${version}"; + sha256 = "127n3jc5d6cl0yrpjf8acdj76br97knks1wx4f6jcswkx9x47w0a"; }; uuid = "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com"; nativeBuildInputs = [ glib ]; - patches = [ ./fix-desktop-file-paths.patch ]; - makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ]; meta = with lib; { @@ -24,6 +22,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ rhoriguchi ]; homepage = "https://gitlab.com/Czarlie/gnome-fuzzy-app-search"; - broken = versionOlder gnome3.gnome-shell.version "3.18"; + broken = versionOlder gnome.gnome-shell.version "3.18"; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix similarity index 93% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix index cb8ece571e..c924b4e3ec 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -12,14 +12,14 @@ , glib-networking , gtk3 , openssh -, gnome3 +, gnome , gjs , nixosTests }: stdenv.mkDerivation rec { pname = "gnome-shell-gsconnect"; - version = "44"; + version = "46"; outputs = [ "out" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "C+8mhK4UOs2iZplDyY45bCX0mMGgwVV/ZfaPpYUlWxA="; + sha256 = "161379kipr6z6gbhchb5b17djrkg5fbvblyyabzkc2gv05r3h6fw"; }; patches = [ @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { gtk3 gsound gjs # for running daemon - gnome3.evolution-data-server # for libebook-contacts typelib + gnome.evolution-data-server # for libebook-contacts typelib ]; mesonFlags = [ - "-Dgnome_shell_libdir=${gnome3.gnome-shell}/lib" + "-Dgnome_shell_libdir=${gnome.gnome-shell}/lib" "-Dgsettings_schemadir=${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}" "-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts" "-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts" diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/installed-tests-path.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/installed-tests-path.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/hot-edge/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/hot-edge/default.nix new file mode 100644 index 0000000000..aaa5870996 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/hot-edge/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-hot-edge"; + version = "jdoda"; + + src = fetchFromGitHub { + owner = "jdoda"; + repo = "hotedge"; + rev = "bb7f651becea5287241caf7cda246a68ab07dac8"; + sha256 = "oeTs0kRan6b5relxzhK1IKbV0Yv2d5YdvvUPJ3fM9ik="; + }; + + dontBuild = true; + + uuid = "hotedge@jonathan.jdoda.ca"; + + installPhase = '' + runHook preInstall + install -Dt $out/share/gnome-shell/extensions/${uuid} extension.js metadata.json stylesheet.css + runHook postInstall + ''; + + meta = with lib; { + description = "Replace the top-left hot corner with a bottom hot edge"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jtojnar ]; + homepage = "https://github.com/jdoda/hotedge"; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/icon-hider/default.nix similarity index 81% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/icon-hider/default.nix index 00c67421e5..820d96988c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/icon-hider/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome3 }: +{ lib, stdenv, fetchFromGitHub, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-icon-hider"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { description = "Icon Hider is a GNOME Shell extension for managing status area items"; license = licenses.bsd3; maintainers = with maintainers; [ jonafato ]; - platforms = gnome3.gnome-shell.meta.platforms; + platforms = gnome.gnome-shell.meta.platforms; homepage = "https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider"; - broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 + broken = versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/impatience/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/impatience/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/impatience/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/impatience/default.nix diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/material-shell/default.nix similarity index 91% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/material-shell/default.nix index 87b9a3c150..9b683c1af6 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/material-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, gnome3 }: +{ stdenv, lib, fetchFromGitHub, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-material-shell"; @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ benley ]; homepage = "https://github.com/material-shell/material-shell"; - platforms = gnome3.gnome-shell.meta.platforms; + platforms = gnome.gnome-shell.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix similarity index 84% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix index 9ab2168d2d..8d9faaa89a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , nix-update-script -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple MPRIS indicator button for GNOME Shell"; license = licenses.gpl3; - maintainers = with maintainers; [ worldofpeace ]; - platforms = gnome3.gnome-shell.meta.platforms; + maintainers = with maintainers; [ ]; + platforms = gnome.gnome-shell.meta.platforms; homepage = "https://github.com/JasonLG1979/gnome-shell-extension-mpris-indicator-button"; - broken = versionOlder gnome3.gnome-shell.version "3.34"; + broken = versionOlder gnome.gnome-shell.version "3.34"; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix similarity index 89% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix index f663aa8977..fd0d2dbb57 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, glib, gnome3, unzip }: +{ lib, stdenv, fetchFromGitLab, glib, gnome, unzip }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-night-theme-switcher"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ unzip ]; - buildInputs = [ glib gnome3.gnome-shell ]; + buildInputs = [ glib gnome.gnome-shell ]; uuid = "nightthemeswitcher@romainvigier.fr"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/no-title-bar/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/no-title-bar/default.nix diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/no-title-bar/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/no-title-bar/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/noannoyance/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/noannoyance/default.nix diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/paperwm/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/paperwm/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/paperwm/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/paperwm/default.nix diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix similarity index 87% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix index d164774034..93ffcda830 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, glib, gnome3 }: +{ lib, stdenv, fetchFromGitHub, glib, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-pidgin-im-integration"; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ]; - broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 + broken = versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix similarity index 76% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix index e58d8ce6e4..f01a2cd545 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-sound-output-device-chooser"; - version = "35"; + version = "38"; src = fetchFromGitHub { owner = "kgshank"; repo = "gse-sound-output-device-chooser"; rev = version; - sha256 = "sha256-Yl5ut6kJAkAAdCBiNFpwDgshXCLMmFH3/zhnFGpyKqs="; + sha256 = "sha256-LZ+C9iK+j7+DEscYCIObxXc0Bn0Z0xSsEFMZxc8REWA="; }; patches = [ @@ -28,11 +28,13 @@ stdenv.mkDerivation rec { dontBuild = true; uuid = "sound-output-device-chooser@kgshank.net"; - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall + + makeFlags = [ + "INSTALL_DIR=${placeholder "out"}/share/gnome-shell/extensions" + ]; + + preInstall = '' + mkdir -p ${placeholder "out"}/share/gnome-shell/extensions ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/sound-output-device-chooser/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/sound-output-device-chooser/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/system-monitor/default.nix similarity index 80% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/system-monitor/default.nix index 3935150c57..a6cfad43b6 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/system-monitor/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }: +{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-system-monitor"; - version = "unstable-2021-04-08"; + version = "unstable-2021-05-04"; src = fetchFromGitHub { owner = "paradoxxxzero"; repo = "gnome-shell-system-monitor-applet"; - rev = "942603da39de12f50b1f86efbde92d7526d1290e"; - sha256 = "0lzb7064bigw2xsqkzr8qfhp9wfmxyi3823j2782v99jpcz423aw"; + rev = "bc38ccf49ac0ffae0fc0436f3c2579fc86949f10"; + sha256 = "0yb5sb2xv4m18a24h4daahnxgnlmbfa0rfzic0zs082qv1kfi5h8"; }; buildInputs = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./paths_and_nonexisting_dirs.patch; - clutter_path = gnome3.mutter.libdir; # this should not be used in settings but 🤷‍♀️ + clutter_path = gnome.mutter.libdir; # this should not be used in settings but 🤷‍♀️ gtop_path = "${libgtop}/lib/girepository-1.0"; glib_net_path = "${glib-networking}/lib/girepository-1.0"; }) diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/tilingnome/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/tilingnome/default.nix index dcea4c69ff..c1ca77d9d7 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/tilingnome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, glib, gnome3 }: +{ stdenv, lib, fetchFromGitHub, glib, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-tilingnome-unstable"; @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ benley ]; homepage = "https://github.com/rliang/gnome-shell-extension-tilingnome"; - platforms = gnome3.gnome-shell.meta.platforms; + platforms = gnome.gnome-shell.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/timepp/default.nix similarity index 95% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/timepp/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/timepp/default.nix index 94b8540c1b..cb4234a251 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/timepp/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/timepp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome3 }: +{ lib, stdenv, fetchFromGitHub, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-timepp"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/topicons-plus/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/topicons-plus/default.nix diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/unite/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/unite/default.nix similarity index 89% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/unite/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/unite/default.nix index 79d7a33523..1fbd31ec10 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/unite/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/unite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib }: +{ lib, stdenv, gnome, fetchFromGitHub, xprop, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-unite"; @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ rhoriguchi ]; homepage = "https://github.com/hardpixel/unite-shell"; - broken = versionOlder gnome3.gnome-shell.version "3.32"; + broken = versionOlder gnome.gnome-shell.version "3.32"; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix similarity index 86% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix index 42f226e967..0e71345bb8 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome3 }: +{ lib, stdenv, fetchFromGitHub, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-window-corner-preview"; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; homepage = "https://github.com/medenagan/window-corner-preview"; - broken = lib.versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 + broken = lib.versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/workspace-matrix/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/extensions/workspace-matrix/default.nix diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/find-latest-version.py b/third_party/nixpkgs/pkgs/desktops/gnome/find-latest-version.py similarity index 63% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/find-latest-version.py rename to third_party/nixpkgs/pkgs/desktops/gnome/find-latest-version.py index ad80af24bc..3078999e3e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/find-latest-version.py +++ b/third_party/nixpkgs/pkgs/desktops/gnome/find-latest-version.py @@ -3,14 +3,21 @@ import math import json import requests import sys +from libversion import Version +from typing import Optional def version_to_list(version): return list(map(int, version.split("."))) -def odd_unstable(version_str, selected): - version = version_to_list(version_str) +def odd_unstable(version: Version, selected): + try: + version = version_to_list(version.value) + except: + # Failing to parse as a list of numbers likely means the version contains a string tag like “beta”, therefore it is not a stable release. + return selected != "stable" + if len(version) < 2: return True @@ -23,28 +30,34 @@ def odd_unstable(version_str, selected): return True -def no_policy(version, selected): +def tagged(version: Version, selected): + if selected == "stable": + return not ("alpha" in version.value or "beta" in version.value or "rc" in version.value) + else: + return True + + +def no_policy(version: Version, selected): return True version_policies = { "odd-unstable": odd_unstable, + "tagged": tagged, "none": no_policy, } -def make_version_policy(version_predicate, selected, upper_bound): +def make_version_policy(version_predicate, selected, upper_bound: Optional[Version]): if not upper_bound: - upper_bound = [math.inf, math.inf] + return lambda version: version_predicate(version, selected) else: - upper_bound = version_to_list(upper_bound) - - return lambda version: version_predicate(version, selected) and version_to_list(version) < upper_bound + return lambda version: version_predicate(version, selected) and version < upper_bound parser = argparse.ArgumentParser(description="Find latest version for a GNOME package by crawling their release server.") parser.add_argument("package-name", help="Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.") -parser.add_argument("version-policy", help="Policy determining which versions are considered stable. For most GNOME packages, odd minor versions are unstable but there are exceptions.", choices=version_policies.keys(), nargs="?", default="odd-unstable") +parser.add_argument("version-policy", help="Policy determining which versions are considered stable. GNOME packages usually denote stability by alpha/beta/rc tag in the version. For older packages, odd minor versions are unstable but there are exceptions.", choices=version_policies.keys(), nargs="?", default="tagged") parser.add_argument("requested-release", help="Most of the time, we will want to update to stable version but sometimes it is useful to test.", choices=["stable", "unstable"], nargs="?", default="stable") parser.add_argument("--upper-bound", dest="upper-bound", help="Only look for versions older than this one (useful for pinning dependencies).") @@ -55,6 +68,8 @@ if __name__ == "__main__": package_name = getattr(args, "package-name") requested_release = getattr(args, "requested-release") upper_bound = getattr(args, "upper-bound") + if upper_bound: + upper_bound = Version(upper_bound) version_predicate = version_policies[getattr(args, "version-policy")] version_policy = make_version_policy(version_predicate, requested_release, upper_bound) @@ -64,11 +79,11 @@ if __name__ == "__main__": print("Unknown format of cache.json file.", file=sys.stderr) sys.exit(1) - versions = cache[2][package_name] - versions = sorted(filter(version_policy, versions), key=version_to_list) + versions = map(Version, cache[2][package_name]) + versions = sorted(filter(version_policy, versions)) if len(versions) == 0: print("No versions matched.", file=sys.stderr) sys.exit(1) - print(versions[-1]) + print(versions[-1].value) diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/aisleriot/default.nix similarity index 85% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/games/aisleriot/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/games/aisleriot/default.nix index bb513df4c7..bdd7c9cc1a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitLab +, nix-update-script , pkg-config -, gnome3 , itstool , gtk3 , wrapGAppsHook @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.13"; + version = "3.22.16"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = version; - sha256 = "05k84bbgrrxchxg08l1jjcz384kpjdmxd24g0wnf731aa9zcnp5k"; + sha256 = "0arjnm5kgnb4pir53hlm94iym80d0srs256sm2hwhwwc5fr1w79i"; }; nativeBuildInputs = [ @@ -61,9 +61,8 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; + updateScript = nix-update-script { + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/atomix/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/atomix/default.nix similarity index 84% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/games/atomix/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/games/atomix/default.nix index 802d92bf19..43d9aaa768 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/atomix/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, wrapGAppsHook, python3 -, gettext, gnome3, glib, gtk3, libgnome-games-support, gdk-pixbuf }: +, gettext, gnome, glib, gtk3, libgnome-games-support, gdk-pixbuf }: let pname = "atomix"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook python3 ]; - buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome3.adwaita-icon-theme ]; + buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py @@ -21,9 +21,9 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/five-or-more/default.nix similarity index 80% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/games/five-or-more/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/games/five-or-more/default.nix index 9f6ea6aac0..f01d137979 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/five-or-more/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome, gtk3, wrapGAppsHook , librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { vala ]; buildInputs = [ - gtk3 librsvg libgnome-games-support gnome3.adwaita-icon-theme + gtk3 librsvg libgnome-games-support gnome.adwaita-icon-theme ]; postPatch = '' @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "five-or-more"; - attrPath = "gnome3.five-or-more"; + attrPath = "gnome.five-or-more"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/four-in-a-row/default.nix similarity index 81% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/games/four-in-a-row/default.nix index 17dc8fe7c2..2c6899ee1a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/four-in-a-row/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook , gettext, meson, gsound, librsvg, itstool, vala , python3, ninja, desktop-file-utils }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pkg-config wrapGAppsHook gettext meson itstool vala ninja python3 desktop-file-utils ]; - buildInputs = [ gtk3 gsound librsvg gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gsound librsvg gnome.adwaita-icon-theme ]; postPatch = '' chmod +x build-aux/meson_post_install.py @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "four-in-a-row"; - attrPath = "gnome3.four-in-a-row"; + attrPath = "gnome.four-in-a-row"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-chess/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-chess/default.nix new file mode 100644 index 0000000000..c632bce407 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, vala +, pkg-config +, wrapGAppsHook4 +, gobject-introspection +, gettext +, itstool +, libxml2 +, python3 +, gnome +, glib +, gtk4 +, librsvg +}: + +stdenv.mkDerivation rec { + pname = "gnome-chess"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "132nc96z0bryyi9d5gljsbwsa71rl8wm5w57jbhpwiv4fyjhgybk"; + }; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + gettext + itstool + libxml2 + python3 + wrapGAppsHook4 + gobject-introspection + ]; + + buildInputs = [ + glib + gtk4 + librsvg + gnome.adwaita-icon-theme + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-chess"; + attrPath = "gnome.gnome-chess"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Chess"; + description = "Play the classic two-player boardgame of chess"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-klotski/default.nix similarity index 75% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-klotski/default.nix index fe1f092fbf..bb4cdae8fa 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-klotski/default.nix @@ -1,23 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils +{ lib, stdenv, fetchurl, pkg-config, vala, gnome, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils , glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support , meson, ninja, python3 }: let pname = "gnome-klotski"; - version = "3.38.1"; + version = "3.38.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "00rwi6z0068pbq01sq2d389ffcqsh3ylq3i8zkrqvblqid1hvnlv"; + sha256 = "1qm01hdd5yp8chig62bj10912vclbdvywwczs84sfg4zci2phqwi"; }; nativeBuildInputs = [ pkg-config vala meson ninja python3 wrapGAppsHook gettext itstool libxml2 appstream-glib desktop-file-utils - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support ]; @@ -27,9 +27,9 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix similarity index 82% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix index d5d2de53e4..7ef68e470e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook , librsvg, gettext, itstool, libxml2 , meson, ninja, glib, vala, desktop-file-utils }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja vala desktop-file-utils - pkg-config gnome3.adwaita-icon-theme + pkg-config gnome.adwaita-icon-theme libxml2 itstool gettext wrapGAppsHook glib # for glib-compile-schemas ]; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mines/default.nix similarity index 67% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mines/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mines/default.nix index 600b0d9846..6a7168badb 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mines/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkg-config, gnome, gtk3, wrapGAppsHook , librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }: stdenv.mkDerivation rec { pname = "gnome-mines"; - version = "3.36.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0m2680r94nk61imym4x73j03jwfjd8cxm592m5ybiqdfdw6i723i"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0sf6kdvhr4pr3hddnj6ql9larz2wy108sri31id6x9g459nbly8z"; }; # gobject-introspection for finding vapi files @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meson ninja vala gobject-introspection pkg-config gettext itstool python3 libxml2 wrapGAppsHook desktop-file-utils ]; - buildInputs = [ gtk3 librsvg gnome3.adwaita-icon-theme libgnome-games-support libgee ]; + buildInputs = [ gtk3 librsvg gnome.adwaita-icon-theme libgnome-games-support libgee ]; postPatch = '' chmod +x build-aux/meson_post_install.py @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-mines"; - attrPath = "gnome3.gnome-mines"; + attrPath = "gnome.gnome-mines"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-nibbles/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-nibbles/default.nix new file mode 100644 index 0000000000..34b50f2244 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-nibbles/default.nix @@ -0,0 +1,84 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, librsvg +, gsound +, clutter-gtk +, gettext +, itstool +, vala +, python3 +, libxml2 +, libgee +, libgnome-games-support +, meson +, ninja +, desktop-file-utils +, hicolor-icon-theme +}: + +stdenv.mkDerivation rec { + pname = "gnome-nibbles"; + version = "3.38.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1naknfbciydbym79a0jq039xf0033z8gyln48c0qsbcfr2qn8yj5"; + }; + + patches = [ + # Fix build with recent Vala. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/commit/62964e9256fcac616109af874dbb2bd8342a9853.patch"; + sha256 = "4VijELRxycS8rwi1HU9U3h9K/VtdQjJntfdtMN9Uz34="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/commit/1b48446068608aff9b5edf1fdbd4b8c0d9f0be94.patch"; + sha256 = "X0+Go5ae4F06WTPDYc2HIIax8X4RDgUGO6A6Qp8UifQ="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + vala + python3 + pkg-config + wrapGAppsHook + gettext + itstool + libxml2 + desktop-file-utils + hicolor-icon-theme + ]; + + buildInputs = [ + gtk3 + librsvg + gsound + clutter-gtk + gnome.adwaita-icon-theme + libgee + libgnome-games-support + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-nibbles"; + attrPath = "gnome.gnome-nibbles"; + }; + }; + + meta = with lib; { + description = "Guide a worm around a maze"; + homepage = "https://wiki.gnome.org/Apps/Nibbles"; + license = licenses.gpl2; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-robots/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-robots/default.nix new file mode 100644 index 0000000000..c9f7cbfc21 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-robots/default.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, librsvg +, gsound +, gettext +, itstool +, libxml2 +, libgnome-games-support +, libgee +, meson +, ninja +, vala +, python3 +, desktop-file-utils +, adwaita-icon-theme +}: + +stdenv.mkDerivation rec { + pname = "gnome-robots"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-robots/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "04fbykj576dq1h6cycgfhh8wd6yxmlsqykvj188sbwahay42zgvg"; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + vala + python3 + libxml2 + wrapGAppsHook + gettext + itstool + desktop-file-utils + ]; + + buildInputs = [ + gtk3 + librsvg + gsound + libgnome-games-support + libgee + adwaita-icon-theme + ]; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-robots"; + attrPath = "gnome.gnome-robots"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Robots"; + description = "Avoid the robots and make them crash into each other"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix similarity index 76% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 7c5fd8f1ac..3bd0ec3b3c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gobject-introspection, gettext, gtk3, gnome, wrapGAppsHook , libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "3.38.0"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0cpxx63liczmax6ry06r5k0f221xpg2rqh49vkdj2snmqq61swrq"; + url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1nr1g4q1gxqbzmaz15y3zgssnj7w01cq9l422ja4rglyg0fwjhbm"; }; nativeBuildInputs = [ meson ninja vala pkg-config gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-sudoku"; - attrPath = "gnome3.gnome-sudoku"; + attrPath = "gnome.gnome-sudoku"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-taquin/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-taquin/default.nix new file mode 100644 index 0000000000..c3e78ff201 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-taquin/default.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, librsvg +, gsound +, gettext +, itstool +, libxml2 +, meson +, ninja +, vala +, python3 +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "gnome-taquin"; + version = "3.38.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-taquin/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0kw131q0ad0rbsp6qifjc8fjlhvjxyihil8a76kj8ya9mn7kvnwn"; + }; + + patches = [ + # Fix build with recent Vala. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-taquin/-/commit/99dea5e7863e112f33f16e59898c56a4f1a547b3.patch"; + sha256 = "U7djuMhb1XJaKAPyogQjaunOkbBK24r25YD7BgH05P4="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-taquin/-/commit/66be44dc20d114e449fc33156e3939fd05dfbb16.patch"; + sha256 = "RN41RCLHlJyXTARSH9qjsmpYi1UFeMRssoYxRsbngDQ="; + }) + ]; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook + meson + ninja + python3 + gettext + itstool + libxml2 + vala + desktop-file-utils + ]; + buildInputs = [ + gtk3 + librsvg + gsound + gnome.adwaita-icon-theme + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-taquin"; + attrPath = "gnome.gnome-taquin"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Taquin"; + description = "Move tiles so that they reach their places"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-tetravex/default.nix similarity index 78% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-tetravex/default.nix index 9ae7377379..a1cdf98d9a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-tetravex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook , libxml2, gettext, itstool, meson, ninja, python3 , vala, desktop-file-utils }: @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome3.gnome-tetravex"; }; + updateScript = gnome.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome.gnome-tetravex"; }; }; nativeBuildInputs = [ - wrapGAppsHook itstool libxml2 gnome3.adwaita-icon-theme + wrapGAppsHook itstool libxml2 gnome.adwaita-icon-theme pkg-config gettext meson ninja python3 vala desktop-file-utils ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/hitori/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/hitori/default.nix similarity index 92% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/games/hitori/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/games/hitori/default.nix index 8369c571f5..1dc07bae26 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/hitori/default.nix @@ -3,7 +3,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , glib , gtk3 , cairo @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/iagno/default.nix similarity index 59% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/games/iagno/default.nix index db3b0d2115..d7e3930eae 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/iagno/default.nix @@ -3,7 +3,7 @@ , fetchpatch , pkg-config , gtk3 -, gnome3 +, gnome , gdk-pixbuf , librsvg , wrapGAppsHook @@ -26,6 +26,20 @@ stdenv.mkDerivation rec { sha256 = "097dw1l92l73xah9l56ka5mi3dvx48ffpiv33ni5i5rqw0ng7fc4"; }; + patches = [ + # Fix build with recent Vala. + # https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/15 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/iagno/-/commit/e8a0aeec350ea80349582142c0e8e3cd3f1bce38.patch"; + sha256 = "OO1x0Yx56UFzHTBsPAMYAjnJHlnTjdO1Vk7q6XU8wKQ="; + }) + # https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/13 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/iagno/-/commit/508c0f94e5f182e50ff61be6e04f72574dee97cb.patch"; + sha256 = "U7djuMhb1XJaKAPyogQjaunOkbBK24r25YD7BgH05P4="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -40,16 +54,16 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gdk-pixbuf librsvg gsound ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "iagno"; - attrPath = "gnome3.iagno"; + attrPath = "gnome.iagno"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/lightsoff/default.nix similarity index 67% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/games/lightsoff/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/games/lightsoff/default.nix index 6783147840..94b71f0e85 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/lightsoff/default.nix @@ -1,21 +1,21 @@ -{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook +{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook , gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib , meson, ninja, python3 }: stdenv.mkDerivation rec { pname = "lightsoff"; - version = "3.38.0"; + version = "40.0.1"; src = fetchurl { - url = "mirror://gnome/sources/lightsoff/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0dpnnw8v1yk1p0y08f9c9xkgswqlm8x83dfn96798nif2zbypdnh"; + url = "mirror://gnome/sources/lightsoff/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1aziy64g15bm83zfn3ifs20z9yvscdvsxbx132xnq77i0r3qvlxc"; }; nativeBuildInputs = [ vala pkg-config wrapGAppsHook itstool gettext appstream-glib libxml2 meson ninja python3 ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ]; postPatch = '' chmod +x build-aux/meson_post_install.py @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "lightsoff"; - attrPath = "gnome3.lightsoff"; + attrPath = "gnome.lightsoff"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/quadrapassel/default.nix similarity index 84% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/games/quadrapassel/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/games/quadrapassel/default.nix index de3d67b58b..d54c49eafe 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/quadrapassel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, gdk-pixbuf +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, gdk-pixbuf , librsvg, gsound, libmanette , gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook , meson, ninja, python3, vala, desktop-file-utils @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja python3 vala desktop-file-utils - pkg-config gnome3.adwaita-icon-theme + pkg-config gnome.adwaita-icon-theme libxml2 itstool gettext wrapGAppsHook ]; buildInputs = [ @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/swell-foop/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/swell-foop/default.nix new file mode 100644 index 0000000000..50fab59815 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/swell-foop/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, vala +, glib +, gtk3 +, libgnome-games-support +, gnome +, desktop-file-utils +, clutter +, clutter-gtk +, gettext +, itstool +, libxml2 +, wrapGAppsHook +, python3 +}: + +stdenv.mkDerivation rec { + pname = "swell-foop"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "17r4b0g8s7z872wdd7ngk248z7fqx43vm2sym1bdqhzsi250s1y1"; + }; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + wrapGAppsHook + python3 + itstool + gettext + libxml2 + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk3 + libgnome-games-support + gnome.adwaita-icon-theme + clutter + clutter-gtk + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; + description = "Puzzle game, previously known as Same GNOME"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix similarity index 66% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix index b9409605f2..3e2abc8730 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix @@ -1,24 +1,24 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, gdk-pixbuf +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, gdk-pixbuf , librsvg, libgnome-games-support, gettext, itstool, libxml2, wrapGAppsHook , meson, ninja, python3, desktop-file-utils }: stdenv.mkDerivation rec { pname = "tali"; - version = "3.38.3"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/tali/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "AhVCi1DEoIJ/sN4uTmum5WZ4+bp22NJbfuyoUhXyWjk="; + url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "19gic6yjg3bg6jf87zvhm7ihsz1y58dz86p4x3a16xdhjyrk40q2"; }; passthru = { - updateScript = gnome3.updateScript { packageName = "tali"; attrPath = "gnome3.tali"; }; + updateScript = gnome.updateScript { packageName = "tali"; attrPath = "gnome.tali"; }; }; nativeBuildInputs = [ meson ninja python3 desktop-file-utils - pkg-config gnome3.adwaita-icon-theme + pkg-config gnome.adwaita-icon-theme libxml2 itstool gettext wrapGAppsHook ]; buildInputs = [ gtk3 gdk-pixbuf librsvg libgnome-games-support ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/installer.nix b/third_party/nixpkgs/pkgs/desktops/gnome/installer.nix similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/installer.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/installer.nix diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/geary/default.nix similarity index 78% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/misc/geary/default.nix index ff97d34f7c..37eca7ccc7 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/geary/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config , gtk3 @@ -15,6 +16,7 @@ , libsecret , gmime3 , isocodes +, icu , libxml2 , gettext , sqlite @@ -22,12 +24,12 @@ , json-glib , itstool , libgee -, gnome3 +, gnome , webkitgtk , python3 , gnutls , cacert -, xvfb_run +, xvfb-run , glibcLocales , dbus , shared-mime-info @@ -37,6 +39,7 @@ , gobject-introspection , gspell , appstream-glib +, libstemmer , libytnef , libhandy , gsound @@ -44,18 +47,13 @@ stdenv.mkDerivation rec { pname = "geary"; - version = "3.38.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04p8fjkz4xp5afp0ld1m09pnv0zkcx51l7hf23amfrjkk0kj2bp7"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1c2nd35500ng28223y5pszc7fh8g16njj34f6p5xc9594lvj0mik"; }; - patches = [ - # Longer timeout for client test. - ./Bump-client-test-timeout-to-300s.patch - ]; - nativeBuildInputs = [ appstream-glib desktop-file-utils @@ -84,12 +82,14 @@ stdenv.mkDerivation rec { gspell gtk3 isocodes + icu json-glib libgee libhandy libpeas libsecret libunwind + libstemmer libytnef sqlite webkitgtk @@ -99,12 +99,13 @@ stdenv.mkDerivation rec { dbus gnutls # for certtool cacert # trust store for glib-networking - xvfb_run + xvfb-run glibcLocales # required by Geary.ImapDb.DatabaseTest/utf8_case_insensitive_collation ]; mesonFlags = [ - "-Dcontractor=true" # install the contractor file (Pantheon specific) + "-Dprofile=release" + "-Dcontractor=enabled" # install the contractor file (Pantheon specific) ]; # NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see: @@ -118,21 +119,23 @@ stdenv.mkDerivation rec { patchShebangs build-aux/yaml_to_json.py chmod +x desktop/geary-attach - - # Drop test that breaks after webkitgtk 2.32.0 update - # https://gitlab.gnome.org/GNOME/geary/-/issues/1180 - sed -i '/add_test("edit_context_font", edit_context_font);/d' test/js/composer-page-state-test.vala ''; - doCheck = true; + # Some tests time out. + doCheck = false; checkPhase = '' + runHook preCheck + NO_AT_BRIDGE=1 \ GIO_EXTRA_MODULES=$GIO_EXTRA_MODULES:${glib-networking}/lib/gio/modules \ + HOME=$TMPDIR \ XDG_DATA_DIRS=$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share:${folks}/share/gsettings-schemas/${folks.name} \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ meson test -v --no-stdsplit + + runHook postCheck ''; preFixup = '' @@ -141,9 +144,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gitg/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gitg/default.nix similarity index 87% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gitg/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/misc/gitg/default.nix index 0f4f8e6773..8f73bdaeb7 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gitg/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, fetchpatch , vala , gettext , pkg-config @@ -15,7 +15,7 @@ , gtksourceview , gsettings-desktop-schemas , adwaita-icon-theme -, gnome3 +, gnome , gtkspell3 , shared-mime-info , libgee @@ -36,16 +36,16 @@ stdenv.mkDerivation rec { sha256 = "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914"; }; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - - substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash" - ''; - - doCheck = true; - - enableParallelBuilding = true; + nativeBuildInputs = [ + gobject-introspection + gettext + meson + ninja + pkg-config + python3 + vala + wrapGAppsHook + ]; buildInputs = [ adwaita-icon-theme @@ -63,16 +63,14 @@ stdenv.mkDerivation rec { libsoup ]; - nativeBuildInputs = [ - gobject-introspection - gettext - meson - ninja - pkg-config - python3 - vala - wrapGAppsHook - ]; + doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + + substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash" + ''; preFixup = '' gappsWrapperArgs+=( @@ -82,7 +80,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; @@ -91,7 +89,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Gitg"; description = "GNOME GUI client to view git repositories"; maintainers = with maintainers; [ domenkozar ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-applets/default.nix similarity index 84% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-applets/default.nix index 1947179028..d414266a9d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-applets/default.nix @@ -16,17 +16,18 @@ , adwaita-icon-theme , libgweather , gucharmap +, tracker , polkit -, gnome3 +, gnome }: stdenv.mkDerivation rec { pname = "gnome-applets"; - version = "3.38.0"; + version = "3.40.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04qrzycwm7pz556agl08xw3d0r1mmr4ja9n9jfijjxs9inrhp5yc"; + sha256 = "1k6mdkg16ia29fyg8ikf4dfs51gnrmg0f8xwpvd3192lhfsbsh19"; }; nativeBuildInputs = [ @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { adwaita-icon-theme libgweather gucharmap - # tracker # Tracker 3 not supported. + tracker polkit wirelesstools linuxPackages.cpupower @@ -62,9 +63,10 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-autoar/default.nix similarity index 77% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-autoar/default.nix index 2d66dabb5a..8a74c05dfe 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-autoar/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , pkg-config -, gnome3 +, gnome , gtk3 , glib , gobject-introspection @@ -11,17 +11,17 @@ stdenv.mkDerivation rec { pname = "gnome-autoar"; - version = "0.3.1"; + version = "0.3.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1y6hh5dldhdq7mpbmd571zl0yadfackvifhnxvykkqqddwz72y0f"; + sha256 = "0wkwix44yg126xn1v4f2j60bv9yiyadfpzf8ifx0bvd9x5f4v354"; }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-autoar"; attrPath = "gnome3.gnome-autoar"; }; + updateScript = gnome.updateScript { packageName = "gnome-autoar"; attrPath = "gnome.gnome-autoar"; }; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-flashback/default.nix similarity index 96% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-flashback/default.nix index 935778aa64..7e578f27cd 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -7,7 +7,7 @@ , gnome-desktop , gnome-panel , gnome-session -, gnome3 +, gnome , gsettings-desktop-schemas , gtk3 , ibus @@ -30,7 +30,7 @@ }: let pname = "gnome-flashback"; - version = "3.38.0"; + version = "3.40.0"; # From data/sessions/Makefile.am requiredComponentsCommon = [ @@ -61,7 +61,7 @@ let src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1r51yqdqichp4jv54kiaqrh0xhykngr4ymlvrkjhzdhivwadsg4m"; + sha256 = "0fxv13m2q9z1q3i9jbggl35cb7jlckbdrfsr5sf030hr1w836gz0"; }; # make .desktop Execs absolute @@ -120,9 +120,10 @@ let PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; + versionPolicy = "odd-unstable"; }; mkSessionForWm = { wmName, wmLabel, wmCommand }: diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix index 53be2df471..6e0aa78e6f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, gnome3, packagekit, polkit +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, gnome, packagekit, polkit , gtk3, systemd, wrapGAppsHook, desktop-file-utils }: stdenv.mkDerivation rec { @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-packagekit"; - attrPath = "gnome3.gnome-packagekit"; + attrPath = "gnome.gnome-packagekit"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-panel/default.nix similarity index 88% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-panel/default.nix index b820f7750d..4e42f91e1e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-panel/default.nix @@ -8,7 +8,7 @@ , glib , gnome-desktop , gnome-menus -, gnome3 +, gnome , gtk3 , itstool , libgweather @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gnome-panel"; - version = "3.38.0"; + version = "3.40.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-GosVrvCgKmyqm5IJyNP7Q+e5h6OAB2aRwj8DFOwwLxU="; + hash = "sha256-nxNQde3GZs8rnKkd41xnA+KxdxwQp3B0FPtlbCilmzs="; }; # make .desktop Exec absolute @@ -82,9 +82,10 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-screensaver/fix-dbus-service-dir.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-screensaver/fix-dbus-service-dir.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix similarity index 66% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix index b6a12fca13..460ab47733 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix @@ -5,12 +5,12 @@ , gdk-pixbuf , gettext , glib -, gnome3 +, gnome , gobject-introspection , gsettings-desktop-schemas , gtk3 , itstool -, libhandy_0 +, libhandy , libnotify , libsoup , libxml2 @@ -20,13 +20,13 @@ python3Packages.buildPythonApplication rec { pname = "gnome-tweaks"; - version = "3.34.1"; + version = "40.0"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19y62dj4n5i6v4zpjllxl51dch6ndy8xs45v5aqmmq9xyfrqk5yq"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "+V8/4DGwsBwC95oWWfiJFS03cq4+RN+EA9FGC6Xuw2o="; }; nativeBuildInputs = [ @@ -43,15 +43,15 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gdk-pixbuf glib - gnome3.gnome-desktop - gnome3.gnome-settings-daemon - gnome3.gnome-shell + gnome.gnome-desktop + gnome.gnome-settings-daemon + gnome.gnome-shell # Makes it possible to select user themes through the `user-theme` extension - gnome3.gnome-shell-extensions - gnome3.mutter + gnome.gnome-shell-extensions + gnome.mutter gsettings-desktop-schemas gtk3 - libhandy_0 + libhandy libnotify libsoup ]; @@ -65,17 +65,17 @@ python3Packages.buildPythonApplication rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; meta = with lib; { - homepage = "https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"; + homepage = "https://wiki.gnome.org/Apps/Tweaks"; description = "A tool to customize advanced GNOME 3 options"; maintainers = teams.gnome.members; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix similarity index 95% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix index 7dbf6daffa..15fcfbfe39 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "3.38.6"; + version = "3.40.2"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-6CIzOBq/Y9XKiv/lQAtDYK6bxhT1WxjbXhu4+noO5nI="; + sha256 = "sha256-DUikcnkDBRkCwPLrl8lkNr+SeNpc3bPwPTWRn91nOo4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch similarity index 97% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch index c8a3fad227..46e30ce2e2 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch @@ -17,7 +17,7 @@ +imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@'); + - const { GPaste } = imports.gi; + //const { GPaste } = imports.gi; const ExtensionUtils = imports.misc.extensionUtils; --- a/src/libgpaste/settings/gpaste-settings.c diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gtkhtml/default.nix similarity index 73% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/misc/gtkhtml/default.nix index cc054a983c..88fb31c433 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gtkhtml/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gtk3, intltool -, gnome3, enchant, isocodes, gsettings-desktop-schemas }: +, gnome, enchant, isocodes, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gtkhtml"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "gtkhtml"; attrPath = "gnome3.gtkhtml"; }; + updateScript = gnome.updateScript { packageName = "gtkhtml"; attrPath = "gnome.gtkhtml"; }; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme + buildInputs = [ gtk3 intltool gnome.adwaita-icon-theme gsettings-desktop-schemas ]; propagatedBuildInputs = [ enchant isocodes ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/libgnome-games-support/default.nix similarity index 80% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/misc/libgnome-games-support/default.nix index 01899d20b5..dd65f858b6 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/libgnome-games-support/default.nix @@ -6,7 +6,7 @@ , libgee , gettext , vala -, gnome3 +, gnome , libintl , meson , ninja @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "libgnome-games-support"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pdk9hc30xdlv0ba24f7pvcr2d5370zykrmpws7hgmjgl4wfbpdb"; + sha256 = "0gs1k88wwafn5cdyb5yq1cxpi9azachb0ysxgwh15sx77g6plyy3"; }; nativeBuildInputs = [ @@ -41,9 +41,10 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/metacity/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/metacity/default.nix similarity index 84% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/misc/metacity/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/misc/metacity/default.nix index c74d57d9f4..702b7ffb38 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/metacity/default.nix @@ -2,7 +2,7 @@ , fetchurl , gettext , glib -, gnome3 +, gnome , gsettings-desktop-schemas , gtk3 , xorg @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "metacity"; - version = "3.38.0"; + version = "3.40.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1b0i9sq6qa540f2006cv1p8i6lxg1h6w00apxwzwjpfqn0hk26c1"; + sha256 = "1d8mj2nshijshfiaica8dirfws1p6i9631frq7q23b3y91jiyk12"; }; patches = [ @@ -55,9 +55,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/misc/metacity/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch rename to third_party/nixpkgs/pkgs/desktops/gnome/misc/metacity/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/nautilus-python/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/misc/nautilus-python/default.nix index 4db81228a0..40c1d4c767 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/nautilus-python/default.nix @@ -9,7 +9,7 @@ , ncurses , nautilus , gtk3 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -46,9 +46,10 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/pomodoro/default.nix similarity index 89% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/misc/pomodoro/default.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/misc/pomodoro/default.nix index ae52c41787..2881cc7e50 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/pomodoro/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-pomodoro"; - version = "0.18.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "codito"; repo = "gnome-pomodoro"; rev = version; - sha256 = "0990m8ydryd77kv25nfqli1n209i0h5dkjg9gkyww8bfrjhw47mc"; + sha256 = "sha256-im66QUzz6PcX0vkf4cN57ttRLB4KKPFky1pwUa4V7kQ="; }; nativeBuildInputs = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { This GNOME utility helps to manage time according to Pomodoro Technique. It intends to improve productivity and focus by taking short breaks. ''; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/update.nix b/third_party/nixpkgs/pkgs/desktops/gnome/update.nix similarity index 88% rename from third_party/nixpkgs/pkgs/desktops/gnome-3/update.nix rename to third_party/nixpkgs/pkgs/desktops/gnome/update.nix index 1bceddf77e..928eac4516 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/update.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/update.nix @@ -1,8 +1,8 @@ { stdenv, pkgs, lib, writeScript, python3, common-updater-scripts }: -{ packageName, attrPath ? packageName, versionPolicy ? "odd-unstable", freeze ? false }: +{ packageName, attrPath ? packageName, versionPolicy ? "tagged", freeze ? false }: let - python = python3.withPackages (p: [ p.requests ]); + python = python3.withPackages (p: [ p.requests p.libversion ]); upperBoundFlag = let package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs; diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix index 8fe232dff7..e661dae909 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix @@ -4,7 +4,7 @@ , fetchurl, fetchpatch , gmp, gnutls , libffi, binutils-unwrapped -, libjpeg, libtiff, libpng, giflib, libungif +, libjpeg, libtiff, libpng, giflib , libxml2, libxslt, libiconv , libobjc, libgcrypt , icu @@ -26,7 +26,7 @@ gsmakeDerivation { cups gmp gnutls libffi binutils-unwrapped - libjpeg libtiff libpng giflib libungif + libjpeg libtiff libpng giflib giflib libxml2 libxslt libiconv libobjc libgcrypt icu diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/default.nix index abbabd4abf..d337512dce 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/default.nix @@ -1,6 +1,5 @@ { newScope , llvmPackages -, giflib_4_1 }: let @@ -16,7 +15,7 @@ let libobjc = callPackage ./libobjc2 {}; make = callPackage ./make {}; back = callPackage ./back {}; - base = callPackage ./base { giflib = giflib_4_1; }; + base = callPackage ./base { }; gui = callPackage ./gui {}; gworkspace = callPackage ./gworkspace {}; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/make/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/make/default.nix index f571a3c486..f96eb7388b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/make/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/make/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, clang, which, libobjc }: let - version = "2.8.0"; + version = "2.9.0"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; - sha256 = "0pfaylrr3xgn5026anmja4rv4l7nzzaqsrkxycyi0p4lvm12kklz"; + sha256 = "sha256-oLBmwRJXh5x8hTEd6mnGf23HQe8znbZRT4W2SZLEDSo="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 27fda63610..fb2ed9e37d 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , mkDerivation , fetchFromGitHub , cmake @@ -21,6 +22,13 @@ mkDerivation rec { sha256 = "0zhcv6cbdn9fr5lpglz26gzssbxkpi824sgc0g7w3hh1z6nqqf8l"; }; + # Nix clang on darwin identifies as 'Clang', not 'AppleClang' + # Without this, dependants fail to link. + postPatch = '' + substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \ + --replace AppleClang Clang + ''; + nativeBuildInputs = [ cmake pkg-config diff --git a/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix index 6ac9c3864a..8c6df49fd1 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop -, libXdamage, libXpresent, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: +, libXdamage, libXpresent, libstartup_notification, gnome, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "marco"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libXpresent libstartup_notification gtk3 - gnome3.zenity + gnome.zenity mate-settings-daemon ]; 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 1046e431a3..ccd20a6b87 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3 +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome, glib, gtk3, gtksourceview3, libwnck3 , libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook , mateUpdateScript }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 gtksourceview3 - gnome3.gucharmap + gnome.gucharmap libwnck3 libgtop libxml2 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 b1b59dc640..62e0b5b319 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome, gtk3, dconf, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-desktop"; 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 3a99538d92..fd7b19e1de 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 @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-power-manager"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { libxml2 libcanberra-gtk3 gtk3 - gnome3.libgnome-keyring + gnome.libgnome-keyring libnotify dbus-glib upower diff --git a/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix index 4c98c9cf52..5e226f4d88 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3 -, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }: +, gnome, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "pluma"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { python3 gtksourceview3 libpeas - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme mate.mate-desktop ]; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix index 1c86de6160..a3e75d231f 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -37,9 +37,18 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-8r0DlmG8xlCQ1uFHZQjXG2ls4VBrsRzrVY8Ey3/OYAU="; + sha256 = "MsaXdmL+M+NYAJrrwluleeNxqQg0soFbO/G/FqibBFI="; }; + patches = [ + # Allow build with appstream 0.14.x + # https://github.com/elementary/appcenter/pull/1493 + (fetchpatch { + url = "https://github.com/elementary/appcenter/commit/5807dd13fe3c715f26225aed8d7a0abdea0c2a64.patch"; + sha256 = "BvEahG9lU9ZdgooFDFhm5evRvnKVcmcHLdmZPb85gbo="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 15e0059ce8..791c2508e1 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "elementary-calculator"; - version = "1.6.0"; + version = "1.6.1"; repoName = "calculator"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-kDqUwTi3XnFGUwAjnWcaKqDylUFqpus9WurLoqbV1xk="; + sha256 = "sha256-LGY111wPldxuSfqhZ2E2TeJjexcGbfS25RjLw+Wi99c="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index f9ab49a72b..cf0d0d812f 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -18,6 +18,7 @@ , python3 , libnotify , libical +, libgdata , evolution-data-server , appstream-glib , elementary-icon-theme @@ -67,6 +68,7 @@ stdenv.mkDerivation rec { libgee libical libnotify + libgdata # required by some dependency transitively ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 7339038b08..e8b10227ea 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , pkg-config @@ -39,6 +40,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-4AEayj+K/lOW6jEYmvmdan1kTqqqLL1YzwcU7/3PH5U="; }; + patches = [ + # Fix build with latest Vala. + (fetchpatch { + url = "https://github.com/elementary/code/commit/c50580d3336296823da9a2c50b824f21fde50286.patch"; + sha256 = "F+ZYlnZWYCU68G4oayLfbTnvSnTb4YA0zHVGD/Uf3KA="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 24eafcabde..5a5c314b3e 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , pkg-config @@ -41,6 +42,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-3GZoBCu9rF+BnNk9APBzKWO1JYg1XYWwrEvwcjWvYDE="; }; + patches = [ + # Fix build with latest Vala. + (fetchpatch { + url = "https://github.com/elementary/music/commit/9ed3bbb3a0d68e289a772b4603f58e52a4973316.patch"; + sha256 = "fFO97SQzTc2fYFJFGfFPSUCdkCgZxfX1fjDQ7GH4BUs="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index ca0b395135..7280051361 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , meson @@ -45,6 +46,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-bTk4shryAWWMrKX3mza6xQ05qpBPf80Ey7fmYgKLUiY="; }; + patches = [ + # Fix build with latest Vala. + (fetchpatch { + url = "https://github.com/elementary/photos/commit/27e529fc96da828982563e2e19a6f0cef883a29e.patch"; + sha256 = "w39wh45VHggCs62TN6wpUEyz/hJ1y7qL1Ox+sp0Pt2s="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 06d8041339..7387ea34e4 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -25,6 +25,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-tnAJyyPN/Xy1pmlgBpgO2Eb5CeHrRltjQTHmuTPBt8s="; }; + patches = [ + # Fix build with latest Vala. + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-printers/commit/5eced5ddda6f229d7265ea0a713f6c1cd181a526.patch"; + sha256 = "lPTNqka6jjvv1JnAqVzVIQBIdDXlCOQ5ASvgZNuEUC8="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index 6a18f6b6e2..26e26de33b 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , meson @@ -28,6 +29,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-Sws6FqUL7QAROInDrcqYAp6j1TCC4aGV0/hi5Kmm5wQ="; }; + patches = [ + # Fix build with latest Vala. + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-security-privacy/commit/c8e422e630bbee0badcf4df26364c9e83e06bad0.patch"; + sha256 = "5Gm+muZiCraJC5JaGVVo0HDJ7KxjOpclHRW1RKsk3bc="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/default.nix index e5182807b3..82d6a87b10 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, gnome3 }: +{ config, pkgs, lib, gnome }: lib.makeScope pkgs.newScope (self: with self; { @@ -23,9 +23,9 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-session wingpanel-indicator-sound ]; - maintainers = with pkgs.lib.maintainers; [ worldofpeace ]; + maintainers = with pkgs.lib.maintainers; [ ]; - mutter = pkgs.gnome3.mutter334; + mutter = pkgs.gnome.mutter334; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; @@ -72,17 +72,17 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-print-shim = callPackage ./desktop/elementary-print-shim { }; elementary-session-settings = callPackage ./desktop/elementary-session-settings { - inherit (gnome3) gnome-session gnome-keyring; + inherit (gnome) gnome-session gnome-keyring; }; elementary-shortcut-overlay = callPackage ./desktop/elementary-shortcut-overlay { }; extra-elementary-contracts = callPackage ./desktop/extra-elementary-contracts { - inherit (gnome3) file-roller gnome-bluetooth; + inherit (gnome) file-roller gnome-bluetooth; }; gala = callPackage ./desktop/gala { - inherit (gnome3) gnome-desktop; + inherit (gnome) gnome-desktop; }; wingpanel = callPackage ./desktop/wingpanel { }; @@ -109,7 +109,7 @@ lib.makeScope pkgs.newScope (self: with self; { # explained here -> https://github.com/elementary/greeter/issues/92#issuecomment-376215614 # Take note of "I am holding off on "fixing" this bug for as long as possible." elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { - inherit (gnome3) gnome-desktop; + inherit (gnome) gnome-desktop; }; pantheon-agent-geoclue2 = callPackage ./services/pantheon-agent-geoclue2 { }; @@ -169,7 +169,7 @@ lib.makeScope pkgs.newScope (self: with self; { switchboard-plug-onlineaccounts = callPackage ./apps/switchboard-plugs/onlineaccounts { }; switchboard-plug-pantheon-shell = callPackage ./apps/switchboard-plugs/pantheon-shell { - inherit (gnome3) gnome-desktop; + inherit (gnome) gnome-desktop; }; switchboard-plug-power = callPackage ./apps/switchboard-plugs/power { }; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index c4e070aeac..03954fac64 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -15,6 +15,7 @@ , libgee , libxml2 , libsoup +, libgdata , elementary-calendar }: @@ -52,6 +53,7 @@ stdenv.mkDerivation rec { libical libsoup wingpanel + libgdata # required by some dependency transitively ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix index defb6095a3..3d4dc6bd84 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "5.5.0"; + version = "6.0.0"; outputs = [ "out" "dev" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-ytbjuo9RnYyJ9+LqtWE117dGlNErLl+nmTM22xGGDo8="; + sha256 = "sha256-RGukXeFmtnyCfK8pKdvTHL0t8yhEYwAiiPelTy1Xcf0="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index a37e43cd35..43fd7a69e8 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -2,10 +2,11 @@ , substituteAll , fetchurl , fetchgit +, fetchpatch , meson , ninja , pkg-config -, gnome3 +, gnome , perl , gettext , gtk3 @@ -73,6 +74,20 @@ stdenv.mkDerivation rec { #"${patchPath}/ubuntu_ibus_configs.patch" # https://github.com/elementary/os-patches/blob/6975d1c254cb6ab913b8e2396877203aea8eaa65/debian/patches/elementary-dpms.patch ./elementary-dpms.patch + + # Query GWeather DB on the fly instead of caching. + # Needed for the next patch to apply. + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/merge_requests/175 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/df6c69f028d27b53ac86829e11df103b25ed5a74.patch"; + sha256 = "bKZkPzN64DXMgitjn0vUzUvKl7ldhN/mNVtPKVmHd0Q="; + }) + # Adjust to libgweather changes. + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/217 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/82d88014dfca2df7e081712870e1fb017c16b808.patch"; + sha256 = "H5k/v+M2bRaswt5nrDJFNn4gS4BdB0UfzdjUCT4yLKg="; + }) ]; nativeBuildInputs = [ @@ -137,7 +152,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = repoName; attrPath = "pantheon.${pname}"; }; diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix index ea2e199e93..4b41e5ad9d 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix @@ -139,6 +139,7 @@ let plasma-integration = callPackage ./plasma-integration {}; plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; + plasma-sdk = callPackage ./plasma-sdk.nix {}; plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { }; plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { }; plasma-vault = callPackage ./plasma-vault {}; diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh index 10214b3fe2..398f9a1b97 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.21.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.21.4/ -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-sdk.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-sdk.nix new file mode 100644 index 0000000000..e82fc4d060 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-sdk.nix @@ -0,0 +1,41 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, karchive +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdeclarative +, ki18n +, kiconthemes +, kio +, plasma-framework +, kservice +, ktexteditor +, kwidgetsaddons +, kdoctools +, qtbase +}: + +mkDerivation { + name = "plasma-sdk"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + karchive + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kdbusaddons + kdeclarative + ki18n + kiconthemes + kio + plasma-framework + kservice + ktexteditor + kwidgetsaddons + ]; +} diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix index bf93e0564d..8fa7ba91c6 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix @@ -4,419 +4,419 @@ { bluedevil = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/bluedevil-5.21.3.tar.xz"; - sha256 = "1xqm4bn97asilc4yw5rvmmhk7c7wvmbalalr6gz8gw4gv0pg67qv"; - name = "bluedevil-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/bluedevil-5.21.4.tar.xz"; + sha256 = "0ls6ijk10pgi75ycwcnq3z4j5hn657cnr4s7fky53qkc3y2x25g1"; + name = "bluedevil-5.21.4.tar.xz"; }; }; breeze = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/breeze-5.21.3.tar.xz"; - sha256 = "0frm3f8q1n0pdzjk7zwmvlrl19fb9265ihnnfhak6ckaq50x72l3"; - name = "breeze-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/breeze-5.21.4.tar.xz"; + sha256 = "1n6hwppcbnn3hw5r3f9jssvslnming9qvs4s2czyl0kky1nv8bfm"; + name = "breeze-5.21.4.tar.xz"; }; }; breeze-grub = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/breeze-grub-5.21.3.tar.xz"; - sha256 = "1j0pk4pv5pxwhwah1gd5znnsw3j15x2sc74pp6zinz9a1ywjklnz"; - name = "breeze-grub-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/breeze-grub-5.21.4.tar.xz"; + sha256 = "1jd8fy9b5cmv1da27xqbl6x3197pq6m4wwxzylxgnmciivhmnzm2"; + name = "breeze-grub-5.21.4.tar.xz"; }; }; breeze-gtk = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/breeze-gtk-5.21.3.tar.xz"; - sha256 = "1x5by915lfhbkhgrhy3lkwg64skwdlqaxzbq92x0m9v9a9agwidc"; - name = "breeze-gtk-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/breeze-gtk-5.21.4.tar.xz"; + sha256 = "03aj8rxh46j663m26jsb9hrg0x5j0hvzjqwc8l1ayfcwkdgl4b4i"; + name = "breeze-gtk-5.21.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/breeze-plymouth-5.21.3.tar.xz"; - sha256 = "01ida3pfj6g1igndjfjpv16199zysgxlxlnc7vsx7kr8aval8pmx"; - name = "breeze-plymouth-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/breeze-plymouth-5.21.4.tar.xz"; + sha256 = "0ibwl2aikh547k851pb78216v8ld5la9xg3f9945dcbf7ly88nd7"; + name = "breeze-plymouth-5.21.4.tar.xz"; }; }; discover = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/discover-5.21.3.tar.xz"; - sha256 = "170kxhrwj4mvj5qg7cyz3sxdfyp7rr4pgsi3v7kahs19a9w3isnx"; - name = "discover-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/discover-5.21.4.tar.xz"; + sha256 = "1f3hvafyf2kga1ywn5aia37xxgagx6p2b43h7ap7mjkmw7ywyr30"; + name = "discover-5.21.4.tar.xz"; }; }; drkonqi = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/drkonqi-5.21.3.tar.xz"; - sha256 = "1hq37vi0vndhy66labspm75blicx1g4q594wxfxzl076mav5jds4"; - name = "drkonqi-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/drkonqi-5.21.4.tar.xz"; + sha256 = "123l0hyyzskjivasp1q8w9y2f2mbjrwjap3yfi23h98zbzcblcaq"; + name = "drkonqi-5.21.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/kactivitymanagerd-5.21.3.tar.xz"; - sha256 = "1x5p6rbjf9kz07r5mrkiglvbigvk5bfx8qpb8l2vagsbvlg298c3"; - name = "kactivitymanagerd-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/kactivitymanagerd-5.21.4.tar.xz"; + sha256 = "0waawpy5pqllj8iacrxpwsnz4m1yy7z8jih63s7psgr22cbvd116"; + name = "kactivitymanagerd-5.21.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/kde-cli-tools-5.21.3.tar.xz"; - sha256 = "0hkmr3zxg4np1ppsgj77ijgkwgvl7d0zxwl46xjc2px877lx8bpp"; - name = "kde-cli-tools-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/kde-cli-tools-5.21.4.tar.xz"; + sha256 = "1hvfb0qg6hxbyih665xwki8gbxjljgbw6x2blh2cikp7df66nhh1"; + name = "kde-cli-tools-5.21.4.tar.xz"; }; }; kdecoration = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/kdecoration-5.21.3.tar.xz"; - sha256 = "06a3gsf1lyjxccjzn0ad254wsf7x2bln2i6kyk5j4gwqss6lplf5"; - name = "kdecoration-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/kdecoration-5.21.4.tar.xz"; + sha256 = "003yp803gnsszlnbw1lbh043h8xlrrzg92v7vls8k5cb04ib0p8a"; + name = "kdecoration-5.21.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/kde-gtk-config-5.21.3.tar.xz"; - sha256 = "17fyan2jah059kj1i0sy7h901a4d2k7cc87sd84mskyys7g8vs1h"; - name = "kde-gtk-config-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/kde-gtk-config-5.21.4.tar.xz"; + sha256 = "0g7h1l5q9hdi2iq1kh5aclxjw1ffpq1l020p37k7f251m49440y8"; + name = "kde-gtk-config-5.21.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/kdeplasma-addons-5.21.3.tar.xz"; - sha256 = "1181ax96csn4170p5blvhr679d7l865nby5a66swscyl3a5ys8b1"; - name = "kdeplasma-addons-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/kdeplasma-addons-5.21.4.tar.xz"; + sha256 = "18jny36w6zf4nfqffaqgmdgp4vcaa2civnd2lrrls8jhlz81grid"; + name = "kdeplasma-addons-5.21.4.tar.xz"; }; }; kgamma5 = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/kgamma5-5.21.3.tar.xz"; - sha256 = "0h8rwwd6lyfzmxsr5sfvllh1j8gk1pbq1w2fva8q534qrkqhqb49"; - name = "kgamma5-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/kgamma5-5.21.4.tar.xz"; + sha256 = "1rzn3d7i2i4bba9nfydbsvjqc7wzfz9lgd7qg74k19hzmfiqfhsl"; + name = "kgamma5-5.21.4.tar.xz"; }; }; khotkeys = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/khotkeys-5.21.3.tar.xz"; - sha256 = "1n3ahrb5mzrxap572ydal1sy5q71af97iy4i2fwbljdb6zb1l1bl"; - name = "khotkeys-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/khotkeys-5.21.4.tar.xz"; + sha256 = "05k6b8zilll97s14s50x27dk8p4lzmld95gzgrsv4i81jdvjgx53"; + name = "khotkeys-5.21.4.tar.xz"; }; }; kinfocenter = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/kinfocenter-5.21.3.tar.xz"; - sha256 = "1hj4mnx2mxb1ya7la05frx5c39cp3q7c5f78lnp6p8bkv3ylik72"; - name = "kinfocenter-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/kinfocenter-5.21.4.tar.xz"; + sha256 = "150kfx4cb10zjsaqkyidh1qis5644849xfqfnd5ldwsn07nkyp1y"; + name = "kinfocenter-5.21.4.tar.xz"; }; }; kmenuedit = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/kmenuedit-5.21.3.tar.xz"; - sha256 = "0fc3sal11amaj5ydws86hdmc45zhrxkv6lc5sfy200wvff3ynjjj"; - name = "kmenuedit-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/kmenuedit-5.21.4.tar.xz"; + sha256 = "1hmqji2ahkw3knv7pcj5m86zlmxmbsz98xv2igdx2gv6hrjbn8nh"; + name = "kmenuedit-5.21.4.tar.xz"; }; }; kscreen = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/kscreen-5.21.3.tar.xz"; - sha256 = "1f9gxdlj883ddmc1xgd1nmm8n6m5yd269kfx3m9bbp61cw4hrqlm"; - name = "kscreen-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/kscreen-5.21.4.tar.xz"; + sha256 = "1n9ymmysdfipwwi3f6ixg1kh3pkbp5wvi2y8fli0cpjdbrfj5lfr"; + name = "kscreen-5.21.4.tar.xz"; }; }; kscreenlocker = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/kscreenlocker-5.21.3.tar.xz"; - sha256 = "1hjlpwwca9nrdwgsiy5ss5ainr1fy1wfvi4g599cvijb77qc84h0"; - name = "kscreenlocker-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/kscreenlocker-5.21.4.tar.xz"; + sha256 = "1z94p93khl2b8zz965d6wdd4vi1q60f0s2a7ca9ph06gp8d574k4"; + name = "kscreenlocker-5.21.4.tar.xz"; }; }; ksshaskpass = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/ksshaskpass-5.21.3.tar.xz"; - sha256 = "16c2kzdmw3viphaygdff29cvi06r53ag4a6hkxw15yrscw31n3ns"; - name = "ksshaskpass-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/ksshaskpass-5.21.4.tar.xz"; + sha256 = "0zj4160xs940b9rin43b0a3j6czm3n04drg484y1h2mfqjflgc61"; + name = "ksshaskpass-5.21.4.tar.xz"; }; }; ksysguard = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/ksysguard-5.21.3.tar.xz"; - sha256 = "0ys1idjqb9n67czdhlds6mhhiizxq8qq4rmds9nq8cm961g5kqsf"; - name = "ksysguard-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/ksysguard-5.21.4.tar.xz"; + sha256 = "10p5bb80rcawd0qdm4f17whmqrfhzhv6hd20d57f1i9m7ijq456d"; + name = "ksysguard-5.21.4.tar.xz"; }; }; kwallet-pam = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/kwallet-pam-5.21.3.tar.xz"; - sha256 = "1dnni2k4ry11mfjnfc0i44zww3glhsbr70qnpkl9dsf5rj4dcwj3"; - name = "kwallet-pam-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/kwallet-pam-5.21.4.tar.xz"; + sha256 = "0s3wy9qikciblr6g98kn6s4ii5pnqwcngzng0czr3r4p90w33kkg"; + name = "kwallet-pam-5.21.4.tar.xz"; }; }; kwayland-integration = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/kwayland-integration-5.21.3.tar.xz"; - sha256 = "0kqw5dbsxmdm5fi34yq718ngkx5j23211jh4l9vl029qgbi42xhc"; - name = "kwayland-integration-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/kwayland-integration-5.21.4.tar.xz"; + sha256 = "1r3fmmzmdyfdam4hsjvjv3wss5zvyi674xsyn6csclmq3jwfz70k"; + name = "kwayland-integration-5.21.4.tar.xz"; }; }; kwayland-server = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/kwayland-server-5.21.3.tar.xz"; - sha256 = "0d3asblzz9c7cbjfdk33z26hn5n14rdrc3s9jm9awvcc1sd122a4"; - name = "kwayland-server-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/kwayland-server-5.21.4.tar.xz"; + sha256 = "1mkivw3siyxhgyhrm6fkqmp2wiswckrb433q87dh1j9gp7kg8cpz"; + name = "kwayland-server-5.21.4.tar.xz"; }; }; kwin = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/kwin-5.21.3.tar.xz"; - sha256 = "0ni0ipfm0hp90sq03m1a5lm6shxb2cf9j1a4kiqpaf7n62ch8f3w"; - name = "kwin-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/kwin-5.21.4.tar.xz"; + sha256 = "0br3hxnbqm2vyxcxind01784zd88bkhpz6ira03g3gjq7hlwzjx9"; + name = "kwin-5.21.4.tar.xz"; }; }; kwrited = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/kwrited-5.21.3.tar.xz"; - sha256 = "01nn94qmi8q38rdv694d9qs7zahsziclmkw49zy0wlffq4ivpk6x"; - name = "kwrited-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/kwrited-5.21.4.tar.xz"; + sha256 = "1hrsy1r7b7sgnj0l8zn1yxlrfhrrbk8rq2frbfi329fk3psca247"; + name = "kwrited-5.21.4.tar.xz"; }; }; libkscreen = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/libkscreen-5.21.3.tar.xz"; - sha256 = "1j2d1xpn48ks0wk9vvnvj9r03bc0ggrqvblyhs30p31svfihjs3a"; - name = "libkscreen-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/libkscreen-5.21.4.tar.xz"; + sha256 = "0b0mlc1lzfbkpzxs8rd7s7q5xmqla6p1q1jdnjxly3wj60pas2dc"; + name = "libkscreen-5.21.4.tar.xz"; }; }; libksysguard = { - version = "5.21.3.1"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/libksysguard-5.21.3.1.tar.xz"; - sha256 = "0nayjihapn71wrnzfb4wv9laafysl0x6sn98sbwhclapbdvxnw73"; - name = "libksysguard-5.21.3.1.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/libksysguard-5.21.4.tar.xz"; + sha256 = "0sziqldjwcwpblkn7mn4w9xg34lv9pzdlc87andka4g1lxcln2gc"; + name = "libksysguard-5.21.4.tar.xz"; }; }; milou = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/milou-5.21.3.tar.xz"; - sha256 = "0qbk0y783n7f7pl0akx252vyblrrgmsg5yr7ncaijq4x4l90f1yf"; - name = "milou-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/milou-5.21.4.tar.xz"; + sha256 = "0y6mvzc5prgg1n7z2gzv1b7ngh0fygggrhdbk5wvpy6zp8yanwka"; + name = "milou-5.21.4.tar.xz"; }; }; oxygen = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/oxygen-5.21.3.tar.xz"; - sha256 = "16yj1qx4mbi62brkn8wkcr6sz5dkbl2pf49zc1hadnxfm9wd3z0a"; - name = "oxygen-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/oxygen-5.21.4.tar.xz"; + sha256 = "1d7cdpy3k7zyg3k6n6jz2473cqhbi7npgnpka4kc2lfjrkb9s0zj"; + name = "oxygen-5.21.4.tar.xz"; }; }; plasma-browser-integration = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/plasma-browser-integration-5.21.3.tar.xz"; - sha256 = "1hz996lv3vvp1zldzpkb9dmvnn94v69j2vq9sfs446c25ggf9d6y"; - name = "plasma-browser-integration-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/plasma-browser-integration-5.21.4.tar.xz"; + sha256 = "14yna45ykfa88a17iy4c5qkd673ay818693qqn13s4zwkxriby3n"; + name = "plasma-browser-integration-5.21.4.tar.xz"; }; }; plasma-desktop = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/plasma-desktop-5.21.3.tar.xz"; - sha256 = "0bryk523qfzb5max1h460d67ir6xbrsws9bq72bdfbv1wkv64kyy"; - name = "plasma-desktop-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/plasma-desktop-5.21.4.tar.xz"; + sha256 = "1drv50601030xvskkw1pa5hi5ngrx2i8lkj7m8i9pym8zy15qqy9"; + name = "plasma-desktop-5.21.4.tar.xz"; }; }; plasma-disks = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/plasma-disks-5.21.3.tar.xz"; - sha256 = "18a7dppfhb2wpb7sfhnayq96bxjlzygdz7sppcjikxil8klhv1aq"; - name = "plasma-disks-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/plasma-disks-5.21.4.tar.xz"; + sha256 = "1hjihh088v1w03lpz5pcz6pycbpd8b8kh54a44pq7zkhh6l6n65g"; + name = "plasma-disks-5.21.4.tar.xz"; }; }; plasma-firewall = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/plasma-firewall-5.21.3.tar.xz"; - sha256 = "0bzmcakzwiimc90bbpih1z5isrcfhdfwlslp4q3v3npppnivv9bw"; - name = "plasma-firewall-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/plasma-firewall-5.21.4.tar.xz"; + sha256 = "1in9maphksc7ajj6jhy0qxgw5f7fy4m23dpik6wvxc5r3v5b76z7"; + name = "plasma-firewall-5.21.4.tar.xz"; }; }; plasma-integration = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/plasma-integration-5.21.3.tar.xz"; - sha256 = "09dlbfildd8wl0nbss84yibljyl6cadx95q8q4n0c5wymyc4zqy1"; - name = "plasma-integration-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/plasma-integration-5.21.4.tar.xz"; + sha256 = "0bj2k5c4170apy7ascfdqc052jm35pi2w5zb3m39qb5b7ylq1hhw"; + name = "plasma-integration-5.21.4.tar.xz"; }; }; plasma-nano = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/plasma-nano-5.21.3.tar.xz"; - sha256 = "1yqn29769nnfhiyqbpv15c0zxvkfzq4yvk9x9qlchbcwjc1gr23j"; - name = "plasma-nano-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/plasma-nano-5.21.4.tar.xz"; + sha256 = "0v5vr5di9bk57g2xi442qj8yv9219mdpc0l0n2bsvbb8x4f0d5qk"; + name = "plasma-nano-5.21.4.tar.xz"; }; }; plasma-nm = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/plasma-nm-5.21.3.tar.xz"; - sha256 = "0d7v757kzd0pcvlz201m0njcz9y8j0bqkwbzdz3gik9s7x6rl73p"; - name = "plasma-nm-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/plasma-nm-5.21.4.tar.xz"; + sha256 = "1gy1drykjyipmrpqbb7yk2232g5hzy316gkmr45invgfg3fizl73"; + name = "plasma-nm-5.21.4.tar.xz"; }; }; plasma-pa = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/plasma-pa-5.21.3.tar.xz"; - sha256 = "16z9xzn5swrzz86yd8lykjphs92ghdsahfxjv0v9nj3ca24kfibp"; - name = "plasma-pa-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/plasma-pa-5.21.4.tar.xz"; + sha256 = "1rcghgqvasldmpianxhn980kc3nw1knmdlmxz52kngnpnimmqmz9"; + name = "plasma-pa-5.21.4.tar.xz"; }; }; plasma-phone-components = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/plasma-phone-components-5.21.3.tar.xz"; - sha256 = "1dhv0gdyk47dl8il6zwjdz84jmz2d4ppfyifzc2rzf0ys934scn0"; - name = "plasma-phone-components-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/plasma-phone-components-5.21.4.tar.xz"; + sha256 = "08dpch4c6q59c9ys4n4w1hky09886hi1wqxgwwr4lyp02g3xmwbd"; + name = "plasma-phone-components-5.21.4.tar.xz"; }; }; plasma-sdk = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/plasma-sdk-5.21.3.tar.xz"; - sha256 = "0asbb7j5b8c4kixw1yf7mdfyd8gjrf57gdb2wfs1npasak0dw84w"; - name = "plasma-sdk-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/plasma-sdk-5.21.4.tar.xz"; + sha256 = "1cn0lq3d5ipmlwkjzarm7s5ipx6ybjv9cz93pnpxkfxlbi47q0s0"; + name = "plasma-sdk-5.21.4.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/plasma-systemmonitor-5.21.3.tar.xz"; - sha256 = "1w1xzqmpzk016f8rkyx6cvm6lng3h177c441hird13n6v147l7ll"; - name = "plasma-systemmonitor-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/plasma-systemmonitor-5.21.4.tar.xz"; + sha256 = "16mrq66qripffnj4gskzb6l52hqw9siqr8cwxq618cwk5g7hg544"; + name = "plasma-systemmonitor-5.21.4.tar.xz"; }; }; plasma-tests = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/plasma-tests-5.21.3.tar.xz"; - sha256 = "000iwijpxxicixy5zbbgfs96h988x1d4wvjw90vagjw4hj361dk8"; - name = "plasma-tests-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/plasma-tests-5.21.4.tar.xz"; + sha256 = "0mxl3laym3wlhqnq7pmjm1g9mm0r306dnsr3yjl5mmhdx3dwb165"; + name = "plasma-tests-5.21.4.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/plasma-thunderbolt-5.21.3.tar.xz"; - sha256 = "1j0nb9p5wbgksxy19bxsz9ni9ys40r4arvs8rl8pvvv9hndqhndm"; - name = "plasma-thunderbolt-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/plasma-thunderbolt-5.21.4.tar.xz"; + sha256 = "10r90hjm1ykigy587kdna6cydbbh9y4h7rbifx2r5rjzkhp9mihd"; + name = "plasma-thunderbolt-5.21.4.tar.xz"; }; }; plasma-vault = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/plasma-vault-5.21.3.tar.xz"; - sha256 = "1q59q6y8gx4qbp1a5nbsg8zmrdljacfqd3i5n214nlj6al13sg9j"; - name = "plasma-vault-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/plasma-vault-5.21.4.tar.xz"; + sha256 = "13d4z2g34skhw11wykhwyigdzxpa12pgq01i30km5cyp0idi6xy5"; + name = "plasma-vault-5.21.4.tar.xz"; }; }; plasma-workspace = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/plasma-workspace-5.21.3.tar.xz"; - sha256 = "1djanxc7mslw9hnbzlngf6pflc6byjzqb14ibilg3fxsir2jwq40"; - name = "plasma-workspace-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/plasma-workspace-5.21.4.tar.xz"; + sha256 = "1m98ssdq4vzhlqazd87qmgryi3fhmp68y47qw95yhaxnf12ih2xs"; + name = "plasma-workspace-5.21.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/plasma-workspace-wallpapers-5.21.3.tar.xz"; - sha256 = "1qjkk3qfzz1id898kmx7xx6rr6p77y0jfwkjyf26abk51bdfk9lm"; - name = "plasma-workspace-wallpapers-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/plasma-workspace-wallpapers-5.21.4.tar.xz"; + sha256 = "1myqz90b1fcmzgq08a15mlikn83iv6hflmdw7985419w7cly81n7"; + name = "plasma-workspace-wallpapers-5.21.4.tar.xz"; }; }; plymouth-kcm = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/plymouth-kcm-5.21.3.tar.xz"; - sha256 = "0wmpvb06z0js50c9jpv61jlxbx9sf1f5lidzs5v4xs31shxc9sbg"; - name = "plymouth-kcm-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/plymouth-kcm-5.21.4.tar.xz"; + sha256 = "1d0na5831azka04n3j78582i3hy5ns1hpdw24y558rly16w80z60"; + name = "plymouth-kcm-5.21.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.21.3"; + version = "1-5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/polkit-kde-agent-1-5.21.3.tar.xz"; - sha256 = "06qpkf01665mjr49wyc3f336g6g7l93k8l35q0yyih58i3v04s0v"; - name = "polkit-kde-agent-1-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/polkit-kde-agent-1-5.21.4.tar.xz"; + sha256 = "0lg2ls4fb135p64y3kmkxczrqmqzlzdq4ywsrf58ayi42drghdmj"; + name = "polkit-kde-agent-1-5.21.4.tar.xz"; }; }; powerdevil = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/powerdevil-5.21.3.tar.xz"; - sha256 = "0lk6bvc0mym3x3sd85bsvsxvm82vr40lcx355xjycxskf75c5jzz"; - name = "powerdevil-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/powerdevil-5.21.4.tar.xz"; + sha256 = "0i84k7dv8nvww0pfly2d7mplydjgzdkh14sd17113rlwzyfp5wf6"; + name = "powerdevil-5.21.4.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/qqc2-breeze-style-5.21.3.tar.xz"; - sha256 = "1ydvirjrkjbwfc2faz74dd9zlmfz18fa3cig143gna9rfr5api54"; - name = "qqc2-breeze-style-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/qqc2-breeze-style-5.21.4.tar.xz"; + sha256 = "0ny9i75zm0j4m103kazs6lnny8lcmisgl6kmyvjwsnxfl0wfrdww"; + name = "qqc2-breeze-style-5.21.4.tar.xz"; }; }; sddm-kcm = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/sddm-kcm-5.21.3.tar.xz"; - sha256 = "1flqgfpiz66s7dsw1k95zdrbj7ka09r0i2pcdygnrwlls5yvqljz"; - name = "sddm-kcm-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/sddm-kcm-5.21.4.tar.xz"; + sha256 = "00940pi4x7is88w6b25f5chqhi97xqvnmn92jzy629p1g8zg75ik"; + name = "sddm-kcm-5.21.4.tar.xz"; }; }; systemsettings = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/systemsettings-5.21.3.tar.xz"; - sha256 = "08ynlg282x1klgpd43mh3ng4m579iq9hjlln96fqaw19g7x1i58x"; - name = "systemsettings-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/systemsettings-5.21.4.tar.xz"; + sha256 = "017d42fdb8dn1srni4lvdyvraaflybbcwkdgdl98vwyv9hw0qjq3"; + name = "systemsettings-5.21.4.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.21.3"; + version = "5.21.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.3/xdg-desktop-portal-kde-5.21.3.tar.xz"; - sha256 = "05r1kbw39jmj2gfn42052y779l0k89kxh7xynw07igr7c5mxy4ih"; - name = "xdg-desktop-portal-kde-5.21.3.tar.xz"; + url = "${mirror}/stable/plasma/5.21.4/xdg-desktop-portal-kde-5.21.4.tar.xz"; + sha256 = "01klvbvivw2zd478vj7bq0dn7l5mwsrqhnkj8hd5vc9xcaq6kgzg"; + name = "xdg-desktop-portal-kde-5.21.4.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix index 22fdd00cb2..33666c53bb 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -1,16 +1,19 @@ -{ mkXfceDerivation, gobject-introspection, vala, gtk3, gtksourceview4, xfconf }: +{ mkXfceDerivation, gobject-introspection, gtk3, gtksourceview4, gspell }: mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.5.4"; + version = "0.5.5"; odd-unstable = false; - sha256 = "0yrmjs6cyzm08jz8wzrx8wdxj7zdbxn6x625109ckfcfxrkp4a2f"; + sha256 = "1c985xb3395bn1024qhqqdnlkbn02zldsnybxsw49xqh55pa4a2n"; - nativeBuildInputs = [ gobject-introspection vala ]; + nativeBuildInputs = [ gobject-introspection ]; - buildInputs = [ gtk3 gtksourceview4 xfconf ]; + buildInputs = [ gtk3 gtksourceview4 gspell ]; + + # Use the GSettings keyfile backend rather than DConf + configureFlags = [ "--enable-keyfile-settings" ]; meta = { description = "Simple text editor for Xfce"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix index e220e29f3e..4e6072c711 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix @@ -20,9 +20,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.16.6"; + version = "4.16.8"; - sha256 = "12zqwazsqdmghy4h2c4fwxha069l07d46i512395y22h7n6655rn"; + sha256 = "1r7qkd6l0mgf97m1xnnizm7fkvl4a52r3hsds5z68y6myvb78p18"; nativeBuildInputs = [ docbook_xsl diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix index 0a08d38823..d0b1862c3f 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -1,7 +1,6 @@ { mkXfceDerivation , exo , garcon -, gettext , glib , gobject-introspection , gtk3 @@ -17,9 +16,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.16.2"; + version = "4.16.3"; - sha256 = "0wy66viwjnp1c0lgf90fp3vyqy0f1m1kbfdym8a0yrv2b6sn3958"; + sha256 = "085hxllsf792sgi8nn0qjfj5vclbrw2dgrgzl6gy55lxcbhkml9x"; nativeBuildInputs = [ gobject-introspection @@ -45,9 +44,6 @@ mkXfceDerivation { patches = [ ./xfce4-panel-datadir.patch ]; postPatch = '' - for f in $(find . -name \*.sh); do - substituteInPlace $f --replace gettext ${gettext}/bin/gettext - done substituteInPlace plugins/clock/clock.c \ --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; @@ -56,6 +52,6 @@ mkXfceDerivation { NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; meta = { - description = "Xfce's panel"; + description = "Panel for the Xfce desktop environment"; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/default.nix index 1b7877cd79..6ccd2a0c61 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/default.nix @@ -80,7 +80,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-terminal = callPackage ./applications/xfce4-terminal { }; xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter { - inherit (pkgs.gnome3) libsoup; + inherit (pkgs.gnome) libsoup; }; xfdashboard = callPackage ./applications/xfdashboard {}; @@ -211,7 +211,7 @@ lib.makeScope pkgs.newScope (self: with self; { libxfcegui4 = throw "libxfcegui4 is the deprecated Xfce GUI library. It has been superseded by the libxfce4ui library"; xinitrc = xfce4-session.xinitrc; inherit (pkgs.gnome2) libglade; - inherit (pkgs.gnome3) vte gtksourceview; + inherit (pkgs.gnome) vte gtksourceview; xfce4-mixer-pulse = xfce4-mixer; thunar-bare = thunar.override { thunarPlugins = []; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix index 1f79e0ffb2..d4492948ac 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix @@ -3,16 +3,11 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-clipman-plugin"; - version = "1.6.1"; - sha256 = "03akijvry1n1fkziyvxwcksl4vy4lmnpgd5izjs8jai5sndhsszl"; + version = "1.6.2"; + sha256 = "0pm4pzq3imc0m09mg0zk6kwcn5yzdgiqgdbpws01q3xz58jmb4a6"; buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ]; - postPatch = '' - # exo-csource has been dropped from exo - substituteInPlace panel-plugin/Makefile.am --replace exo-csource xdt-csource - ''; - meta = { description = "Clipboard manager for Xfce panel"; }; diff --git a/third_party/nixpkgs/pkgs/development/arduino/arduino-cli/default.nix b/third_party/nixpkgs/pkgs/development/arduino/arduino-cli/default.nix index 95586d064d..9629d90a34 100644 --- a/third_party/nixpkgs/pkgs/development/arduino/arduino-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/arduino/arduino-cli/default.nix @@ -4,18 +4,18 @@ let pkg = buildGoModule rec { pname = "arduino-cli"; - version = "0.12.1"; + version = "0.18.1"; src = fetchFromGitHub { owner = "arduino"; repo = pname; rev = version; - sha256 = "1jlxs4szss2250zp8rz4bislgnzvqhxyp6z48dhx7zaam03hyf0w"; + sha256 = "sha256-EtkONrP/uaetsdC47WsyQOE71Gsz0wKUiTiYThj8Kq8="; }; subPackages = [ "." ]; - vendorSha256 = "03yj2iar63qm10fw3jh9fvz57c2sqcmngb0mj5jkhbnwf8nl7mhc"; + vendorSha256 = "sha256-kPIhG6lsH+0IrYfdlzdv/X/cUQb22Xza9Q6ywjKae/4="; doCheck = false; @@ -32,15 +32,20 @@ let }; +in +if stdenv.isLinux then # buildFHSUserEnv is needed because the arduino-cli downloads compiler # toolchains from the internet that have their interpreters pointed at # /lib64/ld-linux-x86-64.so.2 -in buildFHSUserEnv { - inherit (pkg) name meta; + buildFHSUserEnv + { + inherit (pkg) name meta; - runScript = "${pkg.outPath}/bin/arduino-cli"; + runScript = "${pkg.outPath}/bin/arduino-cli"; - extraInstallCommands = '' - mv $out/bin/$name $out/bin/arduino-cli - ''; -} + extraInstallCommands = '' + mv $out/bin/$name $out/bin/arduino-cli + ''; + } +else + pkg diff --git a/third_party/nixpkgs/pkgs/development/arduino/platformio/core.nix b/third_party/nixpkgs/pkgs/development/arduino/platformio/core.nix index 17e87f2cb6..ee8bbeabbf 100644 --- a/third_party/nixpkgs/pkgs/development/arduino/platformio/core.nix +++ b/third_party/nixpkgs/pkgs/development/arduino/platformio/core.nix @@ -1,9 +1,25 @@ -{ stdenv, lib, buildPythonApplication, bottle -, click, click-completion, colorama, semantic-version -, lockfile, pyserial, requests -, tabulate, pyelftools, marshmallow -, pytest, tox, jsondiff -, git, spdx-license-list-data +{ stdenv, lib, buildPythonApplication +, ajsonrpc +, bottle +, click +, click-completion +, colorama +, git +, jsondiff +, lockfile +, marshmallow +, pyelftools +, pyserial +, pytest +, requests +, semantic-version +, spdx-license-list-data +, starlette +, tabulate +, tox +, uvicorn +, wsproto +, zeroconf , version, src }: @@ -78,10 +94,24 @@ in buildPythonApplication rec { pname = "platformio"; inherit version src; - propagatedBuildInputs = [ - bottle click click-completion colorama git - lockfile pyserial requests semantic-version - tabulate pyelftools marshmallow + propagatedBuildInputs = [ + ajsonrpc + bottle + click + click-completion + colorama + git + lockfile + marshmallow + pyelftools + pyserial + requests + semantic-version + starlette + tabulate + uvicorn + wsproto + zeroconf ]; HOME = "/tmp"; @@ -105,6 +135,9 @@ in buildPythonApplication rec { postPatch = '' substitute platformio/package/manifest/schema.py platformio/package/manifest/schema.py \ --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data}' + + substituteInPlace setup.py \ + --replace "zeroconf==0.28.*" "zeroconf" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/arduino/platformio/default.nix b/third_party/nixpkgs/pkgs/development/arduino/platformio/default.nix index 194385e795..312c2d1044 100644 --- a/third_party/nixpkgs/pkgs/development/arduino/platformio/default.nix +++ b/third_party/nixpkgs/pkgs/development/arduino/platformio/default.nix @@ -4,14 +4,14 @@ let callPackage = newScope self; - version = "5.0.4"; + version = "5.1.1"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "15jnhlhkk9z6cyzxw065r3080dqan951klwf65p152vfzg79wf84"; + sha256 = "1m9vq5r4g04n3ckmb3hrrc4ar5v31k6isc76bw4glrn2xb7r8c00"; }; self = { diff --git a/third_party/nixpkgs/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch b/third_party/nixpkgs/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch index 511d81c3b0..e0016adcf7 100644 --- a/third_party/nixpkgs/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch +++ b/third_party/nixpkgs/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch @@ -1,11 +1,15 @@ diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py -index f293ba5a..a818271f 100644 +index addc4c5..514b0ad 100644 --- a/platformio/package/manifest/schema.py +++ b/platformio/package/manifest/schema.py -@@ -252,5 +252,4 @@ class ManifestSchema(BaseSchema): +@@ -253,9 +253,4 @@ class ManifestSchema(BaseSchema): @staticmethod @memoized(expire="1h") def load_spdx_licenses(): -- spdx_data_url = "https://dl.bintray.com/platformio/dl-misc/spdx-licenses-3.json" +- version = "3.12" +- spdx_data_url = ( +- "https://raw.githubusercontent.com/spdx/license-list-data/" +- "v%s/json/licenses.json" % version +- ) - return json.loads(fetch_remote_content(spdx_data_url)) + return json.load(open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json")) diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/build-mix.nix b/third_party/nixpkgs/pkgs/development/beam-modules/build-mix.nix new file mode 100644 index 0000000000..7e19f19a09 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/beam-modules/build-mix.nix @@ -0,0 +1,85 @@ +{ stdenv, writeText, elixir, erlang, hex, lib }: + +{ name +, version +, src +, buildInputs ? [ ] +, beamDeps ? [ ] +, propagatedBuildInputs ? [ ] +, postPatch ? "" +, compilePorts ? false +, meta ? { } +, enableDebugInfo ? false +, mixEnv ? "prod" +, ... +}@attrs: + +with lib; +let + shell = drv: stdenv.mkDerivation { + name = "interactive-shell-${drv.name}"; + buildInputs = [ drv ]; + }; + + pkg = self: stdenv.mkDerivation (attrs // { + name = "${name}-${version}"; + inherit version; + inherit src; + + MIX_ENV = mixEnv; + MIX_DEBUG = if enableDebugInfo then 1 else 0; + HEX_OFFLINE = 1; + + # stripping does not have any effect on beam files + dontStrip = true; + + # add to ERL_LIBS so other modules can find at runtime. + # http://erlang.org/doc/man/code.html#code-path + # Mix also searches the code path when compiling with the --no-deps-check + # flag, which is why there is no complicated booterstrapper like the one + # used by buildRebar3. + setupHook = attrs.setupHook or + writeText "setupHook.sh" '' + addToSearchPath ERL_LIBS "$1/lib/erlang/lib" + ''; + + buildInputs = buildInputs ++ [ elixir hex ]; + propagatedBuildInputs = propagatedBuildInputs ++ beamDeps; + + buildPhase = attrs.buildPhase or '' + runHook preBuild + export HEX_HOME="$TEMPDIR/hex" + export MIX_HOME="$TEMPDIR/mix" + mix compile --no-deps-check + runHook postBuild + ''; + + installPhase = attrs.installPhase or '' + runHook preInstall + + # This uses the install path convention established by nixpkgs maintainers + # for all beam packages. Changing this will break compatibility with other + # builder functions like buildRebar3 and buildErlangMk. + mkdir -p "$out/lib/erlang/lib/${name}-${version}" + + # Some packages like db_connection will use _build/shared instead of + # honoring the $MIX_ENV variable. + for reldir in _build/{$MIX_ENV,shared}/lib/${name}/{src,ebin,priv,include} ; do + if test -d $reldir ; then + # Some builds produce symlinks (eg: phoenix priv dircetory). They must + # be followed with -H flag. + cp -Hrt "$out/lib/erlang/lib/${name}-${version}" "$reldir" + fi + done + + runHook postInstall + ''; + + passthru = { + packageName = name; + env = shell self; + inherit beamDeps; + }; + }); +in +fix pkg diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/build-rebar3.nix b/third_party/nixpkgs/pkgs/development/beam-modules/build-rebar3.nix index 2e2f0a50b3..dc882a1331 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/build-rebar3.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/build-rebar3.nix @@ -1,12 +1,10 @@ -{ stdenv, writeText, erlang, rebar3, openssl, libyaml, - pc, lib }: +{ stdenv, writeText, erlang, rebar3WithPlugins, openssl, libyaml, lib }: { name, version , src , setupHook ? null , buildInputs ? [], beamDeps ? [], buildPlugins ? [] , postPatch ? "" -, compilePorts ? false , installPhase ? null , buildPhase ? null , configurePhase ? null @@ -19,7 +17,9 @@ with lib; let debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info"; - ownPlugins = buildPlugins ++ (if compilePorts then [pc] else []); + rebar3 = rebar3WithPlugins { + plugins = buildPlugins; + }; shell = drv: stdenv.mkDerivation { name = "interactive-shell-${drv.name}"; @@ -36,13 +36,9 @@ let inherit version; buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ]; - propagatedBuildInputs = unique (beamDeps ++ ownPlugins); + propagatedBuildInputs = unique beamDeps; dontStrip = true; - # The following are used by rebar3-nix-bootstrap - inherit compilePorts; - buildPlugins = ownPlugins; - inherit src; setupHook = writeText "setupHook.sh" '' @@ -53,18 +49,9 @@ let rm -f rebar rebar3 '' + postPatch; - configurePhase = '' - runHook preConfigure - ${erlang}/bin/escript ${rebar3.bootstrapper} ${debugInfoFlag} - runHook postConfigure - ''; - buildPhase = '' runHook preBuild - HOME=. rebar3 compile - ${if compilePorts then '' - HOME=. rebar3 pc compile - '' else ""} + HOME=. rebar3 bare compile -path "" runHook postBuild ''; @@ -72,10 +59,9 @@ let runHook preInstall mkdir -p "$out/lib/erlang/lib/${name}-${version}" for reldir in src ebin priv include; do - fd="_build/default/lib/${name}/$reldir" - [ -d "$fd" ] || continue - cp -Hrt "$out/lib/erlang/lib/${name}-${version}" "$fd" - success=1 + [ -d "$reldir" ] || continue + # $out/lib/erlang/lib is a convention used in nixpkgs for compiled BEAM packages + cp -Hrt "$out/lib/erlang/lib/${name}-${version}" "$reldir" done runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/default.nix index 6bf9e45e62..601505e1f4 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/default.nix @@ -18,11 +18,12 @@ let inherit callPackage erlang; beamPackages = self; + inherit (callPackage ../tools/build-managers/rebar3 { }) rebar3 rebar3WithPlugins; rebar = callPackage ../tools/build-managers/rebar { }; - rebar3 = callPackage ../tools/build-managers/rebar3 { }; # rebar3 port compiler plugin is required by buildRebar3 pc = callPackage ./pc { }; + rebar3-nix = callPackage ./rebar3-nix { }; fetchHex = callPackage ./fetch-hex.nix { }; @@ -32,9 +33,12 @@ let buildRebar3 = callPackage ./build-rebar3.nix { }; buildHex = callPackage ./build-hex.nix { }; buildErlangMk = callPackage ./build-erlang-mk.nix { }; + buildMix = callPackage ./build-mix.nix { }; fetchMixDeps = callPackage ./fetch-mix-deps.nix { }; mixRelease = callPackage ./mix-release.nix { }; + erlang-ls = callPackage ./erlang-ls { }; + # BEAM-based languages. elixir = elixir_1_11; diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix new file mode 100644 index 0000000000..ff68af8d52 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix @@ -0,0 +1,34 @@ +{ fetchFromGitHub, fetchHex, stdenv, erlang, rebar3WithPlugins, lib }: +let + version = "0.15.0"; + owner = "erlang-ls"; + repo = "erlang_ls"; + deps = import ./rebar-deps.nix { inherit fetchHex fetchFromGitHub; }; +in stdenv.mkDerivation { + inherit version; + pname = "erlang-ls"; + buildInputs = [ erlang (rebar3WithPlugins { }) ]; + src = fetchFromGitHub { + inherit owner repo; + sha256 = "1s6zk8r5plm7ajifz17mvfrnk5mzbhj7alayink9phqbmzrypnfg"; + rev = version; + }; + buildPhase = '' + mkdir _checkouts + ${toString (lib.mapAttrsToList (k: v: '' + cp -R ${v} _checkouts/${k} + '') deps)} + make + ''; + installPhase = '' + mkdir -p $out/bin + cp _build/default/bin/erlang_ls $out/bin/ + cp _build/dap/bin/els_dap $out/bin/ + ''; + meta = with lib; { + homepage = "https://github.com/erlang-ls/erlang_ls"; + description = "The Erlang Language Server"; + platforms = platforms.unix; + license = licenses.asl20; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix new file mode 100644 index 0000000000..9de79e52be --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix @@ -0,0 +1,90 @@ +# Generated by rebar3_nix +{ fetchHex, fetchFromGitHub }: +{ + getopt = fetchHex { + pkg = "getopt"; + version = "1.0.1"; + sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; + }; + zipper = fetchHex { + pkg = "zipper"; + version = "1.0.1"; + sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0="; + }; + quickrand = fetchHex { + pkg = "quickrand"; + version = "2.0.1"; + sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY="; + }; + providers = fetchHex { + pkg = "providers"; + version = "1.8.1"; + sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; + }; + katana_code = fetchHex { + pkg = "katana_code"; + version = "0.2.1"; + sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI="; + }; + bucs = fetchHex { + pkg = "bucs"; + version = "1.0.16"; + sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI="; + }; + yamerl = fetchHex { + pkg = "yamerl"; + version = "0.8.1"; + sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8="; + }; + uuid = fetchHex { + pkg = "uuid_erl"; + version = "2.0.1"; + sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs="; + }; + tdiff = fetchHex { + pkg = "tdiff"; + version = "0.1.2"; + sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU="; + }; + redbug = fetchHex { + pkg = "redbug"; + version = "2.0.6"; + sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ="; + }; + rebar3_format = fetchHex { + pkg = "rebar3_format"; + version = "0.8.2"; + sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM="; + }; + ranch = fetchHex { + pkg = "ranch"; + version = "1.7.1"; + sha256 = "sha256-RR2FJ3h99xbZncNhYvygWTSRXbC2FBu9rC6o08evx9c="; + }; + jsx = fetchHex { + pkg = "jsx"; + version = "3.0.0"; + sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0="; + }; + erlfmt = fetchFromGitHub { + owner = "whatsapp"; + repo = "erlfmt"; + rev = "2e93fc4a646111357642b0179a2a63151868d890"; + sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr"; + }; + ephemeral = fetchHex { + pkg = "ephemeral"; + version = "2.0.4"; + sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA="; + }; + elvis_core = fetchHex { + pkg = "elvis_core"; + version = "1.1.1"; + sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI="; + }; + docsh = fetchHex { + pkg = "docsh"; + version = "0.7.2"; + sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ="; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/pc/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/pc/default.nix index a6d7c1c44d..2896a325e0 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/pc/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/pc/default.nix @@ -2,8 +2,8 @@ buildHex { name = "pc"; - version = "1.6.0"; - sha256 = "0xq411ig5ny3iilkkkqa4vm3w3dgjc9cfzkqwk8pm13dw9mcm8h0"; + version = "1.12.0"; + sha256 = "1gdvixy4j560qjdiv5qjgnl5wl3rrn231dv1m4vdq4b9l4g4p27x"; meta = { description = "a rebar3 port compiler for native code"; diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/rebar3-nix/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/rebar3-nix/default.nix new file mode 100644 index 0000000000..ff248700d7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/beam-modules/rebar3-nix/default.nix @@ -0,0 +1,18 @@ +{ lib, buildRebar3, fetchFromGitHub }: +buildRebar3 rec { + name = "rebar3_nix"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "erlang-nix"; + repo = name; + rev = "v${version}"; + sha256 = "17w8m4aqqgvhpx3xyc7x2qzsrd3ybzc83ay50zs1gyd1b8csh2wf"; + }; + + meta = { + description = "nix integration for rebar3"; + license = lib.licenses.bsd3; + homepage = "https://github.com/erlang-nix/rebar3_nix"; + maintainers = with lib.maintainers; [ dlesl gleber ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index 262e52c252..71a55c6829 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -3,6 +3,7 @@ { swingSupport ? true # not used for now , lib, stdenv , fetchurl +, setJavaClassPath }: let cpuName = stdenv.hostPlatform.parsed.cpu.name; @@ -30,7 +31,11 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name; ln -s $out/Contents/Home/* $out/ + # Propagate the setJavaClassPath setup hook from the JDK so that + # any package that depends on the JDK has $CLASSPATH set up + # properly. mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs # Set JAVA_HOME automatically. cat <> $out/nix-support/setup-hook diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index a433a2f132..e304f67bd7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -5,6 +5,7 @@ , fetchurl , autoPatchelfHook , makeWrapper +, setJavaClassPath # minimum dependencies , alsaLib , fontconfig @@ -74,7 +75,11 @@ let result = stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/57733 find "$out" -name 'libfreetype.so*' -delete + # Propagate the setJavaClassPath setup hook from the JDK so that + # any package that depends on the JDK has $CLASSPATH set up + # properly. mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs # Set JAVA_HOME automatically. cat <> "$out/nix-support/setup-hook" diff --git a/third_party/nixpkgs/pkgs/development/compilers/avian/default.nix b/third_party/nixpkgs/pkgs/development/compilers/avian/default.nix deleted file mode 100644 index d39aa2806a..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/avian/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }: - -stdenv.mkDerivation rec { - pname = "avian"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "readytalk"; - repo = "avian"; - rev = "v${version}"; - sha256 = "1j2y45cpqk3x6a743mgpg7z3ivwm7qc9jy6xirvay7ah1qyxmm48"; - }; - - buildInputs = [ zlib jdk ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Foundation ]; - - NIX_CFLAGS_COMPILE = "-Wno-error"; - - postPatch = '' - substituteInPlace makefile \ - --replace 'g++' 'c++' \ - --replace 'gcc' 'cc' - ''; - - installPhase = '' - mkdir -p $out/bin - cp build/*/avian $out/bin/ - cp build/*/avian-dynamic $out/bin/ - ''; - - meta = { - description = "Lightweight Java virtual machine"; - longDescription = '' - Avian is a lightweight virtual machine and class library designed - to provide a useful subset of Java’s features, suitable for - building self-contained applications. - ''; - homepage = "https://readytalk.github.io/avian/"; - license = lib.licenses.isc; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.earldouglas ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/cc65/default.nix b/third_party/nixpkgs/pkgs/development/compilers/cc65/default.nix index 6e201ac793..03325d2fd6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cc65/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cc65/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { sha256 = "01a15yvs455qp20hri2pbg2wqvcip0d50kb7dibi9427hqk9cnj4"; }; - makeFlags = [ "PREFIX=${placeholder "out"}"]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "CC=${stdenv.cc.targetPrefix}cc" + ]; meta = with lib; { homepage = "https://cc65.github.io/"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/compcert/default.nix b/third_party/nixpkgs/pkgs/development/compilers/compcert/default.nix index 611efb11f4..4679e01e90 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/compcert/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/compcert/default.nix @@ -27,6 +27,33 @@ let param = { }; "3.8" = { sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7"; + patches = [ + # Support for Coq 8.12.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/06956421b4307054af221c118c5f59593c0e67b9.patch"; + sha256 = "1f90q6j3xfvnf3z830bkd4d8526issvmdlrjlc95bfsqs78i1yrl"; + }) + # Support for Coq 8.13.0 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/0895388e7ebf9c9f3176d225107e21968919fb97.patch"; + sha256 = "0qhkzgb2xl5kxys81pldp3mr39gd30lvr2l2wmplij319vp3xavd"; + }) + # Support for Coq 8.13.1 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/6bf310dd678285dc193798e89fc2c441d8430892.patch"; + sha256 = "026ahhvpj5pksy90f8pnxgmhgwfqk4kwyvcf8x3dsanvz98d4pj5"; + }) + # Drop support for Coq < 8.9 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/7563a5df926a4c6fb1489a7a4c847641c8a35095.patch"; + sha256 = "05vkslzy399r3dm6dmjs722rrajnyfa30xsyy3djl52isvn4gyfb"; + }) + # Support for Coq 8.13.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/48bc183167c4ce01a5c9ea86e49d60530adf7290.patch"; + sha256 = "0j62lppfk26d1brdp3qwll2wi4gvpx1k70qivpvby5f7dpkrkax1"; + }) + ]; useExternalFlocq = true; }; }."${version}"; in diff --git a/third_party/nixpkgs/pkgs/development/compilers/copper/default.nix b/third_party/nixpkgs/pkgs/development/compilers/copper/default.nix index dd6af73547..736004fb58 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/copper/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/copper/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://tibleiz.net/copper/"; license = licenses.bsd2; platforms = platforms.x86_64; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix index 58e4b3b355..8fc4a15efc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix @@ -146,7 +146,7 @@ let "CRYSTAL_CONFIG_VERSION=${version}" ]; - LLVM_CONFIG = "${llvmPackages.llvm}/bin/llvm-config"; + LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; FLAGS = [ "--release" diff --git a/third_party/nixpkgs/pkgs/development/compilers/dale/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dale/default.nix index addd7997d3..bf02d623e5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dale/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dale/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "0v4ajrzrqvf279kd7wsd9flrpsav57lzxlwwimk9vnfwh7xpzf9v"; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config llvm_6.dev ]; buildInputs = [ libffi llvm_6 ]; inherit doCheck; diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix index 6981bcbd8f..837855d2bd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix @@ -2,7 +2,7 @@ , haskell, haskellPackages, nodejs , fetchurl, fetchpatch, makeWrapper, writeScriptBin # Rust dependecies -, rustPlatform, openssl, pkg-config, Security +, curl, rustPlatform, openssl, pkg-config, Security }: let fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; @@ -102,7 +102,7 @@ let elmRustPackages = { elm-json = import ./packages/elm-json.nix { - inherit lib rustPlatform fetchurl openssl stdenv pkg-config Security; + inherit curl lib rustPlatform fetchurl openssl stdenv pkg-config Security; } // { meta = with lib; { description = "Install, upgrade and uninstall Elm dependencies"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix index cf0ba2303e..18f4d3aff1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix @@ -1,4 +1,4 @@ -{ mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary +{ mkDerivation, fetchpatch, ansi-terminal, ansi-wl-pprint, base, binary , bytestring, Cabal, cmark, containers, directory, elm-format , fetchgit, filepath, free, HUnit, indents, json, mtl , optparse-applicative, parsec, process, QuickCheck, quickcheck-io @@ -14,6 +14,15 @@ mkDerivation { rev = "63e15bb5ec5f812e248e61b6944189fa4a0aee4e"; fetchSubmodules = true; }; + patches = [ + # Update code after breaking change in optparse-applicative + # https://github.com/zwilias/elm-instrument/pull/5 + (fetchpatch { + name = "update-optparse-applicative.patch"; + url = "https://github.com/mdevlamynck/elm-instrument/commit/c548709d4818aeef315528e842eaf4c5b34b59b4.patch"; + sha256 = "0ln7ik09n3r3hk7jmwwm46kz660mvxfa71120rkbbaib2falfhsc"; + }) + ]; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath process ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.nix index 810c1a91a0..a480b9e0e1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.nix @@ -1,20 +1,20 @@ -{ lib, rustPlatform, fetchurl, openssl, stdenv, pkg-config, Security }: +{ lib, curl, rustPlatform, fetchurl, openssl, stdenv, pkg-config, Security }: rustPlatform.buildRustPackage rec { pname = "elm-json"; - version = "0.2.7"; + version = "0.2.10"; src = fetchurl { url = "https://github.com/zwilias/elm-json/archive/v${version}.tar.gz"; - sha256 = "sha256:1b9bhl7rb01ylqjbfd1ccm26lhk4hzwd383rbg89aj2jwjv0w4hs"; + sha256 = "sha256:03azh7wvl60h6w7ffpvl49s7jr7bxpladcm4fzcasakg26i5a71x"; }; cargoPatches = [ ./elm-json.patch ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ curl openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0ylniriq073kpiykamkn9mxdaa6kyiza4pvf7gnfq2h1dvbqa6z7"; + cargoSha256 = "sha256:01zasrqf1va58i52s3kwdkj1rnwy80gv00xi6npfshjirj3ix07f"; # Tests perform networking and therefore can't work in sandbox doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.patch b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.patch index 70064d0a42..d7f434c8eb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.patch @@ -1,48 +1,43 @@ diff --git a/Cargo.lock b/Cargo.lock -index f4d95f5..6830b3d 100644 +index 5440d72..6e173fa 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -625,14 +625,6 @@ name = "openssl-probe" - version = "0.1.2" +@@ -774,15 +774,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -[[package]] -name = "openssl-src" --version = "111.9.0+1.1.1g" +-version = "111.11.0+1.1.1h" -source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "380fe324132bea01f45239fadfec9343adb044615f29930d039bec1ae7b9fa5b" -dependencies = [ -- "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)", +- "cc", -] - [[package]] name = "openssl-sys" - version = "0.9.56" -@@ -641,7 +633,6 @@ dependencies = [ - "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.70 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-src 111.9.0+1.1.1g (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", - "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + version = "0.9.58" +@@ -792,7 +783,6 @@ dependencies = [ + "autocfg", + "cc", + "libc", +- "openssl-src", + "pkg-config", + "vcpkg", ] -@@ -1162,7 +1153,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - "checksum object 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2" - "checksum once_cell 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" - "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" --"checksum openssl-src 111.9.0+1.1.1g (registry+https://github.com/rust-lang/crates.io-index)" = "a2dbe10ddd1eb335aba3780eb2eaa13e1b7b441d2562fd962398740927f39ec4" - "checksum openssl-sys 0.9.56 (registry+https://github.com/rust-lang/crates.io-index)" = "f02309a7f127000ed50594f0b50ecc69e7c654e16d41b4e8156d1b3df8e0b52e" - "checksum petgraph 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29c127eea4a29ec6c85d153c59dc1213f33ec74cead30fe4730aecc88cc1fd92" - "checksum pin-project 0.4.17 (registry+https://github.com/rust-lang/crates.io-index)" = "edc93aeee735e60ecb40cf740eb319ff23eab1c5748abfdb5c180e4ce49f7791" diff --git a/Cargo.toml b/Cargo.toml -index adfab25..37ae0c2 100644 +index 4d319f2..6f4d0e5 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -21,7 +21,7 @@ colored = "1.9" +@@ -21,8 +21,8 @@ colored = "2.0" dialoguer = "0.6" - dirs = "2.0" + dirs = "3.0" fs2 = "0.4" -isahc = { version = "0.9", features = ["static-ssl"] } +-curl = {version = "0.4", features = ["static-curl", "static-ssl", "force-system-lib-on-osx", "http2"]} +isahc = "0.9" ++curl = {version = "0.4", features = ["force-system-lib-on-osx", "http2"]} + ctrlc = "3.1" + console = "0.12" - [dev-dependencies] - assert_cmd = "0.11" diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix index 1502b09cca..aebe7b30f1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix @@ -4,6 +4,7 @@ , langObjC ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin , langGo ? false +, reproducibleBuild ? true , profiledCompiler ? false , langJit ? false , staticCompiler ? false @@ -48,11 +49,15 @@ assert langAda -> gnatboot != null; # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; +# profiledCompiler builds inject non-determinism in one of the compilation stages. +# If turned on, we can't provide reproducible builds anymore +assert reproducibleBuild -> profiledCompiler == false; + with lib; with builtins; let majorVersion = "10"; - version = "${majorVersion}.2.0"; + version = "${majorVersion}.3.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -85,7 +90,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "130xdkhmz1bc2kzx061s3sfwk36xah1fw5w332c0nzwwpdl47pdq"; + sha256 = "0i6378ig6h397zkhd7m4ccwjx5alvzrf2hm27p1pzwjhlv0h9x34"; }; inherit patches; @@ -181,13 +186,12 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform gnatboot langAda langGo langJit; + inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit; }; dontDisableStatic = true; - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" "target" ]; configureFlags = import ../common/configure-flags.nix { inherit diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix index 3a9f50be3e..c9d8663c0c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix @@ -68,7 +68,7 @@ let majorVersion = "11"; url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; sha256 = ""; # TODO: uncomment and check hash when available. }) */ - ++ optional langAda ../gnat-cflags.patch + ++ optional langAda ../gnat-cflags-11.patch ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch @@ -186,7 +186,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform gnatboot langAda langGo langJit; + inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit; }; dontDisableStatic = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix index 6a2121a829..86dd9247f5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix @@ -4,6 +4,7 @@ , langObjCpp ? stdenv.targetPlatform.isDarwin , langJava ? false , langGo ? false +, reproducibleBuild ? true , profiledCompiler ? false , langJit ? false , staticCompiler ? false @@ -58,6 +59,10 @@ assert langGo -> langCC; # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; +# profiledCompiler builds inject non-determinism in one of the compilation stages. +# If turned on, we can't provide reproducible builds anymore +assert reproducibleBuild -> profiledCompiler == false; + with lib; with builtins; @@ -191,13 +196,12 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform langJava langGo; + inherit version targetPlatform hostPlatform langJava langGo; }; dontDisableStatic = true; - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" "target" ]; configureFlags = import ../common/configure-flags.nix { inherit diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix index 709288559d..b7c9e5bcc0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix @@ -4,6 +4,7 @@ , langObjCpp ? stdenv.targetPlatform.isDarwin , langJava ? false , langGo ? false +, reproducibleBuild ? true , profiledCompiler ? false , langJit ? false , staticCompiler ? false @@ -58,6 +59,10 @@ assert langGo -> langCC; # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; +# profiledCompiler builds inject non-determinism in one of the compilation stages. +# If turned on, we can't provide reproducible builds anymore +assert reproducibleBuild -> profiledCompiler == false; + with lib; with builtins; @@ -204,13 +209,12 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform langJava langGo; + inherit version targetPlatform hostPlatform langJava langGo; }; dontDisableStatic = true; - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" "target" ]; configureFlags = import ../common/configure-flags.nix { inherit diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix index 93c9dde61f..069d9c18a6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix @@ -5,6 +5,7 @@ , langObjCpp ? stdenv.targetPlatform.isDarwin , langJava ? false , langGo ? false +, reproducibleBuild ? true , profiledCompiler ? false , langJit ? false , staticCompiler ? false @@ -61,6 +62,10 @@ assert langAda -> gnatboot != null; # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; +# profiledCompiler builds inject non-determinism in one of the compilation stages. +# If turned on, we can't provide reproducible builds anymore +assert reproducibleBuild -> profiledCompiler == false; + with lib; with builtins; @@ -227,13 +232,12 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform gnatboot langJava langAda langGo; + inherit version targetPlatform hostPlatform gnatboot langJava langAda langGo; }; dontDisableStatic = true; - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" "target" ]; configureFlags = import ../common/configure-flags.nix { inherit diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix index d9b4c639b5..1f153b0fb3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix @@ -3,6 +3,7 @@ , langObjC ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin , langGo ? false +, reproducibleBuild ? true , profiledCompiler ? false , langJit ? false , staticCompiler ? false @@ -45,6 +46,10 @@ assert langGo -> langCC; # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; +# profiledCompiler builds inject non-determinism in one of the compilation stages. +# If turned on, we can't provide reproducible builds anymore +assert reproducibleBuild -> profiledCompiler == false; + with lib; with builtins; @@ -192,13 +197,12 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform langGo; + inherit version targetPlatform hostPlatform langGo; }; dontDisableStatic = true; - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" "target" ]; configureFlags = import ../common/configure-flags.nix { inherit diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix index 4edc034720..4d9e216947 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix @@ -3,6 +3,7 @@ , langObjC ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin , langGo ? false +, reproducibleBuild ? true , profiledCompiler ? false , langJit ? false , staticCompiler ? false @@ -45,6 +46,10 @@ assert langGo -> langCC; # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; +# profiledCompiler builds inject non-determinism in one of the compilation stages. +# If turned on, we can't provide reproducible builds anymore +assert reproducibleBuild -> profiledCompiler == false; + with lib; with builtins; @@ -178,13 +183,12 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform langGo; + inherit version targetPlatform hostPlatform langGo; }; dontDisableStatic = true; - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" "target" ]; configureFlags = import ../common/configure-flags.nix { inherit diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix index ca92a8f484..09cf7e98db 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix @@ -5,6 +5,7 @@ , langObjCpp ? stdenv.targetPlatform.isDarwin , langD ? false , langGo ? false +, reproducibleBuild ? true , profiledCompiler ? false , langJit ? false , staticCompiler ? false @@ -54,6 +55,10 @@ assert langAda -> gnatboot != null; # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; +# profiledCompiler builds inject non-determinism in one of the compilation stages. +# If turned on, we can't provide reproducible builds anymore +assert reproducibleBuild -> profiledCompiler == false; + with lib; with builtins; @@ -195,13 +200,12 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform gnatboot langAda langGo langJit; + inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit; }; dontDisableStatic = true; - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" "target" ]; configureFlags = import ../common/configure-flags.nix { inherit diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix index 7f7a40f336..42deb970df 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -44,6 +44,9 @@ let crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; + targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + "${stdenv.targetPlatform.config}-"; + crossConfigureFlags = # Ensure that -print-prog-name is able to find the correct programs. [ @@ -112,6 +115,18 @@ let # Basic configuration ++ [ + # Force target prefix. The behavior if `--target` and `--host` + # are specified is inconsistent: Sometimes specifying `--target` + # always causes a prefix to be generated, sometimes it's only + # added if the `--host` and `--target` differ. This means that + # sometimes there may be a prefix even though nixpkgs doesn't + # expect one and sometimes there may be none even though nixpkgs + # expects one (since not all information is serialized into the + # config attribute). The easiest way out of these problems is to + # always set the program prefix, so gcc will conform to our + # expectations. + "--program-prefix=${targetPrefix}" + (lib.enableFeature enableLTO "lto") "--disable-libstdcxx-pch" "--without-included-gettext" diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix index 1c65b4a8ba..d9977e0ba2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -1,4 +1,4 @@ -{ lib, version, hostPlatform +{ lib, version, hostPlatform, targetPlatform , gnatboot ? null , langAda ? false , langJava ? false @@ -58,3 +58,10 @@ lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' + lib.optionalString (hostPlatform.isDarwin && langJit) '' export STRIP='strip -x' '' + +# HACK: if host and target config are the same, but the platforms are +# actually different we need to convince the configure script that it +# is in fact building a cross compiler although it doesn't believe it. ++ lib.optionalString (targetPlatform.config == hostPlatform.config && targetPlatform != hostPlatform) '' + substituteInPlace configure --replace is_cross_compiler=no is_cross_compiler=yes +'' diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/gnat-cflags-11.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/gnat-cflags-11.patch new file mode 100644 index 0000000000..03ef286645 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/gnat-cflags-11.patch @@ -0,0 +1,35 @@ +diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in +index 4e74252bd74..0d848b5b4e3 100644 +--- a/gcc/ada/gcc-interface/Makefile.in ++++ b/gcc/ada/gcc-interface/Makefile.in +@@ -111,7 +111,7 @@ NO_OMIT_ADAFLAGS = -fno-omit-frame-pointer + NO_SIBLING_ADAFLAGS = -fno-optimize-sibling-calls + NO_REORDER_ADAFLAGS = -fno-toplevel-reorder + GNATLIBFLAGS = -W -Wall -gnatg -nostdinc +-GNATLIBCFLAGS = -g -O2 ++GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET) + # Pretend that _Unwind_GetIPInfo is available for the target by default. This + # should be autodetected during the configuration of libada and passed down to + # here, but we need something for --disable-libada and hope for the best. +@@ -198,7 +198,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR)) + # Link flags used to build gnat tools. By default we prefer to statically + # link with libgcc to avoid a dependency on shared libgcc (which is tricky + # to deal with as it may conflict with the libgcc provided by the system). +-GCC_LINK_FLAGS=-static-libstdc++ -static-libgcc ++GCC_LINK_FLAGS=-static-libstdc++ -static-libgcc $(CFLAGS_FOR_TARGET) + + # End of variables for you to override. + +diff --git a/libada/Makefile.in b/libada/Makefile.in +index 522b9207326..ca866c74471 100644 +--- a/libada/Makefile.in ++++ b/libada/Makefile.in +@@ -59,7 +59,7 @@ LDFLAGS= + CFLAGS=-g + PICFLAG = @PICFLAG@ + GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc +-GNATLIBCFLAGS= -g -O2 ++GNATLIBCFLAGS= -g -O2 $(CFLAGS) + GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(CFLAGS_FOR_TARGET) \ + -fexceptions -DIN_RTS @have_getipinfo@ @have_capability@ + 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 index 02373d00b1..13eba00fae 100644 --- 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 @@ -31,6 +31,8 @@ let else "${lib.getLib glibc}/lib/ld-linux*"; + downloadsUrl = "https://downloads.haskell.org/ghc"; + in stdenv.mkDerivation rec { @@ -41,23 +43,23 @@ stdenv.mkDerivation rec { # 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"; + url = "${downloadsUrl}/${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"; + url = "${downloadsUrl}/${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"; + url = "${downloadsUrl}/${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"; + url = "${downloadsUrl}/${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"; + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; sha256 = "1hngyq14l4f950hzhh2d204ca2gfc98pc9xdasxihzqd1jq75dzd"; }; }.${stdenv.hostPlatform.system} @@ -212,11 +214,12 @@ stdenv.mkDerivation rec { enableShared = true; }; - meta = { + meta = rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; license = lib.licenses.bsd3; platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; + hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms; maintainers = with lib.maintainers; [ lostnet ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.4.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.4.nix index 075e9bf9d5..da957f9352 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.4.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.4.nix @@ -18,7 +18,7 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix index ca984c3695..092511ba6d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -28,6 +28,8 @@ let else "${lib.getLib glibc}/lib/ld-linux*"; + downloadsUrl = "https://downloads.haskell.org/ghc"; + in stdenv.mkDerivation rec { @@ -39,22 +41,22 @@ stdenv.mkDerivation rec { src = fetchurl ({ i686-linux = { # Don't use the Fedora27 build (as below) because there isn't one! - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; sha256 = "1p2h29qghql19ajk755xa0yxkn85slbds8m9n5196ris743vkp8w"; }; x86_64-linux = { # This is the Fedora build because it links against ncurses6 where the # deb9 one links against ncurses5, see here # https://github.com/NixOS/nixpkgs/issues/85924 for a discussion - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-fedora27-linux.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-fedora27-linux.tar.xz"; sha256 = "18dlqm5d028fqh6ghzn7pgjspr5smw030jjzl3kq6q1kmwzbay6g"; }; aarch64-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-ubuntu18.04-linux.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-ubuntu18.04-linux.tar.xz"; sha256 = "11n7l2a36i5vxzzp85la2555q4m34l747g0pnmd81cp46y85hlhq"; }; x86_64-darwin = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; sha256 = "0s9188vhhgf23q3rjarwhbr524z6h2qga5xaaa2pma03sfqvvhfz"; }; }.${stdenv.hostPlatform.system} @@ -171,6 +173,9 @@ stdenv.mkDerivation rec { enableShared = true; }; - meta.license = lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; + meta = rec { + license = lib.licenses.bsd3; + platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; + hydraPlatforms = builtins.filter (p: p != "aarch64-linux") platforms; + }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix index 9bef190ad1..b0336ad399 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix @@ -18,7 +18,7 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform 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 index 83f3534d3e..58beef5d68 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix @@ -19,7 +19,7 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix index 3ba8876311..a0ca13270a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix @@ -10,7 +10,9 @@ , # GHC can be built with system libffi or a bundled one. libffi ? null -, enableDwarf ? !stdenv.targetPlatform.isDarwin && + # Libdw.c only supports x86_64, i686 and s390x +, enableDwarf ? stdenv.targetPlatform.isx86 && + !stdenv.targetPlatform.isDarwin && !stdenv.targetPlatform.isWindows , elfutils # for DWARF support @@ -22,7 +24,7 @@ , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. @@ -38,7 +40,7 @@ , # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows -, version ? "8.11.20200824" +, version ? "9.3.20210504" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -110,8 +112,8 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; - rev = "3f50154591ada9064351ccec4adfe6df53ca2439"; - sha256 = "1w2p5bc74aswspzvgvrhcb95hvj5ky38rgqqjvrri19z2qyiky6d"; + rev = "049c3a83fbce67e58e70c727d89e8331608a4e04"; + sha256 = "0dk7c9ywam9fj33lqzpwxhiwz017m58j6ixvc8b07kzp7kskaxq7"; }; enableParallelBuilding = true; @@ -139,6 +141,9 @@ stdenv.mkDerivation (rec { export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + # otherwise haddock fails when generating the compiler docs + export LANG=C.UTF-8 + echo -n "${buildMK dontStrip}" > mk/build.mk echo ${version} > VERSION echo ${src.rev} > GIT_COMMIT_ID @@ -256,6 +261,8 @@ stdenv.mkDerivation (rec { description = "The Glasgow Haskell Compiler"; maintainers = with lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; + # ghcHEAD times out on aarch64-linux on Hydra. + hydraPlatforms = builtins.filter (p: p != "aarch64-linux") ghc.meta.platforms; }; dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghdl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ghdl/default.nix index ec07331dc5..e7886eb8f5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghdl/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "--enable-synth" ] ++ lib.optional (backend == "llvm") - "--with-llvm-config=${llvm}/bin/llvm-config"; + "--with-llvm-config=${llvm.dev}/bin/llvm-config"; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix index 474a960d35..7bce45c455 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.14.4"; + version = "0.15.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iW4mH9zLJzD+E+H/b0NAbPWzfSbDmRpirDwrLlyZppI="; + sha256 = "sha256-vBxVGIgg2BpVvEYjmX99YSf1zy9aWOHr6ftaYxJWkzY="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-ErLwrve2Fpyg9JaH3y7VIYuFcOPVP++XAIrRvv5dGm0="; + cargoSha256 = "sha256-2zHc7xk5MuEUO9YGifSWbgRTi51ZUk84QLro94LsBtQ="; meta = with lib; { description = "A statically typed language for the Erlang VM"; 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 7f7870b7e0..1aa0ec0301 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix @@ -11,7 +11,7 @@ let inherit (lib) optionals optionalString; - version = "1.15.11"; + version = "1.15.12"; go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1rb1s130yqy80kcl140k5a53xhvw4fmrpmclvqygcv67si0j8nzj"; + sha256 = "sha256-HGkRk330onf6dOe378PQhZRJjExK3AtsSuNWYTdSgJE="; }; # perl is used for testing go vet diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix index f82a0d72b7..219f19ad27 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix @@ -11,7 +11,7 @@ let inherit (lib) optionals optionalString; - version = "1.16.3"; + version = "1.16.4"; go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-spjSnekjbKR6Aj44IxO8wtLu0x36cGtgoEEDzoOnGiU="; + sha256 = "sha256-rk9rbioWd9MYF5hGVadiB0tTVtpQ+1hyK5kQSHDUNQM="; }; # perl is used for testing go vet diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/2-dev.nix b/third_party/nixpkgs/pkgs/development/compilers/go/2-dev.nix index 21347cbd65..4b541e8990 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/2-dev.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/2-dev.nix @@ -39,12 +39,12 @@ in stdenv.mkDerivation rec { pname = "go2-unstable"; - version = "2021-03-22"; + version = "2021-04-13"; src = fetchgit { url = https://go.googlesource.com/go; - rev = "a4b4db4cdeefb7b4ea5adb09073dd123846b3588"; - sha256 = "sha256:1wqqnywcrfazydi5wcg04s6zgsfh4m879vxfgacgrnigd23ynhvr"; + rev = "9cd52cf2a93a958e8e001aea36886e7846c91f2f"; + sha256 = "sha256:0hybm93y4i4j7bs86y7h73nc1wqnspkq75if7n1032zf9bs8sm96"; }; # perl is used for testing go vet diff --git a/third_party/nixpkgs/pkgs/development/compilers/inform6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/inform6/default.nix index f0c182f020..950bafa67d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/inform6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/inform6/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "PREFIX=${placeholder "out"}" + ]; meta = with lib; { description = "Interactive fiction compiler and libraries"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix b/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix index 5128658296..75687de4e9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -18,7 +18,7 @@ let inherit spirv-llvm-translator; }; inherit (llvmPkgs) llvm; - inherit (if buildWithPatches then opencl-clang else llvmPkgs) clang clang-unwrapped spirv-llvm-translator; + inherit (if buildWithPatches then opencl-clang else llvmPkgs) clang libclang spirv-llvm-translator; inherit (lib) getVersion optional optionals versionOlder versions; in @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ln -s ${clang}/bin/clang $out/ ln -s clang $out/clang-${versions.major (getVersion clang)} ln -s ${opencl-clang}/lib/* $out/ - ln -s ${clang-unwrapped}/lib/clang/${getVersion clang}/include/opencl-c.h $out/ + ln -s ${lib.getLib libclang}/lib/clang/${getVersion clang}/include/opencl-c.h $out/ ''; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix index fd74815871..bbe17e0755 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix @@ -28,10 +28,9 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake which m4 bison flex python3 ]; + nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.llvm.dev ]; buildInputs = with llvmPackages; [ - # we need to link against libclang, so we need the unwrapped - llvm llvmPackages.clang-unwrapped + llvm llvmPackages.libclang ]; postPatch = '' @@ -66,6 +65,7 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ + "-DLLVM_CONFIG_EXECUTABLE=${llvmPackages.llvm.dev}/bin/llvm-config" "-DCLANG_EXECUTABLE=${llvmPackages.clang}/bin/clang" "-DCLANGPP_EXECUTABLE=${llvmPackages.clang}/bin/clang++" "-DISPC_INCLUDE_EXAMPLES=OFF" diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/1.0-bin.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/1.0-bin.nix new file mode 100644 index 0000000000..dfda8da9e4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/1.0-bin.nix @@ -0,0 +1,80 @@ +{ autoPatchelfHook, fetchurl, lib, makeWrapper, openssl, stdenv }: + +stdenv.mkDerivation rec { + pname = "julia-bin"; + version = "1.0.5"; + + src = { + x86_64-linux = fetchurl { + url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; + sha256 = "00vbszpjmz47nqy19v83xa463ajhzwanjyg5mvcfp9kvfw9xdvcx"; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + # Julia’s source files are in different locations for source and binary + # releases. Thus we temporarily create symlinks to allow us to share patches + # with source releases. + prePatch = '' + ln -s share/julia/stdlib/v${lib.versions.majorMinor version} stdlib + ln -s share/julia/test + ''; + patches = [ + # Source release Nix patch(es) relevant for binary releases as well. + ./patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch + ]; + postPatch = '' + # Revert symlink hack. + rm stdlib test + ''; + + buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook ]; + + installPhase = '' + runHook preInstall + cp -r . $out + # Setting `LD_LIBRARY_PATH` resolves `Libdl` failures. Not sure why this is + # only necessary on v1.0.x and a cleaner solution is welcome, but after + # staring at `strace` for a few hours this is as clean as I could make it. + wrapProgram $out/bin/julia \ + --suffix LD_LIBRARY_PATH : $out/lib + runHook postInstall + ''; + + # Breaks backtraces, etc. + dontStrip = true; + + doInstallCheck = true; + installCheckInputs = [ openssl ]; + preInstallCheck = '' + # Some tests require read/write access to $HOME. + export HOME="$TMPDIR" + ''; + installCheckPhase = '' + runHook preInstallCheck + # Command lifted from `test/Makefile`. + $out/bin/julia \ + --check-bounds=yes \ + --startup-file=no \ + --depwarn=error \ + $out/share/julia/test/runtests.jl + runHook postInstallCheck + ''; + + meta = { + description = "High-level, high-performance dynamic language for technical computing"; + homepage = "https://julialang.org"; + # Bundled and linked with various GPL code, although Julia itself is MIT. + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ninjin raskin ]; + platforms = [ "x86_64-linux" ]; + knownVulnerabilities = [ + # Built with libgit2 v0.27.2: + # https://github.com/JuliaLang/julia/blob/e0837d1e64a9e4d17534a9f981e9a2a3f221356f/deps/libgit2.version + # https://nvd.nist.gov/vuln/detail/CVE-2020-12278 + "CVE-2020-12278" + # https://nvd.nist.gov/vuln/detail/CVE-2020-12279 + "CVE-2020-12279" + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix new file mode 100644 index 0000000000..19aab27ba7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix @@ -0,0 +1,73 @@ +{ autoPatchelfHook, fetchurl, lib, stdenv }: + +stdenv.mkDerivation rec { + pname = "julia-bin"; + version = "1.6.1"; + + src = { + x86_64-linux = fetchurl { + url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; + sha256 = "01i5sm4vqb0y5qznql571zap19b42775drrcxnzsyhpaqgg8m23w"; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + # Julia’s source files are in different locations for source and binary + # releases. Thus we temporarily create a symlink to allow us to share patches + # with source releases. + prePatch = '' + ln -s share/julia/test + ''; + patches = [ + # Source release Nix patch(es) relevant for binary releases as well. + ./patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch + ./patches/1.6-bin/0003-nix-Skip-chown-tests-broken-in-sandbox.patch + ./patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch + ]; + postPatch = '' + # Revert symlink hack. + rm test + + # Julia fails to pick up our Certification Authority root certificates, but + # it provides its own so we can simply disable the test. Patching in the + # dynamic path to ours require us to rebuild the Julia system image. + substituteInPlace share/julia/stdlib/v${lib.versions.majorMinor version}/NetworkOptions/test/runtests.jl \ + --replace '@test ca_roots_path() != bundled_ca_roots()' \ + '@test_skip ca_roots_path() != bundled_ca_roots()' + ''; + + nativeBuildInputs = [ autoPatchelfHook ]; + + installPhase = '' + runHook preInstall + cp -r . $out + runHook postInstall + ''; + + # Breaks backtraces, etc. + dontStrip = true; + + doInstallCheck = true; + preInstallCheck = '' + # Some tests require read/write access to $HOME. + export HOME="$TMPDIR" + ''; + installCheckPhase = '' + runHook preInstallCheck + # Command lifted from `test/Makefile`. + $out/bin/julia \ + --check-bounds=yes \ + --startup-file=no \ + --depwarn=error \ + $out/share/julia/test/runtests.jl + runHook postInstallCheck + ''; + + meta = { + description = "High-level, high-performance dynamic language for technical computing."; + homepage = "https://julialang.org"; + # Bundled and linked with various GPL code, although Julia itself is MIT. + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ninjin raskin ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch b/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch new file mode 100644 index 0000000000..0de1f7c010 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch @@ -0,0 +1,87 @@ +From 4954b99efae367da49412edd31a7bd832ec62c69 Mon Sep 17 00:00:00 2001 +From: Pontus Stenetorp +Date: Mon, 15 Mar 2021 05:55:18 +0000 +Subject: [PATCH 2/3] nix: Skip tests that require network access + +Necessary as the Nix build sandbox does not permit network access. +--- + stdlib/Sockets/test/runtests.jl | 40 ++++++++++++++++----------------- + test/file.jl | 4 ++-- + 2 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/stdlib/Sockets/test/runtests.jl b/stdlib/Sockets/test/runtests.jl +index 6145f87616..9cc7a001e5 100644 +--- a/stdlib/Sockets/test/runtests.jl ++++ b/stdlib/Sockets/test/runtests.jl +@@ -151,33 +151,33 @@ defaultport = rand(2000:4000) + end + + @testset "getnameinfo on some unroutable IP addresses (RFC 5737)" begin +- @test getnameinfo(ip"192.0.2.1") == "192.0.2.1" +- @test getnameinfo(ip"198.51.100.1") == "198.51.100.1" +- @test getnameinfo(ip"203.0.113.1") == "203.0.113.1" +- @test getnameinfo(ip"0.1.1.1") == "0.1.1.1" +- @test getnameinfo(ip"::ffff:0.1.1.1") == "::ffff:0.1.1.1" +- @test getnameinfo(ip"::ffff:192.0.2.1") == "::ffff:192.0.2.1" +- @test getnameinfo(ip"2001:db8::1") == "2001:db8::1" ++ @test_skip getnameinfo(ip"192.0.2.1") == "192.0.2.1" ++ @test_skip getnameinfo(ip"198.51.100.1") == "198.51.100.1" ++ @test_skip getnameinfo(ip"203.0.113.1") == "203.0.113.1" ++ @test_skip getnameinfo(ip"0.1.1.1") == "0.1.1.1" ++ @test_skip getnameinfo(ip"::ffff:0.1.1.1") == "::ffff:0.1.1.1" ++ @test_skip getnameinfo(ip"::ffff:192.0.2.1") == "::ffff:192.0.2.1" ++ @test_skip getnameinfo(ip"2001:db8::1") == "2001:db8::1" + end + + @testset "getnameinfo on some valid IP addresses" begin + @test !isempty(getnameinfo(ip"::")::String) +- @test !isempty(getnameinfo(ip"0.0.0.0")::String) +- @test !isempty(getnameinfo(ip"10.1.0.0")::String) +- @test !isempty(getnameinfo(ip"10.1.0.255")::String) +- @test !isempty(getnameinfo(ip"10.1.255.1")::String) +- @test !isempty(getnameinfo(ip"255.255.255.255")::String) +- @test !isempty(getnameinfo(ip"255.255.255.0")::String) +- @test !isempty(getnameinfo(ip"192.168.0.1")::String) +- @test !isempty(getnameinfo(ip"::1")::String) ++ @test_skip !isempty(getnameinfo(ip"0.0.0.0")::String) ++ @test_skip !isempty(getnameinfo(ip"10.1.0.0")::String) ++ @test_skip !isempty(getnameinfo(ip"10.1.0.255")::String) ++ @test_skip !isempty(getnameinfo(ip"10.1.255.1")::String) ++ @test_skip !isempty(getnameinfo(ip"255.255.255.255")::String) ++ @test_skip !isempty(getnameinfo(ip"255.255.255.0")::String) ++ @test_skip !isempty(getnameinfo(ip"192.168.0.1")::String) ++ @test_skip !isempty(getnameinfo(ip"::1")::String) + end + + @testset "getaddrinfo" begin +- let localhost = getnameinfo(ip"127.0.0.1")::String +- @test !isempty(localhost) && localhost != "127.0.0.1" +- @test !isempty(getalladdrinfo(localhost)::Vector{IPAddr}) +- @test getaddrinfo(localhost, IPv4)::IPv4 != ip"0.0.0.0" +- @test try ++ let localhost = getnameinfo(ip"::")::String ++ @test_skip !isempty(localhost) && localhost != "127.0.0.1" ++ @test_skip !isempty(getalladdrinfo(localhost)::Vector{IPAddr}) ++ @test_skip getaddrinfo(localhost, IPv4)::IPv4 != ip"0.0.0.0" ++ @test_skip try + getaddrinfo(localhost, IPv6)::IPv6 != ip"::" + catch ex + isa(ex, Sockets.DNSError) && ex.code == Base.UV_EAI_NONAME && ex.host == localhost +diff --git a/test/file.jl b/test/file.jl +index e86476f975..579276f82c 100644 +--- a/test/file.jl ++++ b/test/file.jl +@@ -874,8 +874,8 @@ if !Sys.iswindows() || (Sys.windows_version() >= Sys.WINDOWS_VISTA_VER) + else + @test_throws ErrorException symlink(file, "ba\0d") + end +-@test_throws ArgumentError download("good", "ba\0d") +-@test_throws ArgumentError download("ba\0d", "good") ++@test_skip @test_throws ArgumentError download("good", "ba\0d") ++@test_skip @test_throws ArgumentError download("ba\0d", "good") + + ################### + # walkdir # +-- +2.29.3 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch b/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch new file mode 100644 index 0000000000..d47efe25c5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch @@ -0,0 +1,28 @@ +From ffe227676352a910754d96d92e9b06e475f28ff1 Mon Sep 17 00:00:00 2001 +From: Pontus Stenetorp +Date: Thu, 8 Apr 2021 04:25:19 +0000 +Subject: [PATCH 2/6] nix: Skip `tempname` test broken in sandbox + +Reported upstream: + + https://github.com/JuliaLang/julia/issues/38873 +--- + test/file.jl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/file.jl b/test/file.jl +index 0f39bc7c14..bd4dd78f62 100644 +--- a/test/file.jl ++++ b/test/file.jl +@@ -95,7 +95,7 @@ end + @test dirname(t) == tempdir() + mktempdir() do d + t = tempname(d) +- @test dirname(t) == d ++ @test_skip dirname(t) == d + end + @test_throws ArgumentError tempname(randstring()) + end +-- +2.29.3 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0003-nix-Skip-chown-tests-broken-in-sandbox.patch b/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0003-nix-Skip-chown-tests-broken-in-sandbox.patch new file mode 100644 index 0000000000..e63c88c8fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0003-nix-Skip-chown-tests-broken-in-sandbox.patch @@ -0,0 +1,27 @@ +From b20357fb1044d2c100172b1d5cbdf6c6d9bd3590 Mon Sep 17 00:00:00 2001 +From: Pontus Stenetorp +Date: Thu, 8 Apr 2021 05:10:39 +0000 +Subject: [PATCH 3/6] nix: Skip `chown` tests broken in sandbox + +--- + test/file.jl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/file.jl b/test/file.jl +index bd4dd78f62..06fd4e49da 100644 +--- a/test/file.jl ++++ b/test/file.jl +@@ -503,8 +503,8 @@ if !Sys.iswindows() + @test stat(file).gid == 0 + @test stat(file).uid == 0 + else +- @test_throws Base._UVError("chown($(repr(file)), -2, -1)", Base.UV_EPERM) chown(file, -2, -1) # Non-root user cannot change ownership to another user +- @test_throws Base._UVError("chown($(repr(file)), -1, -2)", Base.UV_EPERM) chown(file, -1, -2) # Non-root user cannot change group to a group they are not a member of (eg: nogroup) ++ @test_skip @test_throws Base._UVError("chown($(repr(file)), -2, -1)", Base.UV_EPERM) chown(file, -2, -1) # Non-root user cannot change ownership to another user ++ @test_skip @test_throws Base._UVError("chown($(repr(file)), -1, -2)", Base.UV_EPERM) chown(file, -1, -2) # Non-root user cannot change group to a group they are not a member of (eg: nogroup) + end + else + # test that chown doesn't cause any errors for Windows +-- +2.29.3 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch b/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch new file mode 100644 index 0000000000..243a9cfd76 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch @@ -0,0 +1,30 @@ +From 44c2c979c4f2222567ce65f506cf47fb87482348 Mon Sep 17 00:00:00 2001 +From: Pontus Stenetorp +Date: Thu, 8 Apr 2021 04:37:44 +0000 +Subject: [PATCH 5/6] nix: Enable parallel unit tests for sandbox + +Disabled by default due to lack of networking in the Nix sandbox. This +greatly speeds up the build process on a multi-core system. +--- + test/runtests.jl | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/test/runtests.jl b/test/runtests.jl +index 2f9cd058bb..2f8c19fa32 100644 +--- a/test/runtests.jl ++++ b/test/runtests.jl +@@ -83,8 +83,9 @@ prepend!(tests, linalg_tests) + import LinearAlgebra + cd(@__DIR__) do + n = 1 +- if net_on +- n = min(Sys.CPU_THREADS, length(tests)) ++ if net_on || haskey(ENV, "NIX_BUILD_CORES") ++ x = haskey(ENV, "NIX_BUILD_CORES") ? parse(Int, ENV["NIX_BUILD_CORES"]) : Sys.CPU_THREADS ++ n = min(x, Sys.CPU_THREADS, length(tests)) + n > 1 && addprocs_with_testenv(n) + LinearAlgebra.BLAS.set_num_threads(1) + end +-- +2.29.3 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix index 9154b7d76a..5fdf58e56f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, unzip }: -let - version = "1.4.21"; -in stdenv.mkDerivation { - inherit version; +stdenv.mkDerivation rec { pname = "kotlin"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1ixnwrvgs14f9160d9d69r7w2dfp5cdwiwpk1ky0ps8nly8hjwj6"; + sha256 = "1dyiis96skflhlsmc8byp5j8j3vsicmlslwyrkn1pv4gc8gzqhq3"; }; propagatedBuildInputs = [ jre ] ; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ldc/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/ldc/generic.nix index 4261c2b653..f79fb24a56 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ldc/generic.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ldc/generic.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - cmake ldcBootstrap lit lit.python llvm_11 makeWrapper ninja unzip + cmake ldcBootstrap lit lit.python llvm_11.dev makeWrapper ninja unzip ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix index 35b7ab313d..d228c4261a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld +{ lib, stdenv, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +, buildLlvmTools , fixDarwinDylibNames , enableManpages ? false }: @@ -18,28 +19,33 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - nativeBuildInputs = [ cmake python3 lld ] + nativeBuildInputs = [ cmake python3 ] ++ lib.optional enableManpages python3.pkgs.sphinx ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libxml2 llvm ]; + buildInputs = [ libxml2 libllvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++14" "-DCLANGD_BUILD_XPC=OFF" "-DLLVM_ENABLE_RTTI=ON" + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" ]; patches = [ ./purity.patch # https://reviews.llvm.org/D51899 ./compiler-rt-baremetal.patch + ./gnu-install-dirs.patch ]; postPatch = '' @@ -56,12 +62,12 @@ let --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE ''; - outputs = [ "out" "lib" "python" ]; + outputs = [ "out" "lib" "dev" "python" ]; # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${llvm}/lib/LLVMgold.so ]; then - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then + ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib fi ln -sv $out/bin/clang $out/bin/cpp @@ -80,11 +86,14 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + + mkdir -p $dev/bin + cp bin/clang-tblgen $dev/bin ''; passthru = { isClang = true; - inherit llvm; + inherit libllvm; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/clang/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/clang/gnu-install-dirs.patch new file mode 100644 index 0000000000..454c81875e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/clang/gnu-install-dirs.patch @@ -0,0 +1,248 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dc1413f4b597..c173531e624f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,6 +9,8 @@ endif() + if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) + project(Clang) + ++ include(GNUInstallDirs) ++ + # Rely on llvm-config. + set(CONFIG_OUTPUT) + if(LLVM_CONFIG) +@@ -417,7 +419,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/clang include/clang-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT clang-headers + FILES_MATCHING + PATTERN "*.def" +@@ -427,7 +429,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT clang-headers + FILES_MATCHING + PATTERN "CMakeFiles" EXCLUDE +@@ -447,7 +449,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + add_custom_target(bash-autocomplete DEPENDS utils/bash-autocomplete.sh) + install(PROGRAMS utils/bash-autocomplete.sh +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT bash-autocomplete) + if(NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-bash-autocomplete +diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake +index 577cc11ab015..a4f4481d8442 100644 +--- a/cmake/modules/AddClang.cmake ++++ b/cmake/modules/AddClang.cmake +@@ -114,9 +114,9 @@ macro(add_clang_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_clangtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-${name} +@@ -160,7 +160,7 @@ macro(add_clang_tool name) + + install(TARGETS ${name} + ${export_to_clangtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT LLVM_ENABLE_IDE) +@@ -175,7 +175,7 @@ endmacro() + macro(add_clang_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() + + function(clang_target_link_libraries target type) +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index 85c3124234ad..64c48235d914 100644 +--- a/lib/Headers/CMakeLists.txt ++++ b/lib/Headers/CMakeLists.txt +@@ -191,7 +191,7 @@ set_target_properties(clang-resource-headers PROPERTIES + FOLDER "Misc" + RUNTIME_OUTPUT_DIRECTORY "${output_dir}") + +-set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) ++set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) + + install( + FILES ${files} ${generated_files} +diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt +index ceef4b08637c..8efad5520ca4 100644 +--- a/tools/c-index-test/CMakeLists.txt ++++ b/tools/c-index-test/CMakeLists.txt +@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH + "@executable_path/../../lib") + else() +- set(INSTALL_DESTINATION bin) ++ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + + install(TARGETS c-index-test +diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt +index 35ecdb11253c..d77d75de0094 100644 +--- a/tools/clang-format/CMakeLists.txt ++++ b/tools/clang-format/CMakeLists.txt +@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE ) + endif() + + install(PROGRAMS clang-format-bbedit.applescript +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-diff.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-sublime.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS git-clang-format +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT clang-format) +diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt +index cda8e29ec5b1..0134d8ccd70b 100644 +--- a/tools/clang-rename/CMakeLists.txt ++++ b/tools/clang-rename/CMakeLists.txt +@@ -19,8 +19,8 @@ clang_target_link_libraries(clang-rename + ) + + install(PROGRAMS clang-rename.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) + install(PROGRAMS clang-rename.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) +diff --git a/tools/diagtool/CMakeLists.txt b/tools/diagtool/CMakeLists.txt +index a95444be40ee..136d96d9bf5b 100644 +--- a/tools/diagtool/CMakeLists.txt ++++ b/tools/diagtool/CMakeLists.txt +@@ -21,7 +21,7 @@ clang_target_link_libraries(diagtool + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(TARGETS diagtool + COMPONENT diagtool +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-diagtool +diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt +index 973655361f71..0181002e4e3b 100644 +--- a/tools/libclang/CMakeLists.txt ++++ b/tools/libclang/CMakeLists.txt +@@ -141,7 +141,7 @@ endif() + if(INTERNAL_INSTALL_PREFIX) + set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") + else() +- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) ++ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + install(DIRECTORY ../../include/clang-c +@@ -172,7 +172,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) + COMPONENT + libclang-python-bindings + DESTINATION +- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") ++ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") + endforeach() + if(NOT LLVM_ENABLE_IDE) + add_custom_target(libclang-python-bindings) +diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt +index 28241245fcb7..d6b59f02fc2a 100644 +--- a/tools/scan-build/CMakeLists.txt ++++ b/tools/scan-build/CMakeLists.txt +@@ -42,7 +42,7 @@ if(CLANG_INSTALL_SCANBUILD) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) + install(PROGRAMS bin/${BinFile} +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT scan-build) + endforeach() + +@@ -56,7 +56,7 @@ if(CLANG_INSTALL_SCANBUILD) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) + install(PROGRAMS libexec/${LibexecFile} +- DESTINATION libexec ++ DESTINATION ${CMAKE_INSTALL_LIBEXECDIR} + COMPONENT scan-build) + endforeach() + +@@ -84,7 +84,7 @@ if(CLANG_INSTALL_SCANBUILD) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) + install(FILES share/scan-build/${ShareFile} +- DESTINATION share/scan-build ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build + COMPONENT scan-build) + endforeach() + +diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt +index 22edb974bac7..9f140a9a4538 100644 +--- a/tools/scan-view/CMakeLists.txt ++++ b/tools/scan-view/CMakeLists.txt +@@ -22,7 +22,7 @@ if(CLANG_INSTALL_SCANVIEW) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) + install(PROGRAMS bin/${BinFile} +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT scan-view) + endforeach() + +@@ -36,7 +36,7 @@ if(CLANG_INSTALL_SCANVIEW) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) + install(FILES share/${ShareFile} +- DESTINATION share/scan-view ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view + COMPONENT scan-view) + endforeach() + +diff --git a/utils/hmaptool/CMakeLists.txt b/utils/hmaptool/CMakeLists.txt +index 62f2de0cb15c..6aa66825b6ec 100644 +--- a/utils/hmaptool/CMakeLists.txt ++++ b/utils/hmaptool/CMakeLists.txt +@@ -10,7 +10,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM + + list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) + install(PROGRAMS ${CLANG_HMAPTOOL} +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT hmaptool) + + add_custom_target(hmaptool ALL DEPENDS ${Depends}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt/default.nix index 1d759c903f..1f990ac433 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { inherit version; src = fetch pname "1yjqjri753w0fzmxcyz687nvd97sbc9rsqrxzpq720na47hwh3fr"; - nativeBuildInputs = [ cmake python3 llvm ]; + nativeBuildInputs = [ cmake python3 llvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { patches = [ ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./find-darwin-sdk-version.patch # don't test for macOS being >= 10.15 + ./gnu-install-dirs.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 0000000000..db0bd006ea --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,129 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8d768a404f21..74551dc5a004 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,6 +12,7 @@ endif() + # Check if compiler-rt is built as a standalone project. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) + project(CompilerRT C CXX ASM) ++ include(GNUInstallDirs) + set(COMPILER_RT_STANDALONE_BUILD TRUE) + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + endif() +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index 35a48c6af29c..e4300f256091 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -493,7 +493,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) + add_custom_target(${target_name} DEPENDS ${dst_file}) + # Install in Clang resource directory. + install(FILES ${file_name} +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR} + COMPONENT ${component}) + add_dependencies(${component} ${target_name}) + +@@ -510,7 +510,7 @@ macro(add_compiler_rt_script name) + add_custom_target(${name} DEPENDS ${dst}) + install(FILES ${dst} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR}) + endmacro(add_compiler_rt_script src name) + + # Builds custom version of libc++ and installs it in . +diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake +index 9f501a61c4b6..f9a0d92dbca0 100644 +--- a/cmake/Modules/CompilerRTDarwinUtils.cmake ++++ b/cmake/Modules/CompilerRTDarwinUtils.cmake +@@ -440,7 +440,7 @@ macro(darwin_add_embedded_builtin_libraries) + set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded) + set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded) + + set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi") + set(CFLAGS_i386 "-march=pentium") +diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake +index 6e672b1e1818..64999709958e 100644 +--- a/cmake/Modules/CompilerRTUtils.cmake ++++ b/cmake/Modules/CompilerRTUtils.cmake +@@ -371,7 +371,7 @@ endfunction() + function(get_compiler_rt_install_dir arch install_dir) + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + get_compiler_rt_target(${arch} target) +- set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/lib/${target} PARENT_SCOPE) ++ set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${target} PARENT_SCOPE) + else() + set(${install_dir} ${COMPILER_RT_LIBRARY_INSTALL_DIR} PARENT_SCOPE) + endif() +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index b4b87aa53073..f1ae8668837c 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -65,11 +65,11 @@ if (LLVM_TREE_AVAILABLE) + else() + # Take output dir and install path from the user. + set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH +- "Path where built compiler-rt libraries should be stored.") ++ "Path where built compiler-rt build artifacts should be stored.") + set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH + "Path where built compiler-rt executables should be stored.") +- set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH +- "Path where built compiler-rt libraries should be installed.") ++ set(COMPILER_RT_INSTALL_PATH "" CACHE PATH ++ "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.") + option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF) + option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) + # Use a host compiler to compile/link tests. +@@ -97,7 +97,7 @@ else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) + set(COMPILER_RT_LIBRARY_OUTPUT_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) + set(COMPILER_RT_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR}) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) + endif() + + if(APPLE) +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index d47d7baeb118..507c8e5c713e 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -62,22 +62,22 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") + install(FILES ${SANITIZER_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer) + # Install fuzzer headers. + install(FILES ${FUZZER_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/fuzzer) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/fuzzer) + # Install xray headers. + install(FILES ${XRAY_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray) + # Install profile headers. + install(FILES ${PROFILE_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/profile) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/profile) + + if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs. + add_custom_target(install-compiler-rt-headers +diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt +index 051215edbeb7..ecce1f52efb0 100644 +--- a/lib/dfsan/CMakeLists.txt ++++ b/lib/dfsan/CMakeLists.txt +@@ -56,4 +56,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename} + DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt) + add_dependencies(dfsan dfsan_abilist) + install(FILES ${dfsan_abilist_filename} +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix index 3fa91cd837..e2e78e16d7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix @@ -1,6 +1,5 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith -, buildPackages , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: @@ -18,31 +17,39 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "06n1yp638rh24xdxv9v2df0qajxbjz4w59b7dd4ky36drwmpi4yh"; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); - mkExtraBuildCommands = cc: '' + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); + mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" + ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; + mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" + ''; + in { - llvm = callPackage ./llvm { }; + libllvm = callPackage ./llvm { }; - clang-unwrapped = callPackage ./clang { - inherit (tools) lld; + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputUnspecified = true; }; + + libclang = callPackage ./clang { inherit clang-tools-extra_src; }; + clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; + # disabled until recommonmark supports sphinx 3 - #Llvm-manpages = lowPrio (tools.llvm.override { + #Llvm-manpages = lowPrio (tools.libllvm.override { # enableManpages = true; # python3 = pkgs.python3; # don't use python-boot #}); - clang-manpages = lowPrio (tools.clang-unwrapped.override { + clang-manpages = lowPrio (tools.libclang.override { enableManpages = true; python3 = pkgs.python3; # don't use python-boot }); @@ -53,8 +60,6 @@ let # python3 = pkgs.python3; # don't use python-boot # }); - libclang = tools.clang-unwrapped.lib; - clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; libstdcxxClang = wrapCCWith rec { @@ -144,7 +149,7 @@ let '' + mkExtraBuildCommands cc; }; - lldClangNoCompilerRt = wrapCCWith { + lldClangNoCompilerRt = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = null; bintools = wrapBintoolsWith { @@ -154,7 +159,7 @@ let extraPackages = [ ]; extraBuildCommands = '' echo "-nostartfiles" >> $out/nix-support/cc-cflags - ''; + '' + mkExtraBuildCommands0 cc; }; }); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix index a3fb092734..1e5dc5b2da 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation { export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; - patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; + outputs = [ "out" "dev" ]; + + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; preConfigure = '' # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++/gnu-install-dirs.patch new file mode 100644 index 0000000000..4b031e90bd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++/gnu-install-dirs.patch @@ -0,0 +1,99 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 60564dc96c7b..77d832ad5a44 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,6 +26,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUILD) + project(libcxx CXX C) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libcxx) + set(PACKAGE_VERSION 10.0.1) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +@@ -415,7 +417,7 @@ string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) + set(LIBCXX_HEADER_DIR ${LLVM_BINARY_DIR}) +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) + string(APPEND LIBCXX_INSTALL_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) +@@ -423,10 +425,10 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) + set(LIBCXX_HEADER_DIR ${LLVM_BINARY_DIR}) +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) + else() + set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) + endif() + + file(MAKE_DIRECTORY "${LIBCXX_BINARY_INCLUDE_DIR}") +diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake +index 10f100f7f0fb..95ed3978ab73 100644 +--- a/cmake/Modules/HandleLibCXXABI.cmake ++++ b/cmake/Modules/HandleLibCXXABI.cmake +@@ -61,7 +61,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) + + if (LIBCXX_INSTALL_HEADERS) + install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" +- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dstdir} ++ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} + COMPONENT cxx-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index 302da8a131b4..4c6ab463f564 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -244,7 +244,7 @@ if (LIBCXX_INSTALL_HEADERS) + foreach(file ${files}) + get_filename_component(dir ${file} DIRECTORY) + install(FILES ${file} +- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dir} ++ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dir} + COMPONENT ${CXX_HEADER_TARGET} + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) +@@ -253,7 +253,7 @@ if (LIBCXX_INSTALL_HEADERS) + if (LIBCXX_NEEDS_SITE_CONFIG) + # Install the generated header as __config. + install(FILES ${LIBCXX_BINARY_DIR}/__generated_config +- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1 ++ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + RENAME __config + COMPONENT ${CXX_HEADER_TARGET}) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 120505fe18da..9b8456d8405a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -341,21 +341,21 @@ if (LIBCXX_INSTALL_LIBRARY) + install(TARGETS cxx_shared + ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) ++ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + endif() + + if (LIBCXX_INSTALL_STATIC_LIBRARY) + install(TARGETS cxx_static + ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) ++ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + endif() + + if(LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY) + install(TARGETS ${LIBCXX_INSTALL_TARGETS} ${experimental_lib} + LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) ++ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + endif() + + # NOTE: This install command must go after the cxx install command otherwise diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++abi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++abi/default.nix index 1909996614..bc5e77b739 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++abi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++abi/default.nix @@ -8,6 +8,25 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "0yqs722y76cwvmfsq0lb917r9m3fci7bf5z3yzl71yz9n88ghzm9"; + outputs = [ "out" "dev" ]; + + postUnpack = '' + unpackFile ${libcxx.src} + unpackFile ${llvm.src} + cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" + '' + lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} + '' + lib.optionalString stdenv.hostPlatform.isWasm '' + patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch} + ''; + + patches = [ + ./no-threads.patch + ./gnu-install-dirs.patch + ]; + nativeBuildInputs = [ cmake ]; buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; @@ -21,20 +40,6 @@ stdenv.mkDerivation { "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; - patches = [ ./no-threads.patch ]; - - postUnpack = '' - unpackFile ${libcxx.src} - unpackFile ${llvm.src} - cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" - '' + lib.optionalString stdenv.isDarwin '' - export TRIPLE=x86_64-apple-darwin - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} - '' + lib.optionalString stdenv.hostPlatform.isWasm '' - patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch} - ''; - installPhase = if stdenv.isDarwin then '' for file in lib/*.dylib; do diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++abi/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++abi/gnu-install-dirs.patch new file mode 100644 index 0000000000..0f80ade7c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libc++abi/gnu-install-dirs.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8f9572586b4a..bf0e41dfc751 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,6 +20,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXXABI_STANDALONE_BUILD) + project(libcxxabi CXX C) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libcxxabi) + set(PACKAGE_VERSION 10.0.1) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +@@ -214,17 +216,17 @@ string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION + + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) + string(APPEND LIBCXXABI_INSTALL_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) + endif() + elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) + else() + set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) + endif() + + set(LIBCXXABI_INSTALL_PREFIX "" CACHE STRING "Define libc++abi destination prefix.") diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libunwind/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libunwind/default.nix index f0f45780a2..d010deb661 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libunwind/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libunwind/default.nix @@ -8,6 +8,12 @@ stdenv.mkDerivation rec { src = fetch pname "09syx66idnm2pr46x2vmk0jn3iwdv0lkd04xy4zjbwmz3vn066bl"; + patches = [ + ./gnu-install-dirs.patch + ]; + + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libunwind/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libunwind/gnu-install-dirs.patch new file mode 100644 index 0000000000..8cea7d3e33 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libunwind/gnu-install-dirs.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c033069ef1d0..e2846896eece 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,6 +18,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_BUILD) + project(libunwind) + ++ include(GNUInstallDirs) ++ + # Rely on llvm-config. + set(CONFIG_OUTPUT) + if(NOT LLVM_CONFIG_PATH) +@@ -189,17 +191,17 @@ string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION + + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) + string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) + endif() + elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX}) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX}) + else() + set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX}) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX}) + endif() + + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBUNWIND_LIBRARY_DIR}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lld/default.nix index a94c1b5b0d..03a48f02a0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lld/default.nix @@ -1,8 +1,9 @@ { lib, stdenv +, buildLlvmTools , fetch , cmake , libxml2 -, llvm +, libllvm , version }: @@ -12,15 +13,20 @@ stdenv.mkDerivation rec { src = fetch pname "0ynzi35r4fckvp6842alpd43qr810j3728yfslc66fk2mbh4j52r"; + patches = [ + ./gnu-install-dirs.patch + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ llvm libxml2 ]; + buildInputs = [ libllvm libxml2 ]; - outputs = [ "out" "dev" ]; + cmakeFlags = [ + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ]; - postInstall = '' - moveToOutput include "$dev" - moveToOutput lib "$dev" - ''; + outputs = [ "out" "lib" "dev" ]; meta = { description = "The LLVM Linker"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lld/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lld/gnu-install-dirs.patch new file mode 100644 index 0000000000..232f5cbac9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lld/gnu-install-dirs.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 641f71c114ae..9d44c1463aff 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(LLD_BUILT_STANDALONE TRUE) + ++ include(GNUInstallDirs) ++ + find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") + if(NOT LLVM_CONFIG_PATH) + message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") +@@ -202,7 +204,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake +index fa48b428d26b..e7967aad3ceb 100644 +--- a/cmake/modules/AddLLD.cmake ++++ b/cmake/modules/AddLLD.cmake +@@ -20,9 +20,9 @@ macro(add_lld_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_lldtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-${name} +@@ -54,7 +54,7 @@ macro(add_lld_tool name) + + install(TARGETS ${name} + ${export_to_lldtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT CMAKE_CONFIGURATION_TYPES) +@@ -69,5 +69,5 @@ endmacro() + macro(add_lld_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() +diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt +index a15e296e31df..654c2cfdb9c0 100644 +--- a/tools/lld/CMakeLists.txt ++++ b/tools/lld/CMakeLists.txt +@@ -17,7 +17,7 @@ target_link_libraries(lld + ) + + install(TARGETS lld +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if(NOT LLD_SYMLINKS_TO_CREATE) + set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld ld64.lld wasm-ld) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lldb/default.nix index 7fb8ed57a0..ccca340b3e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lldb/default.nix @@ -7,8 +7,8 @@ , which , libedit , libxml2 -, llvm -, clang-unwrapped +, libllvm +, libclang , python3 , version , darwin @@ -22,19 +22,22 @@ stdenv.mkDerivation (rec { src = fetch pname "051p5b04y6z3g730rmc2n2v71lipbw7k69riww3a6sl74myfiaq7"; - patches = [ ./procfs.patch ]; + patches = [ + ./procfs.patch + ./gnu-install-dirs.patch + ]; - nativeBuildInputs = [ cmake python3 which swig lit ] - ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ + cmake python3 which swig lit + ] ++ lib.optionals enableManpages [ + python3.pkgs.sphinx python3.pkgs.recommonmark + ]; buildInputs = [ - ncurses - zlib - libedit - libxml2 - llvm - ] - ++ lib.optionals stdenv.isDarwin [ + ncurses zlib libedit libxml2 libllvm + ] ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation @@ -46,8 +49,9 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "format" ]; cmakeFlags = [ + "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" "-DLLVM_ENABLE_RTTI=OFF" - "-DClang_DIR=${clang-unwrapped}/lib/cmake" + "-DClang_DIR=${libclang.dev}/lib/cmake" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" ] ++ lib.optionals stdenv.isDarwin [ "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" @@ -57,33 +61,38 @@ stdenv.mkDerivation (rec { "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" + ] ++ lib.optionals doCheck [ + "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" ]; + doCheck = false; + postInstall = '' # Editor support # vscode: install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin - ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ln -s $out/bin/llvm-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin ''; meta = with lib; { description = "A next-generation high-performance debugger"; - homepage = "https://lldb.llvm.org"; - license = licenses.ncsa; - platforms = platforms.all; + homepage = "https://lldb.llvm.org"; + license = licenses.ncsa; + platforms = platforms.all; }; } // lib.optionalAttrs enableManpages { pname = "lldb-manpages"; buildPhase = '' - make docs-lldb-man + make docs-man ''; propagatedBuildInputs = []; + # manually install lldb man page installPhase = '' - # manually install lldb man page mkdir -p $out/share/man/man1 install docs/man/lldb.1 -t $out/share/man/man1/ ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lldb/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lldb/gnu-install-dirs.patch new file mode 100644 index 0000000000..053a580e45 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/lldb/gnu-install-dirs.patch @@ -0,0 +1,65 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 573b8556989e..a12cc6f6ba77 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,6 +17,8 @@ set(CMAKE_MODULE_PATH + # If we are not building as part of LLVM, build LLDB as a standalone project, + # using LLVM as an external library. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) ++ include(GNUInstallDirs) ++ + project(lldb) + include(LLDBStandalone) + +diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake +index ecf0b66a41a3..6f2d97af7a11 100644 +--- a/cmake/modules/AddLLDB.cmake ++++ b/cmake/modules/AddLLDB.cmake +@@ -107,13 +107,13 @@ function(add_lldb_library name) + endif() + + if(PARAM_SHARED) +- set(install_dest lib${LLVM_LIBDIR_SUFFIX}) ++ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(PARAM_INSTALL_PREFIX) + set(install_dest ${PARAM_INSTALL_PREFIX}) + endif() + # RUNTIME is relevant for DLL platforms, FRAMEWORK for macOS + install(TARGETS ${name} COMPONENT ${name} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${install_dest} + ARCHIVE DESTINATION ${install_dest} + FRAMEWORK DESTINATION ${install_dest}) +diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake +index 4a15a343ee1d..c74bbb6878d7 100644 +--- a/cmake/modules/LLDBConfig.cmake ++++ b/cmake/modules/LLDBConfig.cmake +@@ -238,7 +238,7 @@ include_directories(BEFORE + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ + COMPONENT lldb-headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +@@ -247,7 +247,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ + COMPONENT lldb-headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt +index aff75d7db334..98a527c5e761 100644 +--- a/tools/intel-features/CMakeLists.txt ++++ b/tools/intel-features/CMakeLists.txt +@@ -64,4 +64,4 @@ if (LLDB_ENABLE_PYTHON AND LLDB_BUILD_INTEL_PT) + endif() + + install(TARGETS lldbIntelFeatures +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix index 3100eaf4db..22ed308486 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -1,4 +1,5 @@ { lib, stdenv +, pkgsBuildBuild , fetch , cmake , python3 @@ -10,10 +11,10 @@ , version , release_version , zlib -, buildPackages +, buildLlvmTools , debugVersion ? false , enableManpages ? false -, enableSharedLibraries ? true +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 || stdenv.isAarch32 # broken for the armv7l builder @@ -44,8 +45,7 @@ in stdenv.mkDerivation (rec { mv polly-* $sourceRoot/tools/polly ''; - outputs = [ "out" "python" ] - ++ optional enableSharedLibraries "lib"; + outputs = [ "out" "lib" "dev" "python" ]; nativeBuildInputs = [ cmake python3 ] ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; @@ -55,10 +55,14 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../lib''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" + --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + optionalString (enableSharedLibraries) '' @@ -97,6 +101,7 @@ in stdenv.mkDerivation (rec { ''; cmakeFlags = with stdenv; [ + "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=ON" @@ -120,7 +125,20 @@ in stdenv.mkDerivation (rec { "-DCAN_TARGET_i386=false" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildPackages.llvm_10}/bin/llvm-tblgen" + "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ( + let + nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; + nativeBintools = nativeCC.bintools.bintools; + nativeToolchainFlags = [ + "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" + "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" + "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" + "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" + "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" + ]; + in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=${lib.concatStringsSep ";" nativeToolchainFlags}" + ) ]; postBuild = '' @@ -134,20 +152,19 @@ in stdenv.mkDerivation (rec { postInstall = '' mkdir -p $python/share mv $out/share/opt-viewer $python/share/opt-viewer - '' - + optionalString enableSharedLibraries '' - moveToOutput "lib/libLLVM-*" "$lib" - moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" - '' - + optionalString (enableSharedLibraries && (!stdenv.isDarwin)) '' - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" + moveToOutput "bin/llvm-config*" "$dev" + substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ + --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" + substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ + --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' '' + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + '' + + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; doCheck = stdenv.isLinux && (!stdenv.isx86_32); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/gnu-install-dirs-polly.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 0000000000..3353058d8a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,106 @@ +diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt +index 9939097f743e..8cc538da912a 100644 +--- a/tools/polly/CMakeLists.txt ++++ b/tools/polly/CMakeLists.txt +@@ -2,7 +2,11 @@ + if (NOT DEFINED LLVM_MAIN_SRC_DIR) + project(Polly) + cmake_minimum_required(VERSION 3.4.3) ++endif() ++ ++include(GNUInstallDirs) + ++if (NOT DEFINED LLVM_MAIN_SRC_DIR) + # Where is LLVM installed? + find_package(LLVM CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) +@@ -145,14 +149,14 @@ include_directories( + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE + ) + + install(DIRECTORY ${POLLY_BINARY_DIR}/include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE +diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt +index 211f95512717..f9e04a4844b6 100644 +--- a/tools/polly/cmake/CMakeLists.txt ++++ b/tools/polly/cmake/CMakeLists.txt +@@ -79,18 +79,18 @@ file(GENERATE + + # Generate PollyConfig.cmake for the install tree. + unset(POLLY_EXPORTS) +-set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") ++set(POLLY_INSTALL_PREFIX "") + set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") ++set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") ++set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + if (POLLY_BUNDLED_ISL) + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" +- "${POLLY_INSTALL_PREFIX}/include/polly" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" + ) + else() + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" + ${ISL_INCLUDE_DIRS} + ) + endif() +@@ -100,12 +100,12 @@ endif() + foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) + get_target_property(tgt_type ${tgt} TYPE) + if (tgt_type STREQUAL "EXECUTABLE") +- set(tgt_prefix "bin/") ++ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") + else() +- set(tgt_prefix "lib/") ++ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") + endif() + +- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$") ++ set(tgt_path "${tgt_prefix}$") + file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) + + if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") +diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake +index 86de6f10686e..91f30891ccbe 100644 +--- a/tools/polly/cmake/polly_macros.cmake ++++ b/tools/polly/cmake/polly_macros.cmake +@@ -44,8 +44,8 @@ macro(add_polly_library name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") + install(TARGETS ${name} + EXPORT LLVMExports +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) + endmacro(add_polly_library) +diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt +index 8ffd984e542b..261cc19f3238 100644 +--- a/tools/polly/lib/External/CMakeLists.txt ++++ b/tools/polly/lib/External/CMakeLists.txt +@@ -274,7 +274,7 @@ if (POLLY_BUNDLED_ISL) + install(DIRECTORY + ${ISL_SOURCE_DIR}/include/ + ${ISL_BINARY_DIR}/include/ +- DESTINATION include/polly ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/gnu-install-dirs.patch new file mode 100644 index 0000000000..155bab32f4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/gnu-install-dirs.patch @@ -0,0 +1,416 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0e85afa82c76..3e700d9c5fae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -253,15 +253,21 @@ if (CMAKE_BUILD_TYPE AND + message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") + endif() + ++include(GNUInstallDirs) ++ + set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) + +-set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") ++set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING ++ "Path for binary subdirectory (defaults to 'bin')") + mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) + + set(LLVM_UTILS_INSTALL_DIR "${LLVM_TOOLS_INSTALL_DIR}" CACHE STRING + "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") + mark_as_advanced(LLVM_UTILS_INSTALL_DIR) + ++set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING ++ "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) ++ + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) + set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) +@@ -527,9 +533,9 @@ option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) + option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) + option (LLVM_ENABLE_BINDINGS "Build bindings." ON) + +-set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" ++set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html" + CACHE STRING "Doxygen-generated HTML documentation install directory") +-set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" ++set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html" + CACHE STRING "OCamldoc-generated HTML documentation install directory") + + option (LLVM_BUILD_EXTERNAL_COMPILER_RT +@@ -993,7 +999,7 @@ endif() + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/llvm include/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +@@ -1005,7 +1011,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +@@ -1020,13 +1026,13 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + if (LLVM_INSTALL_MODULEMAPS) + install(DIRECTORY include/llvm include/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "module.modulemap" + ) + install(FILES include/llvm/module.install.modulemap +- DESTINATION include/llvm ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm + COMPONENT llvm-headers + RENAME "module.extern.modulemap" + ) +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index f5a1b0d6f238..a7387224d68f 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -729,9 +729,9 @@ macro(add_llvm_library name) + + install(TARGETS ${name} + ${export_to_llvmexports} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} +- RUNTIME DESTINATION bin COMPONENT ${name}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${name}) + + if (NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-${name} +@@ -934,7 +934,7 @@ function(process_llvm_pass_plugins) + "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})") + install(FILES + ${llvm_cmake_builddir}/LLVMConfigExtensions.cmake +- DESTINATION ${LLVM_INSTALL_PACKAGE_DIR} ++ DESTINATION ${LLVM_INSTALL_CMAKE_DIR} + COMPONENT cmake-exports) + + set(ExtensionDef "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def") +@@ -1147,7 +1147,7 @@ macro(add_llvm_example name) + endif() + add_llvm_executable(${name} ${ARGN}) + if( LLVM_BUILD_EXAMPLES ) +- install(TARGETS ${name} RUNTIME DESTINATION examples) ++ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) + endif() + set_target_properties(${name} PROPERTIES FOLDER "Examples") + endmacro(add_llvm_example name) +@@ -1713,7 +1713,7 @@ function(llvm_install_library_symlink name dest type) + set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) + set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) + +- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 AND "${type}" STREQUAL "SHARED") + set(output_dir bin) + endif() +@@ -1730,7 +1730,7 @@ function(llvm_install_library_symlink name dest type) + endif() + endfunction() + +-function(llvm_install_symlink name dest) ++function(llvm_install_symlink name dest output_dir) + cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) + foreach(path ${CMAKE_MODULE_PATH}) + if(EXISTS ${path}/LLVMInstallSymlink.cmake) +@@ -1753,7 +1753,7 @@ function(llvm_install_symlink name dest) + set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) + + install(SCRIPT ${INSTALL_SYMLINK} +- CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" ++ CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" + COMPONENT ${component}) + + if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE) +@@ -1836,7 +1836,8 @@ function(add_llvm_tool_symlink link_name target) + endif() + + if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) +- llvm_install_symlink(${link_name} ${target}) ++ GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR) ++ llvm_install_symlink(${link_name} ${target} ${output_dir}) + endif() + endif() + endfunction() +@@ -1958,9 +1959,9 @@ function(llvm_setup_rpath name) + + if (APPLE) + set(_install_name_dir INSTALL_NAME_DIR "@rpath") +- set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + elseif(UNIX) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + set_property(TARGET ${name} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-z,origin ") +diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake +index 554046b20edf..4d1ad980641e 100644 +--- a/cmake/modules/AddOCaml.cmake ++++ b/cmake/modules/AddOCaml.cmake +@@ -144,9 +144,9 @@ function(add_ocaml_library name) + endforeach() + + if( APPLE ) +- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + elseif( UNIX ) +- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + endif() + list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") + +diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake +index 2bf654b60c44..450ee45d86e6 100644 +--- a/cmake/modules/AddSphinxTarget.cmake ++++ b/cmake/modules/AddSphinxTarget.cmake +@@ -78,7 +78,7 @@ function (add_sphinx_target builder project) + endif() + elseif (builder STREQUAL html) + string(TOUPPER "${project}" project_upper) +- set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" ++ set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html" + CACHE STRING "HTML documentation install directory for ${project}") + + # '/.' indicates: copy the contents of the directory directly into +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index af757d6199a8..b0fb7e7705d1 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -1,4 +1,4 @@ +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + # First for users who use an installed LLVM, create the LLVMExports.cmake file. +@@ -96,13 +96,13 @@ foreach(p ${_count}) + set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} + get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") + endforeach(p) +-set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") ++set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") + set(LLVM_CONFIG_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}") + set(LLVM_CONFIG_MAIN_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}") +-set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") ++set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") + set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") +-set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") ++set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") + set(LLVM_CONFIG_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMExports.cmake") + set(LLVM_CONFIG_EXPORTS "${LLVM_EXPORTS}") + configure_file( +diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake +index 09fed8085c23..aa79f192abf0 100644 +--- a/cmake/modules/LLVMInstallSymlink.cmake ++++ b/cmake/modules/LLVMInstallSymlink.cmake +@@ -10,7 +10,7 @@ function(install_symlink name target outdir) + set(LINK_OR_COPY copy) + endif() + +- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") ++ set(bindir "${DESTDIR}${outdir}/") + + message(STATUS "Creating ${name}") + +diff --git a/docs/CMake.rst b/docs/CMake.rst +index a86ebb3a37bd..e720711e2b3c 100644 +--- a/docs/CMake.rst ++++ b/docs/CMake.rst +@@ -196,7 +196,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. + **LLVM_LIBDIR_SUFFIX**:STRING + Extra suffix to append to the directory where libraries are to be + installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` +- to install libraries to ``/usr/lib64``. ++ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. + + **CMAKE_C_FLAGS**:STRING + Extra flags to use when compiling C source files. +@@ -516,8 +516,8 @@ LLVM-specific variables + + **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING + The path to install Doxygen-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/doxygen-html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. + + **LLVM_ENABLE_SPHINX**:BOOL + If specified, CMake will search for the ``sphinx-build`` executable and will make +@@ -548,13 +548,33 @@ LLVM-specific variables + + **LLVM_INSTALL_SPHINX_HTML_DIR**:STRING + The path to install Sphinx-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/html`. + + **LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING + The path to install OCamldoc-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/ocaml-html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html`. ++ ++**CMAKE_INSTALL_BINDIR**:STRING ++ The path to install binary tools, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `bin`. ++ ++**CMAKE_INSTALL_LIBDIR**:STRING ++ The path to install libraries, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `lib`. ++ ++**CMAKE_INSTALL_INCLUDEDIR**:STRING ++ The path to install header files, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `include`. ++ ++**CMAKE_INSTALL_DOCDIR**:STRING ++ The path to install documentation, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `share/doc`. ++ ++**CMAKE_INSTALL_MANDIR**:STRING ++ The path to install manpage files, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `share/man`. + + **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL + macOS Only: If enabled CMake will generate a target named +@@ -740,9 +760,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). + + This file is available in two different locations. + +-* ``/lib/cmake/llvm/LLVMConfig.cmake`` where +- ```` is the install prefix of an installed version of LLVM. +- On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. ++* ``LLVMConfig.cmake`` where ++ ```` is the location where LLVM CMake modules are ++ installed as part of an installed version of LLVM. This is typically ++ ``cmake/llvm/`` within the lib directory. On Linux, this is typically ++ ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. + + * ``/lib/cmake/llvm/LLVMConfig.cmake`` where + ```` is the root of the LLVM build tree. **Note: this is only +diff --git a/examples/Bye/CMakeLists.txt b/examples/Bye/CMakeLists.txt +index 3206f90d0916..1822965fc35f 100644 +--- a/examples/Bye/CMakeLists.txt ++++ b/examples/Bye/CMakeLists.txt +@@ -9,5 +9,5 @@ add_llvm_pass_plugin(Bye + BUILDTREE_ONLY + ) + +-install(TARGETS ${name} RUNTIME DESTINATION examples) ++install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) + set_target_properties(${name} PROPERTIES FOLDER "Examples") +diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt +index 1d5ca3ba92b0..026f5453c1da 100644 +--- a/include/llvm/CMakeLists.txt ++++ b/include/llvm/CMakeLists.txt +@@ -4,5 +4,5 @@ add_subdirectory(Support) + # If we're doing an out-of-tree build, copy a module map for generated + # header files into the build area. + if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +- configure_file(module.modulemap.build module.modulemap COPYONLY) ++ configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) + endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index 63cef75368b7..6295478b1f3d 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -23,6 +23,10 @@ + #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" ++#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" ++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" ++#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" ++#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" + #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" + #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index fb12e29a36a8..dbb6c2b90332 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -358,12 +358,26 @@ int main(int argc, char **argv) { + ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); + } else { + ActivePrefix = CurrentExecPrefix; +- ActiveIncludeDir = ActivePrefix + "/include"; +- SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); +- sys::fs::make_absolute(ActivePrefix, path); +- ActiveBinDir = path.str(); +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; +- ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveIncludeDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveBinDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveLibDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveCMakeDir = std::string(path.str()); ++ } + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + +diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt +index b86e4abd01a7..02ce5773f17d 100644 +--- a/tools/lto/CMakeLists.txt ++++ b/tools/lto/CMakeLists.txt +@@ -23,7 +23,7 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports) + add_llvm_library(LTO SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES} DEPENDS intrinsics_gen) + + install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h +- DESTINATION include/llvm-c ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c + COMPONENT LTO) + + if (APPLE) +diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt +index ead73ec13a8f..250362021f17 100644 +--- a/tools/opt-viewer/CMakeLists.txt ++++ b/tools/opt-viewer/CMakeLists.txt +@@ -8,7 +8,7 @@ set (files + + foreach (file ${files}) + install(PROGRAMS ${file} +- DESTINATION share/opt-viewer ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer + COMPONENT opt-viewer) + endforeach (file) + +diff --git a/tools/remarks-shlib/CMakeLists.txt b/tools/remarks-shlib/CMakeLists.txt +index e948496c603a..1f4df8a98b10 100644 +--- a/tools/remarks-shlib/CMakeLists.txt ++++ b/tools/remarks-shlib/CMakeLists.txt +@@ -11,7 +11,7 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/Remarks.exports) + add_llvm_library(Remarks SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES}) + + install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h +- DESTINATION include/llvm-c ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c + COMPONENT Remarks) + + if (APPLE) 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 2e03112d82..3b7accffbc 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 @@ -1,4 +1,5 @@ -{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld +{ lib, stdenv, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +, buildLlvmTools , fixDarwinDylibNames , enableManpages ? false }: @@ -19,26 +20,31 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - nativeBuildInputs = [ cmake python3 lld ] + nativeBuildInputs = [ cmake python3 ] ++ lib.optional enableManpages python3.pkgs.sphinx ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libxml2 llvm ]; + buildInputs = [ libxml2 libllvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++14" "-DCLANGD_BUILD_XPC=OFF" + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" ]; patches = [ ./purity.patch # https://reviews.llvm.org/D51899 + ./gnu-install-dirs.patch ]; postPatch = '' @@ -55,12 +61,12 @@ let --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE ''; - outputs = [ "out" "lib" "python" ]; + outputs = [ "out" "lib" "dev" "python" ]; # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${llvm}/lib/LLVMgold.so ]; then - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then + ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib fi ln -sv $out/bin/clang $out/bin/cpp @@ -79,11 +85,14 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + + mkdir -p $dev/bin + cp bin/clang-tblgen $dev/bin ''; passthru = { isClang = true; - inherit llvm; + inherit libllvm; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/gnu-install-dirs.patch new file mode 100644 index 0000000000..98ea97e058 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/gnu-install-dirs.patch @@ -0,0 +1,235 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bb4b801f01c8..77a8b43b22c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,6 +9,8 @@ endif() + if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) + project(Clang) + ++ include(GNUInstallDirs) ++ + set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to") + set(CMAKE_CXX_STANDARD_REQUIRED YES) + set(CMAKE_CXX_EXTENSIONS NO) +@@ -447,7 +449,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/clang include/clang-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT clang-headers + FILES_MATCHING + PATTERN "*.def" +@@ -457,7 +459,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT clang-headers + FILES_MATCHING + PATTERN "CMakeFiles" EXCLUDE +@@ -477,7 +479,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + add_custom_target(bash-autocomplete DEPENDS utils/bash-autocomplete.sh) + install(PROGRAMS utils/bash-autocomplete.sh +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT bash-autocomplete) + if(NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-bash-autocomplete +diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake +index 704278a0e93b..d25c8d325c71 100644 +--- a/cmake/modules/AddClang.cmake ++++ b/cmake/modules/AddClang.cmake +@@ -123,9 +123,9 @@ macro(add_clang_library name) + install(TARGETS ${lib} + COMPONENT ${lib} + ${export_to_clangtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-${lib} +@@ -170,7 +170,7 @@ macro(add_clang_tool name) + + install(TARGETS ${name} + ${export_to_clangtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT LLVM_ENABLE_IDE) +@@ -185,7 +185,7 @@ endmacro() + macro(add_clang_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() + + function(clang_target_link_libraries target type) +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index 0692fe75a441..6f201e7207d0 100644 +--- a/lib/Headers/CMakeLists.txt ++++ b/lib/Headers/CMakeLists.txt +@@ -208,7 +208,7 @@ set_target_properties(clang-resource-headers PROPERTIES + FOLDER "Misc" + RUNTIME_OUTPUT_DIRECTORY "${output_dir}") + +-set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) ++set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) + + install( + FILES ${files} ${generated_files} +diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt +index ceef4b08637c..8efad5520ca4 100644 +--- a/tools/c-index-test/CMakeLists.txt ++++ b/tools/c-index-test/CMakeLists.txt +@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH + "@executable_path/../../lib") + else() +- set(INSTALL_DESTINATION bin) ++ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + + install(TARGETS c-index-test +diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt +index 35ecdb11253c..d77d75de0094 100644 +--- a/tools/clang-format/CMakeLists.txt ++++ b/tools/clang-format/CMakeLists.txt +@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE ) + endif() + + install(PROGRAMS clang-format-bbedit.applescript +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-diff.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-sublime.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS git-clang-format +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT clang-format) +diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt +index cda8e29ec5b1..0134d8ccd70b 100644 +--- a/tools/clang-rename/CMakeLists.txt ++++ b/tools/clang-rename/CMakeLists.txt +@@ -19,8 +19,8 @@ clang_target_link_libraries(clang-rename + ) + + install(PROGRAMS clang-rename.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) + install(PROGRAMS clang-rename.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) +diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt +index 5cd9ac5cddc1..a197676fedbd 100644 +--- a/tools/libclang/CMakeLists.txt ++++ b/tools/libclang/CMakeLists.txt +@@ -165,7 +165,7 @@ endif() + if(INTERNAL_INSTALL_PREFIX) + set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") + else() +- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) ++ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + install(DIRECTORY ../../include/clang-c +@@ -196,7 +196,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) + COMPONENT + libclang-python-bindings + DESTINATION +- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") ++ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") + endforeach() + if(NOT LLVM_ENABLE_IDE) + add_custom_target(libclang-python-bindings) +diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt +index ec0702d76f18..d25d982f51da 100644 +--- a/tools/scan-build/CMakeLists.txt ++++ b/tools/scan-build/CMakeLists.txt +@@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) + install(PROGRAMS bin/${BinFile} +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT scan-build) + endforeach() + +@@ -61,7 +61,7 @@ if(CLANG_INSTALL_SCANBUILD) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) + install(PROGRAMS libexec/${LibexecFile} +- DESTINATION libexec ++ DESTINATION ${CMAKE_INSTALL_LIBEXECDIR} + COMPONENT scan-build) + endforeach() + +@@ -89,7 +89,7 @@ if(CLANG_INSTALL_SCANBUILD) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) + install(FILES share/scan-build/${ShareFile} +- DESTINATION share/scan-build ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build + COMPONENT scan-build) + endforeach() + +diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt +index 22edb974bac7..9f140a9a4538 100644 +--- a/tools/scan-view/CMakeLists.txt ++++ b/tools/scan-view/CMakeLists.txt +@@ -22,7 +22,7 @@ if(CLANG_INSTALL_SCANVIEW) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) + install(PROGRAMS bin/${BinFile} +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT scan-view) + endforeach() + +@@ -36,7 +36,7 @@ if(CLANG_INSTALL_SCANVIEW) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) + install(FILES share/${ShareFile} +- DESTINATION share/scan-view ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view + COMPONENT scan-view) + endforeach() + +diff --git a/utils/hmaptool/CMakeLists.txt b/utils/hmaptool/CMakeLists.txt +index 62f2de0cb15c..6aa66825b6ec 100644 +--- a/utils/hmaptool/CMakeLists.txt ++++ b/utils/hmaptool/CMakeLists.txt +@@ -10,7 +10,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM + + list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) + install(PROGRAMS ${CLANG_HMAPTOOL} +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT hmaptool) + + add_custom_target(hmaptool ALL DEPENDS ${Depends}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt/default.nix index 6ab3606307..257bc34092 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { inherit version; src = fetch pname "0x1j8ngf1zj63wlnns9vlibafq48qcm72p4jpaxkmkb4qw0grwfy"; - nativeBuildInputs = [ cmake python3 llvm ]; + nativeBuildInputs = [ cmake python3 llvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ @@ -24,10 +24,6 @@ stdenv.mkDerivation rec { "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - ] ++ lib.optionals (stdenv.isDarwin) [ - "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" - "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" - "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}" ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" @@ -45,6 +41,10 @@ stdenv.mkDerivation rec { "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" ] ++ lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" + "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}" ]; outputs = [ "out" "dev" ]; @@ -52,6 +52,10 @@ stdenv.mkDerivation rec { patches = [ ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config + ./gnu-install-dirs.patch + # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the + # extra `/`. + ./normalize-var.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 0000000000..91e2088292 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,129 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fa62814b635d..6328614d829e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,6 +12,7 @@ endif() + # Check if compiler-rt is built as a standalone project. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) + project(CompilerRT C CXX ASM) ++ include(GNUInstallDirs) + set(COMPILER_RT_STANDALONE_BUILD TRUE) + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + endif() +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index 7c127a93dfa7..6a95a65b70a7 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -524,7 +524,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) + add_custom_target(${target_name} DEPENDS ${dst_file}) + # Install in Clang resource directory. + install(FILES ${file_name} +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR} + COMPONENT ${component}) + add_dependencies(${component} ${target_name}) + +@@ -541,7 +541,7 @@ macro(add_compiler_rt_script name) + add_custom_target(${name} DEPENDS ${dst}) + install(FILES ${dst} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR}) + endmacro(add_compiler_rt_script src name) + + # Builds custom version of libc++ and installs it in . +diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake +index be8d7e733c7a..ab256bdff26c 100644 +--- a/cmake/Modules/CompilerRTDarwinUtils.cmake ++++ b/cmake/Modules/CompilerRTDarwinUtils.cmake +@@ -498,7 +498,7 @@ macro(darwin_add_embedded_builtin_libraries) + set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded) + set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded) + + set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi") + set(CFLAGS_i386 "-march=pentium") +diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake +index 99b9f0e4af44..c5183ffa746e 100644 +--- a/cmake/Modules/CompilerRTUtils.cmake ++++ b/cmake/Modules/CompilerRTUtils.cmake +@@ -375,7 +375,7 @@ endfunction() + function(get_compiler_rt_install_dir arch install_dir) + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + get_compiler_rt_target(${arch} target) +- set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/lib/${target} PARENT_SCOPE) ++ set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${target} PARENT_SCOPE) + else() + set(${install_dir} ${COMPILER_RT_LIBRARY_INSTALL_DIR} PARENT_SCOPE) + endif() +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index 964dd598f102..2acaab87d349 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -66,11 +66,11 @@ if (LLVM_TREE_AVAILABLE) + else() + # Take output dir and install path from the user. + set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH +- "Path where built compiler-rt libraries should be stored.") ++ "Path where built compiler-rt build artifacts should be stored.") + set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH + "Path where built compiler-rt executables should be stored.") +- set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH +- "Path where built compiler-rt libraries should be installed.") ++ set(COMPILER_RT_INSTALL_PATH "" CACHE PATH ++ "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.") + option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF) + option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) + # Use a host compiler to compile/link tests. +@@ -98,7 +98,7 @@ else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) + set(COMPILER_RT_LIBRARY_OUTPUT_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) + set(COMPILER_RT_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR}) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) + endif() + + if(APPLE) +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index d47d7baeb118..507c8e5c713e 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -62,22 +62,22 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") + install(FILES ${SANITIZER_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer) + # Install fuzzer headers. + install(FILES ${FUZZER_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/fuzzer) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/fuzzer) + # Install xray headers. + install(FILES ${XRAY_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray) + # Install profile headers. + install(FILES ${PROFILE_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/profile) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/profile) + + if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs. + add_custom_target(install-compiler-rt-headers +diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt +index 051215edbeb7..ecce1f52efb0 100644 +--- a/lib/dfsan/CMakeLists.txt ++++ b/lib/dfsan/CMakeLists.txt +@@ -56,4 +56,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename} + DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt) + add_dependencies(dfsan dfsan_abilist) + install(FILES ${dfsan_abilist_filename} +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt/normalize-var.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt/normalize-var.patch new file mode 100644 index 0000000000..b9986910e5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt/normalize-var.patch @@ -0,0 +1,16 @@ +diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +index c5183ffa746e..e4e4a007335d 100644 +--- a/cmake/Modules/CompilerRTUtils.cmake ++++ b/cmake/Modules/CompilerRTUtils.cmake +@@ -299,8 +299,9 @@ macro(load_llvm_config) + # Get some LLVM variables from LLVMConfig. + include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake") + +- set(LLVM_LIBRARY_OUTPUT_INTDIR +- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR ++ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} ++ REALPATH) + endif() + endmacro() + 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 22209ffb64..69c6564bab 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix @@ -1,6 +1,5 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith -, buildPackages , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: @@ -20,31 +19,38 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "18n1w1hkv931xzq02b34wglbv6zd6sd0r5kb8piwvag7klj7qw3n"; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); - mkExtraBuildCommands = cc: '' + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); + mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" + ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; + mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" + ''; + in { - llvm = callPackage ./llvm { }; + libllvm = callPackage ./llvm { }; - clang-unwrapped = callPackage ./clang { - inherit (tools) lld; + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputUnspecified = true; }; + + libclang = callPackage ./clang { inherit clang-tools-extra_src; }; + clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; # disabled until recommonmark supports sphinx 3 - #Llvm-manpages = lowPrio (tools.llvm.override { + #Llvm-manpages = lowPrio (tools.libllvm.override { # enableManpages = true; # python3 = pkgs.python3; # don't use python-boot #}); - clang-manpages = lowPrio (tools.clang-unwrapped.override { + clang-manpages = lowPrio (tools.libclang.override { enableManpages = true; python3 = pkgs.python3; # don't use python-boot }); @@ -55,8 +61,6 @@ let # python3 = pkgs.python3; # don't use python-boot # }); - libclang = tools.clang-unwrapped.lib; - clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; libstdcxxClang = wrapCCWith rec { @@ -146,7 +150,7 @@ let '' + mkExtraBuildCommands cc; }; - lldClangNoCompilerRt = wrapCCWith { + lldClangNoCompilerRt = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = null; bintools = wrapBintoolsWith { @@ -156,7 +160,7 @@ let extraPackages = [ ]; extraBuildCommands = '' echo "-nostartfiles" >> $out/nix-support/cc-cflags - ''; + '' + mkExtraBuildCommands0 cc; }; }); 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 6adb824f53..e095350cea 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 @@ -15,6 +15,8 @@ stdenv.mkDerivation { mv llvm-* llvm ''; + outputs = [ "out" "dev" ]; + patches = [ (fetchpatch { # Backported from LLVM 12, avoids clashes with commonly used "block.h" header. @@ -22,6 +24,7 @@ stdenv.mkDerivation { sha256 = "sha256-aWa66ogmPkG0xHzSfcpD0qZyZQcNKwLV44js4eiun78="; stripLen = 1; }) + ./gnu-install-dirs.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++/gnu-install-dirs.patch new file mode 100644 index 0000000000..2b95d6a85d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++/gnu-install-dirs.patch @@ -0,0 +1,100 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 910d04b54b6d..80ef692d83eb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,6 +31,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUILD) + project(libcxx CXX C) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libcxx) + set(PACKAGE_VERSION 11.1.0) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +@@ -418,7 +420,7 @@ string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) + set(LIBCXX_HEADER_DIR ${LLVM_BINARY_DIR}) +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) + string(APPEND LIBCXX_INSTALL_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) +@@ -426,11 +428,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) + set(LIBCXX_HEADER_DIR ${LLVM_BINARY_DIR}) +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) + else() + set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_HEADER_DIR ${CMAKE_BINARY_DIR}) +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) + endif() + + file(MAKE_DIRECTORY "${LIBCXX_BINARY_INCLUDE_DIR}") +diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake +index c5aa26739e36..8841c4a5252d 100644 +--- a/cmake/Modules/HandleLibCXXABI.cmake ++++ b/cmake/Modules/HandleLibCXXABI.cmake +@@ -63,7 +63,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) + + if (LIBCXX_INSTALL_HEADERS) + install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" +- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dstdir} ++ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} + COMPONENT cxx-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index be8141c98166..93847e5758cc 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -257,7 +257,7 @@ if (LIBCXX_INSTALL_HEADERS) + foreach(file ${files}) + get_filename_component(dir ${file} DIRECTORY) + install(FILES ${file} +- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dir} ++ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dir} + COMPONENT ${CXX_HEADER_TARGET} + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) +@@ -265,7 +265,7 @@ if (LIBCXX_INSTALL_HEADERS) + + # Install the generated header as __config. + install(FILES ${LIBCXX_BINARY_DIR}/__generated_config +- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1 ++ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + RENAME __config + COMPONENT ${CXX_HEADER_TARGET}) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2001c09761d9..5bd11ea6b400 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -344,21 +344,21 @@ if (LIBCXX_INSTALL_LIBRARY) + install(TARGETS cxx_shared + ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) ++ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + endif() + + if (LIBCXX_INSTALL_STATIC_LIBRARY) + install(TARGETS cxx_static + ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) ++ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + endif() + + if(LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY) + install(TARGETS cxx_experimental + LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) ++ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + endif() + + # NOTE: This install command must go after the cxx install command otherwise diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi/default.nix index c35ec706a0..a79a0d2f07 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi/default.nix @@ -8,20 +8,7 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "1azcf31mxw59hb1x17xncnm3dyw90ylh8rqx462lvypqh3nr6c8l"; - nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; - - cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ lib.optionals stdenv.hostPlatform.isWasm [ - "-DLIBCXXABI_ENABLE_THREADS=OFF" - "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" - ] ++ lib.optionals (!enableShared) [ - "-DLIBCXXABI_ENABLE_SHARED=OFF" - ]; - - patches = [ ./no-threads.patch ]; + outputs = [ "out" "dev" ]; postUnpack = '' unpackFile ${libcxx.src} @@ -36,6 +23,24 @@ stdenv.mkDerivation { patch -p1 -d llvm -i ${./wasm.patch} ''; + patches = [ + ./no-threads.patch + ./gnu-install-dirs.patch + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; + + cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DLIBCXXABI_ENABLE_THREADS=OFF" + "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optionals (!enableShared) [ + "-DLIBCXXABI_ENABLE_SHARED=OFF" + ]; + installPhase = if stdenv.isDarwin then '' for file in lib/*.dylib; do diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi/gnu-install-dirs.patch new file mode 100644 index 0000000000..10651c1255 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi/gnu-install-dirs.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 36c6b2249e2b..a93c13ccaed9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,6 +24,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXXABI_STANDALONE_BUILD) + project(libcxxabi CXX C) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libcxxabi) + set(PACKAGE_VERSION 11.1.0) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +@@ -160,17 +162,17 @@ string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION + + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) + string(APPEND LIBCXXABI_INSTALL_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) + endif() + elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) + else() + set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) + endif() + + set(LIBCXXABI_INSTALL_PREFIX "" CACHE STRING "Define libc++abi destination prefix.") diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libunwind/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libunwind/default.nix index 0c635cabc0..6b095f4fea 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libunwind/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libunwind/default.nix @@ -8,6 +8,12 @@ stdenv.mkDerivation rec { src = fetch pname "1vpqs2c358v8fbr1r8jmzkfqk12jllimjcfmgxga127ksq9b37nj"; + patches = [ + ./gnu-install-dirs.patch + ]; + + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libunwind/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libunwind/gnu-install-dirs.patch new file mode 100644 index 0000000000..b5b9c20927 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libunwind/gnu-install-dirs.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e44a103648f9..aaf1f9555d7f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,6 +18,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_BUILD) + project(libunwind LANGUAGES C CXX ASM) + ++ include(GNUInstallDirs) ++ + # Rely on llvm-config. + set(CONFIG_OUTPUT) + if(NOT LLVM_CONFIG_PATH) +@@ -192,17 +194,17 @@ string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION + + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) + string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) + endif() + elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX}) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX}) + else() + set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX}) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX}) + endif() + + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBUNWIND_LIBRARY_DIR}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld/default.nix index 1a16184a6e..3ee5ba6e5a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld/default.nix @@ -1,8 +1,9 @@ { lib, stdenv +, buildLlvmTools , fetch , cmake , libxml2 -, llvm +, libllvm , version }: @@ -12,15 +13,20 @@ stdenv.mkDerivation rec { src = fetch pname "1kk61i7z5bi9i11rzsd2b388d42if1c7a45zkaa4mk0yps67hyh1"; + patches = [ + ./gnu-install-dirs.patch + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ llvm libxml2 ]; + buildInputs = [ libllvm libxml2 ]; - outputs = [ "out" "dev" ]; + cmakeFlags = [ + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ]; - postInstall = '' - moveToOutput include "$dev" - moveToOutput lib "$dev" - ''; + outputs = [ "out" "lib" "dev" ]; meta = { description = "The LLVM Linker"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld/gnu-install-dirs.patch new file mode 100644 index 0000000000..19cf5526aa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld/gnu-install-dirs.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 040bb2c8f6d7..f765f0096d97 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(LLD_BUILT_STANDALONE TRUE) + ++ include(GNUInstallDirs) ++ + find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") + if(NOT LLVM_CONFIG_PATH) + message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") +@@ -205,7 +207,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake +index 23df41312403..d62372c88de7 100644 +--- a/cmake/modules/AddLLD.cmake ++++ b/cmake/modules/AddLLD.cmake +@@ -20,9 +20,9 @@ macro(add_lld_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_lldtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-${name} +@@ -54,7 +54,7 @@ macro(add_lld_tool name) + + install(TARGETS ${name} + ${export_to_lldtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT CMAKE_CONFIGURATION_TYPES) +@@ -69,5 +69,5 @@ endmacro() + macro(add_lld_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() +diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt +index e6f72fcd3488..d903609e6e4f 100644 +--- a/tools/lld/CMakeLists.txt ++++ b/tools/lld/CMakeLists.txt +@@ -21,7 +21,7 @@ target_link_libraries(lld + ) + + install(TARGETS lld +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if(NOT LLD_SYMLINKS_TO_CREATE) + set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld ld64.lld wasm-ld) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb/default.nix index fc9b471ec9..2979a46a6c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb/default.nix @@ -7,8 +7,8 @@ , which , libedit , libxml2 -, llvm -, clang-unwrapped +, libllvm +, libclang , python3 , version , darwin @@ -22,19 +22,22 @@ stdenv.mkDerivation (rec { src = fetch pname "1vlyg015dyng43xqb8cg2l6r9ix8klibxsajazbfnckdnh54hwxj"; - patches = [ ./procfs.patch ]; + patches = [ + ./procfs.patch + ./gnu-install-dirs.patch + ]; - nativeBuildInputs = [ cmake python3 which swig lit ] - ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ + cmake python3 which swig lit + ] ++ lib.optionals enableManpages [ + python3.pkgs.sphinx python3.pkgs.recommonmark + ]; buildInputs = [ - ncurses - zlib - libedit - libxml2 - llvm - ] - ++ lib.optionals stdenv.isDarwin [ + ncurses zlib libedit libxml2 libllvm + ] ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation @@ -46,8 +49,9 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "format" ]; cmakeFlags = [ + "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" "-DLLVM_ENABLE_RTTI=OFF" - "-DClang_DIR=${clang-unwrapped}/lib/cmake" + "-DClang_DIR=${libclang.dev}/lib/cmake" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" ] ++ lib.optionals stdenv.isDarwin [ "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" @@ -57,33 +61,38 @@ stdenv.mkDerivation (rec { "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" + ] ++ lib.optionals doCheck [ + "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" ]; + doCheck = false; + postInstall = '' # Editor support # vscode: install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin - ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ln -s $out/bin/llvm-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin ''; meta = with lib; { description = "A next-generation high-performance debugger"; - homepage = "https://lldb.llvm.org"; - license = licenses.ncsa; - platforms = platforms.all; + homepage = "https://lldb.llvm.org"; + license = licenses.ncsa; + platforms = platforms.all; }; } // lib.optionalAttrs enableManpages { pname = "lldb-manpages"; buildPhase = '' - make docs-lldb-man + make docs-man ''; propagatedBuildInputs = []; + # manually install lldb man page installPhase = '' - # manually install lldb man page mkdir -p $out/share/man/man1 install docs/man/lldb.1 -t $out/share/man/man1/ ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb/gnu-install-dirs.patch new file mode 100644 index 0000000000..a476910952 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb/gnu-install-dirs.patch @@ -0,0 +1,65 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bf748020ea40..34103d2b5e1a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,6 +17,8 @@ set(CMAKE_MODULE_PATH + # If we are not building as part of LLVM, build LLDB as a standalone project, + # using LLVM as an external library. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) ++ include(GNUInstallDirs) ++ + project(lldb) + include(LLDBStandalone) + +diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake +index 4ed5c647c5d2..89f96e710d55 100644 +--- a/cmake/modules/AddLLDB.cmake ++++ b/cmake/modules/AddLLDB.cmake +@@ -107,13 +107,13 @@ function(add_lldb_library name) + endif() + + if(PARAM_SHARED) +- set(install_dest lib${LLVM_LIBDIR_SUFFIX}) ++ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(PARAM_INSTALL_PREFIX) + set(install_dest ${PARAM_INSTALL_PREFIX}) + endif() + # RUNTIME is relevant for DLL platforms, FRAMEWORK for macOS + install(TARGETS ${name} COMPONENT ${name} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${install_dest} + ARCHIVE DESTINATION ${install_dest} + FRAMEWORK DESTINATION ${install_dest}) +diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake +index 8465cfe3b7b7..01b7eae136e2 100644 +--- a/cmake/modules/LLDBConfig.cmake ++++ b/cmake/modules/LLDBConfig.cmake +@@ -245,7 +245,7 @@ include_directories(BEFORE + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ + COMPONENT lldb-headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +@@ -254,7 +254,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ + COMPONENT lldb-headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt +index efba2f74904f..e08413b1dbb1 100644 +--- a/tools/intel-features/CMakeLists.txt ++++ b/tools/intel-features/CMakeLists.txt +@@ -65,4 +65,4 @@ if (LLDB_ENABLE_PYTHON AND LLDB_BUILD_INTEL_PT) + endif() + + install(TARGETS lldbIntelFeatures +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix index ee2fe9c90b..c8033b585c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -1,4 +1,5 @@ { lib, stdenv +, pkgsBuildBuild , fetch , cmake , python3 @@ -10,15 +11,15 @@ , version , release_version , zlib -, buildPackages +, buildLlvmTools , debugVersion ? false , enableManpages ? false -, enableSharedLibraries ? true +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 || stdenv.isAarch32 # broken for the armv7l builder ) -, enablePolly ? false +, enablePolly ? false # TODO should be on by default }: let @@ -44,8 +45,7 @@ in stdenv.mkDerivation (rec { mv polly-* $sourceRoot/tools/polly ''; - outputs = [ "out" "python" ] - ++ optional enableSharedLibraries "lib"; + outputs = [ "out" "lib" "dev" "python" ]; nativeBuildInputs = [ cmake python3 ] ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; @@ -55,10 +55,14 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../lib''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" + --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + optionalString (enableSharedLibraries) '' @@ -99,6 +103,7 @@ in stdenv.mkDerivation (rec { LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; cmakeFlags = with stdenv; [ + "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=ON" @@ -122,7 +127,20 @@ in stdenv.mkDerivation (rec { "-DCAN_TARGET_i386=false" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildPackages.llvm_11}/bin/llvm-tblgen" + "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ( + let + nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; + nativeBintools = nativeCC.bintools.bintools; + nativeToolchainFlags = [ + "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" + "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" + "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" + "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" + "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" + ]; + in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=${lib.concatStringsSep ";" nativeToolchainFlags}" + ) ]; postBuild = '' @@ -136,20 +154,19 @@ in stdenv.mkDerivation (rec { postInstall = '' mkdir -p $python/share mv $out/share/opt-viewer $python/share/opt-viewer - '' - + optionalString enableSharedLibraries '' - moveToOutput "lib/libLLVM-*" "$lib" - moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" - '' - + optionalString (enableSharedLibraries && (!stdenv.isDarwin)) '' - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" + moveToOutput "bin/llvm-config*" "$dev" + substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ + --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" + substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ + --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' '' + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + '' + + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; doCheck = stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/gnu-install-dirs-polly.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 0000000000..fff2d4953e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,106 @@ +diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt +index 9939097f743e..8cc538da912a 100644 +--- a/tools/polly/CMakeLists.txt ++++ b/tools/polly/CMakeLists.txt +@@ -2,7 +2,11 @@ + if (NOT DEFINED LLVM_MAIN_SRC_DIR) + project(Polly) + cmake_minimum_required(VERSION 3.4.3) ++endif() ++ ++include(GNUInstallDirs) + ++if (NOT DEFINED LLVM_MAIN_SRC_DIR) + # Where is LLVM installed? + find_package(LLVM CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) +@@ -145,14 +149,14 @@ include_directories( + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE + ) + + install(DIRECTORY ${POLLY_BINARY_DIR}/include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE +diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt +index 211f95512717..f9e04a4844b6 100644 +--- a/tools/polly/cmake/CMakeLists.txt ++++ b/tools/polly/cmake/CMakeLists.txt +@@ -79,18 +79,18 @@ file(GENERATE + + # Generate PollyConfig.cmake for the install tree. + unset(POLLY_EXPORTS) +-set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") ++set(POLLY_INSTALL_PREFIX "") + set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") ++set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") ++set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + if (POLLY_BUNDLED_ISL) + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" +- "${POLLY_INSTALL_PREFIX}/include/polly" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" + ) + else() + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" + ${ISL_INCLUDE_DIRS} + ) + endif() +@@ -100,12 +100,12 @@ endif() + foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) + get_target_property(tgt_type ${tgt} TYPE) + if (tgt_type STREQUAL "EXECUTABLE") +- set(tgt_prefix "bin/") ++ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") + else() +- set(tgt_prefix "lib/") ++ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") + endif() + +- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$") ++ set(tgt_path "${tgt_prefix}$") + file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) + + if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") +diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake +index 86de6f10686e..91f30891ccbe 100644 +--- a/tools/polly/cmake/polly_macros.cmake ++++ b/tools/polly/cmake/polly_macros.cmake +@@ -44,8 +44,8 @@ macro(add_polly_library name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") + install(TARGETS ${name} + EXPORT LLVMExports +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) + endmacro(add_polly_library) +diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt +index 1039079cb49c..28b499ae1e9e 100644 +--- a/tools/polly/lib/External/CMakeLists.txt ++++ b/tools/polly/lib/External/CMakeLists.txt +@@ -275,7 +275,7 @@ if (POLLY_BUNDLED_ISL) + install(DIRECTORY + ${ISL_SOURCE_DIR}/include/ + ${ISL_BINARY_DIR}/include/ +- DESTINATION include/polly ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/gnu-install-dirs.patch new file mode 100644 index 0000000000..29df98a693 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/gnu-install-dirs.patch @@ -0,0 +1,417 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 247ad36d3845..815e2c4ba955 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -269,15 +269,21 @@ if (CMAKE_BUILD_TYPE AND + message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") + endif() + ++include(GNUInstallDirs) ++ + set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) + +-set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") ++set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING ++ "Path for binary subdirectory (defaults to 'bin')") + mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) + + set(LLVM_UTILS_INSTALL_DIR "${LLVM_TOOLS_INSTALL_DIR}" CACHE STRING + "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") + mark_as_advanced(LLVM_UTILS_INSTALL_DIR) + ++set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING ++ "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) ++ + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) + set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) +@@ -559,9 +565,9 @@ option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) + option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) + option (LLVM_ENABLE_BINDINGS "Build bindings." ON) + +-set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" ++set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html" + CACHE STRING "Doxygen-generated HTML documentation install directory") +-set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" ++set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html" + CACHE STRING "OCamldoc-generated HTML documentation install directory") + + option (LLVM_BUILD_EXTERNAL_COMPILER_RT +@@ -1107,7 +1113,7 @@ endif() + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/llvm include/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +@@ -1119,7 +1125,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +@@ -1134,13 +1140,13 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + if (LLVM_INSTALL_MODULEMAPS) + install(DIRECTORY include/llvm include/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "module.modulemap" + ) + install(FILES include/llvm/module.install.modulemap +- DESTINATION include/llvm ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm + COMPONENT llvm-headers + RENAME "module.extern.modulemap" + ) +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index b74adc11ade9..a5aa258cde30 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -766,9 +766,9 @@ macro(add_llvm_library name) + + install(TARGETS ${name} + ${export_to_llvmexports} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} +- RUNTIME DESTINATION bin COMPONENT ${name}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${name}) + + if (NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-${name} +@@ -981,7 +981,7 @@ function(process_llvm_pass_plugins) + "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})") + install(FILES + ${llvm_cmake_builddir}/LLVMConfigExtensions.cmake +- DESTINATION ${LLVM_INSTALL_PACKAGE_DIR} ++ DESTINATION ${LLVM_INSTALL_CMAKE_DIR} + COMPONENT cmake-exports) + + set(ExtensionDef "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def") +@@ -1201,7 +1201,7 @@ macro(add_llvm_example name) + endif() + add_llvm_executable(${name} ${ARGN}) + if( LLVM_BUILD_EXAMPLES ) +- install(TARGETS ${name} RUNTIME DESTINATION examples) ++ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) + endif() + set_target_properties(${name} PROPERTIES FOLDER "Examples") + endmacro(add_llvm_example name) +@@ -1819,7 +1819,7 @@ function(llvm_install_library_symlink name dest type) + set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) + set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) + +- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 AND "${type}" STREQUAL "SHARED") + set(output_dir bin) + endif() +@@ -1836,7 +1836,7 @@ function(llvm_install_library_symlink name dest type) + endif() + endfunction() + +-function(llvm_install_symlink name dest) ++function(llvm_install_symlink name dest output_dir) + cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) + foreach(path ${CMAKE_MODULE_PATH}) + if(EXISTS ${path}/LLVMInstallSymlink.cmake) +@@ -1859,7 +1859,7 @@ function(llvm_install_symlink name dest) + set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) + + install(SCRIPT ${INSTALL_SYMLINK} +- CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" ++ CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" + COMPONENT ${component}) + + if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE) +@@ -1942,7 +1942,8 @@ function(add_llvm_tool_symlink link_name target) + endif() + + if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) +- llvm_install_symlink(${link_name} ${target}) ++ GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR) ++ llvm_install_symlink(${link_name} ${target} ${output_dir}) + endif() + endif() + endfunction() +@@ -2064,9 +2065,9 @@ function(llvm_setup_rpath name) + + if (APPLE) + set(_install_name_dir INSTALL_NAME_DIR "@rpath") +- set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + elseif(UNIX) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + set_property(TARGET ${name} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-z,origin ") +diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake +index 554046b20edf..4d1ad980641e 100644 +--- a/cmake/modules/AddOCaml.cmake ++++ b/cmake/modules/AddOCaml.cmake +@@ -144,9 +144,9 @@ function(add_ocaml_library name) + endforeach() + + if( APPLE ) +- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + elseif( UNIX ) +- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + endif() + list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") + +diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake +index b5babb30abcf..190b1222a9f9 100644 +--- a/cmake/modules/AddSphinxTarget.cmake ++++ b/cmake/modules/AddSphinxTarget.cmake +@@ -84,7 +84,7 @@ function (add_sphinx_target builder project) + endif() + elseif (builder STREQUAL html) + string(TOUPPER "${project}" project_upper) +- set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" ++ set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html" + CACHE STRING "HTML documentation install directory for ${project}") + + # '/.' indicates: copy the contents of the directory directly into +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index 4b8879f65fe4..f01920bcc60f 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -1,4 +1,4 @@ +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + # First for users who use an installed LLVM, create the LLVMExports.cmake file. +@@ -108,13 +108,13 @@ foreach(p ${_count}) + set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} + get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") + endforeach(p) +-set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") ++set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") + set(LLVM_CONFIG_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}") + set(LLVM_CONFIG_MAIN_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}") +-set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") ++set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") + set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") +-set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") ++set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") + + # Generate a default location for lit + if (LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS) +diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake +index 09fed8085c23..aa79f192abf0 100644 +--- a/cmake/modules/LLVMInstallSymlink.cmake ++++ b/cmake/modules/LLVMInstallSymlink.cmake +@@ -10,7 +10,7 @@ function(install_symlink name target outdir) + set(LINK_OR_COPY copy) + endif() + +- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") ++ set(bindir "${DESTDIR}${outdir}/") + + message(STATUS "Creating ${name}") + +diff --git a/docs/CMake.rst b/docs/CMake.rst +index 1f908d3e95b1..1315e0aa40e1 100644 +--- a/docs/CMake.rst ++++ b/docs/CMake.rst +@@ -196,7 +196,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. + **LLVM_LIBDIR_SUFFIX**:STRING + Extra suffix to append to the directory where libraries are to be + installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` +- to install libraries to ``/usr/lib64``. ++ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. + + **CMAKE_C_FLAGS**:STRING + Extra flags to use when compiling C source files. +@@ -516,8 +516,8 @@ LLVM-specific variables + + **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING + The path to install Doxygen-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/doxygen-html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. + + **LLVM_ENABLE_SPHINX**:BOOL + If specified, CMake will search for the ``sphinx-build`` executable and will make +@@ -548,13 +548,33 @@ LLVM-specific variables + + **LLVM_INSTALL_SPHINX_HTML_DIR**:STRING + The path to install Sphinx-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/html`. + + **LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING + The path to install OCamldoc-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/ocaml-html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html`. ++ ++**CMAKE_INSTALL_BINDIR**:STRING ++ The path to install binary tools, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `bin`. ++ ++**CMAKE_INSTALL_LIBDIR**:STRING ++ The path to install libraries, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `lib`. ++ ++**CMAKE_INSTALL_INCLUDEDIR**:STRING ++ The path to install header files, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `include`. ++ ++**CMAKE_INSTALL_DOCDIR**:STRING ++ The path to install documentation, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `share/doc`. ++ ++**CMAKE_INSTALL_MANDIR**:STRING ++ The path to install manpage files, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `share/man`. + + **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL + macOS Only: If enabled CMake will generate a target named +@@ -752,9 +772,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). + + This file is available in two different locations. + +-* ``/lib/cmake/llvm/LLVMConfig.cmake`` where +- ```` is the install prefix of an installed version of LLVM. +- On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. ++* ``LLVMConfig.cmake`` where ++ ```` is the location where LLVM CMake modules are ++ installed as part of an installed version of LLVM. This is typically ++ ``cmake/llvm/`` within the lib directory. On Linux, this is typically ++ ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. + + * ``/lib/cmake/llvm/LLVMConfig.cmake`` where + ```` is the root of the LLVM build tree. **Note: this is only +diff --git a/examples/Bye/CMakeLists.txt b/examples/Bye/CMakeLists.txt +index bb96edb4b4bf..678c22fb43c8 100644 +--- a/examples/Bye/CMakeLists.txt ++++ b/examples/Bye/CMakeLists.txt +@@ -14,6 +14,6 @@ if (NOT WIN32) + BUILDTREE_ONLY + ) + +- install(TARGETS ${name} RUNTIME DESTINATION examples) ++ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) + set_target_properties(${name} PROPERTIES FOLDER "Examples") + endif() +diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt +index b46319f24fc8..2feabd1954e4 100644 +--- a/include/llvm/CMakeLists.txt ++++ b/include/llvm/CMakeLists.txt +@@ -5,5 +5,5 @@ add_subdirectory(Frontend) + # If we're doing an out-of-tree build, copy a module map for generated + # header files into the build area. + if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +- configure_file(module.modulemap.build module.modulemap COPYONLY) ++ configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) + endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index 63cef75368b7..6295478b1f3d 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -23,6 +23,10 @@ + #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" ++#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" ++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" ++#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" ++#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" + #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" + #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 7e74b7c90816..f185e9283f83 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -358,12 +358,26 @@ int main(int argc, char **argv) { + ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); + } else { + ActivePrefix = CurrentExecPrefix; +- ActiveIncludeDir = ActivePrefix + "/include"; +- SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); +- sys::fs::make_absolute(ActivePrefix, path); +- ActiveBinDir = std::string(path.str()); +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; +- ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveIncludeDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveBinDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveLibDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveCMakeDir = std::string(path.str()); ++ } + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + +diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt +index 2963f97cad88..69d66c9c9ca1 100644 +--- a/tools/lto/CMakeLists.txt ++++ b/tools/lto/CMakeLists.txt +@@ -25,7 +25,7 @@ add_llvm_library(LTO SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES} DEPENDS + intrinsics_gen) + + install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h +- DESTINATION include/llvm-c ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c + COMPONENT LTO) + + if (APPLE) +diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt +index ead73ec13a8f..250362021f17 100644 +--- a/tools/opt-viewer/CMakeLists.txt ++++ b/tools/opt-viewer/CMakeLists.txt +@@ -8,7 +8,7 @@ set (files + + foreach (file ${files}) + install(PROGRAMS ${file} +- DESTINATION share/opt-viewer ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer + COMPONENT opt-viewer) + endforeach (file) + +diff --git a/tools/remarks-shlib/CMakeLists.txt b/tools/remarks-shlib/CMakeLists.txt +index e948496c603a..1f4df8a98b10 100644 +--- a/tools/remarks-shlib/CMakeLists.txt ++++ b/tools/remarks-shlib/CMakeLists.txt +@@ -11,7 +11,7 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/Remarks.exports) + add_llvm_library(Remarks SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES}) + + install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h +- DESTINATION include/llvm-c ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c + COMPONENT Remarks) + + if (APPLE) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix index ab329e3d85..3d1106dbc5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld +{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +, buildLlvmTools , fixDarwinDylibNames , enableManpages ? false }: @@ -18,26 +19,31 @@ let unpackFile ${clang-tools-extra_src} ''; - nativeBuildInputs = [ cmake python3 lld ] + nativeBuildInputs = [ cmake python3 ] ++ lib.optional enableManpages python3.pkgs.sphinx ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libxml2 llvm ]; + buildInputs = [ libxml2 libllvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++14" "-DCLANGD_BUILD_XPC=OFF" + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" ]; patches = [ ./purity.patch # https://reviews.llvm.org/D51899 + ./gnu-install-dirs.patch ]; postPatch = '' @@ -51,12 +57,12 @@ let sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; - outputs = [ "out" "lib" "python" ]; + outputs = [ "out" "lib" "dev" "python" ]; # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${llvm}/lib/LLVMgold.so ]; then - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then + ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib fi ln -sv $out/bin/clang $out/bin/cpp @@ -75,11 +81,14 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + + mkdir -p $dev/bin + cp bin/clang-tblgen $dev/bin ''; passthru = { isClang = true; - inherit llvm; + inherit libllvm; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/gnu-install-dirs.patch new file mode 100644 index 0000000000..b834d386b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/gnu-install-dirs.patch @@ -0,0 +1,235 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9e74014134a0..976e6a1757fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.13.4) + if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) + project(Clang) + ++ include(GNUInstallDirs) ++ + set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to") + set(CMAKE_CXX_STANDARD_REQUIRED YES) + set(CMAKE_CXX_EXTENSIONS NO) +@@ -416,7 +418,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/clang include/clang-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT clang-headers + FILES_MATCHING + PATTERN "*.def" +@@ -425,7 +427,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT clang-headers + FILES_MATCHING + PATTERN "CMakeFiles" EXCLUDE +@@ -445,7 +447,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + add_custom_target(bash-autocomplete DEPENDS utils/bash-autocomplete.sh) + install(PROGRAMS utils/bash-autocomplete.sh +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT bash-autocomplete) + if(NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-bash-autocomplete +diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake +index 704278a0e93b..d25c8d325c71 100644 +--- a/cmake/modules/AddClang.cmake ++++ b/cmake/modules/AddClang.cmake +@@ -123,9 +123,9 @@ macro(add_clang_library name) + install(TARGETS ${lib} + COMPONENT ${lib} + ${export_to_clangtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-${lib} +@@ -170,7 +170,7 @@ macro(add_clang_tool name) + + install(TARGETS ${name} + ${export_to_clangtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT LLVM_ENABLE_IDE) +@@ -185,7 +185,7 @@ endmacro() + macro(add_clang_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() + + function(clang_target_link_libraries target type) +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index b2c0ce8dd4a0..19e5443d8c25 100644 +--- a/lib/Headers/CMakeLists.txt ++++ b/lib/Headers/CMakeLists.txt +@@ -215,7 +215,7 @@ set_target_properties(clang-resource-headers PROPERTIES + FOLDER "Misc" + RUNTIME_OUTPUT_DIRECTORY "${output_dir}") + +-set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) ++set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) + + install( + FILES ${files} ${generated_files} +diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt +index ceef4b08637c..8efad5520ca4 100644 +--- a/tools/c-index-test/CMakeLists.txt ++++ b/tools/c-index-test/CMakeLists.txt +@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH + "@executable_path/../../lib") + else() +- set(INSTALL_DESTINATION bin) ++ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + + install(TARGETS c-index-test +diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt +index 35ecdb11253c..d77d75de0094 100644 +--- a/tools/clang-format/CMakeLists.txt ++++ b/tools/clang-format/CMakeLists.txt +@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE ) + endif() + + install(PROGRAMS clang-format-bbedit.applescript +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-diff.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-sublime.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS git-clang-format +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT clang-format) +diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt +index cda8e29ec5b1..0134d8ccd70b 100644 +--- a/tools/clang-rename/CMakeLists.txt ++++ b/tools/clang-rename/CMakeLists.txt +@@ -19,8 +19,8 @@ clang_target_link_libraries(clang-rename + ) + + install(PROGRAMS clang-rename.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) + install(PROGRAMS clang-rename.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) +diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt +index 51ff2e7e1565..1ed5f8a079a1 100644 +--- a/tools/libclang/CMakeLists.txt ++++ b/tools/libclang/CMakeLists.txt +@@ -166,7 +166,7 @@ endif() + if(INTERNAL_INSTALL_PREFIX) + set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") + else() +- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) ++ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + install(DIRECTORY ../../include/clang-c +@@ -196,7 +196,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) + COMPONENT + libclang-python-bindings + DESTINATION +- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") ++ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") + endforeach() + if(NOT LLVM_ENABLE_IDE) + add_custom_target(libclang-python-bindings) +diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt +index ec0702d76f18..d25d982f51da 100644 +--- a/tools/scan-build/CMakeLists.txt ++++ b/tools/scan-build/CMakeLists.txt +@@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) + install(PROGRAMS bin/${BinFile} +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT scan-build) + endforeach() + +@@ -61,7 +61,7 @@ if(CLANG_INSTALL_SCANBUILD) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) + install(PROGRAMS libexec/${LibexecFile} +- DESTINATION libexec ++ DESTINATION ${CMAKE_INSTALL_LIBEXECDIR} + COMPONENT scan-build) + endforeach() + +@@ -89,7 +89,7 @@ if(CLANG_INSTALL_SCANBUILD) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) + install(FILES share/scan-build/${ShareFile} +- DESTINATION share/scan-build ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build + COMPONENT scan-build) + endforeach() + +diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt +index dd3d33439299..fea19c12ce70 100644 +--- a/tools/scan-view/CMakeLists.txt ++++ b/tools/scan-view/CMakeLists.txt +@@ -19,7 +19,7 @@ if(CLANG_INSTALL_SCANVIEW) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) + install(PROGRAMS bin/${BinFile} +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT scan-view) + endforeach() + +@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) + install(FILES share/${ShareFile} +- DESTINATION share/scan-view ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view + COMPONENT scan-view) + endforeach() + +diff --git a/utils/hmaptool/CMakeLists.txt b/utils/hmaptool/CMakeLists.txt +index 62f2de0cb15c..6aa66825b6ec 100644 +--- a/utils/hmaptool/CMakeLists.txt ++++ b/utils/hmaptool/CMakeLists.txt +@@ -10,7 +10,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM + + list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) + install(PROGRAMS ${CLANG_HMAPTOOL} +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT hmaptool) + + add_custom_target(hmaptool ALL DEPENDS ${Depends}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-X86-support-extension.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/X86-support-extension.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-X86-support-extension.patch rename to third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/X86-support-extension.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-armv7l.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/armv7l.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-armv7l.patch rename to third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/armv7l.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-codesign.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/codesign.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-codesign.patch rename to third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/codesign.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/default.nix index bf7f4bc431..b880a0071b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { inherit version; src = fetch pname "0d444qihq9jhqnfv003cr704v363va72zl6qaw2algj1c85cva45"; - nativeBuildInputs = [ cmake python3 llvm ]; + nativeBuildInputs = [ cmake python3 llvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ @@ -24,9 +24,6 @@ stdenv.mkDerivation rec { "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - ] ++ lib.optionals (stdenv.isDarwin) [ - "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" - "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" @@ -44,15 +41,23 @@ stdenv.mkDerivation rec { "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" ] ++ lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" + "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}" ]; outputs = [ "out" "dev" ]; patches = [ - ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ./compiler-rt-X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config + ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ./X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config + ./gnu-install-dirs.patch + # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the + # extra `/`. + ./normalize-var.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch - ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; + ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 0000000000..5f025764de --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,129 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b44ad2c2118e..d42f5664d448 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 3.13.4) + # Check if compiler-rt is built as a standalone project. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) + project(CompilerRT C CXX ASM) ++ include(GNUInstallDirs) + set(COMPILER_RT_STANDALONE_BUILD TRUE) + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + endif() +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index 361538a58e47..f0d8d9ab80f1 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -495,7 +495,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) + add_custom_target(${target_name} DEPENDS ${dst_file}) + # Install in Clang resource directory. + install(FILES ${file_name} +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR} + COMPONENT ${component}) + add_dependencies(${component} ${target_name}) + +@@ -512,7 +512,7 @@ macro(add_compiler_rt_script name) + add_custom_target(${name} DEPENDS ${dst}) + install(FILES ${dst} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR}) + endmacro(add_compiler_rt_script src name) + + # Builds custom version of libc++ and installs it in . +diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake +index 456a8dcda59f..7a09e74c7c79 100644 +--- a/cmake/Modules/CompilerRTDarwinUtils.cmake ++++ b/cmake/Modules/CompilerRTDarwinUtils.cmake +@@ -508,7 +508,7 @@ macro(darwin_add_embedded_builtin_libraries) + set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded) + set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded) + + set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi") + set(CFLAGS_i386 "-march=pentium") +diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake +index f61d487e93a0..f1f46fb9599c 100644 +--- a/cmake/Modules/CompilerRTUtils.cmake ++++ b/cmake/Modules/CompilerRTUtils.cmake +@@ -378,7 +378,7 @@ endfunction() + function(get_compiler_rt_install_dir arch install_dir) + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + get_compiler_rt_target(${arch} target) +- set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/lib/${target} PARENT_SCOPE) ++ set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${target} PARENT_SCOPE) + else() + set(${install_dir} ${COMPILER_RT_LIBRARY_INSTALL_DIR} PARENT_SCOPE) + endif() +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index 1edab43e7c0d..1aac6b73ff82 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -65,11 +65,11 @@ if (LLVM_TREE_AVAILABLE) + else() + # Take output dir and install path from the user. + set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH +- "Path where built compiler-rt libraries should be stored.") ++ "Path where built compiler-rt build artifacts should be stored.") + set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH + "Path where built compiler-rt executables should be stored.") +- set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH +- "Path where built compiler-rt libraries should be installed.") ++ set(COMPILER_RT_INSTALL_PATH "" CACHE PATH ++ "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.") + option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF) + option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) + # Use a host compiler to compile/link tests. +@@ -97,7 +97,7 @@ else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) + set(COMPILER_RT_LIBRARY_OUTPUT_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) + set(COMPILER_RT_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR}) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) + endif() + + if(APPLE) +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index b00e8caa1ddd..0fe64e4862c9 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -69,22 +69,22 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") + install(FILES ${SANITIZER_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer) + # Install fuzzer headers. + install(FILES ${FUZZER_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/fuzzer) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/fuzzer) + # Install xray headers. + install(FILES ${XRAY_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray) + # Install profile headers. + install(FILES ${PROFILE_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/profile) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/profile) + + if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs. + add_custom_target(install-compiler-rt-headers +diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt +index a29de8deff1b..d39ff01613d2 100644 +--- a/lib/dfsan/CMakeLists.txt ++++ b/lib/dfsan/CMakeLists.txt +@@ -57,4 +57,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename} + DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt) + add_dependencies(dfsan dfsan_abilist) + install(FILES ${dfsan_abilist_filename} +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/normalize-var.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/normalize-var.patch new file mode 100644 index 0000000000..135cf625ef --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/normalize-var.patch @@ -0,0 +1,16 @@ +diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +index f1f46fb9599c..6f19e69507ba 100644 +--- a/cmake/Modules/CompilerRTUtils.cmake ++++ b/cmake/Modules/CompilerRTUtils.cmake +@@ -302,8 +302,9 @@ macro(load_llvm_config) + # Get some LLVM variables from LLVMConfig. + include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake") + +- set(LLVM_LIBRARY_OUTPUT_INTDIR +- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR ++ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} ++ REALPATH) + endif() + endmacro() + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix index a6d68d2e2a..ea054107e0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix @@ -1,6 +1,5 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith -, buildPackages , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross , darwin @@ -27,34 +26,41 @@ let }; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); - mkExtraBuildCommands = cc: '' + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); + mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" + ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + ''; + mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; in { - llvm = callPackage ./llvm { + libllvm = callPackage ./llvm { inherit llvm_meta; }; - clang-unwrapped = callPackage ./clang { - inherit (tools) lld; + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputUnspecified = true; }; + + libclang = callPackage ./clang { inherit clang-tools-extra_src llvm_meta; }; + clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; + # disabled until recommonmark supports sphinx 3 - #Llvm-manpages = lowPrio (tools.llvm.override { + #Llvm-manpages = lowPrio (tools.libllvm.override { # enableManpages = true; # python3 = pkgs.python3; # don't use python-boot #}); - clang-manpages = lowPrio (tools.clang-unwrapped.override { + clang-manpages = lowPrio (tools.libclang.override { enableManpages = true; python3 = pkgs.python3; # don't use python-boot }); @@ -65,8 +71,6 @@ let # python3 = pkgs.python3; # don't use python-boot # }); - libclang = tools.clang-unwrapped.lib; - clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; libstdcxxClang = wrapCCWith rec { @@ -164,7 +168,7 @@ let '' + mkExtraBuildCommands cc; }; - lldClangNoCompilerRt = wrapCCWith { + lldClangNoCompilerRt = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = null; bintools = wrapBintoolsWith { @@ -174,7 +178,7 @@ let extraPackages = [ ]; extraBuildCommands = '' echo "-nostartfiles" >> $out/nix-support/cc-cflags - ''; + '' + mkExtraBuildCommands0 cc; }; }); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/default.nix index dab6c583e8..7c97426243 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch} '' + lib.optionalString stdenv.hostPlatform.isWasm '' - patch -p1 -d llvm -i ${./libcxxabi-wasm.patch} + patch -p1 -d llvm -i ${./wasm.patch} ''; installPhase = if stdenv.isDarwin diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/libcxxabi-wasm.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/wasm.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/libcxxabi-wasm.patch rename to third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/wasm.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libunwind/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libunwind/default.nix index 8b75146d7b..abfe950614 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libunwind/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libunwind/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { mv llvm-* llvm ''; + patches = [ + ./gnu-install-dirs.patch + ]; + + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libunwind/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libunwind/gnu-install-dirs.patch new file mode 100644 index 0000000000..a791d6c432 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libunwind/gnu-install-dirs.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 48cb8e004e08..fec8144fb95a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,6 +23,8 @@ set(LIBUNWIND_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_BUILD) + project(libunwind LANGUAGES C CXX ASM) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libunwind) + set(PACKAGE_VERSION 12.0.0) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +@@ -115,17 +117,17 @@ set(CMAKE_MODULE_PATH + + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) + string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) + endif() + elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX}) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX}) + else() + set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX}) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX}) + endif() + + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBUNWIND_LIBRARY_DIR}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lld/default.nix index 18b72a9040..d46f25b68b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lld/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, llvm_meta +, buildLlvmTools , fetch , libunwind , cmake , libxml2 -, llvm +, libllvm , version }: @@ -13,8 +14,20 @@ stdenv.mkDerivation rec { src = fetch pname "1zakyxk5bwnh7jarckcd4rbmzi58jgn2dbah5j5cwcyfyfbx9drc"; + patches = [ + ./gnu-install-dirs.patch + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ llvm libxml2 ]; + buildInputs = [ libllvm libxml2 ]; + + cmakeFlags = [ + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ]; + + outputs = [ "out" "lib" "dev" ]; postPatch = '' substituteInPlace MachO/CMakeLists.txt --replace \ @@ -23,13 +36,6 @@ stdenv.mkDerivation rec { tar -xf "${libunwind.src}" --wildcards -C libunwind/include --strip-components=2 "libunwind-*/include/" ''; - outputs = [ "out" "dev" ]; - - postInstall = '' - moveToOutput include "$dev" - moveToOutput lib "$dev" - ''; - meta = llvm_meta // { homepage = "https://lld.llvm.org/"; description = "The LLVM linker"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lld/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lld/gnu-install-dirs.patch new file mode 100644 index 0000000000..61e2f0e486 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lld/gnu-install-dirs.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d4e561b50d8f..cfa5bdd79c2a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(LLD_BUILT_STANDALONE TRUE) + ++ include(GNUInstallDirs) ++ + find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") + if(NOT LLVM_CONFIG_PATH) + message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") +@@ -179,7 +181,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + ) +diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake +index 23df41312403..d62372c88de7 100644 +--- a/cmake/modules/AddLLD.cmake ++++ b/cmake/modules/AddLLD.cmake +@@ -20,9 +20,9 @@ macro(add_lld_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_lldtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-${name} +@@ -54,7 +54,7 @@ macro(add_lld_tool name) + + install(TARGETS ${name} + ${export_to_lldtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT CMAKE_CONFIGURATION_TYPES) +@@ -69,5 +69,5 @@ endmacro() + macro(add_lld_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() +diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt +index 5cff736ff57f..64e775c771b9 100644 +--- a/tools/lld/CMakeLists.txt ++++ b/tools/lld/CMakeLists.txt +@@ -21,7 +21,7 @@ target_link_libraries(lld + ) + + install(TARGETS lld +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if(NOT LLD_SYMLINKS_TO_CREATE) + set(LLD_SYMLINKS_TO_CREATE diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/default.nix index 1fce82d799..07517308b4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, llvm_meta +, runCommand , fetch , cmake , zlib @@ -7,8 +8,8 @@ , which , libedit , libxml2 -, llvm -, clang-unwrapped +, libllvm +, libclang , python3 , version , libobjc @@ -27,17 +28,30 @@ stdenv.mkDerivation (rec { src = fetch pname "1v85qyq3snk81vjmwq5q7xikyyqsfpqy2c4qmr81mps4avsw1g0l"; - patches = [ ./lldb-procfs.patch ]; + patches = [ + ./procfs.patch + (runCommand "resource-dir.patch" { + clangLibDir = "${libclang.lib}/lib"; + } '' + substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir + '') + ./gnu-install-dirs.patch + ]; - nativeBuildInputs = [ cmake python3 which swig lit ] - ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ + cmake python3 which swig lit + ] ++ lib.optionals enableManpages [ + python3.pkgs.sphinx python3.pkgs.recommonmark + ]; buildInputs = [ ncurses zlib libedit libxml2 - llvm + libllvm ] ++ lib.optionals stdenv.isDarwin [ libobjc @@ -51,8 +65,9 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "format" ]; cmakeFlags = [ + "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" "-DLLVM_ENABLE_RTTI=OFF" - "-DClang_DIR=${clang-unwrapped}/lib/cmake" + "-DClang_DIR=${libclang.dev}/lib/cmake" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" ] ++ lib.optionals stdenv.isDarwin [ "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" @@ -62,8 +77,13 @@ stdenv.mkDerivation (rec { "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" + ] ++ lib.optionals doCheck [ + "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" ]; + doCheck = false; + postInstall = '' # Editor support # vscode: @@ -90,6 +110,7 @@ stdenv.mkDerivation (rec { ''; propagatedBuildInputs = []; + # manually install lldb man page installPhase = '' mkdir -p $out/share/man/man1 diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch new file mode 100644 index 0000000000..98321f4479 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch @@ -0,0 +1,65 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b5633e21c56a..f2f1035e9238 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,6 +10,8 @@ set(CMAKE_MODULE_PATH + # If we are not building as part of LLVM, build LLDB as a standalone project, + # using LLVM as an external library. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) ++ include(GNUInstallDirs) ++ + project(lldb) + include(LLDBStandalone) + +diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake +index 4ed5c647c5d2..89f96e710d55 100644 +--- a/cmake/modules/AddLLDB.cmake ++++ b/cmake/modules/AddLLDB.cmake +@@ -107,13 +107,13 @@ function(add_lldb_library name) + endif() + + if(PARAM_SHARED) +- set(install_dest lib${LLVM_LIBDIR_SUFFIX}) ++ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(PARAM_INSTALL_PREFIX) + set(install_dest ${PARAM_INSTALL_PREFIX}) + endif() + # RUNTIME is relevant for DLL platforms, FRAMEWORK for macOS + install(TARGETS ${name} COMPONENT ${name} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${install_dest} + ARCHIVE DESTINATION ${install_dest} + FRAMEWORK DESTINATION ${install_dest}) +diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake +index 2fdf1502d055..37364341ff8b 100644 +--- a/cmake/modules/LLDBConfig.cmake ++++ b/cmake/modules/LLDBConfig.cmake +@@ -225,7 +225,7 @@ include_directories(BEFORE + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ + COMPONENT lldb-headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".cmake" EXCLUDE +@@ -233,7 +233,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ + COMPONENT lldb-headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".cmake" EXCLUDE +diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt +index 734167e51bc5..f95761b5df58 100644 +--- a/tools/intel-features/CMakeLists.txt ++++ b/tools/intel-features/CMakeLists.txt +@@ -65,4 +65,4 @@ if (LLDB_ENABLE_PYTHON AND LLDB_BUILD_INTEL_PT) + endif() + + install(TARGETS lldbIntelFeatures +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/lldb-procfs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/procfs.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/lldb-procfs.patch rename to third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/procfs.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/resource-dir.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/resource-dir.patch new file mode 100644 index 0000000000..e0db80afeb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb/resource-dir.patch @@ -0,0 +1,13 @@ +diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake +index 37364341ff8b..7f74c1a3e257 100644 +--- a/cmake/modules/LLDBConfig.cmake ++++ b/cmake/modules/LLDBConfig.cmake +@@ -257,7 +257,7 @@ if (NOT TARGET clang-resource-headers) + # Iterate over the possible places where the external resource directory + # could be and pick the first that exists. + foreach(CANDIDATE "${Clang_DIR}/../.." "${LLVM_DIR}" "${LLVM_LIBRARY_DIRS}" +- "${LLVM_BUILD_LIBRARY_DIR}" ++ "${LLVM_BUILD_LIBRARY_DIR}" "@clangLibDir@" + "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}") + # Build the resource directory path by appending 'clang/'. + set(CANDIDATE_RESOURCE_DIR "${CANDIDATE}/clang/${LLDB_CLANG_RESOURCE_DIR_NAME}") diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix index 33bb7b931f..0bc704a815 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, llvm_meta +, pkgsBuildBuild , fetch , cmake , python3 @@ -10,10 +11,10 @@ , version , release_version , zlib -, buildPackages +, buildLlvmTools , debugVersion ? false , enableManpages ? false -, enableSharedLibraries ? true +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 || stdenv.isAarch32 # broken for the armv7l builder @@ -44,8 +45,7 @@ in stdenv.mkDerivation (rec { mv polly-* $sourceRoot/tools/polly ''; - outputs = [ "out" "python" ] - ++ optional enableSharedLibraries "lib"; + outputs = [ "out" "lib" "dev" "python" ]; nativeBuildInputs = [ cmake python3 ] ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; @@ -59,17 +59,18 @@ in stdenv.mkDerivation (rec { # Force a test to evaluate the saved benchmark for a CPU for which LLVM has # an execution model. See NixOS/nixpkgs#119673. ../../exegesis-force-bdver2.patch - ]; + ./gnu-install-dirs.patch + ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../lib''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" + --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + optionalString (enableSharedLibraries) '' - substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib - patch -p1 < ./llvm-outputs.patch + substitute '${./outputs.patch}' ./outputs.patch --subst-var lib + patch -p1 < ./outputs.patch '' + '' # FileSystem permissions tests fail with various special bits substituteInPlace unittests/Support/CMakeLists.txt \ @@ -108,6 +109,7 @@ in stdenv.mkDerivation (rec { LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; cmakeFlags = with stdenv; [ + "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=ON" @@ -131,11 +133,24 @@ in stdenv.mkDerivation (rec { "-DCAN_TARGET_i386=false" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildPackages.llvm_12}/bin/llvm-tblgen" + "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ( + let + nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; + nativeBintools = nativeCC.bintools.bintools; + nativeToolchainFlags = [ + "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" + "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" + "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" + "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" + "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" + ]; + in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=${lib.concatStringsSep ";" nativeToolchainFlags}" + ) ]; postBuild = '' - rm -R $out + rm -fR $out ''; preCheck = '' @@ -145,20 +160,19 @@ in stdenv.mkDerivation (rec { postInstall = '' mkdir -p $python/share mv $out/share/opt-viewer $python/share/opt-viewer - '' - + optionalString enableSharedLibraries '' - moveToOutput "lib/libLLVM-*" "$lib" - moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" - '' - + optionalString (enableSharedLibraries && (!stdenv.isDarwin)) '' - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" + moveToOutput "bin/llvm-config*" "$dev" + substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ + --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" + substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ + --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' '' + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + '' + + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; doCheck = stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/gnu-install-dirs-polly.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 0000000000..68f3c45396 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,105 @@ +diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt +index ca7c04c565bb..6ed5db5dd4f8 100644 +--- a/tools/polly/CMakeLists.txt ++++ b/tools/polly/CMakeLists.txt +@@ -2,7 +2,11 @@ + if (NOT DEFINED LLVM_MAIN_SRC_DIR) + project(Polly) + cmake_minimum_required(VERSION 3.13.4) ++endif() ++ ++include(GNUInstallDirs) + ++if (NOT DEFINED LLVM_MAIN_SRC_DIR) + # Where is LLVM installed? + find_package(LLVM CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) +@@ -122,13 +126,13 @@ include_directories( + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + ) + + install(DIRECTORY ${POLLY_BINARY_DIR}/include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE +diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt +index 7cc129ba2e90..137be25e4b80 100644 +--- a/tools/polly/cmake/CMakeLists.txt ++++ b/tools/polly/cmake/CMakeLists.txt +@@ -79,18 +79,18 @@ file(GENERATE + + # Generate PollyConfig.cmake for the install tree. + unset(POLLY_EXPORTS) +-set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") ++set(POLLY_INSTALL_PREFIX "") + set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") ++set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") ++set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + if (POLLY_BUNDLED_ISL) + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" +- "${POLLY_INSTALL_PREFIX}/include/polly" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" + ) + else() + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" + ${ISL_INCLUDE_DIRS} + ) + endif() +@@ -100,12 +100,12 @@ endif() + foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) + get_target_property(tgt_type ${tgt} TYPE) + if (tgt_type STREQUAL "EXECUTABLE") +- set(tgt_prefix "bin/") ++ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") + else() +- set(tgt_prefix "lib/") ++ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") + endif() + +- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$") ++ set(tgt_path "${tgt_prefix}$") + file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) + + if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") +diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake +index 518a09b45a42..bd9d6f5542ad 100644 +--- a/tools/polly/cmake/polly_macros.cmake ++++ b/tools/polly/cmake/polly_macros.cmake +@@ -44,8 +44,8 @@ macro(add_polly_library name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") + install(TARGETS ${name} + EXPORT LLVMExports +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) + endmacro(add_polly_library) +diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt +index 8991094d92c7..178d8ad606bb 100644 +--- a/tools/polly/lib/External/CMakeLists.txt ++++ b/tools/polly/lib/External/CMakeLists.txt +@@ -275,7 +275,7 @@ if (POLLY_BUNDLED_ISL) + install(DIRECTORY + ${ISL_SOURCE_DIR}/include/ + ${ISL_BINARY_DIR}/include/ +- DESTINATION include/polly ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/gnu-install-dirs.patch new file mode 100644 index 0000000000..da8dc14451 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/gnu-install-dirs.patch @@ -0,0 +1,417 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 277d0fe54d7b..af69c8be8745 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -256,15 +256,21 @@ if (CMAKE_BUILD_TYPE AND + message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") + endif() + ++include(GNUInstallDirs) ++ + set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) + +-set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") ++set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING ++ "Path for binary subdirectory (defaults to 'bin')") + mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) + + set(LLVM_UTILS_INSTALL_DIR "${LLVM_TOOLS_INSTALL_DIR}" CACHE STRING + "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") + mark_as_advanced(LLVM_UTILS_INSTALL_DIR) + ++set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING ++ "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) ++ + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) + set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) +@@ -567,9 +573,9 @@ option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) + option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) + option (LLVM_ENABLE_BINDINGS "Build bindings." ON) + +-set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" ++set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html" + CACHE STRING "Doxygen-generated HTML documentation install directory") +-set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" ++set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html" + CACHE STRING "OCamldoc-generated HTML documentation install directory") + + option (LLVM_BUILD_EXTERNAL_COMPILER_RT +@@ -1027,7 +1033,7 @@ endif() + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/llvm include/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +@@ -1038,7 +1044,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +@@ -1052,13 +1058,13 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + if (LLVM_INSTALL_MODULEMAPS) + install(DIRECTORY include/llvm include/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "module.modulemap" + ) + install(FILES include/llvm/module.install.modulemap +- DESTINATION include/llvm ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm + COMPONENT llvm-headers + RENAME "module.extern.modulemap" + ) +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index 97c9980c7de3..409e8b615f75 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -804,9 +804,9 @@ macro(add_llvm_library name) + + install(TARGETS ${name} + ${export_to_llvmexports} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} +- RUNTIME DESTINATION bin COMPONENT ${name}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${name}) + + if (NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-${name} +@@ -1022,7 +1022,7 @@ function(process_llvm_pass_plugins) + "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})") + install(FILES + ${llvm_cmake_builddir}/LLVMConfigExtensions.cmake +- DESTINATION ${LLVM_INSTALL_PACKAGE_DIR} ++ DESTINATION ${LLVM_INSTALL_CMAKE_DIR} + COMPONENT cmake-exports) + + set(ExtensionDef "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def") +@@ -1242,7 +1242,7 @@ macro(add_llvm_example name) + endif() + add_llvm_executable(${name} ${ARGN}) + if( LLVM_BUILD_EXAMPLES ) +- install(TARGETS ${name} RUNTIME DESTINATION examples) ++ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) + endif() + set_target_properties(${name} PROPERTIES FOLDER "Examples") + endmacro(add_llvm_example name) +@@ -1854,7 +1854,7 @@ function(llvm_install_library_symlink name dest type) + set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) + set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) + +- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 AND "${type}" STREQUAL "SHARED") + set(output_dir bin) + endif() +@@ -1871,7 +1871,7 @@ function(llvm_install_library_symlink name dest type) + endif() + endfunction() + +-function(llvm_install_symlink name dest) ++function(llvm_install_symlink name dest output_dir) + cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) + foreach(path ${CMAKE_MODULE_PATH}) + if(EXISTS ${path}/LLVMInstallSymlink.cmake) +@@ -1894,7 +1894,7 @@ function(llvm_install_symlink name dest) + set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) + + install(SCRIPT ${INSTALL_SYMLINK} +- CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" ++ CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" + COMPONENT ${component}) + + if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE) +@@ -1977,7 +1977,8 @@ function(add_llvm_tool_symlink link_name target) + endif() + + if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) +- llvm_install_symlink(${link_name} ${target}) ++ GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR) ++ llvm_install_symlink(${link_name} ${target} ${output_dir}) + endif() + endif() + endfunction() +@@ -2100,9 +2101,9 @@ function(llvm_setup_rpath name) + + if (APPLE) + set(_install_name_dir INSTALL_NAME_DIR "@rpath") +- set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + elseif(UNIX) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + set_property(TARGET ${name} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-z,origin ") +diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake +index 554046b20edf..4d1ad980641e 100644 +--- a/cmake/modules/AddOCaml.cmake ++++ b/cmake/modules/AddOCaml.cmake +@@ -144,9 +144,9 @@ function(add_ocaml_library name) + endforeach() + + if( APPLE ) +- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + elseif( UNIX ) +- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + endif() + list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") + +diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake +index e80c3b5c1cac..482f6d715ef5 100644 +--- a/cmake/modules/AddSphinxTarget.cmake ++++ b/cmake/modules/AddSphinxTarget.cmake +@@ -90,7 +90,7 @@ function (add_sphinx_target builder project) + endif() + elseif (builder STREQUAL html) + string(TOUPPER "${project}" project_upper) +- set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" ++ set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html" + CACHE STRING "HTML documentation install directory for ${project}") + + # '/.' indicates: copy the contents of the directory directly into +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index 505dc9a29d70..36e6c63af3f4 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -1,4 +1,4 @@ +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + # First for users who use an installed LLVM, create the LLVMExports.cmake file. +@@ -107,13 +107,13 @@ foreach(p ${_count}) + set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} + get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") + endforeach(p) +-set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") ++set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") + set(LLVM_CONFIG_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}") + set(LLVM_CONFIG_MAIN_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}") +-set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") ++set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") + set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") +-set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") ++set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") + + # Generate a default location for lit + if (LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS) +diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake +index 09fed8085c23..aa79f192abf0 100644 +--- a/cmake/modules/LLVMInstallSymlink.cmake ++++ b/cmake/modules/LLVMInstallSymlink.cmake +@@ -10,7 +10,7 @@ function(install_symlink name target outdir) + set(LINK_OR_COPY copy) + endif() + +- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") ++ set(bindir "${DESTDIR}${outdir}/") + + message(STATUS "Creating ${name}") + +diff --git a/docs/CMake.rst b/docs/CMake.rst +index bb821b417ad9..6a528f7c2ad3 100644 +--- a/docs/CMake.rst ++++ b/docs/CMake.rst +@@ -196,7 +196,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. + **LLVM_LIBDIR_SUFFIX**:STRING + Extra suffix to append to the directory where libraries are to be + installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` +- to install libraries to ``/usr/lib64``. ++ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. + + **CMAKE_C_FLAGS**:STRING + Extra flags to use when compiling C source files. +@@ -550,8 +550,8 @@ LLVM-specific variables + + **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING + The path to install Doxygen-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/doxygen-html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. + + **LLVM_ENABLE_SPHINX**:BOOL + If specified, CMake will search for the ``sphinx-build`` executable and will make +@@ -582,13 +582,33 @@ LLVM-specific variables + + **LLVM_INSTALL_SPHINX_HTML_DIR**:STRING + The path to install Sphinx-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/html`. + + **LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING + The path to install OCamldoc-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/ocaml-html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html`. ++ ++**CMAKE_INSTALL_BINDIR**:STRING ++ The path to install binary tools, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `bin`. ++ ++**CMAKE_INSTALL_LIBDIR**:STRING ++ The path to install libraries, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `lib`. ++ ++**CMAKE_INSTALL_INCLUDEDIR**:STRING ++ The path to install header files, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `include`. ++ ++**CMAKE_INSTALL_DOCDIR**:STRING ++ The path to install documentation, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `share/doc`. ++ ++**CMAKE_INSTALL_MANDIR**:STRING ++ The path to install manpage files, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `share/man`. + + **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL + macOS Only: If enabled CMake will generate a target named +@@ -786,9 +806,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). + + This file is available in two different locations. + +-* ``/lib/cmake/llvm/LLVMConfig.cmake`` where +- ```` is the install prefix of an installed version of LLVM. +- On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. ++* ``LLVMConfig.cmake`` where ++ ```` is the location where LLVM CMake modules are ++ installed as part of an installed version of LLVM. This is typically ++ ``cmake/llvm/`` within the lib directory. On Linux, this is typically ++ ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. + + * ``/lib/cmake/llvm/LLVMConfig.cmake`` where + ```` is the root of the LLVM build tree. **Note: this is only +diff --git a/examples/Bye/CMakeLists.txt b/examples/Bye/CMakeLists.txt +index bb96edb4b4bf..678c22fb43c8 100644 +--- a/examples/Bye/CMakeLists.txt ++++ b/examples/Bye/CMakeLists.txt +@@ -14,6 +14,6 @@ if (NOT WIN32) + BUILDTREE_ONLY + ) + +- install(TARGETS ${name} RUNTIME DESTINATION examples) ++ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) + set_target_properties(${name} PROPERTIES FOLDER "Examples") + endif() +diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt +index b46319f24fc8..2feabd1954e4 100644 +--- a/include/llvm/CMakeLists.txt ++++ b/include/llvm/CMakeLists.txt +@@ -5,5 +5,5 @@ add_subdirectory(Frontend) + # If we're doing an out-of-tree build, copy a module map for generated + # header files into the build area. + if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +- configure_file(module.modulemap.build module.modulemap COPYONLY) ++ configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) + endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index ebe5b73a5c65..70c497be12f5 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -23,6 +23,10 @@ + #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" ++#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" ++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" ++#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" ++#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" + #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" + #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 1a2f04552d13..44fa7d3eec6b 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -357,12 +357,26 @@ int main(int argc, char **argv) { + ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); + } else { + ActivePrefix = CurrentExecPrefix; +- ActiveIncludeDir = ActivePrefix + "/include"; +- SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); +- sys::fs::make_absolute(ActivePrefix, path); +- ActiveBinDir = std::string(path.str()); +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; +- ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveIncludeDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveBinDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveLibDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveCMakeDir = std::string(path.str()); ++ } + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + +diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt +index 2963f97cad88..69d66c9c9ca1 100644 +--- a/tools/lto/CMakeLists.txt ++++ b/tools/lto/CMakeLists.txt +@@ -25,7 +25,7 @@ add_llvm_library(LTO SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES} DEPENDS + intrinsics_gen) + + install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h +- DESTINATION include/llvm-c ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c + COMPONENT LTO) + + if (APPLE) +diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt +index ead73ec13a8f..250362021f17 100644 +--- a/tools/opt-viewer/CMakeLists.txt ++++ b/tools/opt-viewer/CMakeLists.txt +@@ -8,7 +8,7 @@ set (files + + foreach (file ${files}) + install(PROGRAMS ${file} +- DESTINATION share/opt-viewer ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer + COMPONENT opt-viewer) + endforeach (file) + +diff --git a/tools/remarks-shlib/CMakeLists.txt b/tools/remarks-shlib/CMakeLists.txt +index 865436247270..ce1daa62f6ab 100644 +--- a/tools/remarks-shlib/CMakeLists.txt ++++ b/tools/remarks-shlib/CMakeLists.txt +@@ -19,7 +19,7 @@ if(LLVM_ENABLE_PIC) + endif() + + install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h +- DESTINATION include/llvm-c ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c + COMPONENT Remarks) + + if (APPLE) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/llvm-outputs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/outputs.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/llvm-outputs.patch rename to third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/outputs.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix index 21961f4f04..bbeb927768 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +, buildLlvmTools , fixDarwinDylibNames , enableManpages ? false }: @@ -22,20 +23,27 @@ let ++ lib.optional enableManpages python3.pkgs.sphinx ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libxml2 llvm ]; + buildInputs = [ libxml2 libllvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLVM_ENABLE_RTTI=ON" + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" ]; - patches = [ ./purity.patch ]; + patches = [ + ./purity.patch + ./gnu-install-dirs.patch + ]; postPatch = '' sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ @@ -48,12 +56,12 @@ let sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; - outputs = [ "out" "lib" "python" ]; + outputs = [ "out" "lib" "dev" "python" ]; # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${llvm}/lib/LLVMgold.so ]; then - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then + ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib fi ln -sv $out/bin/clang $out/bin/cpp @@ -70,11 +78,14 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + + mkdir -p $dev/bin + cp bin/clang-tblgen $dev/bin ''; passthru = { isClang = true; - inherit llvm; + inherit libllvm; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/clang/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/clang/gnu-install-dirs.patch new file mode 100644 index 0000000000..7e6903222f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/clang/gnu-install-dirs.patch @@ -0,0 +1,242 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2667b1d6892e..87c5ad58738f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.4.3) + if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) + project(Clang) + ++ include(GNUInstallDirs) ++ + # Rely on llvm-config. + set(CONFIG_OUTPUT) + find_program(LLVM_CONFIG "llvm-config") +@@ -344,7 +346,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/clang include/clang-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.def" + PATTERN "*.h" +@@ -353,7 +355,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "CMakeFiles" EXCLUDE + PATTERN "*.inc" +@@ -361,7 +363,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(PROGRAMS utils/bash-autocomplete.sh +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + ) + endif() + +diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake +index e657059744a4..19da44638fe6 100644 +--- a/cmake/modules/AddClang.cmake ++++ b/cmake/modules/AddClang.cmake +@@ -99,9 +99,9 @@ macro(add_clang_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_clangtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) + add_custom_target(install-${name} +@@ -143,7 +143,7 @@ macro(add_clang_tool name) + + install(TARGETS ${name} + ${export_to_clangtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT CMAKE_CONFIGURATION_TYPES) +@@ -160,5 +160,5 @@ endmacro() + macro(add_clang_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index a621c02644e3..e140efc9c83c 100644 +--- a/lib/Headers/CMakeLists.txt ++++ b/lib/Headers/CMakeLists.txt +@@ -129,13 +129,13 @@ install( + FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h + COMPONENT clang-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) + + install( + FILES ${cuda_wrapper_files} + COMPONENT clang-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) + + if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. + add_custom_target(install-clang-headers +diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt +index ad990e010eef..92e52d05afb9 100644 +--- a/tools/c-index-test/CMakeLists.txt ++++ b/tools/c-index-test/CMakeLists.txt +@@ -48,7 +48,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH + "@executable_path/../../lib") + else() +- set(INSTALL_DESTINATION bin) ++ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + + install(TARGETS c-index-test +diff --git a/tools/clang-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt +index 04151a8e0331..13918d91c4ba 100644 +--- a/tools/clang-check/CMakeLists.txt ++++ b/tools/clang-check/CMakeLists.txt +@@ -19,4 +19,4 @@ target_link_libraries(clang-check + ) + + install(TARGETS clang-check +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt +index a13633eaefc4..9b0094783690 100644 +--- a/tools/clang-format/CMakeLists.txt ++++ b/tools/clang-format/CMakeLists.txt +@@ -20,20 +20,20 @@ if( LLVM_USE_SANITIZE_COVERAGE ) + endif() + + install(PROGRAMS clang-format-bbedit.applescript +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-diff.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-sublime.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS git-clang-format +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT clang-format) +diff --git a/tools/clang-offload-bundler/CMakeLists.txt b/tools/clang-offload-bundler/CMakeLists.txt +index 6161d08ae587..a003292d1676 100644 +--- a/tools/clang-offload-bundler/CMakeLists.txt ++++ b/tools/clang-offload-bundler/CMakeLists.txt +@@ -21,4 +21,4 @@ target_link_libraries(clang-offload-bundler + ${CLANG_OFFLOAD_BUNDLER_LIB_DEPS} + ) + +-install(TARGETS clang-offload-bundler RUNTIME DESTINATION bin) ++install(TARGETS clang-offload-bundler RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt +index 771e3bdea6f0..d1396e62b28f 100644 +--- a/tools/clang-rename/CMakeLists.txt ++++ b/tools/clang-rename/CMakeLists.txt +@@ -14,11 +14,11 @@ target_link_libraries(clang-rename + clangToolingRefactor + ) + +-install(TARGETS clang-rename RUNTIME DESTINATION bin) ++install(TARGETS clang-rename RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + install(PROGRAMS clang-rename.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) + install(PROGRAMS clang-rename.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) +diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt +index 2dd670307636..1fe576f77ddb 100644 +--- a/tools/libclang/CMakeLists.txt ++++ b/tools/libclang/CMakeLists.txt +@@ -121,7 +121,7 @@ endif() + if(INTERNAL_INSTALL_PREFIX) + set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") + else() +- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) ++ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + install(DIRECTORY ../../include/clang-c +diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt +index 380379300b09..adfd58ed5f7d 100644 +--- a/tools/scan-build/CMakeLists.txt ++++ b/tools/scan-build/CMakeLists.txt +@@ -41,7 +41,7 @@ if(CLANG_INSTALL_SCANBUILD) + ${CMAKE_BINARY_DIR}/bin/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) +- install(PROGRAMS bin/${BinFile} DESTINATION bin) ++ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endforeach() + + foreach(LibexecFile ${LibexecFiles}) +@@ -53,7 +53,7 @@ if(CLANG_INSTALL_SCANBUILD) + ${CMAKE_BINARY_DIR}/libexec/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) +- install(PROGRAMS libexec/${LibexecFile} DESTINATION libexec) ++ install(PROGRAMS libexec/${LibexecFile} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) + endforeach() + + foreach(ManPage ${ManPages}) +@@ -77,7 +77,7 @@ if(CLANG_INSTALL_SCANBUILD) + ${CMAKE_BINARY_DIR}/share/scan-build/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) +- install(FILES share/scan-build/${ShareFile} DESTINATION share/scan-build) ++ install(FILES share/scan-build/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build) + endforeach() + + add_custom_target(scan-build ALL DEPENDS ${Depends}) +diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt +index b305ca562a72..554bcb379061 100644 +--- a/tools/scan-view/CMakeLists.txt ++++ b/tools/scan-view/CMakeLists.txt +@@ -21,7 +21,7 @@ if(CLANG_INSTALL_SCANVIEW) + ${CMAKE_BINARY_DIR}/bin/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) +- install(PROGRAMS bin/${BinFile} DESTINATION bin) ++ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endforeach() + + foreach(ShareFile ${ShareFiles}) +@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) + ${CMAKE_BINARY_DIR}/share/scan-view/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) +- install(FILES share/${ShareFile} DESTINATION share/scan-view) ++ install(FILES share/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view) + endforeach() + + add_custom_target(scan-view ALL DEPENDS ${Depends}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt/default.nix index 705c5994bd..7e85c420da 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { inherit version; src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy"; - nativeBuildInputs = [ cmake python3 llvm ]; + nativeBuildInputs = [ cmake python3 llvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ @@ -54,6 +54,7 @@ stdenv.mkDerivation { ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce ../../common/compiler-rt/glibc.patch + ./gnu-install-dirs.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ lib.optional (stdenv.hostPlatform.libc == "glibc") ./sys-ustat.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 0000000000..618e597e96 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,103 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f997c53410c1..ac079d89b57b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,6 +12,7 @@ cmake_minimum_required(VERSION 3.4.3) + # Check if compiler-rt is built as a standalone project. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) + project(CompilerRT C CXX ASM) ++ include(GNUInstallDirs) + set(COMPILER_RT_STANDALONE_BUILD TRUE) + endif() + +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index bc5fb9ff722b..91fb79d1980c 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -344,7 +344,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) + add_custom_target(${target_name} DEPENDS ${dst_file}) + # Install in Clang resource directory. + install(FILES ${file_name} +- DESTINATION ${COMPILER_RT_INSTALL_PATH} ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_PREFIX} + COMPONENT ${component}) + add_dependencies(${component} ${target_name}) + +@@ -361,7 +361,7 @@ macro(add_compiler_rt_script name) + add_custom_target(${name} DEPENDS ${dst}) + install(FILES ${dst} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR}) + endmacro(add_compiler_rt_script src name) + + # Builds custom version of libc++ and installs it in . +diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake +index f646975475bb..75885bf305b8 100644 +--- a/cmake/Modules/CompilerRTDarwinUtils.cmake ++++ b/cmake/Modules/CompilerRTDarwinUtils.cmake +@@ -391,7 +391,7 @@ macro(darwin_add_embedded_builtin_libraries) + set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded) + set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded) + + set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi") + set(CFLAGS_i386 "-march=pentium") +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index b38c6ca96fac..a4580414cbc8 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -43,11 +43,11 @@ if (LLVM_TREE_AVAILABLE) + else() + # Take output dir and install path from the user. + set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH +- "Path where built compiler-rt libraries should be stored.") ++ "Path where built compiler-rt build artifacts should be stored.") + set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH + "Path where built compiler-rt executables should be stored.") +- set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH +- "Path where built compiler-rt libraries should be installed.") ++ set(COMPILER_RT_INSTALL_PATH "" CACHE PATH ++ "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.") + option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF) + option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) + # Use a host compiler to compile/link tests. +@@ -67,9 +67,9 @@ if(NOT DEFINED COMPILER_RT_OS_DIR) + string(TOLOWER ${CMAKE_SYSTEM_NAME} COMPILER_RT_OS_DIR) + endif() + set(COMPILER_RT_LIBRARY_OUTPUT_DIR +- ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) ++ ${COMPILER_RT_OUTPUT_DIR}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) + set(COMPILER_RT_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR}) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) + + if(APPLE) + # On Darwin if /usr/include doesn't exist, the user probably has Xcode but not +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index ec3bf40b95e6..af119f10ee2b 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -44,8 +44,8 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") + # Install sanitizer headers. + install(FILES ${SANITIZER_HEADERS} + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer) + # Install xray headers. + install(FILES ${XRAY_HEADERS} + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray) +diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt +index 2c486bff821b..0ee715da95f8 100644 +--- a/lib/dfsan/CMakeLists.txt ++++ b/lib/dfsan/CMakeLists.txt +@@ -44,4 +44,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename} + DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt) + add_dependencies(dfsan dfsan_abilist) + install(FILES ${dfsan_abilist_filename} +- DESTINATION ${COMPILER_RT_INSTALL_PATH}) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_PREFIX}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix index 86bba415c0..c416964b22 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix @@ -1,6 +1,5 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith -, buildPackages , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: @@ -18,34 +17,43 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3"; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" + ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; + in { - llvm = callPackage ./llvm { }; + libllvm = callPackage ./llvm { }; - clang-unwrapped = callPackage ./clang { + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputUnspecified = true; }; + + libllvm-polly = callPackage ./llvm { enablePolly = true; }; + + llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; }; + + libclang = callPackage ./clang { inherit clang-tools-extra_src; }; - llvm-manpages = lowPrio (tools.llvm.override { + clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; + + llvm-manpages = lowPrio (tools.libllvm.override { enableManpages = true; python3 = pkgs.python3; # don't use python-boot }); - clang-manpages = lowPrio (tools.clang-unwrapped.override { + clang-manpages = lowPrio (tools.libclang.override { enableManpages = true; python3 = pkgs.python3; # don't use python-boot }); - libclang = tools.clang-unwrapped.lib; - clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; libstdcxxClang = wrapCCWith rec { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix index 164836e1a4..77421b4e6d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation { export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; - patches = lib.optionals stdenv.hostPlatform.isMusl [ + outputs = [ "out" "dev" ]; + + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ../../libcxx-0001-musl-hacks.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++/gnu-install-dirs.patch new file mode 100644 index 0000000000..d9ea0dc7df --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++/gnu-install-dirs.patch @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ca5afba86d19..ed69e4043c3d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,6 +22,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + project(libcxx CXX C) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libcxx) + set(PACKAGE_VERSION 5.0.0) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake +index b1f6bee8f945..1b455fceed7f 100644 +--- a/cmake/Modules/HandleLibCXXABI.cmake ++++ b/cmake/Modules/HandleLibCXXABI.cmake +@@ -55,7 +55,7 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs) + ) + if (LIBCXX_INSTALL_HEADERS) + install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" +- DESTINATION ${LIBCXX_INSTALL_PREFIX}include/c++/v1/${dstdir} ++ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} + COMPONENT libcxx + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index 5a1b2ccdc426..106d3d6c1d3c 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -20,7 +20,7 @@ endif() + + if (LIBCXX_INSTALL_HEADERS) + install(DIRECTORY . +- DESTINATION ${LIBCXX_INSTALL_PREFIX}include/c++/v1 ++ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 + COMPONENT cxx-headers + FILES_MATCHING + ${LIBCXX_HEADER_PATTERN} +@@ -44,7 +44,7 @@ if (LIBCXX_INSTALL_HEADERS) + set(generated_config_deps generate_config_header) + # Install the generated header as __config. + install(FILES ${LIBCXX_BINARY_DIR}/__generated_config +- DESTINATION ${LIBCXX_INSTALL_PREFIX}include/c++/v1 ++ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + RENAME __config + COMPONENT cxx-headers) +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 578651423f3b..277befd631ac 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -355,8 +355,8 @@ if (LIBCXX_INSTALL_LIBRARY) + set(experimental_lib cxx_experimental) + endif() + install(TARGETS ${LIBCXX_TARGETS} ${experimental_lib} +- LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx +- ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx ++ LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx ++ ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx + ) + # NOTE: This install command must go after the cxx install command otherwise + # it will not be executed after the library symlinks are installed. +@@ -364,7 +364,7 @@ if (LIBCXX_INSTALL_LIBRARY) + # Replace the libc++ filename with $ + # after we required CMake 3.0. + install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}" +- DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} ++ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} + COMPONENT libcxx) + endif() + endif() diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi/default.nix index dd148a8917..8bc3b9e297 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi/default.nix @@ -6,8 +6,7 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv"; - nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + outputs = [ "out" "dev" ]; postUnpack = '' unpackFile ${libcxx.src} @@ -19,6 +18,13 @@ stdenv.mkDerivation { patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} ''; + patches = [ + ./gnu-install-dirs.patch + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + installPhase = if stdenv.isDarwin then '' for file in lib/*.dylib; do diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi/gnu-install-dirs.patch new file mode 100644 index 0000000000..760d7194f7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi/gnu-install-dirs.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4db3328deb9c..74b39acfe588 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,6 +20,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + project(libcxxabi CXX C) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libcxxabi) + set(PACKAGE_VERSION 5.0.0) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index adcc412880c9..71758665af05 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -174,8 +174,8 @@ endif() + add_custom_target(cxxabi DEPENDS ${LIBCXXABI_TARGETS}) + + install(TARGETS ${LIBCXXABI_TARGETS} +- LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi +- ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi ++ LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi ++ ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi + ) + + if (NOT CMAKE_CONFIGURATION_TYPES) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lld/default.nix index 244960cf41..73762e2d2e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lld/default.nix @@ -1,7 +1,8 @@ { lib, stdenv +, buildLlvmTools , fetch , cmake -, llvm +, libllvm , version }: @@ -11,15 +12,20 @@ stdenv.mkDerivation { src = fetch "lld" "1ah75rjly6747jk1zbwca3z0svr9b09ylgxd4x9ns721xir6sia6"; + patches = [ + ./gnu-install-dirs.patch + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ llvm ]; + buildInputs = [ libllvm ]; - outputs = [ "out" "dev" ]; + cmakeFlags = [ + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ]; - postInstall = '' - moveToOutput include "$dev" - moveToOutput lib "$dev" - ''; + outputs = [ "out" "lib" "dev" ]; meta = { description = "The LLVM Linker"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lld/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lld/gnu-install-dirs.patch new file mode 100644 index 0000000000..ed673870de --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lld/gnu-install-dirs.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e2ab0e35f1ab..f68e23d2a70d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(LLD_BUILT_STANDALONE TRUE) + ++ include(GNUInstallDirs) ++ + find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") + if(NOT LLVM_CONFIG_PATH) + message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") +@@ -203,7 +205,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake +index fd1d44199ca6..2ec1831ed8f6 100644 +--- a/cmake/modules/AddLLD.cmake ++++ b/cmake/modules/AddLLD.cmake +@@ -20,9 +20,9 @@ macro(add_lld_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_lldtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) + add_custom_target(install-${name} +@@ -56,7 +56,7 @@ macro(add_lld_tool name) + + install(TARGETS ${name} + ${export_to_lldtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT CMAKE_CONFIGURATION_TYPES) +@@ -73,5 +73,5 @@ endmacro() + macro(add_lld_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() +diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt +index 2df10697ff66..94aa8d092220 100644 +--- a/tools/lld/CMakeLists.txt ++++ b/tools/lld/CMakeLists.txt +@@ -13,7 +13,7 @@ target_link_libraries(lld + ) + + install(TARGETS lld +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if(NOT LLD_SYMLINKS_TO_CREATE) + set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lldb/default.nix index 61a9e60391..723792d134 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lldb/default.nix @@ -8,14 +8,14 @@ , which , libedit , libxml2 -, llvm -, clang-unwrapped +, libllvm +, libclang , python3 , version , darwin }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lldb"; inherit version; @@ -28,29 +28,46 @@ stdenv.mkDerivation { sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps"; stripLen = 1; }) + ./gnu-install-dirs.patch ]; postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place - sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ + sed -i 's,".*ClangConfig.cmake","${libclang.dev}/lib/cmake/clang/ClangConfig.cmake",' \ cmake/modules/LLDBStandalone.cmake - sed -i 's,".*tools/clang/include","${clang-unwrapped}/include",' \ + sed -i 's,".*tools/clang/include","${libclang.dev}/include",' \ cmake/modules/LLDBStandalone.cmake - sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \ + sed -i 's,"$.LLVM_LIBRARY_DIR.",${libllvm.lib}/lib ${libclang.lib}/lib,' \ cmake/modules/LLDBStandalone.cmake ''; - nativeBuildInputs = [ cmake python3 which swig ]; - buildInputs = [ ncurses zlib libedit libxml2 llvm ] - ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ + cmake python3 which swig + ]; + + buildInputs = [ + ncurses zlib libedit libxml2 libllvm + ] ++ lib.optionals stdenv.isDarwin [ + darwin.libobjc + darwin.apple_sdk.libs.xpc + darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa + ]; CXXFLAGS = "-fno-rtti"; hardeningDisable = [ "format" ]; cmakeFlags = [ + "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ] ++ lib.optionals doCheck [ + "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" ]; + doCheck = false; + postInstall = '' mkdir -p $out/share/man/man1 cp ../docs/lldb.1 $out/share/man/man1/ diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lldb/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lldb/gnu-install-dirs.patch new file mode 100644 index 0000000000..5c6193b028 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lldb/gnu-install-dirs.patch @@ -0,0 +1,76 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ada293811b3e..6c2149309f65 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,6 +7,8 @@ set(CMAKE_MODULE_PATH + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" + ) + ++include(GNUInstallDirs) ++ + include(LLDBStandalone) + include(LLDBConfig) + include(AddLLDB) +diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake +index 4c6f1efd673d..179a12b49cce 100644 +--- a/cmake/modules/AddLLDB.cmake ++++ b/cmake/modules/AddLLDB.cmake +@@ -54,14 +54,14 @@ function(add_lldb_library name) + endif() + install(TARGETS ${name} + COMPONENT ${name} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${out_dir} + ARCHIVE DESTINATION ${out_dir}) + else() + install(TARGETS ${name} + COMPONENT ${name} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + if (NOT CMAKE_CONFIGURATION_TYPES) + add_custom_target(install-${name} +@@ -126,7 +126,7 @@ function(add_lldb_executable name) + if(ARG_GENERATE_INSTALL AND NOT (ARG_INCLUDE_IN_FRAMEWORK AND LLDB_BUILD_FRAMEWORK )) + install(TARGETS ${name} + COMPONENT ${name} +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + if (NOT CMAKE_CONFIGURATION_TYPES) + add_custom_target(install-${name} + DEPENDS ${name} +diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake +index 726552675f47..f1f769f34446 100644 +--- a/cmake/modules/LLDBConfig.cmake ++++ b/cmake/modules/LLDBConfig.cmake +@@ -276,7 +276,7 @@ include_directories(BEFORE + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ + COMPONENT lldb_headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +@@ -286,7 +286,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ + COMPONENT lldb_headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +diff --git a/tools/intel-mpx/CMakeLists.txt b/tools/intel-mpx/CMakeLists.txt +index 29ba9a1cacec..30e2f9334b95 100644 +--- a/tools/intel-mpx/CMakeLists.txt ++++ b/tools/intel-mpx/CMakeLists.txt +@@ -12,4 +12,4 @@ target_link_libraries(lldb-intel-mpxtable + PUBLIC liblldb LLVMSupport) + + install(TARGETS lldb-intel-mpxtable +- LIBRARY DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/default.nix index 94d2a1e586..0cbd30c783 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/default.nix @@ -1,4 +1,5 @@ { lib, stdenv +, pkgsBuildBuild , fetch , fetchpatch , cmake @@ -10,9 +11,11 @@ , version , release_version , zlib +, buildLlvmTools , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? !enableManpages +, enablePolly ? false }: let @@ -29,15 +32,18 @@ stdenv.mkDerivation ({ inherit version; src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm"; + polly_src = fetch "polly" "1f4i1qsw7ywx25v262p8syz339zcbvfkx295xz26hmqrn944xa6x"; unpackPhase = '' unpackFile $src mv llvm-${version}* llvm sourceRoot=$PWD/llvm + '' + optionalString enablePolly '' + unpackFile $polly_src + mv polly-* $sourceRoot/tools/polly ''; - outputs = [ "out" "python" ] - ++ optional enableSharedLibraries "lib"; + outputs = [ "out" "lib" "dev" "python" ]; nativeBuildInputs = [ cmake python3 ] ++ optional enableManpages python3.pkgs.sphinx; @@ -59,11 +65,13 @@ stdenv.mkDerivation ({ # sha256 = "0injj1hqgrbcbihhwp2nbal88jfykad30r54f2cdcx7gws2fcy8i"; # stripLen = 1; #}) - ]; + ./gnu-install-dirs.patch + ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' "" + --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}" ''${extra_libdir})' "" '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + optionalString (enableSharedLibraries) '' @@ -90,6 +98,7 @@ stdenv.mkDerivation ({ ''; cmakeFlags = with stdenv; [ + "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=ON" @@ -100,20 +109,36 @@ stdenv.mkDerivation ({ "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" ] - ++ optional enableSharedLibraries + ++ lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" - ++ optionals enableManpages [ + ++ lib.optionals enableManpages [ "-DLLVM_BUILD_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" ] - ++ optional (!isDarwin) + ++ lib.optional (!isDarwin) "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ++ optionals (isDarwin) [ + ++ lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DCMAKE_CROSSCOMPILING=True" + "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ( + let + nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; + nativeBintools = nativeCC.bintools.bintools; + nativeToolchainFlags = [ + "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" + "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" + "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" + "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" + "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" + ]; + in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=${lib.concatStringsSep ";" nativeToolchainFlags}" + ) ]; postBuild = '' @@ -127,21 +152,20 @@ stdenv.mkDerivation ({ postInstall = '' mkdir -p $python/share mv $out/share/opt-viewer $python/share/opt-viewer - '' - + optionalString enableSharedLibraries '' - moveToOutput "lib/libLLVM-*" "$lib" - moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" - moveToOutput "lib/libLTO${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" + moveToOutput "bin/llvm-config*" "$dev" + substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ + --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" + substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ + --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' '' + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLTO.dylib" "$lib/lib/libLTO.dylib" ${lib.concatMapStringsSep "\n" (v: '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib '') versionSuffixes} + '' + + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; doCheck = stdenv.isLinux && (!stdenv.isi686); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs-polly.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 0000000000..40f6fa0603 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,106 @@ +diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt +index 9ddc0f7ff81d..7ca45f286d47 100644 +--- a/tools/polly/CMakeLists.txt ++++ b/tools/polly/CMakeLists.txt +@@ -2,7 +2,11 @@ + if (NOT DEFINED LLVM_MAIN_SRC_DIR) + project(Polly) + cmake_minimum_required(VERSION 3.4.3) ++endif() ++ ++include(GNUInstallDirs) + ++if (NOT DEFINED LLVM_MAIN_SRC_DIR) + # Where is LLVM installed? + find_package(LLVM CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) +@@ -157,14 +161,14 @@ include_directories( + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE + ) + + install(DIRECTORY ${POLLY_BINARY_DIR}/include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE +diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt +index 969292cd6b00..d7aea77bdd20 100644 +--- a/tools/polly/cmake/CMakeLists.txt ++++ b/tools/polly/cmake/CMakeLists.txt +@@ -79,18 +79,18 @@ file(GENERATE + + # Generate PollyConfig.cmake for the install tree. + unset(POLLY_EXPORTS) +-set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") ++set(POLLY_INSTALL_PREFIX "") + set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") ++set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") ++set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + if (POLLY_BUNDLED_ISL) + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" +- "${POLLY_INSTALL_PREFIX}/include/polly" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" + ) + else() + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" + ${ISL_INCLUDE_DIRS} + ) + endif() +@@ -100,12 +100,12 @@ endif() + foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) + get_target_property(tgt_type ${tgt} TYPE) + if (tgt_type STREQUAL "EXECUTABLE") +- set(tgt_prefix "bin/") ++ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") + else() +- set(tgt_prefix "lib/") ++ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") + endif() + +- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$") ++ set(tgt_path "${tgt_prefix}$") + file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) + + if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") +diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake +index 32bed50bb060..cca5bfff4970 100644 +--- a/tools/polly/cmake/polly_macros.cmake ++++ b/tools/polly/cmake/polly_macros.cmake +@@ -44,8 +44,8 @@ macro(add_polly_library name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") + install(TARGETS ${name} + EXPORT LLVMExports +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) + endmacro(add_polly_library) +diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt +index 286c04fba287..07905e68f595 100644 +--- a/tools/polly/lib/External/CMakeLists.txt ++++ b/tools/polly/lib/External/CMakeLists.txt +@@ -268,7 +268,7 @@ if (POLLY_BUNDLED_ISL) + install(DIRECTORY + ${ISL_SOURCE_DIR}/include/ + ${ISL_BINARY_DIR}/include/ +- DESTINATION include/polly ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs.patch new file mode 100644 index 0000000000..3f6d6acb83 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs.patch @@ -0,0 +1,386 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c1e03aed4809..8b8bbb8c403e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -279,15 +279,21 @@ if (CMAKE_BUILD_TYPE AND + message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") + endif() + ++include(GNUInstallDirs) ++ + set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) + +-set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") ++set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING ++ "Path for binary subdirectory (defaults to 'bin')") + mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) + + set(LLVM_UTILS_INSTALL_DIR "bin" CACHE STRING + "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") + mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) + ++set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING ++ "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) ++ + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) + set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) +@@ -512,9 +518,9 @@ option (LLVM_ENABLE_DOXYGEN "Use doxygen to generate llvm API documentation." OF + option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) + option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) + +-set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" ++set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html" + CACHE STRING "Doxygen-generated HTML documentation install directory") +-set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" ++set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html" + CACHE STRING "OCamldoc-generated HTML documentation install directory") + + option (LLVM_BUILD_EXTERNAL_COMPILER_RT +@@ -945,7 +951,7 @@ add_subdirectory(cmake/modules) + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/llvm include/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +@@ -957,7 +963,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index 1c922651b133..d555fd627a4f 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -589,11 +589,11 @@ macro(add_llvm_library name) + else() + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LTO" OR + (LLVM_LINK_LLVM_DYLIB AND ${name} STREQUAL "LLVM")) +- set(install_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(ARG_SHARED OR BUILD_SHARED_LIBS) + if(WIN32 OR CYGWIN OR MINGW) + set(install_type RUNTIME) +- set(install_dir bin) ++ set(install_dir ${CMAKE_INSTALL_BINDIR}) + else() + set(install_type LIBRARY) + endif() +@@ -637,9 +637,9 @@ macro(add_llvm_loadable_module name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + if(WIN32 OR CYGWIN) + # DLL platform +- set(dlldir "bin") ++ set(dlldir "${CMAKE_INSTALL_BINDIR}") + else() +- set(dlldir "lib${LLVM_LIBDIR_SUFFIX}") ++ set(dlldir "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + endif() + + if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR +@@ -651,7 +651,7 @@ macro(add_llvm_loadable_module name) + install(TARGETS ${name} + ${export_to_llvmexports} + LIBRARY DESTINATION ${dlldir} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) + endif() +@@ -864,7 +864,7 @@ macro(add_llvm_example name) + endif() + add_llvm_executable(${name} ${ARGN}) + if( LLVM_BUILD_EXAMPLES ) +- install(TARGETS ${name} RUNTIME DESTINATION examples) ++ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) + endif() + set_target_properties(${name} PROPERTIES FOLDER "Examples") + endmacro(add_llvm_example name) +@@ -1275,7 +1275,7 @@ function(llvm_install_library_symlink name dest type) + set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) + set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) + +- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 AND "${type}" STREQUAL "SHARED") + set(output_dir bin) + endif() +@@ -1293,7 +1293,7 @@ function(llvm_install_library_symlink name dest type) + endif() + endfunction() + +-function(llvm_install_symlink name dest) ++function(llvm_install_symlink name dest output_dir) + cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) + foreach(path ${CMAKE_MODULE_PATH}) + if(EXISTS ${path}/LLVMInstallSymlink.cmake) +@@ -1316,7 +1316,7 @@ function(llvm_install_symlink name dest) + set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) + + install(SCRIPT ${INSTALL_SYMLINK} +- CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" ++ CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" + COMPONENT ${component}) + + if (NOT CMAKE_CONFIGURATION_TYPES AND NOT ARG_ALWAYS_GENERATE) +@@ -1400,7 +1400,8 @@ function(add_llvm_tool_symlink link_name target) + endif() + + if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) +- llvm_install_symlink(${link_name} ${target}) ++ GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR) ++ llvm_install_symlink(${link_name} ${target} ${output_dir}) + endif() + endif() + endfunction() +@@ -1452,9 +1453,9 @@ function(llvm_setup_rpath name) + + if (APPLE) + set(_install_name_dir INSTALL_NAME_DIR "@rpath") +- set(_install_rpath "@loader_path/../lib" ${extra_libdir}) ++ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}" ${extra_libdir}) + elseif(UNIX) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + set_property(TARGET ${name} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-z,origin ") +diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake +index 1d8094cc505f..afdbe6e6d19c 100644 +--- a/cmake/modules/AddOCaml.cmake ++++ b/cmake/modules/AddOCaml.cmake +@@ -140,9 +140,9 @@ function(add_ocaml_library name) + endforeach() + + if( APPLE ) +- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + elseif( UNIX ) +- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + endif() + list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") + +diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake +index 4540c5c36c8e..4cefb17fbd55 100644 +--- a/cmake/modules/AddSphinxTarget.cmake ++++ b/cmake/modules/AddSphinxTarget.cmake +@@ -73,7 +73,7 @@ function (add_sphinx_target builder project) + + elseif (builder STREQUAL html) + string(TOUPPER "${project}" project_upper) +- set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" ++ set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html" + CACHE STRING "HTML documentation install directory for ${project}") + + # '/.' indicates: copy the contents of the directory directly into +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index ac4b0b7c0304..21a6a3da8667 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -1,4 +1,4 @@ +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + # First for users who use an installed LLVM, create the LLVMExports.cmake file. +@@ -84,11 +84,11 @@ foreach(p ${_count}) + set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} + get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") + endforeach(p) +-set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") +-set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") ++set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") ++set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") + set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") +-set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") ++set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") + set(LLVM_CONFIG_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMExports.cmake") + set(LLVM_CONFIG_EXPORTS "${LLVM_EXPORTS}") + configure_file( +diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake +index 482697b06baf..af2ac1e6c979 100644 +--- a/cmake/modules/LLVMInstallSymlink.cmake ++++ b/cmake/modules/LLVMInstallSymlink.cmake +@@ -10,7 +10,7 @@ function(install_symlink name target outdir) + set(LINK_OR_COPY copy) + endif() + +- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") ++ set(bindir "${DESTDIR}${outdir}/") + + message("Creating ${name}") + +diff --git a/docs/CMake.rst b/docs/CMake.rst +index b6ebf37adc92..34c73d2869e0 100644 +--- a/docs/CMake.rst ++++ b/docs/CMake.rst +@@ -196,7 +196,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. + **LLVM_LIBDIR_SUFFIX**:STRING + Extra suffix to append to the directory where libraries are to be + installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` +- to install libraries to ``/usr/lib64``. ++ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. + + **CMAKE_C_FLAGS**:STRING + Extra flags to use when compiling C source files. +@@ -461,8 +461,8 @@ LLVM-specific variables + + **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING + The path to install Doxygen-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/doxygen-html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. + + **LLVM_ENABLE_SPHINX**:BOOL + If specified, CMake will search for the ``sphinx-build`` executable and will make +@@ -493,13 +493,33 @@ LLVM-specific variables + + **LLVM_INSTALL_SPHINX_HTML_DIR**:STRING + The path to install Sphinx-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/html`. + + **LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING + The path to install OCamldoc-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/ocaml-html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html`. ++ ++**CMAKE_INSTALL_BINDIR**:STRING ++ The path to install binary tools, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `bin`. ++ ++**CMAKE_INSTALL_LIBDIR**:STRING ++ The path to install libraries, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `lib`. ++ ++**CMAKE_INSTALL_INCLUDEDIR**:STRING ++ The path to install header files, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `include`. ++ ++**CMAKE_INSTALL_DOCDIR**:STRING ++ The path to install documentation, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `share/doc`. ++ ++**CMAKE_INSTALL_MANDIR**:STRING ++ The path to install manpage files, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `share/man`. + + **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL + OS X Only: If enabled CMake will generate a target named +@@ -651,9 +671,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). + + This file is available in two different locations. + +-* ``/lib/cmake/llvm/LLVMConfig.cmake`` where +- ```` is the install prefix of an installed version of LLVM. +- On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. ++* ``LLVMConfig.cmake`` where ++ ```` is the location where LLVM CMake modules are ++ installed as part of an installed version of LLVM. This is typically ++ ``cmake/llvm/`` within the lib directory. On Linux, this is typically ++ ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. + + * ``/lib/cmake/llvm/LLVMConfig.cmake`` where + ```` is the root of the LLVM build tree. **Note: this is only +diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt +index 1d5ca3ba92b0..026f5453c1da 100644 +--- a/include/llvm/CMakeLists.txt ++++ b/include/llvm/CMakeLists.txt +@@ -4,5 +4,5 @@ add_subdirectory(Support) + # If we're doing an out-of-tree build, copy a module map for generated + # header files into the build area. + if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +- configure_file(module.modulemap.build module.modulemap COPYONLY) ++ configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) + endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index f201e1f7bff0..4582ed556a02 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -24,6 +24,10 @@ + #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" ++#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" ++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" ++#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" ++#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" + #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" + #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 08b096afb052..2deae0dcfacc 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -332,12 +332,26 @@ int main(int argc, char **argv) { + ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); + } else { + ActivePrefix = CurrentExecPrefix; +- ActiveIncludeDir = ActivePrefix + "/include"; +- SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); +- sys::fs::make_absolute(ActivePrefix, path); +- ActiveBinDir = path.str(); +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; +- ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveIncludeDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveBinDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveLibDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveCMakeDir = std::string(path.str()); ++ } + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + +diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt +index 6e913519a809..85641eef721f 100644 +--- a/tools/lto/CMakeLists.txt ++++ b/tools/lto/CMakeLists.txt +@@ -19,7 +19,7 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports) + add_llvm_library(LTO SHARED ${SOURCES} DEPENDS intrinsics_gen) + + install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h +- DESTINATION include/llvm-c ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c + COMPONENT LTO) + + if (APPLE) +diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt +index 19b606933082..27b9f71b3d79 100644 +--- a/tools/opt-viewer/CMakeLists.txt ++++ b/tools/opt-viewer/CMakeLists.txt +@@ -8,6 +8,6 @@ set (files + + foreach (file ${files}) + install(PROGRAMS ${file} +- DESTINATION share/opt-viewer ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer + COMPONENT opt-viewer) + endforeach (file) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix index 41202dd3f5..5c4894af9d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +, buildLlvmTools , fixDarwinDylibNames , enableManpages ? false }: @@ -22,20 +23,27 @@ let ++ lib.optional enableManpages python3.pkgs.sphinx ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libxml2 llvm ]; + buildInputs = [ libxml2 libllvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLVM_ENABLE_RTTI=ON" + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" ]; - patches = [ ./purity.patch ]; + patches = [ + ./purity.patch + ./gnu-install-dirs.patch + ]; postPatch = '' sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ @@ -48,12 +56,12 @@ let sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; - outputs = [ "out" "lib" "python" ]; + outputs = [ "out" "lib" "dev" "python" ]; # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${llvm}/lib/LLVMgold.so ]; then - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then + ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib fi ln -sv $out/bin/clang $out/bin/cpp @@ -70,11 +78,14 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + + mkdir -p $dev/bin + cp bin/clang-tblgen $dev/bin ''; passthru = { isClang = true; - inherit llvm; + inherit libllvm; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/clang/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/clang/gnu-install-dirs.patch new file mode 100644 index 0000000000..bdbbae9551 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/clang/gnu-install-dirs.patch @@ -0,0 +1,258 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2eee8e6148f7..63efc7d2fdd0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.4.3) + if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) + project(Clang) + ++ include(GNUInstallDirs) ++ + # Rely on llvm-config. + set(CONFIG_OUTPUT) + find_program(LLVM_CONFIG "llvm-config") +@@ -365,7 +367,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/clang include/clang-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.def" + PATTERN "*.h" +@@ -374,7 +376,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "CMakeFiles" EXCLUDE + PATTERN "*.inc" +@@ -382,7 +384,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(PROGRAMS utils/bash-autocomplete.sh +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + ) + endif() + +diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake +index c09a8423f9f6..39f37e0097eb 100644 +--- a/cmake/modules/AddClang.cmake ++++ b/cmake/modules/AddClang.cmake +@@ -99,9 +99,9 @@ macro(add_clang_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_clangtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-${name} +@@ -141,7 +141,7 @@ macro(add_clang_tool name) + + install(TARGETS ${name} + ${export_to_clangtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT CMAKE_CONFIGURATION_TYPES) +@@ -156,5 +156,5 @@ endmacro() + macro(add_clang_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index 97ba3edea1c5..9d2bc5714af5 100644 +--- a/lib/Headers/CMakeLists.txt ++++ b/lib/Headers/CMakeLists.txt +@@ -142,13 +142,13 @@ install( + FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h + COMPONENT clang-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) + + install( + FILES ${cuda_wrapper_files} + COMPONENT clang-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) + + if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. + add_llvm_install_targets(install-clang-headers +diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt +index d38c7bb28709..c9b5499cb756 100644 +--- a/tools/c-index-test/CMakeLists.txt ++++ b/tools/c-index-test/CMakeLists.txt +@@ -50,7 +50,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH + "@executable_path/../../lib") + else() +- set(INSTALL_DESTINATION bin) ++ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + + install(TARGETS c-index-test +diff --git a/tools/clang-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt +index c5ace26c2914..97bdfca7d896 100644 +--- a/tools/clang-check/CMakeLists.txt ++++ b/tools/clang-check/CMakeLists.txt +@@ -20,4 +20,4 @@ target_link_libraries(clang-check + ) + + install(TARGETS clang-check +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt +index a295e8cd0b2a..1973ff82c7f6 100644 +--- a/tools/clang-format/CMakeLists.txt ++++ b/tools/clang-format/CMakeLists.txt +@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE ) + endif() + + install(PROGRAMS clang-format-bbedit.applescript +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-diff.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-sublime.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS git-clang-format +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT clang-format) +diff --git a/tools/clang-func-mapping/CMakeLists.txt b/tools/clang-func-mapping/CMakeLists.txt +index ae28e28d532d..8ecb2e37a8f7 100644 +--- a/tools/clang-func-mapping/CMakeLists.txt ++++ b/tools/clang-func-mapping/CMakeLists.txt +@@ -20,4 +20,4 @@ target_link_libraries(clang-func-mapping + ) + + install(TARGETS clang-func-mapping +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/tools/clang-offload-bundler/CMakeLists.txt b/tools/clang-offload-bundler/CMakeLists.txt +index 8718015be76a..7a038f39622e 100644 +--- a/tools/clang-offload-bundler/CMakeLists.txt ++++ b/tools/clang-offload-bundler/CMakeLists.txt +@@ -22,4 +22,4 @@ target_link_libraries(clang-offload-bundler + ${CLANG_OFFLOAD_BUNDLER_LIB_DEPS} + ) + +-install(TARGETS clang-offload-bundler RUNTIME DESTINATION bin) ++install(TARGETS clang-offload-bundler RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/tools/clang-refactor/CMakeLists.txt b/tools/clang-refactor/CMakeLists.txt +index d2029066b9b7..9bc152a675af 100644 +--- a/tools/clang-refactor/CMakeLists.txt ++++ b/tools/clang-refactor/CMakeLists.txt +@@ -21,4 +21,4 @@ target_link_libraries(clang-refactor + clangToolingRefactor + ) + +-install(TARGETS clang-refactor RUNTIME DESTINATION bin) ++install(TARGETS clang-refactor RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt +index 9689e1c6804d..6087716510a9 100644 +--- a/tools/clang-rename/CMakeLists.txt ++++ b/tools/clang-rename/CMakeLists.txt +@@ -16,8 +16,8 @@ target_link_libraries(clang-rename + ) + + install(PROGRAMS clang-rename.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) + install(PROGRAMS clang-rename.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) +diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt +index 44406378207b..3b64b18ad4a5 100644 +--- a/tools/libclang/CMakeLists.txt ++++ b/tools/libclang/CMakeLists.txt +@@ -130,7 +130,7 @@ endif() + if(INTERNAL_INSTALL_PREFIX) + set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") + else() +- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) ++ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + install(DIRECTORY ../../include/clang-c +diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt +index 380379300b09..adfd58ed5f7d 100644 +--- a/tools/scan-build/CMakeLists.txt ++++ b/tools/scan-build/CMakeLists.txt +@@ -41,7 +41,7 @@ if(CLANG_INSTALL_SCANBUILD) + ${CMAKE_BINARY_DIR}/bin/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) +- install(PROGRAMS bin/${BinFile} DESTINATION bin) ++ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endforeach() + + foreach(LibexecFile ${LibexecFiles}) +@@ -53,7 +53,7 @@ if(CLANG_INSTALL_SCANBUILD) + ${CMAKE_BINARY_DIR}/libexec/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) +- install(PROGRAMS libexec/${LibexecFile} DESTINATION libexec) ++ install(PROGRAMS libexec/${LibexecFile} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) + endforeach() + + foreach(ManPage ${ManPages}) +@@ -77,7 +77,7 @@ if(CLANG_INSTALL_SCANBUILD) + ${CMAKE_BINARY_DIR}/share/scan-build/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) +- install(FILES share/scan-build/${ShareFile} DESTINATION share/scan-build) ++ install(FILES share/scan-build/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build) + endforeach() + + add_custom_target(scan-build ALL DEPENDS ${Depends}) +diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt +index b305ca562a72..554bcb379061 100644 +--- a/tools/scan-view/CMakeLists.txt ++++ b/tools/scan-view/CMakeLists.txt +@@ -21,7 +21,7 @@ if(CLANG_INSTALL_SCANVIEW) + ${CMAKE_BINARY_DIR}/bin/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) +- install(PROGRAMS bin/${BinFile} DESTINATION bin) ++ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endforeach() + + foreach(ShareFile ${ShareFiles}) +@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) + ${CMAKE_BINARY_DIR}/share/scan-view/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) +- install(FILES share/${ShareFile} DESTINATION share/scan-view) ++ install(FILES share/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view) + endforeach() + + add_custom_target(scan-view ALL DEPENDS ${Depends}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt/default.nix index f0a1c7ecc3..384305f5cf 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { inherit version; src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl"; - nativeBuildInputs = [ cmake python3 llvm ]; + nativeBuildInputs = [ cmake python3 llvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ @@ -54,6 +54,7 @@ stdenv.mkDerivation { ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce ../../common/compiler-rt/glibc.patch + ./gnu-install-dirs.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 0000000000..8daf03994b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,107 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4b953b212829..a10b69aa67dc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 3.4.3) + # Check if compiler-rt is built as a standalone project. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) + project(CompilerRT C CXX ASM) ++ include(GNUInstallDirs) + set(COMPILER_RT_STANDALONE_BUILD TRUE) + endif() + +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index 139b6140011c..502354a37d67 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -439,7 +439,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) + add_custom_target(${target_name} DEPENDS ${dst_file}) + # Install in Clang resource directory. + install(FILES ${file_name} +- DESTINATION ${COMPILER_RT_INSTALL_PATH} ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_PREFIX} + COMPONENT ${component}) + add_dependencies(${component} ${target_name}) + +@@ -456,7 +456,7 @@ macro(add_compiler_rt_script name) + add_custom_target(${name} DEPENDS ${dst}) + install(FILES ${dst} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR}) + endmacro(add_compiler_rt_script src name) + + # Builds custom version of libc++ and installs it in . +diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake +index a25540bf46d1..77ea739fea74 100644 +--- a/cmake/Modules/CompilerRTDarwinUtils.cmake ++++ b/cmake/Modules/CompilerRTDarwinUtils.cmake +@@ -375,7 +375,7 @@ macro(darwin_add_embedded_builtin_libraries) + set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded) + set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded) + + set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi") + set(CFLAGS_i386 "-march=pentium") +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index b208f0852408..cacf4e8fb69d 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -46,11 +46,11 @@ if (LLVM_TREE_AVAILABLE) + else() + # Take output dir and install path from the user. + set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH +- "Path where built compiler-rt libraries should be stored.") ++ "Path where built compiler-rt build artifacts should be stored.") + set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH + "Path where built compiler-rt executables should be stored.") +- set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH +- "Path where built compiler-rt libraries should be installed.") ++ set(COMPILER_RT_INSTALL_PATH "" CACHE PATH ++ "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.") + option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF) + option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) + # Use a host compiler to compile/link tests. +@@ -70,9 +70,9 @@ if(NOT DEFINED COMPILER_RT_OS_DIR) + string(TOLOWER ${CMAKE_SYSTEM_NAME} COMPILER_RT_OS_DIR) + endif() + set(COMPILER_RT_LIBRARY_OUTPUT_DIR +- ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) ++ ${COMPILER_RT_OUTPUT_DIR}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) + set(COMPILER_RT_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR}) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) + + if(APPLE) + # On Darwin if /usr/include doesn't exist, the user probably has Xcode but not +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index f7efb102ab63..ab8a94d9ff40 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -47,12 +47,12 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") + install(FILES ${SANITIZER_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer) + # Install xray headers. + install(FILES ${XRAY_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray) + + if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs. + add_custom_target(install-compiler-rt-headers +diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt +index 2c486bff821b..0ee715da95f8 100644 +--- a/lib/dfsan/CMakeLists.txt ++++ b/lib/dfsan/CMakeLists.txt +@@ -44,4 +44,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename} + DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt) + add_dependencies(dfsan dfsan_abilist) + install(FILES ${dfsan_abilist_filename} +- DESTINATION ${COMPILER_RT_INSTALL_PATH}) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_PREFIX}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix index 2c4c11c89b..b78f7a6250 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix @@ -1,6 +1,5 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith -, buildPackages , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: @@ -18,35 +17,44 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "1w8ml7fyn4vyxmy59n2qm4r1k1kgwgwkaldp6m45fdv4g0kkfbhd"; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" + ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; + in { - llvm = callPackage ./llvm { }; + libllvm = callPackage ./llvm { }; - clang-unwrapped = callPackage ./clang { + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputUnspecified = true; }; + + libllvm-polly = callPackage ./llvm { enablePolly = true; }; + + llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; }; + + libclang = callPackage ./clang { inherit clang-tools-extra_src; }; - llvm-manpages = lowPrio (tools.llvm.override { + clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; + + llvm-manpages = lowPrio (tools.libllvm.override { enableManpages = true; enableSharedLibraries = false; python3 = pkgs.python3; # don't use python-boot }); - clang-manpages = lowPrio (tools.clang-unwrapped.override { + clang-manpages = lowPrio (tools.libclang.override { enableManpages = true; python3 = pkgs.python3; # don't use python-boot }); - libclang = tools.clang-unwrapped.lib; - clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; libstdcxxClang = wrapCCWith rec { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix index ac489db54f..69314fbe2b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation { export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; - patches = lib.optionals stdenv.hostPlatform.isMusl [ + outputs = [ "out" "dev" ]; + + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ../../libcxx-0001-musl-hacks.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++/gnu-install-dirs.patch new file mode 100644 index 0000000000..33ff9ef123 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++/gnu-install-dirs.patch @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9e8e9d5e3d9b..e1d6d2392b92 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,6 +22,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + project(libcxx CXX C) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libcxx) + set(PACKAGE_VERSION 6.0.0) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake +index 558e11ba2cc1..c6a99cec0191 100644 +--- a/cmake/Modules/HandleLibCXXABI.cmake ++++ b/cmake/Modules/HandleLibCXXABI.cmake +@@ -55,7 +55,7 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs) + ) + if (LIBCXX_INSTALL_HEADERS) + install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" +- DESTINATION ${LIBCXX_INSTALL_PREFIX}include/c++/v1/${dstdir} ++ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} + COMPONENT cxx-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index b98e09260ca1..c920f48697bc 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -20,7 +20,7 @@ endif() + + if (LIBCXX_INSTALL_HEADERS) + install(DIRECTORY . +- DESTINATION ${LIBCXX_INSTALL_PREFIX}include/c++/v1 ++ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 + COMPONENT cxx-headers + FILES_MATCHING + ${LIBCXX_HEADER_PATTERN} +@@ -44,7 +44,7 @@ if (LIBCXX_INSTALL_HEADERS) + set(generated_config_deps generate_config_header) + # Install the generated header as __config. + install(FILES ${LIBCXX_BINARY_DIR}/__generated_config +- DESTINATION ${LIBCXX_INSTALL_PREFIX}include/c++/v1 ++ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + RENAME __config + COMPONENT cxx-headers) +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index aa5ebf1568ec..36d85b94c3ba 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -357,8 +357,8 @@ if (LIBCXX_INSTALL_LIBRARY) + set(experimental_lib cxx_experimental) + endif() + install(TARGETS ${LIBCXX_TARGETS} ${experimental_lib} +- LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx +- ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx ++ LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx ++ ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx + ) + # NOTE: This install command must go after the cxx install command otherwise + # it will not be executed after the library symlinks are installed. +@@ -366,7 +366,7 @@ if (LIBCXX_INSTALL_LIBRARY) + # Replace the libc++ filename with $ + # after we required CMake 3.0. + install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}" +- DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} ++ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} + COMPONENT libcxx) + endif() + endif() diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi/default.nix index c0d90f6c8e..04054f0ba0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi/default.nix @@ -6,8 +6,7 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "0prqvdj317qrc8nddaq1hh2ag9algkd9wbkj3y4mr5588k12x7r0"; - nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + outputs = [ "out" "dev" ]; postUnpack = '' unpackFile ${libcxx.src} @@ -19,6 +18,13 @@ stdenv.mkDerivation { patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} ''; + patches = [ + ./gnu-install-dirs.patch + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + installPhase = if stdenv.isDarwin then '' for file in lib/*.dylib; do diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi/gnu-install-dirs.patch new file mode 100644 index 0000000000..649d28d6c4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi/gnu-install-dirs.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1adbdb338322..2978631e1c58 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,6 +20,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + project(libcxxabi CXX C) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libcxxabi) + set(PACKAGE_VERSION 6.0.0) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 240f6d0d103b..7ad5c31ec7b4 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -181,8 +181,8 @@ add_custom_target(cxxabi DEPENDS ${LIBCXXABI_TARGETS}) + + if (LIBCXXABI_INSTALL_LIBRARY) + install(TARGETS ${LIBCXXABI_TARGETS} +- LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi +- ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi ++ LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi ++ ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi + ) + endif() + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lld/default.nix index b803852480..5bfd5f60e9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lld/default.nix @@ -1,8 +1,9 @@ { lib, stdenv +, buildLlvmTools , fetch , cmake , libxml2 -, llvm +, libllvm , version }: @@ -12,15 +13,20 @@ stdenv.mkDerivation { src = fetch "lld" "04afcfq2h7ysyqxxhyhb7ig4p0vdw7mi63kh8mffl74j0rc781p7"; + patches = [ + ./gnu-install-dirs.patch + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ llvm libxml2 ]; + buildInputs = [ libllvm libxml2 ]; - outputs = [ "out" "dev" ]; + cmakeFlags = [ + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ]; - postInstall = '' - moveToOutput include "$dev" - moveToOutput lib "$dev" - ''; + outputs = [ "out" "lib" "dev" ]; meta = { description = "The LLVM Linker"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lld/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lld/gnu-install-dirs.patch new file mode 100644 index 0000000000..8c6886c689 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lld/gnu-install-dirs.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e2fbdbfbbb47..d601b231ebb8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(LLD_BUILT_STANDALONE TRUE) + ++ include(GNUInstallDirs) ++ + find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") + if(NOT LLVM_CONFIG_PATH) + message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") +@@ -203,7 +205,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake +index 0d951799cdfe..7d8546ba87f8 100644 +--- a/cmake/modules/AddLLD.cmake ++++ b/cmake/modules/AddLLD.cmake +@@ -20,9 +20,9 @@ macro(add_lld_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_lldtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-${name} +@@ -54,7 +54,7 @@ macro(add_lld_tool name) + + install(TARGETS ${name} + ${export_to_lldtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT CMAKE_CONFIGURATION_TYPES) +@@ -69,5 +69,5 @@ endmacro() + macro(add_lld_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() +diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt +index d8829493fc22..df748a0e749b 100644 +--- a/tools/lld/CMakeLists.txt ++++ b/tools/lld/CMakeLists.txt +@@ -16,7 +16,7 @@ target_link_libraries(lld + ) + + install(TARGETS lld +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if(NOT LLD_SYMLINKS_TO_CREATE) + set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld ld64.lld wasm-ld) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lldb/default.nix index 7c6f8b1bd9..31cc0ca68d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lldb/default.nix @@ -8,14 +8,14 @@ , which , libedit , libxml2 -, llvm -, clang-unwrapped +, libllvm +, libclang , python3 , version , darwin }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lldb"; inherit version; @@ -28,29 +28,46 @@ stdenv.mkDerivation { sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps"; stripLen = 1; }) + ./gnu-install-dirs.patch ]; postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place - sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ + sed -i 's,".*ClangConfig.cmake","${libclang.dev}/lib/cmake/clang/ClangConfig.cmake",' \ cmake/modules/LLDBStandalone.cmake - sed -i 's,".*tools/clang/include","${clang-unwrapped}/include",' \ + sed -i 's,".*tools/clang/include","${libclang.dev}/include",' \ cmake/modules/LLDBStandalone.cmake - sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \ + sed -i 's,"$.LLVM_LIBRARY_DIR.",${libllvm.lib}/lib ${libclang.lib}/lib,' \ cmake/modules/LLDBStandalone.cmake ''; - nativeBuildInputs = [ cmake python3 which swig ]; - buildInputs = [ ncurses zlib libedit libxml2 llvm ] - ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ + cmake python3 which swig + ]; + + buildInputs = [ + ncurses zlib libedit libxml2 libllvm + ] ++ lib.optionals stdenv.isDarwin [ + darwin.libobjc + darwin.apple_sdk.libs.xpc + darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa + ]; CXXFLAGS = "-fno-rtti"; hardeningDisable = [ "format" ]; cmakeFlags = [ + "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ] ++ lib.optionals doCheck [ + "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" ]; + doCheck = false; + postInstall = '' mkdir -p $out/share/man/man1 cp ../docs/lldb.1 $out/share/man/man1/ diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lldb/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lldb/gnu-install-dirs.patch new file mode 100644 index 0000000000..a240ecaab1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lldb/gnu-install-dirs.patch @@ -0,0 +1,76 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c6b082e104e5..568a99837e1f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,6 +7,8 @@ set(CMAKE_MODULE_PATH + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" + ) + ++include(GNUInstallDirs) ++ + include(LLDBStandalone) + include(LLDBConfig) + include(AddLLDB) +diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake +index 2fd8b384d9e3..4db5e786c493 100644 +--- a/cmake/modules/AddLLDB.cmake ++++ b/cmake/modules/AddLLDB.cmake +@@ -56,14 +56,14 @@ function(add_lldb_library name) + endif() + install(TARGETS ${name} + COMPONENT ${name} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${out_dir} + ARCHIVE DESTINATION ${out_dir}) + else() + install(TARGETS ${name} + COMPONENT ${name} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + if (NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-${name} +@@ -132,7 +132,7 @@ function(add_lldb_executable name) + if(ARG_GENERATE_INSTALL AND NOT (ARG_INCLUDE_IN_FRAMEWORK AND LLDB_BUILD_FRAMEWORK )) + install(TARGETS ${name} + COMPONENT ${name} +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + if (NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-${name} + DEPENDS ${name} +diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake +index 24878b5913f3..b9d27788bb87 100644 +--- a/cmake/modules/LLDBConfig.cmake ++++ b/cmake/modules/LLDBConfig.cmake +@@ -278,7 +278,7 @@ include_directories(BEFORE + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ + COMPONENT lldb-headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +@@ -288,7 +288,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ + COMPONENT lldb-headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt +index b5316540fdf3..3c3c882d503f 100644 +--- a/tools/intel-features/CMakeLists.txt ++++ b/tools/intel-features/CMakeLists.txt +@@ -64,4 +64,4 @@ if (NOT LLDB_DISABLE_PYTHON AND LLDB_BUILD_INTEL_PT) + endif() + + install(TARGETS lldbIntelFeatures +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/default.nix index de99691094..1c04a62c4d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/default.nix @@ -1,4 +1,5 @@ { lib, stdenv +, pkgsBuildBuild , fetch , cmake , python3 @@ -9,11 +10,12 @@ , version , release_version , zlib -, buildPackages +, buildLlvmTools , fetchpatch , debugVersion ? false , enableManpages ? false -, enableSharedLibraries ? true +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic +, enablePolly ? false }: let @@ -30,15 +32,18 @@ stdenv.mkDerivation ({ inherit version; src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn"; + polly_src = fetch "polly" "1k2frwg5mkqh0raia8xf69h3jhdw7a5nxd6vjscjn44cdkgmyxp7"; unpackPhase = '' unpackFile $src mv llvm-${version}* llvm sourceRoot=$PWD/llvm + '' + optionalString enablePolly '' + unpackFile $polly_src + mv polly-* $sourceRoot/tools/polly ''; - outputs = [ "out" "python" ] - ++ optional enableSharedLibraries "lib"; + outputs = [ "out" "lib" "dev" "python" ]; nativeBuildInputs = [ cmake python3 ] ++ optional enableManpages python3.pkgs.sphinx; @@ -58,12 +63,13 @@ stdenv.mkDerivation ({ includes = [ "test/tools/gold/X86/common.ll" ]; sha256 = "0fxgrxmfnjx17w3lcq19rk68b2xksh1bynz3ina784kma7hp4wdb"; }) - ]; + ./gnu-install-dirs.patch + ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' "" + --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}" ''${extra_libdir})' "" '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + optionalString (enableSharedLibraries) '' @@ -88,6 +94,7 @@ stdenv.mkDerivation ({ ''; cmakeFlags = with stdenv; [ + "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=ON" @@ -112,7 +119,20 @@ stdenv.mkDerivation ({ "-DCAN_TARGET_i386=false" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildPackages.llvm_6}/bin/llvm-tblgen" + "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ( + let + nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; + nativeBintools = nativeCC.bintools.bintools; + nativeToolchainFlags = [ + "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" + "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" + "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" + "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" + "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" + ]; + in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=${lib.concatStringsSep ";" nativeToolchainFlags}" + ) ]; postBuild = '' @@ -126,19 +146,20 @@ stdenv.mkDerivation ({ postInstall = '' mkdir -p $python/share mv $out/share/opt-viewer $python/share/opt-viewer - '' - + optionalString enableSharedLibraries '' - moveToOutput "lib/libLLVM-*" "$lib" - moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" + moveToOutput "bin/llvm-config*" "$dev" + substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ + --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" + substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ + --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' '' + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" ${lib.concatMapStringsSep "\n" (v: '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib '') versionSuffixes} + '' + + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; doCheck = stdenv.isLinux && (!stdenv.isi686); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/gnu-install-dirs-polly.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 0000000000..b4fda24a55 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,106 @@ +diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt +index 9ddc0f7ff81d..7ca45f286d47 100644 +--- a/tools/polly/CMakeLists.txt ++++ b/tools/polly/CMakeLists.txt +@@ -2,7 +2,11 @@ + if (NOT DEFINED LLVM_MAIN_SRC_DIR) + project(Polly) + cmake_minimum_required(VERSION 3.4.3) ++endif() ++ ++include(GNUInstallDirs) + ++if (NOT DEFINED LLVM_MAIN_SRC_DIR) + # Where is LLVM installed? + find_package(LLVM CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) +@@ -157,14 +161,14 @@ include_directories( + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE + ) + + install(DIRECTORY ${POLLY_BINARY_DIR}/include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE +diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt +index 969292cd6b00..d7aea77bdd20 100644 +--- a/tools/polly/cmake/CMakeLists.txt ++++ b/tools/polly/cmake/CMakeLists.txt +@@ -79,18 +79,18 @@ file(GENERATE + + # Generate PollyConfig.cmake for the install tree. + unset(POLLY_EXPORTS) +-set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") ++set(POLLY_INSTALL_PREFIX "") + set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") ++set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") ++set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + if (POLLY_BUNDLED_ISL) + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" +- "${POLLY_INSTALL_PREFIX}/include/polly" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" + ) + else() + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" + ${ISL_INCLUDE_DIRS} + ) + endif() +@@ -100,12 +100,12 @@ endif() + foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) + get_target_property(tgt_type ${tgt} TYPE) + if (tgt_type STREQUAL "EXECUTABLE") +- set(tgt_prefix "bin/") ++ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") + else() +- set(tgt_prefix "lib/") ++ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") + endif() + +- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$") ++ set(tgt_path "${tgt_prefix}$") + file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) + + if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") +diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake +index 32bed50bb060..cca5bfff4970 100644 +--- a/tools/polly/cmake/polly_macros.cmake ++++ b/tools/polly/cmake/polly_macros.cmake +@@ -44,8 +44,8 @@ macro(add_polly_library name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") + install(TARGETS ${name} + EXPORT LLVMExports +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) + endmacro(add_polly_library) +diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt +index b3c6e73a7a00..c67acf8576c7 100644 +--- a/tools/polly/lib/External/CMakeLists.txt ++++ b/tools/polly/lib/External/CMakeLists.txt +@@ -268,7 +268,7 @@ if (POLLY_BUNDLED_ISL) + install(DIRECTORY + ${ISL_SOURCE_DIR}/include/ + ${ISL_BINARY_DIR}/include/ +- DESTINATION include/polly ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/gnu-install-dirs.patch new file mode 100644 index 0000000000..987f97210f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/gnu-install-dirs.patch @@ -0,0 +1,386 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f8da6cf92119..881e4cda4971 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -271,15 +271,21 @@ if (CMAKE_BUILD_TYPE AND + message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") + endif() + ++include(GNUInstallDirs) ++ + set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) + +-set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") ++set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING ++ "Path for binary subdirectory (defaults to 'bin')") + mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) + + set(LLVM_UTILS_INSTALL_DIR "bin" CACHE STRING + "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") + mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) + ++set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING ++ "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) ++ + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) + set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) +@@ -510,9 +516,9 @@ option (LLVM_ENABLE_DOXYGEN "Use doxygen to generate llvm API documentation." OF + option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) + option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) + +-set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" ++set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html" + CACHE STRING "Doxygen-generated HTML documentation install directory") +-set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" ++set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html" + CACHE STRING "OCamldoc-generated HTML documentation install directory") + + option (LLVM_BUILD_EXTERNAL_COMPILER_RT +@@ -944,7 +950,7 @@ endif() + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/llvm include/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +@@ -956,7 +962,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index fd5627eecbb2..29e09c6f3f8a 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -621,11 +621,11 @@ macro(add_llvm_library name) + else() + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LTO" OR + (LLVM_LINK_LLVM_DYLIB AND ${name} STREQUAL "LLVM")) +- set(install_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(ARG_SHARED OR BUILD_SHARED_LIBS) + if(WIN32 OR CYGWIN OR MINGW) + set(install_type RUNTIME) +- set(install_dir bin) ++ set(install_dir ${CMAKE_INSTALL_BINDIR}) + else() + set(install_type LIBRARY) + endif() +@@ -667,9 +667,9 @@ macro(add_llvm_loadable_module name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + if(WIN32 OR CYGWIN) + # DLL platform +- set(dlldir "bin") ++ set(dlldir "${CMAKE_INSTALL_BINDIR}") + else() +- set(dlldir "lib${LLVM_LIBDIR_SUFFIX}") ++ set(dlldir "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + endif() + + if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR +@@ -681,7 +681,7 @@ macro(add_llvm_loadable_module name) + install(TARGETS ${name} + ${export_to_llvmexports} + LIBRARY DESTINATION ${dlldir} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) + endif() +@@ -892,7 +892,7 @@ macro(add_llvm_example name) + endif() + add_llvm_executable(${name} ${ARGN}) + if( LLVM_BUILD_EXAMPLES ) +- install(TARGETS ${name} RUNTIME DESTINATION examples) ++ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) + endif() + set_target_properties(${name} PROPERTIES FOLDER "Examples") + endmacro(add_llvm_example name) +@@ -1410,7 +1410,7 @@ function(llvm_install_library_symlink name dest type) + set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) + set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) + +- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 AND "${type}" STREQUAL "SHARED") + set(output_dir bin) + endif() +@@ -1426,7 +1426,7 @@ function(llvm_install_library_symlink name dest type) + endif() + endfunction() + +-function(llvm_install_symlink name dest) ++function(llvm_install_symlink name dest output_dir) + cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) + foreach(path ${CMAKE_MODULE_PATH}) + if(EXISTS ${path}/LLVMInstallSymlink.cmake) +@@ -1449,7 +1449,7 @@ function(llvm_install_symlink name dest) + set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) + + install(SCRIPT ${INSTALL_SYMLINK} +- CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" ++ CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" + COMPONENT ${component}) + + if (NOT CMAKE_CONFIGURATION_TYPES AND NOT ARG_ALWAYS_GENERATE) +@@ -1531,7 +1531,8 @@ function(add_llvm_tool_symlink link_name target) + endif() + + if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) +- llvm_install_symlink(${link_name} ${target}) ++ GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR) ++ llvm_install_symlink(${link_name} ${target} ${output_dir}) + endif() + endif() + endfunction() +@@ -1583,9 +1584,9 @@ function(llvm_setup_rpath name) + + if (APPLE) + set(_install_name_dir INSTALL_NAME_DIR "@rpath") +- set(_install_rpath "@loader_path/../lib" ${extra_libdir}) ++ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}" ${extra_libdir}) + elseif(UNIX) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + set_property(TARGET ${name} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-z,origin ") +diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake +index 02bab6846376..eff26adb2efc 100644 +--- a/cmake/modules/AddOCaml.cmake ++++ b/cmake/modules/AddOCaml.cmake +@@ -140,9 +140,9 @@ function(add_ocaml_library name) + endforeach() + + if( APPLE ) +- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + elseif( UNIX ) +- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + endif() + list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") + +diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake +index 22e3dcb776aa..ba77b9c195e2 100644 +--- a/cmake/modules/AddSphinxTarget.cmake ++++ b/cmake/modules/AddSphinxTarget.cmake +@@ -73,7 +73,7 @@ function (add_sphinx_target builder project) + + elseif (builder STREQUAL html) + string(TOUPPER "${project}" project_upper) +- set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" ++ set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html" + CACHE STRING "HTML documentation install directory for ${project}") + + # '/.' indicates: copy the contents of the directory directly into +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index 6074e8358594..9d0be6c2ced5 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -1,4 +1,4 @@ +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + # First for users who use an installed LLVM, create the LLVMExports.cmake file. +@@ -84,11 +84,11 @@ foreach(p ${_count}) + set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} + get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") + endforeach(p) +-set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") +-set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") ++set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") ++set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") + set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") +-set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") ++set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") + set(LLVM_CONFIG_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMExports.cmake") + set(LLVM_CONFIG_EXPORTS "${LLVM_EXPORTS}") + configure_file( +diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake +index 482697b06baf..af2ac1e6c979 100644 +--- a/cmake/modules/LLVMInstallSymlink.cmake ++++ b/cmake/modules/LLVMInstallSymlink.cmake +@@ -10,7 +10,7 @@ function(install_symlink name target outdir) + set(LINK_OR_COPY copy) + endif() + +- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") ++ set(bindir "${DESTDIR}${outdir}/") + + message("Creating ${name}") + +diff --git a/docs/CMake.rst b/docs/CMake.rst +index 05edec64da33..6db014f04656 100644 +--- a/docs/CMake.rst ++++ b/docs/CMake.rst +@@ -196,7 +196,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. + **LLVM_LIBDIR_SUFFIX**:STRING + Extra suffix to append to the directory where libraries are to be + installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` +- to install libraries to ``/usr/lib64``. ++ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. + + **CMAKE_C_FLAGS**:STRING + Extra flags to use when compiling C source files. +@@ -465,8 +465,8 @@ LLVM-specific variables + + **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING + The path to install Doxygen-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/doxygen-html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. + + **LLVM_ENABLE_SPHINX**:BOOL + If specified, CMake will search for the ``sphinx-build`` executable and will make +@@ -497,13 +497,33 @@ LLVM-specific variables + + **LLVM_INSTALL_SPHINX_HTML_DIR**:STRING + The path to install Sphinx-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/html`. + + **LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING + The path to install OCamldoc-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/ocaml-html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html`. ++ ++**CMAKE_INSTALL_BINDIR**:STRING ++ The path to install binary tools, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `bin`. ++ ++**CMAKE_INSTALL_LIBDIR**:STRING ++ The path to install libraries, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `lib`. ++ ++**CMAKE_INSTALL_INCLUDEDIR**:STRING ++ The path to install header files, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `include`. ++ ++**CMAKE_INSTALL_DOCDIR**:STRING ++ The path to install documentation, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `share/doc`. ++ ++**CMAKE_INSTALL_MANDIR**:STRING ++ The path to install manpage files, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `share/man`. + + **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL + OS X Only: If enabled CMake will generate a target named +@@ -660,9 +680,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). + + This file is available in two different locations. + +-* ``/lib/cmake/llvm/LLVMConfig.cmake`` where +- ```` is the install prefix of an installed version of LLVM. +- On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. ++* ``LLVMConfig.cmake`` where ++ ```` is the location where LLVM CMake modules are ++ installed as part of an installed version of LLVM. This is typically ++ ``cmake/llvm/`` within the lib directory. On Linux, this is typically ++ ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. + + * ``/lib/cmake/llvm/LLVMConfig.cmake`` where + ```` is the root of the LLVM build tree. **Note: this is only +diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt +index 1d5ca3ba92b0..026f5453c1da 100644 +--- a/include/llvm/CMakeLists.txt ++++ b/include/llvm/CMakeLists.txt +@@ -4,5 +4,5 @@ add_subdirectory(Support) + # If we're doing an out-of-tree build, copy a module map for generated + # header files into the build area. + if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +- configure_file(module.modulemap.build module.modulemap COPYONLY) ++ configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) + endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index f201e1f7bff0..4582ed556a02 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -24,6 +24,10 @@ + #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" ++#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" ++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" ++#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" ++#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" + #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" + #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 08b096afb052..2deae0dcfacc 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -332,12 +332,26 @@ int main(int argc, char **argv) { + ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); + } else { + ActivePrefix = CurrentExecPrefix; +- ActiveIncludeDir = ActivePrefix + "/include"; +- SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); +- sys::fs::make_absolute(ActivePrefix, path); +- ActiveBinDir = path.str(); +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; +- ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveIncludeDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveBinDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveLibDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveCMakeDir = std::string(path.str()); ++ } + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + +diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt +index 6e913519a809..85641eef721f 100644 +--- a/tools/lto/CMakeLists.txt ++++ b/tools/lto/CMakeLists.txt +@@ -19,7 +19,7 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports) + add_llvm_library(LTO SHARED ${SOURCES} DEPENDS intrinsics_gen) + + install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h +- DESTINATION include/llvm-c ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c + COMPONENT LTO) + + if (APPLE) +diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt +index 19b606933082..27b9f71b3d79 100644 +--- a/tools/opt-viewer/CMakeLists.txt ++++ b/tools/opt-viewer/CMakeLists.txt +@@ -8,6 +8,6 @@ set (files + + foreach (file ${files}) + install(PROGRAMS ${file} +- DESTINATION share/opt-viewer ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer + COMPONENT opt-viewer) + endforeach (file) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix index 4ab13441e3..187602ef36 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld +{ lib, stdenv, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +, buildLlvmTools , fixDarwinDylibNames , enableManpages ? false , enablePolly ? false # TODO: get this info from llvm (passthru?) @@ -23,17 +24,21 @@ let ++ lib.optional enableManpages python3.pkgs.sphinx ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libxml2 llvm lld ]; + buildInputs = [ libxml2 libllvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLVM_ENABLE_RTTI=ON" + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" ] ++ lib.optionals enablePolly [ "-DWITH_POLLY=ON" "-DLINK_POLLY_INTO_TOOLS=ON" @@ -43,6 +48,10 @@ let ./purity.patch # make clang -xhip use $PATH to find executables ./HIP-use-PATH-7.patch + # Backport for the `--unwindlib=[libgcc|compiler-rt]` flag, which is + # needed for our bootstrapping to not interfere with C. + ./unwindlib.patch + ./gnu-install-dirs.patch ]; postPatch = '' @@ -59,12 +68,12 @@ let --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE ''; - outputs = [ "out" "lib" "python" ]; + outputs = [ "out" "lib" "dev" "python" ]; # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${llvm}/lib/LLVMgold.so ]; then - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then + ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib fi ln -sv $out/bin/clang $out/bin/cpp @@ -81,11 +90,14 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + + mkdir -p $dev/bin + cp bin/clang-tblgen $dev/bin ''; passthru = { isClang = true; - inherit llvm; + inherit libllvm; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/clang/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/clang/gnu-install-dirs.patch new file mode 100644 index 0000000000..540c043a2d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/clang/gnu-install-dirs.patch @@ -0,0 +1,281 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 52b881939499..85662a2113e7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.4.3) + if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) + project(Clang) + ++ include(GNUInstallDirs) ++ + # Rely on llvm-config. + set(CONFIG_OUTPUT) + find_program(LLVM_CONFIG "llvm-config") +@@ -374,7 +376,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/clang include/clang-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.def" + PATTERN "*.h" +@@ -383,7 +385,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "CMakeFiles" EXCLUDE + PATTERN "*.inc" +@@ -391,7 +393,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(PROGRAMS utils/bash-autocomplete.sh +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + ) + endif() + +diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake +index c09a8423f9f6..39f37e0097eb 100644 +--- a/cmake/modules/AddClang.cmake ++++ b/cmake/modules/AddClang.cmake +@@ -99,9 +99,9 @@ macro(add_clang_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_clangtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-${name} +@@ -141,7 +141,7 @@ macro(add_clang_tool name) + + install(TARGETS ${name} + ${export_to_clangtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT CMAKE_CONFIGURATION_TYPES) +@@ -156,5 +156,5 @@ endmacro() + macro(add_clang_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index 1930d8e225c7..bb9158093079 100644 +--- a/lib/Headers/CMakeLists.txt ++++ b/lib/Headers/CMakeLists.txt +@@ -162,19 +162,19 @@ install( + FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h + COMPONENT clang-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) + + install( + FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_fp16.h + COMPONENT clang-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) + + install( + FILES ${cuda_wrapper_files} + COMPONENT clang-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) + + if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. + add_llvm_install_targets(install-clang-headers +diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt +index 53e3421f1b35..79ae5bb4c399 100644 +--- a/tools/c-index-test/CMakeLists.txt ++++ b/tools/c-index-test/CMakeLists.txt +@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH + "@executable_path/../../lib") + else() +- set(INSTALL_DESTINATION bin) ++ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + + install(TARGETS c-index-test +diff --git a/tools/clang-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt +index c5ace26c2914..97bdfca7d896 100644 +--- a/tools/clang-check/CMakeLists.txt ++++ b/tools/clang-check/CMakeLists.txt +@@ -20,4 +20,4 @@ target_link_libraries(clang-check + ) + + install(TARGETS clang-check +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt +index a295e8cd0b2a..1973ff82c7f6 100644 +--- a/tools/clang-format/CMakeLists.txt ++++ b/tools/clang-format/CMakeLists.txt +@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE ) + endif() + + install(PROGRAMS clang-format-bbedit.applescript +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-diff.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-sublime.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS git-clang-format +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT clang-format) +diff --git a/tools/clang-func-mapping/CMakeLists.txt b/tools/clang-func-mapping/CMakeLists.txt +index ae28e28d532d..8ecb2e37a8f7 100644 +--- a/tools/clang-func-mapping/CMakeLists.txt ++++ b/tools/clang-func-mapping/CMakeLists.txt +@@ -20,4 +20,4 @@ target_link_libraries(clang-func-mapping + ) + + install(TARGETS clang-func-mapping +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/tools/clang-offload-bundler/CMakeLists.txt b/tools/clang-offload-bundler/CMakeLists.txt +index 8718015be76a..7a038f39622e 100644 +--- a/tools/clang-offload-bundler/CMakeLists.txt ++++ b/tools/clang-offload-bundler/CMakeLists.txt +@@ -22,4 +22,4 @@ target_link_libraries(clang-offload-bundler + ${CLANG_OFFLOAD_BUNDLER_LIB_DEPS} + ) + +-install(TARGETS clang-offload-bundler RUNTIME DESTINATION bin) ++install(TARGETS clang-offload-bundler RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt +index 3b3ab1540a80..9aca9ba4a2cf 100644 +--- a/tools/clang-rename/CMakeLists.txt ++++ b/tools/clang-rename/CMakeLists.txt +@@ -18,8 +18,8 @@ target_link_libraries(clang-rename + ) + + install(PROGRAMS clang-rename.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) + install(PROGRAMS clang-rename.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) +diff --git a/tools/diagtool/CMakeLists.txt b/tools/diagtool/CMakeLists.txt +index 96d1c390249c..41c762b37b76 100644 +--- a/tools/diagtool/CMakeLists.txt ++++ b/tools/diagtool/CMakeLists.txt +@@ -21,7 +21,7 @@ target_link_libraries(diagtool + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(TARGETS diagtool + COMPONENT diagtool +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-diagtool +diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt +index e539c8308e75..4e1fbccea35d 100644 +--- a/tools/libclang/CMakeLists.txt ++++ b/tools/libclang/CMakeLists.txt +@@ -130,7 +130,7 @@ endif() + if(INTERNAL_INSTALL_PREFIX) + set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") + else() +- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) ++ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + install(DIRECTORY ../../include/clang-c +diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt +index 380379300b09..adfd58ed5f7d 100644 +--- a/tools/scan-build/CMakeLists.txt ++++ b/tools/scan-build/CMakeLists.txt +@@ -41,7 +41,7 @@ if(CLANG_INSTALL_SCANBUILD) + ${CMAKE_BINARY_DIR}/bin/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) +- install(PROGRAMS bin/${BinFile} DESTINATION bin) ++ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endforeach() + + foreach(LibexecFile ${LibexecFiles}) +@@ -53,7 +53,7 @@ if(CLANG_INSTALL_SCANBUILD) + ${CMAKE_BINARY_DIR}/libexec/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) +- install(PROGRAMS libexec/${LibexecFile} DESTINATION libexec) ++ install(PROGRAMS libexec/${LibexecFile} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) + endforeach() + + foreach(ManPage ${ManPages}) +@@ -77,7 +77,7 @@ if(CLANG_INSTALL_SCANBUILD) + ${CMAKE_BINARY_DIR}/share/scan-build/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) +- install(FILES share/scan-build/${ShareFile} DESTINATION share/scan-build) ++ install(FILES share/scan-build/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build) + endforeach() + + add_custom_target(scan-build ALL DEPENDS ${Depends}) +diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt +index b305ca562a72..554bcb379061 100644 +--- a/tools/scan-view/CMakeLists.txt ++++ b/tools/scan-view/CMakeLists.txt +@@ -21,7 +21,7 @@ if(CLANG_INSTALL_SCANVIEW) + ${CMAKE_BINARY_DIR}/bin/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) +- install(PROGRAMS bin/${BinFile} DESTINATION bin) ++ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endforeach() + + foreach(ShareFile ${ShareFiles}) +@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) + ${CMAKE_BINARY_DIR}/share/scan-view/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) +- install(FILES share/${ShareFile} DESTINATION share/scan-view) ++ install(FILES share/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view) + endforeach() + + add_custom_target(scan-view ALL DEPENDS ${Depends}) +diff --git a/utils/hmaptool/CMakeLists.txt b/utils/hmaptool/CMakeLists.txt +index 5573009d343a..24b3a90f233f 100644 +--- a/utils/hmaptool/CMakeLists.txt ++++ b/utils/hmaptool/CMakeLists.txt +@@ -9,7 +9,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${CLANG_HMAPTOOL}) + + list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) +-install(PROGRAMS ${CLANG_HMAPTOOL} DESTINATION bin) ++install(PROGRAMS ${CLANG_HMAPTOOL} DESTINATION ${CMAKE_INSTALL_BINDIR}) + + add_custom_target(hmaptool ALL DEPENDS ${Depends}) + set_target_properties(hmaptool PROPERTIES FOLDER "Utils") diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/clang/unwindlib.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/clang/unwindlib.patch new file mode 100644 index 0000000000..59a092d7c7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/clang/unwindlib.patch @@ -0,0 +1,227 @@ +commit a5cacb5ba7f1f18e7bb6f6709e42683eeb7e6470 +Author: Sterling Augustine +Date: Tue Mar 19 20:01:59 2019 +0000 + + Add --unwindlib=[libgcc|compiler-rt] to parallel --rtlib= [take 2] + + "clang++ hello.cc --rtlib=compiler-rt" + + now can works without specifying additional unwind or exception + handling libraries. + + This reworked version of the feature no longer modifies today's default + unwind library for compiler-rt: which is nothing. Rather, a user + can specify -DCLANG_DEFAULT_UNWINDLIB=libunwind when configuring + the compiler. + + This should address the issues from the previous version. + + Update tests for new --unwindlib semantics. + + Differential Revision: https://reviews.llvm.org/D59109 + + llvm-svn: 356508 + +diff --git clang/CMakeLists.txt clang/CMakeLists.txt +index 52b881939499..2c3fb62f6e73 100644 +--- clang/CMakeLists.txt ++++ clang/CMakeLists.txt +@@ -244,6 +244,24 @@ if (NOT(CLANG_DEFAULT_RTLIB STREQUAL "" OR + "Default runtime library to use (\"libgcc\" or \"compiler-rt\", empty for platform default)" FORCE) + endif() + ++set(CLANG_DEFAULT_UNWINDLIB "" CACHE STRING ++ "Default unwind library to use (\"none\" \"libgcc\" or \"libunwind\", empty to match runtime library.)") ++if (CLANG_DEFAULT_UNWINDLIB STREQUAL "") ++ if (CLANG_DEFAULT_RTLIB STREQUAL "libgcc") ++ set (CLANG_DEFAULT_UNWINDLIB "libgcc" CACHE STRING "" FORCE) ++ elseif (CLANG_DEFAULT_RTLIBS STREQUAL "libunwind") ++ set (CLANG_DEFAULT_UNWINDLIB "none" CACHE STRING "" FORCE) ++ endif() ++endif() ++ ++if (NOT(CLANG_DEFAULT_UNWINDLIB STREQUAL "none" OR ++ CLANG_DEFAULT_UNWINDLIB STREQUAL "libgcc" OR ++ CLANG_DEFAULT_UNWINDLIB STREQUAL "libunwind")) ++ message(WARNING "Resetting default unwindlib to use platform default") ++ set(CLANG_DEFAULT_UNWINDLIB "" CACHE STRING ++ "Default unwind library to use (\"none\" \"libgcc\" or \"libunwind\", empty for none)" FORCE) ++endif() ++ + set(CLANG_DEFAULT_OBJCOPY "objcopy" CACHE STRING + "Default objcopy executable to use.") + +diff --git clang/include/clang/Basic/DiagnosticDriverKinds.td clang/include/clang/Basic/DiagnosticDriverKinds.td +index 7f75f45c6578..7e1bb33b5cef 100644 +--- clang/include/clang/Basic/DiagnosticDriverKinds.td ++++ clang/include/clang/Basic/DiagnosticDriverKinds.td +@@ -52,6 +52,10 @@ def err_drv_invalid_rtlib_name : Error< + "invalid runtime library name in argument '%0'">; + def err_drv_unsupported_rtlib_for_platform : Error< + "unsupported runtime library '%0' for platform '%1'">; ++def err_drv_invalid_unwindlib_name : Error< ++ "invalid unwind library name in argument '%0'">; ++def err_drv_incompatible_unwindlib : Error< ++ "--rtlib=libgcc requires --unwindlib=libgcc">; + def err_drv_invalid_stdlib_name : Error< + "invalid library name in argument '%0'">; + def err_drv_invalid_output_with_multiple_archs : Error< +diff --git clang/include/clang/Config/config.h.cmake clang/include/clang/Config/config.h.cmake +index 1d624450b9d9..2d4cb747e87e 100644 +--- clang/include/clang/Config/config.h.cmake ++++ clang/include/clang/Config/config.h.cmake +@@ -23,6 +23,9 @@ + /* Default runtime library to use. */ + #define CLANG_DEFAULT_RTLIB "${CLANG_DEFAULT_RTLIB}" + ++/* Default unwind library to use. */ ++#define CLANG_DEFAULT_UNWINDLIB "${CLANG_DEFAULT_UNWINDLIB}" ++ + /* Default objcopy to use */ + #define CLANG_DEFAULT_OBJCOPY "${CLANG_DEFAULT_OBJCOPY}" + +diff --git clang/include/clang/Driver/Options.td clang/include/clang/Driver/Options.td +index 601aa8744967..0e74a2d36dea 100644 +--- clang/include/clang/Driver/Options.td ++++ clang/include/clang/Driver/Options.td +@@ -2428,6 +2428,8 @@ def std_EQ : Joined<["-", "--"], "std=">, Flags<[CC1Option]>, + }]>; + def stdlib_EQ : Joined<["-", "--"], "stdlib=">, Flags<[CC1Option]>, + HelpText<"C++ standard library to use">, Values<"libc++,libstdc++,platform">; ++def unwindlib_EQ : Joined<["-", "--"], "unwindlib=">, Flags<[CC1Option]>, ++ HelpText<"Unwind library to use">, Values<"libgcc,unwindlib,platform">; + def sub__library : JoinedOrSeparate<["-"], "sub_library">; + def sub__umbrella : JoinedOrSeparate<["-"], "sub_umbrella">; + def system_header_prefix : Joined<["--"], "system-header-prefix=">, +diff --git clang/include/clang/Driver/ToolChain.h clang/include/clang/Driver/ToolChain.h +index 2f9c2c190e32..d5b131bcf112 100644 +--- clang/include/clang/Driver/ToolChain.h ++++ clang/include/clang/Driver/ToolChain.h +@@ -99,6 +99,12 @@ public: + RLT_Libgcc + }; + ++ enum UnwindLibType { ++ UNW_None, ++ UNW_CompilerRT, ++ UNW_Libgcc ++ }; ++ + enum RTTIMode { + RM_Enabled, + RM_Disabled, +@@ -352,6 +358,10 @@ public: + return ToolChain::CST_Libstdcxx; + } + ++ virtual UnwindLibType GetDefaultUnwindLibType() const { ++ return ToolChain::UNW_None; ++ } ++ + virtual std::string getCompilerRTPath() const; + + virtual std::string getCompilerRT(const llvm::opt::ArgList &Args, +@@ -484,6 +494,10 @@ public: + // given compilation arguments. + virtual CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const; + ++ // GetUnwindLibType - Determine the unwind library type to use with the ++ // given compilation arguments. ++ virtual UnwindLibType GetUnwindLibType(const llvm::opt::ArgList &Args) const; ++ + /// AddClangCXXStdlibIncludeArgs - Add the clang -cc1 level arguments to set + /// the include paths to use for the given C++ standard library type. + virtual void +diff --git clang/lib/Driver/ToolChain.cpp clang/lib/Driver/ToolChain.cpp +index cf3db34688df..d980dd5d23fb 100644 +--- clang/lib/Driver/ToolChain.cpp ++++ clang/lib/Driver/ToolChain.cpp +@@ -665,6 +665,33 @@ ToolChain::RuntimeLibType ToolChain::GetRuntimeLibType( + return GetDefaultRuntimeLibType(); + } + ++ToolChain::UnwindLibType ToolChain::GetUnwindLibType( ++ const ArgList &Args) const { ++ const Arg *A = Args.getLastArg(options::OPT_unwindlib_EQ); ++ StringRef LibName = A ? A->getValue() : CLANG_DEFAULT_UNWINDLIB; ++ ++ if (LibName == "none") ++ return ToolChain::UNW_None; ++ else if (LibName == "platform" || LibName == "") { ++ ToolChain::RuntimeLibType RtLibType = GetRuntimeLibType(Args); ++ if (RtLibType == ToolChain::RLT_CompilerRT) ++ return ToolChain::UNW_None; ++ else if (RtLibType == ToolChain::RLT_Libgcc) ++ return ToolChain::UNW_Libgcc; ++ } else if (LibName == "libunwind") { ++ if (GetRuntimeLibType(Args) == RLT_Libgcc) ++ getDriver().Diag(diag::err_drv_incompatible_unwindlib); ++ return ToolChain::UNW_CompilerRT; ++ } else if (LibName == "libgcc") ++ return ToolChain::UNW_Libgcc; ++ ++ if (A) ++ getDriver().Diag(diag::err_drv_invalid_unwindlib_name) ++ << A->getAsString(Args); ++ ++ return GetDefaultUnwindLibType(); ++} ++ + ToolChain::CXXStdlibType ToolChain::GetCXXStdlibType(const ArgList &Args) const{ + const Arg *A = Args.getLastArg(options::OPT_stdlib_EQ); + StringRef LibName = A ? A->getValue() : CLANG_DEFAULT_CXX_STDLIB; +diff --git clang/test/Driver/compiler-rt-unwind.c clang/test/Driver/compiler-rt-unwind.c +new file mode 100644 +index 000000000000..00024dfa7ed3 +--- /dev/null ++++ clang/test/Driver/compiler-rt-unwind.c +@@ -0,0 +1,49 @@ ++// General tests that the driver handles combinations of --rtlib=XXX and ++// --unwindlib=XXX properly. ++// ++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=x86_64-unknown-linux \ ++// RUN: --gcc-toolchain="" \ ++// RUN: | FileCheck --check-prefix=RTLIB-EMPTY %s ++// RTLIB-EMPTY: "{{.*}}lgcc" ++// RTLIB-EMPTY: "{{.*}}-lgcc_s" ++// ++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=x86_64-unknown-linux -rtlib=libgcc \ ++// RUN: --gcc-toolchain="" \ ++// RUN: | FileCheck --check-prefix=RTLIB-GCC %s ++// RTLIB-GCC: "{{.*}}lgcc" ++// RTLIB-GCC: "{{.*}}lgcc_s" ++// ++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=libunwind \ ++// RUN: --gcc-toolchain="" \ ++// RUN: | FileCheck --check-prefix=RTLIB-GCC-UNWINDLIB-COMPILER-RT %s ++// RTLIB-GCC-UNWINDLIB-COMPILER-RT: "{{.*}}lgcc" ++// RTLIB-GCC-UNWINDLIB-COMPILER-RT: "{{.*}}lunwind" ++// ++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt \ ++// RUN: --gcc-toolchain="" \ ++// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT %s ++// RTLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins-x86_64.a" ++// ++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \ ++// RUN: --gcc-toolchain="" \ ++// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC %s ++// RTLIB-COMPILER-RT-UNWINDLIB-GCC: "{{.*}}libclang_rt.builtins-x86_64.a" ++// RTLIB-COMPILER-RT-UNWINDLIB-GCC: "{{.*}}lgcc_s" ++// ++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \ ++// RUN: -static --gcc-toolchain="" \ ++// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC %s ++// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC: "{{.*}}libclang_rt.builtins-x86_64.a" ++// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC: "{{.*}}lgcc_eh" ++// ++// RUN: not %clang -no-canonical-prefixes %s -o %t.o 2> %t.err \ ++// RUN: --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=libunwind \ ++// RUN: --gcc-toolchain="" \ ++// RUN: FileCheck --input-file=%t.err --check-prefix=RTLIB-GCC-UNWINDLIB-COMPILER_RT %s ++// RTLIB-GCC-UNWINDLIB-COMPILER_RT: "{{[.|\\\n]*}}--rtlib=libgcc requires --unwindlib=libgcc" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt/default.nix index 2184213159..75d61a51e6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { inherit version; src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5"; - nativeBuildInputs = [ cmake python3 llvm ]; + nativeBuildInputs = [ cmake python3 llvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ @@ -54,6 +54,7 @@ stdenv.mkDerivation { # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce ../../common/compiler-rt/glibc.patch ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ./gnu-install-dirs.patch ] ++ lib.optional (useLLVM) ./crtbegin-and-end.patch ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 0000000000..fd7c6a690f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,117 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 86ca2b3ef74b..555103bd97fe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 3.4.3) + # Check if compiler-rt is built as a standalone project. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) + project(CompilerRT C CXX ASM) ++ include(GNUInstallDirs) + set(COMPILER_RT_STANDALONE_BUILD TRUE) + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + endif() +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index cd4c704fc824..5abcd1260381 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -478,7 +478,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) + add_custom_target(${target_name} DEPENDS ${dst_file}) + # Install in Clang resource directory. + install(FILES ${file_name} +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR} + COMPONENT ${component}) + add_dependencies(${component} ${target_name}) + +@@ -495,7 +495,7 @@ macro(add_compiler_rt_script name) + add_custom_target(${name} DEPENDS ${dst}) + install(FILES ${dst} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR}) + endmacro(add_compiler_rt_script src name) + + # Builds custom version of libc++ and installs it in . +diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake +index 04cc955980fa..a99f6dfb2f82 100644 +--- a/cmake/Modules/CompilerRTDarwinUtils.cmake ++++ b/cmake/Modules/CompilerRTDarwinUtils.cmake +@@ -377,7 +377,7 @@ macro(darwin_add_embedded_builtin_libraries) + set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded) + set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded) + + set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi") + set(CFLAGS_i386 "-march=pentium") +diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake +index e5651718fa34..d95cfc984a85 100644 +--- a/cmake/Modules/CompilerRTUtils.cmake ++++ b/cmake/Modules/CompilerRTUtils.cmake +@@ -330,7 +330,7 @@ endfunction() + function(get_compiler_rt_install_dir arch install_dir) + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + get_compiler_rt_target(${arch} target) +- set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${target}/lib PARENT_SCOPE) ++ set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${target}/${CMAKE_INSTALL_FULL_LIBDIR} PARENT_SCOPE) + else() + set(${install_dir} ${COMPILER_RT_LIBRARY_INSTALL_DIR} PARENT_SCOPE) + endif() +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index 91fe2494b476..b59a0ffc69f4 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -53,11 +53,11 @@ if (LLVM_TREE_AVAILABLE) + else() + # Take output dir and install path from the user. + set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH +- "Path where built compiler-rt libraries should be stored.") ++ "Path where built compiler-rt build artifacts should be stored.") + set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH + "Path where built compiler-rt executables should be stored.") +- set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH +- "Path where built compiler-rt libraries should be installed.") ++ set(COMPILER_RT_INSTALL_PATH "" CACHE PATH ++ "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.") + option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF) + option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) + # Use a host compiler to compile/link tests. +@@ -85,7 +85,7 @@ else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) + set(COMPILER_RT_LIBRARY_OUTPUT_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) + set(COMPILER_RT_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR}) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) + endif() + + if(APPLE) +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index c4b93b89a30c..3913dc3a1ee6 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -48,12 +48,12 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") + install(FILES ${SANITIZER_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer) + # Install xray headers. + install(FILES ${XRAY_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray) + + if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs. + add_custom_target(install-compiler-rt-headers +diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt +index b3ae713cf02c..52b364b900f5 100644 +--- a/lib/dfsan/CMakeLists.txt ++++ b/lib/dfsan/CMakeLists.txt +@@ -54,4 +54,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename} + DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt) + add_dependencies(dfsan dfsan_abilist) + install(FILES ${dfsan_abilist_filename} +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix index 2170177117..7aa3f9099c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix @@ -1,6 +1,5 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith -, buildPackages , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: @@ -18,42 +17,51 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "0lb4kdh7j2fhfz8kd6iv5df7m3pikiryk1vvwsf87spc90n09q0w"; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); - mkExtraBuildCommands = cc: '' + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); + mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; + mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ''; + in { - llvm = callPackage ./llvm { }; + libllvm = callPackage ./llvm { }; - llvm-polly = callPackage ./llvm { enablePolly = true; }; + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputUnspecified = true; }; - clang-unwrapped = callPackage ./clang { - inherit (tools) lld; + libllvm-polly = callPackage ./llvm { enablePolly = true; }; + + llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; }; + + libclang = callPackage ./clang { inherit clang-tools-extra_src; }; + + clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; + clang-polly-unwrapped = callPackage ./clang { inherit clang-tools-extra_src; - llvm = tools.llvm-polly; + libllvm = tools.libllvm-polly; enablePolly = true; }; - llvm-manpages = lowPrio (tools.llvm.override { + llvm-manpages = lowPrio (tools.libllvm.override { enableManpages = true; python3 = pkgs.python3; # don't use python-boot }); - clang-manpages = lowPrio (tools.clang-unwrapped.override { + clang-manpages = lowPrio (tools.libclang.override { enableManpages = true; python3 = pkgs.python3; # don't use python-boot }); - libclang = tools.clang-unwrapped.lib; - clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; libstdcxxClang = wrapCCWith rec { @@ -141,7 +149,7 @@ let '' + mkExtraBuildCommands cc; }; - lldClangNoCompilerRt = wrapCCWith { + lldClangNoCompilerRt = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = null; bintools = wrapBintoolsWith { @@ -151,7 +159,7 @@ let extraPackages = [ ]; extraBuildCommands = '' echo "-nostartfiles" >> $out/nix-support/cc-cflags - ''; + '' + mkExtraBuildCommands0 cc; }; }); @@ -181,6 +189,12 @@ let libunwind = libraries.libunwind; })); + libunwind = callPackage ./libunwind ({ + inherit (buildLlvmTools) llvm; + } // lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + }); + openmp = callPackage ./openmp.nix {}; }); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix index fb50c4e24d..afc59d9117 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation { export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; - patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; + outputs = [ "out" "dev" ]; + + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; prePatch = '' substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" @@ -37,7 +41,8 @@ stdenv.mkDerivation { "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" - ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" ; + ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" + ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" ; passthru = { isLLVM = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++/gnu-install-dirs.patch new file mode 100644 index 0000000000..910e5287a8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++/gnu-install-dirs.patch @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index acb49565ce97..6a863926cbca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,6 +26,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + project(libcxx CXX C) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libcxx) + set(PACKAGE_VERSION 7.0.0) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake +index 1c19d7e01af7..9c8aee8e8bb7 100644 +--- a/cmake/Modules/HandleLibCXXABI.cmake ++++ b/cmake/Modules/HandleLibCXXABI.cmake +@@ -59,7 +59,7 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs) + + if (LIBCXX_INSTALL_HEADERS) + install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" +- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dstdir} ++ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} + COMPONENT cxx-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index d9def18d725c..16494dacaf6f 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -243,7 +243,7 @@ if (LIBCXX_INSTALL_HEADERS) + foreach(file ${files}) + get_filename_component(dir ${file} DIRECTORY) + install(FILES ${file} +- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dir} ++ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dir} + COMPONENT cxx-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) +@@ -252,7 +252,7 @@ if (LIBCXX_INSTALL_HEADERS) + if (LIBCXX_NEEDS_SITE_CONFIG) + # Install the generated header as __config. + install(FILES ${LIBCXX_BINARY_DIR}/__generated_config +- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1 ++ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + RENAME __config + COMPONENT cxx-headers) +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index e068edc8a7af..b63ad92d1d78 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -399,8 +399,8 @@ if (LIBCXX_INSTALL_LIBRARY) + set(experimental_lib cxx_experimental) + endif() + install(TARGETS ${LIBCXX_INSTALL_TARGETS} ${filesystem_lib} ${experimental_lib} +- LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx +- ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx ++ LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx ++ ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx + ) + # NOTE: This install command must go after the cxx install command otherwise + # it will not be executed after the library symlinks are installed. +@@ -408,7 +408,7 @@ if (LIBCXX_INSTALL_LIBRARY) + # Replace the libc++ filename with $ + # after we required CMake 3.0. + install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}" +- DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} ++ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} + COMPONENT libcxx) + endif() + endif() diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi/default.nix index 84c4786514..31ead6eb42 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, cmake, fetch, libcxx, llvm, version -, standalone ? false +{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version +, standalone ? stdenv.hostPlatform.useLLVM or false +, withLibunwind ? !stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm # on musl the shared objects don't build , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -10,7 +11,7 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2"; - nativeBuildInputs = [ cmake ]; + outputs = [ "out" "dev" ]; postUnpack = '' unpackFile ${libcxx.src} @@ -22,9 +23,18 @@ stdenv.mkDerivation { patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} ''; - cmakeFlags = - lib.optional standalone "-DLLVM_ENABLE_LIBCXX=ON" ++ - lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF"; + patches = [ + ./gnu-install-dirs.patch + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = lib.optional withLibunwind libunwind; + + cmakeFlags = lib.optionals standalone [ + "-DLLVM_ENABLE_LIBCXX=ON" + ] ++ lib.optionals (standalone && withLibunwind) [ + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + ] ++ lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF"; installPhase = if stdenv.isDarwin then '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi/gnu-install-dirs.patch new file mode 100644 index 0000000000..92d9e94fde --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi/gnu-install-dirs.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d6648ede1f59..55a8f17ca5e6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,6 +20,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + project(libcxxabi CXX C) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libcxxabi) + set(PACKAGE_VERSION 7.0.0svn) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 776c51294330..314b45feac69 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -195,8 +195,8 @@ add_custom_target(cxxabi DEPENDS ${LIBCXXABI_BUILD_TARGETS}) + + if (LIBCXXABI_INSTALL_LIBRARY) + install(TARGETS ${LIBCXXABI_INSTALL_TARGETS} +- LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi +- ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi ++ LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi ++ ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi + ) + endif() + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libunwind/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libunwind/default.nix new file mode 100644 index 0000000000..14c0abc515 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libunwind/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, version, fetch, fetchpatch, cmake, llvm, libcxx +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation { + pname = "libunwind"; + inherit version; + + src = fetch "libunwind" "035dsxs10nyiqd00q07yycvmkjl01yz4jdlrjvmch8klxg4pyjhp"; + + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + # removes use of `new` that require libc++ + (fetchpatch { + url = "https://github.com/llvm-mirror/libunwind/commit/34a45c630d4c79af403661d267db42fbe7de1178.patch"; + sha256 = "0n0pv6jvcky8pn3srhrf9x5kbnd0d2kia9xlx2g590f5q0bgwfhv"; + }) + # cleans up remaining libc++ dependencies (mostly header inclusions) + (fetchpatch { + url = "https://github.com/llvm-mirror/libunwind/commit/e050272d2eb57eb4e56a37b429a61df2ebb8aa3e.patch"; + sha256 = "170mwmj0wf40iyk1kzdpaiy36rz9n8dpl881h4h7s5da0rh51xya"; + includes = [ "src/libunwind.cpp" "src/UnwindCursor.hpp" ]; + }) + ]; + + nativeBuildInputs = [ cmake llvm.dev ]; + + cmakeFlags = lib.optionals (!enableShared) [ + "-DLIBUNWIND_ENABLE_SHARED=OFF" + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + "-DLIBUNWIND_HAS_NOSTDINCXX_FLAG=ON" + "-DLLVM_ENABLE_LIBCXX=ON" + ]; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libunwind/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libunwind/gnu-install-dirs.patch new file mode 100644 index 0000000000..21d4fa80ea --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libunwind/gnu-install-dirs.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0e48d713837a..05483c367bd1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,6 +18,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + project(libunwind) + ++ include(GNUInstallDirs) ++ + # Rely on llvm-config. + set(CONFIG_OUTPUT) + if(NOT LLVM_CONFIG_PATH) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 937159e2cb86..07f8b936e7e5 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -141,8 +141,8 @@ add_custom_target(unwind DEPENDS ${LIBUNWIND_BUILD_TARGETS}) + + if (LIBUNWIND_INSTALL_LIBRARY) + install(TARGETS ${LIBUNWIND_INSTALL_TARGETS} +- LIBRARY DESTINATION ${LIBUNWIND_INSTALL_PREFIX}lib${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind +- ARCHIVE DESTINATION ${LIBUNWIND_INSTALL_PREFIX}lib${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind) ++ LIBRARY DESTINATION ${LIBUNWIND_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind ++ ARCHIVE DESTINATION ${LIBUNWIND_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind) + endif() + + if (NOT CMAKE_CONFIGURATION_TYPES AND LIBUNWIND_INSTALL_LIBRARY) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lld/default.nix index f4c58abef8..da863d5ad4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lld/default.nix @@ -1,8 +1,9 @@ { lib, stdenv +, buildLlvmTools , fetch , cmake , libxml2 -, llvm +, libllvm , version }: @@ -12,15 +13,20 @@ stdenv.mkDerivation { src = fetch "lld" "0rsqb7zcnij5r5ipfhr129j7skr5n9pyr388kjpqwh091952f3x1"; + patches = [ + ./gnu-install-dirs.patch + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ llvm libxml2 ]; + buildInputs = [ libllvm libxml2 ]; - outputs = [ "out" "dev" ]; + cmakeFlags = [ + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ]; - postInstall = '' - moveToOutput include "$dev" - moveToOutput lib "$dev" - ''; + outputs = [ "out" "lib" "dev" ]; meta = { description = "The LLVM Linker"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lld/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lld/gnu-install-dirs.patch new file mode 100644 index 0000000000..acc2d3d477 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lld/gnu-install-dirs.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e2fbdbfbbb47..d601b231ebb8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(LLD_BUILT_STANDALONE TRUE) + ++ include(GNUInstallDirs) ++ + find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") + if(NOT LLVM_CONFIG_PATH) + message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") +@@ -203,7 +205,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake +index fa48b428d26b..e7967aad3ceb 100644 +--- a/cmake/modules/AddLLD.cmake ++++ b/cmake/modules/AddLLD.cmake +@@ -20,9 +20,9 @@ macro(add_lld_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_lldtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-${name} +@@ -54,7 +54,7 @@ macro(add_lld_tool name) + + install(TARGETS ${name} + ${export_to_lldtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT CMAKE_CONFIGURATION_TYPES) +@@ -69,5 +69,5 @@ endmacro() + macro(add_lld_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() +diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt +index d8829493fc22..df748a0e749b 100644 +--- a/tools/lld/CMakeLists.txt ++++ b/tools/lld/CMakeLists.txt +@@ -16,7 +16,7 @@ target_link_libraries(lld + ) + + install(TARGETS lld +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if(NOT LLD_SYMLINKS_TO_CREATE) + set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld ld64.lld wasm-ld) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lldb/default.nix index 3fa5b411f6..9788849287 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lldb/default.nix @@ -7,32 +7,31 @@ , which , libedit , libxml2 -, llvm -, clang-unwrapped +, libllvm +, libclang , perl , python3 , version , darwin }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lldb"; inherit version; src = fetch "lldb" "0klsscg1sczc4nw2l53xggi969k361cng2sjjrfp3bv4g5x14s4v"; - nativeBuildInputs = [ cmake perl python3 which swig ]; - buildInputs = [ ncurses zlib libedit libxml2 llvm ] - ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; - + patches = [ + ./gnu-install-dirs.patch + ]; postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place - sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ + sed -i 's,".*ClangConfig.cmake","${libclang.dev}/lib/cmake/clang/ClangConfig.cmake",' \ cmake/modules/LLDBStandalone.cmake - sed -i 's,".*tools/clang/include","${clang-unwrapped}/include",' \ + sed -i 's,".*tools/clang/include","${libclang.dev}/include",' \ cmake/modules/LLDBStandalone.cmake - sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \ + sed -i 's,"$.LLVM_LIBRARY_DIR.",${libllvm.lib}/lib ${libclang.lib}/lib,' \ cmake/modules/LLDBStandalone.cmake sed -i -e 's,message(SEND_ERROR "Cannot find debugserver on system."),,' \ -e 's,string(STRIP ''${XCODE_DEV_DIR} XCODE_DEV_DIR),,' \ @@ -42,9 +41,18 @@ stdenv.mkDerivation { patchShebangs scripts ''; - cmakeFlags = [ - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic - "-DSKIP_DEBUGSERVER=ON" + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ + cmake perl python3 which swig + ]; + + buildInputs = [ + ncurses zlib libedit libxml2 libllvm + ] ++ lib.optionals stdenv.isDarwin [ + darwin.libobjc + darwin.apple_sdk.libs.xpc + darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; CXXFLAGS = "-fno-rtti"; @@ -52,6 +60,17 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2"; + cmakeFlags = [ + "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + "-DSKIP_DEBUGSERVER=ON" + ] ++ lib.optionals doCheck [ + "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" + ]; + + doCheck = false; + postInstall = '' mkdir -p $out/share/man/man1 cp ../docs/lldb.1 $out/share/man/man1/ diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lldb/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lldb/gnu-install-dirs.patch new file mode 100644 index 0000000000..40645743ec --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/lldb/gnu-install-dirs.patch @@ -0,0 +1,76 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 00ddcdc1488f..af2aa238939a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,6 +7,8 @@ set(CMAKE_MODULE_PATH + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" + ) + ++include(GNUInstallDirs) ++ + include(LLDBStandalone) + include(LLDBConfig) + include(AddLLDB) +diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake +index 129a5ef7500d..fb3fb3ce655c 100644 +--- a/cmake/modules/AddLLDB.cmake ++++ b/cmake/modules/AddLLDB.cmake +@@ -56,14 +56,14 @@ function(add_lldb_library name) + endif() + install(TARGETS ${name} + COMPONENT ${name} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${out_dir} + ARCHIVE DESTINATION ${out_dir}) + else() + install(TARGETS ${name} + COMPONENT ${name} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + if (NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-${name} +@@ -121,7 +121,7 @@ function(add_lldb_executable name) + endif() + + if(ARG_GENERATE_INSTALL) +- set(out_dir "bin") ++ set(out_dir "${CMAKE_INSTALL_BINDIR}") + if (LLDB_BUILD_FRAMEWORK AND ARG_INCLUDE_IN_SUITE) + set(out_dir ${LLDB_FRAMEWORK_INSTALL_DIR}/${LLDB_FRAMEWORK_RESOURCE_DIR}) + endif() +diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake +index dae6e365da38..ef272d5de5c0 100644 +--- a/cmake/modules/LLDBConfig.cmake ++++ b/cmake/modules/LLDBConfig.cmake +@@ -278,7 +278,7 @@ include_directories(BEFORE + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ + COMPONENT lldb-headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +@@ -288,7 +288,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ + COMPONENT lldb-headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt +index b5316540fdf3..3c3c882d503f 100644 +--- a/tools/intel-features/CMakeLists.txt ++++ b/tools/intel-features/CMakeLists.txt +@@ -64,4 +64,4 @@ if (NOT LLDB_DISABLE_PYTHON AND LLDB_BUILD_INTEL_PT) + endif() + + install(TARGETS lldbIntelFeatures +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/default.nix index 53a7301b19..6f189779f8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/default.nix @@ -1,4 +1,5 @@ { lib, stdenv +, pkgsBuildBuild , fetch , fetchpatch , cmake @@ -11,10 +12,10 @@ , version , release_version , zlib -, buildPackages +, buildLlvmTools , debugVersion ? false , enableManpages ? false -, enableSharedLibraries ? true +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 || stdenv.isAarch32 # broken for the armv7l builder @@ -46,8 +47,7 @@ in stdenv.mkDerivation ({ mv polly-* $sourceRoot/tools/polly ''; - outputs = [ "out" "python" ] - ++ optional enableSharedLibraries "lib"; + outputs = [ "out" "lib" "dev" "python" ]; nativeBuildInputs = [ cmake python3 ] ++ optional enableManpages python3.pkgs.sphinx; @@ -67,12 +67,13 @@ in stdenv.mkDerivation ({ url = "https://github.com/llvm-mirror/llvm/commit/cc1f2a595ead516812a6c50398f0f3480ebe031f.patch"; sha256 = "0k6k1p5yisgwx417a67s7sr9930rqh1n0zv5jvply8vjjy4b3kf8"; }) - ]; + ./gnu-install-dirs.patch + ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' "" + --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}" ''${extra_libdir})' "" '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + optionalString (enableSharedLibraries) '' @@ -110,6 +111,7 @@ in stdenv.mkDerivation ({ ''; cmakeFlags = with stdenv; [ + "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=ON" @@ -134,7 +136,20 @@ in stdenv.mkDerivation ({ "-DCAN_TARGET_i386=false" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildPackages.llvm_7}/bin/llvm-tblgen" + "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ( + let + nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; + nativeBintools = nativeCC.bintools.bintools; + nativeToolchainFlags = [ + "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" + "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" + "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" + "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" + "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" + ]; + in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=${lib.concatStringsSep ";" nativeToolchainFlags}" + ) ]; postBuild = '' @@ -148,19 +163,20 @@ in stdenv.mkDerivation ({ postInstall = '' mkdir -p $python/share mv $out/share/opt-viewer $python/share/opt-viewer - '' - + optionalString enableSharedLibraries '' - moveToOutput "lib/libLLVM-*" "$lib" - moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" + moveToOutput "bin/llvm-config*" "$dev" + substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ + --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" + substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ + --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' '' + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" ${lib.concatMapStringsSep "\n" (v: '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib '') versionSuffixes} + '' + + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; doCheck = stdenv.isLinux && (!stdenv.isx86_32); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs-polly.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 0000000000..0b2d3b79e4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,106 @@ +diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt +index 9939097f743e..8cc538da912a 100644 +--- a/tools/polly/CMakeLists.txt ++++ b/tools/polly/CMakeLists.txt +@@ -2,7 +2,11 @@ + if (NOT DEFINED LLVM_MAIN_SRC_DIR) + project(Polly) + cmake_minimum_required(VERSION 3.4.3) ++endif() ++ ++include(GNUInstallDirs) + ++if (NOT DEFINED LLVM_MAIN_SRC_DIR) + # Where is LLVM installed? + find_package(LLVM CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) +@@ -145,14 +149,14 @@ include_directories( + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE + ) + + install(DIRECTORY ${POLLY_BINARY_DIR}/include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE +diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt +index 969292cd6b00..d7aea77bdd20 100644 +--- a/tools/polly/cmake/CMakeLists.txt ++++ b/tools/polly/cmake/CMakeLists.txt +@@ -79,18 +79,18 @@ file(GENERATE + + # Generate PollyConfig.cmake for the install tree. + unset(POLLY_EXPORTS) +-set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") ++set(POLLY_INSTALL_PREFIX "") + set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") ++set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") ++set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + if (POLLY_BUNDLED_ISL) + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" +- "${POLLY_INSTALL_PREFIX}/include/polly" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" + ) + else() + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" + ${ISL_INCLUDE_DIRS} + ) + endif() +@@ -100,12 +100,12 @@ endif() + foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) + get_target_property(tgt_type ${tgt} TYPE) + if (tgt_type STREQUAL "EXECUTABLE") +- set(tgt_prefix "bin/") ++ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") + else() +- set(tgt_prefix "lib/") ++ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") + endif() + +- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$") ++ set(tgt_path "${tgt_prefix}$") + file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) + + if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") +diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake +index e48203871884..5bc8a2a52541 100644 +--- a/tools/polly/cmake/polly_macros.cmake ++++ b/tools/polly/cmake/polly_macros.cmake +@@ -44,8 +44,8 @@ macro(add_polly_library name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") + install(TARGETS ${name} + EXPORT LLVMExports +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) + endmacro(add_polly_library) +diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt +index 8ffd984e542b..261cc19f3238 100644 +--- a/tools/polly/lib/External/CMakeLists.txt ++++ b/tools/polly/lib/External/CMakeLists.txt +@@ -274,7 +274,7 @@ if (POLLY_BUNDLED_ISL) + install(DIRECTORY + ${ISL_SOURCE_DIR}/include/ + ${ISL_BINARY_DIR}/include/ +- DESTINATION include/polly ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs.patch new file mode 100644 index 0000000000..7e7921e49a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs.patch @@ -0,0 +1,386 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3d3013cedcd..b298d6ef04af 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -275,15 +275,21 @@ if (CMAKE_BUILD_TYPE AND + message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") + endif() + ++include(GNUInstallDirs) ++ + set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) + +-set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") ++set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING ++ "Path for binary subdirectory (defaults to 'bin')") + mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) + + set(LLVM_UTILS_INSTALL_DIR "${LLVM_TOOLS_INSTALL_DIR}" CACHE STRING + "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") + mark_as_advanced(LLVM_UTILS_INSTALL_DIR) + ++set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING ++ "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) ++ + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) + set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) +@@ -531,9 +537,9 @@ option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) + option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) + option (LLVM_ENABLE_BINDINGS "Build bindings." ON) + +-set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" ++set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html" + CACHE STRING "Doxygen-generated HTML documentation install directory") +-set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" ++set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html" + CACHE STRING "OCamldoc-generated HTML documentation install directory") + + option (LLVM_BUILD_EXTERNAL_COMPILER_RT +@@ -966,7 +972,7 @@ endif() + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/llvm include/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +@@ -978,7 +984,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index c0f90ba7068d..d656156ff9c8 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -638,11 +638,11 @@ macro(add_llvm_library name) + else() + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LTO" OR + (LLVM_LINK_LLVM_DYLIB AND ${name} STREQUAL "LLVM")) +- set(install_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(ARG_SHARED OR BUILD_SHARED_LIBS) + if(WIN32 OR CYGWIN OR MINGW) + set(install_type RUNTIME) +- set(install_dir bin) ++ set(install_dir ${CMAKE_INSTALL_BINDIR}) + else() + set(install_type LIBRARY) + endif() +@@ -684,9 +684,9 @@ macro(add_llvm_loadable_module name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + if(WIN32 OR CYGWIN) + # DLL platform +- set(dlldir "bin") ++ set(dlldir "${CMAKE_INSTALL_BINDIR}") + else() +- set(dlldir "lib${LLVM_LIBDIR_SUFFIX}") ++ set(dlldir "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + endif() + + if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR +@@ -698,7 +698,7 @@ macro(add_llvm_loadable_module name) + install(TARGETS ${name} + ${export_to_llvmexports} + LIBRARY DESTINATION ${dlldir} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) + endif() +@@ -912,7 +912,7 @@ macro(add_llvm_example name) + endif() + add_llvm_executable(${name} ${ARGN}) + if( LLVM_BUILD_EXAMPLES ) +- install(TARGETS ${name} RUNTIME DESTINATION examples) ++ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) + endif() + set_target_properties(${name} PROPERTIES FOLDER "Examples") + endmacro(add_llvm_example name) +@@ -1430,7 +1430,7 @@ function(llvm_install_library_symlink name dest type) + set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) + set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) + +- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 AND "${type}" STREQUAL "SHARED") + set(output_dir bin) + endif() +@@ -1446,7 +1446,7 @@ function(llvm_install_library_symlink name dest type) + endif() + endfunction() + +-function(llvm_install_symlink name dest) ++function(llvm_install_symlink name dest output_dir) + cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) + foreach(path ${CMAKE_MODULE_PATH}) + if(EXISTS ${path}/LLVMInstallSymlink.cmake) +@@ -1469,7 +1469,7 @@ function(llvm_install_symlink name dest) + set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) + + install(SCRIPT ${INSTALL_SYMLINK} +- CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" ++ CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" + COMPONENT ${component}) + + if (NOT CMAKE_CONFIGURATION_TYPES AND NOT ARG_ALWAYS_GENERATE) +@@ -1551,7 +1551,8 @@ function(add_llvm_tool_symlink link_name target) + endif() + + if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) +- llvm_install_symlink(${link_name} ${target}) ++ GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR) ++ llvm_install_symlink(${link_name} ${target} ${output_dir}) + endif() + endif() + endfunction() +@@ -1635,9 +1636,9 @@ function(llvm_setup_rpath name) + + if (APPLE) + set(_install_name_dir INSTALL_NAME_DIR "@rpath") +- set(_install_rpath "@loader_path/../lib" ${extra_libdir}) ++ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}" ${extra_libdir}) + elseif(UNIX) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + set_property(TARGET ${name} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-z,origin ") +diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake +index 02bab6846376..eff26adb2efc 100644 +--- a/cmake/modules/AddOCaml.cmake ++++ b/cmake/modules/AddOCaml.cmake +@@ -140,9 +140,9 @@ function(add_ocaml_library name) + endforeach() + + if( APPLE ) +- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + elseif( UNIX ) +- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + endif() + list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") + +diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake +index 22e3dcb776aa..ba77b9c195e2 100644 +--- a/cmake/modules/AddSphinxTarget.cmake ++++ b/cmake/modules/AddSphinxTarget.cmake +@@ -73,7 +73,7 @@ function (add_sphinx_target builder project) + + elseif (builder STREQUAL html) + string(TOUPPER "${project}" project_upper) +- set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" ++ set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html" + CACHE STRING "HTML documentation install directory for ${project}") + + # '/.' indicates: copy the contents of the directory directly into +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index 6c316a2f04fb..129c0995059c 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -1,4 +1,4 @@ +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + # First for users who use an installed LLVM, create the LLVMExports.cmake file. +@@ -90,11 +90,11 @@ foreach(p ${_count}) + set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} + get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") + endforeach(p) +-set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") +-set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") ++set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") ++set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") + set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") +-set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") ++set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") + set(LLVM_CONFIG_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMExports.cmake") + set(LLVM_CONFIG_EXPORTS "${LLVM_EXPORTS}") + configure_file( +diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake +index 1a04de931ff7..1c5ea4200635 100644 +--- a/cmake/modules/LLVMInstallSymlink.cmake ++++ b/cmake/modules/LLVMInstallSymlink.cmake +@@ -10,7 +10,7 @@ function(install_symlink name target outdir) + set(LINK_OR_COPY copy) + endif() + +- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") ++ set(bindir "${DESTDIR}${outdir}/") + + message("Creating ${name}") + +diff --git a/docs/CMake.rst b/docs/CMake.rst +index cbcadc212498..a3da96546f43 100644 +--- a/docs/CMake.rst ++++ b/docs/CMake.rst +@@ -196,7 +196,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. + **LLVM_LIBDIR_SUFFIX**:STRING + Extra suffix to append to the directory where libraries are to be + installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` +- to install libraries to ``/usr/lib64``. ++ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. + + **CMAKE_C_FLAGS**:STRING + Extra flags to use when compiling C source files. +@@ -473,8 +473,8 @@ LLVM-specific variables + + **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING + The path to install Doxygen-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/doxygen-html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. + + **LLVM_ENABLE_SPHINX**:BOOL + If specified, CMake will search for the ``sphinx-build`` executable and will make +@@ -505,13 +505,33 @@ LLVM-specific variables + + **LLVM_INSTALL_SPHINX_HTML_DIR**:STRING + The path to install Sphinx-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/html`. + + **LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING + The path to install OCamldoc-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/ocaml-html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html`. ++ ++**CMAKE_INSTALL_BINDIR**:STRING ++ The path to install binary tools, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `bin`. ++ ++**CMAKE_INSTALL_LIBDIR**:STRING ++ The path to install libraries, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `lib`. ++ ++**CMAKE_INSTALL_INCLUDEDIR**:STRING ++ The path to install header files, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `include`. ++ ++**CMAKE_INSTALL_DOCDIR**:STRING ++ The path to install documentation, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `share/doc`. ++ ++**CMAKE_INSTALL_MANDIR**:STRING ++ The path to install manpage files, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `share/man`. + + **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL + OS X Only: If enabled CMake will generate a target named +@@ -676,9 +696,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). + + This file is available in two different locations. + +-* ``/lib/cmake/llvm/LLVMConfig.cmake`` where +- ```` is the install prefix of an installed version of LLVM. +- On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. ++* ``LLVMConfig.cmake`` where ++ ```` is the location where LLVM CMake modules are ++ installed as part of an installed version of LLVM. This is typically ++ ``cmake/llvm/`` within the lib directory. On Linux, this is typically ++ ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. + + * ``/lib/cmake/llvm/LLVMConfig.cmake`` where + ```` is the root of the LLVM build tree. **Note: this is only +diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt +index 1d5ca3ba92b0..026f5453c1da 100644 +--- a/include/llvm/CMakeLists.txt ++++ b/include/llvm/CMakeLists.txt +@@ -4,5 +4,5 @@ add_subdirectory(Support) + # If we're doing an out-of-tree build, copy a module map for generated + # header files into the build area. + if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +- configure_file(module.modulemap.build module.modulemap COPYONLY) ++ configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) + endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index f201e1f7bff0..4582ed556a02 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -24,6 +24,10 @@ + #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" ++#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" ++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" ++#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" ++#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" + #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" + #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 892adc3b9dd8..cabe7fcc630f 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -333,12 +333,26 @@ int main(int argc, char **argv) { + ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); + } else { + ActivePrefix = CurrentExecPrefix; +- ActiveIncludeDir = ActivePrefix + "/include"; +- SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); +- sys::fs::make_absolute(ActivePrefix, path); +- ActiveBinDir = path.str(); +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; +- ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveIncludeDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveBinDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveLibDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveCMakeDir = std::string(path.str()); ++ } + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + +diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt +index 6e913519a809..85641eef721f 100644 +--- a/tools/lto/CMakeLists.txt ++++ b/tools/lto/CMakeLists.txt +@@ -19,7 +19,7 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports) + add_llvm_library(LTO SHARED ${SOURCES} DEPENDS intrinsics_gen) + + install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h +- DESTINATION include/llvm-c ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c + COMPONENT LTO) + + if (APPLE) +diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt +index 19b606933082..27b9f71b3d79 100644 +--- a/tools/opt-viewer/CMakeLists.txt ++++ b/tools/opt-viewer/CMakeLists.txt +@@ -8,6 +8,6 @@ set (files + + foreach (file ${files}) + install(PROGRAMS ${file} +- DESTINATION share/opt-viewer ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer + COMPONENT opt-viewer) + endforeach (file) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix index 8f44ffc061..c82b3e873e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld +{ lib, stdenv, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +, buildLlvmTools , fixDarwinDylibNames , enableManpages ? false , enablePolly ? false # TODO: get this info from llvm (passthru?) @@ -23,18 +24,22 @@ let ++ lib.optional enableManpages python3.pkgs.sphinx ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libxml2 llvm lld ]; + buildInputs = [ libxml2 libllvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" "-DCLANGD_BUILD_XPC=OFF" "-DLLVM_ENABLE_RTTI=ON" + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" ] ++ lib.optionals enablePolly [ "-DWITH_POLLY=ON" "-DLINK_POLLY_INTO_TOOLS=ON" @@ -42,7 +47,7 @@ let patches = [ ./purity.patch - ./clang-xpc.patch + ./xpc.patch # Backport for -static-pie, which the latter touches, and which is nice in # its own right. ./static-pie.patch @@ -53,6 +58,7 @@ let ./compiler-rt-baremetal.patch # make clang -xhip use $PATH to find executables ./HIP-use-PATH-8.patch + ./gnu-install-dirs.patch ]; postPatch = '' @@ -69,12 +75,12 @@ let --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE ''; - outputs = [ "out" "lib" "python" ]; + outputs = [ "out" "lib" "dev" "python" ]; # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${llvm}/lib/LLVMgold.so ]; then - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then + ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib fi ln -sv $out/bin/clang $out/bin/cpp @@ -91,11 +97,14 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + + mkdir -p $dev/bin + cp bin/clang-tblgen $dev/bin ''; passthru = { isClang = true; - inherit llvm; + inherit libllvm; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/gnu-install-dirs.patch new file mode 100644 index 0000000000..e4b9c3f8dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/gnu-install-dirs.patch @@ -0,0 +1,290 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c2016a45ca6b..9224797da0b5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,6 +9,8 @@ endif() + if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) + project(Clang) + ++ include(GNUInstallDirs) ++ + # Rely on llvm-config. + set(CONFIG_OUTPUT) + if(LLVM_CONFIG) +@@ -382,7 +384,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/clang include/clang-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.def" + PATTERN "*.h" +@@ -391,7 +393,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "CMakeFiles" EXCLUDE + PATTERN "*.inc" +@@ -399,7 +401,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(PROGRAMS utils/bash-autocomplete.sh +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + ) + endif() + +diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake +index 7e22f16f365b..3c0c1d245969 100644 +--- a/cmake/modules/AddClang.cmake ++++ b/cmake/modules/AddClang.cmake +@@ -99,9 +99,9 @@ macro(add_clang_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_clangtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-${name} +@@ -142,7 +142,7 @@ macro(add_clang_tool name) + + install(TARGETS ${name} + ${export_to_clangtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT CMAKE_CONFIGURATION_TYPES) +@@ -157,5 +157,5 @@ endmacro() + macro(add_clang_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index e444c9c8706f..f8e4d06366a4 100644 +--- a/lib/Headers/CMakeLists.txt ++++ b/lib/Headers/CMakeLists.txt +@@ -164,19 +164,19 @@ install( + FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h + COMPONENT clang-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) + + install( + FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_fp16.h + COMPONENT clang-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) + + install( + FILES ${cuda_wrapper_files} + COMPONENT clang-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) + + if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. + add_llvm_install_targets(install-clang-headers +diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt +index 53e3421f1b35..79ae5bb4c399 100644 +--- a/tools/c-index-test/CMakeLists.txt ++++ b/tools/c-index-test/CMakeLists.txt +@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH + "@executable_path/../../lib") + else() +- set(INSTALL_DESTINATION bin) ++ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + + install(TARGETS c-index-test +diff --git a/tools/clang-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt +index b837b0a0a5d9..9e30bd5780a5 100644 +--- a/tools/clang-check/CMakeLists.txt ++++ b/tools/clang-check/CMakeLists.txt +@@ -21,4 +21,4 @@ target_link_libraries(clang-check + ) + + install(TARGETS clang-check +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/tools/clang-extdef-mapping/CMakeLists.txt b/tools/clang-extdef-mapping/CMakeLists.txt +index 6c81689a831a..dacc14737719 100644 +--- a/tools/clang-extdef-mapping/CMakeLists.txt ++++ b/tools/clang-extdef-mapping/CMakeLists.txt +@@ -18,4 +18,4 @@ target_link_libraries(clang-extdef-mapping + ) + + install(TARGETS clang-extdef-mapping +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt +index a295e8cd0b2a..1973ff82c7f6 100644 +--- a/tools/clang-format/CMakeLists.txt ++++ b/tools/clang-format/CMakeLists.txt +@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE ) + endif() + + install(PROGRAMS clang-format-bbedit.applescript +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-diff.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-sublime.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS git-clang-format +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT clang-format) +diff --git a/tools/clang-offload-bundler/CMakeLists.txt b/tools/clang-offload-bundler/CMakeLists.txt +index 8718015be76a..7a038f39622e 100644 +--- a/tools/clang-offload-bundler/CMakeLists.txt ++++ b/tools/clang-offload-bundler/CMakeLists.txt +@@ -22,4 +22,4 @@ target_link_libraries(clang-offload-bundler + ${CLANG_OFFLOAD_BUNDLER_LIB_DEPS} + ) + +-install(TARGETS clang-offload-bundler RUNTIME DESTINATION bin) ++install(TARGETS clang-offload-bundler RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt +index 45cbd763425c..f534e022024a 100644 +--- a/tools/clang-rename/CMakeLists.txt ++++ b/tools/clang-rename/CMakeLists.txt +@@ -19,8 +19,8 @@ target_link_libraries(clang-rename + ) + + install(PROGRAMS clang-rename.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) + install(PROGRAMS clang-rename.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) +diff --git a/tools/diagtool/CMakeLists.txt b/tools/diagtool/CMakeLists.txt +index 96d1c390249c..41c762b37b76 100644 +--- a/tools/diagtool/CMakeLists.txt ++++ b/tools/diagtool/CMakeLists.txt +@@ -21,7 +21,7 @@ target_link_libraries(diagtool + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(TARGETS diagtool + COMPONENT diagtool +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-diagtool +diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt +index 32333b011ad1..258dfb2d520c 100644 +--- a/tools/libclang/CMakeLists.txt ++++ b/tools/libclang/CMakeLists.txt +@@ -131,7 +131,7 @@ endif() + if(INTERNAL_INSTALL_PREFIX) + set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") + else() +- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) ++ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + install(DIRECTORY ../../include/clang-c +@@ -162,7 +162,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) + COMPONENT + libclang-python-bindings + DESTINATION +- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") ++ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") + endforeach() + if(NOT CMAKE_CONFIGURATION_TYPES) + add_custom_target(libclang-python-bindings) +diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt +index 380379300b09..adfd58ed5f7d 100644 +--- a/tools/scan-build/CMakeLists.txt ++++ b/tools/scan-build/CMakeLists.txt +@@ -41,7 +41,7 @@ if(CLANG_INSTALL_SCANBUILD) + ${CMAKE_BINARY_DIR}/bin/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) +- install(PROGRAMS bin/${BinFile} DESTINATION bin) ++ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endforeach() + + foreach(LibexecFile ${LibexecFiles}) +@@ -53,7 +53,7 @@ if(CLANG_INSTALL_SCANBUILD) + ${CMAKE_BINARY_DIR}/libexec/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) +- install(PROGRAMS libexec/${LibexecFile} DESTINATION libexec) ++ install(PROGRAMS libexec/${LibexecFile} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) + endforeach() + + foreach(ManPage ${ManPages}) +@@ -77,7 +77,7 @@ if(CLANG_INSTALL_SCANBUILD) + ${CMAKE_BINARY_DIR}/share/scan-build/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) +- install(FILES share/scan-build/${ShareFile} DESTINATION share/scan-build) ++ install(FILES share/scan-build/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build) + endforeach() + + add_custom_target(scan-build ALL DEPENDS ${Depends}) +diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt +index b305ca562a72..554bcb379061 100644 +--- a/tools/scan-view/CMakeLists.txt ++++ b/tools/scan-view/CMakeLists.txt +@@ -21,7 +21,7 @@ if(CLANG_INSTALL_SCANVIEW) + ${CMAKE_BINARY_DIR}/bin/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) +- install(PROGRAMS bin/${BinFile} DESTINATION bin) ++ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endforeach() + + foreach(ShareFile ${ShareFiles}) +@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) + ${CMAKE_BINARY_DIR}/share/scan-view/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) +- install(FILES share/${ShareFile} DESTINATION share/scan-view) ++ install(FILES share/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view) + endforeach() + + add_custom_target(scan-view ALL DEPENDS ${Depends}) +diff --git a/utils/hmaptool/CMakeLists.txt b/utils/hmaptool/CMakeLists.txt +index 5573009d343a..24b3a90f233f 100644 +--- a/utils/hmaptool/CMakeLists.txt ++++ b/utils/hmaptool/CMakeLists.txt +@@ -9,7 +9,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${CLANG_HMAPTOOL}) + + list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) +-install(PROGRAMS ${CLANG_HMAPTOOL} DESTINATION bin) ++install(PROGRAMS ${CLANG_HMAPTOOL} DESTINATION ${CMAKE_INSTALL_BINDIR}) + + add_custom_target(hmaptool ALL DEPENDS ${Depends}) + set_target_properties(hmaptool PROPERTIES FOLDER "Utils") diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/clang-xpc.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/xpc.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/clang-xpc.patch rename to third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/xpc.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt/default.nix index 3da3d59d11..d370de031b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { inherit version; src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi"; - nativeBuildInputs = [ cmake python3 llvm ]; + nativeBuildInputs = [ cmake python3 llvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ @@ -54,6 +54,7 @@ stdenv.mkDerivation { # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce ../../common/compiler-rt/glibc.patch ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ./gnu-install-dirs.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ lib.optional (useLLVM) ./crtbegin-and-end.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 0000000000..1c2e7f0b31 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,117 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aa360a3ef36e..a39676148181 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 3.4.3) + # Check if compiler-rt is built as a standalone project. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) + project(CompilerRT C CXX ASM) ++ include(GNUInstallDirs) + set(COMPILER_RT_STANDALONE_BUILD TRUE) + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + endif() +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index 81b110203c27..df7598a11caf 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -479,7 +479,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) + add_custom_target(${target_name} DEPENDS ${dst_file}) + # Install in Clang resource directory. + install(FILES ${file_name} +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR} + COMPONENT ${component}) + add_dependencies(${component} ${target_name}) + +@@ -496,7 +496,7 @@ macro(add_compiler_rt_script name) + add_custom_target(${name} DEPENDS ${dst}) + install(FILES ${dst} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR}) + endmacro(add_compiler_rt_script src name) + + # Builds custom version of libc++ and installs it in . +diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake +index 04cc955980fa..a99f6dfb2f82 100644 +--- a/cmake/Modules/CompilerRTDarwinUtils.cmake ++++ b/cmake/Modules/CompilerRTDarwinUtils.cmake +@@ -377,7 +377,7 @@ macro(darwin_add_embedded_builtin_libraries) + set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded) + set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded) + + set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi") + set(CFLAGS_i386 "-march=pentium") +diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake +index 5348f2064b67..d7b8fe190789 100644 +--- a/cmake/Modules/CompilerRTUtils.cmake ++++ b/cmake/Modules/CompilerRTUtils.cmake +@@ -363,7 +363,7 @@ endfunction() + function(get_compiler_rt_install_dir arch install_dir) + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + get_compiler_rt_target(${arch} target) +- set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${target}/lib PARENT_SCOPE) ++ set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${target}/${CMAKE_INSTALL_FULL_LIBDIR} PARENT_SCOPE) + else() + set(${install_dir} ${COMPILER_RT_LIBRARY_INSTALL_DIR} PARENT_SCOPE) + endif() +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index aeabf17653f5..0a927fbfc750 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -59,11 +59,11 @@ if (LLVM_TREE_AVAILABLE) + else() + # Take output dir and install path from the user. + set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH +- "Path where built compiler-rt libraries should be stored.") ++ "Path where built compiler-rt build artifacts should be stored.") + set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH + "Path where built compiler-rt executables should be stored.") +- set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH +- "Path where built compiler-rt libraries should be installed.") ++ set(COMPILER_RT_INSTALL_PATH "" CACHE PATH ++ "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.") + option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF) + option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) + # Use a host compiler to compile/link tests. +@@ -91,7 +91,7 @@ else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) + set(COMPILER_RT_LIBRARY_OUTPUT_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) + set(COMPILER_RT_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR}) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) + endif() + + if(APPLE) +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index c4b93b89a30c..3913dc3a1ee6 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -48,12 +48,12 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") + install(FILES ${SANITIZER_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer) + # Install xray headers. + install(FILES ${XRAY_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray) + + if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs. + add_custom_target(install-compiler-rt-headers +diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt +index b3ae713cf02c..52b364b900f5 100644 +--- a/lib/dfsan/CMakeLists.txt ++++ b/lib/dfsan/CMakeLists.txt +@@ -54,4 +54,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename} + DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt) + add_dependencies(dfsan dfsan_abilist) + install(FILES ${dfsan_abilist_filename} +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix index 6d6d8b4f78..bcbbd155e3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix @@ -1,6 +1,5 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith -, buildPackages , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: @@ -18,43 +17,52 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "1qf3097bc5ia8p6cpmbx985rjr3yaah5s8fc0nv7pw742yv7jw8q"; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); - mkExtraBuildCommands = cc: '' + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); + mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; + mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ''; + in { - llvm = callPackage ./llvm { }; + libllvm = callPackage ./llvm { }; - llvm-polly = callPackage ./llvm { enablePolly = true; }; + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputUnspecified = true; }; - clang-unwrapped = callPackage ./clang { - inherit (tools) lld; + libllvm-polly = callPackage ./llvm { enablePolly = true; }; + + llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; }; + + libclang = callPackage ./clang { inherit clang-tools-extra_src; }; + + clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; + clang-polly-unwrapped = callPackage ./clang { inherit clang-tools-extra_src; - llvm = tools.llvm-polly; + libllvm = tools.libllvm-polly; enablePolly = true; }; # disabled until recommonmark supports sphinx 3 - #llvm-manpages = lowPrio (tools.llvm.override { + #llvm-manpages = lowPrio (tools.libllvm.override { # enableManpages = true; # python3 = pkgs.python3; # don't use python-boot #}); - clang-manpages = lowPrio (tools.clang-unwrapped.override { + clang-manpages = lowPrio (tools.libclang.override { enableManpages = true; python3 = pkgs.python3; # don't use python-boot }); - libclang = tools.clang-unwrapped.lib; - clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; libstdcxxClang = wrapCCWith rec { @@ -144,7 +152,7 @@ let '' + mkExtraBuildCommands cc; }; - lldClangNoCompilerRt = wrapCCWith { + lldClangNoCompilerRt = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = null; bintools = wrapBintoolsWith { @@ -154,7 +162,7 @@ let extraPackages = [ ]; extraBuildCommands = '' echo "-nostartfiles" >> $out/nix-support/cc-cflags - ''; + '' + mkExtraBuildCommands0 cc; }; }); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix index 70e4d9e1a6..d73600b441 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation { export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; - patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; + outputs = [ "out" "dev" ]; + + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; prePatch = '' substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++/gnu-install-dirs.patch new file mode 100644 index 0000000000..6af403ac86 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++/gnu-install-dirs.patch @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6b83bce1ae72..63cda3e4e80c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,6 +26,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + project(libcxx CXX C) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libcxx) + set(PACKAGE_VERSION 8.0.1) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake +index 1c19d7e01af7..9c8aee8e8bb7 100644 +--- a/cmake/Modules/HandleLibCXXABI.cmake ++++ b/cmake/Modules/HandleLibCXXABI.cmake +@@ -59,7 +59,7 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs) + + if (LIBCXX_INSTALL_HEADERS) + install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" +- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dstdir} ++ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} + COMPONENT cxx-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index 73f7cfc4d8e3..92cf0864ac7e 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -243,7 +243,7 @@ if (LIBCXX_INSTALL_HEADERS) + foreach(file ${files}) + get_filename_component(dir ${file} DIRECTORY) + install(FILES ${file} +- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dir} ++ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dir} + COMPONENT cxx-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) +@@ -252,7 +252,7 @@ if (LIBCXX_INSTALL_HEADERS) + if (LIBCXX_NEEDS_SITE_CONFIG) + # Install the generated header as __config. + install(FILES ${LIBCXX_BINARY_DIR}/__generated_config +- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1 ++ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + RENAME __config + COMPONENT cxx-headers) +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 24489e8fb5e8..7327e5ee4b85 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -414,8 +414,8 @@ if (LIBCXX_INSTALL_LIBRARY) + set(experimental_lib cxx_experimental) + endif() + install(TARGETS ${LIBCXX_INSTALL_TARGETS} ${filesystem_lib} ${experimental_lib} +- LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx +- ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx ++ LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx ++ ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx + ) + # NOTE: This install command must go after the cxx install command otherwise + # it will not be executed after the library symlinks are installed. +@@ -423,7 +423,7 @@ if (LIBCXX_INSTALL_LIBRARY) + # Replace the libc++ filename with $ + # after we required CMake 3.0. + install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}" +- DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} ++ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} + COMPONENT libcxx) + endif() + endif() diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi/default.nix index bde67f8664..5659bb4f14 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi/default.nix @@ -8,6 +8,25 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp"; + outputs = [ "out" "dev" ]; + + postUnpack = '' + unpackFile ${libcxx.src} + unpackFile ${llvm.src} + cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" + '' + lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} + '' + lib.optionalString stdenv.hostPlatform.isWasm '' + patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch} + ''; + + patches = [ + ./no-threads.patch + ./gnu-install-dirs.patch + ]; + nativeBuildInputs = [ cmake ]; buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; @@ -21,20 +40,6 @@ stdenv.mkDerivation { "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; - patches = [ ./no-threads.patch ]; - - postUnpack = '' - unpackFile ${libcxx.src} - unpackFile ${llvm.src} - cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" - '' + lib.optionalString stdenv.isDarwin '' - export TRIPLE=x86_64-apple-darwin - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} - '' + lib.optionalString stdenv.hostPlatform.isWasm '' - patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch} - ''; - installPhase = if stdenv.isDarwin then '' for file in lib/*.dylib; do diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi/gnu-install-dirs.patch new file mode 100644 index 0000000000..3f924b0efb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi/gnu-install-dirs.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 92c7dc5dc557..556b3e05a042 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,6 +20,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + project(libcxxabi CXX C) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libcxxabi) + set(PACKAGE_VERSION 8.0.0) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7e21fb2d7926..30711099a19c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -220,8 +220,8 @@ add_custom_target(cxxabi DEPENDS ${LIBCXXABI_BUILD_TARGETS}) + + if (LIBCXXABI_INSTALL_LIBRARY) + install(TARGETS ${LIBCXXABI_INSTALL_TARGETS} +- LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi +- ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi ++ LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi ++ ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi + ) + endif() + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libunwind/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libunwind/default.nix index d1bd54fbd3..e38f2072ce 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libunwind/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libunwind/default.nix @@ -2,13 +2,11 @@ , enableShared ? !stdenv.hostPlatform.isStatic }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libunwind"; inherit version; - src = fetch "libunwind" "0vhgcgzsb33l83qaikrkj87ypqb48mi607rccczccwiiv8ficw0q"; - - nativeBuildInputs = [ cmake ]; + src = fetch pname "0vhgcgzsb33l83qaikrkj87ypqb48mi607rccczccwiiv8ficw0q"; patches = [ (fetchpatch { @@ -19,7 +17,12 @@ stdenv.mkDerivation { url = "https://github.com/llvm-mirror/libunwind/commit/e050272d2eb57eb4e56a37b429a61df2ebb8aa3e.patch"; sha256 = "1sxyx5xnax8k713jjcxgq3jq3cpnxygs2rcdf5vfja0f2k9jzldl"; }) + ./gnu-install-dirs.patch ]; + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ]; + cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libunwind/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libunwind/gnu-install-dirs.patch new file mode 100644 index 0000000000..ffabba8137 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libunwind/gnu-install-dirs.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3d06073cfe74..55c7d1635fcd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,6 +18,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + project(libunwind) + ++ include(GNUInstallDirs) ++ + # Rely on llvm-config. + set(CONFIG_OUTPUT) + if(NOT LLVM_CONFIG_PATH) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index f7523f88b6ac..4060dad214de 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -151,8 +151,8 @@ add_custom_target(unwind DEPENDS ${LIBUNWIND_BUILD_TARGETS}) + + if (LIBUNWIND_INSTALL_LIBRARY) + install(TARGETS ${LIBUNWIND_INSTALL_TARGETS} +- LIBRARY DESTINATION ${LIBUNWIND_INSTALL_PREFIX}lib${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind +- ARCHIVE DESTINATION ${LIBUNWIND_INSTALL_PREFIX}lib${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind) ++ LIBRARY DESTINATION ${LIBUNWIND_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind ++ ARCHIVE DESTINATION ${LIBUNWIND_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind) + endif() + + if (NOT CMAKE_CONFIGURATION_TYPES AND LIBUNWIND_INSTALL_LIBRARY) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lld/default.nix index 8009beb7bc..696403d1bf 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lld/default.nix @@ -1,8 +1,9 @@ { lib, stdenv +, buildLlvmTools , fetch , cmake , libxml2 -, llvm +, libllvm , version }: @@ -12,15 +13,20 @@ stdenv.mkDerivation { src = fetch "lld" "121xhxrlvwy3k5nf6p1wv31whxlb635ssfkci8z93mwv4ja1xflz"; + patches = [ + ./gnu-install-dirs.patch + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ llvm libxml2 ]; + buildInputs = [ libllvm libxml2 ]; - outputs = [ "out" "dev" ]; + cmakeFlags = [ + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ]; - postInstall = '' - moveToOutput include "$dev" - moveToOutput lib "$dev" - ''; + outputs = [ "out" "lib" "dev" ]; meta = { description = "The LLVM Linker"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lld/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lld/gnu-install-dirs.patch new file mode 100644 index 0000000000..acc2d3d477 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lld/gnu-install-dirs.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e2fbdbfbbb47..d601b231ebb8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(LLD_BUILT_STANDALONE TRUE) + ++ include(GNUInstallDirs) ++ + find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") + if(NOT LLVM_CONFIG_PATH) + message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") +@@ -203,7 +205,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake +index fa48b428d26b..e7967aad3ceb 100644 +--- a/cmake/modules/AddLLD.cmake ++++ b/cmake/modules/AddLLD.cmake +@@ -20,9 +20,9 @@ macro(add_lld_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_lldtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-${name} +@@ -54,7 +54,7 @@ macro(add_lld_tool name) + + install(TARGETS ${name} + ${export_to_lldtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT CMAKE_CONFIGURATION_TYPES) +@@ -69,5 +69,5 @@ endmacro() + macro(add_lld_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() +diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt +index d8829493fc22..df748a0e749b 100644 +--- a/tools/lld/CMakeLists.txt ++++ b/tools/lld/CMakeLists.txt +@@ -16,7 +16,7 @@ target_link_libraries(lld + ) + + install(TARGETS lld +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if(NOT LLD_SYMLINKS_TO_CREATE) + set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld ld64.lld wasm-ld) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lldb/default.nix index 83c171d2a5..95bf4aae05 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lldb/default.nix @@ -7,47 +7,67 @@ , which , libedit , libxml2 -, llvm -, clang-unwrapped +, libllvm +, libclang , python3 , version , darwin }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lldb"; inherit version; src = fetch "lldb" "1mriw4adrwm6kzabrjr7yqmdiylxd6glf6samd80dp8idnm9p9z8"; + patches = [ + ./gnu-install-dirs.patch + ]; + postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place - sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ + sed -i 's,".*ClangConfig.cmake","${libclang.dev}/lib/cmake/clang/ClangConfig.cmake",' \ cmake/modules/LLDBStandalone.cmake - sed -i 's,".*tools/clang/include","${clang-unwrapped}/include",' \ + sed -i 's,".*tools/clang/include","${libclang.dev}/include",' \ cmake/modules/LLDBStandalone.cmake - sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \ + sed -i 's,"$.LLVM_LIBRARY_DIR.",${libllvm.lib}/lib ${libclang.lib}/lib,' \ cmake/modules/LLDBStandalone.cmake ''; - nativeBuildInputs = [ cmake python3 which swig ]; - buildInputs = [ ncurses zlib libedit libxml2 llvm ] - ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ + cmake python3 which swig + ]; + + buildInputs = [ + ncurses zlib libedit libxml2 libllvm + ] ++ lib.optionals stdenv.isDarwin [ + darwin.libobjc + darwin.apple_sdk.libs.xpc + darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa + ]; CXXFLAGS = "-fno-rtti"; hardeningDisable = [ "format" ]; cmakeFlags = [ + "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ] ++ lib.optionals doCheck [ + "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" ]; + doCheck = false; + postInstall = '' mkdir -p $out/share/man/man1 cp ../docs/lldb.1 $out/share/man/man1/ install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json - mkdir $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin - ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ln -s $out/bin/llvm-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch new file mode 100644 index 0000000000..b2e79086be --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch @@ -0,0 +1,81 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cdf22c4b0fc8..8def776f2b4a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,6 +7,8 @@ set(CMAKE_MODULE_PATH + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" + ) + ++include(GNUInstallDirs) ++ + include(LLDBStandalone) + include(LLDBConfig) + include(AddLLDB) +diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake +index f82c11d3d317..776e6d6ef9de 100644 +--- a/cmake/modules/AddLLDB.cmake ++++ b/cmake/modules/AddLLDB.cmake +@@ -63,18 +63,18 @@ function(add_lldb_library name) + set(install_dir ".") + endif() + else() +- set(install_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + install(TARGETS ${name} + COMPONENT ${name} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${install_dir} + ARCHIVE DESTINATION ${install_dir}) + else() + install(TARGETS ${name} + COMPONENT ${name} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + if (NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-${name} +@@ -122,7 +122,7 @@ function(add_lldb_executable name) + if(ARG_GENERATE_INSTALL) + install(TARGETS ${name} + COMPONENT ${name} +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + if (NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-${name} + DEPENDS ${name} +diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake +index 109c5132d3be..8b9092faa29d 100644 +--- a/cmake/modules/LLDBConfig.cmake ++++ b/cmake/modules/LLDBConfig.cmake +@@ -319,7 +319,7 @@ include_directories(BEFORE + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ + COMPONENT lldb-headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +@@ -329,7 +329,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ + COMPONENT lldb-headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt +index b5316540fdf3..3c3c882d503f 100644 +--- a/tools/intel-features/CMakeLists.txt ++++ b/tools/intel-features/CMakeLists.txt +@@ -64,4 +64,4 @@ if (NOT LLDB_DISABLE_PYTHON AND LLDB_BUILD_INTEL_PT) + endif() + + install(TARGETS lldbIntelFeatures +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/default.nix index c0b88e7ff3..8ea9b287c7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/default.nix @@ -1,4 +1,5 @@ { lib, stdenv +, pkgsBuildBuild , fetch , fetchpatch , cmake @@ -11,10 +12,10 @@ , version , release_version , zlib -, buildPackages +, buildLlvmTools , debugVersion ? false , enableManpages ? false -, enableSharedLibraries ? true +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 || stdenv.isAarch32 # broken for the armv7l builder @@ -45,8 +46,7 @@ in stdenv.mkDerivation ({ mv polly-* $sourceRoot/tools/polly ''; - outputs = [ "out" "python" ] - ++ optional enableSharedLibraries "lib"; + outputs = [ "out" "lib" "dev" "python" ]; nativeBuildInputs = [ cmake python3 ] ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; @@ -62,12 +62,13 @@ in stdenv.mkDerivation ({ url = "https://bugs.gentoo.org/attachment.cgi?id=612792"; sha256 = "0rwx6jpqq4xnf4mvfm8v2d4r34y1yi05am0mx5k2d5bha9j64lqg"; }) - ]; + ./gnu-install-dirs.patch + ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' "" + --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}" ''${extra_libdir})' "" '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + optionalString (enableSharedLibraries) '' @@ -96,6 +97,7 @@ in stdenv.mkDerivation ({ ''; cmakeFlags = with stdenv; [ + "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=ON" @@ -119,7 +121,20 @@ in stdenv.mkDerivation ({ "-DCAN_TARGET_i386=false" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildPackages.llvm_8}/bin/llvm-tblgen" + "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ( + let + nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; + nativeBintools = nativeCC.bintools.bintools; + nativeToolchainFlags = [ + "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" + "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" + "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" + "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" + "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" + ]; + in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=${lib.concatStringsSep ";" nativeToolchainFlags}" + ) ]; postBuild = '' @@ -133,18 +148,19 @@ in stdenv.mkDerivation ({ postInstall = '' mkdir -p $python/share mv $out/share/opt-viewer $python/share/opt-viewer - '' - + optionalString enableSharedLibraries '' - moveToOutput "lib/libLLVM-*" "$lib" - moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" + moveToOutput "bin/llvm-config*" "$dev" + substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ + --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" + substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ + --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' '' + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + '' + + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; doCheck = stdenv.isLinux && (!stdenv.isx86_32); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/gnu-install-dirs-polly.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 0000000000..7c477c7df5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,106 @@ +diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt +index 9939097f743e..8cc538da912a 100644 +--- a/tools/polly/CMakeLists.txt ++++ b/tools/polly/CMakeLists.txt +@@ -2,7 +2,11 @@ + if (NOT DEFINED LLVM_MAIN_SRC_DIR) + project(Polly) + cmake_minimum_required(VERSION 3.4.3) ++endif() ++ ++include(GNUInstallDirs) + ++if (NOT DEFINED LLVM_MAIN_SRC_DIR) + # Where is LLVM installed? + find_package(LLVM CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) +@@ -145,14 +149,14 @@ include_directories( + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE + ) + + install(DIRECTORY ${POLLY_BINARY_DIR}/include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE +diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt +index 211f95512717..f9e04a4844b6 100644 +--- a/tools/polly/cmake/CMakeLists.txt ++++ b/tools/polly/cmake/CMakeLists.txt +@@ -79,18 +79,18 @@ file(GENERATE + + # Generate PollyConfig.cmake for the install tree. + unset(POLLY_EXPORTS) +-set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") ++set(POLLY_INSTALL_PREFIX "") + set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") ++set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") ++set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + if (POLLY_BUNDLED_ISL) + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" +- "${POLLY_INSTALL_PREFIX}/include/polly" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" + ) + else() + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" + ${ISL_INCLUDE_DIRS} + ) + endif() +@@ -100,12 +100,12 @@ endif() + foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) + get_target_property(tgt_type ${tgt} TYPE) + if (tgt_type STREQUAL "EXECUTABLE") +- set(tgt_prefix "bin/") ++ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") + else() +- set(tgt_prefix "lib/") ++ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") + endif() + +- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$") ++ set(tgt_path "${tgt_prefix}$") + file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) + + if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") +diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake +index e48203871884..5bc8a2a52541 100644 +--- a/tools/polly/cmake/polly_macros.cmake ++++ b/tools/polly/cmake/polly_macros.cmake +@@ -44,8 +44,8 @@ macro(add_polly_library name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") + install(TARGETS ${name} + EXPORT LLVMExports +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) + endmacro(add_polly_library) +diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt +index 8ffd984e542b..261cc19f3238 100644 +--- a/tools/polly/lib/External/CMakeLists.txt ++++ b/tools/polly/lib/External/CMakeLists.txt +@@ -274,7 +274,7 @@ if (POLLY_BUNDLED_ISL) + install(DIRECTORY + ${ISL_SOURCE_DIR}/include/ + ${ISL_BINARY_DIR}/include/ +- DESTINATION include/polly ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/gnu-install-dirs.patch new file mode 100644 index 0000000000..027e43f7ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/gnu-install-dirs.patch @@ -0,0 +1,394 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 81c2bab39ec9..075e68be6125 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -251,15 +251,21 @@ if (CMAKE_BUILD_TYPE AND + message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") + endif() + ++include(GNUInstallDirs) ++ + set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) + +-set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") ++set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING ++ "Path for binary subdirectory (defaults to 'bin')") + mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) + + set(LLVM_UTILS_INSTALL_DIR "${LLVM_TOOLS_INSTALL_DIR}" CACHE STRING + "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") + mark_as_advanced(LLVM_UTILS_INSTALL_DIR) + ++set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING ++ "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) ++ + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) + set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) +@@ -517,9 +523,9 @@ option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) + option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) + option (LLVM_ENABLE_BINDINGS "Build bindings." ON) + +-set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" ++set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html" + CACHE STRING "Doxygen-generated HTML documentation install directory") +-set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" ++set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html" + CACHE STRING "OCamldoc-generated HTML documentation install directory") + + option (LLVM_BUILD_EXTERNAL_COMPILER_RT +@@ -956,7 +962,7 @@ endif() + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/llvm include/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +@@ -968,7 +974,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +@@ -983,13 +989,13 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + if (LLVM_INSTALL_MODULEMAPS) + install(DIRECTORY include/llvm include/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "module.modulemap" + ) + install(FILES include/llvm/module.install.modulemap +- DESTINATION include/llvm ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm + COMPONENT llvm-headers + RENAME "module.extern.modulemap" + ) +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index 1a417447278b..0c2aef338078 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -646,11 +646,11 @@ macro(add_llvm_library name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LTO" OR + ${name} STREQUAL "OptRemarks" OR + (LLVM_LINK_LLVM_DYLIB AND ${name} STREQUAL "LLVM")) +- set(install_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(ARG_MODULE OR ARG_SHARED OR BUILD_SHARED_LIBS) + if(WIN32 OR CYGWIN OR MINGW) + set(install_type RUNTIME) +- set(install_dir bin) ++ set(install_dir ${CMAKE_INSTALL_BINDIR}) + else() + set(install_type LIBRARY) + endif() +@@ -898,7 +898,7 @@ macro(add_llvm_example name) + endif() + add_llvm_executable(${name} ${ARGN}) + if( LLVM_BUILD_EXAMPLES ) +- install(TARGETS ${name} RUNTIME DESTINATION examples) ++ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) + endif() + set_target_properties(${name} PROPERTIES FOLDER "Examples") + endmacro(add_llvm_example name) +@@ -1442,7 +1442,7 @@ function(llvm_install_library_symlink name dest type) + set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) + set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) + +- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 AND "${type}" STREQUAL "SHARED") + set(output_dir bin) + endif() +@@ -1458,7 +1458,7 @@ function(llvm_install_library_symlink name dest type) + endif() + endfunction() + +-function(llvm_install_symlink name dest) ++function(llvm_install_symlink name dest output_dir) + cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) + foreach(path ${CMAKE_MODULE_PATH}) + if(EXISTS ${path}/LLVMInstallSymlink.cmake) +@@ -1481,7 +1481,7 @@ function(llvm_install_symlink name dest) + set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) + + install(SCRIPT ${INSTALL_SYMLINK} +- CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" ++ CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" + COMPONENT ${component}) + + if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE) +@@ -1563,7 +1563,8 @@ function(add_llvm_tool_symlink link_name target) + endif() + + if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) +- llvm_install_symlink(${link_name} ${target}) ++ GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR) ++ llvm_install_symlink(${link_name} ${target} ${output_dir}) + endif() + endif() + endfunction() +@@ -1670,9 +1671,9 @@ function(llvm_setup_rpath name) + + if (APPLE) + set(_install_name_dir INSTALL_NAME_DIR "@rpath") +- set(_install_rpath "@loader_path/../lib" ${extra_libdir}) ++ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}" ${extra_libdir}) + elseif(UNIX) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + set_property(TARGET ${name} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-z,origin ") +diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake +index 02bab6846376..eff26adb2efc 100644 +--- a/cmake/modules/AddOCaml.cmake ++++ b/cmake/modules/AddOCaml.cmake +@@ -140,9 +140,9 @@ function(add_ocaml_library name) + endforeach() + + if( APPLE ) +- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + elseif( UNIX ) +- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + endif() + list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") + +diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake +index 22e3dcb776aa..ba77b9c195e2 100644 +--- a/cmake/modules/AddSphinxTarget.cmake ++++ b/cmake/modules/AddSphinxTarget.cmake +@@ -73,7 +73,7 @@ function (add_sphinx_target builder project) + + elseif (builder STREQUAL html) + string(TOUPPER "${project}" project_upper) +- set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" ++ set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html" + CACHE STRING "HTML documentation install directory for ${project}") + + # '/.' indicates: copy the contents of the directory directly into +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index f5cc0006fa06..77698aeaf000 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -1,4 +1,4 @@ +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + # First for users who use an installed LLVM, create the LLVMExports.cmake file. +@@ -90,11 +90,11 @@ foreach(p ${_count}) + set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} + get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") + endforeach(p) +-set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") +-set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") ++set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") ++set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") + set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") +-set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") ++set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") + set(LLVM_CONFIG_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMExports.cmake") + set(LLVM_CONFIG_EXPORTS "${LLVM_EXPORTS}") + configure_file( +diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake +index 1a04de931ff7..1c5ea4200635 100644 +--- a/cmake/modules/LLVMInstallSymlink.cmake ++++ b/cmake/modules/LLVMInstallSymlink.cmake +@@ -10,7 +10,7 @@ function(install_symlink name target outdir) + set(LINK_OR_COPY copy) + endif() + +- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") ++ set(bindir "${DESTDIR}${outdir}/") + + message("Creating ${name}") + +diff --git a/docs/CMake.rst b/docs/CMake.rst +index eb219c58560b..6f32532f8ebf 100644 +--- a/docs/CMake.rst ++++ b/docs/CMake.rst +@@ -196,7 +196,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. + **LLVM_LIBDIR_SUFFIX**:STRING + Extra suffix to append to the directory where libraries are to be + installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` +- to install libraries to ``/usr/lib64``. ++ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. + + **CMAKE_C_FLAGS**:STRING + Extra flags to use when compiling C source files. +@@ -479,8 +479,8 @@ LLVM-specific variables + + **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING + The path to install Doxygen-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/doxygen-html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. + + **LLVM_ENABLE_SPHINX**:BOOL + If specified, CMake will search for the ``sphinx-build`` executable and will make +@@ -511,13 +511,33 @@ LLVM-specific variables + + **LLVM_INSTALL_SPHINX_HTML_DIR**:STRING + The path to install Sphinx-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/html`. + + **LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING + The path to install OCamldoc-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/ocaml-html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html`. ++ ++**CMAKE_INSTALL_BINDIR**:STRING ++ The path to install binary tools, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `bin`. ++ ++**CMAKE_INSTALL_LIBDIR**:STRING ++ The path to install libraries, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `lib`. ++ ++**CMAKE_INSTALL_INCLUDEDIR**:STRING ++ The path to install header files, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `include`. ++ ++**CMAKE_INSTALL_DOCDIR**:STRING ++ The path to install documentation, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `share/doc`. ++ ++**CMAKE_INSTALL_MANDIR**:STRING ++ The path to install manpage files, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `share/man`. + + **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL + OS X Only: If enabled CMake will generate a target named +@@ -691,9 +711,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). + + This file is available in two different locations. + +-* ``/lib/cmake/llvm/LLVMConfig.cmake`` where +- ```` is the install prefix of an installed version of LLVM. +- On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. ++* ``LLVMConfig.cmake`` where ++ ```` is the location where LLVM CMake modules are ++ installed as part of an installed version of LLVM. This is typically ++ ``cmake/llvm/`` within the lib directory. On Linux, this is typically ++ ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. + + * ``/lib/cmake/llvm/LLVMConfig.cmake`` where + ```` is the root of the LLVM build tree. **Note: this is only +diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt +index 1d5ca3ba92b0..026f5453c1da 100644 +--- a/include/llvm/CMakeLists.txt ++++ b/include/llvm/CMakeLists.txt +@@ -4,5 +4,5 @@ add_subdirectory(Support) + # If we're doing an out-of-tree build, copy a module map for generated + # header files into the build area. + if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +- configure_file(module.modulemap.build module.modulemap COPYONLY) ++ configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) + endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index f201e1f7bff0..4582ed556a02 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -24,6 +24,10 @@ + #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" ++#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" ++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" ++#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" ++#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" + #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" + #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index bec89fef98ca..31d78f925d45 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -333,12 +333,26 @@ int main(int argc, char **argv) { + ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); + } else { + ActivePrefix = CurrentExecPrefix; +- ActiveIncludeDir = ActivePrefix + "/include"; +- SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); +- sys::fs::make_absolute(ActivePrefix, path); +- ActiveBinDir = path.str(); +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; +- ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveIncludeDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveBinDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveLibDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveCMakeDir = std::string(path.str()); ++ } + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + +diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt +index 6e913519a809..85641eef721f 100644 +--- a/tools/lto/CMakeLists.txt ++++ b/tools/lto/CMakeLists.txt +@@ -19,7 +19,7 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports) + add_llvm_library(LTO SHARED ${SOURCES} DEPENDS intrinsics_gen) + + install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h +- DESTINATION include/llvm-c ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c + COMPONENT LTO) + + if (APPLE) +diff --git a/tools/opt-remarks/CMakeLists.txt b/tools/opt-remarks/CMakeLists.txt +index a87beae1e893..149ea3d10168 100644 +--- a/tools/opt-remarks/CMakeLists.txt ++++ b/tools/opt-remarks/CMakeLists.txt +@@ -11,7 +11,7 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/OptRemarks.exports) + add_llvm_library(OptRemarks SHARED ${SOURCES}) + + install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/OptRemarks.h +- DESTINATION include/llvm-c ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c + COMPONENT OptRemarks) + + if (APPLE) +diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt +index 19b606933082..27b9f71b3d79 100644 +--- a/tools/opt-viewer/CMakeLists.txt ++++ b/tools/opt-viewer/CMakeLists.txt +@@ -8,6 +8,6 @@ set (files + + foreach (file ${files}) + install(PROGRAMS ${file} +- DESTINATION share/opt-viewer ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer + COMPONENT opt-viewer) + endforeach (file) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix index 87b29163f4..f1c21083bb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld +{ lib, stdenv, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +, buildLlvmTools , fixDarwinDylibNames , enableManpages ? false , enablePolly ? false # TODO: get this info from llvm (passthru?) @@ -23,18 +24,22 @@ let ++ lib.optional enableManpages python3.pkgs.sphinx ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libxml2 llvm lld ]; + buildInputs = [ libxml2 libllvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" "-DCLANGD_BUILD_XPC=OFF" "-DLLVM_ENABLE_RTTI=ON" + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" ] ++ lib.optionals enablePolly [ "-DWITH_POLLY=ON" "-DLINK_POLLY_INTO_TOOLS=ON" @@ -46,6 +51,7 @@ let ./compiler-rt-baremetal.patch # make clang -xhip use $PATH to find executables ./HIP-use-PATH-9.patch + ./gnu-install-dirs.patch ]; postPatch = '' @@ -62,12 +68,12 @@ let --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE ''; - outputs = [ "out" "lib" "python" ]; + outputs = [ "out" "lib" "dev" "python" ]; # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${llvm}/lib/LLVMgold.so ]; then - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then + ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib fi ln -sv $out/bin/clang $out/bin/cpp @@ -86,11 +92,14 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + + mkdir -p $dev/bin + cp bin/clang-tblgen $dev/bin ''; passthru = { isClang = true; - inherit llvm; + inherit libllvm; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/clang/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/clang/gnu-install-dirs.patch new file mode 100644 index 0000000000..625cbcc723 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/clang/gnu-install-dirs.patch @@ -0,0 +1,278 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 60937aa9db38..45522ff32998 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,6 +9,8 @@ endif() + if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) + project(Clang) + ++ include(GNUInstallDirs) ++ + # Rely on llvm-config. + set(CONFIG_OUTPUT) + if(LLVM_CONFIG) +@@ -413,7 +415,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/clang include/clang-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT clang-headers + FILES_MATCHING + PATTERN "*.def" +@@ -423,7 +425,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT clang-headers + FILES_MATCHING + PATTERN "CMakeFiles" EXCLUDE +@@ -442,7 +444,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + endif() + + install(PROGRAMS utils/bash-autocomplete.sh +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + ) + endif() + +diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake +index cbd618e18afb..63ba43f18e64 100644 +--- a/cmake/modules/AddClang.cmake ++++ b/cmake/modules/AddClang.cmake +@@ -109,9 +109,9 @@ macro(add_clang_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_clangtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-${name} +@@ -155,7 +155,7 @@ macro(add_clang_tool name) + + install(TARGETS ${name} + ${export_to_clangtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT LLVM_ENABLE_IDE) +@@ -170,7 +170,7 @@ endmacro() + macro(add_clang_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() + + function(clang_target_link_libraries target type) +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index a3c0b08fa364..aa4215c0999c 100644 +--- a/lib/Headers/CMakeLists.txt ++++ b/lib/Headers/CMakeLists.txt +@@ -185,7 +185,7 @@ set_target_properties(clang-resource-headers PROPERTIES + FOLDER "Misc" + RUNTIME_OUTPUT_DIRECTORY "${output_dir}") + +-set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) ++set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) + + install( + FILES ${files} ${generated_files} +diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt +index ceef4b08637c..8efad5520ca4 100644 +--- a/tools/c-index-test/CMakeLists.txt ++++ b/tools/c-index-test/CMakeLists.txt +@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH + "@executable_path/../../lib") + else() +- set(INSTALL_DESTINATION bin) ++ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + + install(TARGETS c-index-test +diff --git a/tools/clang-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt +index 4576d78bcfb4..7c3b302d8d59 100644 +--- a/tools/clang-check/CMakeLists.txt ++++ b/tools/clang-check/CMakeLists.txt +@@ -21,4 +21,4 @@ clang_target_link_libraries(clang-check + ) + + install(TARGETS clang-check +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/tools/clang-extdef-mapping/CMakeLists.txt b/tools/clang-extdef-mapping/CMakeLists.txt +index 4798bdb71ad0..02d07b9982ac 100644 +--- a/tools/clang-extdef-mapping/CMakeLists.txt ++++ b/tools/clang-extdef-mapping/CMakeLists.txt +@@ -18,4 +18,4 @@ clang_target_link_libraries(clang-extdef-mapping + ) + + install(TARGETS clang-extdef-mapping +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt +index 35ecdb11253c..d77d75de0094 100644 +--- a/tools/clang-format/CMakeLists.txt ++++ b/tools/clang-format/CMakeLists.txt +@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE ) + endif() + + install(PROGRAMS clang-format-bbedit.applescript +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-diff.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-sublime.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS git-clang-format +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT clang-format) +diff --git a/tools/clang-offload-bundler/CMakeLists.txt b/tools/clang-offload-bundler/CMakeLists.txt +index 465bef040a6c..729369ed9429 100644 +--- a/tools/clang-offload-bundler/CMakeLists.txt ++++ b/tools/clang-offload-bundler/CMakeLists.txt +@@ -22,4 +22,4 @@ clang_target_link_libraries(clang-offload-bundler + ${CLANG_OFFLOAD_BUNDLER_LIB_DEPS} + ) + +-install(TARGETS clang-offload-bundler RUNTIME DESTINATION bin) ++install(TARGETS clang-offload-bundler RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt +index cda8e29ec5b1..0134d8ccd70b 100644 +--- a/tools/clang-rename/CMakeLists.txt ++++ b/tools/clang-rename/CMakeLists.txt +@@ -19,8 +19,8 @@ clang_target_link_libraries(clang-rename + ) + + install(PROGRAMS clang-rename.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) + install(PROGRAMS clang-rename.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) +diff --git a/tools/diagtool/CMakeLists.txt b/tools/diagtool/CMakeLists.txt +index a95444be40ee..136d96d9bf5b 100644 +--- a/tools/diagtool/CMakeLists.txt ++++ b/tools/diagtool/CMakeLists.txt +@@ -21,7 +21,7 @@ clang_target_link_libraries(diagtool + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(TARGETS diagtool + COMPONENT diagtool +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-diagtool +diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt +index 613ead1a36b6..e5c7bf27f739 100644 +--- a/tools/libclang/CMakeLists.txt ++++ b/tools/libclang/CMakeLists.txt +@@ -137,7 +137,7 @@ endif() + if(INTERNAL_INSTALL_PREFIX) + set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") + else() +- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) ++ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + install(DIRECTORY ../../include/clang-c +@@ -168,7 +168,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) + COMPONENT + libclang-python-bindings + DESTINATION +- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") ++ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") + endforeach() + if(NOT LLVM_ENABLE_IDE) + add_custom_target(libclang-python-bindings) +diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt +index 380379300b09..adfd58ed5f7d 100644 +--- a/tools/scan-build/CMakeLists.txt ++++ b/tools/scan-build/CMakeLists.txt +@@ -41,7 +41,7 @@ if(CLANG_INSTALL_SCANBUILD) + ${CMAKE_BINARY_DIR}/bin/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) +- install(PROGRAMS bin/${BinFile} DESTINATION bin) ++ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endforeach() + + foreach(LibexecFile ${LibexecFiles}) +@@ -53,7 +53,7 @@ if(CLANG_INSTALL_SCANBUILD) + ${CMAKE_BINARY_DIR}/libexec/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) +- install(PROGRAMS libexec/${LibexecFile} DESTINATION libexec) ++ install(PROGRAMS libexec/${LibexecFile} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) + endforeach() + + foreach(ManPage ${ManPages}) +@@ -77,7 +77,7 @@ if(CLANG_INSTALL_SCANBUILD) + ${CMAKE_BINARY_DIR}/share/scan-build/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) +- install(FILES share/scan-build/${ShareFile} DESTINATION share/scan-build) ++ install(FILES share/scan-build/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build) + endforeach() + + add_custom_target(scan-build ALL DEPENDS ${Depends}) +diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt +index b305ca562a72..554bcb379061 100644 +--- a/tools/scan-view/CMakeLists.txt ++++ b/tools/scan-view/CMakeLists.txt +@@ -21,7 +21,7 @@ if(CLANG_INSTALL_SCANVIEW) + ${CMAKE_BINARY_DIR}/bin/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) +- install(PROGRAMS bin/${BinFile} DESTINATION bin) ++ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endforeach() + + foreach(ShareFile ${ShareFiles}) +@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) + ${CMAKE_BINARY_DIR}/share/scan-view/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) +- install(FILES share/${ShareFile} DESTINATION share/scan-view) ++ install(FILES share/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view) + endforeach() + + add_custom_target(scan-view ALL DEPENDS ${Depends}) +diff --git a/utils/hmaptool/CMakeLists.txt b/utils/hmaptool/CMakeLists.txt +index 5573009d343a..24b3a90f233f 100644 +--- a/utils/hmaptool/CMakeLists.txt ++++ b/utils/hmaptool/CMakeLists.txt +@@ -9,7 +9,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${CLANG_HMAPTOOL}) + + list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) +-install(PROGRAMS ${CLANG_HMAPTOOL} DESTINATION bin) ++install(PROGRAMS ${CLANG_HMAPTOOL} DESTINATION ${CMAKE_INSTALL_BINDIR}) + + add_custom_target(hmaptool ALL DEPENDS ${Depends}) + set_target_properties(hmaptool PROPERTIES FOLDER "Utils") diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt/default.nix index cfc8e0ea74..285fe81151 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { inherit version; src = fetch pname "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2"; - nativeBuildInputs = [ cmake python3 llvm ]; + nativeBuildInputs = [ cmake python3 llvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce ../../common/compiler-rt/glibc.patch ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ./gnu-install-dirs.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 0000000000..7967bbc485 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,117 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f26ae25ada30..8ba536afdccc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,6 +12,7 @@ endif() + # Check if compiler-rt is built as a standalone project. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) + project(CompilerRT C CXX ASM) ++ include(GNUInstallDirs) + set(COMPILER_RT_STANDALONE_BUILD TRUE) + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + endif() +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index f7ee932f214f..ef94a97c4be9 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -488,7 +488,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) + add_custom_target(${target_name} DEPENDS ${dst_file}) + # Install in Clang resource directory. + install(FILES ${file_name} +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR} + COMPONENT ${component}) + add_dependencies(${component} ${target_name}) + +@@ -505,7 +505,7 @@ macro(add_compiler_rt_script name) + add_custom_target(${name} DEPENDS ${dst}) + install(FILES ${dst} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR}) + endmacro(add_compiler_rt_script src name) + + # Builds custom version of libc++ and installs it in . +diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake +index b50d55b56940..7e5729ad9c8e 100644 +--- a/cmake/Modules/CompilerRTDarwinUtils.cmake ++++ b/cmake/Modules/CompilerRTDarwinUtils.cmake +@@ -386,7 +386,7 @@ macro(darwin_add_embedded_builtin_libraries) + set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded) + set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded) + + set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi") + set(CFLAGS_i386 "-march=pentium") +diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake +index 6e672b1e1818..64999709958e 100644 +--- a/cmake/Modules/CompilerRTUtils.cmake ++++ b/cmake/Modules/CompilerRTUtils.cmake +@@ -371,7 +371,7 @@ endfunction() + function(get_compiler_rt_install_dir arch install_dir) + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + get_compiler_rt_target(${arch} target) +- set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/lib/${target} PARENT_SCOPE) ++ set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${target} PARENT_SCOPE) + else() + set(${install_dir} ${COMPILER_RT_LIBRARY_INSTALL_DIR} PARENT_SCOPE) + endif() +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index cef0e0d73d87..db33fb028287 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -55,11 +55,11 @@ if (LLVM_TREE_AVAILABLE) + else() + # Take output dir and install path from the user. + set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH +- "Path where built compiler-rt libraries should be stored.") ++ "Path where built compiler-rt build artifacts should be stored.") + set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH + "Path where built compiler-rt executables should be stored.") +- set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH +- "Path where built compiler-rt libraries should be installed.") ++ set(COMPILER_RT_INSTALL_PATH "" CACHE PATH ++ "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.") + option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF) + option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) + # Use a host compiler to compile/link tests. +@@ -87,7 +87,7 @@ else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) + set(COMPILER_RT_LIBRARY_OUTPUT_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) + set(COMPILER_RT_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR}) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) + endif() + + if(APPLE) +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index 38bd6e41a912..2092d0d08247 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -50,12 +50,12 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") + install(FILES ${SANITIZER_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer) + # Install xray headers. + install(FILES ${XRAY_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray) + + if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs. + add_custom_target(install-compiler-rt-headers +diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt +index b3ae713cf02c..52b364b900f5 100644 +--- a/lib/dfsan/CMakeLists.txt ++++ b/lib/dfsan/CMakeLists.txt +@@ -54,4 +54,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename} + DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt) + add_dependencies(dfsan dfsan_abilist) + install(FILES ${dfsan_abilist_filename} +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix index 1b8bdad07b..0660bac137 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix @@ -1,6 +1,5 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith -, buildPackages , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: @@ -18,43 +17,52 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "01vgzd4k1q93nfs8gyl83mjlc4x0qsgfqw32lacbjzdxg0mdfvxj"; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); - mkExtraBuildCommands = cc: '' + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); + mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; + mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ''; + in { - llvm = callPackage ./llvm { }; + libllvm = callPackage ./llvm { }; - llvm-polly = callPackage ./llvm { enablePolly = true; }; + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputUnspecified = true; }; - clang-unwrapped = callPackage ./clang { - inherit (tools) lld; + libllvm-polly = callPackage ./llvm { enablePolly = true; }; + + llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; }; + + libclang = callPackage ./clang { inherit clang-tools-extra_src; }; + + clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; + clang-polly-unwrapped = callPackage ./clang { inherit clang-tools-extra_src; - llvm = tools.llvm-polly; + libllvm = tools.libllvm-polly; enablePolly = true; }; # disabled until recommonmark supports sphinx 3 - #llvm-manpages = lowPrio (tools.llvm.override { + #llvm-manpages = lowPrio (tools.libllvm.override { # enableManpages = true; # python3 = pkgs.python3; # don't use python-boot #}); - clang-manpages = lowPrio (tools.clang-unwrapped.override { + clang-manpages = lowPrio (tools.libclang.override { enableManpages = true; python3 = pkgs.python3; # don't use python-boot }); - libclang = tools.clang-unwrapped.lib; - clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; libstdcxxClang = wrapCCWith rec { @@ -144,7 +152,7 @@ let '' + mkExtraBuildCommands cc; }; - lldClangNoCompilerRt = wrapCCWith { + lldClangNoCompilerRt = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = null; bintools = wrapBintoolsWith { @@ -154,7 +162,7 @@ let extraPackages = [ ]; extraBuildCommands = '' echo "-nostartfiles" >> $out/nix-support/cc-cflags - ''; + '' + mkExtraBuildCommands0 cc; }; }); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix index 6ea1e28e7b..3cdb4f32a0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation { export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; - patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; + outputs = [ "out" "dev" ]; + + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; preConfigure = '' # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++/gnu-install-dirs.patch new file mode 100644 index 0000000000..424488bd2e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++/gnu-install-dirs.patch @@ -0,0 +1,99 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ec1869ddc7ae..a1c040235c8d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,6 +26,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUILD) + project(libcxx CXX C) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libcxx) + set(PACKAGE_VERSION 9.0.1) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +@@ -416,7 +418,7 @@ string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) + set(LIBCXX_HEADER_DIR ${LLVM_BINARY_DIR}) +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) + string(APPEND LIBCXX_INSTALL_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) +@@ -424,10 +426,10 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) + set(LIBCXX_HEADER_DIR ${LLVM_BINARY_DIR}) +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) + else() + set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) + endif() + + file(MAKE_DIRECTORY "${LIBCXX_BINARY_INCLUDE_DIR}") +diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake +index 10f100f7f0fb..95ed3978ab73 100644 +--- a/cmake/Modules/HandleLibCXXABI.cmake ++++ b/cmake/Modules/HandleLibCXXABI.cmake +@@ -61,7 +61,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) + + if (LIBCXX_INSTALL_HEADERS) + install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" +- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dstdir} ++ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} + COMPONENT cxx-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index 7cbf82caa81f..7cbde7accd78 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -243,7 +243,7 @@ if (LIBCXX_INSTALL_HEADERS) + foreach(file ${files}) + get_filename_component(dir ${file} DIRECTORY) + install(FILES ${file} +- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dir} ++ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dir} + COMPONENT ${CXX_HEADER_TARGET} + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) +@@ -252,7 +252,7 @@ if (LIBCXX_INSTALL_HEADERS) + if (LIBCXX_NEEDS_SITE_CONFIG) + # Install the generated header as __config. + install(FILES ${LIBCXX_BINARY_DIR}/__generated_config +- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1 ++ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + RENAME __config + COMPONENT ${CXX_HEADER_TARGET}) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 31cd24333a5e..a419cef662b0 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -437,21 +437,21 @@ if (LIBCXX_INSTALL_LIBRARY) + install(TARGETS cxx_shared + ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) ++ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + endif() + + if (LIBCXX_INSTALL_STATIC_LIBRARY) + install(TARGETS cxx_static + ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) ++ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + endif() + + if(LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY) + install(TARGETS ${LIBCXX_INSTALL_TARGETS} ${experimental_lib} + LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) ++ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + endif() + + # NOTE: This install command must go after the cxx install command otherwise diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++abi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++abi/default.nix index 99d3918b89..5358985f44 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++abi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++abi/default.nix @@ -8,6 +8,25 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "1b4aiaa8cirx52vk2p5kfk57qmbqf1ipb4nqnjhdgqps9jm7iyg8"; + outputs = [ "out" "dev" ]; + + postUnpack = '' + unpackFile ${libcxx.src} + unpackFile ${llvm.src} + cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" + '' + lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} + '' + lib.optionalString stdenv.hostPlatform.isWasm '' + patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch} + ''; + + patches = [ + ./no-threads.patch + ./gnu-install-dirs.patch + ]; + nativeBuildInputs = [ cmake ]; buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; @@ -21,20 +40,6 @@ stdenv.mkDerivation { "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; - patches = [ ./no-threads.patch ]; - - postUnpack = '' - unpackFile ${libcxx.src} - unpackFile ${llvm.src} - cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" - '' + lib.optionalString stdenv.isDarwin '' - export TRIPLE=x86_64-apple-darwin - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} - '' + lib.optionalString stdenv.hostPlatform.isWasm '' - patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch} - ''; - installPhase = if stdenv.isDarwin then '' for file in lib/*.dylib; do diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++abi/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++abi/gnu-install-dirs.patch new file mode 100644 index 0000000000..70b41a6ff5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libc++abi/gnu-install-dirs.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aa0b124fc3c4..d74373f465c5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,6 +20,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXXABI_STANDALONE_BUILD) + project(libcxxabi CXX C) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libcxxabi) + set(PACKAGE_VERSION 9.0.1) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +@@ -181,17 +183,17 @@ string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION + + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) + string(APPEND LIBCXXABI_INSTALL_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) + endif() + elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) + else() + set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) + endif() + + set(LIBCXXABI_INSTALL_PREFIX "" CACHE STRING "Define libc++abi destination prefix.") diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libunwind/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libunwind/default.nix index 4c4c85512e..fdb362dcd2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libunwind/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libunwind/default.nix @@ -8,6 +8,12 @@ stdenv.mkDerivation rec { src = fetch pname "1wb02ha3gl6p0a321hwpll74pz5qvjr11xmjqx62g288f1m10njk"; + patches = [ + ./gnu-install-dirs.patch + ]; + + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libunwind/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libunwind/gnu-install-dirs.patch new file mode 100644 index 0000000000..12171bb515 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libunwind/gnu-install-dirs.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index df68491d686e..3b53267ae464 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,6 +18,8 @@ set(CMAKE_MODULE_PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_BUILD) + project(libunwind) + ++ include(GNUInstallDirs) ++ + # Rely on llvm-config. + set(CONFIG_OUTPUT) + if(NOT LLVM_CONFIG_PATH) +@@ -189,17 +191,17 @@ string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION + + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) + string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) + endif() + elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX}) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX}) + else() + set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX}) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX}) + endif() + + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBUNWIND_LIBRARY_DIR}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lld/default.nix index 8b12642d2a..cd84afe70e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lld/default.nix @@ -1,8 +1,9 @@ { lib, stdenv +, buildLlvmTools , fetch , cmake , libxml2 -, llvm +, libllvm , version }: @@ -12,15 +13,20 @@ stdenv.mkDerivation rec { src = fetch pname "10hckfxpapfnh6y9apjiya2jpw9nmbbmh8ayijx89mrg7snjn9l6"; + patches = [ + ./gnu-install-dirs.patch + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ llvm libxml2 ]; + buildInputs = [ libllvm libxml2 ]; - outputs = [ "out" "dev" ]; + cmakeFlags = [ + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ]; - postInstall = '' - moveToOutput include "$dev" - moveToOutput lib "$dev" - ''; + outputs = [ "out" "lib" "dev" ]; meta = { description = "The LLVM Linker"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lld/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lld/gnu-install-dirs.patch new file mode 100644 index 0000000000..232f5cbac9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lld/gnu-install-dirs.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 641f71c114ae..9d44c1463aff 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(LLD_BUILT_STANDALONE TRUE) + ++ include(GNUInstallDirs) ++ + find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") + if(NOT LLVM_CONFIG_PATH) + message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") +@@ -202,7 +204,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake +index fa48b428d26b..e7967aad3ceb 100644 +--- a/cmake/modules/AddLLD.cmake ++++ b/cmake/modules/AddLLD.cmake +@@ -20,9 +20,9 @@ macro(add_lld_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_lldtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-${name} +@@ -54,7 +54,7 @@ macro(add_lld_tool name) + + install(TARGETS ${name} + ${export_to_lldtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT CMAKE_CONFIGURATION_TYPES) +@@ -69,5 +69,5 @@ endmacro() + macro(add_lld_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() +diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt +index a15e296e31df..654c2cfdb9c0 100644 +--- a/tools/lld/CMakeLists.txt ++++ b/tools/lld/CMakeLists.txt +@@ -17,7 +17,7 @@ target_link_libraries(lld + ) + + install(TARGETS lld +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if(NOT LLD_SYMLINKS_TO_CREATE) + set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld ld64.lld wasm-ld) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lldb/default.nix index d75acf135f..6d753ce1a8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lldb/default.nix @@ -7,8 +7,8 @@ , which , libedit , libxml2 -, llvm -, clang-unwrapped +, libllvm +, libclang , python3 , version , darwin @@ -21,17 +21,20 @@ stdenv.mkDerivation rec { src = fetch pname "02gb3fbz09kyw8n71218v5v77ip559x3gqbcp8y3w6n3jpbryywa"; - patches = [ ./procfs.patch ]; + patches = [ + ./procfs.patch + ./gnu-install-dirs.patch + ]; + + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ + cmake python3 which swig lit + ]; - nativeBuildInputs = [ cmake python3 which swig lit ]; buildInputs = [ - ncurses - zlib - libedit - libxml2 - llvm - ] - ++ lib.optionals stdenv.isDarwin [ + ncurses zlib libedit libxml2 libllvm + ] ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation @@ -44,11 +47,17 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; cmakeFlags = [ - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic - "-DClang_DIR=${clang-unwrapped}/lib/cmake" + "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" + "-DClang_DIR=${libclang.dev}/lib/cmake" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ] ++ lib.optionals doCheck [ + "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" ]; + doCheck = false; + postInstall = '' # man page mkdir -p $out/share/man/man1 @@ -58,13 +67,13 @@ stdenv.mkDerivation rec { # vscode: install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin - ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ln -s $out/bin/llvm-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin ''; meta = with lib; { description = "A next-generation high-performance debugger"; - homepage = "https://llvm.org/"; - license = licenses.ncsa; - platforms = platforms.all; + homepage = "https://llvm.org/"; + license = licenses.ncsa; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch new file mode 100644 index 0000000000..cb4e400b36 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch @@ -0,0 +1,65 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5d52f6450657..a05130cf80b9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,6 +14,8 @@ set(CMAKE_MODULE_PATH + # If we are not building as part of LLVM, build LLDB as a standalone project, + # using LLVM as an external library. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) ++ include(GNUInstallDirs) ++ + include(LLDBStandalone) + endif() + +diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake +index 4c99278c583b..36d3640a6afc 100644 +--- a/cmake/modules/AddLLDB.cmake ++++ b/cmake/modules/AddLLDB.cmake +@@ -94,13 +94,13 @@ function(add_lldb_library name) + endif() + + if(PARAM_SHARED) +- set(install_dest lib${LLVM_LIBDIR_SUFFIX}) ++ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(PARAM_INSTALL_PREFIX) + set(install_dest ${PARAM_INSTALL_PREFIX}) + endif() + # RUNTIME is relevant for DLL platforms, FRAMEWORK for macOS + install(TARGETS ${name} COMPONENT ${name} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${install_dest} + ARCHIVE DESTINATION ${install_dest} + FRAMEWORK DESTINATION ${install_dest}) +diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake +index e1a133709ff2..357b4bb4492a 100644 +--- a/cmake/modules/LLDBConfig.cmake ++++ b/cmake/modules/LLDBConfig.cmake +@@ -335,7 +335,7 @@ include_directories(BEFORE + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ + COMPONENT lldb-headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +@@ -345,7 +345,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ + COMPONENT lldb-headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE +diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt +index b5316540fdf3..3c3c882d503f 100644 +--- a/tools/intel-features/CMakeLists.txt ++++ b/tools/intel-features/CMakeLists.txt +@@ -64,4 +64,4 @@ if (NOT LLDB_DISABLE_PYTHON AND LLDB_BUILD_INTEL_PT) + endif() + + install(TARGETS lldbIntelFeatures +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/default.nix index b795f07d47..78d8d7b30e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -1,4 +1,5 @@ { lib, stdenv +, pkgsBuildBuild , fetch , cmake , python3 @@ -10,10 +11,10 @@ , version , release_version , zlib -, buildPackages +, buildLlvmTools , debugVersion ? false , enableManpages ? false -, enableSharedLibraries ? true +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 || stdenv.isAarch32 # broken for the armv7l builder @@ -44,8 +45,7 @@ in stdenv.mkDerivation (rec { mv polly-* $sourceRoot/tools/polly ''; - outputs = [ "out" "python" ] - ++ optional enableSharedLibraries "lib"; + outputs = [ "out" "lib" "dev" "python" ]; nativeBuildInputs = [ cmake python3 ] ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; @@ -55,10 +55,14 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' "" + --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}" ''${extra_libdir})' "" '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + optionalString (enableSharedLibraries) '' @@ -104,6 +108,7 @@ in stdenv.mkDerivation (rec { ''; cmakeFlags = with stdenv; [ + "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=ON" @@ -127,7 +132,20 @@ in stdenv.mkDerivation (rec { "-DCAN_TARGET_i386=false" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildPackages.llvm_9}/bin/llvm-tblgen" + "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ( + let + nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; + nativeBintools = nativeCC.bintools.bintools; + nativeToolchainFlags = [ + "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" + "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" + "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" + "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" + "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" + ]; + in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=${lib.concatStringsSep ";" nativeToolchainFlags}" + ) ]; postBuild = '' @@ -141,18 +159,19 @@ in stdenv.mkDerivation (rec { postInstall = '' mkdir -p $python/share mv $out/share/opt-viewer $python/share/opt-viewer - '' - + optionalString enableSharedLibraries '' - moveToOutput "lib/libLLVM-*" "$lib" - moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" + moveToOutput "bin/llvm-config*" "$dev" + substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ + --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" + substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ + --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' '' + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + '' + + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; doCheck = stdenv.isLinux && (!stdenv.isx86_32); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/gnu-install-dirs-polly.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 0000000000..7c477c7df5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,106 @@ +diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt +index 9939097f743e..8cc538da912a 100644 +--- a/tools/polly/CMakeLists.txt ++++ b/tools/polly/CMakeLists.txt +@@ -2,7 +2,11 @@ + if (NOT DEFINED LLVM_MAIN_SRC_DIR) + project(Polly) + cmake_minimum_required(VERSION 3.4.3) ++endif() ++ ++include(GNUInstallDirs) + ++if (NOT DEFINED LLVM_MAIN_SRC_DIR) + # Where is LLVM installed? + find_package(LLVM CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) +@@ -145,14 +149,14 @@ include_directories( + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".svn" EXCLUDE + ) + + install(DIRECTORY ${POLLY_BINARY_DIR}/include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE +diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt +index 211f95512717..f9e04a4844b6 100644 +--- a/tools/polly/cmake/CMakeLists.txt ++++ b/tools/polly/cmake/CMakeLists.txt +@@ -79,18 +79,18 @@ file(GENERATE + + # Generate PollyConfig.cmake for the install tree. + unset(POLLY_EXPORTS) +-set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") ++set(POLLY_INSTALL_PREFIX "") + set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") ++set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") ++set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + if (POLLY_BUNDLED_ISL) + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" +- "${POLLY_INSTALL_PREFIX}/include/polly" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" + ) + else() + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" + ${ISL_INCLUDE_DIRS} + ) + endif() +@@ -100,12 +100,12 @@ endif() + foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) + get_target_property(tgt_type ${tgt} TYPE) + if (tgt_type STREQUAL "EXECUTABLE") +- set(tgt_prefix "bin/") ++ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") + else() +- set(tgt_prefix "lib/") ++ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") + endif() + +- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$") ++ set(tgt_path "${tgt_prefix}$") + file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) + + if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") +diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake +index e48203871884..5bc8a2a52541 100644 +--- a/tools/polly/cmake/polly_macros.cmake ++++ b/tools/polly/cmake/polly_macros.cmake +@@ -44,8 +44,8 @@ macro(add_polly_library name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") + install(TARGETS ${name} + EXPORT LLVMExports +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) + endmacro(add_polly_library) +diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt +index 8ffd984e542b..261cc19f3238 100644 +--- a/tools/polly/lib/External/CMakeLists.txt ++++ b/tools/polly/lib/External/CMakeLists.txt +@@ -274,7 +274,7 @@ if (POLLY_BUNDLED_ISL) + install(DIRECTORY + ${ISL_SOURCE_DIR}/include/ + ${ISL_BINARY_DIR}/include/ +- DESTINATION include/polly ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/gnu-install-dirs.patch new file mode 100644 index 0000000000..380cc3f6df --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/gnu-install-dirs.patch @@ -0,0 +1,395 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b9a10685b99f..c2750500df99 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -242,15 +242,21 @@ if (CMAKE_BUILD_TYPE AND + message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") + endif() + ++include(GNUInstallDirs) ++ + set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) + +-set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") ++set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING ++ "Path for binary subdirectory (defaults to 'bin')") + mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) + + set(LLVM_UTILS_INSTALL_DIR "${LLVM_TOOLS_INSTALL_DIR}" CACHE STRING + "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") + mark_as_advanced(LLVM_UTILS_INSTALL_DIR) + ++set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING ++ "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) ++ + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) + set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) +@@ -534,9 +540,9 @@ option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) + option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) + option (LLVM_ENABLE_BINDINGS "Build bindings." ON) + +-set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" ++set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html" + CACHE STRING "Doxygen-generated HTML documentation install directory") +-set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" ++set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html" + CACHE STRING "OCamldoc-generated HTML documentation install directory") + + option (LLVM_BUILD_EXTERNAL_COMPILER_RT +@@ -1002,7 +1008,7 @@ endif() + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/llvm include/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +@@ -1014,7 +1020,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +@@ -1029,13 +1035,13 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + if (LLVM_INSTALL_MODULEMAPS) + install(DIRECTORY include/llvm include/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "module.modulemap" + ) + install(FILES include/llvm/module.install.modulemap +- DESTINATION include/llvm ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm + COMPONENT llvm-headers + RENAME "module.extern.modulemap" + ) +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index 619e986b8aa0..842b4f71d07e 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -697,9 +697,9 @@ macro(add_llvm_library name) + + install(TARGETS ${name} + ${export_to_llvmexports} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} +- RUNTIME DESTINATION bin COMPONENT ${name}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${name}) + + if (NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-${name} +@@ -930,7 +930,7 @@ macro(add_llvm_example name) + endif() + add_llvm_executable(${name} ${ARGN}) + if( LLVM_BUILD_EXAMPLES ) +- install(TARGETS ${name} RUNTIME DESTINATION examples) ++ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) + endif() + set_target_properties(${name} PROPERTIES FOLDER "Examples") + endmacro(add_llvm_example name) +@@ -1485,7 +1485,7 @@ function(llvm_install_library_symlink name dest type) + set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) + set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) + +- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 AND "${type}" STREQUAL "SHARED") + set(output_dir bin) + endif() +@@ -1501,7 +1501,7 @@ function(llvm_install_library_symlink name dest type) + endif() + endfunction() + +-function(llvm_install_symlink name dest) ++function(llvm_install_symlink name dest output_dir) + cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) + foreach(path ${CMAKE_MODULE_PATH}) + if(EXISTS ${path}/LLVMInstallSymlink.cmake) +@@ -1524,7 +1524,7 @@ function(llvm_install_symlink name dest) + set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) + + install(SCRIPT ${INSTALL_SYMLINK} +- CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" ++ CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" + COMPONENT ${component}) + + if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE) +@@ -1606,7 +1606,8 @@ function(add_llvm_tool_symlink link_name target) + endif() + + if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) +- llvm_install_symlink(${link_name} ${target}) ++ GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR) ++ llvm_install_symlink(${link_name} ${target} ${output_dir}) + endif() + endif() + endfunction() +@@ -1728,9 +1729,9 @@ function(llvm_setup_rpath name) + + if (APPLE) + set(_install_name_dir INSTALL_NAME_DIR "@rpath") +- set(_install_rpath "@loader_path/../lib" ${extra_libdir}) ++ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}" ${extra_libdir}) + elseif(UNIX) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + set_property(TARGET ${name} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-z,origin ") +diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake +index 02bab6846376..eff26adb2efc 100644 +--- a/cmake/modules/AddOCaml.cmake ++++ b/cmake/modules/AddOCaml.cmake +@@ -140,9 +140,9 @@ function(add_ocaml_library name) + endforeach() + + if( APPLE ) +- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + elseif( UNIX ) +- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + endif() + list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") + +diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake +index 22e3dcb776aa..ba77b9c195e2 100644 +--- a/cmake/modules/AddSphinxTarget.cmake ++++ b/cmake/modules/AddSphinxTarget.cmake +@@ -73,7 +73,7 @@ function (add_sphinx_target builder project) + + elseif (builder STREQUAL html) + string(TOUPPER "${project}" project_upper) +- set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" ++ set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html" + CACHE STRING "HTML documentation install directory for ${project}") + + # '/.' indicates: copy the contents of the directory directly into +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index 9cf22b436fa7..486e40010cd8 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -1,4 +1,4 @@ +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + # First for users who use an installed LLVM, create the LLVMExports.cmake file. +@@ -96,13 +96,13 @@ foreach(p ${_count}) + set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} + get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") + endforeach(p) +-set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") ++set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") + set(LLVM_CONFIG_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}") + set(LLVM_CONFIG_MAIN_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}") +-set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") ++set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") + set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") +-set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") ++set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") + set(LLVM_CONFIG_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMExports.cmake") + set(LLVM_CONFIG_EXPORTS "${LLVM_EXPORTS}") + configure_file( +diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake +index 09fed8085c23..aa79f192abf0 100644 +--- a/cmake/modules/LLVMInstallSymlink.cmake ++++ b/cmake/modules/LLVMInstallSymlink.cmake +@@ -10,7 +10,7 @@ function(install_symlink name target outdir) + set(LINK_OR_COPY copy) + endif() + +- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") ++ set(bindir "${DESTDIR}${outdir}/") + + message(STATUS "Creating ${name}") + +diff --git a/docs/CMake.rst b/docs/CMake.rst +index 91fb5282206f..d2c9fd94d131 100644 +--- a/docs/CMake.rst ++++ b/docs/CMake.rst +@@ -196,7 +196,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. + **LLVM_LIBDIR_SUFFIX**:STRING + Extra suffix to append to the directory where libraries are to be + installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` +- to install libraries to ``/usr/lib64``. ++ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. + + **CMAKE_C_FLAGS**:STRING + Extra flags to use when compiling C source files. +@@ -492,8 +492,8 @@ LLVM-specific variables + + **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING + The path to install Doxygen-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/doxygen-html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. + + **LLVM_ENABLE_SPHINX**:BOOL + If specified, CMake will search for the ``sphinx-build`` executable and will make +@@ -524,13 +524,33 @@ LLVM-specific variables + + **LLVM_INSTALL_SPHINX_HTML_DIR**:STRING + The path to install Sphinx-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/html`. + + **LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING + The path to install OCamldoc-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/ocaml-html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html`. ++ ++**CMAKE_INSTALL_BINDIR**:STRING ++ The path to install binary tools, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `bin`. ++ ++**CMAKE_INSTALL_LIBDIR**:STRING ++ The path to install libraries, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `lib`. ++ ++**CMAKE_INSTALL_INCLUDEDIR**:STRING ++ The path to install header files, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `include`. ++ ++**CMAKE_INSTALL_DOCDIR**:STRING ++ The path to install documentation, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `share/doc`. ++ ++**CMAKE_INSTALL_MANDIR**:STRING ++ The path to install manpage files, relative to the ``CMAKE_INSTALL_PREFIX``. ++ Defaults to `share/man`. + + **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL + macOS Only: If enabled CMake will generate a target named +@@ -710,9 +730,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). + + This file is available in two different locations. + +-* ``/lib/cmake/llvm/LLVMConfig.cmake`` where +- ```` is the install prefix of an installed version of LLVM. +- On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. ++* ``LLVMConfig.cmake`` where ++ ```` is the location where LLVM CMake modules are ++ installed as part of an installed version of LLVM. This is typically ++ ``cmake/llvm/`` within the lib directory. On Linux, this is typically ++ ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. + + * ``/lib/cmake/llvm/LLVMConfig.cmake`` where + ```` is the root of the LLVM build tree. **Note: this is only +diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt +index 1d5ca3ba92b0..026f5453c1da 100644 +--- a/include/llvm/CMakeLists.txt ++++ b/include/llvm/CMakeLists.txt +@@ -4,5 +4,5 @@ add_subdirectory(Support) + # If we're doing an out-of-tree build, copy a module map for generated + # header files into the build area. + if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +- configure_file(module.modulemap.build module.modulemap COPYONLY) ++ configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) + endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index 3a24d3e974e1..987d82c1bb97 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -23,6 +23,10 @@ + #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" ++#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" ++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" ++#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" ++#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" + #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" + #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 7ef7c46a2627..1f71f8b0f820 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -332,12 +332,26 @@ int main(int argc, char **argv) { + ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); + } else { + ActivePrefix = CurrentExecPrefix; +- ActiveIncludeDir = ActivePrefix + "/include"; +- SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); +- sys::fs::make_absolute(ActivePrefix, path); +- ActiveBinDir = path.str(); +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; +- ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveIncludeDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveBinDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveLibDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveCMakeDir = std::string(path.str()); ++ } + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + +diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt +index b86e4abd01a7..02ce5773f17d 100644 +--- a/tools/lto/CMakeLists.txt ++++ b/tools/lto/CMakeLists.txt +@@ -23,7 +23,7 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports) + add_llvm_library(LTO SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES} DEPENDS intrinsics_gen) + + install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h +- DESTINATION include/llvm-c ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c + COMPONENT LTO) + + if (APPLE) +diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt +index 19b606933082..27b9f71b3d79 100644 +--- a/tools/opt-viewer/CMakeLists.txt ++++ b/tools/opt-viewer/CMakeLists.txt +@@ -8,6 +8,6 @@ set (files + + foreach (file ${files}) + install(PROGRAMS ${file} +- DESTINATION share/opt-viewer ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer + COMPONENT opt-viewer) + endforeach (file) +diff --git a/tools/remarks-shlib/CMakeLists.txt b/tools/remarks-shlib/CMakeLists.txt +index e948496c603a..1f4df8a98b10 100644 +--- a/tools/remarks-shlib/CMakeLists.txt ++++ b/tools/remarks-shlib/CMakeLists.txt +@@ -11,7 +11,7 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/Remarks.exports) + add_llvm_library(Remarks SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES}) + + install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h +- DESTINATION include/llvm-c ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c + COMPONENT Remarks) + + if (APPLE) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix index 6a11ded052..581d057467 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, callPackage, wrapCCWith }: +{ lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith }: let version = "4.1.0"; @@ -15,7 +15,7 @@ in rec { clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc" + ln -s "${lib.getLib cc}/lib/clang/$clang_version/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags echo "-Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags rm $out/nix-support/add-hardening.sh @@ -31,6 +31,7 @@ in rec { lld = callPackage ./lld { inherit llvm version; src = "${src}/lld"; + buildLlvmTools = buildPackages.llvmPackages_rocm; }; llvm = callPackage ./llvm { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/lld/default.nix index a6e993bb20..ef60747b01 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/lld/default.nix @@ -1,4 +1,5 @@ { lib, stdenv +, buildLlvmTools , cmake , libxml2 , llvm @@ -13,12 +14,17 @@ stdenv.mkDerivation rec { pname = "lld"; nativeBuildInputs = [ cmake ]; - buildInputs = [ libxml2 llvm ]; - outputs = [ "out" "dev" ]; - cmakeFlags = [ "-DLLVM_MAIN_SRC_DIR=${llvm.src}" ]; + cmakeFlags = [ + "-DLLVM_MAIN_SRC_DIR=${llvm.src}" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + "-DLLVM_CONFIG_PATH=${llvm.dev}/bin/llvm-config-native" + ]; + + outputs = [ "out" "dev" ]; postInstall = '' moveToOutput include "$dev" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm/default.nix index 62559bf139..b3e8c06195 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm/default.nix @@ -9,7 +9,7 @@ , zlib , debugVersion ? false , enableManpages ? false -, enableSharedLibraries ? true +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic , version , src diff --git a/third_party/nixpkgs/pkgs/development/compilers/mono/5.nix b/third_party/nixpkgs/pkgs/development/compilers/mono/5.nix index 0ecb362acb..c49379c670 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mono/5.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mono/5.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix ({ inherit Foundation libobjc; - version = "5.20.1.27"; - sha256 = "15rpwxw642ad1na93k5nj7d2lb24f21kncr924gxr00178a9x0jy"; + version = "5.20.1.34"; + sha256 = "12vw5dkhmp1vk9l658pil8jiqirkpdsc5z8dm5mpj595yr6d94fd"; enableParallelBuilding = true; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/mrustc/bootstrap.nix b/third_party/nixpkgs/pkgs/development/compilers/mrustc/bootstrap.nix index 35e7daaf21..85b328848b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mrustc/bootstrap.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mrustc/bootstrap.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { # Use shared mrustc/minicargo/llvm instead of rebuilding them "MRUSTC=${mrustc}/bin/mrustc" "MINICARGO=${mrustc-minicargo}/bin/minicargo" - "LLVM_CONFIG=${llvm_7}/bin/llvm-config" + "LLVM_CONFIG=${llvm_7.dev}/bin/llvm-config" "RUSTC_TARGET=${rust.toRustTarget stdenv.targetPlatform}" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/15.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/15.nix index d5cf8fe06c..6430c97093 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/15.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/15.nix @@ -22,9 +22,9 @@ let sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l"; }; - nativeBuildInputs = [ pkg-config autoconf ]; + nativeBuildInputs = [ pkg-config autoconf unzip zip file which ]; buildInputs = [ - cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib + cpio perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix index 8688831cda..306130a099 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg_3, python, ruby +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby , openjdk11-bootstrap }: let @@ -19,7 +19,7 @@ let sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ]; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/pakcs/default.nix b/third_party/nixpkgs/pkgs/development/compilers/pakcs/default.nix index 98fab9eb21..e2dceaab39 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/pakcs/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/pakcs/default.nix @@ -94,7 +94,7 @@ in stdenv.mkDerivation { with dynamic web pages, prototyping embedded systems). ''; - maintainers = with maintainers; [ kkallio gnidorah ]; + maintainers = with maintainers; [ kkallio ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix b/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix index 8910d7f1e6..e9473b81f4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation ( rec { pname = "corral"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "sha256-YJZ1jGMOeZKGZaTrWO2mtR94F0voC2DXaghi0LytF7I="; + sha256 = "sha256-mQ/SxnppChZ+6PKVo5VM+QiNn94F4qJT1kQSrwXTa7k="; }; buildInputs = [ ponyc ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_45.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_45.nix index 13b1b3ef48..f499fc9e9b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_45.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_45.nix @@ -20,9 +20,9 @@ import ./default.nix { rustcVersion = "1.45.2"; rustcSha256 = "0273a1g3f59plyi1n0azf21qjzwml1yqdnj5z472crz37qggr8xp"; - llvmSharedForBuild = pkgsBuildBuild.llvm_10.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvm_10.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvm_10.override { enableSharedLibraries = true; }; + llvmSharedForBuild = pkgsBuildBuild.llvmPackages_10.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvmPackages_10.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvmPackages_10.libllvm.override { enableSharedLibraries = true; }; llvmBootstrapForDarwin = llvmPackages_5; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_51.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_51.nix index a489df471a..17fafa4c7c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_51.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_51.nix @@ -22,9 +22,9 @@ import ./default.nix { rustcVersion = "1.51.0"; rustcSha256 = "0ixqkqglv3isxbvl4ldr4byrkx692wghsz3fasy1pn5kr2prnsvs"; - llvmSharedForBuild = pkgsBuildBuild.llvm_11.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvm_11.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvm_11.override { enableSharedLibraries = true; }; + llvmSharedForBuild = pkgsBuildBuild.llvmPackages_11.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvmPackages_11.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvmPackages_11.libllvm.override { enableSharedLibraries = true; }; llvmBootstrapForDarwin = llvmPackages_11; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix index 6203eaf47b..c90f689e21 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix @@ -35,6 +35,7 @@ "armv7a" = "armv7"; "armv7l" = "armv7"; "armv6l" = "arm"; + "armv5tel" = "armv5te"; }.${cpu.name} or cpu.name; in platform.rustc.config or "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix index 315fe7c0c6..b9bccf9f16 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -88,9 +88,9 @@ in stdenv.mkDerivation rec { "${setTarget}.cxx=${cxxForTarget}" ] ++ optionals (!withBundledLLVM) [ "--enable-llvm-link-shared" - "${setBuild}.llvm-config=${llvmSharedForBuild}/bin/llvm-config" - "${setHost}.llvm-config=${llvmSharedForHost}/bin/llvm-config" - "${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config" + "${setBuild}.llvm-config=${llvmSharedForBuild.dev}/bin/llvm-config" + "${setHost}.llvm-config=${llvmSharedForHost.dev}/bin/llvm-config" + "${setTarget}.llvm-config=${llvmSharedForTarget.dev}/bin/llvm-config" ] ++ optionals (stdenv.isLinux && !stdenv.targetPlatform.isRedox) [ "--enable-profiler" # build libprofiler_builtins ] ++ optionals stdenv.buildPlatform.isMusl [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/solc/0.7.nix b/third_party/nixpkgs/pkgs/development/compilers/solc/0.7.nix deleted file mode 100644 index 99b67b5651..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/solc/0.7.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ lib, gccStdenv, fetchzip, boost, cmake, ncurses, python3, coreutils -, z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null -, cln ? null, gmp ? null -}: - -# compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin, -# general commandline tests fail at abiencoderv2_no_warning/ on clang on NixOS - -assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.6.0"; -assert cvc4Support -> cvc4 != null && cln != null && gmp != null; - -let - jsoncppVersion = "1.9.4"; - jsoncppUrl = "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncppVersion}.tar.gz"; - jsoncpp = fetchzip { - url = jsoncppUrl; - sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"; - }; -in -gccStdenv.mkDerivation rec { - - pname = "solc"; - version = "0.7.4"; - - # upstream suggests avoid using archive generated by github - src = fetchzip { - url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - sha256 = "02261l54jdbvxk612z7zsyvmchy1rx4lf27b3f616sd7r56krpkg"; - }; - - postPatch = '' - substituteInPlace cmake/jsoncpp.cmake \ - --replace "${jsoncppUrl}" ${jsoncpp} - ''; - - cmakeFlags = [ - "-DBoost_USE_STATIC_LIBS=OFF" - ] ++ lib.optionals (!z3Support) [ - "-DUSE_Z3=OFF" - ] ++ lib.optionals (!cvc4Support) [ - "-DUSE_CVC4=OFF" - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ] - ++ lib.optionals z3Support [ z3 ] - ++ lib.optionals cvc4Support [ cvc4 cln gmp ]; - checkInputs = [ ncurses python3 ]; - - # Test fails on darwin for unclear reason - doCheck = gccStdenv.hostPlatform.isLinux; - - checkPhase = '' - while IFS= read -r -d ''' dir - do - LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/$dir - export LD_LIBRARY_PATH - done < <(find . -type d -print0) - - pushd .. - # IPC tests need aleth avaliable, so we disable it - sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh - for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh; do - patchShebangs "$i" - done - TERM=xterm ./scripts/tests.sh - popd - ''; - - meta = with lib; { - description = "Compiler for Ethereum smart contract language Solidity"; - homepage = "https://github.com/ethereum/solidity"; - license = licenses.gpl3; - platforms = with platforms; linux; # darwin is currently broken - maintainers = with maintainers; [ dbrock akru lionello sifmelcara ]; - inherit version; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix index c8f0c50d8a..c01cc761e8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix @@ -7,7 +7,7 @@ , python3 , z3Support ? true , z3 ? null -, cvc4Support ? true +, cvc4Support ? gccStdenv.isLinux , cvc4 ? null , cln ? null , gmp ? null @@ -98,7 +98,6 @@ let description = "Compiler for Ethereum smart contract language Solidity"; homepage = "https://github.com/ethereum/solidity"; license = licenses.gpl3; - platforms = with platforms; linux; # darwin is currently broken maintainers = with maintainers; [ dbrock akru lionello sifmelcara ]; inherit version; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix b/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix index 324e0b07ad..e4549a7d65 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchFromGitHub , cmake +, pkg-config , lit , llvm_8 @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0hxalc3fkliqs61hpr97phbm3qsx4b8vgnlg30aimzr6aas403r5"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ pkg-config cmake llvm_8.dev ]; buildInputs = [ llvm_8 ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix index addf641380..cb4cf580a0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { # Add the packInstall path to the swipl pack search path postPatch = '' - echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> /build/$sourceRoot/boot/init.pl + echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> boot/init.pl ''; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix index b56f509b31..0c00222791 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -40,6 +40,8 @@ let "0.50" = ./disable-graphviz-0.46.1.patch; + "0.52" = ./disable-graphviz-0.46.1.patch; + }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz; @@ -88,7 +90,7 @@ let # Wait for PR #59372 # passthru = { - # updateScript = gnome3.updateScript { + # updateScript = gnome.updateScript { # attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; # packageName = pname; # }; @@ -99,7 +101,7 @@ let homepage = "https://wiki.gnome.org/Projects/Vala"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg worldofpeace ]; + maintainers = with maintainers; [ antono jtojnar peterhoeg ]; }; }); @@ -125,8 +127,8 @@ in rec { }; vala_0_48 = generic { - version = "0.48.14"; - sha256 = "0iz3zzimmk5wxvy5bi75v8ckv153gjrz3r5iqvl8xqackzi7v9fw"; + version = "0.48.17"; + sha256 = "1wlb4vd7k6hg10s09npglbhfcgjzxkywd4v0l96qhn19m9b8cszj"; }; vala_0_50 = generic { @@ -134,5 +136,10 @@ in rec { sha256 = "1353j852h04d1x6b4n6lbg3ay40ph0adb9yi25dh74pligx33z2q"; }; - vala = vala_0_48; + vala_0_52 = generic { + version = "0.52.2"; + sha256 = "sha256-OjxGCAO6Zh5RO+PQmEtYPgVHP2AsdfqY6RdVUDcUqXs="; + }; + + vala = vala_0_52; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/z88dk/default.nix b/third_party/nixpkgs/pkgs/development/compilers/z88dk/default.nix index 026a205cd2..b825af6a20 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/z88dk/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/z88dk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z88dk"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "z88dk"; repo = "z88dk"; rev = "v${version}"; - sha256 = "14r9bjw6lgz85a59a4ajspvg12swiqxi17zicl8r7p29pi9lsibp"; + sha256 = "sha256-NgO8rbM31IX4nrJRU0p1DUafHPagMQepKLLoOLuGlT8="; fetchSubmodules = true; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { makeFlags = [ "git_rev=${short_rev}" "version=${version}" - "prefix=$(out)" + "DESTDIR=$(out)" "git_count=0" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/zig/default.nix b/third_party/nixpkgs/pkgs/development/compilers/zig/default.nix index bd96010e8b..399cb62ba3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zig/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zig/default.nix @@ -1,24 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, llvmPackages +, libxml2 +, zlib +}: llvmPackages.stdenv.mkDerivation rec { - version = "0.7.1"; pname = "zig"; + version = "0.7.1"; src = fetchFromGitHub { owner = "ziglang"; repo = pname; rev = version; - sha256 = "1z6c4ym9jmga46cw2arn7zv2drcpmrf3vw139gscxp27n7q2z5md"; + hash = "sha256-rZYv8LFH3M70SyPwPVyul+Um9j82K8GZIepVmaonzPw="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake llvmPackages.llvm.dev + ]; buildInputs = [ - llvmPackages.clang-unwrapped - llvmPackages.llvm - llvmPackages.lld libxml2 zlib - ]; + ] ++ (with llvmPackages; [ + libclang + lld + llvm + ]); preBuild = '' export HOME=$TMPDIR; @@ -33,12 +43,12 @@ llvmPackages.stdenv.mkDerivation rec { doCheck = true; meta = with lib; { + homepage = "https://ziglang.org/"; description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; - homepage = "https://ziglang.org/"; license = licenses.mit; + maintainers = with maintainers; [ andrewrk AndersonTorres ]; platforms = platforms.unix; - maintainers = [ maintainers.andrewrk ]; # See https://github.com/NixOS/nixpkgs/issues/86299 broken = stdenv.isDarwin; }; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix index 4c5b6a4f6a..4673834343 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix @@ -5,11 +5,13 @@ with lib; mkCoqDerivation { owner = "fblanqui"; inherit version; defaultVersion = with versions; switch coq.coq-version [ + {case = range "8.12" "8.13"; out = "1.8.1"; } {case = range "8.10" "8.11"; out = "1.7.0"; } {case = range "8.8" "8.9"; out = "1.6.0"; } {case = range "8.6" "8.7"; out = "1.4.0"; } ] null; + release."1.8.1".sha256 = "0knhca9fffmyldn4q16h9265i7ih0h4jhcarq4rkn0wnn7x8w8yw"; release."1.7.0".rev = "08b5481ed6ea1a5d2c4c068b62156f5be6d82b40"; release."1.7.0".sha256 = "1w7fmcpf0691gcwq00lm788k4ijlwz3667zj40j5jjc8j8hj7cq3"; release."1.6.0".rev = "328aa06270584b578edc0d2925e773cced4f14c8"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/VST/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/VST/default.nix index af560ec49a..ad5caec949 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/VST/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/VST/default.nix @@ -7,7 +7,11 @@ with lib; mkCoqDerivation { owner = "PrincetonUniversity"; repo = "VST"; inherit version; - defaultVersion = if coq.coq-version == "8.11" then "2.6" else null; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.12" "8.13"; out = "2.7.1"; } + { case = "8.11"; out = "2.6"; } + ] null; + release."2.7.1".sha256 = "1674j7bkvihiv19vizm99dp6gj3lryb00zx6a87jz214f3ydcvnj"; release."2.6".sha256 = "00bf9hl4pvmsqa08lzjs1mrxyfgfxq4k6778pnldmc8ichm90jgk"; releaseRev = v: "v${v}"; propagatedBuildInputs = [ compcert ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix new file mode 100644 index 0000000000..445a042244 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix @@ -0,0 +1,46 @@ +{ lib, mkCoqDerivation, coq, version ? null }: +with lib; + +mkCoqDerivation { + pname = "aac-tactics"; + + releaseRev = v: "v${v}"; + + release."8.13.0".sha256 = "sha256-MAnMc4KzC551JInrRcfKED4nz04FO0GyyyuDVRmnYTY="; + release."8.12.0".sha256 = "sha256-dPNA19kZo/2t3rbyX/R5yfGcaEfMhbm9bo71Uo4ZwoM="; + release."8.11.0".sha256 = "sha256-CKKMiJLltIb38u+ZKwfQh/NlxYawkafp+okY34cGCYU="; + release."8.10.0".sha256 = "sha256-Ny3AgfLAzrz3FnoUqejXLApW+krlkHBmYlo3gAG0JsM="; + release."8.9.0".sha256 = "sha256-6Pp0dgYEnVaSnkJR/2Cawt5qaxWDpBI4m0WAbQboeWY="; + release."8.8.0".sha256 = "sha256-mwIKp3kf/6i9IN3cyIWjoRtW8Yf8cc3MV744zzFM3u4="; + release."8.6.1".sha256 = "sha256-PfovQ9xJnzr0eh/tO66yJ3Yp7A5E1SQG46jLIrrbZFg="; + release."8.5.0".sha256 = "sha256-7yNxJn6CH5xS5w/zsXfcZYORa6e5/qS9v8PUq2o02h4="; + + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = "8.13"; out = "8.13.0"; } + { case = "8.12"; out = "8.12.0"; } + { case = "8.11"; out = "8.11.0"; } + { case = "8.10"; out = "8.10.0"; } + { case = "8.9"; out = "8.9.0"; } + { case = "8.8"; out = "8.8.0"; } + { case = "8.6"; out = "8.6.1"; } + { case = "8.5"; out = "8.5.0"; } + ] null; + + mlPlugin = true; + + meta = { + description = "Coq plugin providing tactics for rewriting universally quantified equations"; + longDescription = '' + This Coq plugin provides tactics for rewriting universally quantified + equations, modulo associativity and commutativity of some operator. + The tactics can be applied for custom operators by registering the + operators and their properties as type class instances. Many common + operator instances, such as for Z binary arithmetic and booleans, are + provided with the plugin. + ''; + maintainers = with maintainers; [ siraben ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/autosubst/0001-changes-to-work-with-Coq-8.6.patch b/third_party/nixpkgs/pkgs/development/coq-modules/autosubst/0001-changes-to-work-with-Coq-8.6.patch deleted file mode 100644 index dde0e2e03e..0000000000 --- a/third_party/nixpkgs/pkgs/development/coq-modules/autosubst/0001-changes-to-work-with-Coq-8.6.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 5b40a32e35fe446cda20ed34c756a010856f39ce Mon Sep 17 00:00:00 2001 -From: Theo Giannakopoulos -Date: Wed, 5 Apr 2017 15:48:55 -0400 -Subject: [PATCH] changes to work with Coq 8.6 - ---- - theories/Autosubst_Derive.v | 12 ++++++++++++ - theories/Autosubst_MMap.v | 3 ++- - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/theories/Autosubst_Derive.v b/theories/Autosubst_Derive.v -index 61995de..cf87f67 100644 ---- a/theories/Autosubst_Derive.v -+++ b/theories/Autosubst_Derive.v -@@ -18,6 +18,7 @@ Hint Extern 0 (Ids _) => derive_Ids : derive. - - Ltac derive_Rename := - match goal with [ |- Rename ?term ] => -+ let inst := fresh "inst" in - hnf; fix inst 2; change _ with (Rename term) in inst; - intros xi s; change (annot term s); destruct s; - match goal with -@@ -66,6 +67,7 @@ Ltac has_var s := - Ltac derive_Subst := - match goal with [ |- Subst ?term ] => - require_instance (Rename term); -+ let inst := fresh "inst" in - hnf; fix inst 2; change _ with (Subst term) in inst; - intros sigma s; change (annot term s); destruct s; - match goal with -@@ -107,6 +109,7 @@ Hint Extern 0 (Subst _) => derive_Subst : derive. - Ltac derive_HSubst := - match goal with [ |- HSubst ?inner ?outer ] => - require_instance (Subst inner); -+ let inst := fresh "inst" in - hnf; fix inst 2; change _ with (HSubst inner outer) in inst; - intros sigma s; change (annot outer s); destruct s; - match goal with -@@ -327,6 +330,7 @@ Ltac derive_SubstLemmas := - assert (up_upren_n : - forall xi n, upn n (ren xi) = ren (iterate upren n xi)) by - (apply up_upren_n_internal, up_upren); -+ let ih := fresh "ih" in - fix ih 2; intros xi s; destruct s; try reflexivity; simpl; f_equal; - try apply mmap_ext; intros; rewrite ?up_upren, ?up_upren_n; apply ih); - -@@ -337,6 +341,7 @@ Ltac derive_SubstLemmas := - (apply up_id_internal; reflexivity); - assert (up_id_n : forall n, upn n ids = ids) by - (apply up_id_n_internal, up_id); -+ let ih := fresh "ih" in - fix ih 1; intros s; destruct s; simpl; f_equal; try reflexivity; - rewrite ?up_id, ?up_id_n; try apply mmap_id_ext; intros; apply ih); - -@@ -344,6 +349,7 @@ Ltac derive_SubstLemmas := - - assert (ren_subst_comp : - forall xi sigma (s : term), (rename xi s).[sigma] = s.[xi >>> sigma]) by( -+ let ih := fresh "ih" in - fix ih 3; intros xi sigma s; destruct s; try reflexivity; simpl; f_equal; - rewrite ?up_comp_ren_subst, ?up_comp_ren_subst_n, ?mmap_comp; - try apply mmap_ext; intros; apply ih); -@@ -357,6 +363,7 @@ Ltac derive_SubstLemmas := - assert (up_comp_subst_ren_n : - forall sigma xi n, upn n (sigma >>> rename xi) = upn n sigma >>> rename (iterate upren n xi)) - by (apply up_comp_subst_ren_n_internal; apply up_comp_subst_ren); -+ let ih := fresh "ih" in - fix ih 3; intros sigma xi s; destruct s; try reflexivity; simpl; - f_equal; rewrite ?up_comp_subst_ren, ?up_comp_subst_ren_n, ?mmap_comp; - try (rewrite hcomp_ren_internal; [|apply rename_subst]); -@@ -368,6 +375,7 @@ Ltac derive_SubstLemmas := - by (apply up_comp_internal; [reflexivity|apply ren_subst_comp|apply subst_ren_comp]); - assert (up_comp_n : forall sigma tau n, upn n (sigma >> tau) = upn n sigma >> upn n tau) - by (apply up_comp_n_internal; apply up_comp); -+ let ih := fresh "ih" in - fix ih 3; intros sigma tau s; destruct s; try reflexivity; simpl; f_equal; - rewrite ?up_comp, ?up_comp_n, ?mmap_comp, ?hcomp_dist_internal; - try apply mmap_ext; intros; apply ih); -@@ -382,6 +390,7 @@ Ltac derive_HSubstLemmas := - let ids := constr:(ids : var -> inner) in - - assert (hsubst_id : forall (s : outer), s.|[ids] = s) by ( -+ let ih := fresh "ih" in - fix ih 1; intros s; destruct s; try reflexivity; simpl; f_equal; - rewrite ?up_id, ?up_id_n; try apply mmap_id_ext; intros; - (apply subst_id || apply ih) -@@ -390,6 +399,7 @@ Ltac derive_HSubstLemmas := - assert (hsubst_comp : forall (theta eta : var -> inner) (s : outer), - s.|[theta].|[eta] = s.|[theta >> eta]) - by ( -+ let ih := fresh "ih" in - fix ih 3; intros sigma tau s; destruct s; try reflexivity; simpl; f_equal; - rewrite <- ?up_comp, <- ?up_comp_n, ?mmap_comp; try apply mmap_ext; intros; - (apply subst_comp || apply ih) -@@ -405,6 +415,7 @@ Ltac derive_SubstHSubstComp := - assert (ren_hsubst_comp : forall xi (theta : var -> inner) (s : outer), - rename xi s.|[theta] = (rename xi s).|[theta] - ) by ( -+ let ih := fresh "ih" in - fix ih 3; intros xi theta s; destruct s; try reflexivity; simpl; f_equal; - rewrite ?mmap_comp; try apply mmap_ext; intros; simpl; apply ih - ); -@@ -421,6 +432,7 @@ Ltac derive_SubstHSubstComp := - apply up_hcomp_n_internal; apply up_hcomp - ); - -+ let ih := fresh "ih" in - fix ih 3; intros sigma tau s; destruct s; try reflexivity; simpl; f_equal; - rewrite ?up_hcomp, ?up_hcomp_n, ?hcomp_lift_n_internal, ?mmap_comp; - try apply mmap_ext; intros; apply ih -diff --git a/theories/Autosubst_MMap.v b/theories/Autosubst_MMap.v -index f8387e7..7af7902 100644 ---- a/theories/Autosubst_MMap.v -+++ b/theories/Autosubst_MMap.v -@@ -23,7 +23,7 @@ Arguments mmap {A B _} f !s /. - Class MMapExt (A B : Type) `{MMap A B} := - mmap_ext : forall f g, - (forall t, f t = g t) -> forall s, mmap f s = mmap g s. --Arguments mmap_ext {A B _ _ f g} H s. -+Arguments mmap_ext {A B H' _ f g} H s : rename. - - Class MMapLemmas (A B : Type) `{MMap A B} := { - mmap_id x : mmap id x = x; -@@ -123,6 +123,7 @@ Tactic Notation "msimpl" "in" "*" := (in_all msimplH); msimpl. - - Ltac derive_MMap := - hnf; match goal with [ |- (?A -> ?A) -> ?B -> ?B ] => -+ let map := fresh "map" in - intros f; fix map 1; intros xs; change (annot B xs); destruct xs; - match goal with - | [ |- annot _ ?ys ] => --- -2.13.2 - diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix index b2609d5dfc..a5f7cbb2f0 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix @@ -1,22 +1,23 @@ -{ lib, mkCoqDerivation, coq, mathcomp, version ? null }: +{ lib, mkCoqDerivation, coq, mathcomp-ssreflect, version ? null }: +with lib; + +mkCoqDerivation { + pname = "autosubst"; + + release."1.7".rev = "v1.7"; + release."1.7".sha256 = "sha256-qoyteQ5W2Noxf12uACOVeHhPLvgmTzrvEo6Ts+FKTGI="; -with lib; mkCoqDerivation { - pname = "autosubst"; - owner = "uds-psl"; inherit version; - defaultVersion = with versions; - if range "8.5" "8.7" coq.coq-version then "5b40a32e" else null; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.10"; out = "1.7"; } + ] null; - release."5b40a32e".rev = "1c3bb3bbf5477e3b33533a0fc090399f45fe3034"; - release."5b40a32e".sha256 = "1wqfzc9az85fvx71xxfii502jgc3mp0r3xwfb8vnb03vkk625ln0"; - - propagatedBuildInputs = [ mathcomp.ssreflect ]; - - patches = [./0001-changes-to-work-with-Coq-8.6.patch]; + propagatedBuildInputs = [ mathcomp-ssreflect ]; meta = { homepage = "https://www.ps.uni-saarland.de/autosubst/"; description = "Automation for de Bruijn syntax and substitution in Coq"; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with maintainers; [ siraben jwiegley ]; + license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix index 79db146107..d738041d5d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix @@ -6,7 +6,7 @@ with lib; mkCoqDerivation { owner = "thery"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = "8.12"; out = "8.12"; } + { case = range "8.12" "8.13"; out = "8.12"; } { case = range "8.10" "8.11"; out = "8.10"; } { case = range "8.8" "8.9"; out = "8.8"; } { case = "8.7"; out = "8.7.2"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/goedel/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/goedel/default.nix new file mode 100644 index 0000000000..f6ed9491e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/goedel/default.nix @@ -0,0 +1,24 @@ +{ lib, mkCoqDerivation, coq, hydra-battles, pocklington, version ? null }: +with lib; + +mkCoqDerivation { + pname = "goedel"; + owner = "coq-community"; + + release."8.12.0".rev = "v8.12.0"; + release."8.12.0".sha256 = "sha256-4lAwWFHGUzPcfHI9u5b+N+7mQ0sLJ8bH8beqQubfFEQ="; + + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.11"; out = "8.12.0"; } + ] null; + + propagatedBuildInputs = [ hydra-battles pocklington ]; + + meta = { + description = "The Gödel-Rosser 1st incompleteness theorem in Coq"; + maintainers = with maintainers; [ siraben ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/hydra-battles/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/hydra-battles/default.nix new file mode 100644 index 0000000000..a74eec4b64 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/hydra-battles/default.nix @@ -0,0 +1,29 @@ +{ lib, mkCoqDerivation, coq, mathcomp, equations, paramcoq, version ? null }: +with lib; + +mkCoqDerivation { + pname = "hydra-battles"; + owner = "coq-community"; + + release."0.3".rev = "v0.3"; + release."0.3".sha256 = "sha256-rXP/vJqVEg2tN/I9LWV13YQ1+C7M6lzGu3oI+7pSZzg="; + + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.11"; out = "0.3"; } + ] null; + + propagatedBuildInputs = [ mathcomp equations paramcoq ]; + + meta = { + description = "Variations on Kirby & Paris' hydra battles and other entertaining math in Coq"; + longDescription = '' + Variations on Kirby & Paris' hydra battles and other + entertaining math in Coq (collaborative, documented, includes + exercises) + ''; + maintainers = with maintainers; [ siraben ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix index 8671eba672..cdb9045236 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix @@ -1,6 +1,4 @@ -{ lib, mkCoqDerivation, which, autoconf -, coq, coquelicot, flocq, mathcomp -, bignums ? null, version ? null }: +{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, bignums ? null, version ? null }: with lib; mkCoqDerivation { pname = "interval"; @@ -8,12 +6,12 @@ with lib; mkCoqDerivation { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.8" ; out = "4.1.0"; } + { case = isGe "8.8" ; out = "4.1.1"; } { case = range "8.8" "8.12"; out = "4.0.0"; } { case = range "8.7" "8.11"; out = "3.4.2"; } { case = range "8.5" "8.6"; out = "3.3.0"; } ] null; - release."4.1.0".sha256 = "1jv27n5c4f3a9d8sizraa920iqi35x8cik8lm7pjp1dkiifz47nb"; + release."4.1.1".sha256 = "sha256-h2NJ6sZt1C/88v7W2xyuftEDoyRt3H6kqm5g2hc1aoU="; release."4.0.0".sha256 = "1hhih6zmid610l6c8z3x4yzdzw9jniyjiknd1vpkyb2rxvqm3gzp"; release."3.4.2".sha256 = "07ngix32qarl3pjnm9d0vqc9fdrgm08gy7zp306hwxjyq7h1v7z0"; release."3.3.0".sha256 = "0lz2hgggzn4cvklvm8rpaxvwaryf37i8mzqajqgdxdbd8f12acsz"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix new file mode 100644 index 0000000000..65af999d08 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -0,0 +1,22 @@ +{ lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }: + +with lib; mkCoqDerivation rec { + pname = "mathcomp-zify"; + repo = "mczify"; + owner = "math-comp"; + inherit version; + + defaultVersion = with versions; + switch [ coq.coq-version mathcomp-algebra.version ] [ + { cases = [ (isEq "8.13") (isEq "1.12") ]; out = "1.0.0+1.12+8.13"; } + ] null; + + release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k"; + + propagatedBuildInputs = [ mathcomp-algebra ]; + + meta = { + description = "Micromega tactics for Mathematical Components"; + maintainers = with maintainers; [ cohencyril ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/metalib/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/metalib/default.nix index 3ce3c625d2..14f1bab574 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/metalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/metalib/default.nix @@ -4,7 +4,7 @@ with lib; mkCoqDerivation { pname = "metalib"; owner = "plclub"; inherit version; - defaultVersion = if versions.range "8.10" "8.12" coq.coq-version then "20200527" else null; + defaultVersion = if versions.range "8.10" "8.13" coq.coq-version then "20200527" else null; release."20200527".rev = "597fd7d0c93eb159274e84a39d554f10f1efccf8"; release."20200527".sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/pocklington/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/pocklington/default.nix new file mode 100644 index 0000000000..111bffeca2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/pocklington/default.nix @@ -0,0 +1,22 @@ +{ lib, mkCoqDerivation, coq, version ? null }: +with lib; + +mkCoqDerivation { + pname = "pocklington"; + owner = "coq-community"; + + release."8.12.0".rev = "v8.12.0"; + release."8.12.0".sha256 = "sha256-0xBrw9+4g14niYdNqp0nx00fPJoSSnaDSDEaIVpPfjs="; + + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.7"; out = "8.12.0"; } + ] null; + + meta = { + description = "Pocklington's criterion for primality in Coq"; + maintainers = with maintainers; [ siraben ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/relation-algebra/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/relation-algebra/default.nix new file mode 100644 index 0000000000..da74215d53 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/relation-algebra/default.nix @@ -0,0 +1,35 @@ +{ lib, mkCoqDerivation, coq, aac-tactics, mathcomp, version ? null }: +with lib; + +mkCoqDerivation { + pname = "relation-algebra"; + owner = "damien-pous"; + + releaseRev = v: "v${v}"; + + release."1.7.5".sha256 = "sha256-XdO8agoJmNXPv8Ho+KTlLCB4oRlQsb0w06aM9M16ZBU="; + release."1.7.4".sha256 = "sha256-o+v2CIAa2+9tJ/V8DneDTf4k31KMHycgMBLaQ+A4ufM="; + release."1.7.3".sha256 = "sha256-4feSNfi7h4Yhwn5L+9KP9K1S7HCPvsvaVWwoQSTFvos="; + release."1.7.2".sha256 = "sha256-f4oNjXspNMEz3AvhIeYO3avbUa1AThoC9DbcHMb5A2o="; + release."1.7.1".sha256 = "sha256-WWVMcR6z8rT4wzZPb8SlaVWGe7NC8gScPqawd7bltQA="; + + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.13"; out = "1.7.5"; } + { case = isGe "8.12"; out = "1.7.4"; } + { case = isGe "8.11"; out = "1.7.3"; } + { case = isGe "8.10"; out = "1.7.2"; } + { case = isGe "8.9"; out = "1.7.1"; } + ] null; + + mlPlugin = true; + + propagatedBuildInputs = [ aac-tactics mathcomp.ssreflect ]; + + meta = { + description = "Relation algebra library for Coq"; + maintainers = with maintainers; [ siraben ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/create_deps.sh b/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/create_deps.sh index f3cdcbc0c1..37f0585d1f 100755 --- a/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/create_deps.sh +++ b/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/create_deps.sh @@ -4,6 +4,8 @@ # Run this script to generate deps.nix # ./create_deps.sh /path/to/microsoft/python/language/server/source/checkout +set -euo pipefail + SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" if [ -d "$1" ]; then @@ -14,13 +16,13 @@ else fi # Generate lockfiles in source checkout -cd $CHECKOUT_PATH/src +cd "$CHECKOUT_PATH/src" dotnet nuget locals all --clear dotnet restore -v normal --no-cache PLS.sln --use-lock-file -r linux-x64 # Use the lockfiles to make a file with two columns: name and version number # for all possible package dependencies -cd $SCRIPTDIR +cd "$SCRIPTDIR" echo "" > all_versions.txt for lockfile in $(find "$CHECKOUT_PATH" -name packages.lock.json); do echo "Processing lockfile $lockfile" diff --git a/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/default.nix b/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/default.nix index 526e93f84c..6502890af2 100644 --- a/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/default.nix @@ -11,7 +11,7 @@ let deps = import ./deps.nix { inherit fetchurl; }; - version = "2020-06-19"; + version = "2020-10-08"; # Build the nuget source needed for the later build all by itself # since it's a time-consuming step that only depends on ./deps.nix. @@ -49,8 +49,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "microsoft"; repo = "python-language-server"; - rev = "838ba78e00173d639bd90f54d8610ec16b4ba3a2"; - sha256 = "0nj8l1apcb67gqwy5i49v0f01fs4lvdfmmp4w2hvrpss9if62c1m"; + rev = "76a29da373a4bb1e81b052f25802f3ca872d0a67"; + sha256 = "16jb90lacdrhi4dpp084bqzx351mv23f4mhl4lz5h6rkfzj5jxgg"; }; buildInputs = [dotnet-sdk_3 openssl icu]; @@ -62,6 +62,8 @@ stdenv.mkDerivation { ]; buildPhase = '' + runHook preBuild + mkdir home export HOME=$(mktemp -d) export DOTNET_CLI_TELEMETRY_OPTOUT=1 @@ -75,14 +77,20 @@ stdenv.mkDerivation { pushd src/LanguageServer/Impl dotnet publish --no-restore -c Release -r linux-x64 popd + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out cp -r output/bin/Release/linux-x64/publish $out/lib mkdir $out/bin makeWrapper $out/lib/Microsoft.Python.LanguageServer $out/bin/python-language-server + + runHook postInstall ''; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/deps.nix b/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/deps.nix index 6a494e7e52..899f38d256 100644 --- a/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/deps.nix +++ b/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/deps.nix @@ -46,18 +46,6 @@ in [ sha256 = "190d755l60j3l5m1661wj19gj9w6ngza56q3vkijkkmbbabdmqln"; }) - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Ref"; - version = "3.0.1"; - sha256 = "0k2ry757qhm99xwm0wh4zalxn9nmxhfswd184z1fjr42szr511fb"; - }) - - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.0.3"; - sha256 = "1jcqy8i9fzb1pmkazi80yqr09zi5nk30n57i46ggr5ky45jngfq9"; - }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.8"; @@ -72,8 +60,8 @@ in [ (fetchNuGet { name = "Microsoft.CodeCoverage"; - version = "16.5.0"; - sha256 = "0610wzn4qyywf9lb4538vwqhprxc4g0g7gjbmnjzvx97jr5nd5mf"; + version = "16.7.1"; + sha256 = "1farw63445cdyciplfs6l9j1gayxw16rkzmrwsiswfyjhqz70xd4"; }) (fetchNuGet { @@ -84,38 +72,8 @@ in [ (fetchNuGet { name = "Microsoft.Extensions.FileSystemGlobbing"; - version = "3.1.2"; - sha256 = "1zwvzp0607irs7irfbq8vnclg5nj2jpyggw9agm4a32la5ngg27m"; - }) - - (fetchNuGet { - name = "Microsoft.NetCore.App.Host.linux-x64"; - version = "3.0.3"; - sha256 = "19igfvwsjzwkh90gqzabl6pdkyygslj2iwpsxg680phffzr411w4"; - }) - - (fetchNuGet { - name = "Microsoft.NetCore.App.Host.linux-x64"; version = "3.1.8"; - sha256 = "0iawz5mqaf1c4r5cf0ks4wqhgpbqi185l80q4909axh516xsjnvs"; - }) - - (fetchNuGet { - name = "Microsoft.NetCore.App.Ref"; - version = "3.0.0"; - sha256 = "1qi382157ln7yngazvr3nskpjkab4x8sqx11l13xyg56vyyjyyiw"; - }) - - (fetchNuGet { - name = "Microsoft.NetCore.App.Ref"; - version = "3.1.0"; - sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; - }) - - (fetchNuGet { - name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.0.3"; - sha256 = "1ykgfnphbkyck0gqbbh5n96w59z2bq47g896ygal1j4nblj3s44v"; + sha256 = "1v2lr0vbssqayzgxvdwb54jmvz7mvlih4l9h7i71gm3c62nlbq8y"; }) (fetchNuGet { @@ -138,8 +96,8 @@ in [ (fetchNuGet { name = "Microsoft.NETCore.Platforms"; - version = "2.0.0"; - sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; + version = "3.0.0"; + sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; }) (fetchNuGet { @@ -156,44 +114,38 @@ in [ (fetchNuGet { name = "Microsoft.NET.Test.Sdk"; - version = "16.5.0"; - sha256 = "19f5bvzci5mmfz81jwc4dax4qdf7w4k67n263383mn8mawf22bfq"; + version = "16.7.1"; + sha256 = "0yqxipj74ax2n76w9ccydppx78ym8m5fda88qnvj4670qjvl0kf8"; }) (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; - version = "16.5.0"; - sha256 = "02h7j1fr0fwcggn0wgddh59k8b2wmly3snckwhswzqvks5rvfnnw"; + version = "16.7.1"; + sha256 = "0s9dyh99gzdpk1i5v468i2r9m6i3jrr41r394pwdwiajsz99kay0"; }) (fetchNuGet { name = "Microsoft.TestPlatform.TestHost"; - version = "16.5.0"; - sha256 = "08cvss66lqa92h55dxkbrzn796jckhlyj53zz22x3qyr6xi21v5v"; + version = "16.7.1"; + sha256 = "1xik06rxn9ps83in0zn9vcl2ibv3acmdqvrx07qq89lxj1sgqlhs"; }) (fetchNuGet { name = "Microsoft.VisualStudio.Threading"; - version = "16.4.33"; - sha256 = "09djx2xz22w48csd0bkpwi1rgpjpaj3mml16wfy8jlsnc66swmnh"; + version = "16.5.132"; + sha256 = "05lngndl6hg4v3vk9l1n1g2lbfjb7jnr5dnkjld9wx3vamdfcfxw"; }) (fetchNuGet { name = "Microsoft.VisualStudio.Threading"; - version = "16.4.45"; - sha256 = "16p61kxsnwanp3nac0gkarl7a94c02qyqjzdkijl5va9k3fa97m6"; + version = "16.6.13"; + sha256 = "0qbvcwy7njz5zpqgfqdf41gf9xqcz64z4rkfjf6bi4zynpkv6n1l"; }) (fetchNuGet { name = "Microsoft.VisualStudio.Threading.Analyzers"; - version = "16.4.45"; - sha256 = "12m0f037pz3ynm69810p4c96nrlnqihx6w4qyrs0kqsxiajf16jc"; - }) - - (fetchNuGet { - name = "Microsoft.VisualStudio.Validation"; - version = "15.3.15"; - sha256 = "1v3r2rlichlvxjrmj1grii1blnl9lp9npg2p6q3q4j6lamskxa9r"; + version = "16.6.13"; + sha256 = "09nqkjnarwj0chb6xrzscq98mpgi86n2a3mfdd3y695kviq99s18"; }) (fetchNuGet { @@ -210,8 +162,8 @@ in [ (fetchNuGet { name = "Microsoft.Win32.Registry"; - version = "4.5.0"; - sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; + version = "4.6.0"; + sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; }) (fetchNuGet { @@ -222,20 +174,20 @@ in [ (fetchNuGet { name = "MSTest.TestAdapter"; - version = "2.1.0"; - sha256 = "1g1v8yjnk4nr1c36k3cz116889bnpiw1i1jkmqnpb19wms7sq7cz"; + version = "2.1.2"; + sha256 = "1390nyc0sf5c4j75cq58bzqjcw77sp2lmpllmm5sp8ysi0fjyfs5"; }) (fetchNuGet { name = "MSTest.TestFramework"; - version = "2.1.0"; - sha256 = "0mac4h7ylw953chclhz0lrn19yks3bab9dn9x9fpjqi7309gid0p"; + version = "2.1.2"; + sha256 = "1617q2accpa8fwy9n1snmjxyx2fz3phks62mdi45cl65kdin0x4z"; }) (fetchNuGet { name = "Nerdbank.Streams"; - version = "2.4.60"; - sha256 = "01554nbs6dj4fjd59b95kaw84j27kfb5y5ixjbl23nh62kpgrd3r"; + version = "2.5.76"; + sha256 = "017h8m1zrm247alhlz4vqsz580b8b88s50cyxb939hmc2nn0qlfv"; }) (fetchNuGet { @@ -276,8 +228,8 @@ in [ (fetchNuGet { name = "NSubstitute"; - version = "4.2.1"; - sha256 = "0wgfjh032qds994fmgxvsg88nhgjrx7p9rnv6z678jm62qi14asy"; + version = "4.2.2"; + sha256 = "1zi1z5i61c2nq8p3jwbkca28yaannrvv6g6q5mmz1775apmfyh79"; }) (fetchNuGet { @@ -600,8 +552,8 @@ in [ (fetchNuGet { name = "StreamJsonRpc"; - version = "2.3.103"; - sha256 = "0z8ahxkbbrzsn56ylzlciriiid4bslf6y1rk49wzahwpvzlik1iw"; + version = "2.5.46"; + sha256 = "0rsgxfxcfgbx1w2jhllx1cwnbj9vra6034gv4kgzahh0v5vn8shf"; }) (fetchNuGet { @@ -804,14 +756,8 @@ in [ (fetchNuGet { name = "System.IO.Pipelines"; - version = "4.5.3"; - sha256 = "1z44vn1qp866lkx78cfqdd4vs7xn1hcfn7in6239sq2kgf5qiafb"; - }) - - (fetchNuGet { - name = "System.IO.Pipelines"; - version = "4.6.0"; - sha256 = "0r9ygjbxpyi6jgb67qnpbp42b7yvvhgmcjxnb50k3lb416claavh"; + version = "4.7.0"; + sha256 = "1cx6bl2bhzp30ahy2csnwbphmlwwp840j56wgab105xc32la0mg4"; }) (fetchNuGet { @@ -1080,8 +1026,8 @@ in [ (fetchNuGet { name = "System.Security.AccessControl"; - version = "4.5.0"; - sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; + version = "4.6.0"; + sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf"; }) (fetchNuGet { @@ -1146,8 +1092,8 @@ in [ (fetchNuGet { name = "System.Security.Principal.Windows"; - version = "4.5.0"; - sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; + version = "4.6.0"; + sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm"; }) (fetchNuGet { diff --git a/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt b/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt index 169ddfbb7b..ec49eee7e9 100644 --- a/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt +++ b/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt @@ -1,14 +1,2 @@ -Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.3 -Microsoft.AspNetCore.App.Ref 3.0.1 -Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.2 -Microsoft.AspNetCore.App.Runtime.linux-x64 3.0.3 -Microsoft.AspNetCore.App.Runtime.linux-x64 3.0.2 -Microsoft.NetCore.App.Ref 3.1.0 -Microsoft.NetCore.App.Ref 3.0.0 -Microsoft.NetCore.App.Runtime.linux-x64 3.1.3 -Microsoft.NetCore.App.Runtime.linux-x64 3.1.2 -Microsoft.NetCore.App.Runtime.linux-x64 3.0.2 -Microsoft.NetCore.App.Runtime.linux-x64 3.0.3 -Microsoft.NetCore.App.Host.linux-x64 3.1.3 -Microsoft.NetCore.App.Host.linux-x64 3.0.2 -Microsoft.NetCore.App.Host.linux-x64 3.0.3 +Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.8 +Microsoft.NetCore.App.Runtime.linux-x64 3.1.8 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix new file mode 100644 index 0000000000..1ec16eaf5e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -0,0 +1,40 @@ +# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh. +{ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal +, containers, deepseq, directory, distribution-nixpkgs, fetchzip +, filepath, hackage-db, hopenssl, hpack, language-nix, lens, lib +, monad-par, monad-par-extras, mtl, optparse-applicative, pretty +, process, split, tasty, tasty-golden, text, time, transformers +, yaml +}: +mkDerivation { + pname = "cabal2nix"; + version = "unstable-2021-05-06"; + src = fetchzip { + url = "https://github.com/NixOS/cabal2nix/archive/b598bc4682b0827554b5780acdd6f948d320283b.tar.gz"; + sha256 = "04afm56cyhj2l41cvq4z11k92jjchr21a8vg9pjaz438pma7jgw1"; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base bytestring Cabal containers deepseq + directory distribution-nixpkgs filepath hackage-db hopenssl hpack + language-nix lens optparse-applicative pretty process split text + time transformers yaml + ]; + executableHaskellDepends = [ + aeson base bytestring Cabal containers directory + distribution-nixpkgs filepath hopenssl language-nix lens monad-par + monad-par-extras mtl optparse-applicative pretty + ]; + testHaskellDepends = [ + base Cabal containers directory filepath language-nix lens pretty + process tasty tasty-golden + ]; + preCheck = '' + export PATH="$PWD/dist/build/cabal2nix:$PATH" + export HOME="$TMPDIR/home" + ''; + homepage = "https://github.com/nixos/cabal2nix#readme"; + description = "Convert Cabal files into Nix build instructions"; + license = lib.licenses.bsd3; +} diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-arm.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-arm.nix new file mode 100644 index 0000000000..57e71f0e00 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-arm.nix @@ -0,0 +1,96 @@ +# ARM-SPECIFIC OVERRIDES FOR THE HASKELL PACKAGE SET IN NIXPKGS +# +# This extension is applied to all haskell package sets in nixpkgs +# if `stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64` +# to apply arm specific workarounds or fixes. +# +# The file is split into three parts: +# +# * Overrides that are applied for all arm platforms +# * Overrides for aarch32 platforms +# * Overrides for aarch64 platforms +# +# This may be extended in the future to also include compiler- +# specific sections as compiler and linker related bugs may +# get fixed subsequently. +# +# When adding new overrides, try to research which section they +# belong into. Most likely we'll be favouring aarch64 overrides +# in practice since that is the only platform we can test on +# Hydra. Also take care to group overrides by the issue they +# solve, so refactors and updates to this file are less tedious. +{ pkgs, haskellLib }: + +let + inherit (pkgs) lib; +in + +with haskellLib; + +self: super: { + # COMMON ARM OVERRIDES + + # moved here from configuration-common.nix, no reason given. + servant-docs = dontCheck super.servant-docs; + swagger2 = dontHaddock (dontCheck super.swagger2); + + # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 + happy = dontCheck super.happy; + +} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 { + # AARCH64-SPECIFIC OVERRIDES + + # Doctests fail on aarch64 due to a GHCi linking bug + # https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295437 + # TODO: figure out if needed on aarch32 as well + language-nix = dontCheck super.language-nix; + trifecta = dontCheck super.trifecta; + ad = dontCheck super.ad; + vinyl = dontCheck super.vinyl; + BNFC = dontCheck super.BNFC; + C-structs = dontCheck super.C-structs; + accelerate = dontCheck super.accelerate; + focuslist = dontCheck super.focuslist; + flight-kml = dontCheck super.flight-kml; + exact-real = dontCheck super.exact-real; + autoapply = dontCheck super.autoapply; + hint = dontCheck super.hint; + hgeometry = dontCheck super.hgeometry; + headroom = dontCheck super.headroom; + haskell-time-range = dontCheck super.haskell-time-range; + hsakamai = dontCheck super.hsakamai; + hsemail-ns = dontCheck super.hsemail-ns; + openapi3 = dontCheck super.openapi3; + strict-writer = dontCheck super.strict-writer; + xml-html-qq = dontCheck super.xml-html-qq; + static = dontCheck super.static; + hhp = dontCheck super.hhp; + groupBy = dontCheck super.groupBy; + greskell = dontCheck super.greskell; + html-validator-cli = dontCheck super.html-validator-cli; + hw-fingertree-strict = dontCheck super.hw-fingertree-strict; + hw-prim = dontCheck super.hw-prim; + hw-packed-vector = dontCheck super.hw-packed-vector; + hw-xml = dontCheck super.hw-xml; + lens-regex = dontCheck super.lens-regex; + meep = dontCheck super.meep; + ranged-list = dontCheck super.ranged-list; + rank2classes = dontCheck super.rank2classes; + schedule = dontCheck super.schedule; + twiml = dontCheck super.twiml; + twitter-conduit = dontCheck super.twitter-conduit; + validationt = dontCheck super.validationt; + vgrep = dontCheck super.vgrep; + vulkan-utils = dontCheck super.vulkan-utils; + yaml-combinators = dontCheck super.yaml-combinators; + yesod-paginator = dontCheck super.yesod-paginator; + grammatical-parsers = dontCheck super.grammatical-parsers; + construct = dontCheck super.construct; + + # https://github.com/ekmett/half/issues/35 + half = dontCheck super.half; + +} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch32 { + # AARCH32-SPECIFIC OVERRIDES + +} 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 3965d4cfce..693a5b61fb 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -75,10 +75,6 @@ self: super: { # Fix test trying to access /home directory shell-conduit = overrideCabal super.shell-conduit (drv: { postPatch = "sed -i s/home/tmp/ test/Spec.hs"; - - # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo - # see: https://github.com/psibi/shell-conduit/issues/12 - doCheck = !pkgs.stdenv.isDarwin; }); # https://github.com/froozen/kademlia/issues/2 @@ -117,15 +113,6 @@ self: super: { # Jailbreak is necessary for QuickCheck dependency. vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector); - conduit-extra = if pkgs.stdenv.isDarwin - then super.conduit-extra.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; }) - else super.conduit-extra; - - # Fix Darwin build. - halive = if pkgs.stdenv.isDarwin - then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit - else super.halive; - # Test suite fails due golden tests checking text representation # of normalized dhall expressions, and newer dhall versions format # differently. @@ -134,19 +121,6 @@ self: super: { then throw "Drop dontCheck override for hpack-dhall > 0.5.2" else dontCheck super.hpack-dhall; - barbly = addBuildDepend super.barbly pkgs.darwin.apple_sdk.frameworks.AppKit; - - # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux - hakyll = if pkgs.stdenv.isDarwin - then dontCheck (overrideCabal super.hakyll (drv: { - testToolDepends = []; - })) - else super.hakyll; - - double-conversion = if !pkgs.stdenv.isDarwin - then super.double-conversion - else addExtraLibrary super.double-conversion pkgs.libcxx; - inline-c-cpp = overrideCabal super.inline-c-cpp (drv: { postPatch = (drv.postPatch or "") + '' substituteInPlace inline-c-cpp.cabal --replace "-optc-std=c++11" "" @@ -196,8 +170,41 @@ self: super: { # base bound digit = doJailbreak super.digit; - # 2020-06-05: HACK: does not pass own build suite - `dontCheck` - hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck super.hnix); + hnix = generateOptparseApplicativeCompletion "hnix" + (overrideCabal super.hnix (drv: { + # 2020-06-05: HACK: does not pass own build suite - `dontCheck` + doCheck = false; + # 2021-05-12: Revert a few dependency cleanups which depend on release + # that are not in stackage yet: + # * Depend on semialign-indexed for Data.Semialign.Indexed + # (remove when semialign >= 1.2 in stackage) + # * Readd dependencies to text and unordered-containers. + # (remove when relude >= 1.0.0.0 is in stackage, see + # https://github.com/haskell-nix/hnix/issues/933) + libraryHaskellDepends = [ + self.semialign-indexed + ] ++ drv.libraryHaskellDepends; + patches = [ + # depend on semialign-indexed again + (pkgs.fetchpatch { + url = "https://github.com/haskell-nix/hnix/commit/16fc342a4f2974f855968472252cd9274609f177.patch"; + sha256 = "0gm4gy3jpn4dqnrhnqlsavfpw9c1j1xa8002v54knnlw6vpk9niy"; + revert = true; + }) + # depend on text again + (pkgs.fetchpatch { + url = "https://github.com/haskell-nix/hnix/commit/73057618576e86bb87dfd42f62b855d24bbdf469.patch"; + sha256 = "03cyk96d5ad362i1pnz9bs8ifr84kpv8phnr628gys4j6a0bqwzc"; + revert = true; + }) + # depend on unordered-containers again + (pkgs.fetchpatch { + url = "https://github.com/haskell-nix/hnix/commit/70643481883ed448b51221a030a76026fb5eb731.patch"; + sha256 = "0pqmijfkysjixg3gb4kmrqdif7s2saz8qi6k337jf15i0npzln8d"; + revert = true; + }) + ] ++ (drv.patches or []); + })); # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -291,28 +298,20 @@ self: super: { htsn = dontCheck super.htsn; htsn-import = dontCheck super.htsn-import; http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105 - ihaskell = dontCheck super.ihaskell; influxdb = dontCheck super.influxdb; integer-roots = dontCheck super.integer-roots; # requires an old version of smallcheck, will be fixed in > 1.0 itanium-abi = dontCheck super.itanium-abi; katt = dontCheck super.katt; - language-nix = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.hostPlatform.isi686) then dontCheck super.language-nix else super.language-nix; # aarch64: https://ghc.haskell.org/trac/ghc/ticket/15275 language-slice = dontCheck super.language-slice; ldap-client = dontCheck super.ldap-client; lensref = dontCheck super.lensref; lvmrun = disableHardening (dontCheck super.lvmrun) ["format"]; - math-functions = if pkgs.stdenv.isDarwin - then dontCheck super.math-functions # "erf table" test fails on Darwin https://github.com/bos/math-functions/issues/63 - else super.math-functions; matplotlib = dontCheck super.matplotlib; # https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage matterhorn = doJailbreak super.matterhorn; # this is needed until the end of time :') memcache = dontCheck super.memcache; metrics = dontCheck super.metrics; milena = dontCheck super.milena; - mockery = if pkgs.stdenv.isDarwin - then overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; }) # darwin doesn't have sub-second resolution https://github.com/hspec/mockery/issues/11 - else super.mockery; modular-arithmetic = dontCheck super.modular-arithmetic; # tests require a very old Glob (0.7.*) nats-queue = dontCheck super.nats-queue; netpbm = dontCheck super.netpbm; @@ -362,7 +361,6 @@ self: super: { tickle = dontCheck super.tickle; tpdb = dontCheck super.tpdb; translatable-intset = dontCheck super.translatable-intset; - trifecta = if pkgs.stdenv.hostPlatform.isAarch64 then dontCheck super.trifecta else super.trifecta; # affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461 ua-parser = dontCheck super.ua-parser; unagi-chan = dontCheck super.unagi-chan; wai-logger = dontCheck super.wai-logger; @@ -454,9 +452,8 @@ self: super: { # https://github.com/andrewthad/haskell-ip/issues/67 ip = dontCheck super.ip; - # https://github.com/ndmitchell/shake/issues/206 - # https://github.com/ndmitchell/shake/issues/267 - shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin && false; }); + # https://github.com/ndmitchell/shake/issues/804 + shake = dontCheck super.shake; # https://github.com/nushio3/doctest-prop/issues/1 doctest-prop = dontCheck super.doctest-prop; @@ -831,7 +828,6 @@ self: super: { # With ghc-8.2.x haddock would time out for unknown reason # See https://github.com/haskell/haddock/issues/679 language-puppet = dontHaddock super.language-puppet; - filecache = overrideCabal super.filecache (drv: { doCheck = !pkgs.stdenv.isDarwin; }); # https://github.com/alphaHeavy/protobuf/issues/34 protobuf = dontCheck super.protobuf; @@ -842,20 +838,23 @@ self: super: { configureFlags = ["--ghc-option=-DU_DEFINE_FALSE_AND_TRUE=1"]; # https://github.com/haskell/text-icu/issues/49 }); - # aarch64 and armv7l fixes. - happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 - hashable = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 - servant-docs = - let - f = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) - then dontCheck - else pkgs.lib.id; - in doJailbreak (f super.servant-docs); # jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage. + # jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage. + servant-docs = doJailbreak super.servant-docs; snap-templates = doJailbreak super.snap-templates; # https://github.com/snapframework/snap-templates/issues/22 - swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; # hledger-lib requires the latest version of pretty-simple - hledger-lib = super.hledger-lib.override { pretty-simple = self.pretty-simple; }; + hledger-lib = appendPatch super.hledger-lib + # This patch has been merged but not released yet: + # https://github.com/simonmichael/hledger/pull/1512. It is + # important for ledger-autosync test suite: + # https://github.com/egh/ledger-autosync/issues/123 + (pkgs.fetchpatch { + name = "hledger-properly-escape-quotes-csv.patch"; + url = "https://github.com/simonmichael/hledger/commit/c9a72e1615e2ddc2824f2e248456e1042eb31e1d.patch"; + sha256 = "10knvrd5bl9nrmi27i0pm82sfr64jy04xgbjp228qywyijpr3pqv"; + includes = [ "Hledger/Read/CsvReader.hs" ]; + stripLen = 1; + }); # Copy hledger man pages from data directory into the proper place. This code # should be moved into the cabal2nix generator. @@ -944,7 +943,16 @@ self: super: { # https://github.com/commercialhaskell/stackage/issues/5795 # This issue can be mitigated with 'dontCheck' which skips the tests and their compilation. dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json); - dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" super.dhall-nix; + # dhall-nix, dhall-nixpkgs: pull updated cabal files with updated bounds. + # Remove at next hackage update. + dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" (overrideCabal super.dhall-nix { + revision = "2"; + editedCabalFile = "1w90jrkzmbv5nasafkkv0kyfmnqkngldx2lr891113h2mqbbr3wx"; + }); + dhall-nixpkgs = overrideCabal super.dhall-nixpkgs { + revision = "1"; + editedCabalFile = "1y08jxg51sbxx0i7ra45ii2v81plzf4hssmwlrw35l8n5gib1vcg"; + }; dhall-yaml = generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml; # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558 @@ -1059,9 +1067,6 @@ self: super: { # Has tasty < 1.2 requirement, but works just fine with 1.2 temporary-resourcet = doJailbreak super.temporary-resourcet; - # Requires dhall >= 1.23.0 - ats-pkg = dontCheck (super.ats-pkg.override { dhall = self.dhall_1_29_0; }); - # fake a home dir and capture generated man page ats-format = overrideCabal super.ats-format (old : { preConfigure = "export HOME=$PWD"; @@ -1090,18 +1095,6 @@ self: super: { # https://github.com/erikd/hjsmin/issues/32 hjsmin = dontCheck super.hjsmin; - nix-tools = super.nix-tools.overrideScope (self: super: { - # Needs https://github.com/peti/hackage-db/pull/9 - hackage-db = super.hackage-db.overrideAttrs (old: { - src = pkgs.fetchFromGitHub { - owner = "ElvishJerricco"; - repo = "hackage-db"; - rev = "84ca9fc75ad45a71880e938e0d93ea4bde05f5bd"; - sha256 = "0y3kw1hrxhsqmyx59sxba8npj4ya8dpgjljc21gkgdvdy9628q4c"; - }; - }); - }); - # upstream issue: https://github.com/vmchale/atspkg/issues/12 language-ats = dontCheck super.language-ats; @@ -1143,11 +1136,6 @@ self: super: { ''; }); - # gtk/gtk3 needs to be told on Darwin to use the Quartz - # rather than X11 backend (see eg https://github.com/gtk2hs/gtk2hs/issues/249). - gtk3 = appendConfigureFlags super.gtk3 (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk"); - gtk = appendConfigureFlags super.gtk (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk"); - # Chart-tests needs and compiles some modules from Chart itself Chart-tests = (addExtraLibrary super.Chart-tests self.QuickCheck).overrideAttrs (old: { preCheck = old.postPatch or "" + '' @@ -1284,15 +1272,47 @@ self: super: { # https://github.com/kowainik/policeman/issues/57 policeman = doJailbreak super.policeman; - haskell-gi-base = addBuildDepends super.haskell-gi-base [ pkgs.gobject-introspection ]; + # nixpkgs has bumped gdkpixbuf C lib, so we need gi-gdkpixbuf_2_0_26 to link against that. + # This leads to all this bumps which can be removed once stackage has haskell-gi 0.25. + haskell-gi = self.haskell-gi_0_25_0; + haskell-gi-base = addBuildDepends super.haskell-gi-base_0_25_0 [ pkgs.gobject-introspection ]; + gi-glib = self.gi-glib_2_0_25; + gi-cairo = self.gi-cairo_1_0_25; + gi-gobject = self.gi-gobject_2_0_26; + gi-atk = self.gi-atk_2_0_23; + gi-gio = self.gi-gio_2_0_28; + gi-harfbuzz = self.gi-harfbuzz_0_0_4; + gi-javascriptcore = self.gi-javascriptcore_4_0_23; + gi-pango = self.gi-pango_1_0_24; + gi-soup = self.gi-soup_2_4_24; + gi-gdkpixbuf = self.gi-gdkpixbuf_2_0_26; + gi-gdk = self.gi-gdk_3_0_24; + gi-gtk = self.gi-gtk_3_0_37; + gi-webkit2 = self.gi-webkit2_4_0_27; + gi-cairo-render = doJailbreak super.gi-cairo-render; + gi-cairo-connector = doJailbreak super.gi-cairo-connector; + gi-gtk-hs = self.gi-gtk-hs_0_3_10; + gi-dbusmenu = self.gi-dbusmenu_0_4_9; + gi-xlib = self.gi-xlib_2_0_10; + gi-gdkx11 = self.gi-gdkx11_3_0_11; + gi-dbusmenugtk3 = self.gi-dbusmenugtk3_0_4_10; - # 2020-08-14: Needs some manual patching to be compatible with haskell-gi-base 0.24 + # 2021-05-17: Needs some manual patching to be compatible with haskell-gi-base 0.25 # Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119 - jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk (pkgs.fetchpatch { - url = "https://github.com/ghcjs/jsaddle/compare/9727365...f842748.patch"; - sha256 = "07l4l999lmlx7sqxf7v4f70rmxhx9r0cjblkgc4n0y6jin4iv1cb"; - stripLen = 2; - extraPrefix = ""; + jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk ./patches/jsaddle-webkit2gtk.patch; + + # 2021-05-12: gi-gdkpixbuf_2_0_26 fix + # https://github.com/taffybar/gtk-sni-tray/pull/25 + gtk-sni-tray = appendPatch super.gtk-sni-tray (pkgs.fetchpatch { + url = "https://github.com/taffybar/gtk-sni-tray/pull/25/commits/4afd84654cb3f2bd2bb7d39451706c5914fd3cdf.patch"; + sha256 = "1xjxlh58vnykqsjq4qw8mliq3gk17mwxi4h9z8dvjyav8zqg05rn"; + }); + + # 2021-05-12: gi-gdkpixbuf_2_0_26 fix + # https://github.com/taffybar/taffybar/pull/507 + taffybar = appendPatch super.taffybar (pkgs.fetchpatch { + url = "https://github.com/taffybar/taffybar/pull/507/commits/14a650d0954000cbd2cb1018a2f3bcd40ecb564f.patch"; + sha256 = "01rm8zida5858j5r0mw7bpmv24b03mb3rw34lbkaw3i7g62bx3a0"; }); # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released) @@ -1388,6 +1408,15 @@ self: super: { # 2021-04-09: test failure # PR pending https://github.com/expipiplus1/update-nix-fetchgit/pull/60 doCheck = false; + + patches = [ + # 2021-05-17 compile with hnix >= 0.13 + # https://github.com/expipiplus1/update-nix-fetchgit/pull/64 + (pkgs.fetchpatch { + url = "https://github.com/expipiplus1/update-nix-fetchgit/commit/bc28c8b26c38093aa950574802012c0cd8447ce8.patch"; + sha256 = "1dwd1jdsrx3ss6ql1bk2ch7ln74mkq6jy9ms8vi8kmf3gbg8l9fg"; + }) + ] ++ (drv.patches or []); })); # Our quickcheck-instances is too old for the newer binary-instances, but @@ -1399,6 +1428,12 @@ self: super: { # https://github.com/haskell/haskell-language-server/issues/611 haskell-language-server = dontCheck super.haskell-language-server; + # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1808 + hls-splice-plugin = dontCheck super.hls-splice-plugin; + + # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809 + hls-eval-plugin = dontCheck super.hls-eval-plugin; + # 2021-03-19: Too restrictive upper bound on optparse-applicative stylish-haskell = doJailbreak super.stylish-haskell; @@ -1427,7 +1462,7 @@ self: super: { }); # 2021-03-09: Overrides because nightly is to old for hls 1.0.0 - lsp-test = doDistribute (dontCheck self.lsp-test_0_13_0_0); + lsp-test = doDistribute (dontCheck self.lsp-test_0_14_0_0); # 2021-03-21 Test hangs # https://github.com/haskell/haskell-language-server/issues/1562 @@ -1482,11 +1517,6 @@ self: super: { # Due to tests restricting base in 0.8.0.0 release http-media = doJailbreak super.http-media; - # https://github.com/ekmett/half/issues/35 - half = if pkgs.stdenv.isAarch64 - then dontCheck super.half - else super.half; - # 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124 heist = doJailbreak super.heist; @@ -1541,10 +1571,6 @@ self: super: { # https://github.com/yesodweb/yesod/issues/1714 yesod-core = dontCheck super.yesod-core; - # Add ApplicationServices on darwin - apecs-physics = addPkgconfigDepends super.apecs-physics - (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.ApplicationServices); - # Break out of overspecified constraint on QuickCheck. algebraic-graphs = dontCheck super.algebraic-graphs; attoparsec = doJailbreak super.attoparsec; # https://github.com/haskell/attoparsec/pull/168 @@ -1790,4 +1816,128 @@ self: super: { excludes = ["test/buildtest"]; }); + # workaround for https://github.com/peti/distribution-nixpkgs/issues/9 + pam = super.pam.override { inherit (pkgs) pam; }; + + # Too strict version bounds on base: + # https://github.com/obsidiansystems/database-id/issues/1 + database-id-class = doJailbreak super.database-id-class; + + cabal2nix-unstable = overrideCabal super.cabal2nix-unstable { + passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh; + }; + + # Too strict version bounds on base and optparse-applicative + # https://github.com/diagrams/diagrams-cairo/issues/77 + diagrams-cairo = doJailbreak super.diagrams-cairo; + + # Too strict version bounds on base + # https://github.com/gibiansky/IHaskell/issues/1217 + ihaskell-display = doJailbreak super.ihaskell-display; + ihaskell-basic = doJailbreak super.ihaskell-basic; + + # Fixes too strict version bounds on regex libraries + # Presumably to be removed at the next release + yi-language = appendPatch super.yi-language (pkgs.fetchpatch { + url = "https://github.com/yi-editor/yi/commit/0d3bcb5ba4c237d57ce33a3dc39b63c56d890765.patch"; + sha256 = "0r4mzngs0x1akqpajzx7ssa9rax977fvj5ra8d3grfbpx6z0nm01"; + includes = [ "yi-language.cabal" ]; + stripLen = 2; + extraPrefix = ""; + }); + + # https://github.com/ghcjs/jsaddle/issues/123 + jsaddle = overrideCabal super.jsaddle (drv: { + # lift conditional version constraint on ref-tf + postPatch = '' + sed -i 's/ref-tf.*,/ref-tf,/' jsaddle.cabal + '' + (drv.postPatch or ""); + }); + + # Tests need to lookup target triple x86_64-unknown-linux + # https://github.com/llvm-hs/llvm-hs/issues/334 + llvm-hs = overrideCabal super.llvm-hs { + doCheck = pkgs.stdenv.targetPlatform.system == "x86_64-linux"; + }; + + # Fix build failure by picking patch from 8.5, + # we need this version of sbv for petrinizer + sbv_7_13 = appendPatch super.sbv_7_13 + (pkgs.fetchpatch { + url = "https://github.com/LeventErkok/sbv/commit/57014b9c7c67dd9b63619a996e2c66e32c33c958.patch"; + sha256 = "10npa8nh2413n6p6qld795qfkbld08icm02bspmk93y0kabpgmgm"; + }); + + # Too strict bounds on dimensional + # https://github.com/enomsg/science-constants-dimensional/pull/1 + science-constants-dimensional = doJailbreak super.science-constants-dimensional; + + # Tests are flaky on busy machines + # https://github.com/merijn/paramtree/issues/4 + paramtree = dontCheck super.paramtree; + + # Too strict version bounds on haskell-gi + # https://github.com/owickstrom/gi-gtk-declarative/issues/100 + gi-gtk-declarative = doJailbreak super.gi-gtk-declarative; + gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple; + + # Test assets missing from sdist + # https://github.com/hadolint/language-docker/issues/63 + language-docker = overrideSrc super.language-docker { + src = pkgs.fetchFromGitHub { + owner = "hadolint"; + repo = "language-docker"; + rev = "refs/tags/${super.language-docker.version}"; + sha256 = "06263jy538ni31vms5pzggmh64fyk62cv3lxnvkc6gylb94kljb8"; + name = "language-docker-${super.language-docker.version}-source"; + }; + }; + + # 2021-05-09: Restrictive bound on hspec-golden. Dep removed in newer versions. + tomland = assert super.tomland.version == "1.3.2.0"; doJailbreak super.tomland; + + # 2021-05-09 haskell-ci pins ShellCheck 0.7.1 + # https://github.com/haskell-CI/haskell-ci/issues/507 + haskell-ci = super.haskell-ci.override { + ShellCheck = self.ShellCheck_0_7_1; + }; + + Frames-streamly = overrideCabal (super.Frames-streamly.override { relude = super.relude_1_0_0_1; }) (drv: { + # https://github.com/adamConnerSax/Frames-streamly/issues/1 + patchPhase = '' +cat > example_data/acs100k.csv <= 8.8 + (pkgs.fetchpatch { + url = "https://github.com/factisresearch/large-hashable/commit/ee7afe4bd181cf15a324c7f4823f7a348e4a0e6b.patch"; + sha256 = "1ha77v0bc6prxacxhpdfgcsgw8348gvhl9y81smigifgjbinphxv"; + excludes = [ + ".travis.yml" + "stack**" + ]; + }) + # Fix cpp invocation + (pkgs.fetchpatch { + url = "https://github.com/factisresearch/large-hashable/commit/7b7c2ed6ac6e096478e8ee00160fa9d220df853a.patch"; + sha256 = "1sf9h3k8jbbgfshzrclaawlwx7k2frb09z2a64f93jhvk6ci6vgx"; + }) + ]; + + # BSON defaults to requiring network instead of network-bsd which is + # required nowadays: https://github.com/mongodb-haskell/bson/issues/26 + bson = appendConfigureFlag (super.bson.override { + network = self.network-bsd; + }) "-f-_old_network"; + + # 2021-05-14: Testsuite is failing. + # https://github.com/kcsongor/generic-lens/issues/133 + generic-optics = dontCheck super.generic-optics; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix new file mode 100644 index 0000000000..4f7a6a131d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix @@ -0,0 +1,171 @@ +# DARWIN-SPECIFIC OVERRIDES FOR THE HASKELL PACKAGE SET IN NIXPKGS + +{ pkgs, haskellLib }: + +let + inherit (pkgs) lib darwin; +in + +with haskellLib; + +self: super: { + + # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo + # see: https://github.com/psibi/shell-conduit/issues/12 + shell-conduit = dontCheck super.shell-conduit; + + conduit-extra = super.conduit-extra.overrideAttrs (drv: { + __darwinAllowLocalNetworking = true; + }); + + halive = addBuildDepend super.halive darwin.apple_sdk.frameworks.AppKit; + + # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux + hakyll = overrideCabal super.hakyll { + testToolDepends = []; + doCheck = false; + }; + + barbly = addBuildDepend super.barbly darwin.apple_sdk.frameworks.AppKit; + + double-conversion = addExtraLibrary super.double-conversion pkgs.libcxx; + + apecs-physics = addPkgconfigDepends super.apecs-physics [ + darwin.apple_sdk.frameworks.ApplicationServices + ]; + + # "erf table" test fails on Darwin + # https://github.com/bos/math-functions/issues/63 + math-functions = dontCheck super.math-functions; + + # darwin doesn't have sub-second resolution + # https://github.com/hspec/mockery/issues/11 + mockery = overrideCabal super.mockery (drv: { + preCheck = '' + export TRAVIS=true + '' + (drv.preCheck or ""); + }); + + # https://github.com/ndmitchell/shake/issues/206 + shake = dontCheck super.shake; + + filecache = dontCheck super.filecache; + + # gtk/gtk3 needs to be told on Darwin to use the Quartz + # rather than X11 backend (see eg https://github.com/gtk2hs/gtk2hs/issues/249). + gtk3 = appendConfigureFlag super.gtk3 "-f have-quartz-gtk"; + gtk = appendConfigureFlag super.gtk "-f have-quartz-gtk"; + + OpenAL = addExtraLibrary super.OpenAL darwin.apple_sdk.frameworks.OpenAL; + + proteaaudio = addExtraLibrary super.proteaaudio darwin.apple_sdk.frameworks.AudioToolbox; + + # the system-fileio tests use canonicalizePath, which fails in the sandbox + system-fileio = dontCheck super.system-fileio; + + # Prevents needing to add `security_tool` as a run-time dependency for + # everything using x509-system to give access to the `security` executable. + # + # darwin.security_tool is broken in Mojave (#45042) + # + # We will use the system provided security for now. + # Beware this WILL break in sandboxes! + # + # TODO(matthewbauer): If someone really needs this to work in sandboxes, + # I think we can add a propagatedImpureHost dep here, but I’m hoping to + # get a proper fix available soonish. + x509-system = overrideCabal super.x509-system (drv: + lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) { + postPatch = '' + substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security + '' + (drv.postPatch or ""); + }); + + # https://github.com/haskell-foundation/foundation/pull/412 + foundation = dontCheck super.foundation; + + llvm-hs = overrideCabal super.llvm-hs (oldAttrs: { + # One test fails on darwin. + doCheck = false; + # llvm-hs's Setup.hs file tries to add the lib/ directory from LLVM8 to + # the DYLD_LIBRARY_PATH environment variable. This messes up clang + # when called from GHC, probably because clang is version 7, but we are + # using LLVM8. + preCompileBuildDriver = '' + substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()" + '' + (oldAttrs.preCompileBuildDriver or ""); + }); + + yesod-bin = addBuildDepend super.yesod-bin darwin.apple_sdk.frameworks.Cocoa; + + hmatrix = addBuildDepend super.hmatrix darwin.apple_sdk.frameworks.Accelerate; + + # Ensure the necessary frameworks are propagatedBuildInputs on darwin + OpenGLRaw = overrideCabal super.OpenGLRaw (drv: { + librarySystemDepends = []; + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ + darwin.apple_sdk.frameworks.OpenGL + ]; + preConfigure = '' + frameworkPaths=($(for i in $nativeBuildInputs; do if [ -d "$i"/Library/Frameworks ]; then echo "-F$i/Library/Frameworks"; fi done)) + frameworkPaths=$(IFS=, ; echo "''${frameworkPaths[@]}") + configureFlags+=$(if [ -n "$frameworkPaths" ]; then echo -n "--ghc-options=-optl=$frameworkPaths"; fi) + '' + (drv.preConfigure or ""); + }); + GLURaw = overrideCabal super.GLURaw (drv: { + librarySystemDepends = []; + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ + darwin.apple_sdk.frameworks.OpenGL + ]; + }); + bindings-GLFW = overrideCabal super.bindings-GLFW (drv: { + librarySystemDepends = []; + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ + darwin.apple_sdk.frameworks.AGL + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.OpenGL + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.Kernel + darwin.apple_sdk.frameworks.CoreVideo + darwin.CF + ]; + }); + OpenCL = overrideCabal super.OpenCL (drv: { + librarySystemDepends = []; + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ + darwin.apple_sdk.frameworks.OpenCL + ]; + }); + + # cabal2nix likes to generate dependencies on hinotify when hfsevents is + # really required on darwin: https://github.com/NixOS/cabal2nix/issues/146. + hinotify = self.hfsevents; + + # FSEvents API is very buggy and tests are unreliable. See + # http://openradar.appspot.com/10207999 and similar issues. + fsnotify = addBuildDepend (dontCheck super.fsnotify) + darwin.apple_sdk.frameworks.Cocoa; + + FractalArt = overrideCabal super.FractalArt (drv: { + librarySystemDepends = [ + darwin.libobjc + darwin.apple_sdk.frameworks.AppKit + ] ++ (drv.librarySystemDepends or []); + }); + + arbtt = overrideCabal super.arbtt (drv: { + librarySystemDepends = [ + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.Carbon + darwin.apple_sdk.frameworks.IOKit + ] ++ (drv.librarySystemDepends or []); + }); + + HTF = overrideCabal super.HTF (drv: { + # GNU find is not prefixed in stdenv + postPatch = '' + substituteInPlace scripts/local-htfpp --replace "find=gfind" "find=find" + '' + (drv.postPatch or ""); + }); + +} 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 index 92d26a6eb0..c55d720033 100644 --- 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 @@ -98,4 +98,10 @@ self: super: { # The test suite seems pretty broken. base64-bytestring = dontCheck super.base64-bytestring; + # 5.6 introduced support for GHC 9.0.x, but hasn't landed in stackage yet + profunctors = super.profunctors_5_6_2; + + # 5 introduced support for GHC 9.0.x, but hasn't landed in stackage yet + lens = super.lens_5_0_1; + } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix index cbfd4b84b2..2b136c6bf8 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -11,8 +11,7 @@ with haskellLib; self: super: { - # This compiler version needs llvm 6.x. - llvmPackages = pkgs.llvmPackages_6; + llvmPackages = pkgs.llvmPackages_10; # Disable GHC 8.7.x core libraries. array = 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 deleted file mode 100644 index 21d5934eed..0000000000 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ /dev/null @@ -1,12004 +0,0 @@ -# pkgs/development/haskell-modules/configuration-hackage2nix.yaml - -compiler: ghc-8.10.4 - -core-packages: - - array-0.5.4.0 - - base-4.14.1.0 - - binary-0.8.8.0 - - bytestring-0.10.12.0 - - Cabal-3.2.1.0 - - containers-0.6.2.1 - - deepseq-1.4.4.0 - - directory-1.3.6.0 - - exceptions-0.10.4 - - filepath-1.4.2.1 - - ghc-8.10.4 - - ghc-boot-8.10.4 - - ghc-boot-th-8.10.4 - - ghc-compact-0.1.0.0 - - ghc-heap-8.10.4 - - ghc-prim-0.6.1 - - ghci-8.10.4 - - haskeline-0.8.0.1 - - hpc-0.6.1.0 - - integer-gmp-1.0.3.0 - - libiserv-8.10.4 - - mtl-2.2.2 - - parsec-3.1.14.0 - - pretty-1.1.3.6 - - process-1.6.9.0 - - rts-1.0 - - stm-2.5.0.0 - - template-haskell-2.16.0.0 - - terminfo-0.4.1.4 - - text-1.2.4.1 - - time-1.9.3 - - transformers-0.5.6.2 - - unix-2.7.2.2 - - xhtml-3000.2.2.1 - - # Hack: The following package is a core package of GHCJS. If we don't declare - # it, then hackage2nix will generate a Hackage database where all dependants - # of this library are marked as "broken". - - ghcjs-base-0 - -# This is a list of packages with versions from the latest Stackage LTS release. -# -# The packages and versions in this list cause the `hackage2nix` tool to -# generate the package at the given version. -# -# For instance, with a line like the following: -# -# - aeson ==1.4.6.0 -# -# `hackage2nix` will generate the `aeson` package at version 1.4.6.0 in the -# ./hackage-packages.nix file. -# -# Since the packages in the LTS package set are sometimes older than the latest -# on Hackage, `hackage2nix` is smart enough to also generate the latest version -# of a given package. -# -# In the above example with aeson, if there was version 1.5.0.0 of aeson -# available on Hackage, `hackage2nix` would generate two packages, `aeson` -# at version 1.4.6.0 and `aeson_1_5_0_0` at version 1.5.0.0. -# -# WARNING: This list is generated semiautomatically based on the most recent -# LTS package set. If you want to add entries to it, you must do so before the -# comment saying "# LTS Haskell x.y". Any changes after that comment will be -# lost the next time `update-stackage.sh` runs. -default-package-overrides: - # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag - - MissingH ==1.4.2.0 - # gi-gdkx11-4.x requires gtk-4.x, which is still under development and - # not yet available in Nixpkgs - - gi-gdkx11 < 4 - # Needs Cabal 3.4 for Setup.hs - - gi-javascriptcore < 4.0.23 # - - gi-soup < 2.4.24 # - - gi-webkit2 < 4.0.27 # - # To stay hls 1.0 compatible - - ghcide < 1.1 - - hls-retrie-plugin < 1.0.0.1 - - lsp < 1.2 - - lsp-types < 1.2 - - hls-plugin-api < 1.1.0.0 - - hls-explicit-imports-plugin < 1.0.0.1 - # 2021-04-02: Stackage Nighlty has haskell-gi* < 0.25, - # so we need to restrict these to compatible versions - # Remove these as soon as haskell-gi{,-base} are 0.25.* - # in Stackage Nightly! - - gi-ggit < 1.0.10 - - gi-girepository < 1.0.24 - - gi-gst < 1.0.24 - - gi-gstbase < 1.0.24 - - gi-gstvideo < 1.0.24 - - gi-gtksource < 3.0.24 - - gi-ibus < 1.5.3 - - gi-notify < 0.7.23 - - gi-ostree < 1.0.14 - - gi-pangocairo < 1.0.25 - - gi-secret < 0.0.13 - - gi-vte < 2.91.28 - - # Stackage Nightly 2021-04-28 - - abstract-deque ==0.3 - - abstract-par ==0.3.3 - - AC-Angle ==1.0 - - accuerr ==0.2.0.2 - - ace ==0.6 - - action-permutations ==0.0.0.1 - - ad ==4.4.1 - - adjunctions ==4.4 - - adler32 ==0.1.2.0 - - aeson ==1.5.6.0 - - aeson-attoparsec ==0.0.0 - - aeson-better-errors ==0.9.1.0 - - aeson-casing ==0.2.0.0 - - aeson-combinators ==0.0.5.0 - - aeson-commit ==1.3 - - aeson-compat ==0.3.9 - - aeson-default ==0.9.1.0 - - aeson-diff ==1.1.0.9 - - aeson-generic-compat ==0.0.1.3 - - aeson-lens ==0.5.0.0 - - aeson-optics ==1.1.0.1 - - aeson-picker ==0.1.0.5 - - aeson-pretty ==0.8.8 - - aeson-qq ==0.8.3 - - aeson-schemas ==1.3.3 - - aeson-with ==0.1.2.0 - - aeson-yak ==0.1.1.3 - - aeson-yaml ==1.1.0.0 - - Agda ==2.6.1.3 - - agda2lagda ==0.2020.11.1 - - al ==0.1.4.2 - - alarmclock ==0.7.0.5 - - alerts ==0.1.2.0 - - alex ==3.2.6 - - alex-meta ==0.3.0.13 - - alg ==0.2.13.1 - - algebraic-graphs ==0.5 - - Allure ==0.10.2.0 - - almost-fix ==0.0.2 - - alsa-core ==0.5.0.1 - - alsa-mixer ==0.3.0 - - alsa-pcm ==0.6.1.1 - - alsa-seq ==0.6.0.8 - - alternative-vector ==0.0.0 - - ALUT ==2.4.0.3 - - amazonka-apigateway ==1.6.1 - - amazonka-application-autoscaling ==1.6.1 - - amazonka-appstream ==1.6.1 - - amazonka-athena ==1.6.1 - - amazonka-autoscaling ==1.6.1 - - amazonka-budgets ==1.6.1 - - amazonka-certificatemanager ==1.6.1 - - amazonka-cloudformation ==1.6.1 - - amazonka-cloudfront ==1.6.1 - - amazonka-cloudhsm ==1.6.1 - - amazonka-cloudsearch ==1.6.1 - - amazonka-cloudsearch-domains ==1.6.1 - - amazonka-cloudtrail ==1.6.1 - - amazonka-cloudwatch ==1.6.1 - - amazonka-cloudwatch-events ==1.6.1 - - amazonka-cloudwatch-logs ==1.6.1 - - amazonka-codebuild ==1.6.1 - - amazonka-codecommit ==1.6.1 - - amazonka-codedeploy ==1.6.1 - - amazonka-codepipeline ==1.6.1 - - amazonka-cognito-identity ==1.6.1 - - amazonka-cognito-idp ==1.6.1 - - amazonka-cognito-sync ==1.6.1 - - amazonka-config ==1.6.1 - - amazonka-core ==1.6.1 - - amazonka-datapipeline ==1.6.1 - - amazonka-devicefarm ==1.6.1 - - amazonka-directconnect ==1.6.1 - - amazonka-discovery ==1.6.1 - - amazonka-dms ==1.6.1 - - amazonka-ds ==1.6.1 - - amazonka-dynamodb ==1.6.1 - - amazonka-dynamodb-streams ==1.6.1 - - amazonka-ecr ==1.6.1 - - amazonka-ecs ==1.6.1 - - amazonka-efs ==1.6.1 - - amazonka-elasticache ==1.6.1 - - amazonka-elasticbeanstalk ==1.6.1 - - amazonka-elasticsearch ==1.6.1 - - amazonka-elastictranscoder ==1.6.1 - - amazonka-elb ==1.6.1 - - amazonka-elbv2 ==1.6.1 - - amazonka-emr ==1.6.1 - - amazonka-gamelift ==1.6.1 - - amazonka-glacier ==1.6.1 - - amazonka-glue ==1.6.1 - - amazonka-health ==1.6.1 - - amazonka-iam ==1.6.1 - - amazonka-importexport ==1.6.1 - - amazonka-inspector ==1.6.1 - - amazonka-iot ==1.6.1 - - amazonka-iot-dataplane ==1.6.1 - - amazonka-kinesis ==1.6.1 - - amazonka-kinesis-analytics ==1.6.1 - - amazonka-kinesis-firehose ==1.6.1 - - amazonka-kms ==1.6.1 - - amazonka-lambda ==1.6.1 - - amazonka-lightsail ==1.6.1 - - amazonka-marketplace-analytics ==1.6.1 - - amazonka-marketplace-metering ==1.6.1 - - amazonka-ml ==1.6.1 - - amazonka-opsworks ==1.6.1 - - amazonka-opsworks-cm ==1.6.1 - - amazonka-pinpoint ==1.6.1 - - amazonka-polly ==1.6.1 - - amazonka-rds ==1.6.1 - - amazonka-redshift ==1.6.1 - - amazonka-rekognition ==1.6.1 - - amazonka-route53 ==1.6.1 - - amazonka-route53-domains ==1.6.1 - - amazonka-s3 ==1.6.1 - - amazonka-sdb ==1.6.1 - - amazonka-servicecatalog ==1.6.1 - - amazonka-ses ==1.6.1 - - amazonka-shield ==1.6.1 - - amazonka-sms ==1.6.1 - - amazonka-snowball ==1.6.1 - - amazonka-sns ==1.6.1 - - amazonka-sqs ==1.6.1 - - amazonka-ssm ==1.6.1 - - amazonka-stepfunctions ==1.6.1 - - amazonka-storagegateway ==1.6.1 - - amazonka-sts ==1.6.1 - - amazonka-support ==1.6.1 - - amazonka-swf ==1.6.1 - - amazonka-test ==1.6.1 - - amazonka-waf ==1.6.1 - - amazonka-workspaces ==1.6.1 - - amazonka-xray ==1.6.1 - - amqp ==0.22.0 - - amqp-utils ==0.6.1.0 - - annotated-wl-pprint ==0.7.0 - - ansi-terminal ==0.11 - - ansi-wl-pprint ==0.6.9 - - ANum ==0.2.0.2 - - apecs ==0.9.2 - - apecs-gloss ==0.2.4 - - apecs-physics ==0.4.5 - - api-field-json-th ==0.1.0.2 - - api-maker ==0.1.0.0 - - ap-normalize ==0.1.0.0 - - appar ==0.1.8 - - appendmap ==0.1.5 - - apply-refact ==0.9.2.0 - - apportionment ==0.0.0.3 - - approximate ==0.3.4 - - approximate-equality ==1.1.0.2 - - app-settings ==0.2.0.12 - - arbor-lru-cache ==0.1.1.1 - - arithmoi ==0.11.0.1 - - array-memoize ==0.6.0 - - arrow-extras ==0.1.0.1 - - ascii ==1.0.1.4 - - ascii-case ==1.0.0.4 - - ascii-char ==1.0.0.8 - - asciidiagram ==1.3.3.3 - - ascii-group ==1.0.0.4 - - ascii-predicates ==1.0.0.4 - - ascii-progress ==0.3.3.0 - - ascii-superset ==1.0.1.4 - - ascii-th ==1.0.0.4 - - asif ==6.0.4 - - asn1-encoding ==0.9.6 - - asn1-parse ==0.9.5 - - asn1-types ==0.3.4 - - assert-failure ==0.1.2.5 - - assoc ==1.0.2 - - astro ==0.4.2.1 - - async ==2.2.3 - - async-extra ==0.2.0.0 - - async-pool ==0.9.1 - - async-refresh ==0.3.0.0 - - async-refresh-tokens ==0.4.0.0 - - atom-basic ==0.2.5 - - atomic-primops ==0.8.4 - - atomic-write ==0.2.0.7 - - attoparsec ==0.13.2.5 - - attoparsec-base64 ==0.0.0 - - attoparsec-binary ==0.2 - - attoparsec-expr ==0.1.1.2 - - attoparsec-iso8601 ==1.0.2.0 - - attoparsec-path ==0.0.0.1 - - audacity ==0.0.2 - - aur ==7.0.6 - - aura ==3.2.4 - - authenticate ==1.3.5 - - authenticate-oauth ==1.6.0.1 - - auto ==0.4.3.1 - - autoexporter ==1.1.20 - - auto-update ==0.1.6 - - avers ==0.0.17.1 - - avro ==0.5.2.0 - - aws-cloudfront-signed-cookies ==0.2.0.6 - - backprop ==0.2.6.4 - - backtracking ==0.1.0 - - bank-holidays-england ==0.2.0.6 - - barbies ==2.0.2.0 - - base16 ==0.3.0.1 - - base16-bytestring ==1.0.1.0 - - base16-lens ==0.1.3.2 - - base32 ==0.2.0.0 - - base32-lens ==0.1.1.1 - - base32string ==0.9.1 - - base58-bytestring ==0.1.0 - - base58string ==0.10.0 - - base64 ==0.4.2.3 - - base64-bytestring ==1.1.0.0 - - base64-bytestring-type ==1.0.1 - - base64-lens ==0.3.1 - - base64-string ==0.2 - - base-compat ==0.11.2 - - base-compat-batteries ==0.11.2 - - basement ==0.0.12 - - base-orphans ==0.8.4 - - base-prelude ==1.4 - - base-unicode-symbols ==0.2.4.2 - - basic-prelude ==0.7.0 - - bazel-runfiles ==0.12 - - bbdb ==0.8 - - bcp47 ==0.2.0.3 - - bcp47-orphans ==0.1.0.3 - - bcrypt ==0.0.11 - - bech32 ==1.1.0 - - bech32-th ==1.0.2 - - bench ==1.0.12 - - benchpress ==0.2.2.16 - - between ==0.11.0.0 - - bibtex ==0.1.0.6 - - bifunctors ==5.5.10 - - bimap ==0.4.0 - - bimaps ==0.1.0.2 - - bimap-server ==0.1.0.1 - - bin ==0.1.1 - - binary-conduit ==1.3.1 - - binary-ext ==2.0.4 - - binary-ieee754 ==0.1.0.0 - - binary-instances ==1.0.1 - - binary-list ==1.1.1.2 - - binary-orphans ==1.0.1 - - binary-parser ==0.5.7 - - binary-parsers ==0.2.4.0 - - binary-search ==2.0.0 - - binary-shared ==0.8.3 - - binary-tagged ==0.3 - - bindings-DSL ==1.0.25 - - bindings-GLFW ==3.3.2.0 - - bindings-libzip ==1.0.1 - - bindings-uname ==0.1 - - bins ==0.1.2.0 - - bitarray ==0.0.1.1 - - bits ==0.5.3 - - bitset-word8 ==0.1.1.2 - - bits-extra ==0.0.2.0 - - bitvec ==1.1.1.0 - - bitwise-enum ==1.0.1.0 - - blake2 ==0.3.0 - - blanks ==0.5.0 - - blas-carray ==0.1.0.1 - - blas-comfort-array ==0.0.0.2 - - blas-ffi ==0.1 - - blaze-bootstrap ==0.1.0.1 - - blaze-builder ==0.4.2.1 - - blaze-html ==0.9.1.2 - - blaze-markup ==0.8.2.8 - - blaze-svg ==0.3.6.1 - - blaze-textual ==0.2.1.0 - - bmp ==1.2.6.3 - - BNFC ==2.9.1 - - BNFC-meta ==0.6.1 - - board-games ==0.3 - - boltzmann-samplers ==0.1.1.0 - - Boolean ==0.2.4 - - boolean-like ==0.1.1.0 - - boolsimplifier ==0.1.8 - - boots ==0.2.0.1 - - bordacount ==0.1.0.0 - - boring ==0.2 - - both ==0.1.1.1 - - bound ==2.0.3 - - BoundedChan ==1.0.3.0 - - bounded-queue ==1.0.0 - - boundingboxes ==0.2.3 - - bower-json ==1.0.0.1 - - boxes ==0.1.5 - - brick ==0.61 - - broadcast-chan ==0.2.1.1 - - bsb-http-chunked ==0.0.0.4 - - bson ==0.4.0.1 - - btrfs ==0.2.0.0 - - buffer-builder ==0.2.4.7 - - buffer-pipe ==0.0 - - bugsnag-haskell ==0.0.4.1 - - bugsnag-hs ==0.2.0.3 - - bugzilla-redhat ==0.3.1 - - burrito ==1.2.0.1 - - butcher ==1.3.3.2 - - buttplug-hs-core ==0.1.0.0 - - bv ==0.5 - - bv-little ==1.1.1 - - byteable ==0.1.1 - - byte-count-reader ==0.10.1.2 - - bytedump ==1.0 - - byte-order ==0.1.2.0 - - byteorder ==1.0.4 - - bytes ==0.17.1 - - byteset ==0.1.1.0 - - bytestring-builder ==0.10.8.2.0 - - bytestring-conversion ==0.3.1 - - bytestring-lexing ==0.5.0.2 - - bytestring-mmap ==0.2.2 - - bytestring-strict-builder ==0.4.5.4 - - bytestring-to-vector ==0.3.0.1 - - bytestring-tree-builder ==0.2.7.9 - - bz2 ==1.0.1.0 - - bzlib ==0.5.1.0 - - bzlib-conduit ==0.3.0.2 - - c14n ==0.1.0.1 - - c2hs ==0.28.7 - - cabal-appimage ==0.3.0.2 - - cabal-debian ==5.1 - - cabal-doctest ==1.0.8 - - cabal-file ==0.1.1 - - cabal-flatpak ==0.1.0.2 - - cabal-plan ==0.7.2.0 - - cabal-rpm ==2.0.8 - - cache ==0.1.3.0 - - cacophony ==0.10.1 - - calendar-recycling ==0.0.0.1 - - call-stack ==0.3.0 - - can-i-haz ==0.3.1.0 - - capability ==0.4.0.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.2 - - cased ==0.1.0.0 - - case-insensitive ==1.2.1.0 - - cases ==0.1.4.1 - - casing ==0.1.4.1 - - cassava ==0.5.2.0 - - cassava-conduit ==0.6.0 - - cassava-megaparsec ==2.0.2 - - cast ==0.1.0.2 - - category ==0.2.5.0 - - cayley-client ==0.4.15 - - cborg ==0.2.5.0 - - cborg-json ==0.2.2.0 - - cereal ==0.5.8.1 - - cereal-conduit ==0.8.0 - - cereal-text ==0.1.0.2 - - cereal-vector ==0.2.0.1 - - cfenv ==0.1.0.0 - - cgi ==3001.5.0.0 - - chan ==0.0.4.1 - - ChannelT ==0.0.0.7 - - character-cases ==0.1.0.6 - - charset ==0.3.8 - - charsetdetect-ae ==1.1.0.4 - - Chart ==1.9.3 - - chaselev-deque ==0.5.0.5 - - ChasingBottoms ==1.3.1.10 - - cheapskate ==0.1.1.2 - - cheapskate-highlight ==0.1.0.0 - - cheapskate-lucid ==0.1.0.0 - - checkers ==0.5.6 - - checksum ==0.0 - - chimera ==0.3.1.0 - - chiphunk ==0.1.4.0 - - choice ==0.2.2 - - chronologique ==0.3.1.3 - - chronos ==1.1.1 - - chronos-bench ==0.2.0.2 - - chunked-data ==0.3.1 - - cipher-aes ==0.2.11 - - cipher-camellia ==0.0.2 - - cipher-des ==0.0.6 - - cipher-rc4 ==0.1.4 - - circle-packing ==0.1.0.6 - - circular ==0.3.1.1 - - citeproc ==0.3.0.9 - - clash-ghc ==1.2.5 - - clash-lib ==1.2.5 - - clash-prelude ==1.2.5 - - classy-prelude ==1.5.0 - - classy-prelude-conduit ==1.5.0 - - clay ==0.13.3 - - clientsession ==0.9.1.2 - - climb ==0.3.3 - - Clipboard ==2.3.2.0 - - clock ==0.8 - - clock-extras ==0.1.0.2 - - closed ==0.2.0.1 - - clumpiness ==0.17.0.2 - - ClustalParser ==1.3.0 - - cmark ==0.6 - - cmark-gfm ==0.2.2 - - cmark-lucid ==0.1.0.0 - - cmdargs ==0.10.21 - - codec-beam ==0.2.0 - - code-page ==0.2.1 - - co-log-concurrent ==0.5.0.0 - - co-log-core ==0.2.1.1 - - Color ==0.3.1 - - colorful-monoids ==0.2.1.3 - - colorize-haskell ==1.0.1 - - colour ==2.3.5 - - combinatorial ==0.1.0.1 - - comfort-array ==0.4.1 - - comfort-graph ==0.0.3.1 - - commonmark ==0.1.1.4 - - commonmark-extensions ==0.2.0.4 - - commonmark-pandoc ==0.2.0.1 - - commutative ==0.0.2 - - comonad ==5.0.8 - - comonad-extras ==4.0.1 - - compactmap ==0.1.4.2.1 - - compdata ==0.12.1 - - compensated ==0.8.3 - - compiler-warnings ==0.1.0 - - composable-associations ==0.1.0.0 - - composable-associations-aeson ==0.1.0.1 - - composite-aeson ==0.7.5.0 - - composite-aeson-path ==0.7.5.0 - - composite-aeson-refined ==0.7.5.0 - - composite-aeson-throw ==0.1.0.0 - - composite-base ==0.7.5.0 - - composite-binary ==0.7.5.0 - - composite-ekg ==0.7.5.0 - - composite-hashable ==0.7.5.0 - - composite-tuple ==0.1.2.0 - - composite-xstep ==0.1.0.0 - - composition ==1.0.2.2 - - composition-extra ==2.0.0 - - concise ==0.1.0.1 - - concurrency ==1.11.0.1 - - concurrent-extra ==0.7.0.12 - - concurrent-output ==1.10.12 - - concurrent-split ==0.0.1.1 - - concurrent-supply ==0.1.8 - - cond ==0.4.1.1 - - conduit ==1.3.4.1 - - conduit-algorithms ==0.0.11.0 - - conduit-combinators ==1.3.0 - - conduit-concurrent-map ==0.1.1 - - conduit-extra ==1.3.5 - - conduit-parse ==0.2.1.0 - - conduit-zstd ==0.0.2.0 - - conferer ==1.1.0.0 - - conferer-aeson ==1.1.0.1 - - conferer-hspec ==1.1.0.0 - - conferer-warp ==1.1.0.0 - - ConfigFile ==1.1.4 - - config-ini ==0.2.4.0 - - configurator ==0.3.0.0 - - configurator-export ==0.1.0.1 - - configurator-pg ==0.2.5 - - connection ==0.3.1 - - connection-pool ==0.2.2 - - console-style ==0.0.2.1 - - constraint ==0.1.4.0 - - constraints ==0.13 - - constraint-tuples ==0.1.2 - - construct ==0.3.0.2 - - contravariant ==1.5.3 - - contravariant-extras ==0.3.5.2 - - control-bool ==0.2.1 - - control-dsl ==0.2.1.3 - - control-monad-free ==0.6.2 - - control-monad-omega ==0.3.2 - - convertible ==1.1.1.0 - - cookie ==0.4.5 - - core-data ==0.2.1.9 - - core-program ==0.2.6.0 - - core-text ==0.3.0.0 - - countable ==1.0 - - country ==0.2.1 - - cpphs ==1.20.9.1 - - cprng-aes ==0.6.1 - - cpu ==0.1.2 - - cpuinfo ==0.1.0.2 - - crackNum ==2.4 - - crc32c ==0.0.0 - - credential-store ==0.1.2 - - criterion ==1.5.9.0 - - criterion-measurement ==0.1.2.0 - - cron ==0.7.0 - - crypto-api ==0.13.3 - - crypto-cipher-types ==0.0.9 - - cryptocompare ==0.1.2 - - crypto-enigma ==0.1.1.6 - - cryptohash ==0.11.9 - - cryptohash-cryptoapi ==0.1.4 - - cryptohash-md5 ==0.11.100.1 - - cryptohash-sha1 ==0.11.100.1 - - cryptohash-sha256 ==0.11.102.0 - - cryptohash-sha512 ==0.11.100.1 - - cryptonite ==0.28 - - 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 - - csp ==1.4.0 - - css-syntax ==0.1.0.0 - - css-text ==0.1.3.0 - - csv ==0.1.2 - - ctrie ==0.2 - - cubicbezier ==0.6.0.6 - - cubicspline ==0.1.2 - - cuckoo-filter ==0.2.0.2 - - cue-sheet ==2.0.1 - - curl ==1.3.8 - - currencies ==0.2.0.0 - - currency ==0.2.0.0 - - cursor ==0.3.0.0 - - cursor-brick ==0.1.0.0 - - cursor-fuzzy-time ==0.0.0.0 - - cursor-gen ==0.3.0.0 - - cutter ==0.0 - - cyclotomic ==1.1.1 - - czipwith ==1.0.1.3 - - d10 ==0.2.1.6 - - data-accessor ==0.2.3 - - data-accessor-mtl ==0.2.0.4 - - data-accessor-template ==0.2.1.16 - - data-accessor-transformers ==0.2.1.7 - - data-ascii ==1.0.0.6 - - data-binary-ieee754 ==0.4.4 - - data-bword ==0.1.0.1 - - data-checked ==0.3 - - data-clist ==0.1.2.3 - - data-compat ==0.1.0.3 - - data-default ==0.7.1.1 - - data-default-class ==0.1.2.0 - - data-default-instances-containers ==0.0.1 - - 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.3.1 - - data-forest ==0.1.0.8 - - data-has ==0.4.0.0 - - data-hash ==0.2.0.1 - - data-interval ==2.1.0 - - data-inttrie ==0.1.4 - - data-lens-light ==0.1.2.2 - - data-memocombinators ==0.5.1 - - data-msgpack ==0.0.13 - - data-msgpack-types ==0.0.3 - - data-or ==1.0.0.5 - - data-ordlist ==0.4.7.0 - - data-ref ==0.0.2 - - data-reify ==0.6.3 - - data-serializer ==0.3.5 - - data-textual ==0.3.0.3 - - dataurl ==0.1.0.0 - - DAV ==1.3.4 - - DBFunctor ==0.1.1.1 - - dbus ==1.2.17 - - dbus-hslogger ==0.1.0.1 - - debian ==4.0.2 - - debian-build ==0.10.2.0 - - debug-trace-var ==0.2.0 - - dec ==0.0.4 - - Decimal ==0.5.2 - - declarative ==0.5.4 - - deepseq-generics ==0.2.0.0 - - deepseq-instances ==0.1.0.1 - - deferred-folds ==0.9.17 - - dejafu ==2.4.0.2 - - dense-linear-algebra ==0.1.0.0 - - depq ==0.4.2 - - deque ==0.4.3 - - deriveJsonNoPrefix ==0.1.0.1 - - derive-topdown ==0.0.2.2 - - deriving-aeson ==0.2.6.1 - - deriving-compat ==0.5.10 - - derulo ==1.0.10 - - dhall ==1.38.1 - - dhall-bash ==1.0.36 - - dhall-json ==1.7.6 - - dhall-lsp-server ==1.0.14 - - dhall-yaml ==1.2.6 - - diagrams-solve ==0.1.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 - - direct-sqlite ==2.3.26 - - dirichlet ==0.1.0.2 - - discount ==0.1.1 - - disk-free-space ==0.1.0.1 - - distributed-closure ==0.4.2.0 - - distribution-opensuse ==1.1.1 - - distributive ==0.6.2.1 - - dl-fedora ==0.9 - - dlist ==0.8.0.8 - - dlist-instances ==0.1.1.1 - - dlist-nonempty ==0.1.1 - - dns ==4.0.1 - - dockerfile ==0.2.0 - - doclayout ==0.3.0.2 - - doctemplates ==0.9 - - doctest ==0.16.3 - - doctest-discover ==0.2.0.0 - - doctest-driver-gen ==0.3.0.3 - - doctest-exitcode-stdio ==0.0 - - doctest-extract ==0.1 - - doctest-lib ==0.1 - - doldol ==0.4.1.2 - - do-list ==1.0.1 - - do-notation ==0.1.0.2 - - dot ==0.3 - - dotenv ==0.8.0.7 - - dotgen ==0.4.3 - - dotnet-timespan ==0.0.1.0 - - double-conversion ==2.0.2.0 - - download ==0.3.2.7 - - download-curl ==0.1.4 - - drinkery ==0.4 - - dsp ==0.2.5.1 - - dual ==0.1.1.1 - - dublincore-xml-conduit ==0.1.0.2 - - dunai ==0.7.0 - - duration ==0.2.0.0 - - dvorak ==0.1.0.0 - - dynamic-state ==0.3.1 - - dyre ==0.8.12 - - eap ==0.9.0.2 - - earcut ==0.1.0.4 - - Earley ==0.13.0.1 - - easy-file ==0.2.2 - - Ebnf2ps ==1.0.15 - - echo ==0.1.4 - - ecstasy ==0.2.1.0 - - ed25519 ==0.0.5.0 - - edit-distance ==0.2.2.1 - - edit-distance-vector ==1.0.0.4 - - editor-open ==0.6.0.0 - - egison ==4.1.2 - - egison-pattern-src ==0.2.1.2 - - egison-pattern-src-th-mode ==0.2.1.2 - - either ==5.0.1.1 - - either-both ==0.1.1.1 - - either-unwrap ==1.1 - - ekg ==0.4.0.15 - - ekg-core ==0.1.1.7 - - ekg-json ==0.1.0.6 - - ekg-statsd ==0.2.5.0 - - elerea ==2.9.0 - - elf ==0.30 - - eliminators ==0.7 - - elm2nix ==0.2.1 - - elm-bridge ==0.6.1 - - elm-core-sources ==1.0.0 - - elm-export ==0.6.0.1 - - elynx ==0.5.0.2 - - elynx-markov ==0.5.0.2 - - elynx-nexus ==0.5.0.2 - - elynx-seq ==0.5.0.2 - - elynx-tools ==0.5.0.2 - - elynx-tree ==0.5.0.2 - - email-validate ==2.3.2.13 - - emojis ==0.1 - - enclosed-exceptions ==1.0.3 - - ENIG ==0.0.1.0 - - entropy ==0.4.1.6 - - enummapset ==0.6.0.3 - - enumset ==0.0.5 - - enum-subset-generate ==0.1.0.0 - - envelope ==0.2.2.0 - - envparse ==0.4.1 - - envy ==2.1.0.0 - - epub-metadata ==4.5 - - eq ==4.2.1 - - equal-files ==0.0.5.3 - - equational-reasoning ==0.7.0.0 - - equivalence ==0.3.5 - - erf ==2.0.0.0 - - error-or ==0.1.2.0 - - error-or-utils ==0.1.1 - - errors ==2.3.0 - - errors-ext ==0.4.2 - - ersatz ==0.4.9 - - esqueleto ==3.4.1.1 - - essence-of-live-coding ==0.2.5 - - essence-of-live-coding-gloss ==0.2.5 - - essence-of-live-coding-pulse ==0.2.5 - - essence-of-live-coding-quickcheck ==0.2.5 - - etc ==0.4.1.0 - - eve ==0.1.9.0 - - 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.4 - - exception-mtl ==0.4.0.1 - - exceptions ==0.10.4 - - exception-transformers ==0.4.0.9 - - exception-via ==0.1.0.0 - - executable-path ==0.0.3.1 - - exit-codes ==1.0.0 - - exomizer ==1.0.0 - - experimenter ==0.1.0.12 - - expiring-cache-map ==0.0.6.1 - - explicit-exception ==0.1.10 - - exp-pairs ==0.2.1.0 - - express ==0.1.6 - - extended-reals ==0.2.4.0 - - extensible-effects ==5.0.0.1 - - extensible-exceptions ==0.1.1.4 - - extra ==1.7.9 - - extractable-singleton ==0.0.1 - - extrapolate ==0.4.4 - - fail ==4.9.0.0 - - failable ==1.2.4.0 - - fakedata ==0.8.0 - - fakedata-parser ==0.1.0.0 - - fakefs ==0.3.0.2 - - fakepull ==0.3.0.2 - - faktory ==1.0.2.1 - - fast-digits ==0.3.0.0 - - fast-logger ==3.0.3 - - fast-math ==1.0.2 - - fb ==2.1.1 - - fclabels ==2.0.5 - - feature-flags ==0.1.0.1 - - fedora-dists ==1.1.2 - - fedora-haskell-tools ==0.9 - - feed ==1.3.2.0 - - FenwickTree ==0.1.2.1 - - fft ==0.1.8.6 - - fgl ==5.7.0.3 - - file-embed ==0.0.13.0 - - file-embed-lzma ==0 - - filelock ==0.1.1.5 - - filemanip ==0.3.6.3 - - file-modules ==0.1.2.4 - - filepath-bytestring ==1.4.2.1.7 - - file-path-th ==0.1.0.0 - - filepattern ==0.1.2 - - fileplow ==0.1.0.0 - - filtrable ==0.1.4.0 - - fin ==0.2 - - FindBin ==0.0.5 - - fingertree ==0.1.4.2 - - finite-typelits ==0.1.4.2 - - first-class-families ==0.8.0.1 - - first-class-patterns ==0.3.2.5 - - fitspec ==0.4.8 - - fixed ==0.3 - - fixed-length ==0.2.2.1 - - fixed-vector ==1.2.0.0 - - fixed-vector-hetero ==0.6.1.0 - - fix-whitespace ==0.0.5 - - flac ==0.2.0 - - flac-picture ==0.1.2 - - flags-applicative ==0.1.0.3 - - flat ==0.4.4 - - flat-mcmc ==1.5.2 - - flexible-defaults ==0.0.3 - - FloatingHex ==0.5 - - floatshow ==0.2.4 - - flow ==1.0.22 - - flush-queue ==1.0.0 - - fmlist ==0.9.4 - - fmt ==0.6.1.2 - - fn ==0.3.0.2 - - focus ==1.0.2 - - focuslist ==0.1.0.2 - - foldable1 ==0.1.0.0 - - fold-debounce ==0.2.0.9 - - fold-debounce-conduit ==0.2.0.6 - - foldl ==1.4.11 - - folds ==0.7.6 - - follow-file ==0.0.3 - - FontyFruity ==0.5.3.5 - - foreign-store ==0.2 - - ForestStructures ==0.0.1.0 - - forkable-monad ==0.2.0.3 - - forma ==1.1.3 - - format-numbers ==0.1.0.1 - - formatting ==6.3.7 - - foundation ==0.0.26.1 - - fourmolu ==0.3.0.0 - - free ==5.1.5 - - free-categories ==0.2.0.2 - - 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 - - fsnotify ==0.3.0.1 - - fsnotify-conduit ==0.1.1.1 - - ftp-client ==0.5.1.4 - - ftp-client-conduit ==0.5.0.5 - - funcmp ==1.9 - - function-builder ==0.3.0.1 - - functor-classes-compat ==1.0.1 - - fusion-plugin ==0.2.2 - - fusion-plugin-types ==0.1.0 - - 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 - - gauge ==0.2.5 - - gd ==3000.7.3 - - gdp ==0.0.3.0 - - general-games ==1.1.1 - - generic-aeson ==0.2.0.12 - - generic-arbitrary ==0.1.0 - - generic-constraints ==1.1.1.1 - - generic-data ==0.9.2.0 - - generic-data-surgery ==0.3.0.0 - - generic-deriving ==1.13.1 - - generic-functor ==0.2.0.0 - - generic-lens ==2.1.0.0 - - generic-lens-core ==2.1.0.0 - - generic-monoid ==0.1.0.1 - - generic-optics ==2.1.0.0 - - GenericPretty ==1.2.2 - - generic-random ==1.3.0.1 - - generics-eot ==0.4.0.1 - - generics-sop ==0.5.1.1 - - generics-sop-lens ==0.2.0.1 - - geniplate-mirror ==0.7.7 - - genvalidity ==0.11.0.0 - - genvalidity-aeson ==0.3.0.0 - - genvalidity-bytestring ==0.6.0.0 - - genvalidity-containers ==0.9.0.0 - - genvalidity-criterion ==0.2.0.0 - - genvalidity-hspec ==0.7.0.4 - - genvalidity-hspec-aeson ==0.3.1.1 - - genvalidity-hspec-binary ==0.2.0.4 - - genvalidity-hspec-cereal ==0.2.0.4 - - genvalidity-hspec-hashable ==0.2.0.5 - - genvalidity-hspec-optics ==0.1.1.2 - - genvalidity-hspec-persistent ==0.0.0.1 - - genvalidity-mergeful ==0.2.0.0 - - genvalidity-mergeless ==0.2.0.0 - - genvalidity-path ==0.3.0.4 - - genvalidity-persistent ==0.0.0.0 - - genvalidity-property ==0.5.0.1 - - genvalidity-scientific ==0.2.1.1 - - genvalidity-sydtest ==0.0.0.0 - - genvalidity-sydtest-aeson ==0.0.0.0 - - genvalidity-sydtest-hashable ==0.0.0.0 - - genvalidity-sydtest-lens ==0.0.0.0 - - genvalidity-sydtest-persistent ==0.0.0.1 - - genvalidity-text ==0.7.0.2 - - genvalidity-time ==0.3.0.0 - - genvalidity-typed-uuid ==0.0.0.2 - - genvalidity-unordered-containers ==0.3.0.1 - - genvalidity-uuid ==0.1.0.4 - - genvalidity-vector ==0.3.0.1 - - geojson ==4.0.2 - - getopt-generics ==0.13.0.4 - - ghc-byteorder ==4.11.0.0.10 - - ghc-check ==0.5.0.4 - - ghc-core ==0.5.6 - - ghc-events ==0.16.0 - - ghc-exactprint ==0.6.4 - - ghcid ==0.8.7 - - ghci-hexcalc ==0.1.1.0 - - ghcjs-codemirror ==0.0.0.2 - - ghc-lib ==8.10.4.20210206 - - ghc-lib-parser ==8.10.4.20210206 - - ghc-lib-parser-ex ==8.10.0.19 - - ghc-parser ==0.2.3.0 - - ghc-paths ==0.1.0.12 - - ghc-prof ==1.4.1.8 - - ghc-source-gen ==0.4.0.0 - - ghc-syntax-highlighter ==0.0.6.0 - - ghc-tcplugins-extra ==0.4.1 - - ghc-trace-events ==0.1.2.2 - - ghc-typelits-extra ==0.4.2 - - ghc-typelits-knownnat ==0.7.5 - - ghc-typelits-natnormalise ==0.7.4 - - ghc-typelits-presburger ==0.6.0.0 - - ghost-buster ==0.1.1.0 - - gi-atk ==2.0.22 - - gi-cairo ==1.0.24 - - gi-cairo-connector ==0.1.0 - - gi-cairo-render ==0.1.0 - - gi-dbusmenu ==0.4.8 - - gi-dbusmenugtk3 ==0.4.9 - - gi-gdk ==3.0.23 - - gi-gdkpixbuf ==2.0.24 - - gi-gdkx11 ==3.0.10 - - gi-gio ==2.0.27 - - gi-glib ==2.0.24 - - gi-gobject ==2.0.25 - - gi-graphene ==1.0.2 - - gi-gtk ==3.0.36 - - gi-gtk-hs ==0.3.9 - - gi-harfbuzz ==0.0.3 - - ginger ==0.10.1.0 - - gingersnap ==0.3.1.0 - - gi-pango ==1.0.23 - - githash ==0.1.5.0 - - github-release ==1.3.7 - - github-rest ==1.0.3 - - github-types ==0.2.1 - - github-webhooks ==0.15.0 - - gitlab-haskell ==0.2.5 - - gitrev ==1.3.1 - - gi-xlib ==2.0.9 - - gl ==0.9 - - glabrous ==2.0.3 - - GLFW-b ==3.3.0.0 - - Glob ==0.10.1 - - gloss ==1.13.2.1 - - gloss-rendering ==1.13.1.1 - - GLURaw ==2.0.0.4 - - GLUT ==2.7.0.16 - - gluturtle ==0.0.58.1 - - gnuplot ==0.5.6.1 - - google-isbn ==1.0.3 - - gopher-proxy ==0.1.1.2 - - gothic ==0.1.6 - - gpolyline ==0.1.0.1 - - graph-core ==0.3.0.0 - - graphite ==0.10.0.1 - - graphql-client ==1.1.1 - - graphs ==0.7.1 - - graphula ==2.0.0.4 - - graphviz ==2999.20.1.0 - - graph-wrapper ==0.2.6.0 - - gravatar ==0.8.0 - - greskell ==1.2.0.1 - - greskell-core ==0.1.3.6 - - greskell-websocket ==0.1.2.5 - - groom ==0.1.2.1 - - group-by-date ==0.1.0.4 - - groups ==0.5.2 - - gtk-sni-tray ==0.1.6.0 - - gtk-strut ==0.1.3.0 - - guarded-allocation ==0.0.1 - - H ==0.9.0.1 - - hackage-db ==2.1.0 - - hackage-security ==0.6.0.1 - - haddock-library ==1.9.0 - - hadoop-streaming ==0.2.0.3 - - hakyll-convert ==0.3.0.4 - - half ==0.3.1 - - hall-symbols ==0.1.0.6 - - hamtsolo ==1.0.3 - - HandsomeSoup ==0.4.2 - - hapistrano ==0.4.1.3 - - happstack-server ==7.7.0 - - happy ==1.20.0 - - happy-meta ==0.2.0.11 - - HasBigDecimal ==0.1.1 - - hasbolt ==0.1.4.4 - - hashable ==1.3.0.0 - - hashable-time ==0.2.1 - - hashids ==1.0.2.4 - - hashing ==0.1.0.1 - - hashmap ==1.3.3 - - hashtables ==1.2.4.1 - - haskeline ==0.8.1.2 - - haskell-awk ==1.2 - - haskell-gi ==0.24.7 - - haskell-gi-base ==0.24.5 - - haskell-gi-overloading ==1.0 - - haskell-import-graph ==1.0.4 - - haskell-lexer ==1.1 - - haskell-lsp ==0.22.0.0 - - haskell-lsp-types ==0.22.0.0 - - haskell-names ==0.9.9 - - HaskellNet ==0.6 - - haskell-src ==1.0.3.1 - - haskell-src-exts ==1.23.1 - - haskell-src-exts-util ==0.2.5 - - haskell-src-meta ==0.8.7 - - haskey-btree ==0.3.0.1 - - hasql ==1.4.5.1 - - hasql-notifications ==0.2.0.0 - - hasql-optparse-applicative ==0.3.0.6 - - hasql-pool ==0.5.2 - - hasql-queue ==1.2.0.2 - - hasql-transaction ==1.0.0.2 - - hasty-hamiltonian ==1.3.4 - - HaTeX ==3.22.3.0 - - HaXml ==1.25.5 - - haxr ==3000.11.4.1 - - HCodecs ==0.5.2 - - hdaemonize ==0.5.6 - - HDBC ==2.4.0.3 - - HDBC-session ==0.1.2.0 - - headroom ==0.4.1.0 - - heap ==1.0.4 - - heaps ==0.4 - - hebrew-time ==0.1.2 - - hedgehog ==1.0.5 - - hedgehog-corpus ==0.2.0 - - hedgehog-fakedata ==0.0.1.4 - - hedgehog-fn ==1.0 - - hedgehog-quickcheck ==0.1.1 - - hedis ==0.14.2 - - hedn ==0.3.0.2 - - here ==1.2.13 - - heredoc ==0.2.0.0 - - heterocephalus ==1.0.5.4 - - hexml ==0.3.4 - - hexml-lens ==0.2.1 - - hexpat ==0.20.13 - - hformat ==0.3.3.1 - - hfsevents ==0.1.6 - - hgrev ==0.2.6 - - hidapi ==0.1.7 - - hie-bios ==0.7.5 - - hi-file-parser ==0.1.2.0 - - higher-leveldb ==0.6.0.0 - - highlighting-kate ==0.6.4 - - hinfo ==0.0.3.0 - - hinotify ==0.4.1 - - hint ==0.9.0.4 - - hjsmin ==0.2.0.4 - - hkd-default ==1.1.0.0 - - hkgr ==0.2.7 - - hlibcpuid ==0.2.0 - - hlibgit2 ==0.18.0.16 - - hlibsass ==0.1.10.1 - - hmatrix ==0.20.2 - - hmatrix-backprop ==0.1.3.0 - - hmatrix-gsl ==0.19.0.1 - - hmatrix-gsl-stats ==0.4.1.8 - - hmatrix-morpheus ==0.1.1.2 - - hmatrix-vector-sized ==0.1.3.0 - - hmm-lapack ==0.4 - - hmpfr ==0.4.4 - - hnock ==0.4.0 - - hoauth2 ==1.16.0 - - hocon ==0.1.0.4 - - hOpenPGP ==2.9.5 - - hopenpgp-tools ==0.23.6 - - hopfli ==0.2.2.1 - - hosc ==0.18.1 - - hostname ==1.0 - - hostname-validate ==1.0.0 - - hourglass ==0.2.12 - - hourglass-orphans ==0.1.0.0 - - hp2pretty ==0.10 - - hpack ==0.34.4 - - hpack-dhall ==0.5.2 - - hpc-codecov ==0.3.0.0 - - hpc-lcov ==1.0.1 - - hprotoc ==2.4.17 - - hruby ==0.3.8.1 - - hsass ==0.8.0 - - hs-bibutils ==6.10.0.0 - - hsc2hs ==0.68.7 - - hscolour ==1.24.4 - - hsdns ==1.8 - - hsebaysdk ==0.4.1.0 - - hsemail ==2.2.1 - - hs-functors ==0.1.7.1 - - hs-GeoIP ==0.3 - - hsini ==0.5.1.2 - - hsinstall ==2.6 - - HSlippyMap ==3.0.1 - - hslogger ==1.3.1.0 - - hslua ==1.3.0.1 - - hslua-aeson ==1.0.3.1 - - hslua-module-doclayout ==0.2.0.1 - - hslua-module-path ==0.1.0.1 - - hslua-module-system ==0.2.2.1 - - hslua-module-text ==0.3.0.1 - - HsOpenSSL ==0.11.7 - - HsOpenSSL-x509-system ==0.1.0.4 - - hsp ==0.10.0 - - hspec ==2.7.10 - - hspec-attoparsec ==0.1.0.2 - - hspec-checkers ==0.1.0.2 - - hspec-contrib ==0.5.1 - - hspec-core ==2.7.10 - - hspec-discover ==2.7.10 - - hspec-expectations ==0.8.2 - - hspec-expectations-json ==1.0.0.3 - - hspec-expectations-lifted ==0.10.0 - - hspec-expectations-pretty-diff ==0.7.2.5 - - hspec-golden ==0.1.0.3 - - hspec-golden-aeson ==0.7.0.0 - - hspec-hedgehog ==0.0.1.2 - - hspec-junit-formatter ==1.0.0.2 - - hspec-leancheck ==0.0.4 - - hspec-megaparsec ==2.2.0 - - hspec-meta ==2.7.8 - - hspec-need-env ==0.1.0.6 - - hspec-parsec ==0 - - hspec-smallcheck ==0.5.2 - - hspec-tables ==0.0.1 - - hspec-wai ==0.11.0 - - hspec-wai-json ==0.11.0 - - hs-php-session ==0.0.9.3 - - hsshellscript ==3.5.0 - - hs-tags ==0.1.5 - - HStringTemplate ==0.8.7 - - HSvm ==0.1.1.3.22 - - HsYAML ==0.2.1.0 - - HsYAML-aeson ==0.2.0.0 - - hsyslog ==5.0.2 - - htaglib ==1.2.0 - - HTF ==0.14.0.6 - - html ==1.0.1.2 - - html-conduit ==1.3.2.1 - - html-entities ==1.1.4.5 - - html-entity-map ==0.1.0.0 - - htoml ==1.0.0.3 - - http2 ==3.0.1 - - HTTP ==4000.3.16 - - http-api-data ==0.4.2 - - http-client ==0.6.4.1 - - http-client-openssl ==0.3.2.0 - - http-client-overrides ==0.1.1.0 - - http-client-tls ==0.3.5.3 - - http-common ==0.8.2.1 - - http-conduit ==2.3.8 - - http-date ==0.0.11 - - http-directory ==0.1.8 - - http-download ==0.2.0.0 - - httpd-shed ==0.4.1.1 - - http-link-header ==1.2.0 - - http-media ==0.8.0.0 - - http-query ==0.1.0.1 - - http-reverse-proxy ==0.6.0 - - http-streams ==0.8.7.2 - - http-types ==0.12.3 - - human-readable-duration ==0.2.1.4 - - HUnit ==1.6.2.0 - - HUnit-approx ==1.1.1.1 - - hunit-dejafu ==2.0.0.4 - - hvect ==0.4.0.0 - - hvega ==0.11.0.1 - - hw-balancedparens ==0.4.1.1 - - hw-bits ==0.7.2.1 - - hw-conduit ==0.2.1.0 - - hw-conduit-merges ==0.2.1.0 - - hw-diagnostics ==0.0.1.0 - - hw-dsv ==0.4.1.0 - - hweblib ==0.6.3 - - hw-eliasfano ==0.1.2.0 - - hw-excess ==0.2.3.0 - - hw-fingertree ==0.1.2.0 - - hw-fingertree-strict ==0.1.2.0 - - hw-hedgehog ==0.1.1.0 - - hw-hspec-hedgehog ==0.1.1.0 - - hw-int ==0.0.2.0 - - hw-ip ==2.4.2.0 - - hw-json ==1.3.2.2 - - hw-json-simd ==0.1.1.0 - - hw-json-simple-cursor ==0.1.1.0 - - hw-json-standard-cursor ==0.2.3.1 - - hw-kafka-client ==4.0.3 - - hw-mquery ==0.2.1.0 - - hw-packed-vector ==0.2.1.0 - - hw-parser ==0.1.1.0 - - hw-prim ==0.6.3.0 - - hw-rankselect ==0.13.4.0 - - hw-rankselect-base ==0.3.4.1 - - hw-simd ==0.1.2.0 - - hw-streams ==0.0.1.0 - - hw-string-parse ==0.0.0.4 - - hw-succinct ==0.1.0.1 - - hw-xml ==0.5.1.0 - - hxt ==9.3.1.22 - - hxt-charproperties ==9.5.0.0 - - hxt-css ==0.1.0.3 - - hxt-curl ==9.1.1.1 - - hxt-expat ==9.1.1 - - hxt-http ==9.1.5.2 - - hxt-regex-xmlschema ==9.2.0.7 - - hxt-tagsoup ==9.1.4 - - hxt-unicode ==9.0.2.4 - - hybrid-vectors ==0.2.2 - - hyper ==0.2.1.0 - - hyperloglog ==0.4.4 - - hyphenation ==0.8.1 - - iconv ==0.4.1.3 - - identicon ==0.2.2 - - ieee754 ==0.8.0 - - if ==0.1.0.0 - - iff ==0.0.6 - - ihaskell ==0.10.2.0 - - ihs ==0.1.0.3 - - ilist ==0.4.0.1 - - imagesize-conduit ==1.1 - - Imlib ==0.1.2 - - immortal ==0.3 - - immortal-queue ==0.1.0.1 - - inbox ==0.1.0 - - include-file ==0.1.0.4 - - incremental-parser ==0.5.0.2 - - indents ==0.5.0.1 - - indexed ==0.1.3 - - indexed-containers ==0.1.0.2 - - indexed-list-literals ==0.2.1.3 - - indexed-profunctors ==0.1.1 - - indexed-traversable ==0.1.1 - - indexed-traversable-instances ==0.1 - - infer-license ==0.2.0 - - inflections ==0.4.0.6 - - influxdb ==1.9.1.2 - - ini ==0.4.1 - - inj ==1.0 - - inline-c ==0.9.1.4 - - inline-c-cpp ==0.4.0.3 - - inline-r ==0.10.4 - - inliterate ==0.1.0 - - input-parsers ==0.2.2 - - insert-ordered-containers ==0.2.4 - - inspection-testing ==0.4.4.0 - - instance-control ==0.1.2.0 - - int-cast ==0.2.0.0 - - integer-logarithms ==1.0.3.1 - - integer-roots ==1.0 - - integration ==0.2.1 - - intern ==0.9.4 - - interpolate ==0.2.1 - - interpolatedstring-perl6 ==1.0.2 - - interpolation ==0.1.1.1 - - interpolator ==1.1.0.2 - - IntervalMap ==0.6.1.2 - - intervals ==0.9.2 - - intro ==0.9.0.0 - - intset-imperative ==0.1.0.0 - - invariant ==0.5.4 - - invertible ==0.2.0.7 - - invertible-grammar ==0.1.3 - - io-machine ==0.2.0.0 - - io-manager ==0.1.0.3 - - io-memoize ==1.1.1.0 - - io-region ==0.1.1 - - io-storage ==0.3 - - io-streams ==1.5.2.0 - - io-streams-haproxy ==1.0.1.0 - - ip6addr ==1.0.2 - - ipa ==0.3 - - iproute ==1.7.11 - - IPv6Addr ==2.0.2 - - ipynb ==0.1.0.1 - - ipython-kernel ==0.10.2.1 - - irc ==0.6.1.0 - - irc-client ==1.1.2.0 - - irc-conduit ==0.3.0.4 - - irc-ctcp ==0.1.3.0 - - isbn ==1.1.0.2 - - islink ==0.1.0.0 - - iso3166-country-codes ==0.20140203.8 - - iso639 ==0.1.0.3 - - iso8601-time ==0.1.5 - - iterable ==3.0 - - ixset-typed ==0.5 - - ixset-typed-binary-instance ==0.1.0.2 - - ixset-typed-conversions ==0.1.2.0 - - ixset-typed-hashable-instance ==0.1.0.2 - - ix-shapable ==0.1.0 - - jack ==0.7.2 - - jalaali ==1.0.0.0 - - jira-wiki-markup ==1.3.4 - - jose ==0.8.4 - - jose-jwt ==0.9.2 - - js-chart ==2.9.4.1 - - js-dgtable ==0.5.2 - - js-flot ==0.8.3 - - js-jquery ==3.3.1 - - json-feed ==1.0.12 - - jsonpath ==0.2.0.0 - - json-rpc ==1.0.3 - - json-rpc-generic ==0.2.1.5 - - JuicyPixels ==3.3.5 - - JuicyPixels-blurhash ==0.1.0.3 - - JuicyPixels-extra ==0.4.1 - - JuicyPixels-scale-dct ==0.1.2 - - junit-xml ==0.1.0.2 - - justified-containers ==0.3.0.0 - - jwt ==0.10.0 - - kan-extensions ==5.2.2 - - kanji ==3.4.1 - - katip ==0.8.5.0 - - katip-logstash ==0.1.0.0 - - kawhi ==0.3.0 - - kazura-queue ==0.1.0.4 - - kdt ==0.2.4 - - keep-alive ==0.2.0.0 - - keycode ==0.2.2 - - keys ==3.12.3 - - ki ==0.2.0.1 - - kind-apply ==0.3.2.0 - - kind-generics ==0.4.1.0 - - kind-generics-th ==0.2.2.2 - - kmeans ==0.1.3 - - koji ==0.0.1 - - koofr-client ==1.0.0.3 - - krank ==0.2.2 - - kubernetes-webhook-haskell ==0.2.0.3 - - l10n ==0.1.0.1 - - labels ==0.3.3 - - lackey ==1.0.14 - - LambdaHack ==0.10.2.0 - - lame ==0.2.0 - - language-avro ==0.1.3.1 - - language-bash ==0.9.2 - - language-c ==0.8.3 - - language-c-quote ==0.12.2.1 - - language-docker ==9.3.0 - - language-java ==0.2.9 - - language-javascript ==0.7.1.0 - - language-protobuf ==1.0.1 - - language-python ==0.5.8 - - language-thrift ==0.12.0.0 - - lapack ==0.3.2 - - lapack-carray ==0.0.3 - - lapack-comfort-array ==0.0.0.1 - - lapack-ffi ==0.0.3 - - lapack-ffi-tools ==0.1.2.1 - - largeword ==1.2.5 - - latex ==0.1.0.4 - - lattices ==2.0.2 - - lawful ==0.1.0.0 - - lazy-csv ==0.5.1 - - lazyio ==0.1.0.4 - - lca ==0.4 - - leancheck ==0.9.4 - - leancheck-instances ==0.0.4 - - leapseconds-announced ==2017.1.0.1 - - learn-physics ==0.6.5 - - lens ==4.19.2 - - lens-action ==0.2.5 - - lens-aeson ==1.1.1 - - lens-csv ==0.1.1.0 - - lens-datetime ==0.3 - - lens-family ==2.0.0 - - lens-family-core ==2.0.0 - - lens-family-th ==0.5.2.0 - - lens-misc ==0.0.2.0 - - lens-process ==0.4.0.0 - - lens-properties ==4.11.1 - - lens-regex ==0.1.3 - - lens-regex-pcre ==1.1.0.0 - - lenz ==0.4.2.0 - - leveldb-haskell ==0.6.5 - - libffi ==0.1 - - libgit ==0.3.1 - - libgraph ==1.14 - - libjwt-typed ==0.2 - - libmpd ==0.10.0.0 - - liboath-hs ==0.0.1.2 - - libyaml ==0.1.2 - - LibZip ==1.0.1 - - lifted-async ==0.10.2 - - lifted-base ==0.2.3.12 - - lift-generics ==0.2 - - lift-type ==0.1.0.1 - - line ==4.0.1 - - linear ==1.21.5 - - linear-circuit ==0.1.0.2 - - linenoise ==0.3.2 - - linux-file-extents ==0.2.0.0 - - linux-namespaces ==0.1.3.0 - - liquid-fixpoint ==0.8.10.2 - - List ==0.6.2 - - ListLike ==4.7.4 - - list-predicate ==0.1.0.1 - - listsafe ==0.1.0.1 - - list-singleton ==1.0.0.5 - - list-t ==1.0.4 - - ListTree ==0.2.3 - - little-rio ==0.2.2 - - llvm-hs ==9.0.1 - - llvm-hs-pure ==9.0.0 - - lmdb ==0.2.5 - - load-env ==0.2.1.0 - - loc ==0.1.3.10 - - locators ==0.3.0.3 - - loch-th ==0.2.2 - - lockfree-queue ==0.2.3.1 - - log-domain ==0.13.1 - - logfloat ==0.13.3.3 - - logging ==3.0.5 - - logging-facade ==0.3.0 - - logging-facade-syslog ==1 - - logict ==0.7.1.0 - - logstash ==0.1.0.1 - - loop ==0.3.0 - - lrucache ==1.2.0.1 - - lrucaching ==0.3.3 - - lsp-test ==0.11.0.5 - - lucid ==2.9.12.1 - - lucid-cdn ==0.2.2.0 - - lucid-extras ==0.2.2 - - lukko ==0.1.1.3 - - lz4-frame-conduit ==0.1.0.1 - - lzma ==0.0.0.3 - - lzma-conduit ==1.2.1 - - machines ==0.7.2 - - magic ==1.1 - - magico ==0.0.2.1 - - mainland-pretty ==0.7.0.1 - - main-tester ==0.2.0.1 - - makefile ==1.1.0.0 - - managed ==1.0.8 - - MapWith ==0.2.0.0 - - markdown ==0.1.17.4 - - markdown-unlit ==0.5.1 - - markov-chain ==0.0.3.4 - - massiv ==0.6.0.0 - - massiv-io ==0.4.1.0 - - massiv-persist ==0.1.0.0 - - massiv-serialise ==0.1.0.0 - - massiv-test ==0.1.6.1 - - mathexpr ==0.3.0.0 - - math-extras ==0.1.1.0 - - math-functions ==0.3.4.2 - - matplotlib ==0.7.5 - - matrices ==0.5.0 - - matrix ==0.3.6.1 - - matrix-as-xyz ==0.1.2.2 - - matrix-market-attoparsec ==0.1.1.3 - - matrix-static ==0.3 - - maximal-cliques ==0.1.1 - - mbox ==0.3.4 - - mbox-utility ==0.0.3.1 - - mcmc ==0.4.0.0 - - mcmc-types ==1.0.3 - - medea ==1.2.0 - - median-stream ==0.7.0.0 - - med-module ==0.1.2.1 - - megaparsec ==9.0.1 - - megaparsec-tests ==9.0.1 - - membrain ==0.0.0.2 - - memory ==0.15.0 - - MemoTrie ==0.6.10 - - mercury-api ==0.1.0.2 - - mergeful ==0.2.0.0 - - mergeless ==0.3.0.0 - - mersenne-random-pure64 ==0.2.2.0 - - messagepack ==0.5.4 - - metrics ==0.4.1.1 - - mfsolve ==0.3.2.0 - - microlens ==0.4.12.0 - - microlens-aeson ==2.3.1 - - microlens-contra ==0.1.0.2 - - microlens-ghc ==0.4.13 - - microlens-mtl ==0.2.0.1 - - microlens-platform ==0.4.2 - - microlens-process ==0.2.0.2 - - microlens-th ==0.4.3.9 - - microspec ==0.2.1.3 - - microstache ==1.0.1.2 - - midair ==0.2.0.1 - - midi ==0.2.2.2 - - mighty-metropolis ==2.0.0 - - mime-mail ==0.5.1 - - mime-mail-ses ==0.4.3 - - mime-types ==0.1.0.9 - - mini-egison ==1.0.0 - - minimal-configuration ==0.1.4 - - minimorph ==0.3.0.0 - - minio-hs ==1.5.3 - - miniutter ==0.5.1.1 - - min-max-pqueue ==0.1.0.2 - - mintty ==0.1.2 - - missing-foreign ==0.1.1 - - MissingH ==1.4.3.0 - - mixed-types-num ==0.4.1 - - mltool ==0.2.0.1 - - mmap ==0.5.9 - - mmark ==0.0.7.2 - - mmark-cli ==0.0.5.0 - - mmark-ext ==0.2.1.3 - - mmorph ==1.1.5 - - mnist-idx ==0.1.2.8 - - mockery ==0.3.5 - - mock-time ==0.1.0 - - mod ==0.1.2.2 - - model ==0.5 - - modern-uri ==0.3.4.1 - - modular ==0.1.0.8 - - monad-chronicle ==1.0.0.1 - - monad-control ==1.0.2.3 - - monad-control-aligned ==0.0.1.1 - - monad-coroutine ==0.9.1 - - monad-extras ==0.6.0 - - monadic-arrays ==0.2.2 - - monad-journal ==0.8.1 - - monadlist ==0.0.2 - - monad-logger ==0.3.36 - - monad-logger-json ==0.1.0.0 - - monad-logger-logstash ==0.1.0.0 - - monad-logger-prefix ==0.1.12 - - monad-loops ==0.4.3 - - monad-memo ==0.5.3 - - monad-metrics ==0.2.2.0 - - monad-par ==0.3.5 - - monad-parallel ==0.7.2.4 - - monad-par-extras ==0.3.3 - - monad-peel ==0.2.1.2 - - monad-primitive ==0.1 - - monad-products ==4.0.1 - - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.5.3 - - 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 - - mongoDB ==2.7.0.0 - - 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 - - more-containers ==0.2.2.2 - - morpheus-graphql ==0.17.0 - - morpheus-graphql-app ==0.17.0 - - morpheus-graphql-client ==0.17.0 - - morpheus-graphql-core ==0.17.0 - - morpheus-graphql-subscriptions ==0.17.0 - - moss ==0.2.0.0 - - mountpoints ==1.0.2 - - mpi-hs ==0.7.2.0 - - mpi-hs-binary ==0.1.1.0 - - 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 - - multimap ==1.2.1 - - multipart ==0.2.1 - - multiset ==0.3.4.3 - - multistate ==0.8.0.3 - - murmur3 ==1.0.4 - - murmur-hash ==0.1.0.9 - - MusicBrainz ==0.4.1 - - mustache ==2.3.1 - - mutable-containers ==0.3.4 - - mwc-probability ==2.3.1 - - mwc-random ==0.14.0.0 - - mwc-random-monad ==0.7.3.1 - - mx-state-codes ==1.0.0.0 - - mysql ==0.2.0.1 - - mysql-simple ==0.4.5 - - n2o ==0.11.1 - - nagios-check ==0.3.2 - - names-th ==0.3.0.1 - - nano-erl ==0.1.0.1 - - nanospec ==0.2.2 - - nats ==1.1.2 - - natural-induction ==0.2.0.0 - - natural-sort ==0.1.2 - - natural-transformation ==0.4 - - ndjson-conduit ==0.1.0.5 - - neat-interpolation ==0.5.1.2 - - netcode-io ==0.0.2 - - netlib-carray ==0.1 - - netlib-comfort-array ==0.0.0.1 - - netlib-ffi ==0.1.1 - - netpbm ==1.0.4 - - nettle ==0.3.0 - - netwire ==5.0.3 - - netwire-input ==0.0.7 - - netwire-input-glfw ==0.0.11 - - network ==3.1.1.1 - - network-bsd ==2.8.1.0 - - network-byte-order ==0.1.6 - - network-conduit-tls ==1.3.2 - - network-info ==0.2.0.10 - - network-ip ==0.3.0.3 - - network-messagepack-rpc ==0.1.2.0 - - network-messagepack-rpc-websocket ==0.1.1.1 - - network-run ==0.2.4 - - network-simple ==0.4.5 - - network-simple-tls ==0.4 - - network-transport ==0.5.4 - - network-transport-composed ==0.2.1 - - network-uri ==2.6.4.1 - - newtype ==0.2.2.0 - - newtype-generics ==0.6 - - nicify-lib ==1.0.1 - - NineP ==0.0.2.1 - - nix-derivation ==1.1.2 - - nix-paths ==1.0.1 - - nonce ==1.0.7 - - nondeterminism ==1.4 - - non-empty ==0.3.3 - - nonempty-containers ==0.3.4.1 - - nonemptymap ==0.0.6.0 - - non-empty-sequence ==0.2.0.4 - - nonempty-vector ==0.2.1.0 - - nonempty-zipper ==1.0.0.2 - - non-negative ==0.1.2 - - not-gloss ==0.7.7.0 - - no-value ==1.0.0.0 - - nowdoc ==0.1.1.0 - - nqe ==0.6.3 - - nri-env-parser ==0.1.0.7 - - nri-observability ==0.1.0.2 - - nri-prelude ==0.6.0.0 - - nsis ==0.3.3 - - numbers ==3000.2.0.2 - - numeric-extras ==0.1 - - numeric-prelude ==0.4.3.3 - - numhask ==0.6.0.2 - - NumInstances ==1.4 - - numtype-dk ==0.5.0.2 - - nuxeo ==0.3.2 - - nvim-hs ==2.1.0.4 - - nvim-hs-contrib ==2.0.0.0 - - nvim-hs-ghcid ==2.0.0.0 - - oauthenticated ==0.2.1.0 - - ObjectName ==1.1.0.1 - - o-clock ==1.2.0.1 - - odbc ==0.2.2 - - oeis2 ==1.0.5 - - ofx ==0.4.4.0 - - old-locale ==1.0.0.7 - - old-time ==1.1.0.3 - - once ==0.4 - - one-liner ==1.0 - - one-liner-instances ==0.1.2.1 - - OneTuple ==0.2.2.1 - - Only ==0.1 - - oo-prototypes ==0.1.0.0 - - opaleye ==0.7.1.0 - - OpenAL ==1.7.0.5 - - openapi3 ==3.1.0 - - open-browser ==0.2.1.0 - - openexr-write ==0.1.0.2 - - OpenGL ==3.0.3.0 - - OpenGLRaw ==3.3.4.0 - - openpgp-asciiarmor ==0.1.2 - - opensource ==0.1.1.0 - - openssl-streams ==1.2.3.0 - - opentelemetry ==0.6.1 - - opentelemetry-extra ==0.6.1 - - opentelemetry-lightstep ==0.6.1 - - opentelemetry-wai ==0.6.1 - - operational ==0.2.3.5 - - operational-class ==0.3.0.0 - - optics ==0.3 - - optics-core ==0.3.0.1 - - optics-extra ==0.3 - - optics-th ==0.3.0.2 - - optics-vl ==0.2.1 - - optional-args ==1.0.2 - - options ==1.2.1.1 - - optparse-applicative ==0.16.1.0 - - optparse-generic ==1.4.4 - - optparse-simple ==0.1.1.3 - - optparse-text ==0.1.1.0 - - ordered-containers ==0.2.2 - - ormolu ==0.1.4.1 - - overhang ==1.0.0 - - packcheck ==0.5.1 - - packdeps ==0.6.0.0 - - pager ==0.1.1.0 - - pagination ==0.2.2 - - pagure-cli ==0.2 - - pandoc ==2.13 - - pandoc-dhall-decoder ==0.1.0.1 - - pandoc-plot ==1.1.1 - - pandoc-throw ==0.1.0.0 - - pandoc-types ==1.22 - - pantry ==0.5.1.5 - - parallel ==3.2.2.0 - - parallel-io ==0.3.3 - - parameterized ==0.5.0.0 - - paripari ==0.7.0.0 - - parseargs ==0.2.0.9 - - parsec-class ==1.0.0.0 - - parsec-numbers ==0.1.0 - - parsec-numeric ==0.1.0.0 - - ParsecTools ==0.0.2.0 - - parser-combinators ==1.2.1 - - parser-combinators-tests ==1.2.1 - - parsers ==0.12.10 - - partial-handler ==1.0.3 - - partial-isomorphisms ==0.2.2.1 - - partial-semigroup ==0.5.1.8 - - password ==3.0.0.0 - - password-instances ==3.0.0.0 - - password-types ==1.0.0.0 - - path ==0.7.0 - - path-binary-instance ==0.1.0.1 - - path-extensions ==0.1.1.0 - - path-extra ==0.2.0 - - path-io ==1.6.2 - - path-like ==0.2.0.2 - - path-pieces ==0.2.1 - - path-text-utf8 ==0.0.1.6 - - pathtype ==0.8.1.1 - - pathwalk ==0.3.1.2 - - pattern-arrows ==0.0.2 - - pava ==0.1.1.1 - - pcg-random ==0.1.3.7 - - pcre2 ==1.1.4 - - pcre-heavy ==1.0.0.2 - - pcre-light ==0.4.1.0 - - pcre-utils ==0.1.8.2 - - pdfinfo ==1.5.4 - - peano ==0.1.0.1 - - pem ==0.2.4 - - percent-format ==0.0.1 - - peregrin ==0.3.1 - - perfect-hash-generator ==0.2.0.6 - - perfect-vector-shuffle ==0.1.1.1 - - persist ==0.1.1.5 - - persistable-record ==0.6.0.5 - - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.11.0.4 - - persistent-documentation ==0.1.0.2 - - persistent-mtl ==0.2.1.0 - - persistent-mysql ==2.10.3.1 - - persistent-pagination ==0.1.1.2 - - persistent-postgresql ==2.11.0.1 - - persistent-qq ==2.9.2.1 - - persistent-sqlite ==2.11.1.0 - - persistent-template ==2.9.1.0 - - persistent-test ==2.0.3.5 - - persistent-typed-db ==0.1.0.2 - - pg-harness-client ==0.6.0 - - pgp-wordlist ==0.1.0.3 - - pg-transact ==0.3.1.1 - - phantom-state ==0.2.1.2 - - pid1 ==0.1.2.0 - - pinboard ==0.10.2.0 - - pipes ==4.3.15 - - pipes-aeson ==0.4.1.8 - - pipes-attoparsec ==0.5.1.5 - - pipes-binary ==0.4.2 - - pipes-bytestring ==2.1.7 - - pipes-concurrency ==2.0.12 - - pipes-csv ==1.4.3 - - pipes-extras ==1.0.15 - - pipes-fastx ==0.3.0.0 - - pipes-group ==1.0.12 - - pipes-http ==1.0.6 - - pipes-network ==0.6.5 - - pipes-network-tls ==0.4 - - pipes-ordered-zip ==1.2.1 - - pipes-parse ==3.0.9 - - pipes-random ==1.0.0.5 - - pipes-safe ==2.3.3 - - pipes-wai ==3.2.0 - - pkcs10 ==0.2.0.0 - - pkgtreediff ==0.4.1 - - place-cursor-at ==1.0.1 - - placeholders ==0.1 - - plaid ==0.1.0.4 - - plotlyhs ==0.2.1 - - pointed ==5.0.2 - - pointedlist ==0.6.1 - - pointless-fun ==1.1.0.6 - - poll ==0.0.0.2 - - poly ==0.5.0.0 - - poly-arity ==0.1.0 - - polynomials-bernstein ==1.1.2 - - polyparse ==1.13 - - polysemy ==1.5.0.0 - - polysemy-plugin ==0.3.0.0 - - pooled-io ==0.0.2.2 - - port-utils ==0.2.1.0 - - posix-paths ==0.2.1.6 - - possibly ==1.0.0.0 - - postgres-options ==0.2.0.0 - - postgresql-binary ==0.12.4 - - postgresql-libpq ==0.9.4.3 - - postgresql-libpq-notify ==0.2.0.0 - - postgresql-orm ==0.5.1 - - postgresql-simple ==0.6.4 - - postgresql-typed ==0.6.2.0 - - postgrest ==7.0.1 - - post-mess-age ==0.2.1.0 - - pptable ==0.3.0.0 - - pqueue ==1.4.1.3 - - prairie ==0.0.1.0 - - 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-diff ==0.4.0.3 - - pretty-hex ==1.1 - - prettyprinter ==1.7.0 - - prettyprinter-ansi-terminal ==1.1.2 - - prettyprinter-compat-annotated-wl-pprint ==1.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 ==4.0.0.0 - - pretty-sop ==0.2.0.3 - - pretty-terminal ==0.1.0.0 - - primes ==0.2.1.0 - - primitive ==0.7.1.0 - - primitive-addr ==0.1.0.2 - - primitive-extras ==0.10.1 - - primitive-unaligned ==0.1.1.1 - - primitive-unlifted ==0.1.3.0 - - print-console-colors ==0.1.0.0 - - probability ==0.2.7 - - process-extras ==0.7.4 - - product-isomorphic ==0.0.3.3 - - product-profunctors ==0.11.0.2 - - profiterole ==0.1 - - profunctors ==5.5.2 - - projectroot ==0.2.0.1 - - project-template ==0.2.1.0 - - prometheus ==2.2.2 - - prometheus-client ==1.0.1 - - prometheus-wai-middleware ==1.0.1.0 - - promises ==0.3 - - prompt ==0.1.1.2 - - prospect ==0.1.0.0 - - proto3-wire ==1.2.1 - - protobuf ==0.2.1.3 - - protobuf-simple ==0.1.1.0 - - protocol-buffers ==2.4.17 - - protocol-buffers-descriptor ==2.4.17 - - protocol-radius ==0.0.1.1 - - protocol-radius-test ==0.1.0.1 - - proto-lens ==0.7.0.0 - - proto-lens-protobuf-types ==0.7.0.0 - - proto-lens-protoc ==0.7.0.0 - - proto-lens-runtime ==0.7.0.0 - - proto-lens-setup ==0.4.0.4 - - protolude ==0.3.0 - - proxied ==0.3.1 - - psqueues ==0.2.7.2 - - publicsuffix ==0.20200526 - - pulse-simple ==0.1.14 - - pureMD5 ==2.1.3 - - purescript-bridge ==0.14.0.0 - - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==2.1.0.0 - - pvar ==1.0.0.0 - - PyF ==0.9.0.3 - - qchas ==1.1.0.1 - - qm-interpolated-string ==0.3.0.0 - - qrcode-core ==0.9.4 - - qrcode-juicypixels ==0.8.2 - - quadratic-irrational ==0.1.1 - - QuasiText ==0.1.2.6 - - QuickCheck ==2.14.2 - - quickcheck-arbitrary-adt ==0.3.1.0 - - quickcheck-assertions ==0.3.0 - - quickcheck-classes ==0.6.5.0 - - quickcheck-classes-base ==0.6.2.0 - - quickcheck-higherorder ==0.1.0.0 - - quickcheck-instances ==0.3.25.2 - - quickcheck-io ==0.2.0 - - quickcheck-simple ==0.1.1.1 - - quickcheck-special ==0.1.0.6 - - quickcheck-text ==0.1.2.1 - - quickcheck-transformer ==0.3.1.1 - - quickcheck-unicode ==1.0.1.0 - - quiet ==0.2 - - quote-quot ==0.2.0.0 - - radius ==0.7.1.0 - - rainbow ==0.34.2.2 - - rainbox ==0.26.0.0 - - ral ==0.2 - - rampart ==1.1.0.2 - - ramus ==0.1.2 - - rando ==0.0.0.4 - - random ==1.1 - - random-bytestring ==0.1.4 - - random-fu ==0.2.7.4 - - random-shuffle ==0.0.4 - - random-source ==0.3.0.8 - - random-tree ==0.6.0.5 - - range ==0.3.0.2 - - ranged-list ==0.1.0.0 - - Ranged-sets ==0.4.0 - - range-set-list ==0.1.3.1 - - rank1dynamic ==0.4.1 - - rank2classes ==1.4.1 - - Rasterific ==0.7.5.3 - - rasterific-svg ==0.3.3.2 - - ratel ==1.0.14 - - rate-limit ==1.4.2 - - ratel-wai ==1.1.5 - - rattle ==0.2 - - rattletrap ==11.1.0 - - Rattus ==0.5 - - rawfilepath ==0.2.4 - - rawstring-qm ==0.2.3.0 - - raw-strings-qq ==1.1 - - rcu ==0.2.5 - - rdf ==0.1.0.5 - - 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 - - rebase ==1.6.1 - - record-dot-preprocessor ==0.2.10 - - record-hasfield ==1.0 - - records-sop ==0.1.1.0 - - record-wrangler ==0.1.1.0 - - recursion-schemes ==5.2.2.1 - - reducers ==3.12.3 - - refact ==0.3.0.2 - - ref-fd ==0.4.0.2 - - refined ==0.6.2 - - reflection ==2.1.6 - - reform ==0.2.7.4 - - reform-blaze ==0.2.4.3 - - reform-hamlet ==0.0.5.3 - - reform-happstack ==0.2.5.4 - - RefSerialize ==0.4.0 - - ref-tf ==0.4.0.2 - - regex ==1.1.0.0 - - regex-applicative ==0.3.4 - - regex-applicative-text ==0.1.0.1 - - regex-base ==0.94.0.1 - - regex-compat ==0.95.2.1 - - regex-compat-tdfa ==0.95.1.4 - - regex-pcre ==0.95.0.0 - - regex-pcre-builtin ==0.95.2.3.8.43 - - regex-posix ==0.96.0.0 - - regex-tdfa ==1.3.1.0 - - regex-with-pcre ==1.1.0.0 - - registry ==0.2.0.3 - - reinterpret-cast ==0.1.0 - - relapse ==1.0.0.0 - - relational-query ==0.12.2.3 - - relational-query-HDBC ==0.7.2.0 - - relational-record ==0.2.2.0 - - relational-schemas ==0.1.8.0 - - reliable-io ==0.0.1 - - relude ==0.7.0.0 - - renderable ==0.2.0.1 - - replace-attoparsec ==1.4.4.0 - - replace-megaparsec ==1.4.4.0 - - repline ==0.4.0.0 - - req ==3.9.0 - - req-conduit ==1.0.0 - - rerebase ==1.6.1 - - rescue ==0.4.2.1 - - resistor-cube ==0.0.1.2 - - resolv ==0.1.2.0 - - resource-pool ==0.2.3.2 - - resourcet ==1.2.4.2 - - result ==0.2.6.0 - - rethinkdb-client-driver ==0.0.25 - - retry ==0.8.1.2 - - rev-state ==0.1.2 - - rfc1751 ==0.1.3 - - rfc5051 ==0.2 - - rhbzquery ==0.4.3 - - rhine ==0.7.0 - - rhine-gloss ==0.7.0 - - rigel-viz ==0.2.0.0 - - rio ==0.1.20.0 - - rio-orphans ==0.1.2.0 - - rio-prettyprint ==0.1.1.0 - - roc-id ==0.1.0.0 - - rocksdb-haskell ==1.0.1 - - rocksdb-haskell-jprupp ==2.1.3 - - rocksdb-query ==0.4.2 - - roles ==0.2.0.0 - - rope-utf16-splay ==0.3.2.0 - - rosezipper ==0.2 - - rot13 ==0.2.0.1 - - rpmbuild-order ==0.4.3.2 - - RSA ==2.4.1 - - runmemo ==1.0.0.1 - - rvar ==0.2.0.6 - - safe ==0.3.19 - - safe-coloured-text ==0.0.0.0 - - safecopy ==0.10.4.2 - - safe-decimal ==0.2.0.0 - - safe-exceptions ==0.1.7.1 - - safe-foldable ==0.1.0.0 - - safeio ==0.0.5.0 - - safe-json ==1.1.1.1 - - safe-money ==0.9 - - SafeSemaphore ==0.10.1 - - safe-tensor ==0.2.1.1 - - salak ==0.3.6 - - salak-yaml ==0.3.5.3 - - saltine ==0.1.1.1 - - salve ==1.0.11 - - sample-frame ==0.0.3 - - sample-frame-np ==0.0.4.1 - - sampling ==0.3.5 - - sandwich ==0.1.0.3 - - sandwich-slack ==0.1.0.3 - - sandwich-webdriver ==0.1.0.4 - - say ==0.1.0.1 - - sbp ==2.6.3 - - scalpel ==0.6.2 - - scalpel-core ==0.6.2 - - scanf ==0.1.0.0 - - scanner ==0.3.1 - - scheduler ==1.5.0 - - scientific ==0.3.6.2 - - scotty ==0.12 - - scrypt ==0.5.0 - - sdl2 ==2.5.3.0 - - sdl2-gfx ==0.2 - - sdl2-image ==2.0.0 - - sdl2-mixer ==1.1.0 - - sdl2-ttf ==2.1.2 - - search-algorithms ==0.3.1 - - secp256k1-haskell ==0.5.0 - - securemem ==0.1.10 - - selda ==0.5.1.0 - - selda-json ==0.1.1.0 - - selda-postgresql ==0.1.8.1 - - selda-sqlite ==0.1.7.1 - - selections ==0.3.0.0 - - selective ==0.4.2 - - semialign ==1.1.0.1 - - semialign-indexed ==1.1 - - semialign-optics ==1.1 - - semigroupoid-extras ==5 - - semigroupoids ==5.3.5 - - semigroups ==0.19.1 - - semirings ==0.6 - - semiring-simple ==1.0.0.1 - - semver ==0.4.0.1 - - sendfile ==0.7.11.1 - - sendgrid-v3 ==0.3.0.0 - - seqalign ==0.2.0.4 - - seqid ==0.6.2 - - seqid-streams ==0.7.2 - - sequence-formats ==1.6.1 - - sequenceTools ==1.4.0.5 - - serf ==0.1.1.0 - - serialise ==0.2.3.0 - - servant ==0.18.2 - - servant-auth ==0.4.0.0 - - servant-auth-client ==0.4.1.0 - - servant-auth-docs ==0.2.10.0 - - servant-auth-server ==0.4.6.0 - - servant-auth-swagger ==0.2.10.1 - - servant-blaze ==0.9.1 - - servant-client ==0.18.2 - - servant-client-core ==0.18.2 - - servant-conduit ==0.15.1 - - servant-docs ==0.11.8 - - servant-elm ==0.7.2 - - servant-errors ==0.1.6.0 - - servant-exceptions ==0.2.1 - - servant-exceptions-server ==0.2.1 - - servant-foreign ==0.15.3 - - servant-http-streams ==0.18.2 - - servant-machines ==0.15.1 - - servant-multipart ==0.12 - - servant-openapi3 ==2.0.1.2 - - servant-pipes ==0.15.2 - - servant-rawm ==1.0.0.0 - - servant-server ==0.18.2 - - servant-swagger ==1.1.10 - - servant-swagger-ui ==0.3.5.3.47.1 - - servant-swagger-ui-core ==0.3.5 - - serverless-haskell ==0.12.6 - - serversession ==1.0.2 - - serversession-frontend-wai ==1.0 - - ses-html ==0.4.0.0 - - set-cover ==0.1.1 - - setenv ==0.1.1.3 - - setlocale ==1.0.0.10 - - sexp-grammar ==2.3.0 - - SHA ==1.6.4.4 - - shake-language-c ==0.12.0 - - shake-plus ==0.3.3.1 - - shake-plus-extended ==0.4.1.0 - - shakespeare ==2.0.25 - - shared-memory ==0.2.0.0 - - shell-conduit ==5.0.0 - - shell-escape ==0.2.0 - - shellmet ==0.0.4.0 - - shelltestrunner ==1.9 - - shell-utility ==0.1 - - shelly ==1.9.0 - - shikensu ==0.3.11 - - shortcut-links ==0.5.1.1 - - should-not-typecheck ==2.1.0 - - show-combinators ==0.2.0.0 - - siggy-chardust ==1.0.0 - - signal ==0.1.0.4 - - silently ==1.2.5.1 - - simple-affine-space ==0.1.1 - - simple-cabal ==0.1.3 - - simple-cmd ==0.2.3 - - simple-cmd-args ==0.1.6 - - simple-log ==0.9.12 - - simple-reflect ==0.3.3 - - simple-sendfile ==0.2.30 - - simple-templates ==1.0.0 - - simple-vec3 ==0.6.0.1 - - simplistic-generics ==2.0.0 - - since ==0.0.0 - - singleton-bool ==0.1.5 - - singleton-nats ==0.4.5 - - singletons ==2.7 - - singletons-presburger ==0.6.0.0 - - siphash ==1.0.3 - - sitemap-gen ==0.1.0.0 - - sized ==1.0.0.0 - - skein ==1.0.9.4 - - skews ==0.1.0.3 - - skip-var ==0.1.1.0 - - skylighting ==0.10.5.1 - - skylighting-core ==0.10.5.1 - - slack-api ==0.12 - - slack-progressbar ==0.1.0.1 - - slick ==1.1.1.0 - - slist ==0.2.0.0 - - slynx ==0.5.0.2 - - smallcheck ==1.2.1 - - smash ==0.1.2 - - smash-aeson ==0.1.0.0 - - smash-lens ==0.1.0.1 - - smash-microlens ==0.1.0.0 - - smoothie ==0.4.2.11 - - smtp-mail ==0.3.0.0 - - snap-blaze ==0.2.1.5 - - snap-core ==1.0.4.2 - - snap-server ==1.1.2.0 - - snowflake ==0.1.1.1 - - soap ==0.2.3.6 - - soap-openssl ==0.1.0.2 - - soap-tls ==0.1.1.4 - - socket ==0.8.3.0 - - socks ==0.6.1 - - some ==1.0.3 - - sop-core ==0.5.0.1 - - sort ==1.0.0.0 - - sorted-list ==0.2.1.0 - - sourcemap ==0.1.6.1 - - sox ==0.2.3.1 - - soxlib ==0.0.3.1 - - spacecookie ==1.0.0.0 - - sparse-linear-algebra ==0.3.1 - - sparse-tensor ==0.2.1.5 - - spatial-math ==0.5.0.1 - - special-values ==0.1.0.0 - - speculate ==0.4.6 - - speedy-slice ==0.3.2 - - Spintax ==0.3.6 - - splice ==0.6.1.1 - - splint ==1.0.1.4 - - split ==0.2.3.4 - - splitmix ==0.1.0.3 - - spoon ==0.3.1 - - spreadsheet ==0.1.3.8 - - sqlcli ==0.2.2.0 - - sqlcli-odbc ==0.2.0.1 - - sqlite-simple ==0.4.18.0 - - sql-words ==0.1.6.4 - - squeal-postgresql ==0.7.0.1 - - squeather ==0.6.0.0 - - srcloc ==0.5.1.2 - - stache ==2.2.1 - - stackcollapse-ghc ==0.0.1.3 - - stack-templatizer ==0.1.0.2 - - stateref ==0.3 - - StateVar ==1.2.1 - - static-text ==0.2.0.6 - - statistics ==0.15.2.0 - - status-notifier-item ==0.3.0.5 - - stb-image-redux ==0.2.1.3 - - step-function ==0.2 - - stm-chans ==3.0.0.4 - - stm-conduit ==4.0.1 - - stm-containers ==1.2 - - stm-delay ==0.1.1.1 - - stm-extras ==0.1.0.3 - - stm-hamt ==1.2.0.6 - - stm-lifted ==2.5.0.0 - - STMonadTrans ==0.4.5 - - stm-split ==0.0.2.1 - - stopwatch ==0.1.0.6 - - storable-complex ==0.2.3.0 - - storable-endian ==0.2.6 - - storable-record ==0.0.5 - - storable-tuple ==0.0.3.3 - - storablevector ==0.2.13.1 - - store ==0.7.11 - - store-core ==0.4.4.4 - - store-streaming ==0.2.0.3 - - stratosphere ==0.59.1 - - streaming ==0.2.3.0 - - streaming-attoparsec ==1.0.0.1 - - streaming-bytestring ==0.2.0 - - streaming-commons ==0.2.2.1 - - streamly ==0.7.3 - - streams ==3.3 - - strict ==0.4.0.1 - - strict-concurrency ==0.2.4.3 - - strict-list ==0.1.5 - - strict-tuple ==0.1.4 - - 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.3.1.0 - - string-qq ==0.0.4 - - string-random ==0.1.4.1 - - stringsearch ==0.3.6.6 - - string-transform ==1.1.1 - - stripe-concepts ==1.0.2.6 - - stripe-core ==2.6.2 - - stripe-haskell ==2.6.2 - - stripe-http-client ==2.6.2 - - stripe-tests ==2.6.2 - - strive ==5.0.14 - - structs ==0.1.5 - - structured ==0.1.0.1 - - structured-cli ==2.7.0.1 - - subcategories ==0.1.1.0 - - sum-type-boilerplate ==0.1.1 - - sundown ==0.6 - - superbuffer ==0.3.1.1 - - svg-tree ==0.6.2.4 - - swagger ==0.3.0 - - swagger2 ==2.6 - - sweet-egison ==0.1.1.3 - - swish ==0.10.0.4 - - syb ==0.7.2.1 - - sydtest ==0.1.0.0 - - sydtest-discover ==0.0.0.0 - - sydtest-persistent-sqlite ==0.0.0.0 - - sydtest-servant ==0.0.0.0 - - sydtest-wai ==0.0.0.0 - - sydtest-yesod ==0.0.0.0 - - symbol ==0.2.4 - - symengine ==0.1.2.0 - - 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.2 - - tabular ==0.2.2.8 - - taffybar ==3.2.3 - - tagchup ==0.4.1.1 - - tagged ==0.8.6.1 - - tagged-binary ==0.2.0.1 - - tagged-identity ==0.1.3 - - tagged-transformer ==0.8.1 - - tagshare ==0.0 - - tagsoup ==0.14.8 - - tao ==1.0.0 - - tao-example ==1.0.0 - - tar ==0.5.1.1 - - tar-conduit ==0.3.2 - - tardis ==0.4.3.0 - - tasty ==1.4.1 - - tasty-ant-xml ==1.1.8 - - tasty-bench ==0.2.5 - - tasty-dejafu ==2.0.0.7 - - tasty-discover ==4.2.2 - - tasty-expected-failure ==0.12.3 - - tasty-focus ==1.0.1 - - tasty-golden ==2.3.4 - - tasty-hedgehog ==1.0.1.0 - - tasty-hspec ==1.1.6 - - tasty-hunit ==0.10.0.3 - - tasty-hunit-compat ==0.2.0.1 - - tasty-kat ==0.0.3 - - tasty-leancheck ==0.0.1 - - tasty-lua ==0.2.3.2 - - tasty-program ==1.0.5 - - tasty-quickcheck ==0.10.1.2 - - tasty-rerun ==1.1.18 - - tasty-silver ==3.2.1 - - tasty-smallcheck ==0.8.2 - - tasty-test-reporter ==0.1.1.4 - - tasty-th ==0.1.7 - - tasty-wai ==0.1.1.1 - - Taxonomy ==2.1.0 - - TCache ==0.12.1 - - tce-conf ==1.3 - - tdigest ==0.2.1.1 - - template-haskell-compat-v0208 ==0.1.5 - - temporary ==1.3 - - temporary-rc ==1.2.0.3 - - temporary-resourcet ==0.1.0.1 - - tensorflow-test ==0.1.0.0 - - tensors ==0.1.5 - - termbox ==0.3.0 - - terminal-progress-bar ==0.4.1 - - terminal-size ==0.3.2.1 - - test-framework ==0.8.2.0 - - test-framework-hunit ==0.3.0.2 - - test-framework-leancheck ==0.0.1 - - test-framework-quickcheck2 ==0.3.0.5 - - test-framework-smallcheck ==0.2 - - test-fun ==0.1.0.0 - - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.2 - - text-ansi ==0.1.1 - - text-binary ==0.2.1.1 - - text-builder ==0.6.6.2 - - text-conversions ==0.3.1 - - text-format ==0.3.2 - - 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.3.0.0 - - text-metrics ==0.3.0 - - text-postgresql ==0.0.3.1 - - text-printer ==0.5.0.1 - - text-regex-replace ==0.1.1.4 - - text-region ==0.3.1.0 - - text-short ==0.1.3 - - text-show ==3.9 - - text-show-instances ==3.8.4 - - text-zipper ==0.11 - - tfp ==1.0.2 - - tf-random ==0.5 - - th-abstraction ==0.4.2.0 - - th-bang-compat ==0.0.1.0 - - th-compat ==0.1.2 - - th-constraint-compat ==0.0.1.0 - - th-data-compat ==0.1.0.0 - - th-desugar ==1.11 - - th-env ==0.1.0.2 - - these ==1.1.1.1 - - these-lens ==1.0.1.2 - - these-optics ==1.0.1.2 - - these-skinny ==0.7.4 - - th-expand-syns ==0.4.8.0 - - th-extras ==0.0.0.4 - - th-lift ==0.8.2 - - th-lift-instances ==0.1.18 - - th-nowq ==0.1.0.5 - - th-orphans ==0.13.11 - - th-printf ==0.7 - - thread-hierarchy ==0.3.0.2 - - thread-local-storage ==0.2 - - threads ==0.5.1.6 - - thread-supervisor ==0.2.0.0 - - threepenny-gui ==0.9.0.0 - - th-reify-compat ==0.0.1.5 - - th-reify-many ==0.1.9 - - 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.1.0 - - th-utilities ==0.2.4.3 - - thyme ==0.3.5.5 - - tidal ==1.7.4 - - tile ==0.3.0.0 - - time-compat ==1.9.5 - - 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.1.0 - - timer-wheel ==0.3.0 - - time-units ==1.0.0 - - timezone-olson ==0.2.0 - - timezone-series ==0.1.9 - - tinylog ==0.15.0 - - titlecase ==1.0.1 - - tldr ==0.9.0 - - tls ==1.5.5 - - tls-debug ==0.4.8 - - tls-session-manager ==0.0.4 - - tlynx ==0.5.0.2 - - tmapchan ==0.0.3 - - tmapmvar ==0.0.4 - - tmp-postgres ==1.34.1.0 - - tomland ==1.3.2.0 - - tonalude ==0.1.1.1 - - topograph ==1.0.0.1 - - torsor ==0.1 - - tostring ==0.2.1.1 - - transaction ==0.1.1.3 - - transformers-base ==0.4.5.2 - - transformers-bifunctors ==0.1 - - transformers-compat ==0.6.6 - - transformers-fix ==1.0 - - traverse-with-class ==1.0.1.0 - - tree-diff ==0.2 - - tree-fun ==0.8.1.0 - - tree-view ==0.5.1 - - trifecta ==2.1.1 - - triplesec ==0.2.2.1 - - tsv2csv ==0.1.0.2 - - ttc ==0.4.0.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 - - turtle ==1.5.22 - - typecheck-plugin-nat-simple ==0.1.0.2 - - 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 - - type-hint ==0.1 - - type-level-integers ==0.0.1 - - type-level-kv-list ==1.1.0 - - type-level-natural-number ==2.0 - - type-level-numbers ==0.1.1.1 - - type-map ==0.1.6.0 - - type-natural ==1.1.0.0 - - typenums ==0.1.4 - - type-of-html ==1.6.2.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 - - tzdata ==0.2.20201021.0 - - ua-parser ==0.7.6.0 - - uglymemo ==0.1.0.1 - - ulid ==0.3.0.0 - - unagi-chan ==0.4.1.3 - - unbounded-delays ==0.1.1.1 - - unboxed-ref ==0.4.0.0 - - unboxing-vector ==0.2.0.0 - - uncaught-exception ==0.1.0 - - uncertain ==0.3.1.0 - - unconstrained ==0.1.0.2 - - unexceptionalio ==0.5.1 - - unexceptionalio-trans ==0.5.1 - - unicode ==0.0.1.1 - - unicode-show ==0.1.0.4 - - unicode-transforms ==0.3.7.1 - - unification-fd ==0.11.1 - - union-find ==0.2 - - unipatterns ==0.0.0.0 - - uniplate ==1.6.13 - - uniprot-kb ==0.1.2.0 - - uniq-deep ==1.2.0 - - unique ==0.0.1 - - unique-logic ==0.4 - - unique-logic-tf ==0.5.1 - - unit-constraint ==0.0.0 - - universe ==1.2.1 - - universe-base ==1.1.2 - - universe-instances-base ==1.1 - - universe-instances-extended ==1.1.2 - - universe-instances-trans ==1.1 - - universe-reverse-instances ==1.1.1 - - universe-some ==1.2.1 - - universum ==1.7.2 - - unix-bytestring ==0.3.7.3 - - unix-compat ==0.5.3 - - unix-time ==0.4.7 - - unliftio ==0.2.14 - - unliftio-core ==0.2.0.1 - - unliftio-pool ==0.2.1.1 - - unliftio-streams ==0.1.1.1 - - unlit ==0.4.0.0 - - unordered-containers ==0.2.13.0 - - unsafe ==0.0 - - urbit-hob ==0.3.3 - - uri-bytestring ==0.3.3.0 - - uri-bytestring-aeson ==0.1.0.8 - - uri-encode ==1.5.0.7 - - url ==2.1.3 - - users ==0.5.0.0 - - utf8-conversions ==0.1.0.4 - - utf8-light ==0.4.2 - - utf8-string ==1.0.2 - - util ==0.1.17.1 - - utility-ht ==0.0.16 - - uuid ==1.3.14 - - uuid-types ==1.0.4 - - validation ==1.1.1 - - validation-selective ==0.1.0.1 - - validity ==0.11.0.0 - - validity-aeson ==0.2.0.4 - - validity-bytestring ==0.4.1.1 - - validity-containers ==0.5.0.4 - - validity-path ==0.4.0.1 - - validity-persistent ==0.0.0.0 - - validity-primitive ==0.0.0.1 - - validity-scientific ==0.2.0.3 - - validity-text ==0.3.1.1 - - validity-time ==0.4.0.0 - - validity-unordered-containers ==0.2.0.3 - - validity-uuid ==0.1.0.3 - - validity-vector ==0.2.0.3 - - valor ==0.1.0.0 - - vault ==0.3.1.5 - - vec ==0.4 - - vector ==0.12.3.0 - - vector-algorithms ==0.8.0.4 - - vector-binary-instances ==0.2.5.2 - - vector-buffer ==0.4.1 - - vector-builder ==0.3.8.1 - - vector-bytes-instances ==0.1.1 - - vector-circular ==0.1.3 - - vector-instances ==3.4 - - vector-mmap ==0.0.3 - - vector-rotcev ==0.1.0.0 - - vector-sized ==1.4.3.1 - - vector-space ==0.16 - - vector-split ==1.0.0.2 - - vector-th-unbox ==0.2.1.9 - - verbosity ==0.4.0.0 - - versions ==4.0.3 - - vformat ==0.14.1.0 - - vformat-aeson ==0.1.0.1 - - vformat-time ==0.1.0.0 - - ViennaRNAParser ==1.3.3 - - vinyl ==0.13.1 - - void ==0.7.3 - - vty ==5.33 - - wai ==3.2.3 - - wai-app-static ==3.1.7.2 - - wai-conduit ==3.0.0.4 - - wai-cors ==0.2.7 - - wai-enforce-https ==0.0.2.1 - - wai-eventsource ==3.0.0 - - wai-extra ==3.1.6 - - wai-feature-flags ==0.1.0.1 - - wai-handler-launch ==3.0.3.1 - - wai-logger ==2.3.6 - - wai-middleware-auth ==0.2.4.1 - - wai-middleware-caching ==0.1.0.2 - - wai-middleware-clacks ==0.1.0.1 - - wai-middleware-static ==0.9.0 - - wai-rate-limit ==0.1.0.0 - - wai-rate-limit-redis ==0.1.0.0 - - wai-saml2 ==0.2.1.2 - - wai-session ==0.3.3 - - wai-session-redis ==0.1.0.1 - - wai-slack-middleware ==0.2.0 - - wai-websockets ==3.0.1.2 - - wakame ==0.1.0.0 - - warp ==3.3.15 - - warp-tls ==3.3.0 - - warp-tls-uid ==0.2.0.6 - - wave ==0.2.0 - - wcwidth ==0.0.2 - - webby ==1.0.1 - - webdriver ==0.9.0.1 - - webex-teams-api ==0.2.0.1 - - webex-teams-conduit ==0.2.0.1 - - webex-teams-pipes ==0.2.0.1 - - webgear-server ==0.2.1 - - webrtc-vad ==0.1.0.3 - - websockets ==0.12.7.2 - - websockets-snap ==0.10.3.1 - - weigh ==0.0.16 - - wide-word ==0.1.1.2 - - wikicfp-scraper ==0.1.0.12 - - wild-bind ==0.1.2.7 - - wild-bind-x11 ==0.2.0.12 - - Win32 ==2.6.1.0 - - Win32-notify ==0.3.0.3 - - windns ==0.1.0.1 - - witch ==0.2.0.2 - - witherable ==0.4.1 - - within ==0.2.0.1 - - with-location ==0.1.0 - - with-utf8 ==1.0.2.2 - - 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 - - world-peace ==1.0.2.0 - - wrap ==0.0.0 - - wreq ==0.5.3.3 - - writer-cps-exceptions ==0.1.0.1 - - writer-cps-mtl ==0.1.1.6 - - writer-cps-transformers ==0.5.6.1 - - wss-client ==0.3.0.0 - - wuss ==1.1.18 - - X11 ==1.9.2 - - X11-xft ==0.3.1 - - x11-xim ==0.0.9.0 - - x509 ==1.7.5 - - x509-store ==1.6.7 - - x509-system ==1.6.6 - - x509-validation ==1.6.11 - - Xauth ==0.1 - - xdg-basedir ==0.2.2 - - xdg-desktop-entry ==0.1.1.1 - - xdg-userdirs ==0.1.0.2 - - xeno ==0.4.2 - - xlsx ==0.8.3 - - xlsx-tabular ==0.2.2.1 - - xml ==1.3.14 - - xml-basic ==0.1.3.1 - - xml-conduit ==1.9.1.1 - - 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 - - xml-indexed-cursor ==0.1.1.0 - - xml-lens ==0.3 - - xml-picklers ==0.3.6 - - xml-to-json ==2.0.1 - - xml-to-json-fast ==2.0.0 - - xml-types ==0.3.8 - - xmonad ==0.15 - - xmonad-contrib ==0.16 - - xmonad-extras ==0.15.3 - - xss-sanitize ==0.3.6 - - xxhash-ffi ==0.2.0.0 - - yaml ==0.11.5.0 - - yamlparse-applicative ==0.1.0.3 - - yesod ==1.6.1.1 - - yesod-auth ==1.6.10.3 - - yesod-auth-hashdb ==1.7.1.6 - - yesod-auth-oauth2 ==0.6.3.0 - - yesod-bin ==1.6.1 - - yesod-core ==1.6.19.0 - - yesod-fb ==0.6.1 - - yesod-form ==1.6.7 - - yesod-gitrev ==0.2.1 - - yesod-markdown ==0.12.6.9 - - yesod-newsfeed ==1.7.0.0 - - yesod-page-cursor ==2.0.0.6 - - yesod-paginator ==1.1.1.0 - - yesod-persistent ==1.6.0.6 - - yesod-sitemap ==1.6.0 - - yesod-static ==1.6.1.0 - - yesod-test ==1.6.12 - - yesod-websockets ==0.3.0.3 - - yes-precure5-command ==5.5.3 - - yi-rope ==0.11 - - yjsvg ==0.2.0.1 - - yjtools ==0.9.18 - - yoga ==0.0.0.5 - - youtube ==0.2.1.1 - - zenacy-html ==2.0.3 - - zenacy-unicode ==1.0.1 - - zero ==0.1.5 - - zeromq4-haskell ==0.8.0 - - zeromq4-patterns ==0.3.1.0 - - zim-parser ==0.2.1.0 - - zio ==0.1.0.2 - - zip ==1.7.0 - - zip-archive ==0.4.1 - - zipper-extra ==0.1.3.2 - - zippers ==0.3.1 - - zip-stream ==0.2.1.0 - - zlib ==0.6.2.3 - - zlib-bindings ==0.1.1.5 - - zlib-lens ==0.1.2.1 - - zot ==0.0.3 - - zstd ==0.1.2.0 - - ztail ==1.2.0.2 - - zydiskell ==0.2.0.0 - -extra-packages: - - base16-bytestring < 1 # required for cabal-install etc. - - Cabal == 2.2.* # required for jailbreak-cabal etc. - - Cabal == 2.4.* # required for cabal-install etc. - - Cabal == 3.2.* # required for cabal-install etc. - - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 - - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 - - dhall == 1.29.0 # required for ats-pkg - - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - - haddock == 2.23.* # required on GHC < 8.10.x - - haddock-api == 2.23.* # required on GHC < 8.10.x - - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - - happy == 1.19.9 # for purescript - - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - - hlint < 3.3 # We don‘t have ghc-lib-parser 9.0.X yet. - - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 - - lsp-test < 0.14 # needed for hls 1.0.0 - - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls - - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - - optparse-applicative < 0.16 # needed for niv-0.2.19 - - refinery == 0.3.* # required by hls-tactics-plugin-1.0.0.0 - - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x - -package-maintainers: - peti: - - cabal-install - - cabal2nix - - cabal2spec - - distribution-nixpkgs - - funcmp - - git-annex - - hackage-db - - hledger - - hledger-interest - - hledger-ui - - hledger-web - - hopenssl - - hsdns - - hsemail - - hsyslog - - jailbreak-cabal - - language-nix - - logging-facade-syslog - - nix-paths - - pandoc - - structured-haskell-mode - - titlecase - - xmonad - - xmonad-contrib - gridaphobe: - - located-base - jb55: - # - bson-lens - - cased - - elm-export-persistent - # - pipes-mongodb - - streaming-wai - kiwi: - - config-schema - - config-value - - glirc - - irc-core - - matterhorn - - mattermost-api - - mattermost-api-qc - - Unique - psibi: - - path-pieces - - persistent - - persistent-sqlite - - persistent-template - - shakespeare - abbradar: - - Agda - roberth: - - arion-compose - - hercules-ci-agent - - hercules-ci-api - - hercules-ci-api-agent - - hercules-ci-api-core - - hercules-ci-cli - - hercules-ci-cnix-expr - - hercules-ci-cnix-store - cdepillabout: - - pretty-simple - - spago - terlar: - - nix-diff - maralorn: - - reflex-dom - - cabal-fmt - - shh - - neuron - - releaser - - taskwarrior - - haskell-language-server - - shake-bench - - iCalendar - - stm-containers - sorki: - - cayenne-lpp - - data-stm32 - - gcodehs - - nix-derivation - - nix-narinfo - - ttn - - ttn-client - - update-nix-fetchgit - - zre - utdemir: - - nix-tree - turion: - - rhine - - rhine-gloss - - essence-of-live-coding - - essence-of-live-coding-gloss - - essence-of-live-coding-pulse - - essence-of-live-coding-quickcheck - - Agda - - dunai - - finite-typelits - - pulse-simple - - simple-affine-space - sternenseemann: - # also maintain upstream package - - spacecookie - - gopher-proxy - # other packages I can help out for - - systemd - - fast-logger - - Euterpea2 - - utc - - socket - - gitit - - yarn-lock - - yarn2nix - poscat: - - hinit - -unsupported-platforms: - alsa-mixer: [ x86_64-darwin ] - alsa-pcm: [ x86_64-darwin ] - alsa-seq: [ x86_64-darwin ] - AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - barbly: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] - bindings-directfb: [ x86_64-darwin ] - d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - dx9base: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - freenect: [ x86_64-darwin ] - FTGL: [ x86_64-darwin ] - gi-ostree: [ x86_64-darwin ] - gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] - hcwiid: [ x86_64-darwin ] - HFuse: [ x86_64-darwin ] - hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - lio-fs: [ x86_64-darwin ] - midi-alsa: [ x86_64-darwin ] - pam: [ x86_64-darwin ] - PortMidi: [ x86_64-darwin ] - Raincat: [ x86_64-darwin ] - reactivity: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - rtlsdr: [ x86_64-darwin ] - rubberband: [ x86_64-darwin ] - sdl2-mixer: [ x86_64-darwin ] - sdl2-ttf: [ x86_64-darwin ] - tokyotyrant-haskell: [ x86_64-darwin ] - vulkan: [ i686-linux, armv7l-linux ] - VulkanMemoryAllocator: [ i686-linux, armv7l-linux ] - Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32-junction-point: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32-notify: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - xattr: [ x86_64-darwin ] - XInput: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - xmobar: [ x86_64-darwin ] - -dont-distribute-packages: - # Depends on shine, which is a ghcjs project. - - shine-varying - - # these packages depend on software with an unfree license - - accelerate-bignum - - accelerate-blas - - accelerate-cublas - - accelerate-cuda - - accelerate-cufft - - accelerate-examples - - accelerate-fft - - accelerate-fourier-benchmark - - accelerate-io-array - - accelerate-io-bmp - - accelerate-io-bytestring - - accelerate-io-cereal - - accelerate-io-JuicyPixels - - accelerate-io-repa - - accelerate-io-vector - - accelerate-kullback-liebler - - accelerate-llvm-ptx - - bindings-yices - - boolector - - ccelerate-cuda - - containers-accelerate - - cplex-hs - - cublas - - cuda # 2020-08-18 because of dependency nvidia-x11 - - cufft - - cusolver - - cusparse - - gloss-raster-accelerate - - hashable-accelerate - - libnvvm - - matlab - - nvvm - - Obsidian - - odpic-raw - - patch-image - # license for input data unclear, dependency not on Hackage - # see https://github.com/NixOS/nixpkgs/pull/88604 - - tensorflow-mnist - - yices-easy - - yices-painless - - # these packages don't evaluate because they have broken (system) dependencies - - XML - - comark - - couch-simple - - diagrams-hsqml - - diagrams-reflex - - dialog - - fltkhs-demos - - fltkhs-fluid-demos - - fltkhs-hello-world - - fltkhs-themes - - ghcjs-dom-hello - - ghcjs-dom-webkit - - gi-javascriptcore - - gi-webkit - - gi-webkit2 - - gi-webkit2webextension - - gsmenu - - haste-gapi - - haste-perch - - hbro - - hplayground - - hs-mesos - - hsqml - - hsqml-datamodel - - hsqml-datamodel-vinyl - - hsqml-datemodel-vinyl - - hsqml-demo-manic - - hsqml-demo-morris - - hsqml-demo-notes - - hsqml-demo-notes - - hsqml-demo-samples - - hsqml-morris - - hsqml-morris - - hstorchat - - imprevu-happstack - - jsaddle-webkit2gtk - - jsaddle-webkitgtk - - jsc - - lambdacat - - leksah - - manatee-all - - manatee-browser - - manatee-reader - - markup-preview - - nomyx-api - - nomyx-core - - nomyx-language - - nomyx-library - - nomyx-server - - passman-cli - - passman-core - - reflex-dom-colonnade - - reflex-dom-contrib - - reflex-dom-fragment-shader-canvas - - reflex-dom-helpers - - reflex-jsx - - sneathlane-haste - - spike - - tianbar - - trasa-reflex - - treersec - - wai-middleware-brotli - - web-browser-in-haskell - - webkit - - webkitgtk3 - - webkitgtk3-javascriptcore - - websnap - -broken-packages: - # These packages don't compile or depend on packages that don't compile. - - 3dmodels - - 4Blocks - - a50 - - AAI - - abcBridge - - abcnotation - - abeson - - abides - - abnf - - AbortT-monadstf - - AbortT-mtl - - AbortT-transformers - - abstract-par-accelerate - - abt - - AC-BuildPlatform - - AC-EasyRaster-GTK - - AC-HalfInteger - - ac-machine - - ac-machine-conduit - - AC-MiniTest - - AC-Terminal - - AC-VanillaArray - - AC-Vector - - AC-Vector-Fancy - - acc - - accelerate-arithmetic - - accelerate-fftw - - accelerate-fourier - - accelerate-llvm-native - - accelerate-random - - accelerate-typelits - - accelerate-utility - - accentuateus - - access-time - - access-token-provider - - achille - - acid-state-dist - - acid-state-tls - - ACME - - acme-all-monad - - acme-comonad - - acme-dont - - acme-flipping-tables - - acme-hq9plus - - acme-http - - acme-inator - - acme-kitchen-sink - - acme-left-pad - - acme-miscorder - - acme-mutable-package - - acme-now - - acme-numbersystem - - acme-operators - - acme-php - - acme-schoenfinkel - - acme-strfry - - acme-stringly-typed - - acme-this - - acme-zero - - acousticbrainz-client - - ActionKid - - activehs - - activehs-base - - activitypub - - activitystreams-aeson - - actor - - acts - - Adaptive - - Adaptive-Blaisorblade - - adaptive-containers - - adaptive-tuple - - adb - - addy - - adhoc-network - - adict - - adjunction - - adobe-swatch-exchange - - adp-multi - - adp-multi-monadiccp - - ADPfusion - - ADPfusionForest - - ADPfusionSet - - adtrees - - advent-of-code-api - - Advgame - - Advise-me - - AERN-Basics - - AERN-Net - - AERN-Real - - AERN-Real-Double - - AERN-Real-Interval - - AERN-RnToRm - - AERN-RnToRm-Plot - - aern2-mp - - aern2-real - - aeson-applicative - - aeson-decode - - aeson-diff-generic - - aeson-extra - - aeson-filthy - - aeson-flowtyped - - aeson-injector - - aeson-match-qq - - aeson-native - - aeson-options - - aeson-prefix - - aeson-schema - - aeson-schemas - - aeson-smart - - aeson-streams - - aeson-t - - aeson-tiled - - aeson-typescript - - aeson-utils - - aeson-via - - affection - - affine-invariant-ensemble-mcmc - - afv - - ag-pictgen - - Agata - - agda-language-server - - agda-server - - agda-snippets - - agda-snippets-hakyll - - agda-unused - - agentx - - AGI - - AhoCorasick - - aig - - aip - - air-th - - airbrake - - airship - - airtable-api - - aivika-distributed - - aivika-experiment-diagrams - - ajhc - - AlanDeniseEricLauren - - alerta - - alex-prelude - - alfred - - alga - - algebra-checkers - - algebra-dag - - algebra-driven-design - - algebra-sql - - algebraic - - algebraic-prelude - - algo-s - - algolia - - AlgoRhythm - - AlgorithmW - - align-text - - AlignmentAlgorithms - - Allure - - ally-invest - - alms - - alpha - - alphachar - - alsa - - alsa-gui - - alsa-midi - - alsa-pcm-tests - - alsa-seq-tests - - altcomposition - - alternative-extra - - alternative-io - - alto - - alure - - amazon-emailer - - amazon-emailer-client-snap - - amazon-products - - amazonka-ec2 - - amazonka-s3-streaming - - amby - - AMI - - ampersand - - amqp-conduit - - amqp-streamly - - analyze - - analyze-client - - anansi-pandoc - - anatomy - - android - - android-activity - - android-lint-summary - - AndroidViewHierarchyImporter - - angel - - angle - - Animas - - animascii - - animate - - animate-example - - animate-frames - - animate-preview - - animate-sdl2 - - annah - - annotated-fix - - Annotations - - anonymous-sums - - anonymous-sums-tests - - ansi-terminal-game - - ansigraph - - antagonist - - antfarm - - anticiv - - antigate - - antimirov - - antiope-athena - - antiope-contract - - antiope-core - - antiope-dynamodb - - antiope-es - - antiope-messages - - antiope-optparse-applicative - - antiope-s3 - - antiope-shell - - antiope-sns - - antiope-sqs - - antiquoter - - antisplice - - antlr-haskell - - antlrc - - anydbm - - aop-prelude - - aos-signature - - aosd - - apart - - apecs-stm - - apelsin - - api-builder - - api-rpc-factom - - api-rpc-pegnet - - api-tools - - api-yoti - - apiary - - apiary-authenticate - - apiary-clientsession - - apiary-cookie - - apiary-eventsource - - apiary-helics - - apiary-http-client - - apiary-logger - - apiary-memcached - - apiary-mongoDB - - apiary-persistent - - apiary-purescript - - apiary-redis - - apiary-session - - apiary-websockets - - apis - - apns-http2 - - apotiki - - app-lens - - appc - - ApplePush - - AppleScript - - applicative-fail - - applicative-parsec - - applicative-quoters - - applicative-splice - - apply-unordered - - approveapi - - approx - - ApproxFun-hs - - arb-fft - - arbb-vm - - arbor-datadog - - arbor-monad-counter - - arbor-monad-logger - - arbor-monad-metric - - arbor-monad-metric-datadog - - arbor-postgres - - arch-hs - - arch-web - - archive-libarchive - - archiver - - archlinux - - archlinux-web - - archnews - - arduino-copilot - - arena - - arff - - arghwxhaskell - - argon - - argon2 - - argparser - - arguedit - - ariadne - - arion - - arithmetic-circuits - - armada - - armor - - arpa - - arpack - - array-builder - - array-chunks - - array-forth - - array-list - - array-primops - - arrayfire - - arraylist - - ArrayRef - - arrow-improve - - arrow-list - - arrowapply-utils - - arrowp - - arrowp-qq - - ArrowVHDL - - artery - - artifact - - asap - - ascii-flatten - - ascii-string - - ascii-table - - ascii-vector-avc - - ascii85-conduit - - asic - - asil - - asn - - ASN1 - - asn1-codec - - asn1-data - - assert - - assert4hs - - assert4hs-core - - assert4hs-hspec - - assert4hs-tasty - - assertions - - asset-map - - assimp - - assumpta - - ast-monad - - ast-monad-json - - astrds - - astview - - async-combinators - - async-dejafu - - async-manager - - async-timer - - asynchronous-exceptions - - aterm-utils - - atlassian-connect-core - - atlassian-connect-descriptor - - atmos-dimensional-tf - - atndapi - - atom-msp430 - - atomic-modify - - atomic-primops-foreign - - atomic-primops-vector - - atomo - - atp - - atp-haskell - - ats-pkg - - ats-setup - - ats-storable - - attempt - - attic-schedule - - atto-lisp - - AttoBencode - - AttoJson - - attomail - - attoparsec-enumerator - - attoparsec-ip - - attoparsec-iteratee - - attoparsec-text - - attoparsec-text-enumerator - - attoparsec-trans - - attoparsec-uri - - attosplit - - Attrac - - atuin - - audiovisual - - augeas - - augur - - aur - - aur-api - - aura - - Aurochs - - authenticate-ldap - - authinfo-hs - - authoring - - AutoForms - - autom - - automata - - autonix-deps - - autonix-deps-kf5 - - autopack - - avatar-generator - - avers - - avers-api - - avers-api-docs - - avers-server - - avl-static - - AvlTree - - avr-shake - - avro-piper - - awesome-prelude - - awesomium - - awesomium-glut - - awesomium-raw - - aws-cloudfront-signer - - aws-configuration-tools - - aws-dynamodb-conduit - - aws-dynamodb-streams - - aws-easy - - aws-ec2 - - aws-ec2-knownhosts - - aws-elastic-transcoder - - aws-general - - aws-kinesis - - aws-kinesis-client - - aws-kinesis-reshard - - aws-lambda - - aws-lambda-haskell-runtime-wai - - aws-lambda-runtime - - aws-larpi - - aws-mfa-credentials - - aws-performance-tests - - aws-route53 - - aws-sdk - - aws-sdk-text-converter - - aws-sdk-xml-unordered - - aws-ses-easy - - aws-sign4 - - aws-simple - - aws-sns - - axel - - axiom - - azimuth-hs - - azubi - - azure-acs - - azure-email - - azure-functions-worker - - azure-service-api - - azure-servicebus - - azurify - - b-tree - - b9 - - babylon - - backblaze-b2-hs - - backdropper - - backstop - - backtracking-exceptions - - backward-state - - bag - - Baggins - - bake - - ballast - - bamboo - - bamboo-launcher - - bamboo-plugin-highlight - - bamboo-plugin-photo - - bamboo-theme-blueprint - - bamboo-theme-mini-html5 - - bamse - - bamstats - - ban-instance - - Bang - - bank-holiday-usa - - banwords - - barchart - - barcodes-code128 - - barecheck - - Barracuda - - barrie - - barrier - - barrier-monad - - base-compat-migrate - - base-encoding - - base-feature-macros - - base-generics - - base-io-access - - base16 - - base16-lens - - base32-bytestring - - base62 - - base64-bytes - - base64-conduit - - baserock-schema - - basex-client - - BASIC - - basic - - basic-sop - - baskell - - batchd - - battlenet - - battlenet-yesod - - battleplace - - battleplace-api - - battleship-combinatorics - - battleships - - bayes-stack - - bazel-coverage-report-renderer - - bbi - - BCMtools - - bcp47 - - bcp47-orphans - - bdcs - - bdcs-api - - bdd - - bdo - - beam - - beam-automigrate - - beam-core - - beam-migrate - - beam-mysql - - beam-newtype-field - - beam-postgres - - beam-sqlite - - beam-th - - beamable - - beautifHOL - - bech32 - - bech32-th - - bed-and-breakfast - - beeminder-api - - Befunge93 - - bein - - belka - - bench-graph - - bench-show - - BenchmarkHistory - - bencodex - - berkeleydb - - BerkeleyDBXML - - BerlekampAlgorithm - - berp - - bert - - besout - - bet - - betacode - - betris - - bff - - bglib - - bgmax - - bgzf - - bhoogle - - bibdb - - bidi-icu - - bidirectional - - bidirectionalization-combined - - bidispec - - bidispec-extras - - BiGUL - - billboard-parser - - billeksah-forms - - billeksah-main - - billeksah-pane - - billeksah-services - - binary-bits - - binary-communicator - - binary-derive - - binary-ext - - binary-file - - binary-indexed-tree - - binary-protocol - - binary-protocol-zmq - - binary-streams - - binary-tagged - - binary-typed - - bind-marshal - - BinderAnn - - binding-core - - binding-gtk - - binding-wx - - bindings-apr - - bindings-apr-util - - bindings-bfd - - bindings-cctools - - bindings-common - - bindings-dc1394 - - bindings-eskit - - bindings-EsounD - - bindings-fann - - bindings-fluidsynth - - bindings-friso - - bindings-gsl - - bindings-hamlib - - bindings-hdf5 - - bindings-K8055 - - bindings-libftdi - - bindings-libg15 - - bindings-libpci - - bindings-librrd - - bindings-libstemmer - - bindings-libusb - - bindings-libv4l2 - - bindings-linux-videodev2 - - bindings-monetdb-mapi - - bindings-mpdecimal - - bindings-ppdev - - bindings-sc3 - - bindings-sipc - - bindings-wlc - - bindynamic - - binembed - - binembed-example - - bio - - bio-sequence - - bioace - - bioalign - - Biobase - - BiobaseBlast - - BiobaseDotP - - BiobaseENA - - BiobaseEnsembl - - BiobaseFasta - - BiobaseFR3D - - BiobaseHTTP - - BiobaseHTTPTools - - BiobaseInfernal - - BiobaseMAF - - BiobaseNewick - - BiobaseTrainingData - - BiobaseTurner - - BiobaseTypes - - BiobaseVienna - - BiobaseXNA - - biocore - - biofasta - - biofastq - - biohazard - - BioHMM - - bioinformatics-toolkit - - biophd - - biopsl - - biosff - - biostockholm - - bip32 - - birch-beer - - bird - - BirdPP - - birds-of-paradise - - bisect-binary - - bishbosh - - bit-array - - bit-stream - - bitcoin-address - - bitcoin-api - - bitcoin-api-extra - - bitcoin-block - - bitcoin-compact-filters - - bitcoin-hs - - bitcoin-keys - - bitcoin-rpc - - bitcoin-script - - bitcoin-scripting - - bitcoin-tx - - bitcoin-types - - bitcoind-regtest - - bitcoind-rpc - - Bitly - - bitly-cli - - bitmaps - - bits-atomic - - bits-conduit - - bits-extras - - bitset - - bitspeak - - BitStringRandomMonad - - BitSyntax - - bittorrent - - bitwise-enum - - bitx-bitcoin - - bizzlelude - - bizzlelude-js - - bkr - - bla - - blakesum - - blakesum-demo - - blas - - BlastHTTP - - blastxml - - blatex - - blaze-builder-enumerator - - blaze-colonnade - - blaze-html-contrib - - blaze-html-hexpat - - blaze-html-truncate - - blaze-json - - blaze-textual-native - - blazeT - - ble - - blink1 - - blip - - bliplib - - Blobs - - blockchain - - blockhash - - Blogdown - - blogination - - BlogLiterately - - BlogLiterately-diagrams - - bloodhound - - bloodhound-amazonka-auth - - bloomfilter-redis - - blosum - - bloxorz - - blubber - - blubber-server - - Blueprint - - bluetile - - bluetileutils - - blunk-hask-tests - - blunt - - bno055-haskell - - bogocopy - - bogre-banana - - boilerplate - - bolt - - boltzmann-brain - - bond - - bond-haskell - - bond-haskell-compiler - - bookkeeper - - bookkeeper-permissions - - Bookshelf - - boolean-normal-forms - - boolexpr - - boombox - - boomslang - - boopadoop - - boots-app - - boots-cloud - - boots-web - - borel - - boring-window-switcher - - bot - - botpp - - bottom - - bound-extras - - bounded-array - - bowntz - - box - - box-csv - - box-socket - - braid - - brain-bleep - - Bravo - - breakout - - breve - - brians-brain - - brick-dropdownmenu - - bricks - - bricks-internal - - bricks-internal-test - - bricks-parsec - - bricks-rendering - - bricks-syntax - - brillig - - broccoli - - brok - - broker-haskell - - bronyradiogermany-common - - bronyradiogermany-streaming - - brotli - - brotli-conduit - - brotli-streams - - browscap - - bsd-sysctl - - bson - - bson-generic - - bson-generics - - bson-lens - - bsparse - - btree - - btree-concurrent - - buchhaltung - - buffer - - buffer-builder - - buffer-builder-aeson - - BufferedSocket - - buffet - - buffon - - bugsnag-haskell - - bugzilla - - build - - buildable - - buildbox - - buildbox-tools - - builder - - buildwrapper - - bullet - - bulletproofs - - bulmex - - bumper - - bunz - - burnt-explorer - - burst-detection - - bus-pirate - - Buster - - buster - - buster-gtk - - buster-network - - butter - - butterflies - - bv-sized - - byline - - bytable - - bytearray-parsing - - bytebuild - - bytehash - - bytelog - - byteslice - - bytesmith - - bytestring-arbitrary - - bytestring-builder-varword - - bytestring-class - - bytestring-csv - - bytestring-plain - - bytestring-read - - bytestring-rematch - - bytestring-show - - bytestring-substring - - bytestring-time - - bytestring-trie - - bytestring-typenats - - bytestringparser - - bytestringparser-temporary - - bytestringreadp - - c-dsl - - c-io - - c-mosquitto - - c0check - - c0parser - - c10k - - c2ats - - cab - - cabal-appimage - - cabal-audit - - cabal-bounds - - cabal-bundle-clib - - cabal-cache - - cabal-cargs - - cabal-constraints - - cabal-db - - cabal-dependency-licenses - - cabal-dev - - cabal-dir - - cabal-edit - - cabal-file-th - - cabal-ghc-dynflags - - cabal-ghci - - cabal-graphdeps - - Cabal-ide-backend - - cabal-info - - cabal-install-bundle - - cabal-install-ghc72 - - cabal-install-ghc74 - - cabal-lenses - - cabal-meta - - cabal-mon - - cabal-nirvana - - cabal-progdeps - - cabal-query - - cabal-setup - - cabal-sort - - cabal-src - - cabal-test - - cabal-test-quickcheck - - cabal-upload - - cabal2arch - - cabal2doap - - cabal2ebuild - - cabal2ghci - - cabalgraph - - cabalish - - cabalmdvrpm - - cabalQuery - - cabalrpmdeps - - CabalSearch - - cabalvchk - - cabin - - cabocha - - cache-polysemy - - cached - - caching - - caching-vault - - cacophony - - cafeteria-prelude - - caffegraph - - cairo-core - - cake - - cake3 - - cakyrespa - - cal-layout - - cal3d - - cal3d-examples - - cal3d-opengl - - calamity - - calc - - calculator - - caldims - - caledon - - calenderweek - - call - - call-alloy - - call-haskell-from-anything - - camfort - - campfire - - candid - - canon - - canonical-filepath - - canonical-json - - canteven-http - - canteven-listen-http - - canteven-log - - canteven-parsedate - - cantor - - cao - - cap - - Capabilities - - capnp - - capped-list - - capri - - car-pool - - caramia - - carbonara - - carboncopy - - cardano-coin-selection - - carettah - - CarneadesDSL - - CarneadesIntoDung - - carte - - cartel - - Cartesian - - casa-abbreviations-and-acronyms - - casadi-bindings - - casadi-bindings-control - - casadi-bindings-core - - casadi-bindings-internal - - casadi-bindings-ipopt-interface - - casadi-bindings-snopt-interface - - Cascade - - cascading - - caseof - - cases - - cash - - cassandra-cql - - Cassava - - cassava-conduit - - cassava-records - - cassette - - cassy - - castle - - casui - - catamorphism - - Catana - - catch-fd - - categorical-algebra - - category-extras - - category-traced - - catnplus - - cautious-file - - cautious-gen - - cayene-lpp - - cayley-client - - CBOR - - CC-delcont-alt - - CC-delcont-cxe - - CC-delcont-exc - - CC-delcont-ref - - CC-delcont-ref-tf - - CCA - - cci - - ccnx - - cctools-workqueue - - cedict - - cef - - cef3-raw - - cef3-simple - - ceilometer-common - - cellrenderer-cairo - - celtchar - - cerberus - - cereal-derive - - cereal-enumerator - - cereal-ieee754 - - cereal-io-streams - - cereal-plus - - cereal-streams - - certificate - - cf - - cfenv - - cfipu - - cflp - - cfopu - - cg - - cgen - - cgi-utils - - cgrep - - chainweb-mining-client - - chakra - - chalkboard - - chalkboard-viewer - - character-cases - - charade - - chart-cli - - Chart-fltkhs - - chart-histogram - - Chart-simple - - chart-svg - - chart-svg-various - - Chart-tests - - chart-unit - - charter - - chatty-text - - chatwork - - cheapskate-terminal - - check-pvp - - Checked - - checked - - checkmate - - chell-quickcheck - - chessIO - - chevalier-common - - chiasma - - chiphunk - - chitauri - - Chitra - - choose - - choose-exe - - chorale - - chorale-geo - - chp - - chp-mtl - - chp-plus - - chp-spec - - chp-transformers - - chr-core - - chr-lang - - chr-parse - - ChristmasTree - - chromatin - - chronograph - - chronos-bench - - chu2 - - chunks - - chunky - - church - - church-maybe - - churros - - cielo - - cil - - cinvoke - - cio - - cipher-blowfish - - ciphersaber2 - - circlehs - - circular - - citation-resolve - - citeproc-hs - - citeproc-hs-pandoc-filter - - cj-token - - cjk - - cl3 - - cl3-hmatrix-interface - - cl3-linear-interface - - clac - - clafer - - claferIG - - claferwiki - - clang-compilation-database - - clang-pure - - clanki - - clarifai - - CLASE - - clash - - clash-ghc - - clash-lib - - clash-multisignal - - clash-prelude - - Clash-Royale-Hack-Cheats - - clash-systemverilog - - clash-verilog - - clash-vhdl - - classify-frog - - ClassLaws - - classy-influxdb-simple - - classy-miso - - classy-parallel - - classyplate - - ClassyPrelude - - clckwrks - - clckwrks-cli - - clckwrks-dot-com - - clckwrks-plugin-bugs - - clckwrks-plugin-ircbot - - clckwrks-plugin-mailinglist - - clckwrks-plugin-media - - clckwrks-plugin-page - - clckwrks-plugin-redirect - - clckwrks-theme-bootstrap - - clckwrks-theme-clckwrks - - clckwrks-theme-geo-bootstrap - - cld2 - - Clean - - clean-unions - - cless - - clevercss - - clexer - - CLI - - cli-builder - - cli-extras - - cli-git - - cli-nix - - clickhouse-haskell - - clif - - clifford - - clifm - - clingo - - clippard - - clipper - - clippings - - clisparkline - - clit - - clocked - - clogparse - - clone-all - - closure - - cloud-haskell - - cloud-seeder - - cloudfront-signer - - clr-inline - - clua - - cluss - - ClustalParser - - clustering - - clustertools - - clutterhs - - cmark-highlight - - cmark-patterns - - cmark-sections - - cmath - - cmathml3 - - CMCompare - - cmd-item - - cmdlib - - cmdtheline - - cmf - - cmonad - - cmph - - cmptype - - CMQ - - cmt - - cmv - - cnc-spec-compiler - - co-log-polysemy - - co-log-polysemy-formatting - - co-log-sys - - Coadjute - - coalpit - - cobot-io - - cobot-tools - - code-builder - - codec - - codec-beam - - codec-libevent - - codec-rpm - - codecov-haskell - - codemonitor - - codepad - - codeworld-api - - codex - - codo-notation - - coercible-utils - - coin - - coinbase-exchange - - coinbase-pro - - coincident-root-loci - - colada - - colchis - - collada-output - - collapse-duplication - - collapse-util - - collection-json - - collections - - collections-api - - collections-base-instances - - colonnade - - color-counter - - colorless - - colorless-http-client - - colorless-scotty - - colour-space - - coltrane - - columbia - - columnar - - com - - comark-syntax - - combinat - - combinat-diagrams - - combinator-interactive - - combinatorial-problems - - Combinatorrent - - combobuffer - - comic - - Command - - commander - - Commando - - commodities - - commsec - - commsec-keyexchange - - ComonadSheet - - compact-list - - compact-map - - compact-mutable - - compact-mutable-vector - - compact-socket - - compact-string - - compact-string-fix - - compact-word-vectors - - Compactable - - compactable - - compdata - - compdata-automata - - compdata-dags - - compdata-param - - compendium-client - - competition - - compilation - - complex-generic - - complexity - - compose-trans - - composite-opaleye - - composite-swagger - - composition-tree - - comprehensions-ghc - - compressed - - compstrat - - comptrans - - computational-algebra - - computational-geometry - - computations - - ConClusion - - concraft - - concraft-hr - - concraft-pl - - concrete-haskell - - concrete-haskell-autogen - - concrete-relaxng-parser - - concrete-typerep - - concurrency-benchmarks - - concurrent-buffer - - Concurrent-Cache - - concurrent-machines - - concurrent-state - - Concurrential - - Condor - - condor - - condorcet - - conductive-base - - conductive-hsc3 - - conductive-song - - conduit-audio-lame - - conduit-audio-samplerate - - conduit-find - - conduit-iconv - - conduit-network-stream - - conduit-resumablesink - - conduit-throttle - - conduit-tokenize-attoparsec - - conduit-vfs - - conduit-vfs-zip - - conf - - confcrypt - - conferer-dhall - - conferer-provider-dhall - - conferer-provider-json - - conferer-provider-yaml - - conferer-snap - - conferer-source-dhall - - conferer-source-json - - conferer-source-yaml - - conffmt - - confide - - config-parser - - config-select - - config-value-getopt - - ConfigFileTH - - Configger - - configifier - - Configurable - - configuration - - configurator-ng - - confsolve - - congruence-relation - - conjure - - conkin - - conlogger - - connection-string - - connections - - Conscript - - consistent - - console-program - - const-math-ghc-plugin - - constr-eq - - constrained-categories - - constrained-category - - constrained-dynamic - - constrained-monads - - constraint-manip - - ConstraintKinds - - constraints-emerge - - constructible - - constructive-algebra - - consul-haskell - - Consumer - - consumers - - container - - containers-benchmark - - containers-verified - - ContArrow - - content-store - - context-free-grammar - - context-stack - - ContextAlgebra - - contiguous - - contiguous-checked - - contiguous-fft - - continue - - continuum - - continuum-client - - Contract - - control - - control-iso - - control-monad-attempt - - control-monad-exception-monadsfd - - control-monad-failure - - control-monad-failure-mtl - - Control-Monad-MultiPass - - Control-Monad-ST2 - - contstuff-monads-tf - - contstuff-transformers - - conversions - - convert - - convert-annotation - - convertible-ascii - - convertible-text - - cookies - - coordinate - - copilot - - copilot-c99 - - copilot-cbmc - - copilot-language - - copilot-libraries - - copilot-sbv - - copilot-theorem - - copr - - COrdering - - core - - core-haskell - - corebot-bliki - - CoreDump - - CoreErlang - - CoreFoundation - - corenlp-parser - - Coroutine - - coroutine-enumerator - - coroutine-iteratee - - coroutine-object - - couch-hs - - CouchDB - - couchdb-conduit - - couchdb-enumerator - - countable-inflections - - counter - - country-codes - - courier - - court - - coverage - - cparsing - - CPBrainfuck - - cpio-conduit - - cpkg - - CPL - - cplusplus-th - - cprng-aes-effect - - cpuperf - - cpython - - cql-io - - cql-io-tinylog - - cqrs-core - - cqrs-example - - cqrs-memory - - cqrs-postgresql - - cqrs-sqlite3 - - cqrs-test - - cqrs-testkit - - cr - - crack - - craft - - Craft3e - - craftwerk - - craftwerk-cairo - - craftwerk-gtk - - crawlchain - - craze - - crc - - crc16 - - crdt - - crdt-event-fold - - creatur - - credential-store - - crf-chain1 - - crf-chain1-constrained - - crf-chain2-generic - - crf-chain2-tiers - - critbit - - criterion-cmp - - criterion-compare - - criterion-plus - - criterion-to-html - - criu-rpc - - criu-rpc-types - - crjdt-haskell - - crockford - - crocodile - - cron-compat - - cruncher-types - - crunghc - - crypt-sha512 - - crypto-cipher-benchmarks - - crypto-classical - - crypto-conduit - - crypto-keys-ssh - - crypto-multihash - - crypto-pubkey-openssh - - crypto-random-effect - - crypto-simple - - cryptocipher - - cryptocompare - - cryptoconditions - - cryptoids - - cryptoids-class - - cryptoids-types - - cryptol - - cryptsy-api - - crystalfontz - - cse-ghc-plugin - - csg - - CSPM-cspm - - CSPM-FiringRules - - CSPM-Frontend - - CSPM-Interpreter - - CSPM-ToProlog - - cspmchecker - - cspretty - - css - - css-easings - - css-selectors - - csv-enumerator - - csv-nptools - - ctemplate - - ctkl - - ctpl - - cube - - cubical - - cuboid - - cuckoo - - curl-runnings - - currency-codes - - currency-convert - - curry-frontend - - CurryDB - - curryer-rpc - - cursedcsv - - cursor-fuzzy-time-gen - - curves - - custom-prelude - - CV - - cv-combinators - - cypher - - d-bus - - d3js - - dag - - DAG-Tournament - - damnpacket - - Dangerous - - danibot - - Dao - - dao - - dapi - - darcs-benchmark - - darcs-beta - - darcs-buildpackage - - darcs-cabalized - - darcs-fastconvert - - darcs-graph - - darcs-monitor - - darcs2dot - - darcsden - - DarcsHelpers - - darcswatch - - darkplaces-demo - - darkplaces-rcon - - darkplaces-rcon-util - - darkplaces-text - - dash-haskell - - data-accessor-monads-fd - - data-accessor-monads-tf - - data-aviary - - data-base - - data-basic - - data-check - - data-combinator-gen - - data-concurrent-queue - - data-construction - - data-cycle - - data-dispersal - - data-diverse-lens - - data-easy - - data-elf - - data-embed - - data-emoticons - - data-filepath - - data-fin - - data-fin-simple - - data-flagset - - data-interval - - data-ivar - - data-kiln - - data-layer - - data-lens - - data-lens-fd - - data-lens-ixset - - data-lens-template - - data-map-multikey - - data-nat - - data-object - - data-object-json - - data-object-yaml - - data-pprint - - data-quotientref - - data-r-tree - - data-reify-cse - - data-repr - - data-result - - data-rev - - Data-Rope - - data-rope - - data-rtuple - - data-size - - data-spacepart - - data-standards - - data-store - - data-stringmap - - data-structure-inferrer - - data-sword - - data-type - - data-util - - data-validation - - data-variant - - database-id-class - - database-id-groundhog - - database-study - - datadog - - datadog-tracing - - datafix - - dataflow - - datalog - - datapacker - - datasets - - DataTreeView - - dataurl - - DataVersion - - date-conversions - - dates - - datetime - - datetime-sb - - dawdle - - dawg - - dbcleaner - - dbf - - DBFunctor - - dbjava - - DBlimited - - dbm - - dbmigrations-mysql - - dbmigrations-postgresql - - dbmigrations-sqlite - - DBus - - dbus-client - - dbus-core - - dbus-qq - - dclabel - - dclabel-eci11 - - dcpu16 - - ddate - - ddc-base - - ddc-build - - ddc-code - - ddc-core - - ddc-core-babel - - ddc-core-eval - - ddc-core-flow - - ddc-core-llvm - - ddc-core-salt - - ddc-core-simpl - - ddc-core-tetra - - ddc-driver - - ddc-interface - - ddc-source-tetra - - ddc-tools - - ddc-war - - ddci-core - - dead-code-detection - - dead-simple-json - - Deadpan-DDP - - debug - - debug-me - - debug-trace-var - - debug-tracy - - decepticons - - decidable - - decimal-arithmetic - - decimal-literals - - DecisionTree - - decoder-conduit - - dedukti - - deep-transformations - - DeepArrow - - deepcontrol - - DeepDarkFantasy - - deeplearning-hs - - deepseq-bounded - - deepseq-magic - - deepseq-th - - deepzoom - - defargs - - DefendTheKing - - deka - - deka-tests - - delaunay - - delicious - - delimited-text - - delimiter-separated - - delta - - delta-h - - Delta-Lambda - - delude - - demarcate - - denominate - - dense - - dense-int-set - - dep-t - - dep-t-advice - - dependent-hashmap - - dependent-monoidal-map - - dependent-state - - depends - - dephd - - deptrack-core - - deptrack-devops - - deptrack-dot - - dequeue - - derangement - - derivation-trees - - derive - - derive-enumerable - - derive-gadt - - derive-IG - - derive-monoid - - derive-trie - - derp-lib - - describe - - descript-lang - - deterministic-game-engine - - detour-via-uom - - deunicode - - devil - - devtools - - dewdrop - - dfinity-radix-tree - - Dflow - - dfsbuild - - dgim - - dgs - - dhall-check - - dhall-docs - - dhall-fly - - dhall-nix - - dhall-nixpkgs - - dhall-recursive-adt - - dhall-text - - dhall-to-cabal - - dhcp-lease-parser - - dhrun - - dia-base - - dia-functions - - diagrams-boolean - - diagrams-braille - - diagrams-builder - - diagrams-cairo - - diagrams-canvas - - diagrams-graphviz - - diagrams-gtk - - diagrams-haddock - - diagrams-html5 - - diagrams-pandoc - - diagrams-pdf - - diagrams-pgf - - diagrams-qrcode - - diagrams-rasterific - - diagrams-rubiks-cube - - diagrams-tikz - - diagrams-wx - - dib - - dice2tex - - dicom - - dictionaries - - dictparser - - diet - - diff - - diffcabal - - difference-monoid - - DifferenceLogic - - differential - - DifferentialEvolution - - diffmap - - difftodo - - digestive-bootstrap - - digestive-foundation-lucid - - digestive-functors-aeson - - digestive-functors-happstack - - digestive-functors-hsp - - DigitalOcean - - digitalocean-kzs - - digits - - dimensional-codata - - dimensional-tf - - DimensionalHash - - dingo-core - - dingo-example - - dingo-widgets - - diohsc - - diophantine - - diplomacy - - diplomacy-server - - direct-binary-files - - direct-fastcgi - - direct-http - - direct-plugins - - direct-rocksdb - - directed-cubical - - directory-contents - - direm - - dirfiles - - discogs-haskell - - discord-gateway - - discord-hs - - discord-register - - discord-rest - - discord-types - - discordian-calendar - - discrete - - DiscussionSupportSystem - - Dish - - disjoint-containers - - disjoint-set - - disjoint-set-stateful - - Dist - - dist-upload - - distance - - DisTract - - distributed-fork-aws-lambda - - distributed-process - - distributed-process-async - - distributed-process-azure - - distributed-process-client-server - - distributed-process-ekg - - distributed-process-execution - - distributed-process-extras - - distributed-process-fsm - - distributed-process-lifted - - distributed-process-monad-control - - distributed-process-p2p - - distributed-process-platform - - distributed-process-registry - - distributed-process-simplelocalnet - - distributed-process-supervisor - - distributed-process-systest - - distributed-process-task - - distributed-process-tests - - distributed-process-zookeeper - - distribution - - distribution-plot - - diversity - - dixi - - djembe - - djinn-th - - dl-fedora - - dmcc - - dmenu - - dmenu-pkill - - dmenu-pmount - - dmenu-search - - DMuCheck - - DnaProteinAlignment - - dnscache - - dnsrbl - - dnssd - - dobutok - - doc-review - - doccheck - - docidx - - docker - - docker-build-cacher - - dockercook - - dockerfile-creator - - docopt - - docrecords - - DocTest - - doctest-discover-configurator - - doctest-prop - - docusign-base - - docusign-base-minimal - - docusign-client - - docusign-example - - docvim - - doi - - DOM - - domain - - domain-core - - domain-optics - - domplate - - dot-linker - - dotfs - - doublify-toolkit - - dow - - download-media-content - - downloader - - dozenal - - dozens - - DP - - dph-base - - dph-examples - - dph-lifted-base - - dph-lifted-copy - - dph-lifted-vseg - - dph-prim-interface - - dph-prim-par - - dph-prim-seq - - dpkg - - DPM - - dpor - - dragen - - drawille - - drClickOn - - dresdner-verkehrsbetriebe - - DrHylo - - DrIFT - - DrIFT-cabalized - - drifter - - drifter-postgresql - - drifter-sqlite - - drmaa - - drone - - dropbox - - dropbox-sdk - - dropsolve - - ds-kanren - - DSA - - dsc - - DSH - - dsh-sql - - dsmc - - dsmc-tools - - dson - - dson-parsec - - DSTM - - dstring - - DTC - - dtd - - dtd-text - - dtw - - dualizer - - duet - - dumb-cas - - dump-core - - dunai-core - - Dung - - duplo - - dura - - Dust - - Dust-crypto - - Dust-tools - - Dust-tools-pcap - - dvault - - dvda - - dvdread - - dvi-processing - - dwarf - - dwarfadt - - dyckword - - dyepack - - dynamic-cabal - - dynamic-graphs - - dynamic-mvector - - dynamic-object - - dynamic-plot - - dynamic-pp - - DynamicTimeWarp - - dynamodb-simple - - dynloader - - dynobud - - DysFRP - - DysFRP-Cairo - - DysFRP-Craftwerk - - dywapitchtrack - - dzen-dhall - - dzen-utils - - each - - earclipper - - early - - easy-api - - easy-bitcoin - - easyjson - - easyplot - - easytensor - - easytensor-vulkan - - easytest - - ebeats - - ebnf-bff - - ec2-unikernel - - eccrypto - - eccrypto-ed25519-bindings - - ecma262 - - ecu - - eddie - - ede - - edenmodules - - edenskel - - edentv - - edge - - edges - - edis - - edit - - edit-lenses - - editable - - editline - - EditTimeReport - - effect-handlers - - effect-monad - - effect-stack - - effin - - egison - - egison-pattern-src - - egison-pattern-src-haskell-mode - - egison-pattern-src-th-mode - - egison-quote - - egison-tutorial - - ehaskell - - ehs - - eibd-client-simple - - eigen - - Eight-Ball-Pool-Hack-Cheats - - eio - - either-list-functions - - either-unwrap - - EitherT - - ejdb2-binding - - ekg-bosun - - ekg-carbon - - ekg-cloudwatch - - ekg-elastic - - ekg-elasticsearch - - ekg-log - - ekg-push - - ekg-rrd - - ekg-wai - - elerea-examples - - elevator - - elision - - elliptic-curve - - elm-street - - elm-websocket - - elsa - - elynx - - elynx-tree - - emacs-keys - - emacs-module - - email - - email-header - - email-postmark - - emailaddress - - emailparse - - embeddock - - embeddock-example - - embla - - embroidery - - emgm - - Emping - - Empty - - empty-monad - - enchant - - encoding - - encoding-io - - encryptable - - engine-io - - engine-io-growler - - engine-io-snap - - engine-io-wai - - engine-io-yesod - - entangle - - EntrezHTTP - - entwine - - enum-text - - enum-text-rio - - enum-utf8 - - EnumContainers - - enumerate - - enumerate-function - - enumerator - - enumerator-fd - - enumerator-tf - - enumfun - - EnumMap - - enummapmap - - env-extra - - env-parser - - envstatus - - epanet-haskell - - epass - - ephemeral - - epi-sim - - epic - - epoll - - eprocess - - epubname - - Eq - - EqualitySolver - - equational-reasoning-induction - - equeue - - erf-native - - erlang - - erlang-ffi - - eros - - eros-client - - eros-http - - error-codes - - error-context - - error-continuations - - error-list - - error-loc - - error-message - - error-util - - errors-ext - - ersaconcat - - ersatz - - ersatz-toysat - - ert - - escape-artist - - escoger - - esotericbot - - EsounD - - espial - - ess - - estimators - - EstProgress - - estreps - - Etage - - Etage-Graph - - EtaMOO - - eternal - - Eternal10Seconds - - eternity - - eternity-timestamped - - ether - - Etherbunny - - ethereum-analyzer - - ethereum-analyzer-cli - - ethereum-analyzer-webui - - ethereum-client-haskell - - ethereum-merkle-patricia-db - - ethereum-rlp - - euphoria - - eurofxref - - evdev - - evdev-streamly - - eve-cli - - event - - event-driven - - event-monad - - eventful-dynamodb - - eventful-postgresql - - eventful-sql-common - - eventful-sqlite - - eventlog2html - - eventloop - - EventSocket - - eventsource-geteventstore-store - - eventstore - - every-bit-counts - - ewe - - exact-cover - - exact-real-positional - - except-exceptions - - exception-monads-fd - - exceptional - - exceptionfree-readfile - - exchangerates - - execs - - executor - - exference - - exh - - exherbo-cabal - - exif - - exigo-schema - - exinst-deepseq - - exinst-hashable - - exists - - exitcode - - exp-extended - - expand - - expat-enumerator - - expiring-containers - - explain - - explicit-constraint-lens - - explicit-determinant - - explicit-iomodes - - explicit-iomodes-bytestring - - explicit-iomodes-text - - explicit-sharing - - explore - - exposed-containers - - expression-parser - - expressions - - expressions-z3 - - expresso - - extcore - - extemp - - extended-categories - - extensible-data - - extensible-effects-concurrent - - extensible-skeleton - - external-sort - - Extra - - extract-dependencies - - extractelf - - extralife - - ez-couch - - ez3 - - f-algebra-gen - - f-ree-hack-cheats-free-v-bucks-generator - - Facebook-Password-Hacker-Online-Latest-Version - - faceted - - factory - - Facts - - facts - - factual-api - - fadno - - fadno-braids - - fadno-xml - - failable-list - - failure-detector - - FailureT - - fake - - fake-type - - faktory - - falling-turnip - - fallingblocks - - family-tree - - fast-arithmetic - - fast-combinatorics - - fast-digits - - fast-nats - - fasta - - fastbayes - - fastedit - - fastirc - - fastly - - fastpbkdf2 - - FastPush - - fastsum - - FastxPipe - - fathead-util - - fault-tree - - fay-builder - - fay-hsx - - fay-simplejson - - fb-persistent - - fbmessenger-api - - fbrnch - - fca - - fcache - - fcd - - fcf-containers - - fcg - - fckeditor - - fclabels-monadlib - - fcm-client - - FComp - - fdo-trash - - feature-flipper - - feature-flipper-postgres - - fedora-img-dl - - fedora-packages - - feed-cli - - feed-collect - - feed-crawl - - feed-gipeda - - feed-translator - - feed2lj - - feed2twitter - - fei-base - - fei-cocoapi - - fei-dataiter - - fei-datasets - - fei-examples - - fei-modelzoo - - fei-nn - - feldspar-compiler - - feldspar-language - - fenfire - - FermatsLastMargin - - fernet - - FerryCore - - festung - - Feval - - fez-conf - - ffeed - - fficxx - - ffmpeg-tutorials - - ffunctor - - fgl-extras-decompositions - - fibon - - ficketed - - fields - - FieldTrip - - fieldwise - - fig - - file-collection - - file-command-qq - - file-embed-poly - - file-location - - filecache - - filediff - - FileManip - - FileManipCompat - - fileneglect - - filepath-crypto - - filepath-io-access - - FilePather - - filepather - - fileplow - - Files - - FileSystem - - filesystem-abstractions - - filesystem-conduit - - filesystem-enumerator - - filesystem-trees - - fillit - - Fin - - final-pretty-printer - - Finance-Quote-Yahoo - - Finance-Treasury - - find-clumpiness - - find-conduit - - find-source-files - - findhttp - - fingertree-psqueue - - fingertree-tf - - finitary-derive - - FiniteMap - - firefly-example - - first-and-last - - first-class-instances - - firstify - - FirstOrderTheory - - fishfood - - fit - - fits-parse - - fitsio - - fix-imports - - fix-parser-simple - - fix-symbols-gitit - - fixed-point - - fixed-point-vector - - fixed-point-vector-space - - fixed-precision - - fixed-storable-array - - fixed-timestep - - fixed-vector-binary - - fixed-vector-cborg - - fixed-vector-cereal - - fixed-width - - fixer - - fixfile - - fixhs - - fixie - - fizzbuzz - - fizzbuzz-as-a-service - - flac - - flac-picture - - flaccuraterip - - flamethrower - - flamingra - - flashblast - - flat-maybe - - flatbuffers - - flay - - flexible-time - - flexiwrap - - flexiwrap-smallcheck - - flickr - - flink-statefulfun - - Flippi - - flite - - float-binstring - - floating-bits - - flow-er - - flowdock - - flowdock-api - - flowdock-rest - - flower - - flowlocks-framework - - flowsim - - flp - - fltkhs - - fltkhs-fluid-examples - - fluent-logger - - fluffy-parser - - fluidsynth - - flux-monoid - - FM-SBLEX - - fmark - - FModExRaw - - fmt-for-rio - - fmt-terminal-colors - - fn-extra - - foldl-incremental - - foldl-statistics - - foldl-transduce - - foldl-transduce-attoparsec - - folds-common - - follow - - follower - - foma - - font-opengl-basic4x6 - - foo - - for-free - - forbidden-fruit - - fordo - - forecast-io - - foreign-var - - forest - - forest-fire - - Forestry - - forex2ledger - - forger - - ForkableT - - formal - - FormalGrammars - - format - - format-status - - formatn - - formattable - - forml - - formlets - - formlets-hsp - - formura - - ForSyDe - - forsyde-deep - - forth-hll - - Fortnite-Hack-Cheats-Free-V-Bucks-Generator - - fortran-src - - fortran-src-extras - - fortytwo - - foscam-directory - - foscam-filename - - foscam-sort - - Foster - - fp-ieee - - fpco-api - - fplll - - fpnla-examples - - FPretty - - fptest - - Fractaler - - fractals - - fraction - - frag - - frame-markdown - - Frames-beam - - Frames-dsv - - Frames-map-reduce - - franchise - - Frank - - fraxl - - freddy - - free-algebras - - free-category - - free-concurrent - - free-game - - free-http - - free-operational - - free-theorems - - free-theorems-counterexamples - - free-theorems-seq - - free-theorems-seq-webui - - free-theorems-webui - - free-v-bucks-generator-no-survey - - free-v-bucks-generator-ps4-no-survey - - freekick2 - - freelude - - freer-converse - - freer-effects - - freer-simple-catching - - freer-simple-http - - freer-simple-profiling - - freer-simple-random - - freer-simple-time - - freesect - - freesound - - freetype-simple - - FreeTypeGL - - freq - - fresh - - friday-devil - - friday-scale-dct - - friendly - - front - - frown - - frp-arduino - - frpnow - - frpnow-gloss - - frpnow-gtk - - frpnow-gtk3 - - frpnow-vty - - fs-events - - fsh-csv - - fsmActions - - fst - - fsutils - - fswait - - fswatch - - ft-generator - - ftdi - - FTGL-bytestring - - ftp-client - - ftp-client-conduit - - ftp-conduit - - ftphs - - FTPLine - - ftree - - ftshell - - full-sessions - - funbot - - funbot-client - - funbot-git-hook - - funcons-lambda-cbv-mp - - funcons-simple - - funcons-tools - - funcons-values - - function-combine - - function-instances-algebra - - functional-arrow - - functor - - functor-combinators - - functor-combo - - functor-friends - - functor-infix - - functor-products - - functor-utils - - functorm - - funflow - - funflow-nix - - Fungi - - funion - - funnyprint - - funpat - - funsat - - funspection - - fused-effects-exceptions - - fused-effects-resumable - - fused-effects-squeal - - fused-effects-th - - fusion - - futun - - future - - fuzzy-time-gen - - fuzzy-timings - - fwgl - - fwgl-glfw - - fwgl-javascript - - fxpak - - g-npm - - g2 - - g2q - - g4ip - - gact - - galois-fft - - galois-field - - game-probability - - gameclock - - gamgee - - Gamgine - - gamma - - Ganymede - - garepinoh - - gargoyle-postgresql-connect - - gargoyle-postgresql-nix - - gas - - gather - - gbu - - gc-monitoring-wai - - gconf - - gdax - - gdiff-ig - - gdiff-th - - GeBoP - - gedcom - - geek - - geek-server - - gegl - - gelatin - - gelatin-freetype2 - - gelatin-fruity - - gelatin-gl - - gelatin-sdl2 - - gelatin-shaders - - gemini-textboard - - gemstone - - gen-imports - - gen-passwd - - Genbank - - gencheck - - gender - - genders - - Gene-CluEDO - - general-prelude - - GeneralTicTacToe - - generator - - generators - - generic-accessors - - generic-binary - - generic-church - - generic-enum - - generic-enumeration - - generic-labels - - generic-lens-labels - - generic-lucid-scaffold - - generic-maybe - - generic-optics - - generic-override-aeson - - generic-pretty - - generic-server - - generic-storable - - generic-tree - - generic-trie - - generic-xml - - generic-xmlpickler - - generics-mrsop - - generics-mrsop-gdiff - - genericserialize - - genesis - - genesis-test - - genetics - - GenI - - geni-gui - - geni-util - - geniconvert - - geniplate - - geniserver - - genprog - - GenSmsPdu - - gentlemark - - GenussFold - - genvalidity-persistent - - geo-resolver - - GeocoderOpenCage - - geodetic - - geodetic-types - - geojson-types - - geolite-csv - - geom2d - - GeomPredicates-SSE - - geos - - Get - - getemx - - getflag - - GGg - - ggtsTC - - gh-labeler - - ghc-clippy-plugin - - ghc-core-smallstep - - ghc-datasize - - ghc-dump-core - - ghc-dump-tree - - ghc-dump-util - - ghc-dup - - ghc-events-analyze - - ghc-events-parallel - - ghc-generic-instances - - ghc-imported-from - - ghc-instances - - ghc-justdoit - - ghc-man-completion - - ghc-mod - - ghc-parmake - - ghc-pkg-autofix - - ghc-pkg-lib - - ghc-plugs-out - - ghc-proofs - - ghc-session - - ghc-simple - - ghc-srcspan-plugin - - ghc-syb - - ghc-syb-utils - - ghc-tags-core - - ghc-tags-plugin - - ghc-time-alloc-prof - - ghc-usage - - ghc-vis - - ghci-dap - - ghci-diagrams - - ghci-haskeline - - ghci-history-parser - - ghci-lib - - ghci-ng - - ghci-pretty - - ghcjs-dom-jsffi - - ghcjs-fetch - - ghcjs-hplay - - ghcjs-promise - - ghcjs-xhr - - ghclive - - ghcprofview - - ghcup - - ght - - gi-cairo-again - - gi-gmodule - - gi-graphene - - gi-gsk - - gi-gstaudio - - gi-gstpbutils - - gi-gsttag - - gi-gtkosxapplication - - gi-gtksheet - - gi-handy - - gi-poppler - - gi-vips - - gi-wnck - - giak - - Gifcurry - - ginsu - - gipeda - - giphy-api - - GiST - - gist - - git - - git-all - - git-checklist - - git-config - - git-cuk - - git-date - - git-fmt - - git-gpush - - git-jump - - git-monitor - - git-object - - git-remote-ipfs - - git-repair - - git-sanity - - git-vogue - - gitdo - - github-backup - - github-data - - github-tools - - github-utils - - github-webhook-handler - - github-webhook-handler-snap - - githud - - gitignore - - gitlab-api - - gitlib - - gitlib-cmdline - - gitlib-cross - - gitlib-libgit2 - - gitlib-s3 - - gitlib-sample - - gitlib-test - - gitlib-utils - - gitson - - gitter - - givegif - - glade - - gladexml-accessor - - glapp - - glazier - - glazier-pipes - - glazier-react - - glazier-react-examples - - glazier-react-widget - - Gleam - - GLFW - - GLFW-b-demo - - GLFW-OGL - - GLFW-task - - gli - - glider-nlp - - GLMatrix - - glob-posix - - global - - global-config - - global-variables - - glome-hs - - GlomeTrace - - GlomeView - - gloss-banana - - gloss-devil - - gloss-examples - - gloss-export - - gloss-game - - gloss-sodium - - glpk-headers - - glpk-hs - - gltf-codec - - glue - - gmap - - gmndl - - gnome-desktop - - gnomevfs - - gnss-converters - - gnuidn - - goa - - goal-core - - goal-geometry - - goal-probability - - goal-simulation - - goatee - - goatee-gtk - - gochan - - godot-haskell - - gofer-prelude - - goldplate - - gooey - - google-cloud - - google-drive - - google-html5-slide - - google-mail-filters - - google-maps-geocoding - - google-oauth2 - - google-oauth2-easy - - google-oauth2-jwt - - google-search - - google-server-api - - google-static-maps - - google-translate - - GoogleCodeJam - - GoogleDirections - - googleplus - - googlepolyline - - GoogleSB - - GoogleTranslate - - gopherbot - - gopro-plus - - gore-and-ash - - gore-and-ash-actor - - gore-and-ash-async - - gore-and-ash-demo - - gore-and-ash-glfw - - gore-and-ash-lambdacube - - gore-and-ash-logging - - gore-and-ash-network - - gore-and-ash-sdl - - gore-and-ash-sync - - GotoT-transformers - - gpah - - GPipe - - GPipe-Collada - - GPipe-Core - - GPipe-Examples - - GPipe-GLFW - - GPipe-GLFW4 - - GPipe-TextureLoad - - gps - - gps2htmlReport - - GPX - - gpx-conduit - - grab - - grab-form - - graceful - - grafana - - graflog - - Grafos - - grakn - - grammar-combinators - - GrammarProducts - - grammatical-parsers - - grapefruit-examples - - grapefruit-frp - - grapefruit-records - - grapefruit-ui - - grapefruit-ui-gtk - - graph-core - - graph-matchings - - graph-rewriting - - graph-rewriting-cl - - graph-rewriting-gl - - graph-rewriting-lambdascope - - graph-rewriting-layout - - graph-rewriting-ski - - graph-rewriting-strategies - - graph-rewriting-trs - - graph-rewriting-ww - - graph-serialize - - graph-utils - - graph-visit - - Graph500 - - graphbuilder - - graphene - - GraphHammer - - GraphHammer-examples - - graphics-drawingcombinators - - graphics-formats-collada - - graphicsFormats - - graphicstools - - graphmod-plugin - - graphql - - graphql-api - - graphql-client - - graphql-utils - - graphql-w-persistent - - graphted - - graphtype - - graphula - - graphula-core - - graql - - grasp - - gray-code - - greencard - - greencard-lib - - greg-client - - gremlin-haskell - - Grempa - - grenade - - grid-proto - - gridbounds - - gridland - - grm - - groot - - gross - - GroteTrap - - groundhog-converters - - groundhog-mysql - - group-theory - - group-with - - grouped-list - - groups-generic - - growler - - GrowlNotify - - grpc-api-etcd - - grpc-etcd-client - - grpc-haskell - - grpc-haskell-core - - gruff - - gruff-examples - - gscholar-rss - - gsl-random - - gsl-random-fu - - gstorable - - gstreamer - - GTALib - - gtfs - - gtfs-realtime - - gtk-serialized-event - - gtk-toy - - gtk2hs-hello - - gtk2hs-rpn - - Gtk2hsGenerics - - gtk3-mac-integration - - gtkglext - - GtkGLTV - - gtkimageview - - gtkrsync - - gtksourceview2 - - gtksourceview3 - - GtkTV - - guarded-rewriting - - guess-combinator - - GuiHaskell - - GuiTV - - gulcii - - gw - - gyah-bin - - gym-http-api - - h-booru - - h-gpgme - - h-reversi - - h2048 - - h2c - - haar - - habit - - hablo - - hablog - - HABQT - - Hach - - hack-contrib - - hack-contrib-press - - hack-frontend-happstack - - hack-handler-cgi - - hack-handler-epoll - - hack-handler-evhttp - - hack-handler-fastcgi - - hack-handler-happstack - - hack-handler-hyena - - hack-handler-kibro - - hack-handler-simpleserver - - hack-middleware-cleanpath - - hack-middleware-clientsession - - hack-middleware-jsonp - - hack2-handler-happstack-server - - hack2-handler-mongrel2-http - - hack2-handler-snap-server - - hack2-handler-warp - - hackage-api - - hackage-diff - - hackage-mirror - - hackage-processing - - hackage-proxy - - hackage-repo-tool - - hackage-server - - hackage-whatsnew - - hackage2hwn - - hackage2twitter - - hackager - - hackernews - - HackMail - - hackmanager - - hackport - - hactor - - hactors - - haddock - - haddock-api - - haddock-cheatsheet - - haddock-leksah - - haddock-test - - haddocset - - hadoop-formats - - hadoop-rpc - - hadoop-tools - - hafar - - haggis - - Haggressive - - hahp - - haiji - - hailgun-send - - hails-bin - - hairy - - hakaru - - hakismet - - hakka - - hako - - hakyll - - hakyll-agda - - hakyll-alectryon - - hakyll-blaze-templates - - hakyll-contrib - - hakyll-contrib-csv - - hakyll-contrib-elm - - hakyll-contrib-hyphenation - - hakyll-contrib-links - - hakyll-dhall - - hakyll-dir-list - - hakyll-elm - - hakyll-favicon - - hakyll-filestore - - hakyll-images - - hakyll-ogmarkup - - hakyll-process - - hakyll-R - - hakyll-sass - - hakyll-series - - hakyll-shakespeare - - hakyll-shortcode - - hakyll-shortcut-links - - hakyll-typescript - - hal - - halberd - - HaLeX - - halfs - - halipeto - - halive - - hall-symbols - - halma - - halma-gui - - halma-telegram-bot - - halves - - ham - - HaMinitel - - hampp - - hamsql - - hamtmap - - hamusic - - hanabi-dealer - - handa-gdata - - handle-like - - HandlerSocketClient - - handsy - - Hangman - - hannahci - - hans - - hans-pcap - - hanspell - - haphviz - - happindicator - - happindicator3 - - happlets - - happlets-lib-gtk - - happraise - - HAppS-Data - - happs-hsp - - happs-hsp-template - - HAppS-IxSet - - HAppS-Server - - HAppS-State - - happs-tutorial - - HAppS-Util - - happstack - - happstack-auth - - happstack-authenticate - - happstack-contrib - - happstack-data - - happstack-dlg - - happstack-facebook - - happstack-fay - - happstack-fay-ajax - - happstack-foundation - - happstack-hamlet - - happstack-heist - - happstack-helpers - - happstack-hstringtemplate - - happstack-ixset - - happstack-jmacro - - happstack-lite - - happstack-monad-peel - - happstack-plugins - - happstack-server-tls-cryptonite - - happstack-state - - happstack-util - - happstack-yui - - happy-hour - - happybara - - happybara-webkit - - happybara-webkit-server - - HappyTree - - hapstone - - HaPy - - haquery - - haquil - - harchive - - hArduino - - hardware-edsl - - HaRe - - harg - - hark - - harmony - - HarmTrace - - haroonga - - haroonga-httpd - - harpy - - harvest-api - - has - - has-th - - hasbolt - - hasbolt-extras - - HasCacBDD - - hascard - - hascas - - Haschoo - - HasGP - - hash - - hashable-extras - - hashable-generics - - hashable-orphans - - hashabler - - hashed-storage - - Hashell - - hashflare - - hashring - - hashtables-plus - - hasim - - hask - - hask-home - - haskarrow - - haskbot-core - - haskdeep - - haskeem - - haskeline-class - - haskelisp - - haskell-abci - - haskell-aliyun - - haskell-awk - - haskell-bitmex-client - - haskell-bitmex-rest - - haskell-brainfuck - - haskell-ci - - haskell-cnc - - haskell-coffee - - haskell-compression - - haskell-conll - - haskell-course-preludes - - haskell-debug-adapter - - haskell-disque - - haskell-docs - - haskell-eigen-util - - haskell-formatter - - haskell-ftp - - haskell-generate - - haskell-go-checkers - - haskell-holes-th - - haskell-igraph - - haskell-in-space - - haskell-kubernetes - - haskell-lsp-client - - haskell-ml - - haskell-mpfr - - haskell-mpi - - haskell-names - - haskell-neo4j-client - - haskell-openflow - - haskell-overridez - - haskell-packages - - haskell-pdf-presenter - - haskell-platform-test - - haskell-player - - haskell-plot - - haskell-postal - - haskell-read-editor - - haskell-reflect - - haskell-rules - - haskell-spacegoo - - haskell-src-exts-observe - - haskell-src-exts-prisms - - haskell-src-exts-qq - - haskell-src-exts-sc - - haskell-src-match - - haskell-src-meta-mwotton - - haskell-stack-trace-plugin - - haskell-token-utils - - haskell-tools-ast - - haskell-tools-ast-fromghc - - haskell-tools-ast-gen - - haskell-tools-ast-trf - - haskell-tools-backend-ghc - - haskell-tools-builtin-refactorings - - haskell-tools-cli - - haskell-tools-daemon - - haskell-tools-debug - - haskell-tools-demo - - haskell-tools-experimental-refactorings - - haskell-tools-prettyprint - - haskell-tools-refactor - - haskell-tools-rewrite - - haskell-tor - - haskell-type-exts - - haskell-typescript - - haskell-tyrant - - haskell2010 - - haskell2020 - - haskell98 - - haskell98libraries - - HaskellAnalysisProgram - - haskelldb - - haskelldb-connect-hdbc - - haskelldb-connect-hdbc-catchio-mtl - - haskelldb-connect-hdbc-catchio-tf - - haskelldb-connect-hdbc-catchio-transformers - - haskelldb-connect-hdbc-lifted - - haskelldb-dynamic - - haskelldb-flat - - haskelldb-hdbc - - haskelldb-hdbc-mysql - - haskelldb-hdbc-odbc - - haskelldb-hdbc-postgresql - - haskelldb-hdbc-sqlite3 - - haskelldb-hsql - - haskelldb-hsql-mysql - - haskelldb-hsql-odbc - - haskelldb-hsql-postgresql - - haskelldb-hsql-sqlite3 - - haskelldb-th - - haskelldb-wx - - haskellish - - HaskellLM - - HaskellNet - - HaskellNet-SSL - - HaskellNN - - Haskelloids - - haskellscrabble - - haskellscript - - HaskellTorrent - - HaskellTutorials - - haskelm - - haskelzinc - - haskeme - - haskey - - haskey-mtl - - haskgame - - haskheap - - haskhol-core - - haskmon - - haskoin - - haskoin-bitcoind - - haskoin-core - - haskoin-crypto - - haskoin-node - - haskoin-protocol - - haskoin-script - - haskoin-store - - haskoin-store-data - - haskoin-util - - haskoin-wallet - - haskoon - - haskoon-httpspec - - haskoon-salvia - - haskore - - haskore-realtime - - haskore-supercollider - - haskore-synthesizer - - HaskRel - - hasktorch - - hasktorch-codegen - - hasktorch-ffi-th - - hasktorch-ffi-thc - - hasktorch-indef - - hasktorch-signatures - - hasktorch-signatures-partial - - hasktorch-signatures-support - - hasktorch-zoo - - haskus-binary - - haskus-system-build - - haskus-utils - - haskus-utils-compat - - haskus-utils-data - - haskus-utils-types - - haskus-utils-variant - - haskus-web - - haskyapi - - haslo - - hasloGUI - - hasmin - - hasparql-client - - hasql-backend - - hasql-class - - hasql-cursor-query - - hasql-cursor-transaction - - hasql-dynamic-statements - - hasql-generic - - hasql-postgres - - hasql-postgres-options - - hasql-queue - - hasql-simple - - hasql-th - - hasql-url - - hastache - - hastache-aeson - - haste - - haste-app - - haste-lib - - haste-markup - - haste-prim - - Hate - - hatex-guide - - HaTeX-meta - - HaTeX-qq - - hats - - hatt - - haven - - haverer - - HaVSA - - hawitter - - Hawk - - hax - - haxl-amazonka - - haxl-facebook - - haxparse - - haxr-th - - haxy - - hayland - - Hayoo - - hayoo-cli - - hback - - hbayes - - hbb - - hbcd - - hBDD-CMUBDD - - hBDD-CUDD - - hbeanstalk - - hbeat - - hbf - - hblas - - hblock - - hburg - - hcad - - HCard - - hcc - - hcg-minus - - hcg-minus-cairo - - hcheat - - hcheckers - - hchesslib - - HCL - - hcltest - - hCM - - hcoap - - hcom - - hcount - - hcron - - hCsound - - hcube - - hdaemonize-buildfix - - hdbc-aeson - - HDBC-mysql - - HDBC-postgresql-hstore - - hdbc-postgresql-hstore - - hdbi - - hdbi-conduit - - hdbi-postgresql - - hdbi-sqlite - - hdbi-tests - - hdevtools - - hdf - - hDFA - - hdiff - - hdigest - - hdirect - - hdis86 - - hdiscount - - hdm - - hdo - - hdocs - - hdph - - hdph-closure - - hdr-histogram - - HDRUtils - - headergen - - heap-console - - heapsort - - heart-app - - heart-core - - heartbeat-streams - - heatitup - - heatitup-complete - - heavy-log-shortcuts - - heavy-logger - - heavy-logger-amazon - - heavy-logger-instances - - hebrew-time - - hecc - - heckle - - hedgehog-checkers - - hedgehog-checkers-lens - - hedgehog-fakedata - - hedgehog-gen-json - - hedgehog-generic - - hedgehog-golden - - hedgehog-servant - - Hedi - - hedis-config - - hedis-namespace - - hedis-pile - - hedis-simple - - hedis-tags - - hedn-functor - - hedra - - heidi - - hein - - heist-aeson - - heist-async - - helics - - helics-wai - - helisp - - helium - - helix - - hell - - hellage - - hellnet - - help-esb - - hemkay - - hemokit - - hen - - henet - - hepevt - - her-lexer - - her-lexer-parsec - - HERA - - herbalizer - - HerbiePlugin - - heredocs - - Hermes - - hermit - - hermit-syb - - herms - - herringbone - - herringbone-embed - - herringbone-wai - - hesh - - hesql - - hetero-dict - - heterogeneous-list-literals - - heterolist - - hetris - - heukarya - - hevm - - hevolisa - - hevolisa-dph - - hex-text - - HExcel - - hexchat - - hexif - - hexmino - - hexml-lens - - hexpat-iteratee - - hexpat-pickle-generic - - hexpr - - hexpress - - hexquote - - hexstring - - hext - - hextream - - heyefi - - heyting-algebras - - hF2 - - hfann - - hfd - - hfiar - - HFitUI - - hfmt - - hfoil - - hfov - - hfractal - - HFrequencyQueue - - hfusion - - hg-buildpackage - - hgalib - - hgdbmi - - HGE2D - - hgearman - - hGelf - - hgen - - hgeometric - - hgeometry-ipe - - hgeometry-svg - - hgeos - - hgettext - - hgis - - hgithub - - hgmp - - hgom - - hgopher - - HGraphStorage - - hgrep - - hgrib - - hharp - - HHDL - - hhp - - hhwloc - - hi - - hi3status - - hiccup - - hichi - - hid-examples - - hidden-char - - hie-core - - hieraclus - - hierarchical-clustering-diagrams - - hierarchical-exceptions - - hierarchical-spectral-clustering - - hierarchy - - hiernotify - - Hieroglyph - - higgledy - - HiggsSet - - higherorder - - highjson - - highjson-swagger - - highjson-th - - highlight-versions - - highWaterMark - - himg - - himpy - - hindent - - hindley-milner - - hinduce-classifier - - hinduce-classifier-decisiontree - - hinduce-examples - - hinquire - - hinstaller - - hint-server - - hinter - - hinterface - - hinvaders - - hinze-streams - - hip - - hipbot - - hipchat-hs - - hipe - - Hipmunk-Utils - - hipsql-api - - hipsql-client - - hipsql-server - - hircules - - hirt - - Hish - - hissmetrics - - hist-pl - - hist-pl-dawg - - hist-pl-fusion - - hist-pl-lexicon - - hist-pl-lmf - - hist-pl-types - - historian - - hit - - hit-graph - - hit-on - - HJavaScript - - hjcase - - hjs - - HJScript - - hjson-query - - hjsonpointer - - hjsonschema - - hjugement-cli - - HJVM - - hkd-delta - - hkd-lens - - hkt - - hlbfgsb - - hlcm - - HLearn-algebra - - HLearn-approximation - - HLearn-classification - - HLearn-datastructures - - HLearn-distributions - - hledger-api - - hledger-chart - - hledger-irr - - hledger-vty - - hlibBladeRF - - hlibev - - hlibfam - - HList - - hlivy - - HLogger - - hlogger - - hlongurl - - hlrdb - - hlrdb-core - - hls - - hls-exactprint-utils - - hlwm - - hly - - hmark - - hmarkup - - hmatrix-banded - - hmatrix-mmap - - hmatrix-nipals - - hmatrix-sparse - - hmatrix-static - - hmatrix-sundials - - hmatrix-svdlibc - - hmatrix-syntax - - hmatrix-tests - - hmeap - - hmeap-utils - - hmenu - - hmep - - hmk - - HMM - - hmm - - hmm-hmatrix - - hmm-lapack - - hMollom - - hmp3 - - Hmpf - - hmt - - hmt-diagrams - - hmumps - - hnetcdf - - HNM - - hnormalise - - ho-rewriting - - hoauth - - hob - - hobbes - - hobbits - - hocilib - - hocker - - hodatime - - HODE - - hoe - - Hoed - - hOff-display - - hog - - hogg - - hoggl - - hogre - - hogre-examples - - hois - - hol - - hold-em - - hole - - holmes - - Holumbus-Searchengine - - holy-project - - homeomorphic - - hommage - - homoiconic - - homplexity - - HongoDB - - honi - - hoobuddy - - hood - - hood-off - - hood2 - - hoodie - - hoodle - - hoodle-builder - - hoodle-core - - hoodle-extra - - hoodle-parser - - hoodle-publish - - hoodle-render - - hoodle-types - - hoogle-index - - hooks-dir - - hoop - - hoopl - - hoovie - - hopencc - - hopencl - - HOpenCV - - hopfield - - hops - - hoq - - horizon - - horname - - hosc-json - - hosts-server - - hothasktags - - hotswap - - hourglass-fuzzy-parsing - - houseman - - hp2any-core - - hp2any-graph - - hp2any-manager - - hpack-convert - - hpack-dhall - - hpaco - - hpaco-lib - - hpage - - hpapi - - hpaste - - hpasteit - - HPath - - hpc-coveralls - - hpc-tracer - - hPDB - - hPDB-examples - - HPDF - - hpg - - HPi - - hpio - - hplaylist - - HPlot - - hpodder - - HPong - - hpqtypes - - hpqtypes-extras - - hprotoc - - hprotoc-fork - - hps - - hps-cairo - - hps-kmeans - - hPushover - - hpygments - - hpylos - - hpyrg - - hpython - - hquantlib - - hquantlib-time - - hR - - hranker - - HRay - - hreader - - hreader-lens - - hreq-client - - hreq-conduit - - hreq-core - - Hricket - - hricket - - hriemann - - HROOT - - HROOT-core - - HROOT-graf - - HROOT-hist - - HROOT-io - - HROOT-math - - HROOT-tree - - hs-blake2 - - hs-brotli - - hs-carbon-examples - - hs-cdb - - hs-conllu - - hs-di - - hs-dotnet - - hs-excelx - - hs-ffmpeg - - hs-fltk - - hs-gen-iface - - hs-gizapp - - hs-inspector - - hs-java - - hs-json-rpc - - hs-logo - - hs-nombre-generator - - hs-pattrans - - hs-pgms - - hs-pkg-config - - hs-pkpass - - hs-re - - hs-rqlite - - hs-rs-notify - - hs-scrape - - hs-snowtify - - hs-speedscope - - hs-tags - - hs-twitter - - hs-twitterarchiver - - hs-vcard - - hs-watchman - - hs2bf - - Hs2lib - - hs2ps - - hsaml2 - - hsautogui - - hsay - - hsbackup - - hsbc - - hsbencher - - hsbencher-codespeed - - hsbencher-fusion - - hsc3 - - hsc3-auditor - - hsc3-cairo - - hsc3-data - - hsc3-db - - hsc3-dot - - hsc3-forth - - hsc3-graphs - - hsc3-lang - - hsc3-lisp - - hsc3-plot - - hsc3-process - - hsc3-rec - - hsc3-rw - - hsc3-server - - hsc3-sf - - hsc3-sf-hsndfile - - hsc3-unsafe - - hsc3-utils - - hscaffold - - hscamwire - - hscassandra - - hscd - - hsclock - - hscope - - hScraper - - hscuid - - hsdev - - hsdif - - hsdip - - hsdns-cache - - Hsed - - hsendxmpp - - hsenv - - HSet - - hset - - hsfacter - - hsfcsh - - HSFFIG - - hsfilt - - hsforce - - HSGEP - - hsgnutls - - hsgnutls-yj - - hsgsom - - HsHaruPDF - - HSHHelpers - - HsHTSLib - - HsHyperEstraier - - hsI2C - - hSimpleDB - - hsimport - - hsinspect - - hsinspect-lsp - - HsJudy - - hskeleton - - hslackbuilder - - hslibsvm - - hslinks - - hslogger-reader - - hslogger-template - - hslogstash - - hsluv-haskell - - hsmagick - - HSmarty - - hsmodetweaks - - Hsmtlib - - hsmtpclient - - hsnock - - hsns - - hsnsq - - hsntp - - hsoptions - - HSoundFile - - hsoz - - hsp-cgi - - hsparql - - HsParrot - - hspear - - hspec-expectations-json - - hspec-expectations-match - - hspec-expectations-pretty - - hspec-experimental - - hspec-hashable - - hspec-jenkins - - hspec-monad-control - - hspec-pg-transact - - hspec-setup - - hspec-shouldbe - - hspec-snap - - hspec-structured-formatter - - hspec-test-sandbox - - hspec-webdriver - - hspec2 - - hspecVariant - - HsPerl5 - - hspkcs11 - - hspread - - hspresent - - hsprocess - - hsql - - hsql-mysql - - hsql-odbc - - hsql-postgresql - - hsql-sqlite3 - - hsreadability - - hsrelp - - hsseccomp - - hsSqlite3 - - hssqlppp - - hssqlppp-th - - HsSVN - - hstar - - hstats - - hstatsd - - hstest - - hstidy - - hstox - - hstradeking - - HStringTemplateHelpers - - hstyle - - hstzaar - - hsubconvert - - hsudoku - - HsWebots - - hswip - - hsx - - hsx-jmacro - - hsx-xhtml - - hsXenCtrl - - hsyscall - - hsyslog-tcp - - hszephyr - - HTab - - htags - - hTalos - - htar - - htdp-image - - hTensor - - htestu - - HTicTacToe - - htiled - - htlset - - html-charset - - html-kure - - html-rules - - html-tokenizer - - hts - - htsn - - htsn-import - - htssets - - http-attoparsec - - http-client-auth - - http-client-lens - - http-client-request-modifiers - - http-client-session - - http-client-streams - - http-client-websockets - - http-conduit-browser - - http-conduit-downloader - - http-directory - - http-dispatch - - http-enumerator - - http-grammar - - http-io-streams - - http-kinder - - http-listen - - http-monad - - http-pony - - http-pony-serve-wai - - http-proxy - - http-querystring - - http-response-decoder - - http-rfc7807 - - http-server - - http-shed - - http-wget - - http2-client - - http2-client-exe - - http2-client-grpc - - http2-grpc-proto-lens - - http2-grpc-proto3-wire - - https-everywhere-rules - - https-everywhere-rules-raw - - httpspec - - htune - - htvm - - htzaar - - huck - - HueAPI - - huff - - huffman - - hugs2yc - - hulk - - HulkImport - - human-parse - - human-text - - humble-prelude - - hums - - hunch - - HUnit-Diff - - hunit-gui - - hunit-rematch - - hunp - - hunspell-hs - - hunt-searchengine - - hunt-server - - hup - - hurdle - - hurl - - hurriyet - - husk-scheme - - husk-scheme-libs - - husky - - hutton - - huttons-razor - - huzzy - - hVOIDP - - hw-all - - hw-aws-sqs-conduit - - hw-ci-assist - - hw-dsv - - hw-json - - hw-json-lens - - hw-json-simd - - hw-json-simple-cursor - - hw-json-standard-cursor - - hw-kafka-avro - - hw-prim-bits - - hw-simd - - hw-simd-cli - - hw-uri - - hwall-auth-iitk - - hweblib - - hwhile - - hworker - - hworker-ses - - hwormhole - - hws - - hwsl2 - - hwsl2-bytevector - - hwsl2-reducers - - hx - - HXMPP - - hxmppc - - hxournal - - HXQ - - hxt-pickle-utils - - hxthelper - - hxweb - - hyahtzee - - hyakko - - hybrid - - hydra-hs - - hydra-print - - Hydrogen - - hydrogen - - hydrogen-cli - - hydrogen-cli-args - - hydrogen-data - - hydrogen-multimap - - hydrogen-parsing - - hydrogen-prelude - - hydrogen-prelude-parsec - - hydrogen-syntax - - hydrogen-util - - hyena - - hylide - - hylolib - - hylotab - - hyloutils - - hyper-extra - - hyper-haskell-server - - hyperdrive - - hyperfunctions - - hyperion - - hyperloglogplus - - hyperpublic - - hypher - - hzk - - hzulip - - i18n - - I1M - - i3ipc - - iap-verifier - - ib-api - - iban - - ical - - ice40-prim - - icepeak - - IcoGrid - - iconv-typed - - ide-backend - - ide-backend-common - - ide-backend-server - - ideas - - ideas-math - - ideas-math-types - - ideas-statistics - - idempotent - - identifiers - - idiii - - idna2008 - - IDynamic - - ieee-utils - - iexcloud - - ifcxt - - IFS - - ig - - ige - - ige-mac-integration - - ignore - - igraph - - ihaskell - - ihaskell-aeson - - ihaskell-basic - - ihaskell-blaze - - ihaskell-charts - - ihaskell-diagrams - - ihaskell-display - - ihaskell-gnuplot - - ihaskell-graphviz - - ihaskell-hatex - - ihaskell-hvega - - ihaskell-inline-r - - ihaskell-juicypixels - - ihaskell-magic - - ihaskell-parsec - - ihaskell-plot - - ihaskell-rlangqq - - ihaskell-widgets - - ihttp - - illuminate - - imagepaste - - imap - - imapget - - imbib - - imgur - - imgurder - - imj-animation - - imj-base - - imj-game-hamazed - - imj-measure-stdout - - imj-prelude - - imm - - immortal-worker - - imparse - - imperative-edsl - - imperative-edsl-vhdl - - ImperativeHaskell - - impl - - implicit-logging - - implicit-params - - importify - - imports - - impossible - - imprint - - improve - - INblobs - - inch - - inchworm - - incremental-computing - - incremental-maps - - increments - - indentation - - indentation-core - - indentation-parsec - - indentation-trifecta - - indents - - index-core - - indexation - - IndexedList - - indextype - - indices - - indieweb-algorithms - - inf-interval - - infer-upstream - - infernal - - infernu - - infinity - - infix - - InfixApplicative - - inflist - - informative - - ini-qq - - inilist - - initialize - - inject-function - - inline-asm - - inline-java - - inserts - - inspector-wrecker - - instana-haskell-trace-sdk - - instance-map - - instant-aeson - - instant-bytes - - instant-deepseq - - instant-generics - - instant-hashable - - instant-zipper - - instapaper-sender - - instinct - - int-multimap - - intcode - - integer-pure - - integreat - - intel-aes - - intensional-datatys - - interlude-l - - internetmarke - - intero - - interpol - - interpolatedstring-qq - - interpolatedstring-qq-mwotton - - interpolatedstring-qq2 - - interruptible - - interval - - IntFormats - - intricacy - - intro-prelude - - introduction - - introduction-test - - intset - - invert - - invertible-hlist - - invertible-syntax - - io-capture - - io-choice - - io-reactive - - ioctl - - ion - - IOR - - IORefCAS - - iostring - - iothread - - iotransaction - - ip - - ip-quoter - - ip2location - - ip2proxy - - ipatch - - ipc - - ipfs - - ipfs-api - - ipld-cid - - ipopt-hs - - ipprint - - iptables-helpers - - iptadmin - - IPv6DB - - Irc - - irc-dcc - - irc-fun-bot - - irc-fun-client - - irc-fun-color - - irc-fun-messages - - irc-fun-types - - iri - - iridium - - iron-mq - - ironforge - - irt - - isdicom - - isevaluated - - ismtp - - IsNull - - iso8601-duration - - isobmff - - isobmff-builder - - isohunt - - isotope - - it-has - - itcli - - itemfield - - iter-stats - - iteratee - - iteratee-compress - - iteratee-mtl - - iteratee-parsec - - iteratee-stm - - iterIO - - iterio-server - - iterm-show - - iterm-show-diagrams - - iterm-show-JuicyPixels - - ivor - - ivory - - ivory-avr-atmega328p-registers - - ivory-backend-c - - ivory-bitdata - - ivory-eval - - ivory-examples - - ivory-hw - - ivory-opts - - ivory-quickcheck - - ivory-serialize - - ivory-stdlib - - ivy-web - - ixdopp - - ixmonad - - ixshader - - iyql - - j - - j2hs - - jack-bindings - - JackMiniMix - - jackminimix - - jacobi-roots - - jaeger-flamegraph - - jail - - jalla - - jarfind - - jarify - - jason - - java-bridge - - java-bridge-extras - - java-character - - java-reflect - - javascript-bridge - - Javasf - - javasf - - Javav - - javav - - jbi - - jcdecaux-vls - - Jdh - - jdi - - jenga - - jenkinsPlugins2nix - - jespresso - - jinquantities - - jmacro - - jmacro-rpc - - jmacro-rpc-happstack - - jmacro-rpc-snap - - jml-web-service - - jmonkey - - jni - - jobqueue - - jobs-ui - - join - - join-api - - joinlist - - jonathanscard - - jot - - jpeg - - js-good-parts - - jsaddle-hello - - jsaddle-wkwebview - - JsContracts - - jsmw - - json-alt - - json-assertions - - json-ast-json-encoder - - json-ast-quickcheck - - json-autotype - - json-b - - json-builder - - JSON-Combinator - - JSON-Combinator-Examples - - json-encoder - - json-enumerator - - json-extra - - json-fu - - json-incremental-decoder - - json-litobj - - json-pointer-hasql - - json-pointy - - json-python - - json-query - - json-rpc-client - - json-schema - - json-sop - - json-syntax - - json-to-haskell - - json-togo - - json-tokens - - json-tools - - json-tracer - - json2 - - json2-hdbc - - JSONb - - jsonextfilter - - JsonGrammar - - jsonifier - - jsonnet - - jsonresume - - jsonrpc-conduit - - jsons-to-schema - - jsonschema-gen - - jsonsql - - jsontsv - - jsonxlsx - - jspath - - juandelacosa - - judge - - judy - - JuicyPixels-blp - - JuicyPixels-canvas - - JunkDB - - JunkDB-driver-gdbm - - JunkDB-driver-hashtables - - jupyter - - JuPyTer-notebook - - JustParse - - jvm - - jvm-batching - - jvm-binary - - jvm-parser - - jvm-streaming - - JYU-Utils - - kademlia - - kafka-client - - kafka-client-sync - - kafka-device - - kafka-device-glut - - kafka-device-joystick - - kafka-device-leap - - kafka-device-spacenav - - kafka-device-vrpn - - kaleidoscope - - Kalman - - kalman - - kangaroo - - kansas-lava - - kansas-lava-cores - - kansas-lava-papilio - - kansas-lava-shake - - karakuri - - karps - - katip-elasticsearch - - katip-kafka - - katip-raven - - katip-rollbar - - katip-scalyr-scribe - - katip-syslog - - katt - - katydid - - kawaii - - kawhi - - kd-tree - - kdesrc-build-extra - - keccak - - keera-hails-i18n - - keera-hails-mvc-environment-gtk - - keera-hails-mvc-model-lightmodel - - keera-hails-mvc-model-protectedmodel - - keera-hails-mvc-solutions-gtk - - keera-hails-reactive-cbmvar - - keera-hails-reactive-fs - - keera-hails-reactive-gtk - - keera-hails-reactive-htmldom - - keera-hails-reactive-network - - keera-hails-reactive-polling - - keera-hails-reactive-wx - - keera-hails-reactive-yampa - - keera-hails-reactivelenses - - keera-hails-reactivevalues - - kempe - - kerry - - Ketchup - - keter - - kevin - - keyed - - keyring - - keysafe - - keystore - - keyvaluehash - - keyword-args - - khph - - kicad-data - - kickass-torrents-dump-parser - - kickchan - - kif-parser - - kit - - kleene - - kmeans-par - - kmeans-vector - - kmonad - - kmp-dfa - - knead - - knead-arithmetic - - knit-haskell - - knots - - koellner-phonetic - - kontra-config - - korfu - - kparams - - kqueue - - kraken - - krapsh - - Kriens - - krpc - - ks-test - - KSP - - ktx - - ktx-codec - - kubernetes-client - - kubernetes-client-core - - kuifje - - kure - - kure-your-boilerplate - - kurita - - KyotoCabinet - - l-bfgs-b - - L-seed - - labeled-graph - - laborantin-hs - - labsat - - labyrinth - - labyrinth-server - - lackey - - lagrangian - - laika - - lambda-bridge - - lambda-calculator - - lambda-canvas - - lambda-devs - - lambda-options - - lambda-toolbox - - lambda2js - - lambdaBase - - lambdabot-utils - - lambdabot-zulip - - lambdacms-core - - lambdacms-media - - lambdacube - - lambdacube-bullet - - lambdacube-compiler - - lambdacube-core - - lambdacube-edsl - - lambdacube-engine - - lambdacube-examples - - lambdacube-gl - - lambdacube-ir - - lambdacube-samples - - LambdaDesigner - - lambdaFeed - - LambdaHack - - LambdaINet - - Lambdajudge - - lambdaLit - - LambdaNet - - LambdaPrettyQuote - - LambdaShell - - lambdatex - - lambdatwit - - Lambdaya - - lambdaya-bus - - lambdiff - - lame - - lame-tester - - lang - - language-asn - - language-boogie - - language-c-comments - - language-c-inline - - language-conf - - language-csharp - - language-dart - - language-dickinson - - language-dockerfile - - language-eiffel - - language-elm - - language-fortran - - language-gcl - - language-go - - language-guess - - language-hcl - - language-java-classfile - - language-kort - - language-lua-qq - - language-lua2 - - language-mixal - - language-Modula2 - - language-ninja - - language-oberon - - language-objc - - language-ocaml - - language-openscad - - language-pig - - language-puppet - - language-python-colour - - language-qux - - language-rust - - language-sh - - language-spelling - - language-sqlite - - language-sygus - - language-thrift - - language-tl - - language-typescript - - language-vhdl - - language-webidl - - lapack - - lapack-carray - - lapack-comfort-array - - lapack-ffi - - large-hashable - - Lastik - - lat - - latest-npm-version - - latex-formulae-hakyll - - latex-formulae-image - - latex-formulae-pandoc - - latex-svg-hakyll - - latex-svg-image - - latex-svg-pandoc - - LATS - - launchdarkly-server-sdk - - launchpad-control - - lawless-concurrent-machines - - layered-state - - layers - - layers-game - - layout - - layout-bootstrap - - layout-rules - - layouting - - lazy-hash - - lazy-hash-cache - - lazy-io-streams - - lazy-priority-queue - - lazy-search - - lazyarray - - lazyboy - - lazyset - - LazyVault - - ld-intervals - - lda - - ldapply - - LDAPv3 - - ldif - - leaf - - leaky - - lean - - leanpub-wreq - - leapseconds - - learn - - learn-physics-examples - - Learning - - leb128 - - leetify - - legion - - legion-discovery - - legion-discovery-client - - legion-extra - - leksah-server - - lendingclub - - lens-filesystem - - lens-labels - - lens-prelude - - lens-process - - lens-simple - - lens-text-encoding - - lens-th-rewrite - - lens-time - - lens-toml-parser - - lens-tutorial - - lens-typelevel - - lens-utils - - lensref - - lentil - - level-monad - - Level0 - - levmar - - levmar-chart - - lex-applicative - - lfst - - lgtk - - lha - - lhae - - lhc - - lhe - - lhs2TeX-hl - - lhslatex - - libarchive - - LibClang - - libconfig - - libcspm - - libexpect - - libfuse3 - - libGenI - - libhbb - - libinfluxdb - - libjenkins - - libjwt-typed - - liblastfm - - liblawless - - liblinear-enumerator - - libltdl - - libmolude - - libnix - - liboath-hs - - liboleg - - libpafe - - libpq - - libraft - - librandomorg - - librato - - libssh2 - - libssh2-conduit - - libsystemd-daemon - - libtagc - - libxls - - libxml-enumerator - - libxslt - - lie - - life-sync - - lifetimes - - lifted-base-tf - - lifted-protolude - - lifter - - ligature - - lightning-haskell - - lightstep-haskell - - lighttpd-conf - - lighttpd-conf-qq - - lilypond - - Limit - - limp-cbc - - linda - - linden - - line-bot-sdk - - line-drawing - - linear-algebra-cblas - - linear-base - - linear-circuit - - linear-code - - linear-maps - - linear-opengl - - linear-vect - - linearmap-category - - linearscan - - linearscan-hoopl - - LinearSplit - - lines-of-action - - LinkChecker - - linkchk - - linkcore - - linked-list-with-iterator - - linkedhashmap - - linklater - - linnet - - linnet-aeson - - linnet-conduit - - linode - - linode-v4 - - linux-blkid - - linux-cgroup - - linux-kmod - - linux-perf - - linux-ptrace - - linx-gateway - - lio-eci11 - - lio-simple - - lion - - lipsum-gen - - liquid - - liquid-base - - liquid-bytestring - - liquid-containers - - liquid-ghc-prim - - liquid-parallel - - liquid-platform - - liquid-prelude - - liquid-vector - - liquidhaskell - - liquidhaskell-cabal - - Liquorice - - list-fusion-probe - - list-mux - - list-prompt - - list-remote-forwards - - list-t-attoparsec - - list-t-html-parser - - list-t-http-client - - list-t-text - - list-witnesses - - list-zip-def - - list-zipper - - listenbrainz-client - - listlike-instances - - ListT - - liszt - - lit - - literals - - LiterateMarkdown - - little-logger - - live-sequencer - - ll-picosat - - llsd - - llvm - - llvm-analysis - - llvm-base - - llvm-base-types - - llvm-base-util - - llvm-data-interop - - llvm-dsl - - llvm-extension - - llvm-extra - - llvm-ffi - - llvm-ffi-tools - - llvm-general - - llvm-general-pure - - llvm-general-quote - - llvm-ht - - llvm-pkg-config - - llvm-pretty - - llvm-pretty-bc-parser - - llvm-tf - - llvm-tools - - lmonad - - lmonad-yesod - - load-balancing - - load-font - - local-address - - local-search - - localize - - located - - located-monad-logger - - loch - - locked-poll - - log - - log-postgres - - log-utils - - log-warper - - log2json - - log4hs - - logentries - - logger - - logging-effect-extra - - logging-effect-extra-file - - logging-effect-extra-handler - - Logic - - logic-classes - - LogicGrowsOnTrees - - LogicGrowsOnTrees-MPI - - LogicGrowsOnTrees-network - - LogicGrowsOnTrees-processes - - logicst - - logict-state - - logplex-parse - - lojban - - lojbanParser - - lojbanXiragan - - lojysamban - - lol - - lol-apps - - lol-benches - - lol-calculus - - lol-cpp - - lol-repa - - lol-tests - - lol-typing - - loli - - longboi - - longshot - - lookup-tables - - loop-effin - - loop-while - - loopbreaker - - looper - - loops - - loopy - - lord - - lorem - - lorentz - - loris - - loshadka - - lostcities - - loup - - lowgl - - lp-diagrams-svg - - LRU - - ls-usb - - lscabal - - lsfrom - - LslPlus - - lsystem - - lti13 - - ltk - - LTS - - lua-bc - - luachunk - - luautils - - lucid-colonnade - - lucienne - - Lucu - - luhn - - lui - - luis-client - - luka - - luminance - - luminance-samples - - lushtags - - luthor - - lvish - - lvmlib - - lxc - - lxd-client - - lye - - Lykah - - lz4-bytes - - lz4-conduit - - lz4-frame-conduit - - lzip - - lzma-enumerator - - lzma-streams - - lzo - - maam - - mac - - macaroon-shop - - macbeth-lib - - machinecell - - machines-amazonka - - machines-attoparsec - - machines-binary - - machines-bytestring - - machines-directory - - machines-encoding - - machines-io - - machines-process - - machines-zlib - - macho - - maclight - - macos-corelibs - - macosx-make-standalone - - macrm - - madlang - - mage - - magic-tyfams - - magic-wormhole - - magicbane - - MagicHaskeller - - magico - - magma - - mahoro - - maid - - mail-pool - - mail-reports - - mailchimp - - mailchimp-subscribe - - MailchimpSimple - - mailgun - - majordomo - - majority - - make-hard-links - - make-monofoldable-foldable - - make-package - - makedo - - makefile - - mallard - - manatee - - manatee-anything - - manatee-core - - manatee-curl - - manatee-editor - - manatee-filemanager - - manatee-imageviewer - - manatee-ircclient - - manatee-mplayer - - manatee-pdfviewer - - manatee-processmanager - - manatee-template - - manatee-terminal - - manatee-welcome - - mandrill - - mandulia - - mangopay - - manifold-random - - manifolds - - Map - - map-exts - - mapalgebra - - Mapping - - mappy - - marionetta - - markdown-kate - - markdown-pap - - markdown2svg - - marked-pretty - - markov-processes - - markov-realization - - markup - - marmalade-upload - - marquise - - mars - - marvin - - marvin-interpolate - - masakazu-bot - - MASMGen - - massiv-persist - - massiv-serialise - - master-plan - - matchers - - math-grads - - math-interpolate - - math-metric - - math-programming - - math-programming-glpk - - math-programming-tests - - mathblog - - mathflow - - mathlink - - matrix-as-xyz - - matrix-market - - matrix-sized - - matsuri - - maude - - maxent - - maxent-learner-hw - - maxent-learner-hw-gui - - maxsharing - - maybench - - MaybeT - - MaybeT-monads-tf - - MaybeT-transformers - - MazesOfMonad - - MBot - - mbox-tools - - mbug - - MC-Fold-DP - - mcl - - mcm - - mcmaster-gloss-examples - - mcmc - - mcmc-samplers - - mcmc-synthesis - - mcpi - - mdapi - - mdcat - - mDNSResponder-client - - mdp - - mealstrom - - mealy - - MeanShift - - Measure - - mecab - - mech - - Mecha - - Mechs - - mechs - - mediabus - - mediabus-fdk-aac - - mediabus-rtp - - mediawiki - - medium-sdk-haskell - - mega-sdist - - megalisp - - mellon-core - - mellon-gpio - - mellon-web - - melody - - memcache - - memcache-conduit - - memcache-haskell - - memcached-binary - - memis - - memo-ptr - - memoization-utils - - memorypool - - menoh - - menshen - - mergeful-persistent - - mergeless-persistent - - merkle-patricia-db - - merkle-tree - - messagepack-rpc - - messente - - meta-misc - - meta-par - - meta-par-accelerate - - metadata - - MetaHDBC - - metaheuristics - - MetaObject - - metaplug - - metar - - metar-http - - metric - - Metrics - - metricsd-client - - metronome - - mezzo - - mezzolens - - MFlow - - mgeneric - - Mhailist - - MHask - - mi - - Michelangelo - - miconix-test - - micro-gateway - - micro-recursion-schemes - - microbase - - microformats2-parser - - microformats2-types - - microgroove - - microlens-each - - micrologger - - microsoft-translator - - MicrosoftTranslator - - mida - - midi-music-box - - midi-utils - - midimory - - midisurface - - mighttpd - - migrant-core - - migrant-hdbc - - migrant-postgresql-simple - - migrant-sqlite-simple - - mikmod - - mikrokosmos - - miku - - milena - - mime-directory - - minecraft-data - - minesweeper - - mini-egison - - miniforth - - minilens - - minilight - - minilight-lua - - minimung - - minions - - minioperational - - miniplex - - minirotate - - ministg - - minizinc-process - - minst-idx - - mios - - MIP - - MIP-glpk - - mirror-tweet - - miso - - miso-action-logger - - miso-examples - - miss - - miss-porcelain - - missing-py2 - - MissingPy - - mit-3qvpPyAi6mH - - mix-arrows - - mixed-strategies - - mixpanel-client - - mkbndl - - mkcabal - - ml-w - - mlist - - mm2 - - mmark - - mmark-cli - - mmark-ext - - mmsyn7h - - mmtf - - mmtl - - mmtl-base - - moan - - Mobile-Legends-Hack-Cheats - - modelicaparser - - modify-fasta - - modsplit - - modular-prelude - - modular-prelude-classy - - modularity - - module-management - - modulespection - - modulo - - Moe - - moe - - MoeDict - - moesocks - - mohws - - mole - - mollie-api-haskell - - monad-atom - - monad-atom-simple - - monad-bayes - - monad-branch - - monad-exception - - monad-fork - - monad-http - - monad-interleave - - monad-levels - - monad-lgbt - - monad-log - - monad-lrs - - monad-mersenne-random - - monad-metrics-extensible - - monad-mock - - monad-open - - monad-parallel-progressbar - - monad-param - - monad-persist - - monad-ran - - monad-recorder - - monad-state - - monad-statevar - - monad-ste - - monad-stlike-io - - monad-stlike-stm - - monad-task - - monad-timing - - monad-tx - - monad-unify - - monad-var - - monad-wrap - - monadacme - - MonadCatchIO-mtl - - MonadCatchIO-mtl-foreign - - MonadCatchIO-transformers - - MonadCatchIO-transformers-foreign - - MonadCompose - - monadic-recursion-schemes - - monadiccp - - monadiccp-gecode - - Monadius - - MonadLab - - monadLib-compose - - monadloc-pp - - monadlog - - Monadoro - - monadplus - - monads-fd - - MonadStack - - monarch - - Monaris - - Monatron - - Monatron-IO - - mondo - - monetdb-mapi - - money - - mongoDB - - mongodb-queue - - mongrel2-handler - - monitor - - monky - - mono-foldable - - Monocle - - monoid - - monoid-absorbing - - monoid-owns - - monoidplus - - monoids - - monopati - - monte-carlo - - months - - monus - - monzo - - moo - - morfette - - morfeusz - - morley - - morloc - - morpheus-graphql - - morpheus-graphql-app - - morpheus-graphql-cli - - morpheus-graphql-subscriptions - - morphisms-functors - - morphisms-functors-inventory - - morphisms-objects - - morte - - mosaico-lib - - moto-postgresql - - motor-diagrams - - motor-reflection - - mount - - movie-monad - - mp - - mpdmate - - mpppc - - mprelude - - mpretty - - mpris - - mprover - - mps - - mptcp-pm - - mpvguihs - - mqtt - - mqtt-hs - - mrifk - - mrm - - ms - - msgpack - - msgpack-aeson - - msgpack-binary - - msgpack-idl - - msgpack-rpc - - msgpack-rpc-conduit - - msh - - msi-kb-backlit - - MSQueue - - MTGBuilder - - mtgoxapi - - mtl-c - - mtl-evil-instances - - mtl-extras - - mtl-tf - - mtlx - - mtp - - mu-avro - - mu-graphql - - mu-grpc-client - - mu-grpc-common - - mu-grpc-server - - mu-kafka - - mu-lens - - mu-optics - - mu-persistent - - mu-prometheus - - mu-protobuf - - mu-rpc - - mu-schema - - mu-servant-server - - mu-tracing - - MuCheck - - MuCheck-Hspec - - MuCheck-HUnit - - MuCheck-QuickCheck - - MuCheck-SmallCheck - - mud - - muesli - - mulang - - multext-east-msd - - multi-cabal - - multi-instance - - multi-trie - - multiaddr - - multiarg - - multibase - - multifocal - - multihash - - multihash-serialise - - multilinear - - multilinear-io - - multipass - - multipath - - multiplate-simplified - - multiplicity - - multipool-persistent-postgresql - - multirec - - multirec-alt-deriver - - multirec-binary - - multisetrewrite - - multivariant - - Munkres-simple - - muon - - murder - - murmur - - murmur3 - - murmurhash3 - - mushu - - music-graphics - - music-parts - - music-pitch - - music-preludes - - music-score - - music-sibelius - - music-suite - - music-util - - musicbrainz-email - - musicScroll - - musicxml - - musicxml2 - - mustache-haskell - - mutable-iter - - MutationOrder - - mute-unmute - - mvar-lock - - mvc - - mvc-updates - - mvclient - - mxnet - - mxnet-dataiter - - mxnet-examples - - mxnet-nn - - mxnet-nnvm - - my-package-testing - - my-test-docs - - myanimelist-export - - myo - - MyPrimes - - mysnapsession - - mysnapsession-example - - mysql-effect - - mysql-haskell-openssl - - mysql-simple-quasi - - mysql-simple-typed - - mystem - - myTestlll - - mywatch - - myxine-client - - mzv - - n-tuple - - n2o-protocols - - n2o-web - - nagios-plugin-ekg - - nakadi-client - - named-lock - - named-servant - - named-servant-client - - named-servant-server - - named-sop - - namelist - - namespace - - nano-hmac - - nano-md5 - - nanocurses - - nanomsg - - nanomsg-haskell - - nanoparsec - - NanoProlog - - nanovg - - nanovg-simple - - nanq - - naperian - - NaperianNetCDF - - naqsha - - narc - - nat-sized-numbers - - nationstates - - nats-client - - nats-queue - - natural - - natural-number - - NaturalLanguageAlphabets - - NaturalSort - - naver-translate - - nbt - - NearContextAlgebra - - neat - - needle - - neet - - nehe-tuts - - neither - - neko-lib - - Neks - - nemesis-titan - - neptune-backend - - nerf - - nero - - nero-wai - - nero-warp - - nest - - nested-routes - - nested-sequence - - NestedFunctor - - nestedmap - - net-spider - - net-spider-cli - - net-spider-pangraph - - net-spider-rpl - - net-spider-rpl-cli - - netclock - - netcore - - netease-fm - - netlines - - netrium - - NetSNMP - - netspec - - netstring-enumerator - - nettle-frp - - nettle-netkit - - nettle-openflow - - netwire-input-javascript - - netwire-vinylglfw-examples - - network-address - - network-anonymous-i2p - - network-anonymous-tor - - network-api-support - - network-arbitrary - - network-attoparsec - - network-bitcoin - - network-builder - - network-bytestring - - network-carbon - - network-connection - - network-dns - - network-enumerator - - network-hans - - network-house - - network-interfacerequest - - network-messagepack-rpc-websocket - - network-minihttp - - network-msgpack-rpc - - network-netpacket - - network-packet-linux - - network-protocol-xmpp - - network-rpca - - network-server - - network-service - - network-simple-sockaddr - - network-simple-wss - - network-socket-options - - network-stream - - network-topic-models - - network-transport-amqp - - network-transport-inmemory - - network-uri-json - - network-voicetext - - network-wai-router - - network-websocket - - networked-game - - neural - - neural-network-blashs - - neural-network-hmatrix - - newhope - - newports - - newsletter - - newsletter-mailgun - - newt - - newtype-deriving - - newtype-th - - newtype-zoo - - next-ref - - nextstep-plist - - nfc - - NGrams - - ngrams-loader - - ngx-export-tools-extra - - niagra - - nibblestring - - nice-html - - nicovideo-translator - - nikepub - - Ninjas - - nirum - - nitro - - nix-delegate - - nix-deploy - - nix-eval - - nix-freeze-tree - - nix-thunk - - nix-tools - - nixfromnpm - - nixpkgs-update - - nkjp - - nlp-scores - - nlp-scores-scripts - - nm - - NMap - - nntp - - no-role-annots - - noether - - nofib-analyse - - nofib-analyze - - noise - - noli - - nom - - Nomyx - - Nomyx-Core - - Nomyx-Language - - Nomyx-Rules - - Nomyx-Web - - non-empty-zipper - - NonEmpty - - nonempty-lift - - NonEmptyList - - normalization-insensitive - - NoSlow - - not-gloss-examples - - notcpp - - notifications-tray-icon - - notmuch-haskell - - notmuch-web - - NoTrace - - now-haskell - - np-extras - - np-linear - - nptools - - ntp-control - - ntrip-client - - nuha - - null-canvas - - nullary - - nullpipe - - numbered-semigroups - - NumberSieves - - NumberTheory - - numerals - - numerals-base - - numeric-ode - - numeric-qq - - numeric-ranges - - numerical - - numhask-array - - numhask-free - - numhask-hedgehog - - numhask-histogram - - numhask-prelude - - numhask-range - - numhask-space - - numhask-test - - Nussinov78 - - Nutri - - NXT - - NXTDSL - - nylas - - nymphaea - - nyx-game - - oanda-rest-api - - oasis-xrd - - oauth2-jwt-bearer - - oauthenticated - - obd - - obdd - - oberon0 - - obj - - Object - - objectid - - ObjectIO - - objective - - oblivious-transfer - - ocaml-export - - ochan - - octane - - octohat - - octopus - - Octree - - oculus - - odbc - - odd-jobs - - OddWord - - oden-go-packages - - oeis2 - - off-simple - - OGL - - ogmarkup - - ohloh-hs - - oi - - oidc-client - - ois-input-manager - - olwrapper - - om-actor - - om-doh - - om-elm - - om-fail - - om-http-logging - - omaketex - - ombra - - Omega - - omega - - omnifmt - - on-a-horse - - on-demand-ssh-tunnel - - onama - - ONC-RPC - - oneormore - - online - - online-csv - - onpartitions - - OnRmt - - onu-course - - op - - opaleye-classy - - opaleye-sqlite - - opaleye-trans - - open-adt - - open-adt-tutorial - - open-haddock - - open-pandoc - - open-signals - - open-typerep - - open-union - - OpenAFP - - OpenAFP-Utils - - openai-hs - - openai-servant - - openapi-petstore - - openapi-typed - - openapi3-code-generator - - opench-meteo - - OpenCL - - OpenCLRaw - - OpenCLWrappers - - opencv-raw - - opendatatable - - OpenGLCheck - - opengles - - openid-connect - - OpenSCAD - - opensoundcontrol-ht - - openssh-github-keys - - openssh-protocol - - opentelemetry-http-client - - opentheory-char - - opentok - - opentracing-jaeger - - opentracing-zipkin-v1 - - opentype - - OpenVG - - OpenVGRaw - - openweathermap - - Operads - - operate-do - - operational-extra - - oplang - - opn - - optima - - optima-for-hasql - - optimal-blocks - - optimization - - optimusprime - - optional - - options-time - - optparse-applicative-simple - - optparse-enum - - optparse-helper - - orc - - orchestrate - - OrchestrateDB - - orchid - - orchid-demo - - order-maintenance - - order-statistics - - ordinal - - Ordinary - - ordrea - - oref - - org-mode - - org-mode-lucid - - organize-imports - - orgmode - - origami - - orizentic - - OrPatterns - - osc - - oscpacking - - oset - - Oslo-Vectize - - OSM - - osm-conduit - - osm-download - - oso2pdf - - osx-ar - - ot - - OTP - - otp-authenticator - - ottparse-pretty - - overloaded - - overloaded-records - - overture - - pack - - package-description-remote - - package-o-tron - - package-vt - - packed - - packed-dawg - - packed-multikey-map - - packedstring - - packer-messagepack - - packman - - packunused - - pacman-memcache - - padKONTROL - - pads-haskell - - pagarme - - PageIO - - pagure-hook-receiver - - Paillier - - pairing - - palette - - pam - - pan-os-syslog - - panda - - pandoc-citeproc - - pandoc-csv2table - - pandoc-filter-graphviz - - pandoc-filter-indent - - pandoc-include - - pandoc-japanese-filters - - pandoc-lens - - pandoc-markdown-ghci-filter - - pandoc-placetable - - pandoc-plantuml-diagrams - - pandoc-pyplot - - pandoc-unlit - - pandoc-utils - - PandocAgda - - pang-a-lambda - - pangraph - - panpipe - - pansite - - pantry-tmp - - papa - - papa-base - - papa-base-export - - papa-base-implement - - papa-export - - papa-implement - - papa-include - - papa-prelude - - papa-prelude-core - - papa-prelude-lens - - papa-prelude-semigroupoids - - papa-prelude-semigroups - - papa-semigroupoids - - papa-semigroupoids-implement - - paphragen - - papillon - - pappy - - paprika - - par-dual - - paragon - - Paraiso - - Parallel-Arrows-Eden - - parallel-tasks - - parameterized-utils - - paranoia - - parco - - parco-attoparsec - - parco-parsec - - parcom-lib - - parconc-examples - - pareto - - parochial - - parquet-hs - - Parry - - parse-help - - parseargs - - parsec-free - - parsec-parsers - - parsec-pratt - - parsec2 - - parsec3 - - parseerror-eq - - parsely - - parser-combinators-tests - - parser-helper - - parser241 - - parsergen - - parsers-megaparsec - - parsestar - - parsimony - - parsnip - - partage - - partial-lens - - partial-records - - partly - - passage - - passman - - PasswordGenerator - - passwords - - pasta - - pastis - - pasty - - patat - - patches-vector - - Pathfinder - - pathfindingcore - - PathTree - - patronscraper - - patterns - - paypal-adaptive-hoops - - paypal-api - - paypal-rest-client - - pb - - pb-next - - pbc4hs - - PBKDF2 - - pcap-enumerator - - pcapng - - pcd-loader - - pcf - - pcf-font - - pcf-font-embed - - PCLT - - PCLT-DB - - pcre-light-extra - - pdf-slave - - pdf-slave-template - - pdf-toolbox-content - - pdf-toolbox-core - - pdf-toolbox-document - - pdf-toolbox-viewer - - pdfname - - pdfsplit - - pdftotext - - pdynload - - peakachu - - PeanoWitnesses - - pec - - pecoff - - pedersen-commitment - - pedestrian-dag - - peg - - peggy - - pell - - pencil - - penntreebank-megaparsec - - penny - - penny-bin - - penny-lib - - penrose - - peparser - - percent-encoder - - perceptron - - perceptual-hash - - peregrin - - perf - - perf-analysis - - PerfectHash - - perfecthash - - perhaps - - periodic - - periodic-client - - periodic-client-exe - - periodic-common - - periodic-server - - perm - - permutation - - permutations - - permute - - PermuteEffects - - persist2er - - Persistence - - persistent-audit - - persistent-cereal - - persistent-database-url - - persistent-equivalence - - persistent-hssqlppp - - persistent-map - - persistent-migration - - persistent-mongoDB - - persistent-mysql-haskell - - persistent-odbc - - persistent-protobuf - - persistent-ratelimit - - persistent-redis - - persistent-relational-record - - persistent-template-classy - - persistent-test - - persistent-vector - - persistent-zookeeper - - persona - - persona-idp - - pesca - - peyotls - - peyotls-codec - - pez - - pg-extras - - pg-harness - - pg-harness-server - - pg-recorder - - pg-store - - pg-transact - - pgdl - - pgf2 - - pgsql-simple - - pgstream - - phasechange - - phaser - - phoityne - - phone-numbers - - phone-push - - phonetic-languages-examples - - phonetic-languages-properties - - phonetic-languages-simplified-lists-examples - - phonetic-languages-simplified-properties-lists - - phonetic-languages-simplified-properties-lists-double - - phooey - - photoname - - phraskell - - Phsu - - phybin - - pi-calculus - - pi-forall - - pi-hoole - - pia-forward - - pianola - - picedit - - pickle - - picologic - - picoparsec - - pictikz - - pier - - pier-core - - piet - - pig - - pinboard - - pinch - - pinch-gen - - pinchot - - ping - - pinpon - - Pipe - - pipe-enumerator - - pipes-async - - pipes-attoparsec-streaming - - pipes-bgzf - - pipes-brotli - - pipes-cacophony - - pipes-cereal - - pipes-cereal-plus - - pipes-conduit - - pipes-core - - pipes-courier - - pipes-errors - - pipes-extra - - pipes-files - - pipes-illumina - - pipes-interleave - - pipes-io - - pipes-key-value-csv - - pipes-mongodb - - pipes-p2p - - pipes-p2p-examples - - pipes-protolude - - pipes-rt - - pipes-s3 - - pipes-shell - - pipes-sqlite-simple - - pipes-transduce - - pipes-vector - - pipes-zeromq4 - - pisigma - - Piso - - pit - - pitchtrack - - pivotal-tracker - - pixel-printer - - pixelated-avatar-generator - - pixiv - - pkcs10 - - pkcs7 - - pkggraph - - pkgtreediff - - plailude - - plan-applicative - - plan-b - - planar-graph - - planb-token-introspection - - planet-mitchell - - planet-mitchell-test - - plankton - - plat - - platinum-parsing - - PlayingCards - - plist - - plist-buddy - - plocketed - - plot-gtk - - plot-gtk-ui - - plot-gtk3 - - Plot-ho-matic - - plot-lab - - plots - - PlslTools - - plugins - - plugins-auto - - plugins-multistage - - plumbers - - plur - - plural - - plzwrk - - png-file - - pngload - - pngload-fixed - - pocket - - pocket-dns - - point-octree - - pointedalternative - - pointfree-fancy - - pointful - - pointless-haskell - - pointless-lenses - - pointless-rewrite - - poke - - pokemon-go-protobuf-types - - poker-eval - - pokitdok - - polar-configfile - - polar-shader - - polh-lexicon - - Pollutocracy - - poly-cont - - poly-control - - polydata - - polydata-core - - polynomial - - polysemy-chronos - - polysemy-conc - - polysemy-extra - - polysemy-fskvstore - - polysemy-http - - polysemy-kvstore-jsonfile - - polysemy-log - - polysemy-log-co - - polysemy-log-di - - polysemy-methodology - - polysemy-methodology-composite - - polysemy-optics - - polysemy-path - - polysemy-RandomFu - - polysemy-resume - - polysemy-test - - polysemy-time - - polysemy-vinyl - - polysemy-zoo - - polyseq - - polytypeable - - polytypeable-utils - - pomaps - - pomodoro - - pomohoro - - ponder - - pong-server - - pontarius-xmpp - - pool - - pool-conduit - - pop3-client - - popenhs - - popkey - - poppler - - porcupine-core - - porcupine-http - - porcupine-s3 - - portager - - porte - - PortFusion - - ports - - poseidon - - poseidon-postgis - - positron - - posix-acl - - posix-api - - posix-realtime - - posix-waitpid - - postcodes - - postgres-embedded - - postgres-tmp - - postgres-websockets - - postgresql-lo-stream - - postgresql-named - - postgresql-query - - postgresql-simple-bind - - postgresql-simple-migration - - postgresql-simple-named - - postgresql-simple-queue - - postgresql-simple-sop - - postgresql-simple-typed - - postgresql-simple-url - - postgresql-syntax - - postgresql-tx-query - - postgresql-tx-squeal - - postgresql-tx-squeal-compat-simple - - postgresql-typed-lifted - - postgrest-ws - - postie - - postmark - - postmark-streams - - postmaster - - potato-tool - - potoki - - potoki-cereal - - potoki-conduit - - potoki-core - - potoki-hasql - - potoki-zlib - - potrace-diagrams - - powermate - - powerpc - - powerqueue-levelmem - - powerqueue-sqs - - pprecord - - PPrinter - - pqc - - pqueue-mtl - - practice-room - - praglude - - preamble - - precursor - - pred-set - - pred-trie - - predicate-class - - predicate-transformers - - predicate-typed - - prednote - - prednote-test - - prefork - - pregame - - preliminaries - - Prelude - - prelude-generalize - - prelude-plus - - preprocess-haskell - - preprocessor - - preql - - presburger - - present - - press - - presto-hdbc - - pretty-ghci - - pretty-ncols - - pretty-types - - prettyprinter-lucid - - prettyprinter-vty - - preview - - prim-array - - prim-instances - - prim-ref - - primal - - primal-memory - - primes-type - - primitive-atomic - - primitive-checked - - primitive-containers - - primitive-convenience - - primitive-foreign - - primitive-indexed - - primitive-maybe - - primitive-simd - - primitive-sort - - primitive-stablename - - PrimitiveArray-Pretty - - primula-board - - primula-bot - - pringletons - - print-debugger - - printcess - - Printf-TH - - prints - - priority-queue - - PriorityChansConverger - - ProbabilityMonads - - probable - - proc - - process-conduit - - process-iterio - - process-leksah - - process-listlike - - process-progress - - process-qq - - process-streaming - - processing - - processmemory - - procrastinating-variable - - procstat - - producer - - prof-flamegraph - - prof2dot - - prof2pretty - - profunctor-monad - - progress - - progress-meter - - progress-reporting - - progressbar - - progression - - progressive - - proj4-hs-bindings - - project-m36 - - projectile - - prolens - - prolog-graph - - prologue - - prolude - - prometheus-effect - - promise - - pronounce - - proof-combinators - - propane - - Proper - - properties - - property-list - - proplang - - prosidy - - prosidyc - - prosper - - proteaaudio - - proteaaudio-sdl - - proteome - - proto-lens-arbitrary - - proto-lens-combinators - - proto-lens-descriptors - - proto-lens-optparse - - proto3-suite - - proto3-wire - - protobuf-native - - protocol - - protocol-buffers-descriptor-fork - - protocol-buffers-fork - - protolude-lifted - - proton - - proton-haskell - - prototype - - prove-everywhere-server - - provenience - - proxy-kindness - - proxy-mapping - - psc-ide - - pseudo-boolean - - pseudo-trie - - PTQ - - ptr-poker - - publicsuffixlistcreate - - publish - - pubnub - - pubsub - - puffytools - - pugixml - - Pugs - - pugs-compat - - pugs-DrIFT - - pugs-hsregex - - PUH-Project - - punkt - - Pup-Events - - Pup-Events-Demo - - Pup-Events-Server - - puppetresources - - pure-cdb - - pure-io - - pure-priority-queue - - pure-priority-queue-tests - - pure-zlib - - purescheme-wai-routing-core - - purescript - - purescript-ast - - purescript-cst - - purescript-iso - - purescript-tsd-gen - - push-notifications - - push-notify - - push-notify-apn - - push-notify-ccs - - push-notify-general - - pusher-haskell - - pusher-ws - - pushme - - putlenses - - puzzle-draw - - puzzle-draw-cmdline - - pvd - - pyffi - - pyfi - - python-pickle - - q4c12-twofinger - - qc-oi-testgenerator - - qd - - qd-vec - - qed - - qhs - - qhull-simple - - qif - - QIO - - QLearn - - qlinear - - qnap-decrypt - - qr-imager - - qr-repa - - qsem - - QuadEdge - - QuadTree - - quantfin - - quantification - - quantum-arrow - - quantum-random - - quarantimer - - qudb - - Quelea - - quenya-verb - - queryparser - - queryparser-demo - - queryparser-hive - - queryparser-presto - - queryparser-vertica - - questioner - - queuelike - - quick-schema - - QuickAnnotate - - quickbench - - quickbooks - - quickcheck-arbitrary-template - - quickcheck-poly - - quickcheck-property-comb - - quickcheck-property-monad - - quickcheck-regex - - quickcheck-relaxng - - quickcheck-rematch - - quickcheck-report - - quickcheck-state-machine - - quickcheck-state-machine-distributed - - quickcheck-string-random - - quickcheck-webdriver - - QuickCheckVariant - - quickjs-hs - - QuickPlot - - quickpull - - quickset - - Quickson - - quickspec - - quicktest - - quickwebapp - - quipper - - quipper-algorithms - - quipper-all - - quipper-cabal - - quipper-core - - quipper-demos - - quipper-language - - quipper-libraries - - quipper-rendering - - quipper-tools - - quipper-utils - - quiver - - quiver-binary - - quiver-bytestring - - quiver-cell - - quiver-csv - - quiver-enumerator - - quiver-groups - - quiver-http - - quiver-instances - - quiver-interleave - - quiver-sort - - quokka - - quoridor-hs - - qux - - R-pandoc - - raaz - - RabbitMQ - - rad - - radian - - radium - - radium-formula-parser - - radix - - rados-haskell - - raft - - rail-compiler-editor - - rails-session - - rainbow-tests - - raketka - - rakhana - - rakuten - - ralist - - rallod - - raml - - rand-vars - - randfile - - rando - - random-access-list - - random-derive - - random-eff - - random-effin - - random-hypergeometric - - random-stream - - RandomDotOrg - - Range - - range-set-list - - range-space - - rangemin - - Ranka - - rapid - - rapid-term - - rasa - - rasa-example-config - - rasa-ext-bufs - - rasa-ext-cmd - - rasa-ext-cursors - - rasa-ext-files - - rasa-ext-logger - - rasa-ext-slate - - rasa-ext-status-bar - - rasa-ext-style - - rasa-ext-views - - rasa-ext-vim - - rascal - - Rasenschach - - rating-chgk-info - - rational-list - - rattle - - rattletrap - - raven-haskell-scotty - - raw-feldspar - - rawr - - raz - - razom-text-util - - rbr - - rbst - - rc - - rclient - - rdioh - - react-flux - - react-flux-servant - - react-haskell - - react-tutorial-haskell-server - - reaction-logic - - reactive-bacon - - reactive-balsa - - reactive-banana - - reactive-banana-automation - - reactive-banana-bunch - - reactive-banana-gi-gtk - - reactive-banana-sdl - - reactive-banana-sdl2 - - reactive-banana-threepenny - - reactive-banana-wx - - reactive-fieldtrip - - reactive-glut - - reactive-jack - - reactive-midyim - - reactive-thread - - reactor - - read-bounded - - read-ctags - - read-io - - readability - - readline - - readline-statevar - - readme-lhs - - readpyc - - readshp - - really-simple-xml-parser - - reanimate - - reanimate-svg - - reasonable-lens - - record - - record-aeson - - record-encode - - record-gl - - record-preprocessor - - record-syntax - - records - - records-th - - recursion-schemes - - recursion-schemes-ext - - recursors - - red-black-record - - reddit - - redis-hs - - redis-simple - - redland - - Redmine - - reduce-equations - - reedsolomon - - reenact - - Ref - - ref - - ref-mtl - - refcount - - Referees - - references - - refh - - refined-http-api-data - - reflection-extras - - reflex-animation - - reflex-backend-socket - - reflex-backend-wai - - reflex-basic-host - - reflex-dom-retractable - - reflex-dom-svg - - reflex-dynamic-containers - - reflex-fsnotify - - reflex-gadt-api - - reflex-ghci - - reflex-gi-gtk - - reflex-gloss - - reflex-gloss-scene - - reflex-libtelnet - - reflex-localize - - reflex-localize-dom - - reflex-orphans - - reflex-process - - reflex-sdl2 - - reflex-transformers - - reflex-vty - - reformat - - refractor - - refresht - - refurb - - reg-alloc - - reg-alloc-graph-color - - regex-deriv - - regex-dfa - - regex-generator - - regex-parsec - - regex-pcre-text - - regex-pderiv - - regex-posix-unittest - - regex-tdfa-pipes - - regex-tdfa-quasiquoter - - regex-tdfa-rc - - regex-tdfa-text - - regex-tdfa-unittest - - regex-tdfa-utf8 - - regex-tre - - regex-type - - regex-wrapper - - regex-xmlschema - - regexp-tries - - regexpr-symbolic - - regexqq - - regional-pointers - - regions - - regions-monadsfd - - regions-monadstf - - regions-mtl - - register-machine-typelevel - - registry - - registry-hedgehog - - regress - - regression-simple - - regular - - regular-extras - - regular-web - - regular-xmlpickler - - reheat - - rehoo - - rei - - reified-records - - reify - - relacion - - relapse - - relational-postgresql8 - - relational-query-postgresql-pure - - relative-date - - relevant-time - - reload - - remark - - remarks - - remote - - remote-debugger - - remote-json - - remote-json-client - - remote-json-server - - remote-monad - - remotion - - render-utf8 - - reorder-expression - - repa-algorithms - - repa-array - - repa-bytestring - - repa-convert - - repa-devil - - repa-eval - - repa-examples - - repa-flow - - repa-linear-algebra - - repa-plugin - - repa-scalar - - repa-series - - repa-stream - - repa-v4l2 - - repl - - RepLib - - replica - - replicant - - ReplicateEffects - - repo-based-blog - - repr - - representable-functors - - representable-tries - - reprinter - - reproject - - req-conduit - - req-oauth2 - - req-url-extra - - reqcatcher - - request-monad - - rere - - rescue - - reserve - - reservoir - - resin - - resistor-cube - - resolve - - resolve-trivial-conflicts - - resource-effect - - resource-embed - - resource-pool-catchio - - resource-simple - - respond - - rest-client - - rest-core - - rest-example - - rest-gen - - rest-happstack - - rest-snap - - rest-stringmap - - rest-types - - rest-wai - - restartable - - restful-snap - - restricted-workers - - restyle - - rethinkdb - - rethinkdb-client-driver - - rethinkdb-model - - rethinkdb-wereHamster - - retryer - - reverse-geocoding - - reversi - - ReviewBoard - - rewrite - - rewrite-inspector - - rewriting - - rezoom - - rfc - - rfc-env - - rfc-http-client - - rfc-prelude - - rfc-psql - - rfc-redis - - rfc-servant - - rg - - rhbzquery - - rhythm-game-tutorial - - rib - - ribbit - - RichConditional - - ridley - - ridley-extras - - riemann - - riff - - ring-buffer - - ring-buffers - - rio-process-pool - - riot - - risc-v - - risc386 - - riscv-isa - - Ritt-Wu - - rivers - - rivet - - rivet-migration - - rivet-simple-deploy - - RJson - - rl-satton - - Rlang-QQ - - rlglue - - RLP - - rlwe-challenges - - rmonad - - RMP - - RNAdesign - - RNAdraw - - RNAFold - - RNAFoldProgs - - RNAlien - - RNAwolf - - rncryptor - - rob - - robin - - robots-txt - - roc-cluster - - roc-cluster-demo - - rock - - rocksdb-haskell - - rocksdb-haskell-jprupp - - rocksdb-query - - roku-api - - rollbar - - rollbar-cli - - rollbar-client - - rollbar-hs - - rollbar-wai - - rollbar-yesod - - roller - - RollingDirectory - - ron-rdt - - ron-schema - - ron-storage - - rope - - rose-trees - - rose-trie - - rosebud - - roshask - - rosmsg - - rosmsg-bin - - rosso - - rotating-log - - rounded - - rounded-hw - - rounding - - roundtrip-aeson - - roundtrip-xml - - route-planning - - rowrecord - - rpc - - rpc-framework - - rpf - - rpm - - rpmbuild-order - - rrule - - rsagl - - rsagl-frp - - rsagl-math - - rspp - - rss - - rss-conduit - - rss2irc - - rstream - - rtcm - - RtMidi - - rtnetlink - - rtorrent-rpc - - rts-loader - - ruby-marshal - - ruby-qq - - ruff - - ruin - - ruler - - ruler-core - - run-st - - rungekutta - - runhs - - runmany - - runtime-arbitrary - - rv - - rws - - RxHaskell - - s-expression - - S3 - - SableCC2Hs - - safe-buffer-monad - - safe-coerce - - safe-freeze - - safe-globals - - safe-lazy-io - - safe-length - - safe-numeric - - safe-plugins - - safe-printf - - safecopy-migrate - - safecopy-store - - safeint - - safepath - - safer-file-handles - - safer-file-handles-bytestring - - safer-file-handles-text - - saferoute - - sai-shape-syb - - sajson - - sak - - salak-toml - - Salsa - - saltine-quickcheck - - salvia - - salvia-demo - - salvia-extras - - salvia-protocol - - salvia-sessions - - salvia-websocket - - samtools - - samtools-conduit - - samtools-enumerator - - samtools-iteratee - - sandlib - - sandman - - sarasvati - - sarsi - - sasl - - sat - - sat-micro-hs - - satchmo - - satchmo-backends - - satchmo-examples - - satchmo-funsat - - satchmo-minisat - - satchmo-toysat - - Saturnin - - savage - - sax - - SBench - - sbvPlugin - - sc2-lowlevel - - sc2-proto - - sc2-support - - sc3-rdu - - scalable-server - - scaleimage - - SCalendar - - scalendar - - scalp-webhooks - - scalpel-search - - scan-metadata - - scan-vector-machine - - scanner-attoparsec - - scc - - scenegraph - - scgi - - schedevr - - schedule-planner - - schedyield - - schema - - schemas - - schematic - - scholdoc - - scholdoc-citeproc - - scholdoc-texmath - - scholdoc-types - - sci-ratio - - SciBaseTypes - - scidb-hquery - - scientific-notation - - SciFlow - - SciFlow-drmaa - - scion - - scion-browser - - scons2dot - - scope - - scope-cairo - - scottish - - scotty-binding-play - - scotty-blaze - - scotty-fay - - scotty-form - - scotty-format - - scotty-hastache - - scotty-params-parser - - scotty-resource - - scotty-rest - - scotty-session - - scotty-tls - - scotty-view - - scp-streams - - scrabble-bot - - scrapbook - - scrapbook-core - - scrape-changes - - ScratchFs - - script-monad - - SCRIPTWriter - - scrobble - - Scurry - - scythe - - scyther-proof - - sde-solver - - sdl2-cairo-image - - sdl2-compositor - - sdl2-fps - - sdr - - seakale - - seakale-postgresql - - seakale-tests - - sec - - secdh - - seclib - - second-transfer - - secp256k1 - - secp256k1-haskell - - secp256k1-legacy - - secret-santa - - secrm - - secure-sockets - - SecureHash-SHA3 - - secureUDP - - sednaDBXML - - seitz-symbol - - selectors - - SelectSequencesFromMSA - - selenium - - selenium-server - - self-extract - - selinux - - semantic-source - - Semantique - - semdoc - - semi-iso - - semialign-extras - - semibounded-lattices - - Semigroup - - semigroupoids-syntax - - semigroups-actions - - semiring - - semiring-num - - sendgrid-haskell - - sendgrid-v3 - - sensei - - sensenet - - sensu-run - - sentence-jp - - sentry - - seonbi - - seqaid - - SeqAlign - - seqloc - - seqloc-datafiles - - sequent-core - - sequor - - serialize-instances - - serialport - - serokell-util - - serpentine - - serv - - serv-wai - - servant-aeson-specs - - servant-auth-cookie - - servant-auth-docs - - servant-auth-hmac - - servant-auth-token - - servant-auth-token-acid - - servant-auth-token-api - - servant-auth-token-leveldb - - servant-auth-token-persistent - - servant-auth-token-rocksdb - - servant-auth-wordpress - - servant-avro - - servant-benchmark - - servant-cassava - - servant-checked-exceptions - - servant-checked-exceptions-core - - servant-cli - - servant-client-js - - servant-client-namedargs - - servant-csharp - - servant-db - - servant-db-postgresql - - servant-dhall - - servant-docs-simple - - servant-ede - - servant-ekg - - servant-elm - - servant-event-stream - - servant-examples - - servant-fiat-content - - servant-generate - - servant-generic - - servant-github - - servant-haxl-client - - servant-hmac-auth - - servant-http-streams - - servant-http2-client - - servant-iCalendar - - servant-jquery - - servant-js - - servant-JuicyPixels - - servant-kotlin - - servant-matrix-param - - servant-mock - - servant-multipart - - servant-namedargs - - servant-nix - - servant-pagination - - servant-pandoc - - servant-polysemy - - servant-pool - - servant-postgresql - - servant-proto-lens - - servant-purescript - - servant-pushbullet-client - - servant-py - - servant-quickcheck - - servant-rawm-client - - servant-rawm-docs - - servant-reason - - servant-reflex - - servant-router - - servant-scotty - - servant-seo - - servant-serf - - servant-server-namedargs - - servant-smsc-ru - - servant-snap - - servant-static-th - - servant-streaming - - servant-streaming-client - - servant-streaming-docs - - servant-streaming-server - - servant-swagger-tags - - servant-to-elm - - servant-waargonaut - - servant-yaml - - servant-zeppelin - - servant-zeppelin-client - - servant-zeppelin-server - - servant-zeppelin-swagger - - server-generic - - serversession - - serversession-backend-acid-state - - serversession-backend-persistent - - serversession-backend-redis - - serversession-frontend-snap - - serversession-frontend-wai - - serversession-frontend-yesod - - services - - ses-html-snaplet - - SessionLogger - - sessions - - sessiontypes - - sessiontypes-distributed - - Set - - set-of - - set-with - - setdown - - setgame - - setoid - - setters - - sexp - - sexp-grammar - - sexpr-parser - - sext - - SFML - - SFML-control - - sfmt - - sfnt2woff - - SFont - - SG - - sgd - - SGdemo - - sgf - - SGplus - - sgrep - - sh2md - - sha-streams - - sha1 - - shade - - shadower - - shake-bindist - - shake-cabal-build - - shake-dhall - - shake-extras - - shake-minify - - shake-minify-css - - shake-pack - - shake-path - - shake-persist - - shakebook - - shaker - - shakespeare-babel - - shakespeare-sass - - shapefile - - shapely-data - - shared-buffer - - shared-fields - - she - - shelduck - - shell-pipe - - Shellac - - Shellac-compatline - - Shellac-editline - - Shellac-haskeline - - Shellac-readline - - shellish - - shellmate - - shellmate-extras - - shimmer - - shine-examples - - shivers-cfg - - shoap - - shopify - - shortcut-links - - shorten-strings - - ShortestPathProblems - - show-prettyprint - - showdown - - Shpadoinkle-backend-pardiff - - Shpadoinkle-backend-snabbdom - - Shpadoinkle-backend-static - - Shpadoinkle-developer-tools - - Shpadoinkle-disembodied - - Shpadoinkle-examples - - Shpadoinkle-html - - Shpadoinkle-router - - Shpadoinkle-streaming - - Shpadoinkle-template - - Shpadoinkle-widgets - - shpider - - shuffle - - shwifty - - si-clock - - sibe - - sifflet - - sifflet-lib - - sigma-ij - - sign - - signable - - signals - - signature - - signed-multiset - - signify-hs - - silkscreen - - silvi - - simd - - simgi - - simple-actors - - simple-atom - - simple-bluetooth - - simple-c-value - - simple-conduit - - simple-config - - simple-css - - simple-download - - simple-eval - - simple-firewire - - simple-genetic-algorithm - - simple-index - - simple-log-syslog - - simple-logging - - simple-money - - simple-neural-networks - - simple-nix - - simple-pascal - - simple-pipe - - simple-rope - - simple-server - - simple-sql-parser - - simple-stacked-vm - - simple-tabular - - simple-tar - - simple-ui - - simple-units - - simple-vec3 - - simple-zipper - - simpleargs - - simpleconfig - - SimpleGL - - simpleirc - - simpleirc-lens - - SimpleLog - - simplenote - - simpleprelude - - SimpleServer - - simplesmtpclient - - simplest-sqlite - - simseq - - singleton-dict - - singleton-typelits - - singletons-base - - singletons-th - - singnal - - singular-factory - - sink - - siphon - - siren-json - - sirkel - - sitepipe - - sixfiguregroup - - sized-grid - - sized-types - - sized-vector - - sizes - - sjsp - - SJW - - skeletal-set - - skeleton - - skeletons - - skell - - skemmtun - - skews - - skulk - - skylark-client - - skylighting-lucid - - skype4hs - - slack - - slack-notify-haskell - - slack-verify - - slack-web - - slave-thread - - sliceofpy - - slidemews - - Slides - - slim - - slip32 - - sloane - - slot-lambda - - sloth - - slug - - slugify - - slynx - - small-bytearray-builder - - smallarray - - smallcheck-kind-generics - - smallcheck-laws - - smallcheck-lens - - smallpt-hs - - smallstring - - smap - - smartcheck - - smartconstructor - - smartGroup - - smartword - - smcdel - - sme - - smerdyakov - - smiles - - smith - - smith-cli - - smith-client - - Smooth - - smsaero - - smt-lib - - smt2-parser - - SmtLib - - smtlib2 - - smtlib2-debug - - smtlib2-pipe - - smtlib2-quickcheck - - smtlib2-timing - - smtp-mail-ng - - SMTPClient - - smtps-gmail - - smuggler - - smuggler2 - - snake - - snake-game - - snap-accept - - snap-auth-cli - - snap-blaze-clay - - snap-configuration-utilities - - snap-elm - - snap-error-collector - - snap-extras - - snap-routes - - snap-stream - - snap-testing - - snap-utils - - snap-web-routes - - snaplet-acid-state - - snaplet-actionlog - - snaplet-amqp - - snaplet-auth-acid - - snaplet-coffee - - snaplet-css-min - - snaplet-customauth - - snaplet-environments - - snaplet-fay - - snaplet-hasql - - snaplet-haxl - - snaplet-hdbc - - snaplet-hslogger - - snaplet-influxdb - - snaplet-lss - - snaplet-mandrill - - snaplet-mongoDB - - snaplet-mongodb-minimalistic - - snaplet-mysql-simple - - snaplet-oauth - - snaplet-persistent - - snaplet-postgresql-simple - - snaplet-postmark - - snaplet-purescript - - snaplet-recaptcha - - snaplet-redis - - snaplet-redson - - snaplet-rest - - snaplet-riak - - snaplet-sass - - snaplet-scoped-session - - snaplet-sedna - - snaplet-ses-html - - snaplet-sqlite-simple - - snaplet-sqlite-simple-jwt-auth - - snaplet-stripe - - snaplet-tasks - - snaplet-typed-sessions - - snaplet-wordpress - - snappy-conduit - - snappy-iteratee - - sndfile-enumerators - - sneakyterm - - SNet - - snipcheck - - snm - - snmp - - snorkels - - snow-white - - snowflake-core - - snowflake-server - - snowtify - - Snusmumrik - - SoccerFun - - SoccerFunGL - - socket-activation - - socket-io - - socket-sctp - - socket-unix - - socketed - - socketio - - sockets - - sockets-and-pipes - - socketson - - sodium - - soegtk - - softfloat-hs - - solga - - solga-swagger - - solr - - sonic-visualiser - - Sonnex - - SoOSiM - - sorted - - sorting - - sorty - - souffle-dsl - - souffle-haskell - - sound-collage - - sounddelay - - soundgen - - source-code-server - - SourceGraph - - sousit - - soyuz - - SpaceInvaders - - spacepart - - SpacePrivateers - - spake2 - - spanout - - sparkle - - sparrow - - spars - - sparse - - sparse-lin-alg - - sparsebit - - sparsecheck - - sparser - - spata - - special-functors - - special-keys - - specialize-th - - species - - spectral-clustering - - speculation - - speculation-transformers - - speechmatics - - spelling-suggest - - sphero - - sphinx - - sphinx-cli - - sphinxesc - - spice - - SpinCounter - - spir-v - - spiros - - splay - - splaytree - - spline3 - - splines - - splint - - split-morphism - - splitter - - Spock - - Spock-api-ghcjs - - Spock-auth - - Spock-lucid - - Spock-worker - - spoonutil - - spoty - - Sprig - - sprinkles - - spritz - - sproxy - - sproxy-web - - sproxy2 - - spsa - - spy - - sql-simple - - sql-simple-mysql - - sql-simple-pool - - sql-simple-postgresql - - sql-simple-sqlite - - sqlcipher - - sqlite - - sqlite-simple-errors - - sqlite-simple-typed - - sqlvalue-list - - sqsd-local - - squeal-postgresql - - squeeze - - sr-extra - - srcinst - - sscan - - sscgi - - ssh - - ssh-tunnel - - sshd-lint - - sssp - - sstable - - SSTG - - st2 - - stable-heap - - stable-maps - - stable-marriage - - stable-memo - - stable-tree - - stack-bump - - stack-fix - - stack-hpc-coveralls - - stack-lib - - stack-network - - stack-prism - - stack-run - - stack-run-auto - - stack-type - - stack-wrapper - - stack2cabal - - stack2nix - - stackage - - stackage-build-plan - - stackage-cabal - - stackage-cli - - stackage-curator - - stackage-metadata - - stackage-query - - stackage-sandbox - - stackage-setup - - stackage-to-hackage - - stackage-types - - stackage-upload - - stackage2nix - - stackcollapse-ghc - - staged-gg - - standalone-derive-topdown - - standalone-haddock - - starling - - stash - - Stasis - - state - - state-bag - - state-plus - - state-record - - stateful-mtl - - static-canvas - - static-closure - - static-tensor - - static-text - - statistics-dirichlet - - statistics-fusion - - statistics-hypergeometric-genvar - - stats - - statsd - - statsd-client - - statsdi - - statvfs - - stb-image-redux - - stc-lang - - stdata - - stdf - - stdio - - steambrowser - - stego-uuid - - stemmer - - stemmer-german - - stepwise - - stern-brocot - - stgi - - STL - - STLinkUSB - - stm-chunked-queues - - stm-firehose - - stm-promise - - stm-stats - - STM32-Zombie - - stmcontrol - - stochastic - - StockholmAlignment - - stocks - - Stomp - - storable - - storable-static-array - - storablevector-streamfusion - - stp - - str - - Strafunski-ATermLib - - Strafunski-Sdf2Haskell - - Strafunski-StrategyLib - - StrappedTemplates - - stratum-tool - - stratux - - stratux-demo - - stratux-http - - stratux-types - - stratux-websockets - - stream - - stream-fusion - - stream-monad - - streamdeck - - streamed - - streaming-base64 - - streaming-benchmarks - - streaming-brotli - - streaming-cassava - - streaming-concurrency - - streaming-conduit - - streaming-events - - streaming-fft - - streaming-lzma - - streaming-osm - - streaming-pcap - - streaming-png - - streaming-process - - streaming-sort - - streaming-utils - - streaming-with - - streamly-archive - - streamly-fsnotify - - streamly-lmdb - - streamproc - - strelka - - strict-base-types - - strict-data - - strict-ghc-plugin - - strict-tuple-lens - - StrictBench - - StrictCheck - - strictly - - string-isos - - string-quote - - string-typelits - - stringlike - - stringtable-atom - - stripe - - stripe-hs - - stripe-http-streams - - stripe-scotty - - stripe-signature - - stripe-wreq - - strongswan-sql - - structural-induction - - structural-traversal - - structured-mongoDB - - structures - - stt - - stunclient - - stunts - - stutter - - stylish-cabal - - stylist - - stylized - - suavemente - - sub-state - - subhask - - subleq-toolchain - - submark - - subsample - - substring-parser - - subwordgraph - - successors - - suffix-array - - suffixarray - - SuffixStructures - - sugarhaskell - - suitable - - summoner - - summoner-tui - - sump - - sunlight - - sunroof-compiler - - sunroof-examples - - sunroof-server - - super-user-spark - - superbubbles - - supercollider-ht - - supercollider-midi - - superconstraints - - superevent - - supermonad - - supernova - - supero - - supervisor - - supplemented - - surjective - - sv - - sv-cassava - - sv-core - - sv-svfactor - - SVD2HS - - svfactor - - svg-builder-fork - - SVG2Q - - svg2q - - svgcairo - - svgone - - svgutils - - svm-light-utils - - svm-simple - - svndump - - swagger-petstore - - swagger-test - - swapper - - swearjure - - sweet-egison - - swf - - swift-lda - - swiss-ephemeris - - switch - - sws - - syb-extras - - syb-with-class-instances-text - - SybWidget - - syfco - - sylvia - - sym - - sym-plot - - symantic - - symantic-atom - - symantic-cli - - symantic-http - - symantic-http-client - - symantic-http-demo - - symantic-http-pipes - - symantic-http-server - - symantic-http-test - - symantic-lib - - symantic-parser - - symantic-xml - - symbiote - - symbolic-link - - symengine - - symengine-hs - - symmetry-operations-symbols - - sync - - sync-mht - - syncthing-hs - - syntactic - - syntax - - syntax-attoparsec - - syntax-example - - syntax-example-json - - syntax-pretty - - syntax-printer - - syntax-trees - - syntax-trees-fork-bairyn - - SyntaxMacros - - syntaxnet-haskell - - synthesizer - - synthesizer-llvm - - sys-process - - Sysmon - - system-canonicalpath - - system-command - - system-extra - - system-inotify - - system-lifted - - system-linux-proc - - system-locale - - system-random-effect - - systemstats - - t-regex - - t3-client - - t3-server - - ta - - table - - table-layout - - table-tennis - - tableaux - - Tables - - tables - - tablestorage - - Tablify - - tabloid - - tabs - - tag-bits - - tag-stream - - tagged-exception-core - - tagged-list - - tagged-th - - tagged-timers - - taglib-api - - tagsoup-ht - - tagsoup-megaparsec - - tagsoup-navigate - - tagsoup-parsec - - tagsoup-selection - - tagstew - - tai - - tai64 - - takahashi - - Takusen - - takusen-oracle - - tal - - tamarin-prover - - tamarin-prover-term - - tamarin-prover-theory - - tamarin-prover-utils - - Tape - - tapioca - - target - - task - - task-distribution - - TaskMonad - - tasty-auto - - tasty-bdd - - tasty-checklist - - tasty-fail-fast - - tasty-grading-system - - tasty-groundhog-converters - - tasty-hedgehog-coverage - - tasty-html - - tasty-integrate - - tasty-jenkins-xml - - tasty-laws - - tasty-lens - - tasty-mgolden - - tasty-silver - - tasty-stats - - tasty-test-vector - - tateti-tateti - - Taxonomy - - TaxonomyTools - - TBC - - TBit - - tbox - - tcache-AWS - - tccli - - tcod-haskell - - tcp - - tcp-streams-openssl - - tdd-util - - tdigest-Chart - - tdlib - - tdlib-gen - - tdlib-types - - tds - - TeaHS - - teams - - techlab - - teeth - - telegram - - telegram-api - - telegram-bot - - telegram-bot-simple - - telegram-raw-api - - telegram-types - - teleport - - teleshell - - tellbot - - tempi - - template-default - - template-haskell-util - - template-hsml - - template-yj - - templateify - - templatepg - - tempodb - - temporal-csound - - tempus - - tensor - - tensor-safe - - tensorflow - - tensorflow-core-ops - - tensorflow-logging - - tensorflow-opgen - - tensorflow-ops - - term-rewriting - - termbox-banana - - termbox-bindings - - terminal-text - - termination-combinators - - termplot - - terntup - - terraform-http-backend-pass - - terrahs - - tersmu - - tesla - - test-fixture - - test-framework-doctest - - test-framework-quickcheck - - test-framework-sandbox - - test-framework-skip - - test-framework-testing-feat - - test-framework-th-prime - - test-karya - - test-pkg - - test-sandbox - - test-sandbox-compose - - test-sandbox-hunit - - test-sandbox-quickcheck - - test-shouldbe - - test-simple - - testbench - - testCom - - testcontainers - - testloop - - testpack - - testpattern - - testrunner - - TeX-my-math - - tex2txt - - texbuilder - - texrunner - - text-all - - text-and-plots - - text-ascii - - text-containers - - text-format-heavy - - text-generic-pretty - - text-icu-normalized - - text-lens - - text-lips - - text-markup - - text-normal - - text-offset - - text-plus - - text-position - - text-register-machine - - text-replace - - text-trie - - text-utf8 - - text-utils - - text-xml-qq - - text-zipper-monad - - text1 - - textmatetags - - textocat-api - - textual - - tfp-th - - tftp - - tga - - th-alpha - - th-build - - th-context - - th-dict-discovery - - th-fold - - th-format - - th-instance-reification - - th-instances - - th-kinds - - th-kinds-fork - - th-lego - - th-pprint - - th-sccs - - th-tc - - th-to-exp - - th-traced - - th-typegraph - - thank-you-stars - - theatre - - thentos-cookie-session - - Theora - - theoremquest - - theoremquest-client - - thih - - thimk - - Thingie - - thock - - thorn - - threadmanager - - threepenny-editors - - threepenny-gui-contextmenu - - threepenny-gui-flexbox - - thrift - - throttled-io-loop - - thumbnail-plus - - thumbnail-polish - - tic-tac-toe - - tickle - - TicTacToe - - tictactoe3d - - tidal-midi - - tidal-serial - - tidal-vis - - tie-knot - - tiempo - - tiger - - tightrope - - tighttp - - timberc - - time-extras - - time-exts - - time-http - - time-io-access - - time-machine - - time-qq - - time-quote - - time-recurrence - - time-series - - time-series-lib - - time-w3c - - time-warp - - timecalc - - timemap - - timeout - - timeout-with-results - - timeparsers - - TimePiece - - timeprint - - timeseries - - timeutils - - timezone-detect - - timezone-olson-th - - timezone-unix - - tini - - tintin - - tiny-scheduler - - TinyLaunchbury - - tinyMesh - - tinytemplate - - TinyURL - - tinyXml - - tip-haskell-frontend - - tip-lib - - titan - - titan-debug-yampa - - titan-record-yampa - - Titim - - tkhs - - tkyprof - - tls-extra - - tlynx - - tmp-postgres - - tn - - to-haskell - - to-string-class - - to-string-instances - - toboggan - - todo - - todos - - tofromxml - - toilet - - token-limiter - - token-search - - tokenify - - tokenizer-streaming - - tokstyle - - toktok - - tokyocabinet-haskell - - tokyotyrant-haskell - - tomato-rubato-openal - - toml - - tonatona-google-server-api - - tonatona-persistent-postgresql - - tonatona-persistent-sqlite - - tonatona-servant - - too-many-cells - - toodles - - Top - - top - - topkata - - torch - - TORCS - - total-map - - TotalMap - - touched - - Tournament - - toxcore - - toxcore-c - - toxiproxy-haskell - - toysolver - - tpar - - tpb - - tptp - - trace - - trace-call - - trace-function-call - - traced - - tracetree - - tracing - - tracing-control - - tracked-files - - tracker - - trackit - - traction - - tracy - - traildb - - trajectory - - transactional-events - - transf - - transfer-db - - transformations - - TransformeR - - transformers-compose - - transformers-convert - - transformers-lift - - transformers-runnable - - TransformersStepByStep - - transient-universe - - transient-universe-tls - - translatable-intset - - translate - - translate-cli - - trasa - - trasa-client - - trasa-extra - - trasa-form - - trasa-server - - trasa-th - - traversal-template - - travis - - travis-meta-yaml - - trawl - - traypoweroff - - treap - - tree-render-text - - tree-traversals - - TreeCounter - - treemap - - treemap-html - - treemap-html-tools - - TreeStructures - - Treiber - - trek-app - - trek-db - - tremulous-query - - TrendGraph - - trhsx - - triangulation - - TrieMap - - tries - - trigger - - trim - - trimpolya - - tripLL - - trivia - - trivial-constraint - - tropical - - tropical-geometry - - true-name - - truelevel - - trurl - - tsession - - tsession-happstack - - tsp-viz - - tsparse - - tsuntsun - - tsvsql - - tsweb - - ttask - - tttool - - tubes - - tuntap - - tuntap-simple - - tup-functor - - tuple-gen - - tuple-lenses - - tuple-morph - - tuple-ops - - tupleinstances - - turing-machines - - turing-music - - turingMachine - - turtle-options - - TV - - tweak - - twee - - tweet-hs - - twentefp-eventloop-graphics - - twentefp-eventloop-trees - - twentefp-graphs - - twentefp-rosetree - - twentefp-trees - - twentefp-websockets - - twentyseven - - twfy-api-client - - twhs - - twidge - - twilight-stm - - twilio - - twill - - twine - - twirp - - twitter - - twitter-conduit - - twitter-enumerator - - twitter-feed - - tx - - txt - - txtblk - - TYB - - tyfam-witnesses - - typalyze - - type-assertions - - type-cache - - type-cereal - - type-combinators - - type-combinators-quote - - type-combinators-singletons - - type-digits - - type-eq - - type-fun - - type-indexed-queues - - type-int - - type-interpreter - - type-level-bst - - type-level-natural-number-induction - - type-level-natural-number-operations - - type-list - - type-of-html-static - - type-ord - - type-ord-spine-cereal - - type-prelude - - type-sets - - type-settheory - - type-spine - - type-structure - - type-sub-th - - type-tree - - type-unary - - typeable-th - - TypeClass - - typed-encoding - - typed-encoding-encoding - - typed-spreadsheet - - typed-streams - - typed-wire - - typedflow - - typedquery - - typehash - - TypeIlluminator - - typelevel - - typelevel-rewrite-rules - - typelevel-tensor - - TypeNat - - typenums - - typeparams - - types-compat - - typesafe-precure - - typescript-docs - - typograffiti - - typson-beam - - typson-esqueleto - - typson-selda - - tyro - - u2f - - uber - - uberlast - - ucam-webauth - - ucam-webauth-types - - ucd - - uconv - - udp-conduit - - udp-streaming - - uhc-light - - uhc-util - - uhexdump - - uhttpc - - ui-command - - UMM - - unagi-bloomfilter - - unamb-custom - - unbound - - unbounded-delays-units - - unboxed-containers - - unboxed-references - - unbreak - - unescaping-print - - unfix-binders - - uni-events - - uni-graphs - - uni-htk - - uni-posixutil - - uni-reactor - - uni-uDrawGraph - - uni-util - - unicode-normalization - - unicode-prelude - - unicode-show - - unicode-symbols - - unicode-tricks - - uniform-io - - union - - union-map - - uniprot-kb - - uniqueid - - uniquely-represented-sets - - uniqueness-periods-vector-examples - - uniqueness-periods-vector-properties - - units-attoparsec - - unittyped - - unitym-yesod - - universal-binary - - universe - - universe-instances-base - - universe-instances-extended - - universe-instances-trans - - universe-th - - unix-fcntl - - unix-handle - - unix-process-conduit - - unix-recursive - - unix-simple - - unlifted-list - - unliftio-messagebox - - unliftio-streams - - unm-hip - - unordered-containers-rematch - - unordered-graphs - - unordered-intmap - - unpack-funcs - - unpacked-either - - unpacked-maybe - - unpacked-maybe-numeric - - unpacked-these - - unpacked-validation - - unparse-attoparsec - - unroll-ghc-plugin - - unsafely - - unscramble - - unsequential - - unused - - uom-plugin - - up - - Updater - - uploadcare - - upskirt - - urbit-airlock - - urbit-api - - urbit-hob - - ureader - - urembed - - uri - - uri-conduit - - uri-encoder - - uri-enumerator - - uri-enumerator-file - - uri-parse - - uri-template - - uri-templater - - url-bytes - - url-decoders - - url-generic - - URLb - - urlcheck - - urldecode - - UrlDisp - - urldisp-happstack - - urlencoded - - urlpath - - URLT - - urn - - urn-random - - urxml - - usb - - usb-enumerator - - usb-hid - - usb-id-database - - usb-iteratee - - usb-safe - - userid - - users-mysql-haskell - - users-persistent - - utf - - utf8-prelude - - utf8-validator - - UTFTConverter - - util-exception - - util-logict - - util-plus - - util-primitive - - util-primitive-control - - util-universe - - uu-cco - - uu-cco-examples - - uu-cco-hut-parsing - - uu-cco-uu-parsinglib - - uuagc-bootstrap - - uuagc-diagrams - - uuid-aeson - - uuid-bytes - - uuid-crypto - - uvector - - uvector-algorithms - - uxadt - - v4l2 - - v4l2-examples - - vabal - - vabal-lib - - vacuum - - vacuum-cairo - - vacuum-graphviz - - vacuum-opengl - - vacuum-ubigraph - - valid-names - - validate-input - - validated-types - - Validation - - validations - - value-supply - - vampire - - var - - varan - - variable-precision - - variables - - variation - - vault-tool-server - - vault-trans - - vaultaire-common - - vcache - - vcache-trie - - vcard - - vcatt - - vcf - - vcsgui - - vcswrapper - - Vec-Boolean - - Vec-OpenGLRaw - - Vec-Transform - - vect-floating - - vect-floating-accelerate - - vect-opengl - - vector-bytestring - - vector-clock - - vector-conduit - - vector-endian - - vector-fftw - - vector-functorlazy - - vector-heterogenous - - vector-instances-collections - - vector-random - - vector-read-instances - - vector-space-map - - vector-space-opengl - - vector-space-points - - vector-static - - vector-text - - vega-view - - venzone - - Verba - - verbalexpressions - - verdict - - verdict-json - - verifiable-expressions - - verify - - verilog - - verismith - - versioning - - versioning-servant - - vflow-types - - vfr-waypoints - - vgrep - - vhd - - vhdl - - vicinity - - ViennaRNA-extras - - viewprof - - views - - vigilance - - Villefort - - vimeta - - vimus - - vintage-basic - - vinyl-json - - vinyl-named-sugar - - vinyl-operational - - vinyl-plus - - vinyl-utils - - vinyl-vectors - - virthualenv - - visibility - - vision - - visual-graphrewrite - - visual-prof - - visualize-cbn - - vitrea - - vk-aws-route53 - - VKHS - - vocoder - - vocoder-audio - - vocoder-conduit - - vocoder-dunai - - voicebase - - vowpal-utils - - voyeur - - vpq - - VRML - - vte - - vtegtk3 - - vty-examples - - vty-menu - - vty-ui - - vty-ui-extras - - vulkan-api - - waargonaut - - wacom-daemon - - waddle - - wahsp - - wai-cli - - wai-devel - - wai-git-http - - wai-graceful - - wai-handler-devel - - wai-handler-fastcgi - - wai-handler-hal - - wai-handler-scgi - - wai-handler-snap - - wai-handler-webkit - - wai-hmac-auth - - wai-lens - - wai-lite - - wai-logger-buffered - - wai-logger-prefork - - wai-make-assets - - wai-middleware-cache - - wai-middleware-cache-redis - - wai-middleware-catch - - wai-middleware-consul - - wai-middleware-content-type - - wai-middleware-crowd - - wai-middleware-delegate - - wai-middleware-etag - - wai-middleware-headers - - wai-middleware-hmac-client - - wai-middleware-preprocessor - - wai-middleware-rollbar - - wai-middleware-route - - wai-middleware-static-caching - - wai-middleware-travisci - - wai-middleware-validation - - wai-rate-limit-redis - - wai-request-spec - - wai-responsible - - wai-router - - wai-routes - - wai-routing - - wai-secure-cookies - - wai-session-alt - - wai-session-mysql - - wai-session-postgresql - - wai-session-redis - - wai-static-cache - - wai-thrift - - wai-throttler - - waitfree - - waitra - - waldo - - wallpaper - - warc - - warp-dynamic - - warp-grpc - - warp-static - - warp-systemd - - warped - - WashNGo - - wasm - - watchdog - - watcher - - watchit - - WAVE - - WaveFront - - wavefront - - wavefront-obj - - wavesurfer - - wavy - - weak-bag - - weather-api - - web-css - - web-encodings - - web-mongrel2 - - web-output - - web-page - - web-push - - web-rep - - web-routes-quasi - - web-routes-regular - - web-routes-transformers - - web-routing - - web3 - - webapi - - webapp - - webauthn - - WebBits - - WebBits-Html - - WebBits-multiplate - - webcloud - - WebCont - - webcrank - - webcrank-dispatch - - webcrank-wai - - webdriver-angular - - webdriver-snoy - - webdriver-w3c - - WeberLogic - - webfinger-client - - webify - - webkit-javascriptcore - - webmention - - Webrexp - - webserver - - webshow - - websockets-rpc - - webwire - - WEditor - - WEditorBrick - - WEditorHyphen - - weekdaze - - weighted - - weighted-regexp - - welshy - - werewolf - - werewolf-slack - - what4 - - Wheb - - wheb-mongo - - wheb-redis - - wheb-strapped - - while-lang-parser - - whim - - whiskers - - whitespace - - whois - - why3 - - wide-word - - wide-word-instances - - WikimediaParser - - wikipedia4epub - - wild-bind-indicator - - wild-bind-task-x11 - - windns - - windowslive - - winerror - - winery - - winio - - Wired - - wires - - wiring - - witty - - wkt - - wkt-geom - - wl-pprint-ansiterm - - wl-pprint-extras - - wl-pprint-terminfo - - WL500gPControl - - WL500gPLib - - wlc-hs - - WMSigner - - wobsurv - - woe - - woffex - - wol - - wolf - - word - - word2vec-model - - WordAlignment - - wordchoice - - wordify - - wordlist - - WordNet - - WordNet-ghc74 - - wordpass - - wordpress-auth - - wordsearch - - work-time - - workdays - - Workflow - - workflow-extra - - workflow-osx - - workflow-pure - - workflow-types - - workflow-windows - - wp-archivebot - - wraxml - - wrecker - - wrecker-ui - - wreq-patchable - - wreq-sb - - wright - - writer-cps-full - - writer-cps-lens - - writer-cps-monads-tf - - writer-cps-morph - - ws - - wsdl - - wsedit - - wshterm - - wsjtx-udp - - wss-client - - wtk - - wtk-gtk - - wu-wei - - wumpus-basic - - wumpus-core - - wumpus-drawing - - wumpus-microprint - - wumpus-tree - - WURFL - - wxAsteroids - - WXDiffCtrl - - wxdirect - - wxFruit - - WxGeneric - - wxhnotepad - - wxSimpleCanvas - - wxturtle - - wyvern - - x-dsp - - X11-extras - - X11-rm - - X11-xdamage - - X11-xfixes - - xchat-plugin - - xcp - - xdcc - - xdot - - Xec - - xenstore - - xfconf - - xformat - - xhaskell-library - - xhb - - xhb-atom-cache - - xhb-ewmh - - xilinx-lava - - xine - - xing-api - - xkbcommon - - xkcd - - xleb - - xls - - xlsior - - xlsx-tabular - - xlsx-templater - - xml-catalog - - xml-conduit-decode - - xml-conduit-selectors - - xml-conduit-stylist - - xml-enumerator - - xml-enumerator-combinators - - xml-html-conduit-lens - - xml-monad - - xml-parsec - - xml-pipe - - xml-prettify - - xml-push - - xml-query - - xml-query-xml-conduit - - xml-query-xml-types - - xml-tydom-conduit - - xml-tydom-core - - xml2json - - xml2x - - XmlHtmlWriter - - xmltv - - XMMS - - xmms2-client - - xmms2-client-glib - - xmonad-bluetilebranch - - xmonad-contrib-bluetilebranch - - xmonad-contrib-gpl - - xmonad-dbus - - xmonad-eval - - xmonad-vanessa - - xmonad-windownames - - xmpipe - - XMPP - - xor - - xorshift-plus - - Xorshift128Plus - - xournal-builder - - xournal-convert - - xournal-parser - - xournal-render - - xournal-types - - xrefcheck - - xsact - - XSaiga - - xsd - - xslt - - xtc - - xxhash - - y0l0bot - - yabi-muno - - Yablog - - yackage - - YACPong - - yahoo-finance-api - - yahoo-finance-conduit - - yahoo-prices - - yahoo-web-search - - yajl - - yajl-enumerator - - yall - - yam - - yam-config - - yam-datasource - - yam-logger - - yam-redis - - yam-servant - - yam-transaction - - yam-transaction-odbc - - yam-web - - yaml-pretty-extras - - yaml-rpc - - yaml-rpc-scotty - - yaml-rpc-snap - - yaml-unscrambler - - YamlReference - - yampa-glfw - - yampa-gloss - - yampa-glut - - yampa-sdl2 - - yampa-test - - yampa2048 - - YampaSynth - - yandex-translate - - yaop - - yap - - yarr - - yarr-image-io - - yasi - - yavie - - yaya-test - - yaya-unsafe-test - - ycextra - - yeamer - - yeller - - yeshql - - yeshql-hdbc - - yeshql-postgresql-simple - - yesod-angular - - yesod-angular-ui - - yesod-articles - - yesod-auth-account - - yesod-auth-account-fork - - yesod-auth-bcrypt - - yesod-auth-bcryptdb - - yesod-auth-deskcom - - yesod-auth-hmac-keccak - - yesod-auth-kerberos - - yesod-auth-ldap - - yesod-auth-ldap-mediocre - - yesod-auth-ldap-native - - yesod-auth-lti13 - - yesod-auth-nopassword - - yesod-auth-oauth2 - - yesod-auth-pam - - yesod-auth-smbclient - - yesod-auth-zendesk - - yesod-bootstrap - - yesod-colonnade - - yesod-comments - - yesod-content-pdf - - yesod-continuations - - yesod-crud - - yesod-crud-persist - - yesod-datatables - - yesod-dsl - - yesod-examples - - yesod-fast-devel - - yesod-fay - - yesod-filter - - yesod-form-richtext - - yesod-gitrev - - yesod-goodies - - yesod-ip - - yesod-job-queue - - yesod-links - - yesod-lucid - - yesod-mangopay - - yesod-markdown - - yesod-media-simple - - yesod-page-cursor - - yesod-paginate - - yesod-pagination - - yesod-paypal-rest - - yesod-platform - - yesod-pnotify - - yesod-pure - - yesod-purescript - - yesod-raml - - yesod-raml-bin - - yesod-raml-docs - - yesod-raml-mock - - yesod-recaptcha - - yesod-routes - - yesod-routes-flow - - yesod-routes-typescript - - yesod-rst - - yesod-s3 - - yesod-sass - - yesod-session-redis - - yesod-static-angular - - yesod-static-remote - - yesod-test-json - - yesod-tls - - yesod-vend - - yesod-worker - - YFrob - - yggdrasil - - yhccore - - yhseq - - yi - - yi-contrib - - yi-core - - yi-dynamic-configuration - - yi-emacs-colours - - yi-frontend-pango - - yi-frontend-vty - - yi-fuzzy-open - - yi-ireader - - yi-keymap-cua - - yi-keymap-emacs - - yi-keymap-vim - - yi-language - - yi-misc-modes - - yi-mode-haskell - - yi-mode-javascript - - yi-monokai - - yi-snippet - - yi-solarized - - yi-spolsky - - yices - - yjftp - - yjftp-libs - - yoctoparsec - - yoda - - Yogurt - - Yogurt-Standalone - - yoko - - york-lava - - yql - - yst - - yu-auth - - yu-core - - yu-launch - - yu-tool - - yu-utils - - yuuko - - yx - - yxdb-utils - - Z-Data - - Z-IO - - Z-MessagePack - - Z-YAML - - z3-encoding - - z85 - - zabt - - zampolit - - zasni-gerna - - zbar - - ZEBEDDE - - zendesk-api - - zenhack-prelude - - zeno - - zephyr - - zerobin - - zeromq-haskell - - zeromq3-conduit - - zeromq3-haskell - - zeromq4-clone-pattern - - zeromq4-conduit - - zeromq4-patterns - - zeroth - - zettelkast - - ZFS - - zifter - - zifter-cabal - - zifter-git - - zifter-google-java-format - - zifter-hindent - - zifter-hlint - - zifter-stack - - zigbee-znet25 - - zip-conduit - - zipedit - - zipkin - - zipper - - zippo - - ziptastic-client - - ziptastic-core - - zlib-enum - - zm - - ZMachine - - zmcat - - zmidi-score - - zoneinfo - - zoom - - zoom-cache - - zoom-cache-pcm - - zoom-cache-sndfile - - zoom-refs - - zoovisitor - - zsdd - - zsh-battery - - zsyntax - - ztar - - zuramaru - - Zwaluw - - zxcvbn-dvorak diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml new file mode 100644 index 0000000000..0aade87acb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -0,0 +1,5263 @@ +broken-packages: + # These packages don't compile. + - 3dmodels + - AAI + - abcnotation + - abeson + - abides + - abnf + - AbortT-transformers + - abstract-par-accelerate + - abt + - AC-BuildPlatform + - acc + - accelerate-fftw + - accelerate-llvm-native + - accelerate-random + - accelerate-utility + - accentuateus + - access-time + - AC-EasyRaster-GTK + - AC-HalfInteger + - achille + - acid-state-dist + - acid-state-tls + - ac-machine + - ACME + - acme-all-monad + - acme-comonad + - acme-dont + - acme-flipping-tables + - acme-hq9plus + - acme-http + - acme-inator + - acme-kitchen-sink + - acme-left-pad + - acme-miscorder + - acme-mutable-package + - acme-now + - acme-numbersystem + - acme-operators + - acme-schoenfinkel + - acme-strfry + - acme-stringly-typed + - acme-this + - acme-zero + - AC-MiniTest + - AC-Terminal + - ActionKid + - activehs-base + - activitypub + - activitystreams-aeson + - acts + - AC-VanillaArray + - AC-Vector + - Adaptive + - Adaptive-Blaisorblade + - adaptive-containers + - adaptive-tuple + - adb + - adjunction + - adobe-swatch-exchange + - ADPfusion + - adp-multi + - adtrees + - aern2-mp + - AERN-Basics + - aeson-applicative + - aeson-decode + - aeson-diff-generic + - aeson-filthy + - aeson-flowtyped + - aeson-match-qq + - aeson-options + - aeson-prefix + - aeson-schema + - aeson-schemas + - aeson-smart + - aeson-streams + - aeson-t + - aeson-tiled + - aeson-typescript + - aeson-utils + - aeson-via + - affection + - affine-invariant-ensemble-mcmc + - Agata + - agda-language-server + - agda-snippets + - AGI + - ag-pictgen + - AhoCorasick + - aig + - airbrake + - airtable-api + - air-th + - ajhc + - AlanDeniseEricLauren + - alerta + - alex-prelude + - alfred + - alga + - algebra-dag + - algebraic + - algebraic-prelude + - AlgorithmW + - algo-s + - align-text + - ally-invest + - alphachar + - alsa + - alsa-midi + - altcomposition + - alternative-extra + - alternative-io + - alto + - alure + - amazon-emailer + - amazon-products + - amby + - AMI + - amqp-conduit + - analyze + - anansi-pandoc + - android + - android-activity + - android-lint-summary + - angel + - angle + - Animas + - animascii + - animate + - annotated-fix + - anonymous-sums + - ansigraph + - antfarm + - antigate + - antimirov + - antiope-optparse-applicative + - antiquoter + - antisplice + - antlr-haskell + - anydbm + - aop-prelude + - aosd + - aos-signature + - apart + - apecs-stm + - api-builder + - api-rpc-factom + - apns-http2 + - appc + - app-lens + - AppleScript + - applicative-fail + - applicative-parsec + - applicative-quoters + - applicative-splice + - apply-unordered + - approveapi + - approx + - ApproxFun-hs + - arbb-vm + - arb-fft + - arbor-monad-counter + - arbor-monad-logger + - arbor-monad-metric + - arbor-postgres + - archiver + - archlinux + - archnews + - arch-web + - arena + - argon2 + - argparser + - arguedit + - arion + - armada + - arpa + - arpack + - arrayfire + - array-primops + - ArrayRef + - arrowapply-utils + - arrow-improve + - arrow-list + - arrowp + - arrowp-qq + - ArrowVHDL + - artery + - artifact + - asap + - ascii85-conduit + - ascii-flatten + - ascii-string + - ascii-vector-avc + - asil + - asn + - asn1-codec + - asn1-data + - assert + - assert4hs + - assert4hs-core + - assertions + - asset-map + - assumpta + - ast-monad + - astrds + - async-combinators + - async-dejafu + - asynchronous-exceptions + - async-manager + - async-timer + - aterm-utils + - atndapi + - atomic-modify + - atomic-primops-vector + - atom-msp430 + - atomo + - atp-haskell + - ats-pkg + - ats-setup + - ats-storable + - attempt + - attic-schedule + - AttoBencode + - atto-lisp + - attomail + - attoparsec-text + - attoparsec-trans + - attosplit + - Attrac + - augeas + - augur + - aur + - aur-api + - Aurochs + - authenticate-ldap + - authinfo-hs + - autom + - automata + - autonix-deps + - autopack + - avatar-generator + - avl-static + - avr-shake + - awesome-prelude + - awesomium-raw + - aws-cloudfront-signer + - aws-easy + - aws-ec2 + - aws-ec2-knownhosts + - aws-general + - aws-larpi + - aws-performance-tests + - aws-route53 + - aws-sdk-text-converter + - aws-simple + - axel + - azubi + - azure-acs + - azure-email + - azurify + - b9 + - backstop + - backtracking-exceptions + - backward-state + - bag + - Baggins + - bake + - Bang + - ban-instance + - bank-holiday-usa + - banwords + - barchart + - barcodes-code128 + - barecheck + - barrie + - barrier + - barrier-monad + - base16 + - base64-conduit + - base-compat-migrate + - base-encoding + - base-feature-macros + - base-generics + - base-io-access + - basex-client + - basic + - basic-sop + - baskell + - battlenet + - battleship-combinatorics + - bazel-coverage-report-renderer + - BCMtools + - bdd + - bdo + - beam + - beamable + - beam-core + - bech32 + - bed-and-breakfast + - beeminder-api + - Befunge93 + - BenchmarkHistory + - bench-show + - bencodex + - berkeleydb + - BerkeleyDBXML + - bert + - besout + - bet + - betacode + - betris + - bgmax + - bgzf + - bhoogle + - bibdb + - bidi-icu + - bidirectional + - bidirectionalization-combined + - bidispec + - bidispec-extras + - BiGUL + - billeksah-services + - binary-bits + - binary-communicator + - binary-derive + - binary-ext + - binary-indexed-tree + - binary-protocol + - binary-typed + - BinderAnn + - binding-gtk + - bindings-apr + - bindings-bfd + - bindings-cctools + - bindings-common + - bindings-dc1394 + - bindings-eskit + - bindings-EsounD + - bindings-fann + - bindings-fluidsynth + - bindings-friso + - bindings-gsl + - bindings-hamlib + - bindings-hdf5 + - bindings-K8055 + - bindings-levmar + - bindings-libftdi + - bindings-libg15 + - bindings-libpci + - bindings-librrd + - bindings-libstemmer + - bindings-libusb + - bindings-libv4l2 + - bindings-monetdb-mapi + - bindings-mpdecimal + - bindings-sc3 + - bindings-sipc + - bindings-wlc + - bind-marshal + - bindynamic + - binembed + - bio + - BiobaseNewick + - biocore + - biohazard + - bio-sequence + - birds-of-paradise + - bisect-binary + - bishbosh + - bitcoin-hs + - bitcoin-script + - bits-atomic + - bits-conduit + - bitset + - bits-extras + - bitspeak + - bit-stream + - BitStringRandomMonad + - bitx-bitcoin + - bizzlelude-js + - bkr + - blakesum + - blas + - blaze-html-contrib + - blaze-html-hexpat + - blaze-html-truncate + - blaze-json + - blazeT + - blaze-textual-native + - bliplib + - blockchain + - blockhash + - Blogdown + - bloodhound + - bloomfilter-redis + - blosum + - blubber-server + - Blueprint + - bluetileutils + - blunk-hask-tests + - bogocopy + - boilerplate + - bolt + - boltzmann-brain + - bond + - bookkeeper + - boolean-normal-forms + - boolexpr + - boombox + - boots-app + - boring-window-switcher + - bot + - botpp + - bottom + - bounded-array + - bound-extras + - braid + - brain-bleep + - Bravo + - brians-brain + - brick-dropdownmenu + - bricks-internal + - brillig + - broccoli + - brok + - broker-haskell + - bronyradiogermany-common + - brotli + - browscap + - bsd-sysctl + - bson-generic + - bson-generics + - bsparse + - btree-concurrent + - buffer + - buffer-builder-aeson + - BufferedSocket + - buffet + - buffon + - bugsnag-haskell + - bugzilla + - build + - buildable + - buildbox + - builder + - bullet + - bumper + - bunz + - burst-detection + - buster + - Buster + - butter + - bv-sized + - bytable + - bytearray-parsing + - bytestring-arbitrary + - bytestring-builder-varword + - bytestring-class + - bytestring-csv + - bytestringparser + - bytestringparser-temporary + - bytestring-plain + - bytestringreadp + - bytestring-rematch + - bytestring-show + - bytestring-substring + - bytestring-time + - bytestring-trie + - bytestring-typenats + - c0parser + - c10k + - c2ats + - cabal2doap + - cabal2ebuild + - cabal2ghci + - cabal-audit + - cabal-bundle-clib + - cabal-constraints + - cabal-db + - cabal-dependency-licenses + - cabal-dev + - cabal-dir + - cabal-edit + - cabal-file-th + - cabal-ghc-dynflags + - cabal-ghci + - cabalgraph + - cabal-graphdeps + - Cabal-ide-backend + - cabal-info + - cabal-install-bundle + - cabal-install-ghc72 + - cabal-install-ghc74 + - cabalish + - cabal-lenses + - cabal-meta + - cabal-mon + - cabal-nirvana + - cabal-progdeps + - cabalQuery + - CabalSearch + - cabal-setup + - cabal-sort + - cabal-src + - cabal-test-quickcheck + - cabal-upload + - cabalvchk + - cabin + - cabocha + - cached + - cache-polysemy + - caching + - cacophony + - cafeteria-prelude + - caffegraph + - cairo-core + - cake3 + - cal3d + - calamity + - caledon + - calenderweek + - call-alloy + - cal-layout + - call-haskell-from-anything + - canon + - canonical-filepath + - canonical-json + - canteven-listen-http + - canteven-log + - canteven-parsedate + - cantor + - Capabilities + - capnp + - capped-list + - capri + - caramia + - carbonara + - carettah + - CarneadesDSL + - carte + - Cartesian + - casa-abbreviations-and-acronyms + - casadi-bindings-internal + - Cascade + - cascading + - caseof + - Cassava + - cassava-conduit + - cassava-records + - cassette + - castle + - catamorphism + - Catana + - catch-fd + - category-traced + - catnplus + - cautious-file + - cautious-gen + - cayene-lpp + - cayley-client + - CCA + - CC-delcont-cxe + - CC-delcont-exc + - CC-delcont-ref + - CC-delcont-ref-tf + - cci + - ccnx + - c-dsl + - cedict + - cef + - cef3-raw + - cellrenderer-cairo + - cerberus + - cereal-derive + - cereal-ieee754 + - cereal-plus + - cf + - cfenv + - cg + - cgen + - cgi-utils + - chalkboard + - character-cases + - charter + - chart-histogram + - Chart-simple + - chatty-text + - chatwork + - checked + - Checked + - checkmate + - chell-quickcheck + - Chitra + - choose + - chorale + - chp + - chp-spec + - ChristmasTree + - chronograph + - chr-parse + - chunky + - church + - church-maybe + - cielo + - cil + - cinvoke + - c-io + - cio + - cipher-blowfish + - circlehs + - circular + - citeproc-hs + - cjk + - cj-token + - clang-compilation-database + - clang-pure + - clanki + - clarifai + - CLASE + - clash-prelude + - Clash-Royale-Hack-Cheats + - ClassLaws + - classy-influxdb-simple + - classy-parallel + - classyplate + - ClassyPrelude + - cld2 + - Clean + - clean-unions + - clevercss + - clexer + - CLI + - cli-builder + - clickhouse-haskell + - clif + - clifm + - clingo + - clippard + - clipper + - clisparkline + - clit + - clogparse + - clone-all + - closure + - cloudfront-signer + - clr-inline + - cluss + - clustering + - cmark-highlight + - cmark-patterns + - cmark-sections + - cmath + - cmd-item + - cmdlib + - cmdtheline + - cmf + - cmonad + - c-mosquitto + - cmph + - CMQ + - cmt + - coalpit + - cobot-io + - cobot-tools + - code-builder + - codec-beam + - codec-libevent + - codecov-haskell + - codepad + - codeworld-api + - codex + - codo-notation + - coin + - coinbase-pro + - coincident-root-loci + - colchis + - collada-output + - collapse-util + - collections + - collections-api + - co-log-polysemy + - co-log-sys + - colonnade + - colorless + - coltrane + - com + - comark-syntax + - combinat-diagrams + - combinatorial-problems + - combinator-interactive + - combobuffer + - Command + - commander + - Commando + - commodities + - commsec + - compactable + - Compactable + - compact-list + - compact-map + - compact-mutable-vector + - compact-socket + - compact-string + - compact-string-fix + - compdata-dags + - compdata-param + - competition + - compilation + - complex-generic + - compose-trans + - composite-opaleye + - composition-tree + - comprehensions-ghc + - compressed + - compstrat + - comptrans + - computational-geometry + - computations + - ConClusion + - concrete-relaxng-parser + - concrete-typerep + - concurrent-buffer + - Concurrent-Cache + - Concurrential + - concurrent-state + - condorcet + - conductive-base + - conduit-audio-lame + - conduit-audio-samplerate + - conduit-find + - conduit-iconv + - conduit-network-stream + - conduit-resumablesink + - conduit-throttle + - conduit-tokenize-attoparsec + - conduit-vfs + - conf + - conferer-provider-json + - conferer-snap + - conferer-source-json + - confide + - ConfigFileTH + - config-parser + - Configurable + - configuration + - config-value-getopt + - confsolve + - congruence-relation + - conjure + - conkin + - conlogger + - connection-string + - Conscript + - consistent + - console-program + - const-math-ghc-plugin + - constrained-categories + - constrained-category + - constrained-dynamic + - constrained-monads + - ConstraintKinds + - constraints-emerge + - constr-eq + - constructive-algebra + - consul-haskell + - Consumer + - containers-benchmark + - containers-verified + - ContArrow + - content-store + - ContextAlgebra + - context-free-grammar + - context-stack + - contiguous-checked + - continue + - Contract + - control-iso + - control-monad-failure + - control-monad-failure-mtl + - Control-Monad-ST2 + - contstuff-monads-tf + - contstuff-transformers + - convert-annotation + - copilot-sbv + - copr + - COrdering + - core + - corebot-bliki + - CoreDump + - CoreErlang + - core-haskell + - Coroutine + - coroutine-object + - CouchDB + - couchdb-conduit + - couch-hs + - counter + - courier + - court + - coverage + - cparsing + - cpio-conduit + - cplusplus-th + - cpuperf + - cpython + - cql-io + - cqrs-core + - cr + - crack + - Craft3e + - craftwerk + - crawlchain + - crc + - crc16 + - crdt-event-fold + - creatur + - credential-store + - critbit + - criterion-compare + - criterion-plus + - criterion-to-html + - criu-rpc-types + - crjdt-haskell + - crocodile + - cruncher-types + - crunghc + - crypto-cipher-benchmarks + - crypto-classical + - cryptocompare + - cryptoconditions + - cryptoids-types + - crypto-keys-ssh + - crypto-multihash + - crypto-pubkey-openssh + - crypto-random-effect + - crypto-simple + - cryptsy-api + - cse-ghc-plugin + - CSPM-FiringRules + - CSPM-Frontend + - cspretty + - css + - css-easings + - css-selectors + - csv-nptools + - ctemplate + - ctkl + - cubical + - cuboid + - cuckoo + - curl-runnings + - currency-convert + - CurryDB + - curryer-rpc + - curry-frontend + - curves + - custom-prelude + - CV + - d3js + - dag + - DAG-Tournament + - damnpacket + - danibot + - dao + - Dao + - darcs2dot + - darcs-buildpackage + - darcs-cabalized + - darcs-graph + - darcs-monitor + - darkplaces-rcon + - darkplaces-text + - data-accessor-monads-tf + - data-aviary + - data-base + - database-id-groundhog + - database-study + - data-check + - data-combinator-gen + - data-concurrent-queue + - data-construction + - data-dispersal + - data-diverse-lens + - datadog + - data-easy + - data-embed + - data-emoticons + - data-filepath + - data-fin + - data-fin-simple + - datafix + - data-flagset + - data-ivar + - data-kiln + - data-lens + - datalog + - data-map-multikey + - data-nat + - data-object + - datapacker + - data-pprint + - data-quotientref + - data-reify-cse + - data-repr + - data-rev + - data-rope + - Data-Rope + - data-r-tree + - data-size + - data-spacepart + - data-standards + - data-store + - data-stringmap + - data-sword + - DataTreeView + - data-type + - data-util + - data-validation + - data-variant + - DataVersion + - dates + - datetime + - datetime-sb + - dawdle + - dawg + - dbcleaner + - dbf + - DBFunctor + - DBlimited + - dbm + - dbmigrations-mysql + - dbmigrations-postgresql + - dbmigrations-sqlite + - d-bus + - DBus + - dbus-core + - dbus-qq + - dclabel + - dclabel-eci11 + - dcpu16 + - ddc-base + - ddc-code + - dead-code-detection + - Deadpan-DDP + - dead-simple-json + - debug-me + - debug-tracy + - decepticons + - decimal-literals + - DecisionTree + - decoder-conduit + - deepcontrol + - DeepDarkFantasy + - deepseq-bounded + - deepseq-magic + - deepseq-th + - deep-transformations + - deka + - Delta-Lambda + - delude + - demarcate + - denominate + - dense-int-set + - dependent-hashmap + - dependent-monoidal-map + - depends + - dep-t + - deptrack-core + - derangement + - derivation-trees + - derive + - derive-enumerable + - derive-gadt + - derive-monoid + - derive-trie + - derp-lib + - describe + - descript-lang + - deterministic-game-engine + - deunicode + - devil + - Dflow + - dfsbuild + - dgim + - dgs + - dhall-check + - dhall-fly + - dhall-text + - dhall-to-cabal + - dhrun + - dia-base + - diagrams-boolean + - diagrams-canvas + - diagrams-graphviz + - diagrams-gtk + - diagrams-pdf + - diagrams-qrcode + - diagrams-rasterific + - diagrams-tikz + - dib + - dice2tex + - dicom + - dictionaries + - dictparser + - diet + - diff + - diffcabal + - differential + - DifferentialEvolution + - diffmap + - difftodo + - digestive-bootstrap + - digestive-foundation-lucid + - digestive-functors-aeson + - digestive-functors-happstack + - digest-pure + - DigitalOcean + - digitalocean-kzs + - digits + - DimensionalHash + - dimensional-tf + - diohsc + - diophantine + - direct-binary-files + - directed-cubical + - direct-fastcgi + - direct-http + - directory-contents + - direct-plugins + - direct-rocksdb + - direm + - discordian-calendar + - discord-types + - discrete + - DiscussionSupportSystem + - Dish + - disjoint-containers + - disjoint-set + - disjoint-set-stateful + - Dist + - distance + - distributed-fork-aws-lambda + - distributed-process + - distribution + - dist-upload + - djembe + - djinn-th + - dmcc + - dmenu + - dnscache + - dnsrbl + - dnssd + - dobutok + - doccheck + - docidx + - docker + - docker-build-cacher + - dockercook + - dockerfile-creator + - docopt + - docrecords + - doctest-discover-configurator + - doctest-prop + - docusign-example + - docvim + - domplate + - dotfs + - dot-linker + - doublify-toolkit + - downloader + - dozenal + - dozens + - dph-base + - dpkg + - DPM + - dpor + - dragen + - drawille + - drClickOn + - dresdner-verkehrsbetriebe + - DrIFT + - DrIFT-cabalized + - drifter-postgresql + - drmaa + - drone + - DSA + - dsc + - ds-kanren + - dsmc + - dson + - dson-parsec + - dstring + - DTC + - dtd-text + - dtw + - dualizer + - duet + - dump-core + - dunai-core + - Dung + - duplo + - dura + - Dust-crypto + - dvault + - dvdread + - dvi-processing + - dwarf + - dwarfadt + - dyckword + - dyepack + - dynamic-graphs + - dynamic-mvector + - dynamic-object + - dynamic-pp + - DynamicTimeWarp + - dynamodb-simple + - dynloader + - DysFRP + - dywapitchtrack + - dzen-dhall + - dzen-utils + - each + - earclipper + - early + - easy-api + - easy-bitcoin + - easyjson + - easyplot + - easytest + - ebeats + - ebnf-bff + - eccrypto + - ecma262 + - ecu + - eddie + - ede + - edenmodules + - edis + - edit + - edit-lenses + - editline + - effect-handlers + - effect-monad + - effect-stack + - effin + - egison-pattern-src + - ehaskell + - ehs + - eibd-client-simple + - eigen + - Eight-Ball-Pool-Hack-Cheats + - eio + - EitherT + - either-unwrap + - ejdb2-binding + - ekg-bosun + - ekg-carbon + - ekg-elastic + - ekg-elasticsearch + - ekg-log + - ekg-push + - ekg-rrd + - ekg-wai + - elevator + - elision + - elm-street + - elm-websocket + - emacs-module + - emailaddress + - email-header + - email-postmark + - embla + - emgm + - Emping + - Empty + - empty-monad + - enchant + - encoding + - encoding-io + - encryptable + - engine-io-snap + - engine-io-wai + - engine-io-yesod + - entwine + - EnumContainers + - enumerator + - enumfun + - EnumMap + - enummapmap + - enum-utf8 + - env-parser + - envstatus + - epanet-haskell + - epass + - epic + - epoll + - eprocess + - epubname + - Eq + - EqualitySolver + - equational-reasoning-induction + - equeue + - erlang + - erlang-ffi + - eros + - errata + - error-context + - error-continuations + - error-list + - error-loc + - error-util + - ersaconcat + - ersatz + - ert + - escape-artist + - escoger + - espial + - ess + - estimators + - EstProgress + - Etage + - eternal + - ethereum-rlp + - euphoria + - eurofxref + - evdev + - eve-cli + - event + - event-driven + - eventful-dynamodb + - eventful-sql-common + - eventlog2html + - eventloop + - eventstore + - ewe + - exact-cover + - exact-real-positional + - except-exceptions + - exceptional + - exceptionfree-readfile + - exchangerates + - execs + - executor + - exh + - exherbo-cabal + - exif + - exigo-schema + - exinst-deepseq + - exinst-hashable + - exists + - exitcode + - exp-extended + - explain + - explicit-constraint-lens + - explicit-determinant + - explicit-iomodes + - exposed-containers + - expression-parser + - expressions + - expresso + - extcore + - extended-categories + - extensible-effects-concurrent + - extensible-skeleton + - external-sort + - Extra + - extractelf + - extralife + - ez3 + - ez-couch + - Facebook-Password-Hacker-Online-Latest-Version + - faceted + - facts + - failable-list + - failure-detector + - fake-type + - faktory + - f-algebra-gen + - fastbayes + - fast-combinatorics + - fastedit + - fastly + - fast-nats + - fastpbkdf2 + - FastPush + - FastxPipe + - fathead-util + - fay-builder + - fay-hsx + - fay-simplejson + - fbmessenger-api + - fb-persistent + - fca + - fcache + - fcg + - fckeditor + - fclabels-monadlib + - fcm-client + - fdo-trash + - feature-flipper + - fedora-packages + - feed-cli + - feed-collect + - feed-crawl + - fenfire + - fernet + - FerryCore + - Feval + - fez-conf + - ffeed + - fficxx + - ffunctor + - fgl-extras-decompositions + - fibon + - fieldwise + - fig + - file-collection + - file-command-qq + - filediff + - file-embed-poly + - file-location + - FileManip + - FileManipCompat + - fileneglect + - Files + - FileSystem + - filesystem-abstractions + - filesystem-conduit + - filesystem-trees + - fillit + - final-pretty-printer + - Finance-Quote-Yahoo + - find-conduit + - find-source-files + - fingertree-psqueue + - fingertree-tf + - finitary-derive + - firefly-example + - first-and-last + - first-class-instances + - fit + - fitsio + - fits-parse + - fixed-point + - fixed-precision + - fixed-storable-array + - fixed-timestep + - fixed-vector-binary + - fixed-vector-cborg + - fixed-vector-cereal + - fixed-width + - fixer + - fixfile + - fixie + - fix-symbols-gitit + - fizzbuzz + - fizzbuzz-as-a-service + - flac + - flaccuraterip + - flamethrower + - flamingra + - flat-maybe + - flay + - flexible-time + - flickr + - flight-kml + - flink-statefulfun + - float-binstring + - floating-bits + - flowdock + - flowdock-rest + - flow-er + - flowlocks-framework + - flp + - fltkhs + - fluffy-parser + - fluidsynth + - flux-monoid + - fmark + - FModExRaw + - fn-extra + - foldl-incremental + - foldl-statistics + - foldl-transduce + - folds-common + - follow + - font-opengl-basic4x6 + - forbidden-fruit + - fordo + - forecast-io + - foreign-var + - forest + - forest-fire + - forex2ledger + - for-free + - forger + - ForkableT + - formatn + - formattable + - formura + - ForSyDe + - forsyde-deep + - Fortnite-Hack-Cheats-Free-V-Bucks-Generator + - fortran-src + - fortytwo + - foscam-filename + - fpco-api + - FPretty + - fptest + - Fractaler + - fractals + - fraction + - frag + - Frames-map-reduce + - franchise + - fraxl + - freddy + - free-concurrent + - free-game + - f-ree-hack-cheats-free-v-bucks-generator + - free-http + - free-operational + - freer-effects + - freer-simple-catching + - freer-simple-http + - freer-simple-profiling + - freer-simple-random + - freer-simple-time + - freesect + - freesound + - free-theorems + - FreeTypeGL + - freetype-simple + - free-v-bucks-generator-no-survey + - free-v-bucks-generator-ps4-no-survey + - freq + - fresh + - friday-devil + - friday-scale-dct + - friendly + - frown + - frp-arduino + - frpnow + - fs-events + - fsh-csv + - fsmActions + - fst + - fsutils + - fswait + - fswatch + - ft-generator + - FTGL-bytestring + - ftp-client + - ftp-conduit + - ftphs + - full-sessions + - funbot-client + - funcons-values + - function-instances-algebra + - functor + - functor-combinators + - functor-friends + - functor-infix + - functorm + - functor-products + - functor-utils + - funflow + - Fungi + - funpat + - funspection + - fused-effects-exceptions + - fused-effects-resumable + - fusion + - futun + - future + - fuzzy-timings + - fwgl + - g4ip + - galois-field + - gameclock + - game-probability + - gamgee + - gamma + - Ganymede + - garepinoh + - gargoyle-postgresql-nix + - gas + - gather + - gc-monitoring-wai + - gconf + - gdiff-th + - gegl + - gelatin + - gemstone + - gencheck + - gender + - genders + - general-prelude + - GeneralTicTacToe + - generator + - generators + - generic-accessors + - generic-binary + - generic-church + - generic-enum + - generic-enumeration + - generic-labels + - generic-lens-labels + - generic-lucid-scaffold + - generic-maybe + - generic-override-aeson + - generic-pretty + - genericserialize + - generic-server + - generics-mrsop + - generic-storable + - generic-tree + - generic-trie + - generic-xml + - generic-xmlpickler + - genetics + - gen-imports + - geniplate + - gen-passwd + - genprog + - gentlemark + - genvalidity-persistent + - GeocoderOpenCage + - geodetic-types + - geojson-types + - geom2d + - GeomPredicates-SSE + - geo-resolver + - geos + - Get + - getflag + - GGg + - ggtsTC + - ghc-clippy-plugin + - ghc-core-smallstep + - ghc-datasize + - ghc-dump-tree + - ghc-dup + - ghc-events-analyze + - ghc-events-parallel + - ghc-generic-instances + - ghci-diagrams + - ghci-haskeline + - ghci-history-parser + - ghci-lib + - ghci-ng + - ghcjs-dom-jsffi + - ghcjs-fetch + - ghcjs-promise + - ghcjs-xhr + - ghc-justdoit + - ghclive + - ghc-man-completion + - ghc-parmake + - ghc-pkg-autofix + - ghc-pkg-lib + - ghc-plugs-out + - ghcprofview + - ghc-proofs + - ghc-session + - ghc-simple + - ghc-srcspan-plugin + - ghc-syb + - ghc-syb-utils + - ghc-tags-core + - ghc-time-alloc-prof + - ghc-usage + - gh-labeler + - giak + - Gifcurry + - gi-graphene + - gi-gsttag + - gi-gtkosxapplication + - gi-gtksheet + - gi-handy + - ginsu + - gipeda + - giphy-api + - gist + - GiST + - git + - git-all + - git-checklist + - git-config + - git-cuk + - git-date + - gitdo + - github-backup + - github-data + - github-tools + - github-utils + - github-webhook-handler + - githud + - gitignore + - git-jump + - gitlab-api + - gitlib-cmdline + - gitlib-utils + - git-repair + - git-sanity + - gitson + - gitter + - git-vogue + - gi-vips + - gi-wnck + - glade + - glapp + - Gleam + - GLFW + - GLFW-b-demo + - gli + - glider-nlp + - GLMatrix + - global-variables + - glob-posix + - GlomeTrace + - gloss-export + - gloss-game + - glpk-headers + - gltf-codec + - glue + - g-npm + - goa + - goal-core + - gochan + - godot-haskell + - gofer-prelude + - gooey + - google-cloud + - GoogleCodeJam + - google-html5-slide + - google-oauth2 + - google-oauth2-easy + - googlepolyline + - google-search + - google-translate + - gopherbot + - gopro-plus + - gore-and-ash + - GotoT-transformers + - gpah + - GPipe + - GPipe-Core + - gpx-conduit + - grab + - graceful + - grafana + - Grafos + - grakn + - grapefruit-frp + - Graph500 + - Graphalyze + - graphbuilder + - graphene + - graphics-drawingcombinators + - graphics-formats-collada + - graph-matchings + - graphmod-plugin + - graphql-api + - graphql-utils + - graphql-w-persistent + - graph-rewriting + - graph-serialize + - graphted + - graphula-core + - graph-utils + - graql + - grasp + - gray-code + - greencard + - greenclip + - greg-client + - gremlin-haskell + - Grempa + - grenade + - grm + - groot + - gross + - GroteTrap + - groundhog-converters + - groundhog-mysql + - grouped-list + - group-theory + - group-with + - growler + - grpc-api-etcd + - gsl-random + - gstreamer + - GTALib + - gtfs-realtime + - gtk2hs-hello + - gtk2hs-rpn + - gtk3-mac-integration + - gtkglext + - gtksourceview2 + - gtksourceview3 + - gtk-toy + - gulcii + - gw + - gyah-bin + - gym-http-api + - h2048 + - h2c + - haar + - HABQT + - hack2-handler-warp + - hackage2hwn + - hackage-api + - hackage-diff + - hackage-mirror + - hackage-processing + - hackage-proxy + - hackager + - hackage-repo-tool + - hackage-whatsnew + - hackernews + - hack-frontend-happstack + - hack-handler-cgi + - hack-handler-happstack + - hack-handler-kibro + - HackMail + - hackport + - hactor + - hactors + - haddock-api + - haddock-cheatsheet + - haddock-leksah + - haddock-test + - hadoop-formats + - hadoop-rpc + - hafar + - Haggressive + - hahp + - haiji + - hailgun-send + - hairy + - hakaru + - hakismet + - hakka + - hako + - hakyll + - hakyll-shortcode + - HaLeX + - halfs + - halipeto + - halive + - halma + - halves + - hampp + - hamsql + - hamtmap + - hanabi-dealer + - handa-gdata + - handle-like + - HandlerSocketClient + - handsy + - Hangman + - hannahci + - hans + - hanspell + - haphviz + - happindicator + - happindicator3 + - happlets + - happraise + - happstack + - happstack-fay-ajax + - happstack-foundation + - happstack-hamlet + - happstack-heist + - happstack-hstringtemplate + - happstack-lite + - happstack-monad-peel + - happstack-server-tls-cryptonite + - happstack-util + - HAppS-Util + - happybara + - happybara-webkit-server + - happy-hour + - HappyTree + - hapstone + - HaPy + - haquery + - harchive + - haroonga + - harpy + - harvest-api + - has + - hasbolt-extras + - HasCacBDD + - hascard + - hascas + - Haschoo + - hash + - hashable-extras + - hashable-generics + - hashable-orphans + - hashabler + - hashed-storage + - hashring + - hashtables-plus + - hasim + - hask + - haskbot-core + - haskeline-class + - haskelisp + - haskell2010 + - haskell2020 + - haskell98 + - haskell98libraries + - HaskellAnalysisProgram + - haskell-awk + - haskell-bitmex-rest + - haskell-brainfuck + - haskell-ci + - haskell-cnc + - haskell-coffee + - haskell-compression + - haskell-conll + - haskell-course-preludes + - haskelldb + - haskelldb-wx + - haskell-disque + - haskell-formatter + - haskell-generate + - haskell-go-checkers + - haskell-holes-th + - haskell-igraph + - haskell-in-space + - haskell-kubernetes + - HaskellLM + - haskell-lsp-client + - haskell-ml + - haskell-mpfr + - haskell-mpi + - haskell-names + - haskell-neo4j-client + - HaskellNet-SSL + - HaskellNN + - Haskelloids + - haskell-openflow + - haskell-overridez + - haskell-packages + - haskell-player + - haskell-plot + - haskell-postal + - haskell-read-editor + - haskell-rules + - haskellscrabble + - haskellscript + - haskell-spacegoo + - haskell-src-exts-prisms + - haskell-src-exts-qq + - haskell-src-exts-sc + - haskell-src-match + - haskell-src-meta-mwotton + - haskell-stack-trace-plugin + - HaskellTorrent + - HaskellTutorials + - haskell-type-exts + - haskell-typescript + - haskell-tyrant + - haskelzinc + - haskeme + - haskey + - haskheap + - haskhol-core + - haskmon + - haskoin + - haskoin-util + - haskore + - hasktorch-codegen + - hasktorch-ffi-th + - hasktorch-signatures-partial + - hasktorch-signatures-support + - haskus-binary + - haskyapi + - hasmin + - hasql-backend + - hasql-class + - hasql-cursor-transaction + - hasql-dynamic-statements + - hasql-generic + - hasql-simple + - hastache + - haste + - haste-prim + - hatex-guide + - hats + - hatt + - haven + - haverer + - hax + - haxl-amazonka + - haxl-facebook + - haxparse + - haxr-th + - hayland + - hayoo-cli + - hBDD-CMUBDD + - hBDD-CUDD + - hbeanstalk + - hbeat + - hblas + - hblock + - h-booru + - hburg + - hcad + - HCard + - hcc + - hcg-minus + - hchesslib + - hcltest + - hcoap + - hcom + - hcount + - hcron + - hCsound + - hcube + - hdaemonize-buildfix + - hdbc-aeson + - HDBC-mysql + - hdbc-postgresql-hstore + - HDBC-postgresql-hstore + - hdevtools + - hDFA + - hdigest + - hdis86 + - hdiscount + - hdm + - hdo + - hdph-closure + - hdr-histogram + - HDRUtils + - headergen + - heap-console + - heapsort + - heart-core + - hebrew-time + - heckle + - hedgehog-checkers + - hedgehog-generic + - hedgehog-golden + - hedgehog-servant + - hedis-config + - hedis-namespace + - hedis-simple + - hedis-tags + - hedra + - hein + - heist-async + - helisp + - helix + - hell + - help-esb + - hemkay + - HERA + - herbalizer + - HerbiePlugin + - heredocs + - her-lexer + - Hermes + - herms + - hetero-dict + - heterogeneous-list-literals + - hetris + - heukarya + - hevm + - HExcel + - hexchat + - hexif + - hexmino + - hexml-lens + - hexpat-pickle-generic + - hexpr + - hexpress + - hexquote + - hexstring + - hext + - heyefi + - hF2 + - hfann + - HFitUI + - hfmt + - hfoil + - hfov + - hfractal + - HFrequencyQueue + - hfusion + - hg-buildpackage + - hgdbmi + - HGE2D + - hgearman + - hGelf + - hgeometric + - hgeometry-ipe + - hgettext + - hgis + - hgom + - hgopher + - h-gpgme + - HGraphStorage + - hgrep + - hgrib + - hharp + - HHDL + - hhwloc + - hi + - hi3status + - hichi + - hidden-char + - hid-examples + - hie-core + - hieraclus + - hierarchical-env + - hierarchical-exceptions + - hierarchy + - hiernotify + - higgledy + - higherorder + - highjson + - highlight-versions + - highWaterMark + - himg + - hindley-milner + - hinquire + - hinstaller + - hinter + - hinterface + - hipchat-hs + - hipe + - Hipmunk + - hipsql-api + - hircules + - Hish + - hissmetrics + - historian + - hist-pl-types + - hit-on + - HJavaScript + - hjcase + - hjs + - hjsonpointer + - hjson-query + - HJVM + - hkd-delta + - hkd-lens + - hkt + - hlbfgsb + - hledger-chart + - hledger-irr + - hledger-vty + - hlibBladeRF + - hlibev + - hlibfam + - HList + - hlivy + - hlogger + - HLogger + - hlongurl + - hls-exactprint-utils + - hlwm + - hmarkup + - hmatrix-banded + - hmatrix-mmap + - hmatrix-nipals + - hmatrix-sparse + - hmatrix-static + - hmatrix-svdlibc + - hmatrix-syntax + - hmatrix-tests + - hmenu + - hmk + - hmm + - HMM + - hmm-hmatrix + - hMollom + - hmp3 + - Hmpf + - hmumps + - hnetcdf + - hoauth + - hobbes + - hocilib + - hocker + - hodatime + - HODE + - hoe + - hog + - hogg + - hois + - hol + - hold-em + - hole + - holmes + - homeomorphic + - homoiconic + - homplexity + - honi + - hoobuddy + - hood2 + - hoodle-types + - hood-off + - hoogle-index + - hooks-dir + - hoop + - hoopl + - hopencc + - hopencl + - HOpenCV + - hopfield + - hops + - ho-rewriting + - horizon + - horname + - hosc-json + - hosts-server + - hothasktags + - hotswap + - hourglass-fuzzy-parsing + - houseman + - hp2any-core + - hpack-convert + - hpapi + - hpasteit + - HPath + - hpc-coveralls + - hpg + - HPi + - hpio + - hplaylist + - hpodder + - hpqtypes + - hprotoc + - hps-kmeans + - hPushover + - hpygments + - hpylos + - hpyrg + - hquantlib-time + - hR + - hreq-core + - h-reversi + - hricket + - Hricket + - hs2bf + - hs2ps + - hsaml2 + - hsay + - hsbc + - hsbencher + - hsc3 + - hsc3-rw + - hsc3-sf + - hscaffold + - hscamwire + - hs-carbon-examples + - hscd + - hs-cdb + - hsclock + - hScraper + - hscuid + - hs-di + - hsdif + - hsdip + - hsdns-cache + - hs-dotnet + - hsenv + - HSet + - hs-excelx + - hsfcsh + - HSFFIG + - hsfilt + - hs-fltk + - hsforce + - hs-gizapp + - hsgnutls + - hsgnutls-yj + - hsgsom + - HsHaruPDF + - HsHTSLib + - HsHyperEstraier + - hsI2C + - hSimpleDB + - hsimport + - hsinspect-lsp + - hs-java + - hs-json-rpc + - HsJudy + - hskeleton + - hslackbuilder + - hslibsvm + - hslinks + - hslogger-reader + - hslogger-template + - hs-logo + - hsluv-haskell + - hsmagick + - hsmodetweaks + - Hsmtlib + - hsmtpclient + - hs-nombre-generator + - hsns + - hsnsq + - hsntp + - hsoptions + - hsoz + - hsparql + - hs-pattrans + - hsp-cgi + - hspear + - hspec2 + - hspec-expectations-match + - hspec-experimental + - hspec-jenkins + - hspec-monad-control + - hspec-snap + - hspec-structured-formatter + - hspec-webdriver + - HsPerl5 + - hs-pgms + - hspkcs11 + - hs-pkg-config + - hspread + - hspresent + - hsql + - hs-re + - hsrelp + - hs-rqlite + - hs-rs-notify + - hs-scrape + - hsseccomp + - hs-snowtify + - hs-speedscope + - hsSqlite3 + - hssqlppp + - HsSVN + - hs-tags + - hstats + - hstatsd + - hstest + - hstidy + - hs-twitter + - hs-twitterarchiver + - hstyle + - hsudoku + - hs-vcard + - hs-watchman + - hsx + - hsXenCtrl + - hsyscall + - hsyslog-tcp + - hszephyr + - hTalos + - htar + - htdp-image + - hTensor + - htestu + - HTicTacToe + - htiled + - htlset + - html-charset + - html-kure + - html-rules + - html-tokenizer + - htsn + - htsn-import + - htssets + - http2-client + - http2-grpc-proto-lens + - http-attoparsec + - http-client-lens + - http-client-request-modifiers + - http-client-session + - http-client-streams + - http-client-websockets + - http-conduit-browser + - http-conduit-downloader + - http-directory + - http-dispatch + - http-grammar + - http-kinder + - http-listen + - http-monad + - http-pony + - http-pony-serve-wai + - http-proxy + - http-querystring + - http-response-decoder + - http-server + - http-shed + - http-wget + - htune + - htvm + - htzaar + - huck + - HueAPI + - huff + - huffman + - HulkImport + - human-parse + - human-text + - humble-prelude + - hums + - hunch + - HUnit-Diff + - hunit-rematch + - hunspell-hs + - hup + - hurriyet + - hutton + - huttons-razor + - hVOIDP + - hwall-auth-iitk + - hw-ci-assist + - hweblib + - hwhile + - hw-json-simd + - hworker + - hw-simd + - hwsl2 + - hx + - HXQ + - hxt-cache + - hxt-pickle-utils + - hyakko + - hydra-hs + - hydra-print + - hydrogen + - hydrogen-multimap + - hylide + - hylolib + - hyperdrive + - hyperfunctions + - hyperion + - hyperloglogplus + - hypher + - hzulip + - i18n + - I1M + - i3ipc + - iap-verifier + - iban + - ib-api + - ical + - icepeak + - IcoGrid + - iconv-typed + - ideas + - idempotent + - identifiers + - idiii + - idna2008 + - IDynamic + - ieee-utils + - iexcloud + - ifcxt + - IFS + - ig + - ige + - ignore + - igraph + - ihaskell-parsec + - ihaskell-widgets + - illuminate + - imagepaste + - imapget + - imgur + - imj-prelude + - immortal-worker + - imperative-edsl + - ImperativeHaskell + - impl + - implicit-logging + - implicit-params + - imports + - impossible + - imprint + - inchworm + - indentation-core + - index-core + - indextype + - indices + - infer-upstream + - infinity + - inf-interval + - infix + - inflist + - informative + - inilist + - ini-qq + - initialize + - inject-function + - inserts + - instana-haskell-trace-sdk + - instance-map + - instant-generics + - instinct + - intcode + - integer-pure + - integreat + - intel-aes + - intensional-datatys + - interlude-l + - internetmarke + - intero + - interpol + - interpolatedstring-qq2 + - interruptible + - interval + - IntFormats + - int-multimap + - intricacy + - introduction + - intro-prelude + - invert + - invertible-syntax + - io-capture + - io-choice + - ioctl + - IOR + - io-reactive + - iostring + - iothread + - iotransaction + - ip2location + - ip2proxy + - ipfs + - ipopt-hs + - ip-quoter + - iptables-helpers + - IPv6DB + - Irc + - irc-dcc + - irc-fun-types + - iridium + - iron-mq + - irt + - isdicom + - IsNull + - iso8601-duration + - isobmff + - isotope + - itcli + - itemfield + - iteratee + - iterIO + - it-has + - ivory + - ixdopp + - ixmonad + - ixshader + - j + - jack-bindings + - jackminimix + - JackMiniMix + - jacobi-roots + - jaeger-flamegraph + - jalla + - jarfind + - jarify + - jason + - java-bridge + - javascript-bridge + - javav + - Javav + - jbi + - jcdecaux-vls + - Jdh + - jdi + - jenga + - jenkinsPlugins2nix + - jespresso + - jinquantities + - jml-web-service + - jni + - jobqueue + - join-api + - joinlist + - jonathanscard + - jpeg + - jsaddle-hello + - jsaddle-wkwebview + - js-good-parts + - json2 + - json-alt + - json-assertions + - json-ast-quickcheck + - json-builder + - json-encoder + - jsonextfilter + - json-extra + - json-fu + - json-litobj + - jsonnet + - json-pointer-hasql + - json-pointy + - json-python + - jsonresume + - json-rpc-client + - json-schema + - jsonschema-gen + - jsonsql + - json-tools + - json-tracer + - jsontsv + - jsonxlsx + - judge + - judy + - JuicyPixels-blp + - JuicyPixels-canvas + - JunkDB + - jupyter + - JustParse + - jvm-binary + - jvm-parser + - JYU-Utils + - kademlia + - kafka-client + - kafka-client-sync + - kalman + - Kalman + - kangaroo + - karps + - katip-kafka + - katip-raven + - katip-scalyr-scribe + - katip-syslog + - katt + - katydid + - kawhi + - kdesrc-build-extra + - kd-tree + - keccak + - keera-hails-reactivevalues + - kempe + - kerry + - Ketchup + - keter + - keyed + - keyring + - khph + - kickass-torrents-dump-parser + - kickchan + - kmonad + - kmp-dfa + - koellner-phonetic + - kontra-config + - kparams + - kqueue + - kraken + - krapsh + - Kriens + - krpc + - KSP + - ktx + - ktx-codec + - kuifje + - kure-your-boilerplate + - KyotoCabinet + - labeled-graph + - lagrangian + - lambda2js + - lambdaBase + - lambdabot-utils + - lambda-bridge + - lambda-canvas + - lambdacms-core + - lambdacube-ir + - Lambdajudge + - LambdaNet + - lambdatex + - lambda-toolbox + - lambdatwit + - Lambdaya + - lame + - lame-tester + - language-asn + - language-c-comments + - language-c-inline + - language-conf + - language-csharp + - language-dart + - language-dockerfile + - language-elm + - language-gcl + - language-go + - language-guess + - language-hcl + - language-java-classfile + - language-lua2 + - language-lua-qq + - language-mixal + - language-objc + - language-ocaml + - language-openscad + - language-pig + - language-puppet + - language-rust + - language-sh + - language-sqlite + - language-sygus + - language-tl + - language-typescript + - language-vhdl + - language-webidl + - lapack-ffi + - Lastik + - latest-npm-version + - latex-formulae-image + - latex-svg-image + - LATS + - launchpad-control + - lawless-concurrent-machines + - layers + - layout + - layout-bootstrap + - lazyarray + - lazyboy + - lazy-priority-queue + - lazyset + - LazyVault + - l-bfgs-b + - lda + - ldif + - ld-intervals + - leaf + - leapseconds + - learn + - Learning + - learn-physics-examples + - leb128 + - leetify + - lendingclub + - lens-filesystem + - lens-labels + - lens-prelude + - lens-process + - lensref + - lens-simple + - lens-text-encoding + - lens-th-rewrite + - lens-time + - lens-toml-parser + - lens-tutorial + - lens-typelevel + - Level0 + - level-monad + - lfst + - lhc + - lhs2TeX-hl + - lhslatex + - LibClang + - libexpect + - libfuse3 + - libGenI + - libhbb + - libinfluxdb + - libjenkins + - libjwt-typed + - libltdl + - libnix + - liboath-hs + - liboleg + - libpafe + - libpq + - librandomorg + - libssh2 + - libsystemd-daemon + - libtagc + - libxls + - libxslt + - lie + - life-sync + - lifted-protolude + - lifter + - ligature + - lilypond + - Limit + - limp-cbc + - linda + - linden + - linear-algebra-cblas + - linear-base + - linear-code + - linear-maps + - linear-opengl + - linearscan + - linear-vect + - line-drawing + - lines-of-action + - linkedhashmap + - linked-list-with-iterator + - linklater + - linode + - linode-v4 + - linux-blkid + - linux-cgroup + - linux-kmod + - linux-perf + - linx-gateway + - lio-simple + - lipsum-gen + - liquid + - liquidhaskell + - liquidhaskell-cabal + - Liquorice + - list-fusion-probe + - listlike-instances + - list-mux + - list-prompt + - list-remote-forwards + - ListT + - list-t-http-client + - list-t-text + - list-zip-def + - list-zipper + - liszt + - lit + - literals + - LiterateMarkdown + - ll-picosat + - llsd + - llvm-base + - llvm-ffi + - llvm-ffi-tools + - llvm-general-pure + - llvm-ht + - llvm-pkg-config + - llvm-pretty + - lmonad + - load-balancing + - load-font + - local-address + - located + - located-monad-logger + - loch + - log2json + - log4hs + - logentries + - logger + - logging-effect-extra-file + - logging-effect-extra-handler + - Logic + - logicst + - logict-state + - logplex-parse + - log-warper + - lojbanParser + - lojbanXiragan + - lol + - lol-calculus + - longboi + - lookup-tables + - loopbreaker + - looper + - loops + - loop-while + - loopy + - lord + - lorem + - loris + - loshadka + - lowgl + - lp-diagrams-svg + - LRU + - lscabal + - L-seed + - lsfrom + - ltext + - ltk + - LTS + - lua-bc + - luautils + - luis-client + - luka + - luminance + - lushtags + - luthor + - lvmlib + - lxc + - lxd-client + - lye + - lz4-frame-conduit + - lzip + - lzma-streams + - lzo + - maam + - mac + - macaroon-shop + - machinecell + - machines-bytestring + - machines-directory + - machines-encoding + - machines-zlib + - macho + - maclight + - macos-corelibs + - macrm + - madlang + - mage + - MagicHaskeller + - magic-tyfams + - magma + - mailchimp + - MailchimpSimple + - mailchimp-subscribe + - makedo + - makefile + - make-hard-links + - make-monofoldable-foldable + - make-package + - mallard + - mandrill + - mandulia + - mangopay + - Map + - mapalgebra + - map-exts + - Mapping + - mappy + - markdown-kate + - marked-pretty + - mars + - marvin-interpolate + - MASMGen + - massiv-persist + - massiv-serialise + - mathflow + - math-grads + - math-interpolate + - math-metric + - math-programming + - matrix-as-xyz + - matrix-market + - matrix-sized + - maude + - maxent-learner-hw + - maybench + - MaybeT + - MaybeT-monads-tf + - MazesOfMonad + - MBot + - mbox-tools + - mbug + - mcl + - mcm + - mcmaster-gloss-examples + - mcmc-synthesis + - mcpi + - mdapi + - mdcat + - mdp + - mealstrom + - MeanShift + - Measure + - mecab + - mech + - Mecha + - mechs + - Mechs + - mediabus + - mediawiki + - medium-sdk-haskell + - megalisp + - mega-sdist + - mellon-core + - melody + - memcached-binary + - memcache-haskell + - memis + - memoization-utils + - memo-ptr + - memorypool + - menoh + - menshen + - merkle-tree + - messagepack-rpc + - messente + - metadata + - MetaHDBC + - metaheuristics + - meta-misc + - meta-par + - metric + - metricsd-client + - mezzo + - mezzolens + - mgeneric + - MHask + - mi + - miconix-test + - microbase + - microgroove + - microlens-each + - micrologger + - micro-recursion-schemes + - microsoft-translator + - mida + - midi-music-box + - midisurface + - midi-utils + - migrant-hdbc + - migrant-postgresql-simple + - mikmod + - mikrokosmos + - miku + - milena + - mime-directory + - minilens + - minilight + - minions + - miniplex + - minirotate + - ministg + - minizinc-process + - minst-idx + - mios + - MIP + - mirror-tweet + - miso-action-logger + - miso-examples + - mit-3qvpPyAi6mH + - mix-arrows + - mixpanel-client + - ml-w + - mm2 + - mmark + - mmtf + - mmtl + - Mobile-Legends-Hack-Cheats + - modelicaparser + - modular-prelude + - module-management + - modulespection + - moe + - Moe + - MoeDict + - moesocks + - mohws + - mollie-api-haskell + - monadacme + - monad-atom + - monad-atom-simple + - monad-bayes + - monad-branch + - MonadCatchIO-transformers + - MonadCompose + - monad-fork + - monad-http + - monadiccp + - monadic-recursion-schemes + - monad-interleave + - Monadius + - monad-levels + - monad-lgbt + - monadLib-compose + - monadloc-pp + - monad-log + - monadlog + - monad-lrs + - monad-mersenne-random + - monad-mock + - monad-open + - Monadoro + - monad-parallel-progressbar + - monad-param + - monad-persist + - monadplus + - monad-ran + - monad-recorder + - monads-fd + - MonadStack + - monad-statevar + - monad-ste + - monad-stlike-io + - monad-task + - monad-timing + - monad-tx + - monad-unify + - monad-wrap + - Monatron + - mondo + - money + - mongodb-queue + - monitor + - mono-foldable + - monoid + - monoid-absorbing + - monoid-owns + - monoidplus + - monoids + - monopati + - months + - monus + - monzo + - morfette + - morfeusz + - morpheus-graphql-cli + - morphisms-functors + - morphisms-objects + - morte + - moto-postgresql + - motor-reflection + - mount + - movie-monad + - mpppc + - mpris + - mpvguihs + - mqtt + - mqtt-hs + - mrifk + - mrm + - ms + - msgpack + - msgpack-binary + - msh + - msi-kb-backlit + - MTGBuilder + - mtl-c + - mtl-evil-instances + - mtl-extras + - mtl-tf + - mtlx + - mtp + - MuCheck + - mud + - muesli + - mulang + - multext-east-msd + - multiaddr + - multiarg + - multi-except + - multihash + - multi-instance + - multilinear + - multipass + - multipath + - multiplate-simplified + - multipool-persistent-postgresql + - multirec + - multivariant + - Munkres-simple + - muon + - murmur + - murmur3 + - mushu + - musicScroll + - music-util + - musicxml + - mustache-haskell + - mvar-lock + - mvc + - mxnet + - mxnet-nnvm + - myanimelist-export + - myo + - my-package-testing + - MyPrimes + - mysnapsession + - mysql-effect + - mysql-simple-quasi + - mystem + - my-test-docs + - myxine-client + - mzv + - n2o-protocols + - nagios-plugin-ekg + - named-lock + - named-servant-server + - named-sop + - namelist + - nanocurses + - nano-hmac + - nano-md5 + - nanomsg + - nanomsg-haskell + - nanoparsec + - NanoProlog + - nanovg + - nanq + - naperian + - naqsha + - narc + - nationstates + - nats-client + - nat-sized-numbers + - natural + - NaturalLanguageAlphabets + - NaturalSort + - naver-translate + - nbt + - neat + - needle + - neet + - nehe-tuts + - neither + - neko-lib + - Neks + - neptune-backend + - nero + - nest + - NestedFunctor + - nestedmap + - nested-sequence + - netclock + - netease-fm + - netrium + - NetSNMP + - netspec + - net-spider + - netwire-input-javascript + - netwire-vinylglfw-examples + - network-address + - network-api-support + - network-attoparsec + - network-bitcoin + - network-builder + - network-bytestring + - network-dns + - networked-game + - network-house + - network-metrics + - network-msg + - network-msgpack-rpc + - network-packet-linux + - network-server + - network-service + - network-simple-sockaddr + - network-simple-wss + - network-socket-options + - network-transport-amqp + - network-transport-inmemory + - network-uri-json + - network-voicetext + - network-wai-router + - neural + - neural-network-blashs + - neural-network-hmatrix + - newhope + - newports + - newsletter + - newt + - newtype-deriving + - newtype-th + - next-ref + - nextstep-plist + - nfc + - NGrams + - niagra + - nibblestring + - nice-html + - nicovideo-translator + - nitro + - nix-delegate + - nix-deploy + - nix-eval + - nix-freeze-tree + - nixfromnpm + - nixpkgs-update + - nix-tools + - nkjp + - nlp-scores + - nm + - NMap + - nntp + - noether + - nofib-analyse + - nofib-analyze + - noise + - nom + - NonEmpty + - nonempty-lift + - non-empty-zipper + - no-role-annots + - notcpp + - not-gloss-examples + - notifications-tray-icon + - NoTrace + - now-haskell + - np-extras + - np-linear + - nptools + - ntp-control + - ntrip-client + - n-tuple + - nullary + - null-canvas + - nullpipe + - numbered-semigroups + - NumberSieves + - NumberTheory + - numerals + - numerals-base + - numeric-qq + - numeric-ranges + - numhask-array + - numhask-free + - numhask-prelude + - numhask-space + - Nutri + - NXTDSL + - nylas + - nyx-game + - oanda-rest-api + - oasis-xrd + - oauth2-jwt-bearer + - oauthenticated + - Object + - ObjectIO + - objective + - oblivious-transfer + - ocaml-export + - Octree + - odbc + - OddWord + - oden-go-packages + - oeis2 + - OGL + - ogmarkup + - oi + - oidc-client + - om-actor + - omaketex + - ombra + - om-doh + - omega + - Omega + - om-elm + - om-fail + - om-http-logging + - omnifmt + - on-a-horse + - onama + - ONC-RPC + - on-demand-ssh-tunnel + - oneormore + - onpartitions + - onu-course + - op + - opaleye-classy + - opaleye-sqlite + - open-adt + - OpenAFP + - openai-hs + - openapi3-code-generator + - openapi-petstore + - openapi-typed + - opench-meteo + - OpenCL + - OpenCLRaw + - OpenCLWrappers + - opencv-raw + - opendatatable + - opengles + - open-haddock + - openid-connect + - open-pandoc + - open-signals + - opensoundcontrol-ht + - openssh-protocol + - opentelemetry-http-client + - opentheory-char + - opentok + - opentype + - OpenVGRaw + - Operads + - operate-do + - operational-extra + - oplang + - opn + - optima + - optimization + - optional + - options-time + - optparse-applicative-simple + - optparse-helper + - orc + - orchestrate + - OrchestrateDB + - ordered + - order-statistics + - ordinal + - Ordinary + - ordrea + - oref + - organize-imports + - org-mode + - orgmode + - origami + - orizentic + - OrPatterns + - osc + - oscpacking + - oset + - Oslo-Vectize + - osm-conduit + - oso2pdf + - osx-ar + - ot + - OTP + - ottparse-pretty + - overloaded + - overloaded-records + - overture + - pack + - package-description-remote + - package-o-tron + - package-vt + - packed + - packed-dawg + - packed-multikey-map + - packedstring + - packer-messagepack + - packman + - packunused + - pacman-memcache + - pads-haskell + - pagarme + - pagure-hook-receiver + - Paillier + - palette + - PandocAgda + - pandoc-citeproc + - pandoc-filter-graphviz + - pandoc-filter-indent + - pandoc-include + - pandoc-lens + - pandoc-markdown-ghci-filter + - pandoc-placetable + - pandoc-pyplot + - pandoc-unlit + - pandoc-utils + - pang-a-lambda + - pangraph + - panpipe + - pansite + - pantry-tmp + - papa-base-export + - papa-include + - papa-prelude + - papa-prelude-core + - papa-prelude-lens + - papa-prelude-semigroupoids + - papa-prelude-semigroups + - papa-semigroupoids-implement + - paphragen + - papillon + - pappy + - paragon + - parallel-tasks + - paranoia + - parco + - parcom-lib + - par-dual + - pareto + - Parry + - parseargs + - parsec2 + - parsec3 + - parsec-free + - parsec-parsers + - parsec-pratt + - parseerror-eq + - parsely + - parser241 + - parser-combinators-tests + - parsergen + - parser-helper + - parsers-megaparsec + - parsimony + - parsnip + - partage + - partial-records + - partly + - passage + - passman + - passman-core + - PasswordGenerator + - passwords + - pasta + - pastis + - pasty + - patat + - patches-vector + - Pathfinder + - pathfindingcore + - PathTree + - patronscraper + - paypal-adaptive-hoops + - paypal-api + - paypal-rest-client + - pb + - pbc4hs + - PBKDF2 + - pb-next + - pcd-loader + - pcf-font + - PCLT + - pcre-light-extra + - pdfname + - pdf-slave-template + - pdfsplit + - pdf-toolbox-viewer + - pdftotext + - pdynload + - PeanoWitnesses + - pecoff + - pedersen-commitment + - pedestrian-dag + - peg + - peggy + - pencil + - penntreebank-megaparsec + - percent-encoder + - perceptron + - peregrin + - perf + - PerfectHash + - perhaps + - periodic + - periodic-common + - permutation + - permutations + - permute + - persist2er + - Persistence + - persistent-cereal + - persistent-database-url + - persistent-discover + - persistent-equivalence + - persistent-migration + - persistent-mongoDB + - persistent-mysql-haskell + - persistent-odbc + - persistent-protobuf + - persistent-ratelimit + - persistent-redis + - persistent-relational-record + - persistent-template-classy + - persistent-zookeeper + - persona + - pesca + - pez + - pgdl + - pg-extras + - pgf2 + - pg-harness + - pg-harness-server + - pg-recorder + - pg-store + - pgstream + - phasechange + - phaser + - phoityne + - phone-numbers + - phone-push + - phonetic-languages-properties + - phonetic-languages-simplified-properties-lists + - phonetic-languages-simplified-properties-lists-double + - phraskell + - Phsu + - phybin + - pia-forward + - pi-calculus + - picedit + - pickle + - picologic + - picoparsec + - pictikz + - pier-core + - piet + - pi-forall + - pig + - pi-hoole + - pinch + - pinchot + - Pipe + - pipes-async + - pipes-bgzf + - pipes-cereal + - pipes-core + - pipes-errors + - pipes-interleave + - pipes-io + - pipes-protolude + - pipes-rt + - pipes-s3 + - pipes-shell + - pipes-sqlite-simple + - pipes-transduce + - pipes-vector + - pipes-zeromq4 + - Piso + - pit + - pivotal-tracker + - pixelated-avatar-generator + - pixel-printer + - pkcs10 + - pkcs7 + - pkggraph + - plailude + - plan-applicative + - planar-graph + - plan-b + - planb-token-introspection + - planet-mitchell-test + - plankton + - plat + - platinum-parsing + - PlayingCards + - plist + - plist-buddy + - plot-gtk + - plot-gtk3 + - plot-gtk-ui + - plot-lab + - plugins-auto + - plugins-multistage + - plumbers + - plur + - plural + - plzwrk + - pngload-fixed + - pocket + - pointedalternative + - pointfree-fancy + - pointful + - pointless-haskell + - pokemon-go-protobuf-types + - poker-eval + - pokitdok + - polar-configfile + - polar-shader + - Pollutocracy + - poly-cont + - poly-control + - polydata-core + - polynomial + - polysemy-zoo + - polytypeable + - pomohoro + - ponder + - pong-server + - pool + - pool-conduit + - pop3-client + - popkey + - poppler + - portager + - porte + - PortFusion + - positron + - posix-acl + - posix-api + - posix-realtime + - posix-waitpid + - postcodes + - postgres-embedded + - postgresql-lo-stream + - postgresql-named + - postgresql-simple-bind + - postgresql-simple-named + - postgresql-simple-sop + - postgresql-simple-url + - postgresql-typed-lifted + - postgres-tmp + - postgrest-ws + - postgres-websockets + - postie + - postmark-streams + - postmaster + - potato-tool + - potoki-core + - powermate + - powerpc + - powerqueue-levelmem + - pprecord + - PPrinter + - pqc + - praglude + - preamble + - precursor + - predicate-class + - predicate-typed + - prednote + - prefork + - pregame + - preliminaries + - Prelude + - prelude-generalize + - prelude-plus + - preprocess-haskell + - preprocessor + - preql + - presburger + - present + - press + - pretty-ghci + - pretty-ncols + - prettyprinter-vty + - prim-array + - primes-type + - prim-instances + - PrimitiveArray-Pretty + - primitive-atomic + - primitive-checked + - primitive-convenience + - primitive-foreign + - primitive-indexed + - primitive-maybe + - primitive-simd + - primitive-stablename + - prim-ref + - pringletons + - printcess + - print-debugger + - prints + - PriorityChansConverger + - priority-queue + - probable + - process-conduit + - processing + - process-leksah + - process-listlike + - processmemory + - procrastinating-variable + - procstat + - prof2pretty + - prof-flamegraph + - profunctor-monad + - progress + - progression + - progressive + - progress-meter + - progress-reporting + - proj4-hs-bindings + - projectile + - prolog-graph + - promise + - pronounce + - proof-combinators + - Proper + - properties + - property-list + - prosidy + - prosper + - proteaaudio + - proteaaudio-sdl + - protocol + - protocol-buffers-fork + - proto-lens-arbitrary + - proto-lens-combinators + - proto-lens-optparse + - protolude-lifted + - proton-haskell + - prototype + - prove-everywhere-server + - provenience + - proxy-kindness + - proxy-mapping + - pseudo-trie + - PTQ + - ptr-poker + - publicsuffixlistcreate + - publish + - pubnub + - pubsub + - pugixml + - pugs-DrIFT + - PUH-Project + - Pup-Events-Server + - pure-io + - pure-priority-queue + - purescript-cst + - pure-zlib + - pusher-haskell + - pusher-ws + - pushme + - push-notifications + - putlenses + - pyffi + - pyfi + - python-pickle + - q4c12-twofinger + - qc-oi-testgenerator + - qd + - qed + - qhull-simple + - qif + - QIO + - QLearn + - qlinear + - qnap-decrypt + - qr-imager + - qsem + - QuadEdge + - QuadTree + - quantfin + - quantification + - quantum-arrow + - quarantimer + - qudb + - quenya-verb + - QuickAnnotate + - quickbooks + - quickcheck-property-comb + - quickcheck-property-monad + - quickcheck-rematch + - quickcheck-report + - QuickCheckVariant + - quickcheck-webdriver + - quickjs-hs + - QuickPlot + - quickpull + - quick-schema + - quickset + - Quickson + - quickspec + - quickwebapp + - quipper-core + - quipper-utils + - quiver + - quokka + - quoridor-hs + - RabbitMQ + - rad + - radian + - radium + - radium-formula-parser + - radix + - rados-haskell + - raft + - rakhana + - rakuten + - raml + - randfile + - rando + - random-access-list + - random-derive + - RandomDotOrg + - random-eff + - random-stream + - rand-vars + - Range + - rangemin + - range-set-list + - rapid + - rapid-term + - rascal + - Rasenschach + - rational-list + - rattle + - rattletrap + - raven-haskell-scotty + - raz + - rbst + - rclient + - react-flux + - react-haskell + - reaction-logic + - reactive-bacon + - reactive-banana + - reactive-thread + - react-tutorial-haskell-server + - readability + - read-bounded + - read-ctags + - read-io + - readline + - readme-lhs + - readshp + - really-simple-xml-parser + - reanimate-svg + - reasonable-lens + - record + - record-encode + - records + - recursors + - red-black-record + - redis-hs + - redis-simple + - redland + - Redmine + - reedsolomon + - reenact + - ref + - Ref + - refcount + - Referees + - references + - refined-http-api-data + - reflection-extras + - reflex-basic-host + - reflex-dom-contrib + - reflex-dom-helper + - reflex-dom-helpers + - reflex-dom-retractable + - reflex-dom-svg + - reflex-dynamic-containers + - reflex-fsnotify + - reflex-gadt-api + - reflex-gi-gtk + - reflex-gloss + - reflex-jsx + - reflex-libtelnet + - reflex-orphans + - reflex-sdl2 + - reflex-transformers + - reflex-vty + - ref-mtl + - reformat + - refractor + - refresht + - reg-alloc + - regex-dfa + - regex-generator + - regex-parsec + - regex-posix-unittest + - regexpr-symbolic + - regexqq + - regex-tdfa-pipes + - regex-tdfa-quasiquoter + - regex-tdfa-rc + - regex-tdfa-text + - regex-tdfa-unittest + - regex-tdfa-utf8 + - regex-tre + - regex-type + - regions + - register-machine-typelevel + - registry + - regress + - regression-simple + - regular + - rehoo + - rei + - reified-records + - reify + - relacion + - relapse + - relational-postgresql8 + - relational-query-postgresql-pure + - relevant-time + - reload + - remark + - remarks + - remote + - remote-debugger + - remote-monad + - reorder-expression + - repa-algorithms + - repa-bytestring + - repa-devil + - repa-eval + - repa-linear-algebra + - repa-scalar + - repa-series + - repl + - RepLib + - replica + - ReplicateEffects + - repo-based-blog + - representable-functors + - reproject + - reqcatcher + - req-conduit + - request-monad + - req-url-extra + - reserve + - reservoir + - resin + - resolve + - resolve-trivial-conflicts + - resource-effect + - resource-embed + - restartable + - restyle + - rethinkdb + - rethinkdb-client-driver + - rethinkdb-wereHamster + - retryer + - reverse-geocoding + - reversi + - ReviewBoard + - rewrite-inspector + - rfc-prelude + - rhbzquery + - ribbit + - ribosome + - RichConditional + - ridley + - riemann + - riff + - ring-buffer + - riscv-isa + - Ritt-Wu + - rivers + - rivet-migration + - rivet-simple-deploy + - RJson + - rlglue + - RLP + - rl-satton + - robin + - robots-txt + - roc-cluster + - roku-api + - rollbar + - rollbar-client + - rollbar-hs + - roller + - ron-rdt + - rope + - rosebud + - rose-trees + - rosmsg + - rosso + - rotating-log + - rounding + - roundtrip-aeson + - rowrecord + - R-pandoc + - rpc-framework + - rpm + - rpmbuild-order + - rrule + - rspp + - rss + - rss2irc + - rstream + - RtMidi + - rtnetlink + - rtorrent-rpc + - rts-loader + - ruby-marshal + - ruby-qq + - ruff + - ruin + - rungekutta + - runhs + - runmany + - rws + - RxHaskell + - SableCC2Hs + - safe-buffer-monad + - safe-coerce + - safecopy-migrate + - safecopy-store + - safe-freeze + - safe-globals + - safeint + - safe-lazy-io + - safe-length + - safepath + - safe-plugins + - safe-printf + - saferoute + - sajson + - salak-toml + - Salsa + - salvia-protocol + - sandlib + - sandman + - sarasvati + - sat + - satchmo + - Saturnin + - savage + - sax + - sbvPlugin + - sc2-proto + - scaleimage + - scalendar + - scanner-attoparsec + - scc + - scenegraph + - scgi + - schedevr + - schedule-planner + - schedyield + - schemas + - scholdoc-types + - SciBaseTypes + - scidb-hquery + - sci-ratio + - scons2dot + - scottish + - scotty-binding-play + - scotty-blaze + - scotty-fay + - scotty-form + - scotty-format + - scotty-params-parser + - scotty-resource + - scotty-rest + - scotty-session + - scotty-tls + - scotty-view + - scrapbook-core + - scrape-changes + - ScratchFs + - script-monad + - scrobble + - scythe + - scyther-proof + - sdl2-cairo-image + - sdl2-compositor + - sdl2-fps + - sdr + - seakale + - sec + - secdh + - seclib + - second-transfer + - secp256k1 + - secp256k1-haskell + - secp256k1-legacy + - secret-santa + - SecureHash-SHA3 + - secure-sockets + - secureUDP + - selectors + - selenium + - selinux + - semantic-source + - Semantique + - semdoc + - semialign-extras + - semibounded-lattices + - Semigroup + - semigroupoids-syntax + - semigroups-actions + - sendgrid-haskell + - sendgrid-v3 + - sensei + - sensu-run + - sentry + - SeqAlign + - sequent-core + - serialize-instances + - serialport + - serokell-util + - servant-aeson-specs + - servant-auth-cookie + - servant-auth-hmac + - servant-auth-token-api + - servant-avro + - servant-client-js + - servant-db + - servant-dhall + - servant-docs-simple + - servant-ekg + - servant-elm + - servant-fiat-content + - servant-generate + - servant-generic + - servant-github + - servant-haxl-client + - servant-hmac-auth + - servant-http-streams + - servant-jquery + - servant-js + - servant-JuicyPixels + - servant-kotlin + - servant-mock + - servant-namedargs + - servant-nix + - servant-pagination + - servant-pandoc + - servant-pool + - servant-proto-lens + - servant-purescript + - servant-pushbullet-client + - servant-py + - servant-quickcheck + - servant-reason + - servant-reflex + - servant-router + - servant-scotty + - servant-seo + - servant-smsc-ru + - servant-static-th + - servant-streaming + - servant-to-elm + - servant-yaml + - servant-zeppelin + - server-generic + - serversession-backend-persistent + - serversession-backend-redis + - serversession-frontend-yesod + - services + - ses-html-snaplet + - SessionLogger + - sessions + - sessiontypes + - Set + - setgame + - set-of + - setoid + - setters + - set-with + - sexp + - sexpr-parser + - sext + - SFML + - sfmt + - sfnt2woff + - SG + - sgd + - SGplus + - sh2md + - shade + - shadower + - shake-bindist + - shakebook + - shake-cabal-build + - shake-dhall + - shake-extras + - shake-minify + - shake-pack + - shake-path + - shake-persist + - shakespeare-babel + - shakespeare-sass + - shared-buffer + - shared-fields + - sha-streams + - she + - Shellac + - shellish + - shellmate + - shell-pipe + - shimmer + - shine-examples + - shivers-cfg + - shoap + - shopify + - shorten-strings + - show-prettyprint + - Shpadoinkle-backend-snabbdom + - Shpadoinkle-streaming + - shwifty + - sifflet + - sifflet-lib + - signed-multiset + - simd + - simple-actors + - simpleargs + - simple-atom + - simple-bluetooth + - simple-conduit + - simple-config + - simpleconfig + - simple-css + - simple-download + - simple-eval + - simple-genetic-algorithm + - simple-index + - simpleirc + - simple-logging + - simple-log-syslog + - simple-money + - simple-neural-networks + - simplenote + - simple-pipe + - simpleprelude + - simple-rope + - simple-server + - simplesmtpclient + - simple-sql-parser + - simple-stacked-vm + - simplest-sqlite + - simple-tabular + - simple-tar + - simple-ui + - simple-units + - simple-vec3 + - simplexmq + - simple-zipper + - singleton-dict + - singletons-th + - singleton-typelits + - singnal + - singular-factory + - sink + - sitepipe + - sixfiguregroup + - sized-grid + - sized-types + - sized-vector + - sizes + - sjsp + - SJW + - skeletal-set + - skell + - skemmtun + - skews + - skulk + - skylighting-lucid + - skype4hs + - slack + - slack-notify-haskell + - slack-verify + - slave-thread + - sliceofpy + - Slides + - slim + - sloane + - sloth + - slot-lambda + - slug + - slugify + - smallarray + - smallcheck-kind-generics + - smallcheck-laws + - smallcheck-lens + - smallpt-hs + - smap + - smartcheck + - smartconstructor + - smartGroup + - sme + - smerdyakov + - smiles + - smsaero + - smt2-parser + - smt-lib + - SmtLib + - smtlib2 + - SMTPClient + - smtp-mail-ng + - smtps-gmail + - smuggler + - smuggler2 + - snake + - snake-game + - snap-accept + - snap-blaze-clay + - snap-configuration-utilities + - snap-error-collector + - snaplet-acid-state + - snaplet-amqp + - snaplet-css-min + - snaplet-customauth + - snaplet-environments + - snaplet-fay + - snaplet-hslogger + - snaplet-influxdb + - snaplet-mongodb-minimalistic + - snaplet-persistent + - snaplet-postgresql-simple + - snaplet-sass + - snaplet-scoped-session + - snaplet-ses-html + - snaplet-sqlite-simple + - snaplet-typed-sessions + - snappy-conduit + - snap-routes + - snap-stream + - snap-testing + - snap-web-routes + - sneakyterm + - SNet + - snipcheck + - snorkels + - snowtify + - socket-activation + - socketed + - socketio + - sockets-and-pipes + - socket-sctp + - socketson + - socket-unix + - sodium + - soegtk + - softfloat-hs + - solga + - sonic-visualiser + - Sonnex + - SoOSiM + - sorted + - sorting + - sorty + - souffle-haskell + - sound-collage + - sousit + - soyuz + - SpaceInvaders + - spacepart + - SpacePrivateers + - spake2 + - spanout + - spars + - sparse + - sparsecheck + - sparse-lin-alg + - special-functors + - special-keys + - speculation + - sphinx + - sphinxesc + - spiros + - spir-v + - splay + - splaytree + - splint + - split-morphism + - splitter + - Spock + - Spock-api-ghcjs + - spoonutil + - spoty + - Sprig + - spritz + - spsa + - spy + - sqlcipher + - sqlite + - sqlite-simple-errors + - sql-simple + - sqlvalue-list + - sqsd-local + - squeal-postgresql + - srcinst + - sscan + - ssh + - ssh-tunnel + - SSTG + - st2 + - stable-heap + - stable-maps + - stable-marriage + - stable-memo + - stack2cabal + - stack2nix + - stackage-cli + - stackage-curator + - stackage-metadata + - stackage-to-hackage + - stackage-types + - stack-bump + - stackcollapse-ghc + - stack-fix + - stack-lib + - stack-prism + - stack-run + - stack-type + - stack-wrapper + - staged-gg + - standalone-derive-topdown + - standalone-haddock + - starling + - stash + - Stasis + - state + - state-bag + - state-plus + - state-record + - static-canvas + - static-tensor + - statistics-dirichlet + - statistics-fusion + - statistics-hypergeometric-genvar + - stats + - statsd + - statvfs + - stb-image-redux + - stc-lang + - stdata + - stdf + - stdio + - steambrowser + - stego-uuid + - stemmer + - stemmer-german + - stepwise + - stern-brocot + - stgi + - STL + - stm-chunked-queues + - stm-firehose + - stm-promise + - stm-stats + - stochastic + - Stomp + - storable + - storable-static-array + - stp + - str + - Strafunski-ATermLib + - Strafunski-StrategyLib + - StrappedTemplates + - stratum-tool + - stratux-types + - stream + - streamdeck + - streamed + - stream-fusion + - streaming-conduit + - streaming-events + - streaming-lzma + - streaming-osm + - streaming-pcap + - streaming-png + - streaming-utils + - streaming-with + - streamly-fsnotify + - stream-monad + - streamproc + - StrictBench + - StrictCheck + - strict-ghc-plugin + - strictly + - strict-tuple-lens + - string-isos + - stringlike + - string-quote + - stringtable-atom + - stripe + - stripe-hs + - stripe-http-streams + - stripe-signature + - strongswan-sql + - structural-traversal + - structures + - stt + - stunclient + - stylish-cabal + - stylized + - subleq-toolchain + - submark + - subsample + - sub-state + - subwordgraph + - suffix-array + - suffixarray + - SuffixStructures + - sugarhaskell + - suitable + - summoner + - sunlight + - sunroof-compiler + - superbubbles + - superevent + - supermonad + - supernova + - supero + - super-user-spark + - supervisor + - supplemented + - surjective + - sv-core + - SVD2HS + - svfactor + - svg-builder-fork + - svgcairo + - svgutils + - svm-light-utils + - svm-simple + - svndump + - swagger-petstore + - swagger-test + - swf + - swift-lda + - swiss-ephemeris + - swisstable + - syb-extras + - SybWidget + - syb-with-class-instances-text + - syfco + - sym + - symantic + - symantic-cli + - symantic-http-test + - symantic-parser + - symantic-xml + - symbolic-link + - symengine + - symengine-hs + - sync + - sync-mht + - syntax-trees + - syntax-trees-fork-bairyn + - synthesizer + - Sysmon + - sys-process + - system-canonicalpath + - system-command + - system-extra + - system-inotify + - system-lifted + - system-linux-proc + - system-locale + - system-random-effect + - t3-server + - table + - tableaux + - table-layout + - tables + - Tables + - tablestorage + - table-tennis + - Tablify + - tabloid + - tabs + - tag-bits + - tagged-exception-core + - tagged-timers + - taglib-api + - tagsoup-ht + - tagsoup-megaparsec + - tagsoup-parsec + - tagsoup-selection + - tai + - tai64 + - takahashi + - Takusen + - takusen-oracle + - tamarin-prover-utils + - Tape + - tapioca + - TaskMonad + - tasty-auto + - tasty-fail-fast + - tasty-grading-system + - tasty-hedgehog-coverage + - tasty-mgolden + - tasty-stats + - tasty-test-vector + - TBC + - TBit + - tcache-AWS + - tcod-haskell + - tcp + - tcp-streams-openssl + - tds + - teams + - teeth + - telegram + - telegram-api + - teleport + - teleshell + - tellbot + - tempi + - template-default + - template-haskell-util + - template-hsml + - templateify + - templatepg + - template-yj + - tempodb + - temporal-csound + - tempus + - tensor + - tensorflow + - tensorflow-opgen + - tensor-safe + - termbox-bindings + - termination-combinators + - termplot + - term-rewriting + - terntup + - terraform-http-backend-pass + - tersmu + - testCom + - testcontainers + - test-fixture + - test-framework-doctest + - test-framework-quickcheck + - test-framework-skip + - test-framework-testing-feat + - test-framework-th-prime + - testloop + - testpack + - testpattern + - test-pkg + - testrunner + - test-sandbox + - test-shouldbe + - tex2txt + - texbuilder + - texrunner + - text1 + - text-all + - text-and-plots + - text-ascii + - text-containers + - text-format-heavy + - text-generic-pretty + - text-icu-normalized + - text-lens + - text-lips + - text-markup + - text-normal + - textocat-api + - text-offset + - text-position + - text-register-machine + - text-replace + - textual + - text-utf8 + - text-xml-qq + - text-zipper-monad + - tfp-th + - tftp + - tga + - thank-you-stars + - th-build + - th-dict-discovery + - thentos-cookie-session + - Theora + - theoremquest + - th-fold + - th-format + - thih + - Thingie + - th-instance-reification + - th-kinds + - th-kinds-fork + - th-lego + - thock + - thorn + - th-pprint + - threadmanager + - threepenny-editors + - threepenny-gui-contextmenu + - threepenny-gui-flexbox + - thrift + - Thrift + - throttled-io-loop + - th-sccs + - th-tc + - th-to-exp + - th-traced + - thumbnail-plus + - tianbar + - TicTacToe + - tictactoe3d + - tidal-midi + - tidal-vis + - tie-knot + - tiempo + - tiger + - tightrope + - timecalc + - time-extras + - time-machine + - timemap + - timeout + - timeout-with-results + - timeparsers + - TimePiece + - time-qq + - time-quote + - time-recurrence + - time-series + - timeseries + - time-series-lib + - timeutils + - time-w3c + - timezone-detect + - timezone-olson-th + - tini + - tintin + - TinyLaunchbury + - tiny-scheduler + - tinytemplate + - TinyURL + - tinyXml + - titan-debug-yampa + - titan-record-yampa + - Titim + - tkhs + - tkyprof + - tmp-postgres + - todo + - tofromxml + - to-haskell + - toilet + - tokenify + - tokenizer-streaming + - token-limiter + - token-search + - tokstyle + - tokyocabinet-haskell + - tokyotyrant-haskell + - tomato-rubato-openal + - toml + - tonatona-persistent-postgresql + - tonatona-persistent-sqlite + - tonatona-servant + - toodles + - Top + - torch + - TORCS + - to-string-class + - TotalMap + - touched + - Tournament + - toxiproxy-haskell + - tptp + - trace + - trace-call + - traced + - trace-function-call + - tracetree + - tracing-control + - tracked-files + - tracker + - trackit + - traction + - tracy + - traildb + - transactional-events + - TransformeR + - transformers-compose + - transformers-lift + - transformers-runnable + - TransformersStepByStep + - transient-universe + - translatable-intset + - translate + - translate-cli + - traversal-template + - travis + - travis-meta-yaml + - trawl + - traypoweroff + - treap + - treemap + - treemap-html + - tree-render-text + - TreeStructures + - tree-traversals + - t-regex + - tremulous-query + - TrendGraph + - trhsx + - trigger + - trim + - tripLL + - trivia + - tropical + - tropical-geometry + - true-name + - tsession + - tsparse + - tsp-viz + - tsuntsun + - tsvsql + - ttask + - tttool + - tubes + - tuntap + - tuple-gen + - tupleinstances + - tuple-lenses + - turing-machines + - turing-music + - turtle-options + - tweak + - twentefp-websockets + - twfy-api-client + - twhs + - twilio + - twine + - twirp + - twitter-feed + - tx + - txtblk + - TYB + - tyfam-witnesses + - typalyze + - typeable-th + - type-combinators + - typed-encoding + - typedflow + - typedquery + - typed-wire + - type-eq + - type-fun + - typehash + - type-indexed-queues + - type-int + - type-interpreter + - type-level-bst + - type-level-natural-number-induction + - type-level-natural-number-operations + - typelevel-tensor + - type-list + - TypeNat + - type-of-html-static + - typeparams + - type-prelude + - typesafe-precure + - types-compat + - type-settheory + - type-spine + - type-tree + - type-unary + - typograffiti + - tyro + - uberlast + - ucam-webauth-types + - ucd + - uconv + - udp-conduit + - udp-streaming + - uhexdump + - uhttpc + - ui-command + - unamb-custom + - unbounded-delays-units + - unboxed-containers + - unboxed-references + - unbreak + - unfix-binders + - unicode-prelude + - unicode-show + - unicode-symbols + - unicode-tricks + - uniform-fileio + - union-map + - uniprot-kb + - uniqueid + - uniquely-represented-sets + - uniqueness-periods-vector-properties + - units-attoparsec + - unittyped + - unitym-yesod + - uni-util + - universal-binary + - unix-handle + - unix-process-conduit + - unix-recursive + - unlifted-list + - unliftio-messagebox + - unm-hip + - unordered-containers-rematch + - unordered-graphs + - unordered-intmap + - unpacked-either + - unpacked-maybe + - unpack-funcs + - unroll-ghc-plugin + - unsafely + - unsequential + - unused + - uom-plugin + - Updater + - uploadcare + - upskirt + - uri + - uri-conduit + - uri-encoder + - uri-parse + - uri-template + - uri-templater + - URLb + - urlcheck + - urldecode + - url-decoders + - urldisp-happstack + - urlencoded + - url-generic + - urn + - urn-random + - urxml + - users-mysql-haskell + - users-persistent + - utf + - utf8-prelude + - utf8-validator + - UTFTConverter + - util-logict + - util-plus + - util-primitive + - util-universe + - uuagc-bootstrap + - uu-cco + - uuid-aeson + - uuid-orphans + - uvector + - uxadt + - vabal-lib + - vacuum + - validated-types + - Validation + - validations + - valid-names + - value-supply + - vampire + - var + - varan + - variables + - variadic + - variation + - vaultaire-common + - vault-tool-server + - vault-trans + - vcache + - vcatt + - vcf + - vcswrapper + - Vec-Boolean + - Vec-OpenGLRaw + - vect-floating + - vect-opengl + - vector-bytestring + - vector-clock + - vector-conduit + - vector-fftw + - vector-functorlazy + - vector-heterogenous + - vector-random + - vector-read-instances + - vector-space-map + - vector-space-opengl + - vector-space-points + - vector-static + - Vec-Transform + - Verba + - verbalexpressions + - verdict + - verify + - verilog + - verismith + - versioning + - vhd + - vhdl + - vicinity + - viewprof + - views + - Villefort + - vimus + - vintage-basic + - vinyl-json + - vinyl-named-sugar + - vinyl-plus + - vinyl-utils + - vinyl-vectors + - virthualenv + - visibility + - visualize-cbn + - visual-prof + - vitrea + - vk-aws-route53 + - VKHS + - vowpal-utils + - voyeur + - vpq + - VRML + - vte + - vtegtk3 + - vty-examples + - vty-menu + - vty-ui + - wacom-daemon + - waddle + - wai-git-http + - wai-graceful + - wai-handler-devel + - wai-handler-fastcgi + - wai-handler-scgi + - wai-handler-webkit + - wai-hmac-auth + - wai-lens + - wai-lite + - wai-logger-buffered + - wai-logger-prefork + - wai-make-assets + - wai-middleware-catch + - wai-middleware-crowd + - wai-middleware-delegate + - wai-middleware-etag + - wai-middleware-headers + - wai-middleware-hmac-client + - wai-middleware-preprocessor + - wai-middleware-static-caching + - wai-middleware-travisci + - wai-rate-limit-redis + - wai-request-spec + - wai-responsible + - wai-router + - wai-routes + - wai-routing + - wai-secure-cookies + - wai-session-alt + - wai-session-mysql + - wai-session-postgresql + - wai-session-redis + - wai-static-cache + - waitfree + - wai-throttler + - waitra + - wallpaper + - warc + - warp-dynamic + - warp-grpc + - warp-static + - warp-systemd + - wasm + - watchdog + - watcher + - watchit + - wavefront + - wavefront-obj + - weak-bag + - weather-api + - webapp + - WebBits + - webcloud + - webcrank + - webcrank-dispatch + - web-css + - webdriver-angular + - webdriver-snoy + - web-encodings + - WeberLogic + - webfinger-client + - webify + - webkit-javascriptcore + - webmention + - web-output + - web-push + - Webrexp + - web-routes-quasi + - web-routes-transformers + - webshow + - websockets-rpc + - webwire + - WEditor + - weekdaze + - weighted-regexp + - welshy + - werewolf + - Wheb + - while-lang-parser + - whim + - whiskers + - whois + - why3 + - wide-word + - WikimediaParser + - windns + - winerror + - Wired + - wires + - wiring + - witty + - wkt + - wkt-geom + - WL500gPLib + - wl-pprint-extras + - WMSigner + - woe + - woffex + - wol + - word2vec-model + - wordify + - wordlist + - WordNet + - WordNet-ghc74 + - wordpass + - wordpress-auth + - wordsearch + - workdays + - Workflow + - workflow-osx + - workflow-windows + - work-time + - wp-archivebot + - wreq-patchable + - wreq-sb + - writer-cps-lens + - writer-cps-monads-tf + - writer-cps-morph + - wsdl + - wsedit + - wsjtx-udp + - wtk + - wumpus-core + - wxdirect + - X11-extras + - X11-rm + - X11-xdamage + - X11-xfixes + - xchat-plugin + - xcp + - x-dsp + - Xec + - xenstore + - xfconf + - xformat + - xhaskell-library + - xhb + - xilinx-lava + - xine + - xing-api + - xkbcommon + - xkcd + - xleb + - xls + - xlsior + - xlsx-templater + - xml2json + - xml-conduit-decode + - xml-conduit-selectors + - xml-conduit-stylist + - xml-html-conduit-lens + - XmlHtmlWriter + - xml-parsec + - xml-prettify + - xml-query + - xml-tydom-core + - XMMS + - xmonad-bluetilebranch + - xmonad-contrib-gpl + - xmonad-dbus + - xmonad-eval + - xmonad-vanessa + - xmonad-windownames + - xor + - Xorshift128Plus + - xorshift-plus + - xournal-types + - xrefcheck + - xsact + - xsd + - xslt + - xxhash + - y0l0bot + - yabi-muno + - yackage + - yahoo-finance-api + - yahoo-finance-conduit + - yahoo-prices + - yahoo-web-search + - yajl + - yall + - yam-config + - yaml-pretty-extras + - YamlReference + - yaml-rpc + - yampa2048 + - yampa-glfw + - yampa-gloss + - yampa-glut + - yampa-sdl2 + - YampaSynth + - yampa-test + - yam-servant + - yandex-translate + - yaop + - yap + - yarr + - yaya-test + - yaya-unsafe-test + - yeller + - yeshql-hdbc + - yeshql-postgresql-simple + - yesod-angular + - yesod-angular-ui + - yesod-auth-account + - yesod-auth-account-fork + - yesod-auth-bcrypt + - yesod-auth-bcryptdb + - yesod-auth-deskcom + - yesod-auth-hmac-keccak + - yesod-auth-kerberos + - yesod-auth-ldap-mediocre + - yesod-auth-ldap-native + - yesod-auth-nopassword + - yesod-auth-pam + - yesod-auth-smbclient + - yesod-auth-zendesk + - yesod-bootstrap + - yesod-comments + - yesod-content-pdf + - yesod-crud + - yesod-crud-persist + - yesod-datatables + - yesod-dsl + - yesod-fast-devel + - yesod-filter + - yesod-form-richtext + - yesod-gitrev + - yesod-goodies + - yesod-job-queue + - yesod-links + - yesod-lucid + - yesod-paginate + - yesod-pagination + - yesod-pnotify + - yesod-pure + - yesod-raml + - yesod-recaptcha + - yesod-routes + - yesod-routes-flow + - yesod-rst + - yesod-s3 + - yesod-sass + - yesod-static-angular + - yesod-static-remote + - yesod-test-json + - yesod-tls + - yesod-vend + - yesod-worker + - YFrob + - yggdrasil + - yhccore + - yhseq + - yices + - yi-contrib + - yi-monokai + - yi-solarized + - yi-spolsky + - yoda + - yst + - yu-core + - yu-tool + - yxdb-utils + - z3-encoding + - z85 + - zabt + - zampolit + - Z-Data + - ZEBEDDE + - zendesk-api + - zenhack-prelude + - zeno + - zeromq4-clone-pattern + - zeromq4-conduit + - zeromq4-patterns + - zeromq-haskell + - zettelkast + - ZFS + - zifter + - zigbee-znet25 + - zip-conduit + - zipedit + - zipkin + - ziptastic-core + - zm + - ZMachine + - zmidi-score + - zoneinfo + - zoom + - zoom-refs + - zsdd + - zsh-battery + - zsyntax + - ztar + - Zwaluw + - zxcvbn-dvorak diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml new file mode 100644 index 0000000000..e4760fa54a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -0,0 +1,483 @@ +# pkgs/development/haskell-modules/configuration-hackage2nix.yaml + +compiler: ghc-8.10.4 + +core-packages: + - array-0.5.4.0 + - base-4.14.1.0 + - binary-0.8.8.0 + - bytestring-0.10.12.0 + - Cabal-3.2.1.0 + - containers-0.6.2.1 + - deepseq-1.4.4.0 + - directory-1.3.6.0 + - exceptions-0.10.4 + - filepath-1.4.2.1 + - ghc-8.10.4 + - ghc-boot-8.10.4 + - ghc-boot-th-8.10.4 + - ghc-compact-0.1.0.0 + - ghc-heap-8.10.4 + - ghc-prim-0.6.1 + - ghci-8.10.4 + - haskeline-0.8.0.1 + - hpc-0.6.1.0 + - integer-gmp-1.0.3.0 + - libiserv-8.10.4 + - mtl-2.2.2 + - parsec-3.1.14.0 + - pretty-1.1.3.6 + - process-1.6.9.0 + - rts-1.0 + - stm-2.5.0.0 + - template-haskell-2.16.0.0 + - terminfo-0.4.1.4 + - text-1.2.4.1 + - time-1.9.3 + - transformers-0.5.6.2 + - unix-2.7.2.2 + - xhtml-3000.2.2.1 + + # Hack: The following package is a core package of GHCJS. If we don't declare + # it, then hackage2nix will generate a Hackage database where all dependants + # of this library are marked as "broken". + - ghcjs-base-0 + +# This is a list of packages with versions from the latest Stackage LTS release. +# +# The packages and versions in this list cause the `hackage2nix` tool to +# generate the package at the given version. +# +# For instance, with a line like the following: +# +# - aeson ==1.4.6.0 +# +# `hackage2nix` will generate the `aeson` package at version 1.4.6.0 in the +# ./hackage-packages.nix file. +# +# Since the packages in the LTS package set are sometimes older than the latest +# on Hackage, `hackage2nix` is smart enough to also generate the latest version +# of a given package. +# +# In the above example with aeson, if there was version 1.5.0.0 of aeson +# available on Hackage, `hackage2nix` would generate two packages, `aeson` +# at version 1.4.6.0 and `aeson_1_5_0_0` at version 1.5.0.0. +# +# WARNING: This list is generated semiautomatically based on the most recent +# LTS package set. If you want to add entries to it, you must do so before the +# comment saying "# LTS Haskell x.y". Any changes after that comment will be +# lost the next time `update-stackage.sh` runs. +default-package-overrides: + # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag + - MissingH ==1.4.2.0 + # gi-gdkx11-4.x requires gtk-4.x, which is still under development and + # not yet available in Nixpkgs + - gi-gdkx11 < 4 + # Needs Cabal 3.4 for Setup.hs + - gi-javascriptcore < 4.0.23 # + - gi-soup < 2.4.24 # + - gi-webkit2 < 4.0.27 # + # 2021-05-11: the diagrams libraries still depends on pre 0.6, + # e. g. https://github.com/diagrams/diagrams-core/issues/115 + # We can keep this pin presumably until base 4.15 + - monoid-extras < 0.6 + # 2021-05-11: Pin for hls 1.1.0 + - ghcide == 1.2.* + - hls-plugin-api == 1.1.0.0 + - hls-explicit-imports-plugin < 1.0.0.2 + # 2021-05-12: remove once versions >= 5.0.0 is in stackage + - futhark < 0.19.5 + +extra-packages: + - base16-bytestring < 1 # required for cabal-install etc. + - Cabal == 2.2.* # required for jailbreak-cabal etc. + - Cabal == 2.4.* # required for cabal-install etc. + - Cabal == 3.2.* # required for cabal-install etc. + - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 + - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 + - dhall == 1.29.0 # required for ats-pkg + - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 + - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 + - haddock == 2.23.* # required on GHC < 8.10.x + - haddock-api == 2.23.* # required on GHC < 8.10.x + - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 + - happy == 1.19.9 # for purescript + - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 + - hlint < 3.3 # We don‘t have ghc-lib-parser 9.0.X yet. + - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 + - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls + - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 + - optparse-applicative < 0.16 # needed for niv-0.2.19 + - refinery == 0.3.* # required by hls-tactics-plugin-1.0.0.0 + - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x + - sbv == 7.13 # required for pkgs.petrinizer + - gi-gdk == 3.0.24 # 2021-05-07: For haskell-gi 0.25 without gtk4 + - gi-gtk < 4.0 # 2021-05-07: For haskell-gi 0.25 without gtk4 + - gi-gdkx11 == 3.0.11 # 2021-05-07: For haskell-gi 0.25 without gtk4 + - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version + +package-maintainers: + abbradar: + - Agda + bdesham: + - pinboard-notes-backup + cdepillabout: + - password + - password-instances + - pretty-simple + - spago + - termonad + Gabriel439: + - annah + - bench + - break + - dhall-bash + - dhall-docs + - dhall-json + - dhall-lsp-server + - dhall-nix + - dhall-nixpkgs + - dhall-openapi + - dhall-text + - dhall-yaml + - dhall + - dirstream + - errors + - foldl + - index-core + - lens-tutorial + - list-transformer + - managed + - mmorph + - morte + - mvc-updates + - mvc + - nix-derivation + - nix-diff + - optional-args + - optparse-generic + - pipes-bytestring + - pipes-concurrency + - pipes-csv + - pipes-extras + - pipes-group + - pipes-http + - pipes-parse + - pipes-safe + - pipes + - server-generic + - total + - turtle + - typed-spreadsheet + gridaphobe: + - located-base + jb55: + # - bson-lens + - cased + - elm-export-persistent + # - pipes-mongodb + - streaming-wai + kiwi: + - config-schema + - config-value + - glirc + - irc-core + - matterhorn + - mattermost-api + - mattermost-api-qc + - Unique + maralorn: + - arbtt + - cabal-fmt + - generic-optics + - ghcup + - haskell-language-server + - hedgehog + - hmatrix + - iCalendar + - neuron + - optics + - reflex-dom + - releaser + - req + - shake-bench + - shh + - snap + - stm-containers + - streamly + - taskwarrior + pacien: + - ldgallery-compiler + peti: + - cabal-install + - cabal2nix + - cabal2spec + - distribution-nixpkgs + - funcmp + - git-annex + - hackage-db + - hledger + - hledger-interest + - hledger-ui + - hledger-web + - hopenssl + - hsdns + - hsemail + - hsyslog + - jailbreak-cabal + - language-nix + - logging-facade-syslog + - nix-paths + - pandoc + - structured-haskell-mode + - titlecase + - xmonad + - xmonad-contrib + poscat: + - hinit + psibi: + - path-pieces + - persistent + - persistent-sqlite + - persistent-template + - shakespeare + roberth: + - arion-compose + - hercules-ci-agent + - hercules-ci-api + - hercules-ci-api-agent + - hercules-ci-api-core + - hercules-ci-cli + - hercules-ci-cnix-expr + - hercules-ci-cnix-store + rvl: + - taffybar + - arbtt + - lentil + sorki: + - cayenne-lpp + - data-stm32 + - gcodehs + - nix-derivation + - nix-narinfo + - ttn + - ttn-client + - update-nix-fetchgit + - zre + sternenseemann: + # also maintain upstream package + - spacecookie + - gopher-proxy + # other packages I can help out for + - systemd + - fast-logger + - flat + - Euterpea2 + - utc + - socket + - gitit + - yarn-lock + - yarn2nix + - large-hashable + terlar: + - nix-diff + turion: + - rhine + - rhine-gloss + - essence-of-live-coding + - essence-of-live-coding-gloss + - essence-of-live-coding-pulse + - essence-of-live-coding-quickcheck + - Agda + - dunai + - finite-typelits + - pulse-simple + - simple-affine-space + utdemir: + - nix-tree + +unsupported-platforms: + Allure: [ x86_64-darwin ] + alsa-mixer: [ x86_64-darwin ] + alsa-pcm: [ x86_64-darwin ] + alsa-seq: [ x86_64-darwin ] + AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + barbly: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] + bdcs-api: [ x86_64-darwin ] + bindings-directfb: [ x86_64-darwin ] + bindings-sane: [ x86_64-darwin ] + charsetdetect: [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3 + cut-the-crap: [ x86_64-darwin ] + d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + dx9base: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Euterpea: [ x86_64-darwin ] + follow-file: [ x86_64-darwin ] + freenect: [ x86_64-darwin ] + FTGL: [ x86_64-darwin ] + ghcjs-dom-hello: [ x86_64-darwin ] + gi-dbusmenugtk3: [ x86_64-darwin ] + gi-dbusmenu: [ x86_64-darwin ] + gi-ggit: [ x86_64-darwin ] + gi-ibus: [ x86_64-darwin ] + gi-ostree: [ x86_64-darwin ] + gi-vte: [ x86_64-darwin ] + gnome-keyring: [ x86_64-darwin ] + gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] + gtk-sni-tray: [ x86_64-darwin ] + haskell-snake: [ x86_64-darwin ] + hcwiid: [ x86_64-darwin ] + HFuse: [ x86_64-darwin ] + hidapi: [ x86_64-darwin ] + hinotify-bytestring: [ x86_64-darwin ] + hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + honk: [ x86_64-darwin ] + hpapi: [ x86_64-darwin ] + HSoM: [ x86_64-darwin ] + iwlib: [ x86_64-darwin ] + jsaddle-webkit2gtk: [ x86_64-darwin ] + LambdaHack: [ x86_64-darwin ] + large-hashable: [ aarch64-linux ] # https://github.com/factisresearch/large-hashable/issues/17 + libmodbus: [ x86_64-darwin ] + libsystemd-journal: [ x86_64-darwin ] + libtelnet: [ x86_64-darwin ] + libzfs: [ x86_64-darwin ] + linearEqSolver: [ aarch64-linux ] + linux-evdev: [ x86_64-darwin ] + linux-file-extents: [ x86_64-darwin ] + linux-inotify: [ x86_64-darwin ] + linux-mount: [ x86_64-darwin ] + linux-namespaces: [ x86_64-darwin ] + lio-fs: [ x86_64-darwin ] + logging-facade-journald: [ x86_64-darwin ] + midi-alsa: [ x86_64-darwin ] + mpi-hs: [ aarch64-linux, x86_64-darwin ] + mpi-hs-binary: [ aarch64-linux, x86_64-darwin ] + mpi-hs-cereal: [ aarch64-linux, x86_64-darwin ] + mpi-hs-store: [ aarch64-linux, x86_64-darwin ] + mplayer-spot: [ aarch64-linux ] + netlink: [ x86_64-darwin ] + oculus: [ x86_64-darwin ] + pam: [ x86_64-darwin ] + parport: [ x86_64-darwin ] + password: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86 + password-instances: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86 + persist-state: [ aarch64-linux, armv7l-linux ] # https://github.com/minad/persist-state/blob/6fd68c0b8b93dec78218f6d5a1f4fa06ced4e896/src/Data/PersistState.hs#L122-L128 + piyo: [ x86_64-darwin ] + PortMidi-simple: [ x86_64-darwin ] + PortMidi: [ x86_64-darwin ] + posix-api: [ x86_64-darwin ] + Raincat: [ x86_64-darwin ] + reactivity: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + reflex-dom-fragment-shader-canvas: [ x86_64-darwin, aarch64-linux ] + reflex-dom: [ x86_64-darwin, aarch64-linux ] + reflex-localize-dom: [ x86_64-darwin, aarch64-linux ] + rtlsdr: [ x86_64-darwin ] + rubberband: [ x86_64-darwin ] + sbv: [ aarch64-linux ] + scat: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86 + scrypt: [ aarch64-linux, armv7l-linux ] # https://github.com/informatikr/scrypt/issues/8 + sdl2-mixer: [ x86_64-darwin ] + sdl2-ttf: [ x86_64-darwin ] + synthesizer-alsa: [ x86_64-darwin ] + taffybar: [ x86_64-darwin ] + termonad: [ x86_64-darwin ] + tokyotyrant-haskell: [ x86_64-darwin ] + udev: [ x86_64-darwin ] + Unixutils-shadow: [ x86_64-darwin ] + verifiable-expressions: [ aarch64-linux ] + vrpn: [ x86_64-darwin ] + vulkan: [ i686-linux, armv7l-linux, x86_64-darwin ] + VulkanMemoryAllocator: [ i686-linux, armv7l-linux, x86_64-darwin ] + vulkan-utils: [ x86_64-darwin ] + webkit2gtk3-javascriptcore: [ x86_64-darwin ] + Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-junction-point: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-notify: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + xattr: [ x86_64-darwin ] + xgboost-haskell: [ aarch64-linux, armv7l-linux ] + XInput: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + xmobar: [ x86_64-darwin ] + xmonad-extras: [ x86_64-darwin ] + xmonad-volume: [ x86_64-darwin ] + +dont-distribute-packages: + # Depends on shine, which is a ghcjs project. + - shine-varying + + # these packages depend on software with an unfree license + - accelerate-bignum + - accelerate-blas + - accelerate-cublas + - accelerate-cuda + - accelerate-cufft + - accelerate-examples + - accelerate-fft + - accelerate-fourier-benchmark + - accelerate-io-array + - accelerate-io-bmp + - accelerate-io-bytestring + - accelerate-io-cereal + - accelerate-io-JuicyPixels + - accelerate-io-repa + - accelerate-io-vector + - accelerate-kullback-liebler + - accelerate-llvm-ptx + - bindings-yices + - boolector + - ccelerate-cuda + - containers-accelerate + - cplex-hs + - cublas + - cuda # 2020-08-18 because of dependency nvidia-x11 + - cufft + - cusolver + - cusparse + - gloss-raster-accelerate + - hashable-accelerate + - libnvvm + - matlab + - nvvm + - Obsidian + - odpic-raw + - patch-image + # license for input data unclear, dependency not on Hackage + # see https://github.com/NixOS/nixpkgs/pull/88604 + - tensorflow-mnist + - yices-easy + - yices-painless + + # These packages don‘t build because they use deprecated webkit versions. + - diagrams-hsqml + - dialog + - ghcjs-dom-webkit + - gi-webkit + - hs-mesos + - hsqml + - hsqml-datamodel + - hsqml-demo-manic + - hsqml-demo-notes + - hsqml-demo-samples + - hstorchat + - jsaddle-webkitgtk + - jsc + - lambdacat + - manatee-all + - manatee-browser + - manatee-reader + - markup-preview + - spike + - web-browser-in-haskell + - webkit + - webkitgtk3 + - webkitgtk3-javascriptcore + - websnap diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml new file mode 100644 index 0000000000..bb66df5b15 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -0,0 +1,2698 @@ +# Stackage Nightly 2021-05-10 +# This file is auto-generated by +# maintainers/scripts/haskell/update-stackage.sh +default-package-overrides: + - abstract-deque ==0.3 + - abstract-par ==0.3.3 + - AC-Angle ==1.0 + - accuerr ==0.2.0.2 + - ace ==0.6 + - action-permutations ==0.0.0.1 + - ad ==4.4.1 + - adjunctions ==4.4 + - adler32 ==0.1.2.0 + - aeson ==1.5.6.0 + - aeson-attoparsec ==0.0.0 + - aeson-better-errors ==0.9.1.0 + - aeson-casing ==0.2.0.0 + - aeson-combinators ==0.0.5.0 + - aeson-commit ==1.3 + - aeson-compat ==0.3.9 + - aeson-default ==0.9.1.0 + - aeson-diff ==1.1.0.9 + - aeson-generic-compat ==0.0.1.3 + - aeson-lens ==0.5.0.0 + - aeson-optics ==1.1.0.1 + - aeson-picker ==0.1.0.5 + - aeson-pretty ==0.8.8 + - aeson-qq ==0.8.3 + - aeson-schemas ==1.3.3 + - aeson-with ==0.1.2.0 + - aeson-yak ==0.1.1.3 + - aeson-yaml ==1.1.0.0 + - Agda ==2.6.1.3 + - agda2lagda ==0.2020.11.1 + - al ==0.1.4.2 + - alarmclock ==0.7.0.5 + - alerts ==0.1.2.0 + - alex ==3.2.6 + - alex-meta ==0.3.0.13 + - alg ==0.2.13.1 + - algebraic-graphs ==0.5 + - Allure ==0.10.2.0 + - almost-fix ==0.0.2 + - alsa-core ==0.5.0.1 + - alsa-mixer ==0.3.0 + - alsa-pcm ==0.6.1.1 + - alsa-seq ==0.6.0.8 + - alternative-vector ==0.0.0 + - ALUT ==2.4.0.3 + - amazonka-apigateway ==1.6.1 + - amazonka-application-autoscaling ==1.6.1 + - amazonka-appstream ==1.6.1 + - amazonka-athena ==1.6.1 + - amazonka-autoscaling ==1.6.1 + - amazonka-budgets ==1.6.1 + - amazonka-certificatemanager ==1.6.1 + - amazonka-cloudformation ==1.6.1 + - amazonka-cloudfront ==1.6.1 + - amazonka-cloudhsm ==1.6.1 + - amazonka-cloudsearch ==1.6.1 + - amazonka-cloudsearch-domains ==1.6.1 + - amazonka-cloudtrail ==1.6.1 + - amazonka-cloudwatch ==1.6.1 + - amazonka-cloudwatch-events ==1.6.1 + - amazonka-cloudwatch-logs ==1.6.1 + - amazonka-codebuild ==1.6.1 + - amazonka-codecommit ==1.6.1 + - amazonka-codedeploy ==1.6.1 + - amazonka-codepipeline ==1.6.1 + - amazonka-cognito-identity ==1.6.1 + - amazonka-cognito-idp ==1.6.1 + - amazonka-cognito-sync ==1.6.1 + - amazonka-config ==1.6.1 + - amazonka-core ==1.6.1 + - amazonka-datapipeline ==1.6.1 + - amazonka-devicefarm ==1.6.1 + - amazonka-directconnect ==1.6.1 + - amazonka-discovery ==1.6.1 + - amazonka-dms ==1.6.1 + - amazonka-ds ==1.6.1 + - amazonka-dynamodb ==1.6.1 + - amazonka-dynamodb-streams ==1.6.1 + - amazonka-ecr ==1.6.1 + - amazonka-ecs ==1.6.1 + - amazonka-efs ==1.6.1 + - amazonka-elasticache ==1.6.1 + - amazonka-elasticbeanstalk ==1.6.1 + - amazonka-elasticsearch ==1.6.1 + - amazonka-elastictranscoder ==1.6.1 + - amazonka-elb ==1.6.1 + - amazonka-elbv2 ==1.6.1 + - amazonka-emr ==1.6.1 + - amazonka-gamelift ==1.6.1 + - amazonka-glacier ==1.6.1 + - amazonka-glue ==1.6.1 + - amazonka-health ==1.6.1 + - amazonka-iam ==1.6.1 + - amazonka-importexport ==1.6.1 + - amazonka-inspector ==1.6.1 + - amazonka-iot ==1.6.1 + - amazonka-iot-dataplane ==1.6.1 + - amazonka-kinesis ==1.6.1 + - amazonka-kinesis-analytics ==1.6.1 + - amazonka-kinesis-firehose ==1.6.1 + - amazonka-kms ==1.6.1 + - amazonka-lambda ==1.6.1 + - amazonka-lightsail ==1.6.1 + - amazonka-marketplace-analytics ==1.6.1 + - amazonka-marketplace-metering ==1.6.1 + - amazonka-ml ==1.6.1 + - amazonka-opsworks ==1.6.1 + - amazonka-opsworks-cm ==1.6.1 + - amazonka-pinpoint ==1.6.1 + - amazonka-polly ==1.6.1 + - amazonka-rds ==1.6.1 + - amazonka-redshift ==1.6.1 + - amazonka-rekognition ==1.6.1 + - amazonka-route53 ==1.6.1 + - amazonka-route53-domains ==1.6.1 + - amazonka-s3 ==1.6.1 + - amazonka-sdb ==1.6.1 + - amazonka-servicecatalog ==1.6.1 + - amazonka-ses ==1.6.1 + - amazonka-shield ==1.6.1 + - amazonka-sms ==1.6.1 + - amazonka-snowball ==1.6.1 + - amazonka-sns ==1.6.1 + - amazonka-sqs ==1.6.1 + - amazonka-ssm ==1.6.1 + - amazonka-stepfunctions ==1.6.1 + - amazonka-storagegateway ==1.6.1 + - amazonka-sts ==1.6.1 + - amazonka-support ==1.6.1 + - amazonka-swf ==1.6.1 + - amazonka-test ==1.6.1 + - amazonka-waf ==1.6.1 + - amazonka-workspaces ==1.6.1 + - amazonka-xray ==1.6.1 + - amqp ==0.22.0 + - amqp-utils ==0.6.1.0 + - annotated-wl-pprint ==0.7.0 + - ansi-terminal ==0.11 + - ansi-wl-pprint ==0.6.9 + - ANum ==0.2.0.2 + - apecs ==0.9.2 + - apecs-gloss ==0.2.4 + - apecs-physics ==0.4.5 + - api-field-json-th ==0.1.0.2 + - api-maker ==0.1.0.0 + - ap-normalize ==0.1.0.0 + - appar ==0.1.8 + - appendmap ==0.1.5 + - apply-refact ==0.9.2.0 + - apportionment ==0.0.0.3 + - approximate ==0.3.4 + - approximate-equality ==1.1.0.2 + - app-settings ==0.2.0.12 + - arbor-lru-cache ==0.1.1.1 + - arithmoi ==0.11.0.1 + - array-memoize ==0.6.0 + - arrow-extras ==0.1.0.1 + - ascii ==1.0.1.4 + - ascii-case ==1.0.0.4 + - ascii-char ==1.0.0.8 + - asciidiagram ==1.3.3.3 + - ascii-group ==1.0.0.4 + - ascii-predicates ==1.0.0.4 + - ascii-progress ==0.3.3.0 + - ascii-superset ==1.0.1.4 + - ascii-th ==1.0.0.4 + - asif ==6.0.4 + - asn1-encoding ==0.9.6 + - asn1-parse ==0.9.5 + - asn1-types ==0.3.4 + - assert-failure ==0.1.2.5 + - assoc ==1.0.2 + - astro ==0.4.2.1 + - async ==2.2.3 + - async-extra ==0.2.0.0 + - async-pool ==0.9.1 + - async-refresh ==0.3.0.0 + - async-refresh-tokens ==0.4.0.0 + - atom-basic ==0.2.5 + - atomic-primops ==0.8.4 + - atomic-write ==0.2.0.7 + - attoparsec ==0.13.2.5 + - attoparsec-base64 ==0.0.0 + - attoparsec-binary ==0.2 + - attoparsec-expr ==0.1.1.2 + - attoparsec-iso8601 ==1.0.2.0 + - attoparsec-path ==0.0.0.1 + - audacity ==0.0.2 + - aur ==7.0.6 + - aura ==3.2.4 + - authenticate ==1.3.5 + - authenticate-oauth ==1.6.0.1 + - auto ==0.4.3.1 + - autoexporter ==1.1.20 + - auto-update ==0.1.6 + - avers ==0.0.17.1 + - avro ==0.5.2.0 + - aws-cloudfront-signed-cookies ==0.2.0.6 + - backprop ==0.2.6.4 + - backtracking ==0.1.0 + - bank-holidays-england ==0.2.0.6 + - barbies ==2.0.2.0 + - base16 ==0.3.0.1 + - base16-bytestring ==1.0.1.0 + - base16-lens ==0.1.3.2 + - base32 ==0.2.0.0 + - base32-lens ==0.1.1.1 + - base32string ==0.9.1 + - base58-bytestring ==0.1.0 + - base58string ==0.10.0 + - base64 ==0.4.2.3 + - base64-bytestring ==1.1.0.0 + - base64-bytestring-type ==1.0.1 + - base64-lens ==0.3.1 + - base64-string ==0.2 + - base-compat ==0.11.2 + - base-compat-batteries ==0.11.2 + - basement ==0.0.12 + - base-orphans ==0.8.4 + - base-prelude ==1.4 + - base-unicode-symbols ==0.2.4.2 + - basic-prelude ==0.7.0 + - bazel-runfiles ==0.12 + - bbdb ==0.8 + - bcp47 ==0.2.0.3 + - bcp47-orphans ==0.1.0.3 + - bcrypt ==0.0.11 + - bech32 ==1.1.0 + - bech32-th ==1.0.2 + - bench ==1.0.12 + - benchpress ==0.2.2.16 + - between ==0.11.0.0 + - bibtex ==0.1.0.6 + - bifunctors ==5.5.11 + - bimap ==0.4.0 + - bimaps ==0.1.0.2 + - bimap-server ==0.1.0.1 + - bin ==0.1.1 + - binary-conduit ==1.3.1 + - binary-ext ==2.0.4 + - binary-ieee754 ==0.1.0.0 + - binary-instances ==1.0.1 + - binary-list ==1.1.1.2 + - binary-orphans ==1.0.1 + - binary-parser ==0.5.7 + - binary-parsers ==0.2.4.0 + - binary-search ==2.0.0 + - binary-shared ==0.8.3 + - binary-tagged ==0.3 + - bindings-DSL ==1.0.25 + - bindings-GLFW ==3.3.2.0 + - bindings-libzip ==1.0.1 + - bindings-uname ==0.1 + - bins ==0.1.2.0 + - bitarray ==0.0.1.1 + - bits ==0.5.3 + - bitset-word8 ==0.1.1.2 + - bits-extra ==0.0.2.0 + - bitvec ==1.1.1.0 + - bitwise-enum ==1.0.1.0 + - blake2 ==0.3.0 + - blanks ==0.5.0 + - blas-carray ==0.1.0.1 + - blas-comfort-array ==0.0.0.2 + - blas-ffi ==0.1 + - blaze-bootstrap ==0.1.0.1 + - blaze-builder ==0.4.2.1 + - blaze-html ==0.9.1.2 + - blaze-markup ==0.8.2.8 + - blaze-svg ==0.3.6.1 + - blaze-textual ==0.2.1.0 + - bmp ==1.2.6.3 + - BNFC ==2.9.1 + - BNFC-meta ==0.6.1 + - board-games ==0.3 + - boltzmann-samplers ==0.1.1.0 + - Boolean ==0.2.4 + - boolean-like ==0.1.1.0 + - boolsimplifier ==0.1.8 + - boots ==0.2.0.1 + - bordacount ==0.1.0.0 + - boring ==0.2 + - both ==0.1.1.1 + - bound ==2.0.3 + - BoundedChan ==1.0.3.0 + - bounded-queue ==1.0.0 + - boundingboxes ==0.2.3 + - bower-json ==1.0.0.1 + - boxes ==0.1.5 + - brick ==0.62 + - broadcast-chan ==0.2.1.1 + - bsb-http-chunked ==0.0.0.4 + - bson ==0.4.0.1 + - btrfs ==0.2.0.0 + - buffer-builder ==0.2.4.7 + - buffer-pipe ==0.0 + - bugsnag-haskell ==0.0.4.1 + - bugsnag-hs ==0.2.0.3 + - bugzilla-redhat ==0.3.1 + - burrito ==1.2.0.1 + - butcher ==1.3.3.2 + - buttplug-hs-core ==0.1.0.0 + - bv ==0.5 + - bv-little ==1.1.1 + - byteable ==0.1.1 + - byte-count-reader ==0.10.1.2 + - bytedump ==1.0 + - byte-order ==0.1.2.0 + - byteorder ==1.0.4 + - bytes ==0.17.1 + - byteset ==0.1.1.0 + - bytestring-builder ==0.10.8.2.0 + - bytestring-conversion ==0.3.1 + - bytestring-lexing ==0.5.0.2 + - bytestring-mmap ==0.2.2 + - bytestring-strict-builder ==0.4.5.4 + - bytestring-to-vector ==0.3.0.1 + - bytestring-tree-builder ==0.2.7.9 + - bz2 ==1.0.1.0 + - bzlib ==0.5.1.0 + - bzlib-conduit ==0.3.0.2 + - c14n ==0.1.0.1 + - c2hs ==0.28.7 + - cabal-appimage ==0.3.0.2 + - cabal-debian ==5.1 + - cabal-doctest ==1.0.8 + - cabal-file ==0.1.1 + - cabal-flatpak ==0.1.0.2 + - cabal-plan ==0.7.2.0 + - cabal-rpm ==2.0.8 + - cache ==0.1.3.0 + - cacophony ==0.10.1 + - calendar-recycling ==0.0.0.1 + - call-stack ==0.3.0 + - can-i-haz ==0.3.1.0 + - capability ==0.4.0.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.2 + - cased ==0.1.0.0 + - case-insensitive ==1.2.1.0 + - cases ==0.1.4.1 + - casing ==0.1.4.1 + - cassava ==0.5.2.0 + - cassava-conduit ==0.6.0 + - cassava-megaparsec ==2.0.2 + - cast ==0.1.0.2 + - category ==0.2.5.0 + - cayley-client ==0.4.15 + - cborg ==0.2.5.0 + - cborg-json ==0.2.2.0 + - cdar-mBound ==0.1.0.1 + - cereal ==0.5.8.1 + - cereal-conduit ==0.8.0 + - cereal-text ==0.1.0.2 + - cereal-vector ==0.2.0.1 + - cfenv ==0.1.0.0 + - cgi ==3001.5.0.0 + - chan ==0.0.4.1 + - ChannelT ==0.0.0.7 + - character-cases ==0.1.0.6 + - charset ==0.3.8 + - charsetdetect-ae ==1.1.0.4 + - Chart ==1.9.3 + - chaselev-deque ==0.5.0.5 + - ChasingBottoms ==1.3.1.10 + - cheapskate ==0.1.1.2 + - cheapskate-highlight ==0.1.0.0 + - cheapskate-lucid ==0.1.0.0 + - checkers ==0.5.6 + - checksum ==0.0 + - chimera ==0.3.1.0 + - chiphunk ==0.1.4.0 + - choice ==0.2.2 + - chronologique ==0.3.1.3 + - chronos ==1.1.1 + - chronos-bench ==0.2.0.2 + - chunked-data ==0.3.1 + - cipher-aes ==0.2.11 + - cipher-camellia ==0.0.2 + - cipher-des ==0.0.6 + - cipher-rc4 ==0.1.4 + - circle-packing ==0.1.0.6 + - circular ==0.3.1.1 + - citeproc ==0.3.0.9 + - clash-ghc ==1.2.5 + - clash-lib ==1.2.5 + - clash-prelude ==1.2.5 + - classy-prelude ==1.5.0 + - classy-prelude-conduit ==1.5.0 + - clay ==0.13.3 + - clientsession ==0.9.1.2 + - climb ==0.3.3 + - Clipboard ==2.3.2.0 + - clock ==0.8 + - clock-extras ==0.1.0.2 + - closed ==0.2.0.1 + - clumpiness ==0.17.0.2 + - ClustalParser ==1.3.0 + - cmark ==0.6 + - cmark-gfm ==0.2.2 + - cmark-lucid ==0.1.0.0 + - cmdargs ==0.10.21 + - codec-beam ==0.2.0 + - code-page ==0.2.1 + - collect-errors ==0.1.1.0 + - co-log-concurrent ==0.5.0.0 + - co-log-core ==0.2.1.1 + - Color ==0.3.1 + - colorful-monoids ==0.2.1.3 + - colorize-haskell ==1.0.1 + - colour ==2.3.5 + - combinatorial ==0.1.0.1 + - comfort-array ==0.4.1 + - comfort-graph ==0.0.3.1 + - commonmark ==0.1.1.4 + - commonmark-extensions ==0.2.0.4 + - commonmark-pandoc ==0.2.0.1 + - commutative ==0.0.2 + - comonad ==5.0.8 + - comonad-extras ==4.0.1 + - compactmap ==0.1.4.2.1 + - compdata ==0.12.1 + - compensated ==0.8.3 + - compiler-warnings ==0.1.0 + - composable-associations ==0.1.0.0 + - composable-associations-aeson ==0.1.0.1 + - composite-aeson ==0.7.5.0 + - composite-aeson-path ==0.7.5.0 + - composite-aeson-refined ==0.7.5.0 + - composite-aeson-throw ==0.1.0.0 + - composite-base ==0.7.5.0 + - composite-binary ==0.7.5.0 + - composite-ekg ==0.7.5.0 + - composite-hashable ==0.7.5.0 + - composite-tuple ==0.1.2.0 + - composite-xstep ==0.1.0.0 + - composition ==1.0.2.2 + - composition-extra ==2.0.0 + - concise ==0.1.0.1 + - concurrency ==1.11.0.1 + - concurrent-extra ==0.7.0.12 + - concurrent-output ==1.10.12 + - concurrent-split ==0.0.1.1 + - concurrent-supply ==0.1.8 + - cond ==0.4.1.1 + - conduit ==1.3.4.1 + - conduit-algorithms ==0.0.11.0 + - conduit-combinators ==1.3.0 + - conduit-concurrent-map ==0.1.1 + - conduit-extra ==1.3.5 + - conduit-parse ==0.2.1.0 + - conduit-zstd ==0.0.2.0 + - conferer ==1.1.0.0 + - conferer-aeson ==1.1.0.1 + - conferer-hspec ==1.1.0.0 + - conferer-warp ==1.1.0.0 + - ConfigFile ==1.1.4 + - config-ini ==0.2.4.0 + - configurator ==0.3.0.0 + - configurator-export ==0.1.0.1 + - configurator-pg ==0.2.5 + - connection ==0.3.1 + - connection-pool ==0.2.2 + - console-style ==0.0.2.1 + - constraint ==0.1.4.0 + - constraints ==0.13 + - constraint-tuples ==0.1.2 + - construct ==0.3.0.2 + - contravariant ==1.5.3 + - contravariant-extras ==0.3.5.2 + - control-bool ==0.2.1 + - control-dsl ==0.2.1.3 + - control-monad-free ==0.6.2 + - control-monad-omega ==0.3.2 + - convertible ==1.1.1.0 + - cookie ==0.4.5 + - core-data ==0.2.1.9 + - core-program ==0.2.7.1 + - core-text ==0.3.0.0 + - countable ==1.0 + - country ==0.2.1 + - cpphs ==1.20.9.1 + - cprng-aes ==0.6.1 + - cpu ==0.1.2 + - cpuinfo ==0.1.0.2 + - crackNum ==2.4 + - crc32c ==0.0.0 + - credential-store ==0.1.2 + - criterion ==1.5.9.0 + - criterion-measurement ==0.1.2.0 + - cron ==0.7.0 + - crypto-api ==0.13.3 + - crypto-cipher-types ==0.0.9 + - cryptocompare ==0.1.2 + - crypto-enigma ==0.1.1.6 + - cryptohash ==0.11.9 + - cryptohash-cryptoapi ==0.1.4 + - cryptohash-md5 ==0.11.100.1 + - cryptohash-sha1 ==0.11.100.1 + - cryptohash-sha256 ==0.11.102.0 + - cryptohash-sha512 ==0.11.100.1 + - cryptonite ==0.28 + - 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 + - csp ==1.4.0 + - css-syntax ==0.1.0.0 + - css-text ==0.1.3.0 + - csv ==0.1.2 + - ctrie ==0.2 + - cubicbezier ==0.6.0.6 + - cubicspline ==0.1.2 + - cuckoo-filter ==0.2.0.2 + - cue-sheet ==2.0.1 + - curl ==1.3.8 + - currencies ==0.2.0.0 + - currency ==0.2.0.0 + - cursor ==0.3.0.0 + - cursor-brick ==0.1.0.0 + - cursor-fuzzy-time ==0.0.0.0 + - cursor-gen ==0.3.0.0 + - cutter ==0.0 + - cyclotomic ==1.1.1 + - czipwith ==1.0.1.3 + - d10 ==0.2.1.6 + - data-accessor ==0.2.3 + - data-accessor-mtl ==0.2.0.4 + - data-accessor-template ==0.2.1.16 + - data-accessor-transformers ==0.2.1.7 + - data-ascii ==1.0.0.6 + - data-binary-ieee754 ==0.4.4 + - data-bword ==0.1.0.1 + - data-checked ==0.3 + - data-clist ==0.1.2.3 + - data-compat ==0.1.0.3 + - data-default ==0.7.1.1 + - data-default-class ==0.1.2.0 + - data-default-instances-containers ==0.0.1 + - 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.3.1 + - data-forest ==0.1.0.8 + - data-has ==0.4.0.0 + - data-hash ==0.2.0.1 + - data-interval ==2.1.0 + - data-inttrie ==0.1.4 + - data-lens-light ==0.1.2.2 + - data-memocombinators ==0.5.1 + - data-msgpack ==0.0.13 + - data-msgpack-types ==0.0.3 + - data-or ==1.0.0.5 + - data-ordlist ==0.4.7.0 + - data-ref ==0.0.2 + - data-reify ==0.6.3 + - data-serializer ==0.3.5 + - data-textual ==0.3.0.3 + - dataurl ==0.1.0.0 + - DAV ==1.3.4 + - DBFunctor ==0.1.1.1 + - dbus ==1.2.17 + - dbus-hslogger ==0.1.0.1 + - debian ==4.0.2 + - debian-build ==0.10.2.0 + - debug-trace-var ==0.2.0 + - dec ==0.0.4 + - Decimal ==0.5.2 + - declarative ==0.5.4 + - deepseq-generics ==0.2.0.0 + - deepseq-instances ==0.1.0.1 + - deferred-folds ==0.9.17 + - dejafu ==2.4.0.2 + - dense-linear-algebra ==0.1.0.0 + - depq ==0.4.2 + - deque ==0.4.3 + - deriveJsonNoPrefix ==0.1.0.1 + - derive-topdown ==0.0.2.2 + - deriving-aeson ==0.2.6.1 + - deriving-compat ==0.5.10 + - derulo ==1.0.10 + - dhall ==1.38.1 + - dhall-bash ==1.0.36 + - dhall-json ==1.7.6 + - dhall-lsp-server ==1.0.14 + - dhall-yaml ==1.2.6 + - diagrams-solve ==0.1.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.4 + - di-monad ==1.3.1 + - directory-tree ==0.12.1 + - direct-sqlite ==2.3.26 + - dirichlet ==0.1.0.2 + - discount ==0.1.1 + - disk-free-space ==0.1.0.1 + - distributed-closure ==0.4.2.0 + - distribution-opensuse ==1.1.1 + - distributive ==0.6.2.1 + - dl-fedora ==0.9 + - dlist ==0.8.0.8 + - dlist-instances ==0.1.1.1 + - dlist-nonempty ==0.1.1 + - dns ==4.0.1 + - dockerfile ==0.2.0 + - doclayout ==0.3.0.2 + - doctemplates ==0.9 + - doctest ==0.16.3 + - doctest-discover ==0.2.0.0 + - doctest-driver-gen ==0.3.0.3 + - doctest-exitcode-stdio ==0.0 + - doctest-extract ==0.1 + - doctest-lib ==0.1 + - doldol ==0.4.1.2 + - do-list ==1.0.1 + - do-notation ==0.1.0.2 + - dot ==0.3 + - dotenv ==0.8.0.7 + - dotgen ==0.4.3 + - dotnet-timespan ==0.0.1.0 + - double-conversion ==2.0.2.0 + - download ==0.3.2.7 + - download-curl ==0.1.4 + - drinkery ==0.4 + - dsp ==0.2.5.1 + - dual ==0.1.1.1 + - dublincore-xml-conduit ==0.1.0.2 + - dunai ==0.7.0 + - duration ==0.2.0.0 + - dvorak ==0.1.0.0 + - dynamic-state ==0.3.1 + - dyre ==0.8.12 + - eap ==0.9.0.2 + - earcut ==0.1.0.4 + - Earley ==0.13.0.1 + - easy-file ==0.2.2 + - Ebnf2ps ==1.0.15 + - echo ==0.1.4 + - ecstasy ==0.2.1.0 + - ed25519 ==0.0.5.0 + - edit-distance ==0.2.2.1 + - edit-distance-vector ==1.0.0.4 + - editor-open ==0.6.0.0 + - egison ==4.1.2 + - egison-pattern-src ==0.2.1.2 + - egison-pattern-src-th-mode ==0.2.1.2 + - either ==5.0.1.1 + - either-both ==0.1.1.1 + - either-unwrap ==1.1 + - ekg ==0.4.0.15 + - ekg-core ==0.1.1.7 + - ekg-json ==0.1.0.6 + - ekg-statsd ==0.2.5.0 + - elerea ==2.9.0 + - elf ==0.30 + - eliminators ==0.7 + - elm2nix ==0.2.1 + - elm-bridge ==0.6.1 + - elm-core-sources ==1.0.0 + - elm-export ==0.6.0.1 + - elynx ==0.5.0.2 + - elynx-markov ==0.5.0.2 + - elynx-nexus ==0.5.0.2 + - elynx-seq ==0.5.0.2 + - elynx-tools ==0.5.0.2 + - elynx-tree ==0.5.0.2 + - email-validate ==2.3.2.13 + - emojis ==0.1 + - enclosed-exceptions ==1.0.3 + - ENIG ==0.0.1.0 + - entropy ==0.4.1.6 + - enummapset ==0.6.0.3 + - enumset ==0.0.5 + - enum-subset-generate ==0.1.0.0 + - envelope ==0.2.2.0 + - envparse ==0.4.1 + - envy ==2.1.0.0 + - epub-metadata ==4.5 + - eq ==4.2.1 + - equal-files ==0.0.5.3 + - equational-reasoning ==0.7.0.0 + - equivalence ==0.3.5 + - erf ==2.0.0.0 + - error-or ==0.1.2.0 + - error-or-utils ==0.1.1 + - errors ==2.3.0 + - errors-ext ==0.4.2 + - ersatz ==0.4.9 + - esqueleto ==3.4.1.1 + - essence-of-live-coding ==0.2.5 + - essence-of-live-coding-gloss ==0.2.5 + - essence-of-live-coding-pulse ==0.2.5 + - essence-of-live-coding-quickcheck ==0.2.5 + - etc ==0.4.1.0 + - eve ==0.1.9.0 + - 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.4 + - exception-mtl ==0.4.0.1 + - exceptions ==0.10.4 + - exception-transformers ==0.4.0.9 + - exception-via ==0.1.0.0 + - executable-path ==0.0.3.1 + - exit-codes ==1.0.0 + - exomizer ==1.0.0 + - experimenter ==0.1.0.12 + - expiring-cache-map ==0.0.6.1 + - explicit-exception ==0.1.10 + - exp-pairs ==0.2.1.0 + - express ==0.1.8 + - extended-reals ==0.2.4.0 + - extensible-effects ==5.0.0.1 + - extensible-exceptions ==0.1.1.4 + - extra ==1.7.9 + - extractable-singleton ==0.0.1 + - extrapolate ==0.4.4 + - fail ==4.9.0.0 + - failable ==1.2.4.0 + - fakedata ==0.8.0 + - fakedata-parser ==0.1.0.0 + - fakefs ==0.3.0.2 + - fakepull ==0.3.0.2 + - faktory ==1.0.2.1 + - fast-digits ==0.3.0.0 + - fast-logger ==3.0.5 + - fast-math ==1.0.2 + - fb ==2.1.1 + - fclabels ==2.0.5 + - feature-flags ==0.1.0.1 + - fedora-dists ==1.1.2 + - fedora-haskell-tools ==0.9 + - feed ==1.3.2.0 + - FenwickTree ==0.1.2.1 + - fft ==0.1.8.6 + - fgl ==5.7.0.3 + - file-embed ==0.0.13.0 + - file-embed-lzma ==0 + - filelock ==0.1.1.5 + - filemanip ==0.3.6.3 + - file-modules ==0.1.2.4 + - filepath-bytestring ==1.4.2.1.7 + - file-path-th ==0.1.0.0 + - filepattern ==0.1.2 + - fileplow ==0.1.0.0 + - filtrable ==0.1.4.0 + - fin ==0.2 + - FindBin ==0.0.5 + - fingertree ==0.1.4.2 + - finite-typelits ==0.1.4.2 + - first-class-families ==0.8.0.1 + - first-class-patterns ==0.3.2.5 + - fitspec ==0.4.8 + - fixed ==0.3 + - fixed-length ==0.2.2.1 + - fixed-vector ==1.2.0.0 + - fixed-vector-hetero ==0.6.1.0 + - fix-whitespace ==0.0.5 + - flac ==0.2.0 + - flac-picture ==0.1.2 + - flags-applicative ==0.1.0.3 + - flat ==0.4.4 + - flat-mcmc ==1.5.2 + - flexible-defaults ==0.0.3 + - FloatingHex ==0.5 + - floatshow ==0.2.4 + - flow ==1.0.22 + - flush-queue ==1.0.0 + - fmlist ==0.9.4 + - fmt ==0.6.1.2 + - fn ==0.3.0.2 + - focus ==1.0.2 + - focuslist ==0.1.0.2 + - foldable1 ==0.1.0.0 + - fold-debounce ==0.2.0.9 + - fold-debounce-conduit ==0.2.0.6 + - foldl ==1.4.11 + - folds ==0.7.6 + - follow-file ==0.0.3 + - FontyFruity ==0.5.3.5 + - foreign-store ==0.2 + - ForestStructures ==0.0.1.0 + - forkable-monad ==0.2.0.3 + - forma ==1.1.3 + - format-numbers ==0.1.0.1 + - formatting ==6.3.7 + - foundation ==0.0.26.1 + - fourmolu ==0.3.0.0 + - free ==5.1.5 + - free-categories ==0.2.0.2 + - 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 + - fsnotify ==0.3.0.1 + - fsnotify-conduit ==0.1.1.1 + - ftp-client ==0.5.1.4 + - ftp-client-conduit ==0.5.0.5 + - funcmp ==1.9 + - function-builder ==0.3.0.1 + - functor-classes-compat ==1.0.1 + - fusion-plugin ==0.2.2 + - fusion-plugin-types ==0.1.0 + - 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 + - gauge ==0.2.5 + - gd ==3000.7.3 + - gdp ==0.0.3.0 + - general-games ==1.1.1 + - generic-aeson ==0.2.0.12 + - generic-arbitrary ==0.1.0 + - generic-constraints ==1.1.1.1 + - generic-data ==0.9.2.0 + - generic-data-surgery ==0.3.0.0 + - generic-deriving ==1.13.1 + - generic-functor ==0.2.0.0 + - generic-lens ==2.1.0.0 + - generic-lens-core ==2.1.0.0 + - generic-monoid ==0.1.0.1 + - generic-optics ==2.1.0.0 + - GenericPretty ==1.2.2 + - generic-random ==1.3.0.1 + - generics-eot ==0.4.0.1 + - generics-sop ==0.5.1.1 + - generics-sop-lens ==0.2.0.1 + - geniplate-mirror ==0.7.7 + - genvalidity ==0.11.0.0 + - genvalidity-aeson ==0.3.0.0 + - genvalidity-bytestring ==0.6.0.0 + - genvalidity-containers ==0.9.0.0 + - genvalidity-criterion ==0.2.0.0 + - genvalidity-hspec ==0.7.0.4 + - genvalidity-hspec-aeson ==0.3.1.1 + - genvalidity-hspec-binary ==0.2.0.4 + - genvalidity-hspec-cereal ==0.2.0.4 + - genvalidity-hspec-hashable ==0.2.0.5 + - genvalidity-hspec-optics ==0.1.1.2 + - genvalidity-hspec-persistent ==0.0.0.1 + - genvalidity-mergeful ==0.2.0.0 + - genvalidity-mergeless ==0.2.0.0 + - genvalidity-path ==0.3.0.4 + - genvalidity-persistent ==0.0.0.0 + - genvalidity-property ==0.5.0.1 + - genvalidity-scientific ==0.2.1.1 + - genvalidity-sydtest ==0.0.0.0 + - genvalidity-sydtest-aeson ==0.0.0.0 + - genvalidity-sydtest-hashable ==0.0.0.0 + - genvalidity-sydtest-lens ==0.0.0.0 + - genvalidity-sydtest-persistent ==0.0.0.1 + - genvalidity-text ==0.7.0.2 + - genvalidity-time ==0.3.0.0 + - genvalidity-typed-uuid ==0.0.0.2 + - genvalidity-unordered-containers ==0.3.0.1 + - genvalidity-uuid ==0.1.0.4 + - genvalidity-vector ==0.3.0.1 + - geojson ==4.0.2 + - getopt-generics ==0.13.0.4 + - ghc-byteorder ==4.11.0.0.10 + - ghc-check ==0.5.0.4 + - ghc-core ==0.5.6 + - ghc-events ==0.17.0 + - ghc-exactprint ==0.6.4 + - ghcid ==0.8.7 + - ghci-hexcalc ==0.1.1.0 + - ghcjs-codemirror ==0.0.0.2 + - ghc-lib ==8.10.4.20210206 + - ghc-lib-parser ==8.10.4.20210206 + - ghc-lib-parser-ex ==8.10.0.19 + - ghc-parser ==0.2.3.0 + - ghc-paths ==0.1.0.12 + - ghc-prof ==1.4.1.8 + - ghc-source-gen ==0.4.0.0 + - ghc-syntax-highlighter ==0.0.6.0 + - ghc-tcplugins-extra ==0.4.1 + - ghc-trace-events ==0.1.2.2 + - ghc-typelits-extra ==0.4.2 + - ghc-typelits-knownnat ==0.7.5 + - ghc-typelits-natnormalise ==0.7.4 + - ghc-typelits-presburger ==0.6.0.0 + - ghost-buster ==0.1.1.0 + - gi-atk ==2.0.22 + - gi-cairo ==1.0.24 + - gi-cairo-connector ==0.1.0 + - gi-cairo-render ==0.1.0 + - gi-dbusmenu ==0.4.8 + - gi-dbusmenugtk3 ==0.4.9 + - gi-gdk ==3.0.23 + - gi-gdkpixbuf ==2.0.24 + - gi-gdkx11 ==3.0.10 + - gi-gio ==2.0.27 + - gi-glib ==2.0.24 + - gi-gobject ==2.0.25 + - gi-graphene ==1.0.2 + - gi-gtk ==3.0.36 + - gi-gtk-hs ==0.3.9 + - gi-harfbuzz ==0.0.3 + - ginger ==0.10.1.0 + - gingersnap ==0.3.1.0 + - gi-pango ==1.0.23 + - githash ==0.1.5.0 + - github-release ==1.3.7 + - github-rest ==1.0.3 + - github-types ==0.2.1 + - github-webhooks ==0.15.0 + - gitlab-haskell ==0.2.5 + - gitrev ==1.3.1 + - gi-xlib ==2.0.9 + - gl ==0.9 + - glabrous ==2.0.3 + - GLFW-b ==3.3.0.0 + - Glob ==0.10.1 + - gloss ==1.13.2.1 + - gloss-rendering ==1.13.1.1 + - GLURaw ==2.0.0.4 + - GLUT ==2.7.0.16 + - gluturtle ==0.0.58.1 + - gnuplot ==0.5.6.1 + - google-isbn ==1.0.3 + - gopher-proxy ==0.1.1.2 + - gothic ==0.1.6 + - gpolyline ==0.1.0.1 + - graph-core ==0.3.0.0 + - graphite ==0.10.0.1 + - graphql-client ==1.1.1 + - graphs ==0.7.1 + - graphula ==2.0.0.4 + - graphviz ==2999.20.1.0 + - graph-wrapper ==0.2.6.0 + - gravatar ==0.8.0 + - greskell ==1.2.0.1 + - greskell-core ==0.1.3.6 + - greskell-websocket ==0.1.2.5 + - groom ==0.1.2.1 + - group-by-date ==0.1.0.4 + - groups ==0.5.2 + - gtk-sni-tray ==0.1.6.0 + - gtk-strut ==0.1.3.0 + - guarded-allocation ==0.0.1 + - H ==0.9.0.1 + - hackage-db ==2.1.0 + - hackage-security ==0.6.0.1 + - haddock-library ==1.9.0 + - hadoop-streaming ==0.2.0.3 + - hakyll-convert ==0.3.0.4 + - half ==0.3.1 + - hall-symbols ==0.1.0.6 + - hamtsolo ==1.0.3 + - HandsomeSoup ==0.4.2 + - hapistrano ==0.4.1.3 + - happstack-server ==7.7.0 + - happy ==1.20.0 + - happy-meta ==0.2.0.11 + - HasBigDecimal ==0.1.1 + - hasbolt ==0.1.4.5 + - hashable ==1.3.0.0 + - hashable-time ==0.2.1 + - hashids ==1.0.2.4 + - hashing ==0.1.0.1 + - hashmap ==1.3.3 + - hashtables ==1.2.4.1 + - haskeline ==0.8.1.2 + - haskell-awk ==1.2.0.1 + - haskell-gi ==0.24.7 + - haskell-gi-base ==0.24.5 + - haskell-gi-overloading ==1.0 + - haskell-import-graph ==1.0.4 + - haskell-lexer ==1.1 + - haskell-lsp ==0.22.0.0 + - haskell-lsp-types ==0.22.0.0 + - haskell-names ==0.9.9 + - HaskellNet ==0.6 + - haskell-src ==1.0.3.1 + - haskell-src-exts ==1.23.1 + - haskell-src-exts-util ==0.2.5 + - haskell-src-meta ==0.8.7 + - haskey-btree ==0.3.0.1 + - hasql ==1.4.5.1 + - hasql-notifications ==0.2.0.0 + - hasql-optparse-applicative ==0.3.0.6 + - hasql-pool ==0.5.2 + - hasql-queue ==1.2.0.2 + - hasql-transaction ==1.0.0.2 + - hasty-hamiltonian ==1.3.4 + - HaTeX ==3.22.3.0 + - HaXml ==1.25.5 + - haxr ==3000.11.4.1 + - HCodecs ==0.5.2 + - hdaemonize ==0.5.6 + - HDBC ==2.4.0.3 + - HDBC-session ==0.1.2.0 + - headroom ==0.4.1.0 + - heap ==1.0.4 + - heaps ==0.4 + - hebrew-time ==0.1.2 + - hedgehog ==1.0.5 + - hedgehog-corpus ==0.2.0 + - hedgehog-fakedata ==0.0.1.4 + - hedgehog-fn ==1.0 + - hedgehog-quickcheck ==0.1.1 + - hedis ==0.14.2 + - hedn ==0.3.0.2 + - here ==1.2.13 + - heredoc ==0.2.0.0 + - heterocephalus ==1.0.5.4 + - hexml ==0.3.4 + - hexml-lens ==0.2.1 + - hexpat ==0.20.13 + - hformat ==0.3.3.1 + - hfsevents ==0.1.6 + - hgrev ==0.2.6 + - hidapi ==0.1.7 + - hie-bios ==0.7.5 + - hi-file-parser ==0.1.2.0 + - higher-leveldb ==0.6.0.0 + - highlighting-kate ==0.6.4 + - hinfo ==0.0.3.0 + - hinotify ==0.4.1 + - hint ==0.9.0.4 + - hjsmin ==0.2.0.4 + - hkd-default ==1.1.0.0 + - hkgr ==0.3 + - hlibcpuid ==0.2.0 + - hlibgit2 ==0.18.0.16 + - hlibsass ==0.1.10.1 + - hmatrix ==0.20.2 + - hmatrix-backprop ==0.1.3.0 + - hmatrix-gsl ==0.19.0.1 + - hmatrix-gsl-stats ==0.4.1.8 + - hmatrix-morpheus ==0.1.1.2 + - hmatrix-vector-sized ==0.1.3.0 + - hmm-lapack ==0.4 + - hmpfr ==0.4.4 + - hnock ==0.4.0 + - hoauth2 ==1.16.0 + - hocon ==0.1.0.4 + - hOpenPGP ==2.9.5 + - hopenpgp-tools ==0.23.6 + - hopfli ==0.2.2.1 + - hosc ==0.18.1 + - hostname ==1.0 + - hostname-validate ==1.0.0 + - hourglass ==0.2.12 + - hourglass-orphans ==0.1.0.0 + - hp2pretty ==0.10 + - hpack ==0.34.4 + - hpack-dhall ==0.5.2 + - hpc-codecov ==0.3.0.0 + - hpc-lcov ==1.0.1 + - hprotoc ==2.4.17 + - hruby ==0.3.8.1 + - hsass ==0.8.0 + - hs-bibutils ==6.10.0.0 + - hsc2hs ==0.68.7 + - hscolour ==1.24.4 + - hsdns ==1.8 + - hsebaysdk ==0.4.1.0 + - hsemail ==2.2.1 + - hs-functors ==0.1.7.1 + - hs-GeoIP ==0.3 + - hsini ==0.5.1.2 + - hsinstall ==2.6 + - HSlippyMap ==3.0.1 + - hslogger ==1.3.1.0 + - hslua ==1.3.0.1 + - hslua-aeson ==1.0.3.1 + - hslua-module-doclayout ==0.2.0.1 + - hslua-module-path ==0.1.0.1 + - hslua-module-system ==0.2.2.1 + - hslua-module-text ==0.3.0.1 + - HsOpenSSL ==0.11.7 + - HsOpenSSL-x509-system ==0.1.0.4 + - hsp ==0.10.0 + - hspec ==2.7.10 + - hspec-attoparsec ==0.1.0.2 + - hspec-checkers ==0.1.0.2 + - hspec-contrib ==0.5.1 + - hspec-core ==2.7.10 + - hspec-discover ==2.7.10 + - hspec-expectations ==0.8.2 + - hspec-expectations-json ==1.0.0.3 + - hspec-expectations-lifted ==0.10.0 + - hspec-expectations-pretty-diff ==0.7.2.5 + - hspec-golden ==0.1.0.3 + - hspec-golden-aeson ==0.7.0.0 + - hspec-hedgehog ==0.0.1.2 + - hspec-junit-formatter ==1.0.0.2 + - hspec-leancheck ==0.0.4 + - hspec-megaparsec ==2.2.0 + - hspec-meta ==2.7.8 + - hspec-need-env ==0.1.0.6 + - hspec-parsec ==0 + - hspec-smallcheck ==0.5.2 + - hspec-tables ==0.0.1 + - hspec-wai ==0.11.0 + - hspec-wai-json ==0.11.0 + - hs-php-session ==0.0.9.3 + - hsshellscript ==3.5.0 + - hs-tags ==0.1.5 + - HStringTemplate ==0.8.7 + - HSvm ==0.1.1.3.22 + - HsYAML ==0.2.1.0 + - HsYAML-aeson ==0.2.0.0 + - hsyslog ==5.0.2 + - htaglib ==1.2.0 + - HTF ==0.14.0.6 + - html ==1.0.1.2 + - html-conduit ==1.3.2.1 + - html-entities ==1.1.4.5 + - html-entity-map ==0.1.0.0 + - htoml ==1.0.0.3 + - http2 ==3.0.1 + - HTTP ==4000.3.16 + - http-api-data ==0.4.2 + - http-client ==0.6.4.1 + - http-client-openssl ==0.3.2.0 + - http-client-overrides ==0.1.1.0 + - http-client-tls ==0.3.5.3 + - http-common ==0.8.2.1 + - http-conduit ==2.3.8 + - http-date ==0.0.11 + - http-directory ==0.1.8 + - http-download ==0.2.0.0 + - httpd-shed ==0.4.1.1 + - http-link-header ==1.2.0 + - http-media ==0.8.0.0 + - http-query ==0.1.0.1 + - http-reverse-proxy ==0.6.0 + - http-streams ==0.8.7.2 + - http-types ==0.12.3 + - human-readable-duration ==0.2.1.4 + - HUnit ==1.6.2.0 + - HUnit-approx ==1.1.1.1 + - hunit-dejafu ==2.0.0.4 + - hvect ==0.4.0.0 + - hvega ==0.11.0.1 + - hw-balancedparens ==0.4.1.1 + - hw-bits ==0.7.2.1 + - hw-conduit ==0.2.1.0 + - hw-conduit-merges ==0.2.1.0 + - hw-diagnostics ==0.0.1.0 + - hw-dsv ==0.4.1.0 + - hweblib ==0.6.3 + - hw-eliasfano ==0.1.2.0 + - hw-excess ==0.2.3.0 + - hw-fingertree ==0.1.2.0 + - hw-fingertree-strict ==0.1.2.0 + - hw-hedgehog ==0.1.1.0 + - hw-hspec-hedgehog ==0.1.1.0 + - hw-int ==0.0.2.0 + - hw-ip ==2.4.2.0 + - hw-json ==1.3.2.2 + - hw-json-simd ==0.1.1.0 + - hw-json-simple-cursor ==0.1.1.0 + - hw-json-standard-cursor ==0.2.3.1 + - hw-kafka-client ==4.0.3 + - hw-mquery ==0.2.1.0 + - hw-packed-vector ==0.2.1.0 + - hw-parser ==0.1.1.0 + - hw-prim ==0.6.3.0 + - hw-rankselect ==0.13.4.0 + - hw-rankselect-base ==0.3.4.1 + - hw-simd ==0.1.2.0 + - hw-streams ==0.0.1.0 + - hw-string-parse ==0.0.0.4 + - hw-succinct ==0.1.0.1 + - hw-xml ==0.5.1.0 + - hxt ==9.3.1.22 + - hxt-charproperties ==9.5.0.0 + - hxt-css ==0.1.0.3 + - hxt-curl ==9.1.1.1 + - hxt-expat ==9.1.1 + - hxt-http ==9.1.5.2 + - hxt-regex-xmlschema ==9.2.0.7 + - hxt-tagsoup ==9.1.4 + - hxt-unicode ==9.0.2.4 + - hybrid-vectors ==0.2.2 + - hyper ==0.2.1.1 + - hyperloglog ==0.4.4 + - hyphenation ==0.8.1 + - iconv ==0.4.1.3 + - identicon ==0.2.2 + - ieee754 ==0.8.0 + - if ==0.1.0.0 + - iff ==0.0.6 + - ihaskell ==0.10.2.0 + - ihs ==0.1.0.3 + - ilist ==0.4.0.1 + - imagesize-conduit ==1.1 + - Imlib ==0.1.2 + - immortal ==0.3 + - immortal-queue ==0.1.0.1 + - inbox ==0.1.0 + - include-file ==0.1.0.4 + - incremental-parser ==0.5.0.2 + - indents ==0.5.0.1 + - indexed ==0.1.3 + - indexed-containers ==0.1.0.2 + - indexed-list-literals ==0.2.1.3 + - indexed-profunctors ==0.1.1 + - indexed-traversable ==0.1.1 + - indexed-traversable-instances ==0.1 + - infer-license ==0.2.0 + - inflections ==0.4.0.6 + - influxdb ==1.9.1.2 + - ini ==0.4.1 + - inj ==1.0 + - inline-c ==0.9.1.4 + - inline-c-cpp ==0.4.0.3 + - inline-r ==0.10.4 + - inliterate ==0.1.0 + - input-parsers ==0.2.2 + - insert-ordered-containers ==0.2.4 + - inspection-testing ==0.4.5.0 + - instance-control ==0.1.2.0 + - int-cast ==0.2.0.0 + - integer-logarithms ==1.0.3.1 + - integer-roots ==1.0 + - integration ==0.2.1 + - intern ==0.9.4 + - interpolate ==0.2.1 + - interpolatedstring-perl6 ==1.0.2 + - interpolation ==0.1.1.1 + - interpolator ==1.1.0.2 + - IntervalMap ==0.6.1.2 + - intervals ==0.9.2 + - intro ==0.9.0.0 + - intset-imperative ==0.1.0.0 + - invariant ==0.5.4 + - invertible ==0.2.0.7 + - invertible-grammar ==0.1.3 + - io-machine ==0.2.0.0 + - io-manager ==0.1.0.3 + - io-memoize ==1.1.1.0 + - io-region ==0.1.1 + - io-storage ==0.3 + - io-streams ==1.5.2.0 + - io-streams-haproxy ==1.0.1.0 + - ip6addr ==1.0.2 + - ipa ==0.3.1 + - iproute ==1.7.11 + - IPv6Addr ==2.0.2 + - ipynb ==0.1.0.1 + - ipython-kernel ==0.10.2.1 + - irc ==0.6.1.0 + - irc-client ==1.1.2.1 + - irc-conduit ==0.3.0.4 + - irc-ctcp ==0.1.3.0 + - isbn ==1.1.0.2 + - islink ==0.1.0.0 + - iso3166-country-codes ==0.20140203.8 + - iso639 ==0.1.0.3 + - iso8601-time ==0.1.5 + - iterable ==3.0 + - ixset-typed ==0.5 + - ixset-typed-binary-instance ==0.1.0.2 + - ixset-typed-conversions ==0.1.2.0 + - ixset-typed-hashable-instance ==0.1.0.2 + - ix-shapable ==0.1.0 + - jack ==0.7.2 + - jalaali ==1.0.0.0 + - jira-wiki-markup ==1.3.4 + - jose ==0.8.4 + - jose-jwt ==0.9.2 + - js-chart ==2.9.4.1 + - js-dgtable ==0.5.2 + - js-flot ==0.8.3 + - js-jquery ==3.3.1 + - json-feed ==1.0.12 + - jsonpath ==0.2.0.0 + - json-rpc ==1.0.3 + - json-rpc-generic ==0.2.1.5 + - JuicyPixels ==3.3.5 + - JuicyPixels-blurhash ==0.1.0.3 + - JuicyPixels-extra ==0.4.1 + - JuicyPixels-scale-dct ==0.1.2 + - junit-xml ==0.1.0.2 + - justified-containers ==0.3.0.0 + - jwt ==0.10.0 + - kan-extensions ==5.2.2 + - kanji ==3.4.1 + - katip ==0.8.5.0 + - katip-logstash ==0.1.0.0 + - kawhi ==0.3.0 + - kazura-queue ==0.1.0.4 + - kdt ==0.2.4 + - keep-alive ==0.2.0.0 + - keycode ==0.2.2 + - keys ==3.12.3 + - ki ==0.2.0.1 + - kind-apply ==0.3.2.0 + - kind-generics ==0.4.1.0 + - kind-generics-th ==0.2.2.2 + - kmeans ==0.1.3 + - koji ==0.0.2 + - koofr-client ==1.0.0.3 + - krank ==0.2.2 + - kubernetes-webhook-haskell ==0.2.0.3 + - l10n ==0.1.0.1 + - labels ==0.3.3 + - lackey ==1.0.14 + - LambdaHack ==0.10.2.0 + - lame ==0.2.0 + - language-avro ==0.1.3.1 + - language-bash ==0.9.2 + - language-c ==0.8.3 + - language-c-quote ==0.13 + - language-docker ==10.0.0 + - language-java ==0.2.9 + - language-javascript ==0.7.1.0 + - language-protobuf ==1.0.1 + - language-python ==0.5.8 + - language-thrift ==0.12.0.0 + - lapack ==0.3.2 + - lapack-carray ==0.0.3 + - lapack-comfort-array ==0.0.0.1 + - lapack-ffi ==0.0.3 + - lapack-ffi-tools ==0.1.2.1 + - largeword ==1.2.5 + - latex ==0.1.0.4 + - lattices ==2.0.2 + - lawful ==0.1.0.0 + - lazy-csv ==0.5.1 + - lazyio ==0.1.0.4 + - lca ==0.4 + - leancheck ==0.9.4 + - leancheck-instances ==0.0.4 + - leapseconds-announced ==2017.1.0.1 + - learn-physics ==0.6.5 + - lens ==4.19.2 + - lens-action ==0.2.5 + - lens-aeson ==1.1.1 + - lens-csv ==0.1.1.0 + - lens-datetime ==0.3 + - lens-family ==2.0.0 + - lens-family-core ==2.0.0 + - lens-family-th ==0.5.2.0 + - lens-misc ==0.0.2.0 + - lens-process ==0.4.0.0 + - lens-properties ==4.11.1 + - lens-regex ==0.1.3 + - lens-regex-pcre ==1.1.0.0 + - lenz ==0.4.2.0 + - leveldb-haskell ==0.6.5 + - libffi ==0.1 + - libgit ==0.3.1 + - libgraph ==1.14 + - libjwt-typed ==0.2 + - libmpd ==0.10.0.0 + - liboath-hs ==0.0.1.2 + - libyaml ==0.1.2 + - LibZip ==1.0.1 + - lifted-async ==0.10.2 + - lifted-base ==0.2.3.12 + - lift-generics ==0.2 + - lift-type ==0.1.0.1 + - line ==4.0.1 + - linear ==1.21.5 + - linear-circuit ==0.1.0.2 + - linenoise ==0.3.2 + - linux-file-extents ==0.2.0.0 + - linux-namespaces ==0.1.3.0 + - liquid-fixpoint ==0.8.10.2 + - List ==0.6.2 + - ListLike ==4.7.4 + - list-predicate ==0.1.0.1 + - listsafe ==0.1.0.1 + - list-singleton ==1.0.0.5 + - list-t ==1.0.4 + - ListTree ==0.2.3 + - little-rio ==0.2.2 + - llvm-hs ==9.0.1 + - llvm-hs-pure ==9.0.0 + - lmdb ==0.2.5 + - load-env ==0.2.1.0 + - loc ==0.1.3.10 + - locators ==0.3.0.3 + - loch-th ==0.2.2 + - lockfree-queue ==0.2.3.1 + - log-domain ==0.13.1 + - logfloat ==0.13.3.3 + - logging ==3.0.5 + - logging-facade ==0.3.0 + - logging-facade-syslog ==1 + - logict ==0.7.1.0 + - logstash ==0.1.0.1 + - loop ==0.3.0 + - lrucache ==1.2.0.1 + - lrucaching ==0.3.3 + - lsp-test ==0.11.0.5 + - lucid ==2.9.12.1 + - lucid-cdn ==0.2.2.0 + - lucid-extras ==0.2.2 + - lukko ==0.1.1.3 + - lz4-frame-conduit ==0.1.0.1 + - lzma ==0.0.0.3 + - lzma-conduit ==1.2.1 + - machines ==0.7.2 + - machines-binary ==7.0.0.0 + - magic ==1.1 + - magico ==0.0.2.1 + - mainland-pretty ==0.7.1 + - main-tester ==0.2.0.1 + - makefile ==1.1.0.0 + - managed ==1.0.8 + - MapWith ==0.2.0.0 + - markdown ==0.1.17.4 + - markdown-unlit ==0.5.1 + - markov-chain ==0.0.3.4 + - massiv ==0.6.0.0 + - massiv-io ==0.4.1.0 + - massiv-persist ==0.1.0.0 + - massiv-serialise ==0.1.0.0 + - massiv-test ==0.1.6.1 + - mathexpr ==0.3.0.0 + - math-extras ==0.1.1.0 + - math-functions ==0.3.4.2 + - matplotlib ==0.7.5 + - matrices ==0.5.0 + - matrix ==0.3.6.1 + - matrix-as-xyz ==0.1.2.2 + - matrix-market-attoparsec ==0.1.1.3 + - matrix-static ==0.3 + - maximal-cliques ==0.1.1 + - mbox ==0.3.4 + - mbox-utility ==0.0.3.1 + - mcmc ==0.4.0.0 + - mcmc-types ==1.0.3 + - medea ==1.2.0 + - median-stream ==0.7.0.0 + - med-module ==0.1.2.1 + - megaparsec ==9.0.1 + - megaparsec-tests ==9.0.1 + - membrain ==0.0.0.2 + - memory ==0.15.0 + - MemoTrie ==0.6.10 + - mercury-api ==0.1.0.2 + - mergeful ==0.2.0.0 + - mergeless ==0.3.0.0 + - mersenne-random-pure64 ==0.2.2.0 + - messagepack ==0.5.4 + - metrics ==0.4.1.1 + - mfsolve ==0.3.2.0 + - microlens ==0.4.12.0 + - microlens-aeson ==2.3.1 + - microlens-contra ==0.1.0.2 + - microlens-ghc ==0.4.13 + - microlens-mtl ==0.2.0.1 + - microlens-platform ==0.4.2 + - microlens-process ==0.2.0.2 + - microlens-th ==0.4.3.9 + - microspec ==0.2.1.3 + - microstache ==1.0.1.2 + - midair ==0.2.0.1 + - midi ==0.2.2.2 + - mighty-metropolis ==2.0.0 + - mime-mail ==0.5.1 + - mime-mail-ses ==0.4.3 + - mime-types ==0.1.0.9 + - mini-egison ==1.0.0 + - minimal-configuration ==0.1.4 + - minimorph ==0.3.0.0 + - minio-hs ==1.5.3 + - miniutter ==0.5.1.1 + - min-max-pqueue ==0.1.0.2 + - mintty ==0.1.2 + - missing-foreign ==0.1.1 + - MissingH ==1.4.3.0 + - mixed-types-num ==0.5.0.3 + - mltool ==0.2.0.1 + - mmap ==0.5.9 + - mmark ==0.0.7.2 + - mmark-cli ==0.0.5.0 + - mmark-ext ==0.2.1.3 + - mmorph ==1.1.5 + - mnist-idx ==0.1.2.8 + - mockery ==0.3.5 + - mock-time ==0.1.0 + - mod ==0.1.2.2 + - model ==0.5 + - modern-uri ==0.3.4.1 + - modular ==0.1.0.8 + - monad-chronicle ==1.0.0.1 + - monad-control ==1.0.2.3 + - monad-control-aligned ==0.0.1.1 + - monad-coroutine ==0.9.1 + - monad-extras ==0.6.0 + - monadic-arrays ==0.2.2 + - monad-journal ==0.8.1 + - monadlist ==0.0.2 + - monad-logger ==0.3.36 + - monad-logger-json ==0.1.0.0 + - monad-logger-logstash ==0.1.0.0 + - monad-logger-prefix ==0.1.12 + - monad-loops ==0.4.3 + - monad-memo ==0.5.3 + - monad-metrics ==0.2.2.0 + - monad-par ==0.3.5 + - monad-parallel ==0.7.2.4 + - monad-par-extras ==0.3.3 + - monad-peel ==0.2.1.2 + - monad-primitive ==0.1 + - monad-products ==4.0.1 + - MonadPrompt ==1.0.0.5 + - MonadRandom ==0.5.3 + - 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 + - mongoDB ==2.7.0.0 + - 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 + - more-containers ==0.2.2.2 + - morpheus-graphql ==0.17.0 + - morpheus-graphql-app ==0.17.0 + - morpheus-graphql-client ==0.17.0 + - morpheus-graphql-core ==0.17.0 + - morpheus-graphql-subscriptions ==0.17.0 + - moss ==0.2.0.0 + - mountpoints ==1.0.2 + - mpi-hs ==0.7.2.0 + - mpi-hs-binary ==0.1.1.0 + - 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 + - multimap ==1.2.1 + - multipart ==0.2.1 + - multiset ==0.3.4.3 + - multistate ==0.8.0.3 + - murmur3 ==1.0.4 + - murmur-hash ==0.1.0.9 + - MusicBrainz ==0.4.1 + - mustache ==2.3.1 + - mutable-containers ==0.3.4 + - mwc-probability ==2.3.1 + - mwc-random ==0.14.0.0 + - mwc-random-monad ==0.7.3.1 + - mx-state-codes ==1.0.0.0 + - mysql ==0.2.0.1 + - mysql-simple ==0.4.6 + - n2o ==0.11.1 + - nagios-check ==0.3.2 + - names-th ==0.3.0.1 + - nano-erl ==0.1.0.1 + - nanospec ==0.2.2 + - nats ==1.1.2 + - natural-induction ==0.2.0.0 + - natural-sort ==0.1.2 + - natural-transformation ==0.4 + - ndjson-conduit ==0.1.0.5 + - neat-interpolation ==0.5.1.2 + - netcode-io ==0.0.2 + - netlib-carray ==0.1 + - netlib-comfort-array ==0.0.0.1 + - netlib-ffi ==0.1.1 + - netpbm ==1.0.4 + - nettle ==0.3.0 + - netwire ==5.0.3 + - netwire-input ==0.0.7 + - netwire-input-glfw ==0.0.11 + - network ==3.1.1.1 + - network-bsd ==2.8.1.0 + - network-byte-order ==0.1.6 + - network-conduit-tls ==1.3.2 + - network-info ==0.2.0.10 + - network-ip ==0.3.0.3 + - network-messagepack-rpc ==0.1.2.0 + - network-messagepack-rpc-websocket ==0.1.1.1 + - network-run ==0.2.4 + - network-simple ==0.4.5 + - network-simple-tls ==0.4 + - network-transport ==0.5.4 + - network-transport-composed ==0.2.1 + - network-uri ==2.6.4.1 + - newtype ==0.2.2.0 + - newtype-generics ==0.6 + - nicify-lib ==1.0.1 + - NineP ==0.0.2.1 + - nix-derivation ==1.1.2 + - nix-paths ==1.0.1 + - nonce ==1.0.7 + - nondeterminism ==1.4 + - non-empty ==0.3.3 + - nonempty-containers ==0.3.4.1 + - nonemptymap ==0.0.6.0 + - non-empty-sequence ==0.2.0.4 + - nonempty-vector ==0.2.1.0 + - nonempty-zipper ==1.0.0.2 + - non-negative ==0.1.2 + - not-gloss ==0.7.7.0 + - no-value ==1.0.0.0 + - nowdoc ==0.1.1.0 + - nqe ==0.6.3 + - nri-env-parser ==0.1.0.7 + - nri-observability ==0.1.0.2 + - nri-prelude ==0.6.0.0 + - nsis ==0.3.3 + - numbers ==3000.2.0.2 + - numeric-extras ==0.1 + - numeric-prelude ==0.4.3.3 + - numhask ==0.6.0.2 + - NumInstances ==1.4 + - numtype-dk ==0.5.0.2 + - nuxeo ==0.3.2 + - nvim-hs ==2.1.0.4 + - nvim-hs-contrib ==2.0.0.0 + - nvim-hs-ghcid ==2.0.0.0 + - oauthenticated ==0.2.1.0 + - ObjectName ==1.1.0.1 + - o-clock ==1.2.0.1 + - odbc ==0.2.2 + - oeis2 ==1.0.5 + - ofx ==0.4.4.0 + - old-locale ==1.0.0.7 + - old-time ==1.1.0.3 + - once ==0.4 + - one-liner ==1.0 + - one-liner-instances ==0.1.2.1 + - OneTuple ==0.2.2.1 + - Only ==0.1 + - oo-prototypes ==0.1.0.0 + - opaleye ==0.7.1.0 + - OpenAL ==1.7.0.5 + - openapi3 ==3.1.0 + - open-browser ==0.2.1.0 + - openexr-write ==0.1.0.2 + - OpenGL ==3.0.3.0 + - OpenGLRaw ==3.3.4.0 + - openpgp-asciiarmor ==0.1.2 + - opensource ==0.1.1.0 + - openssl-streams ==1.2.3.0 + - opentelemetry ==0.6.1 + - opentelemetry-extra ==0.6.1 + - opentelemetry-lightstep ==0.6.1 + - opentelemetry-wai ==0.6.1 + - operational ==0.2.3.5 + - operational-class ==0.3.0.0 + - optics ==0.3 + - optics-core ==0.3.0.1 + - optics-extra ==0.3 + - optics-th ==0.3.0.2 + - optics-vl ==0.2.1 + - optional-args ==1.0.2 + - options ==1.2.1.1 + - optparse-applicative ==0.16.1.0 + - optparse-generic ==1.4.4 + - optparse-simple ==0.1.1.3 + - optparse-text ==0.1.1.0 + - ordered-containers ==0.2.2 + - ormolu ==0.1.4.1 + - overhang ==1.0.0 + - packcheck ==0.5.1 + - packdeps ==0.6.0.0 + - pager ==0.1.1.0 + - pagination ==0.2.2 + - pagure-cli ==0.2 + - pandoc ==2.13 + - pandoc-dhall-decoder ==0.1.0.1 + - pandoc-plot ==1.2.0 + - pandoc-throw ==0.1.0.0 + - pandoc-types ==1.22 + - pantry ==0.5.1.5 + - parallel ==3.2.2.0 + - parallel-io ==0.3.3 + - parameterized ==0.5.0.0 + - paripari ==0.7.0.0 + - parseargs ==0.2.0.9 + - parsec-class ==1.0.0.0 + - parsec-numbers ==0.1.0 + - parsec-numeric ==0.1.0.0 + - ParsecTools ==0.0.2.0 + - parser-combinators ==1.2.1 + - parser-combinators-tests ==1.2.1 + - parsers ==0.12.10 + - partial-handler ==1.0.3 + - partial-isomorphisms ==0.2.2.1 + - partial-semigroup ==0.5.1.8 + - password ==3.0.0.0 + - password-instances ==3.0.0.0 + - password-types ==1.0.0.0 + - path ==0.7.0 + - path-binary-instance ==0.1.0.1 + - path-extensions ==0.1.1.0 + - path-extra ==0.2.0 + - path-io ==1.6.2 + - path-like ==0.2.0.2 + - path-pieces ==0.2.1 + - path-text-utf8 ==0.0.1.6 + - pathtype ==0.8.1.1 + - pathwalk ==0.3.1.2 + - pattern-arrows ==0.0.2 + - pava ==0.1.1.1 + - pcg-random ==0.1.3.7 + - pcre2 ==1.1.4 + - pcre-heavy ==1.0.0.2 + - pcre-light ==0.4.1.0 + - pcre-utils ==0.1.8.2 + - pdfinfo ==1.5.4 + - peano ==0.1.0.1 + - pem ==0.2.4 + - percent-format ==0.0.1 + - peregrin ==0.3.1 + - perfect-hash-generator ==0.2.0.6 + - perfect-vector-shuffle ==0.1.1.1 + - persist ==0.1.1.5 + - persistable-record ==0.6.0.5 + - persistable-types-HDBC-pg ==0.0.3.5 + - persistent ==2.11.0.4 + - persistent-documentation ==0.1.0.2 + - persistent-mtl ==0.2.1.0 + - persistent-mysql ==2.10.3.1 + - persistent-pagination ==0.1.1.2 + - persistent-postgresql ==2.11.0.1 + - persistent-qq ==2.9.2.1 + - persistent-sqlite ==2.11.1.0 + - persistent-template ==2.9.1.0 + - persistent-test ==2.0.3.5 + - persistent-typed-db ==0.1.0.2 + - pg-harness-client ==0.6.0 + - pgp-wordlist ==0.1.0.3 + - pg-transact ==0.3.1.1 + - phantom-state ==0.2.1.2 + - pid1 ==0.1.2.0 + - pinboard ==0.10.2.0 + - pipes ==4.3.16 + - pipes-aeson ==0.4.1.8 + - pipes-attoparsec ==0.5.1.5 + - pipes-binary ==0.4.2 + - pipes-bytestring ==2.1.7 + - pipes-concurrency ==2.0.12 + - pipes-csv ==1.4.3 + - pipes-extras ==1.0.15 + - pipes-fastx ==0.3.0.0 + - pipes-group ==1.0.12 + - pipes-http ==1.0.6 + - pipes-network ==0.6.5 + - pipes-network-tls ==0.4 + - pipes-ordered-zip ==1.2.1 + - pipes-parse ==3.0.9 + - pipes-random ==1.0.0.5 + - pipes-safe ==2.3.3 + - pipes-wai ==3.2.0 + - pkcs10 ==0.2.0.0 + - pkgtreediff ==0.4.1 + - place-cursor-at ==1.0.1 + - placeholders ==0.1 + - plaid ==0.1.0.4 + - plotlyhs ==0.2.1 + - pointed ==5.0.2 + - pointedlist ==0.6.1 + - pointless-fun ==1.1.0.6 + - poll ==0.0.0.2 + - poly ==0.5.0.0 + - poly-arity ==0.1.0 + - polynomials-bernstein ==1.1.2 + - polyparse ==1.13 + - polysemy ==1.5.0.0 + - polysemy-plugin ==0.3.0.0 + - pooled-io ==0.0.2.2 + - port-utils ==0.2.1.0 + - posix-paths ==0.2.1.6 + - possibly ==1.0.0.0 + - postgres-options ==0.2.0.0 + - postgresql-binary ==0.12.4 + - postgresql-libpq ==0.9.4.3 + - postgresql-libpq-notify ==0.2.0.0 + - postgresql-orm ==0.5.1 + - postgresql-simple ==0.6.4 + - postgresql-typed ==0.6.2.0 + - postgrest ==7.0.1 + - post-mess-age ==0.2.1.0 + - pptable ==0.3.0.0 + - pqueue ==1.4.1.3 + - prairie ==0.0.1.0 + - 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-diff ==0.4.0.3 + - pretty-hex ==1.1 + - prettyprinter ==1.7.0 + - prettyprinter-ansi-terminal ==1.1.2 + - prettyprinter-compat-annotated-wl-pprint ==1.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 ==4.0.0.0 + - pretty-sop ==0.2.0.3 + - pretty-terminal ==0.1.0.0 + - primes ==0.2.1.0 + - primitive ==0.7.1.0 + - primitive-addr ==0.1.0.2 + - primitive-extras ==0.10.1 + - primitive-unaligned ==0.1.1.1 + - primitive-unlifted ==0.1.3.0 + - print-console-colors ==0.1.0.0 + - probability ==0.2.7 + - process-extras ==0.7.4 + - product-isomorphic ==0.0.3.3 + - product-profunctors ==0.11.0.2 + - profiterole ==0.1 + - profunctors ==5.5.2 + - projectroot ==0.2.0.1 + - project-template ==0.2.1.0 + - prometheus ==2.2.2 + - prometheus-client ==1.0.1 + - prometheus-wai-middleware ==1.0.1.0 + - promises ==0.3 + - prompt ==0.1.1.2 + - prospect ==0.1.0.0 + - proto3-wire ==1.2.1 + - protobuf ==0.2.1.3 + - protobuf-simple ==0.1.1.0 + - protocol-buffers ==2.4.17 + - protocol-buffers-descriptor ==2.4.17 + - protocol-radius ==0.0.1.1 + - protocol-radius-test ==0.1.0.1 + - proto-lens ==0.7.0.0 + - proto-lens-protobuf-types ==0.7.0.0 + - proto-lens-protoc ==0.7.0.0 + - proto-lens-runtime ==0.7.0.0 + - proto-lens-setup ==0.4.0.4 + - protolude ==0.3.0 + - proxied ==0.3.1 + - psqueues ==0.2.7.2 + - publicsuffix ==0.20200526 + - pulse-simple ==0.1.14 + - pureMD5 ==2.1.3 + - purescript-bridge ==0.14.0.0 + - pushbullet-types ==0.4.1.0 + - pusher-http-haskell ==2.1.0.2 + - pvar ==1.0.0.0 + - PyF ==0.9.0.3 + - qchas ==1.1.0.1 + - qm-interpolated-string ==0.3.0.0 + - qrcode-core ==0.9.4 + - qrcode-juicypixels ==0.8.2 + - quadratic-irrational ==0.1.1 + - QuasiText ==0.1.2.6 + - QuickCheck ==2.14.2 + - quickcheck-arbitrary-adt ==0.3.1.0 + - quickcheck-assertions ==0.3.0 + - quickcheck-classes ==0.6.5.0 + - quickcheck-classes-base ==0.6.2.0 + - quickcheck-higherorder ==0.1.0.0 + - quickcheck-instances ==0.3.25.2 + - quickcheck-io ==0.2.0 + - quickcheck-simple ==0.1.1.1 + - quickcheck-special ==0.1.0.6 + - quickcheck-text ==0.1.2.1 + - quickcheck-transformer ==0.3.1.1 + - quickcheck-unicode ==1.0.1.0 + - quiet ==0.2 + - quote-quot ==0.2.0.0 + - radius ==0.7.1.0 + - rainbow ==0.34.2.2 + - rainbox ==0.26.0.0 + - ral ==0.2 + - rampart ==1.1.0.2 + - ramus ==0.1.2 + - rando ==0.0.0.4 + - random ==1.1 + - random-bytestring ==0.1.4 + - random-fu ==0.2.7.4 + - random-shuffle ==0.0.4 + - random-source ==0.3.0.8 + - random-tree ==0.6.0.5 + - range ==0.3.0.2 + - ranged-list ==0.1.0.0 + - Ranged-sets ==0.4.0 + - range-set-list ==0.1.3.1 + - rank1dynamic ==0.4.1 + - rank2classes ==1.4.1 + - Rasterific ==0.7.5.3 + - rasterific-svg ==0.3.3.2 + - ratel ==1.0.14 + - rate-limit ==1.4.2 + - ratel-wai ==1.1.5 + - rattle ==0.2 + - rattletrap ==11.1.1 + - Rattus ==0.5 + - rawfilepath ==0.2.4 + - rawstring-qm ==0.2.3.0 + - raw-strings-qq ==1.1 + - rcu ==0.2.5 + - rdf ==0.1.0.5 + - 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 + - rebase ==1.6.1 + - record-dot-preprocessor ==0.2.10 + - record-hasfield ==1.0 + - records-sop ==0.1.1.0 + - record-wrangler ==0.1.1.0 + - recursion-schemes ==5.2.2.1 + - reducers ==3.12.3 + - refact ==0.3.0.2 + - ref-fd ==0.5 + - refined ==0.6.2 + - reflection ==2.1.6 + - reform ==0.2.7.4 + - reform-blaze ==0.2.4.3 + - reform-hamlet ==0.0.5.3 + - reform-happstack ==0.2.5.4 + - RefSerialize ==0.4.0 + - ref-tf ==0.5 + - regex ==1.1.0.0 + - regex-applicative ==0.3.4 + - regex-applicative-text ==0.1.0.1 + - regex-base ==0.94.0.1 + - regex-compat ==0.95.2.1 + - regex-compat-tdfa ==0.95.1.4 + - regex-pcre ==0.95.0.0 + - regex-pcre-builtin ==0.95.2.3.8.43 + - regex-posix ==0.96.0.0 + - regex-tdfa ==1.3.1.0 + - regex-with-pcre ==1.1.0.0 + - registry ==0.2.0.3 + - reinterpret-cast ==0.1.0 + - relapse ==1.0.0.0 + - relational-query ==0.12.2.3 + - relational-query-HDBC ==0.7.2.0 + - relational-record ==0.2.2.0 + - relational-schemas ==0.1.8.0 + - reliable-io ==0.0.1 + - relude ==0.7.0.0 + - renderable ==0.2.0.1 + - replace-attoparsec ==1.4.4.0 + - replace-megaparsec ==1.4.4.0 + - repline ==0.4.0.0 + - req ==3.9.0 + - req-conduit ==1.0.0 + - rerebase ==1.6.1 + - rescue ==0.4.2.1 + - resistor-cube ==0.0.1.2 + - resolv ==0.1.2.0 + - resource-pool ==0.2.3.2 + - resourcet ==1.2.4.2 + - result ==0.2.6.0 + - rethinkdb-client-driver ==0.0.25 + - retry ==0.8.1.2 + - rev-state ==0.1.2 + - rfc1751 ==0.1.3 + - rfc5051 ==0.2 + - rhbzquery ==0.4.3 + - rhine ==0.7.0 + - rhine-gloss ==0.7.0 + - rigel-viz ==0.2.0.0 + - rio ==0.1.20.0 + - rio-orphans ==0.1.2.0 + - rio-prettyprint ==0.1.1.0 + - roc-id ==0.1.0.0 + - rocksdb-haskell ==1.0.1 + - rocksdb-haskell-jprupp ==2.1.3 + - rocksdb-query ==0.4.2 + - roles ==0.2.0.0 + - rope-utf16-splay ==0.3.2.0 + - rosezipper ==0.2 + - rot13 ==0.2.0.1 + - rpmbuild-order ==0.4.3.2 + - RSA ==2.4.1 + - runmemo ==1.0.0.1 + - rvar ==0.2.0.6 + - safe ==0.3.19 + - safe-coloured-text ==0.0.0.0 + - safecopy ==0.10.4.2 + - safe-decimal ==0.2.0.0 + - safe-exceptions ==0.1.7.1 + - safe-foldable ==0.1.0.0 + - safeio ==0.0.5.0 + - safe-json ==1.1.1.1 + - safe-money ==0.9 + - SafeSemaphore ==0.10.1 + - safe-tensor ==0.2.1.1 + - salak ==0.3.6 + - salak-yaml ==0.3.5.3 + - saltine ==0.1.1.1 + - salve ==1.0.11 + - sample-frame ==0.0.3 + - sample-frame-np ==0.0.4.1 + - sampling ==0.3.5 + - sandwich ==0.1.0.5 + - sandwich-quickcheck ==0.1.0.5 + - sandwich-slack ==0.1.0.4 + - sandwich-webdriver ==0.1.0.4 + - say ==0.1.0.1 + - sbp ==2.6.3 + - scalpel ==0.6.2 + - scalpel-core ==0.6.2 + - scanf ==0.1.0.0 + - scanner ==0.3.1 + - scheduler ==1.5.0 + - scientific ==0.3.6.2 + - scotty ==0.12 + - scrypt ==0.5.0 + - sdl2 ==2.5.3.0 + - sdl2-gfx ==0.2 + - sdl2-image ==2.0.0 + - sdl2-mixer ==1.1.0 + - sdl2-ttf ==2.1.2 + - search-algorithms ==0.3.1 + - secp256k1-haskell ==0.5.0 + - securemem ==0.1.10 + - selda ==0.5.1.0 + - selda-json ==0.1.1.0 + - selda-postgresql ==0.1.8.1 + - selda-sqlite ==0.1.7.1 + - selections ==0.3.0.0 + - selective ==0.4.2 + - semialign ==1.1.0.1 + - semialign-indexed ==1.1 + - semialign-optics ==1.1 + - semigroupoid-extras ==5 + - semigroupoids ==5.3.5 + - semigroups ==0.19.1 + - semirings ==0.6 + - semiring-simple ==1.0.0.1 + - semver ==0.4.0.1 + - sendfile ==0.7.11.1 + - sendgrid-v3 ==0.3.0.0 + - seqalign ==0.2.0.4 + - seqid ==0.6.2 + - seqid-streams ==0.7.2 + - sequence-formats ==1.6.1 + - sequenceTools ==1.4.0.5 + - serf ==0.1.1.0 + - serialise ==0.2.3.0 + - servant ==0.18.2 + - servant-auth ==0.4.0.0 + - servant-auth-client ==0.4.1.0 + - servant-auth-docs ==0.2.10.0 + - servant-auth-server ==0.4.6.0 + - servant-auth-swagger ==0.2.10.1 + - servant-blaze ==0.9.1 + - servant-client ==0.18.2 + - servant-client-core ==0.18.2 + - servant-conduit ==0.15.1 + - servant-docs ==0.11.8 + - servant-elm ==0.7.2 + - servant-errors ==0.1.6.0 + - servant-exceptions ==0.2.1 + - servant-exceptions-server ==0.2.1 + - servant-foreign ==0.15.3 + - servant-http-streams ==0.18.2 + - servant-machines ==0.15.1 + - servant-multipart ==0.12 + - servant-openapi3 ==2.0.1.2 + - servant-pipes ==0.15.2 + - servant-rawm ==1.0.0.0 + - servant-server ==0.18.2 + - servant-swagger ==1.1.10 + - servant-swagger-ui ==0.3.5.3.47.1 + - servant-swagger-ui-core ==0.3.5 + - serverless-haskell ==0.12.6 + - serversession ==1.0.2 + - serversession-frontend-wai ==1.0 + - ses-html ==0.4.0.0 + - set-cover ==0.1.1 + - setenv ==0.1.1.3 + - setlocale ==1.0.0.10 + - sexp-grammar ==2.3.0 + - SHA ==1.6.4.4 + - shake-language-c ==0.12.0 + - shake-plus ==0.3.3.1 + - shake-plus-extended ==0.4.1.0 + - shakespeare ==2.0.25 + - shared-memory ==0.2.0.0 + - shell-conduit ==5.0.0 + - shell-escape ==0.2.0 + - shellmet ==0.0.4.0 + - shelltestrunner ==1.9 + - shell-utility ==0.1 + - shelly ==1.9.0 + - shikensu ==0.3.11 + - shortcut-links ==0.5.1.1 + - should-not-typecheck ==2.1.0 + - show-combinators ==0.2.0.0 + - siggy-chardust ==1.0.0 + - signal ==0.1.0.4 + - silently ==1.2.5.1 + - simple-affine-space ==0.1.1 + - simple-cabal ==0.1.3 + - simple-cmd ==0.2.3 + - simple-cmd-args ==0.1.6 + - simple-log ==0.9.12 + - simple-reflect ==0.3.3 + - simple-sendfile ==0.2.30 + - simple-templates ==1.0.0 + - simple-vec3 ==0.6.0.1 + - simplistic-generics ==2.0.0 + - since ==0.0.0 + - singleton-bool ==0.1.5 + - singleton-nats ==0.4.5 + - singletons ==2.7 + - singletons-presburger ==0.6.0.0 + - siphash ==1.0.3 + - sitemap-gen ==0.1.0.0 + - sized ==1.0.0.0 + - skein ==1.0.9.4 + - skews ==0.1.0.3 + - skip-var ==0.1.1.0 + - skylighting ==0.10.5.1 + - skylighting-core ==0.10.5.1 + - slack-api ==0.12 + - slack-progressbar ==0.1.0.1 + - slick ==1.1.1.0 + - slist ==0.2.0.0 + - slynx ==0.5.0.2 + - smallcheck ==1.2.1 + - smash ==0.1.2 + - smash-aeson ==0.1.0.0 + - smash-lens ==0.1.0.1 + - smash-microlens ==0.1.0.0 + - smoothie ==0.4.2.11 + - smtp-mail ==0.3.0.0 + - snap-blaze ==0.2.1.5 + - snap-core ==1.0.4.2 + - snap-server ==1.1.2.0 + - snowflake ==0.1.1.1 + - soap ==0.2.3.6 + - soap-openssl ==0.1.0.2 + - soap-tls ==0.1.1.4 + - socket ==0.8.3.0 + - socks ==0.6.1 + - some ==1.0.3 + - sop-core ==0.5.0.1 + - sort ==1.0.0.0 + - sorted-list ==0.2.1.0 + - sourcemap ==0.1.6.1 + - sox ==0.2.3.1 + - soxlib ==0.0.3.1 + - spacecookie ==1.0.0.0 + - sparse-linear-algebra ==0.3.1 + - sparse-tensor ==0.2.1.5 + - spatial-math ==0.5.0.1 + - special-values ==0.1.0.0 + - speculate ==0.4.6 + - speedy-slice ==0.3.2 + - Spintax ==0.3.6 + - splice ==0.6.1.1 + - splint ==1.0.1.4 + - split ==0.2.3.4 + - splitmix ==0.1.0.3 + - splitmix-distributions ==0.8.0.0 + - spoon ==0.3.1 + - spreadsheet ==0.1.3.8 + - sqlcli ==0.2.2.0 + - sqlcli-odbc ==0.2.0.1 + - sqlite-simple ==0.4.18.0 + - sql-words ==0.1.6.4 + - squeal-postgresql ==0.7.0.1 + - squeather ==0.8.0.0 + - srcloc ==0.6 + - stache ==2.3.0 + - stackcollapse-ghc ==0.0.1.3 + - stack-templatizer ==0.1.0.2 + - stateref ==0.3 + - StateVar ==1.2.1 + - static-text ==0.2.0.6 + - statistics ==0.15.2.0 + - status-notifier-item ==0.3.0.5 + - stb-image-redux ==0.2.1.3 + - step-function ==0.2 + - stm-chans ==3.0.0.4 + - stm-conduit ==4.0.1 + - stm-containers ==1.2 + - stm-delay ==0.1.1.1 + - stm-extras ==0.1.0.3 + - stm-hamt ==1.2.0.6 + - stm-lifted ==2.5.0.0 + - STMonadTrans ==0.4.5 + - stm-split ==0.0.2.1 + - stopwatch ==0.1.0.6 + - storable-complex ==0.2.3.0 + - storable-endian ==0.2.6 + - storable-record ==0.0.5 + - storable-tuple ==0.0.3.3 + - storablevector ==0.2.13.1 + - store ==0.7.11 + - store-core ==0.4.4.4 + - store-streaming ==0.2.0.3 + - stratosphere ==0.59.1 + - streaming ==0.2.3.0 + - streaming-attoparsec ==1.0.0.1 + - streaming-bytestring ==0.2.0 + - streaming-commons ==0.2.2.1 + - streamly ==0.7.3 + - streams ==3.3 + - strict ==0.4.0.1 + - strict-concurrency ==0.2.4.3 + - strict-list ==0.1.5 + - strict-tuple ==0.1.4 + - 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.3.1.0 + - string-qq ==0.0.4 + - string-random ==0.1.4.1 + - stringsearch ==0.3.6.6 + - string-transform ==1.1.1 + - stripe-concepts ==1.0.2.6 + - stripe-core ==2.6.2 + - stripe-haskell ==2.6.2 + - stripe-http-client ==2.6.2 + - stripe-tests ==2.6.2 + - strive ==5.0.14 + - structs ==0.1.6 + - structured ==0.1.0.1 + - structured-cli ==2.7.0.1 + - subcategories ==0.1.1.0 + - sum-type-boilerplate ==0.1.1 + - sundown ==0.6 + - superbuffer ==0.3.1.1 + - svg-tree ==0.6.2.4 + - swagger ==0.3.0 + - swagger2 ==2.6 + - sweet-egison ==0.1.1.3 + - swish ==0.10.0.4 + - syb ==0.7.2.1 + - sydtest ==0.1.0.0 + - sydtest-discover ==0.0.0.0 + - sydtest-persistent-sqlite ==0.0.0.0 + - sydtest-servant ==0.0.0.0 + - sydtest-wai ==0.0.0.0 + - sydtest-yesod ==0.0.0.0 + - symbol ==0.2.4 + - symengine ==0.1.2.0 + - 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.2 + - tabular ==0.2.2.8 + - taffybar ==3.2.3 + - tagchup ==0.4.1.1 + - tagged ==0.8.6.1 + - tagged-binary ==0.2.0.1 + - tagged-identity ==0.1.3 + - tagged-transformer ==0.8.1 + - tagshare ==0.0 + - tagsoup ==0.14.8 + - tao ==1.0.0 + - tao-example ==1.0.0 + - tar ==0.5.1.1 + - tar-conduit ==0.3.2 + - tardis ==0.4.3.0 + - tasty ==1.4.1 + - tasty-ant-xml ==1.1.8 + - tasty-bench ==0.2.5 + - tasty-dejafu ==2.0.0.7 + - tasty-discover ==4.2.2 + - tasty-expected-failure ==0.12.3 + - tasty-focus ==1.0.1 + - tasty-golden ==2.3.4 + - tasty-hedgehog ==1.0.1.0 + - tasty-hspec ==1.1.6 + - tasty-hunit ==0.10.0.3 + - tasty-hunit-compat ==0.2.0.1 + - tasty-kat ==0.0.3 + - tasty-leancheck ==0.0.1 + - tasty-lua ==0.2.3.2 + - tasty-program ==1.0.5 + - tasty-quickcheck ==0.10.1.2 + - tasty-rerun ==1.1.18 + - tasty-silver ==3.2.1 + - tasty-smallcheck ==0.8.2 + - tasty-test-reporter ==0.1.1.4 + - tasty-th ==0.1.7 + - tasty-wai ==0.1.1.1 + - Taxonomy ==2.1.0 + - TCache ==0.12.1 + - tce-conf ==1.3 + - tdigest ==0.2.1.1 + - template-haskell-compat-v0208 ==0.1.5 + - temporary ==1.3 + - temporary-rc ==1.2.0.3 + - temporary-resourcet ==0.1.0.1 + - tensorflow-test ==0.1.0.0 + - tensors ==0.1.5 + - termbox ==0.3.0 + - terminal-progress-bar ==0.4.1 + - terminal-size ==0.3.2.1 + - test-framework ==0.8.2.0 + - test-framework-hunit ==0.3.0.2 + - test-framework-leancheck ==0.0.1 + - test-framework-quickcheck2 ==0.3.0.5 + - test-framework-smallcheck ==0.2 + - test-fun ==0.1.0.0 + - testing-type-modifiers ==0.1.0.1 + - texmath ==0.12.2 + - text-ansi ==0.1.1 + - text-binary ==0.2.1.1 + - text-builder ==0.6.6.2 + - text-conversions ==0.3.1 + - text-format ==0.3.2 + - 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.3.0.0 + - text-metrics ==0.3.0 + - text-postgresql ==0.0.3.1 + - text-printer ==0.5.0.1 + - text-regex-replace ==0.1.1.4 + - text-region ==0.3.1.0 + - text-short ==0.1.3 + - text-show ==3.9 + - text-show-instances ==3.8.4 + - text-zipper ==0.11 + - tfp ==1.0.2 + - tf-random ==0.5 + - th-abstraction ==0.4.2.0 + - th-bang-compat ==0.0.1.0 + - th-compat ==0.1.2 + - th-constraint-compat ==0.0.1.0 + - th-data-compat ==0.1.0.0 + - th-desugar ==1.11 + - th-env ==0.1.0.2 + - these ==1.1.1.1 + - these-lens ==1.0.1.2 + - these-optics ==1.0.1.2 + - these-skinny ==0.7.4 + - th-expand-syns ==0.4.8.0 + - th-extras ==0.0.0.4 + - th-lift ==0.8.2 + - th-lift-instances ==0.1.18 + - th-nowq ==0.1.0.5 + - th-orphans ==0.13.11 + - th-printf ==0.7 + - thread-hierarchy ==0.3.0.2 + - thread-local-storage ==0.2 + - threads ==0.5.1.6 + - thread-supervisor ==0.2.0.0 + - threepenny-gui ==0.9.0.0 + - th-reify-compat ==0.0.1.5 + - th-reify-many ==0.1.9 + - 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.1.0 + - th-utilities ==0.2.4.3 + - thyme ==0.3.5.5 + - tidal ==1.7.4 + - tile ==0.3.0.0 + - time-compat ==1.9.5 + - 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.1.0 + - timer-wheel ==0.3.0 + - time-units ==1.0.0 + - timezone-olson ==0.2.0 + - timezone-series ==0.1.9 + - tinylog ==0.15.0 + - titlecase ==1.0.1 + - tldr ==0.9.0 + - tls ==1.5.5 + - tls-debug ==0.4.8 + - tls-session-manager ==0.0.4 + - tlynx ==0.5.0.2 + - tmapchan ==0.0.3 + - tmapmvar ==0.0.4 + - tmp-postgres ==1.34.1.0 + - tomland ==1.3.2.0 + - tonalude ==0.1.1.1 + - topograph ==1.0.0.1 + - torsor ==0.1 + - tostring ==0.2.1.1 + - transaction ==0.1.1.3 + - transformers-base ==0.4.5.2 + - transformers-bifunctors ==0.1 + - transformers-compat ==0.6.6 + - transformers-fix ==1.0 + - traverse-with-class ==1.0.1.0 + - tree-diff ==0.2 + - tree-fun ==0.8.1.0 + - tree-view ==0.5.1 + - trifecta ==2.1.1 + - triplesec ==0.2.2.1 + - tsv2csv ==0.1.0.2 + - ttc ==0.4.0.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 + - turtle ==1.5.22 + - typecheck-plugin-nat-simple ==0.1.0.2 + - 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 + - type-hint ==0.1 + - type-level-integers ==0.0.1 + - type-level-kv-list ==1.1.0 + - type-level-natural-number ==2.0 + - type-level-numbers ==0.1.1.1 + - type-map ==0.1.6.0 + - type-natural ==1.1.0.0 + - typenums ==0.1.4 + - type-of-html ==1.6.2.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 + - tzdata ==0.2.20201021.0 + - ua-parser ==0.7.6.0 + - uglymemo ==0.1.0.1 + - ulid ==0.3.0.0 + - unagi-chan ==0.4.1.3 + - unbounded-delays ==0.1.1.1 + - unboxed-ref ==0.4.0.0 + - unboxing-vector ==0.2.0.0 + - uncaught-exception ==0.1.0 + - uncertain ==0.3.1.0 + - unconstrained ==0.1.0.2 + - unexceptionalio ==0.5.1 + - unexceptionalio-trans ==0.5.1 + - unicode ==0.0.1.1 + - unicode-show ==0.1.0.4 + - unicode-transforms ==0.3.7.1 + - unification-fd ==0.11.1 + - union-find ==0.2 + - unipatterns ==0.0.0.0 + - uniplate ==1.6.13 + - uniprot-kb ==0.1.2.0 + - uniq-deep ==1.2.0 + - unique ==0.0.1 + - unique-logic ==0.4 + - unique-logic-tf ==0.5.1 + - unit-constraint ==0.0.0 + - universe ==1.2.1 + - universe-base ==1.1.2 + - universe-instances-base ==1.1 + - universe-instances-extended ==1.1.2 + - universe-instances-trans ==1.1 + - universe-reverse-instances ==1.1.1 + - universe-some ==1.2.1 + - universum ==1.7.2 + - unix-bytestring ==0.3.7.3 + - unix-compat ==0.5.3 + - unix-time ==0.4.7 + - unliftio ==0.2.15 + - unliftio-core ==0.2.0.1 + - unliftio-pool ==0.2.1.1 + - unliftio-streams ==0.1.1.1 + - unlit ==0.4.0.0 + - unordered-containers ==0.2.13.0 + - unsafe ==0.0 + - urbit-hob ==0.3.3 + - uri-bytestring ==0.3.3.0 + - uri-bytestring-aeson ==0.1.0.8 + - uri-encode ==1.5.0.7 + - url ==2.1.3 + - users ==0.5.0.0 + - utf8-conversions ==0.1.0.4 + - utf8-light ==0.4.2 + - utf8-string ==1.0.2 + - util ==0.1.17.1 + - utility-ht ==0.0.16 + - uuid ==1.3.15 + - uuid-types ==1.0.5 + - validation ==1.1.1 + - validation-selective ==0.1.0.1 + - validity ==0.11.0.0 + - validity-aeson ==0.2.0.4 + - validity-bytestring ==0.4.1.1 + - validity-containers ==0.5.0.4 + - validity-path ==0.4.0.1 + - validity-persistent ==0.0.0.0 + - validity-primitive ==0.0.0.1 + - validity-scientific ==0.2.0.3 + - validity-text ==0.3.1.1 + - validity-time ==0.4.0.0 + - validity-unordered-containers ==0.2.0.3 + - validity-uuid ==0.1.0.3 + - validity-vector ==0.2.0.3 + - valor ==0.1.0.0 + - vault ==0.3.1.5 + - vec ==0.4 + - vector ==0.12.3.0 + - vector-algorithms ==0.8.0.4 + - vector-binary-instances ==0.2.5.2 + - vector-buffer ==0.4.1 + - vector-builder ==0.3.8.1 + - vector-bytes-instances ==0.1.1 + - vector-circular ==0.1.3 + - vector-instances ==3.4 + - vector-mmap ==0.0.3 + - vector-rotcev ==0.1.0.0 + - vector-sized ==1.4.3.1 + - vector-space ==0.16 + - vector-split ==1.0.0.2 + - vector-th-unbox ==0.2.1.9 + - verbosity ==0.4.0.0 + - versions ==4.0.3 + - vformat ==0.14.1.0 + - vformat-aeson ==0.1.0.1 + - vformat-time ==0.1.0.0 + - ViennaRNAParser ==1.3.3 + - vinyl ==0.13.1 + - void ==0.7.3 + - vty ==5.33 + - wai ==3.2.3 + - wai-app-static ==3.1.7.2 + - wai-conduit ==3.0.0.4 + - wai-cors ==0.2.7 + - wai-enforce-https ==0.0.2.1 + - wai-eventsource ==3.0.0 + - wai-extra ==3.1.6 + - wai-feature-flags ==0.1.0.1 + - wai-handler-launch ==3.0.3.1 + - wai-logger ==2.3.6 + - wai-middleware-auth ==0.2.4.1 + - wai-middleware-caching ==0.1.0.2 + - wai-middleware-clacks ==0.1.0.1 + - wai-middleware-static ==0.9.0 + - wai-rate-limit ==0.1.0.0 + - wai-rate-limit-redis ==0.1.0.0 + - wai-saml2 ==0.2.1.2 + - wai-session ==0.3.3 + - wai-session-redis ==0.1.0.1 + - wai-slack-middleware ==0.2.0 + - wai-websockets ==3.0.1.2 + - wakame ==0.1.0.0 + - warp ==3.3.15 + - warp-tls ==3.3.0 + - warp-tls-uid ==0.2.0.6 + - wave ==0.2.0 + - wcwidth ==0.0.2 + - webby ==1.0.1 + - webdriver ==0.9.0.1 + - webex-teams-api ==0.2.0.1 + - webex-teams-conduit ==0.2.0.1 + - webex-teams-pipes ==0.2.0.1 + - webgear-server ==0.2.1 + - webrtc-vad ==0.1.0.3 + - websockets ==0.12.7.2 + - websockets-snap ==0.10.3.1 + - weigh ==0.0.16 + - wide-word ==0.1.1.2 + - wikicfp-scraper ==0.1.0.12 + - wild-bind ==0.1.2.7 + - wild-bind-x11 ==0.2.0.12 + - Win32 ==2.6.1.0 + - Win32-notify ==0.3.0.3 + - windns ==0.1.0.1 + - witch ==0.2.1.1 + - witherable ==0.4.1 + - within ==0.2.0.1 + - with-location ==0.1.0 + - with-utf8 ==1.0.2.2 + - 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 + - world-peace ==1.0.2.0 + - wrap ==0.0.0 + - wreq ==0.5.3.3 + - writer-cps-exceptions ==0.1.0.1 + - writer-cps-mtl ==0.1.1.6 + - writer-cps-transformers ==0.5.6.1 + - wss-client ==0.3.0.0 + - wuss ==1.1.18 + - X11 ==1.9.2 + - X11-xft ==0.3.1 + - x11-xim ==0.0.9.0 + - x509 ==1.7.5 + - x509-store ==1.6.7 + - x509-system ==1.6.6 + - x509-validation ==1.6.11 + - Xauth ==0.1 + - xdg-basedir ==0.2.2 + - xdg-desktop-entry ==0.1.1.1 + - xdg-userdirs ==0.1.0.2 + - xeno ==0.4.2 + - xlsx ==0.8.3 + - xlsx-tabular ==0.2.2.1 + - xml ==1.3.14 + - xml-basic ==0.1.3.1 + - xml-conduit ==1.9.1.1 + - 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 + - xml-indexed-cursor ==0.1.1.0 + - xml-lens ==0.3 + - xml-picklers ==0.3.6 + - xml-to-json ==2.0.1 + - xml-to-json-fast ==2.0.0 + - xml-types ==0.3.8 + - xmonad ==0.15 + - xmonad-contrib ==0.16 + - xmonad-extras ==0.15.3 + - xss-sanitize ==0.3.6 + - xxhash-ffi ==0.2.0.0 + - yaml ==0.11.5.0 + - yamlparse-applicative ==0.1.0.3 + - yesod ==1.6.1.1 + - yesod-auth ==1.6.10.3 + - yesod-auth-hashdb ==1.7.1.6 + - yesod-auth-oauth2 ==0.6.3.0 + - yesod-bin ==1.6.1 + - yesod-core ==1.6.19.0 + - yesod-fb ==0.6.1 + - yesod-form ==1.6.7 + - yesod-gitrev ==0.2.1 + - yesod-markdown ==0.12.6.9 + - yesod-newsfeed ==1.7.0.0 + - yesod-page-cursor ==2.0.0.6 + - yesod-paginator ==1.1.1.0 + - yesod-persistent ==1.6.0.7 + - yesod-sitemap ==1.6.0 + - yesod-static ==1.6.1.0 + - yesod-test ==1.6.12 + - yesod-websockets ==0.3.0.3 + - yes-precure5-command ==5.5.3 + - yi-rope ==0.11 + - yjsvg ==0.2.0.1 + - yjtools ==0.9.18 + - yoga ==0.0.0.5 + - youtube ==0.2.1.1 + - zenacy-html ==2.0.3 + - zenacy-unicode ==1.0.1 + - zero ==0.1.5 + - zeromq4-haskell ==0.8.0 + - zeromq4-patterns ==0.3.1.0 + - zim-parser ==0.2.1.0 + - zio ==0.1.0.2 + - zip ==1.7.0 + - zip-archive ==0.4.1 + - zipper-extra ==0.1.3.2 + - zippers ==0.3.1 + - zip-stream ==0.2.1.0 + - zlib ==0.6.2.3 + - zlib-bindings ==0.1.1.5 + - zlib-lens ==0.1.2.1 + - zot ==0.0.3 + - zstd ==0.1.2.0 + - ztail ==1.2.0.2 + - zydiskell ==0.2.0.0 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml new file mode 100644 index 0000000000..8acd56668d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -0,0 +1,3302 @@ +# This file is automatically generated by +# maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +# It is supposed to list all haskellPackages that cannot evaluate because they +# depend on a dependency marked as broken. +dont-distribute-packages: + + - 4Blocks + - a50 + - abcBridge + - AbortT-monadstf + - AbortT-mtl + - accelerate-arithmetic + - accelerate-fourier + - accelerate-typelits + - access-token-provider + - ac-machine-conduit + - acme-php + - acme-safe + - acousticbrainz-client + - activehs + - actor + - AC-Vector-Fancy + - addy + - adhoc-network + - adict + - ADPfusionForest + - ADPfusionSet + - adp-multi-monadiccp + - Advgame + - Advise-me + - aern2-real + - AERN-Net + - AERN-Real + - AERN-Real-Double + - AERN-Real-Interval + - AERN-RnToRm + - AERN-RnToRm-Plot + - aeson-native + - afv + - agda-server + - agda-snippets-hakyll + - agentx + - aip + - airship + - aivika-distributed + - algebra-checkers + - algebra-driven-design + - algebra-sql + - algolia + - AlgoRhythm + - AlignmentAlgorithms + - alms + - alpha + - alsa-gui + - alsa-pcm-tests + - alsa-seq-tests + - amazon-emailer-client-snap + - ampersand + - amqp-streamly + - analyze-client + - anatomy + - AndroidViewHierarchyImporter + - animate-example + - animate-frames + - animate-preview + - animate-sdl2 + - annah + - Annotations + - anonymous-sums-tests + - antagonist + - anticiv + - antlrc + - apelsin + - apiary + - apiary-authenticate + - apiary-clientsession + - apiary-cookie + - apiary-eventsource + - apiary-helics + - apiary-http-client + - apiary-logger + - apiary-memcached + - apiary-mongoDB + - apiary-persistent + - apiary-purescript + - apiary-redis + - apiary-session + - apiary-websockets + - api-rpc-pegnet + - apis + - api-yoti + - apotiki + - ApplePush + - approx-rand-test + - arbor-monad-metric-datadog + - arch-hs + - archlinux-web + - arduino-copilot + - arff + - arghwxhaskell + - argon + - ariadne + - arithmetic-circuits + - array-forth + - arraylist + - ascii-table + - asic + - ASN1 + - assert4hs-hspec + - assert4hs-tasty + - assimp + - ast-monad-json + - astview + - atlassian-connect-core + - atmos-dimensional-tf + - atomic-primops-foreign + - atp + - AttoJson + - attoparsec-enumerator + - attoparsec-ip + - attoparsec-iteratee + - attoparsec-text-enumerator + - attoparsec-uri + - atuin + - audiovisual + - aura + - authoring + - AutoForms + - autonix-deps-kf5 + - avers + - avers-api + - avers-api-docs + - avers-server + - AvlTree + - avro-piper + - awesomium + - awesomium-glut + - aws-configuration-tools + - aws-dynamodb-conduit + - aws-dynamodb-streams + - aws-elastic-transcoder + - aws-kinesis + - aws-kinesis-client + - aws-kinesis-reshard + - aws-lambda + - aws-mfa-credentials + - aws-sdk + - aws-sdk-xml-unordered + - aws-sign4 + - aws-sns + - axiom + - azimuth-hs + - azure-functions-worker + - azure-service-api + - azure-servicebus + - babylon + - backblaze-b2-hs + - backdropper + - ballast + - bamboo + - bamboo-launcher + - bamboo-plugin-highlight + - bamboo-plugin-photo + - bamboo-theme-blueprint + - bamboo-theme-mini-html5 + - bamse + - bamstats + - Barracuda + - base16-lens + - base32-bytestring + - base62 + - base64-bytes + - baserock-schema + - BASIC + - batchd + - battlenet-yesod + - battleships + - bayes-stack + - bbi + - bdcs + - bdcs-api + - beam-automigrate + - beam-migrate + - beam-mysql + - beam-newtype-field + - beam-postgres + - beam-sqlite + - beam-th + - beautifHOL + - bech32-th + - bein + - belka + - BerlekampAlgorithm + - berp + - bff + - bglib + - billboard-parser + - billeksah-forms + - billeksah-main + - billeksah-pane + - binary-file + - binary-protocol-zmq + - binary-streams + - bindings-apr-util + - bindings-linux-videodev2 + - bindings-ppdev + - binding-wx + - binembed-example + - bioace + - bioalign + - Biobase + - BiobaseBlast + - BiobaseDotP + - BiobaseENA + - BiobaseEnsembl + - BiobaseFasta + - BiobaseFR3D + - BiobaseHTTP + - BiobaseHTTPTools + - BiobaseInfernal + - BiobaseMAF + - BiobaseTrainingData + - BiobaseTurner + - BiobaseTypes + - BiobaseVienna + - BiobaseXNA + - biofasta + - biofastq + - BioHMM + - bioinformatics-toolkit + - biophd + - biopsl + - biosff + - biostockholm + - bip32 + - birch-beer + - bird + - BirdPP + - bit-array + - bitcoin-address + - bitcoin-api + - bitcoin-api-extra + - bitcoin-block + - bitcoin-compact-filters + - bitcoind-regtest + - bitcoind-rpc + - bitcoin-keys + - bitcoin-rpc + - bitcoin-scripting + - bitcoin-tx + - bitcoin-types + - Bitly + - bitly-cli + - bitmaps + - bittorrent + - bla + - blakesum-demo + - BlastHTTP + - blastxml + - blatex + - blaze-builder-enumerator + - blaze-colonnade + - ble + - blink1 + - blip + - Blobs + - blogination + - BlogLiterately + - BlogLiterately-diagrams + - bloodhound-amazonka-auth + - bloxorz + - blubber + - bluetile + - blunt + - bno055-haskell + - bogre-banana + - bond-haskell + - bond-haskell-compiler + - bookkeeper-permissions + - Bookshelf + - boomslang + - boopadoop + - boots-cloud + - boots-web + - borel + - bowntz + - box + - box-csv + - box-socket + - breakout + - bricks + - bricks-internal-test + - bricks-parsec + - bricks-rendering + - bricks-syntax + - bronyradiogermany-streaming + - brotli-conduit + - brotli-streams + - b-tree + - btree + - buchhaltung + - buildbox-tools + - buildwrapper + - bulletproofs + - bulmex + - burnt-explorer + - bus-pirate + - buster-gtk + - buster-network + - butterflies + - bv-sized-lens + - bytebuild + - bytehash + - bytelog + - bytesmith + - bytestring-read + - c0check + - cabal2arch + - cabal-bounds + - cabal-cache + - cabal-cargs + - cabalmdvrpm + - cabal-query + - cabalrpmdeps + - cabal-test + - cake + - cakyrespa + - cal3d-examples + - cal3d-opengl + - calc + - calculator + - caldims + - call + - camfort + - campfire + - candid + - canteven-http + - cao + - cap + - carboncopy + - CarneadesIntoDung + - car-pool + - cartel + - casadi-bindings + - casadi-bindings-control + - casadi-bindings-core + - casadi-bindings-ipopt-interface + - casadi-bindings-snopt-interface + - cash + - cassandra-cql + - cassandra-thrift + - cassy + - casui + - categorical-algebra + - category-extras + - CBOR + - CC-delcont-alt + - cctools-workqueue + - cef3-simple + - ceilometer-common + - celtchar + - cereal-enumerator + - cereal-io-streams + - cereal-streams + - certificate + - cfipu + - cflp + - cfopu + - cgrep + - chainweb-mining-client + - chakra + - chalkboard-viewer + - charade + - chart-cli + - Chart-fltkhs + - chart-svg + - chart-svg-various + - chart-unit + - cheapskate-terminal + - check-pvp + - chevalier-common + - chitauri + - choose-exe + - chorale-geo + - chp-mtl + - chp-plus + - chp-transformers + - chr-core + - chr-lang + - chromatin + - chu2 + - chunks + - ciphersaber2 + - citation-resolve + - citeproc-hs-pandoc-filter + - clac + - clafer + - claferIG + - claferwiki + - clash + - clash-ghc + - clash-ghc_1_4_1 + - clash-lib + - clash-lib_1_4_1 + - clash-multisignal + - clash-prelude-quickcheck + - clash-systemverilog + - clash-verilog + - clash-vhdl + - classify-frog + - classy-miso + - clckwrks + - clckwrks-cli + - clckwrks-dot-com + - clckwrks-plugin-bugs + - clckwrks-plugin-ircbot + - clckwrks-plugin-mailinglist + - clckwrks-plugin-media + - clckwrks-plugin-page + - clckwrks-plugin-redirect + - clckwrks-theme-bootstrap + - clckwrks-theme-clckwrks + - clckwrks-theme-geo-bootstrap + - cless + - click-clack + - clifford + - clippings + - clocked + - cloud-haskell + - cloud-seeder + - cloudyfs + - clua + - ClustalParser + - clustertools + - clutterhs + - cmathml3 + - CMCompare + - cmptype + - cmv + - cnc-spec-compiler + - Coadjute + - codec + - codec-rpm + - codemonitor + - cognimeta-utils + - coinbase-exchange + - colada + - collapse-duplication + - collection-json + - collections-base-instances + - co-log-polysemy-formatting + - color-counter + - colorless-http-client + - colorless-scotty + - colour-space + - columbia + - comark + - Combinatorrent + - comic + - commsec-keyexchange + - comonad-random + - ComonadSheet + - compact-mutable + - complexity + - computational-algebra + - concraft + - concraft-hr + - concraft-pl + - concrete-haskell + - concrete-haskell-autogen + - condor + - Condor + - conductive-hsc3 + - conductive-song + - conduit-vfs-zip + - confcrypt + - conferer-provider-dhall + - conferer-provider-yaml + - conferer-source-dhall + - conferer-source-yaml + - conffmt + - Configger + - configifier + - config-select + - configurator-ng + - constraint-manip + - constructible + - consumers + - container + - containers-accelerate + - continuum + - continuum-client + - control + - control-monad-attempt + - control-monad-exception-monadsfd + - Control-Monad-MultiPass + - conversions + - convert + - convertible-ascii + - convertible-text + - coordinate + - copilot + - copilot-c99 + - copilot-cbmc + - copilot-language + - copilot-libraries + - copilot-theorem + - CoreFoundation + - coroutine-enumerator + - coroutine-iteratee + - couchdb-enumerator + - couch-simple + - CPBrainfuck + - CPL + - cprng-aes-effect + - cql-io-tinylog + - cqrs-example + - cqrs-memory + - cqrs-postgresql + - cqrs-sqlite3 + - cqrs-test + - cqrs-testkit + - craft + - craftwerk-cairo + - craftwerk-gtk + - craze + - crf-chain1 + - crf-chain1-constrained + - crf-chain2-generic + - crf-chain2-tiers + - criu-rpc + - crockford + - cron-compat + - cryptocipher + - crypto-conduit + - cryptoids + - cryptoids-class + - cryptol + - crystalfontz + - csg + - cspmchecker + - CSPM-cspm + - CSPM-Interpreter + - CSPM-ToProlog + - csv-enumerator + - ctpl + - cube + - cursedcsv + - cv-combinators + - cypher + - Dangerous + - dapi + - darcs-benchmark + - darcs-beta + - darcsden + - darcs-fastconvert + - DarcsHelpers + - darcswatch + - darkplaces-demo + - darkplaces-rcon-util + - dash-haskell + - data-accessor-monads-fd + - data-basic + - data-cycle + - datadog-tracing + - data-elf + - dataflow + - data-layer + - data-lens-fd + - data-lens-ixset + - data-lens-template + - data-object-json + - data-object-yaml + - data-result + - data-rtuple + - data-structure-inferrer + - date-conversions + - dbjava + - dbus-client + - ddate + - ddc-build + - ddc-core + - ddc-core-babel + - ddc-core-eval + - ddc-core-flow + - ddc-core-llvm + - ddc-core-salt + - ddc-core-simpl + - ddc-core-tetra + - ddc-driver + - ddci-core + - ddc-interface + - ddc-source-tetra + - ddc-tools + - ddc-war + - debug + - debug-trace-var + - decidable + - decimal-arithmetic + - dedukti + - deeplearning-hs + - deepzoom + - defargs + - DefendTheKing + - definitive-graphics + - deka-tests + - delaunay + - delicious + - delimited-text + - delimiter-separated + - delta + - delta-h + - dependent-state + - dephd + - dep-t-advice + - deptrack-devops + - deptrack-dot + - dequeue + - derive-IG + - detour-via-uom + - devtools + - dewdrop + - dfinity-radix-tree + - dhall-docs + - dhcp-lease-parser + - dia-functions + - diagrams-braille + - diagrams-builder + - diagrams-haddock + - diagrams-html5 + - diagrams-pandoc + - diagrams-pgf + - diagrams-reflex + - diagrams-wx + - DifferenceLogic + - difference-monoid + - digestive-functors-hsp + - dingo-core + - dingo-example + - dingo-widgets + - diplomacy + - diplomacy-server + - dirfiles + - discogs-haskell + - discord-gateway + - discord-hs + - discord-register + - discord-rest + - DisTract + - distributed-process-async + - distributed-process-azure + - distributed-process-client-server + - distributed-process-ekg + - distributed-process-execution + - distributed-process-extras + - distributed-process-fsm + - distributed-process-lifted + - distributed-process-monad-control + - distributed-process-p2p + - distributed-process-platform + - distributed-process-registry + - distributed-process-simplelocalnet + - distributed-process-supervisor + - distributed-process-systest + - distributed-process-task + - distributed-process-tests + - distributed-process-zookeeper + - distribution-plot + - dixi + - dl-fedora + - dmenu-pkill + - dmenu-pmount + - dmenu-search + - DMuCheck + - DnaProteinAlignment + - doc-review + - DocTest + - doi + - DOM + - domain + - domain-core + - domain-optics + - dow + - download-media-content + - DP + - dph-examples + - dph-lifted-base + - dph-lifted-copy + - dph-lifted-vseg + - dph-prim-interface + - dph-prim-par + - dph-prim-seq + - DrHylo + - dropbox-sdk + - dropsolve + - DSH + - dsh-sql + - dsmc-tools + - DSTM + - dtd + - dumb-cas + - Dust + - Dust-tools + - Dust-tools-pcap + - dvda + - dynamic-cabal + - dynamic-plot + - dynobud + - DysFRP-Cairo + - DysFRP-Craftwerk + - eccrypto-ed25519-bindings + - ecdsa + - edenskel + - edentv + - edge + - edges + - editable + - EditTimeReport + - effective-aspects-mzv + - egison + - egison-pattern-src-haskell-mode + - egison-pattern-src-th-mode + - egison-quote + - egison-tutorial + - elerea-examples + - eliminators_0_8 + - elliptic-curve + - elsa + - emacs-keys + - email + - emailparse + - embeddock + - embeddock-example + - embroidery + - engine-io-growler + - entangle + - EntrezHTTP + - enumerate + - enumerate-function + - enumerator-fd + - enumerator-tf + - ephemeral + - erf-native + - eros-client + - eros-http + - error-message + - errors-ext + - ersatz-toysat + - esotericbot + - EsounD + - estreps + - Etage-Graph + - EtaMOO + - Eternal10Seconds + - eternity + - eternity-timestamped + - ether + - Etherbunny + - ethereum-analyzer + - ethereum-analyzer-cli + - ethereum-analyzer-webui + - ethereum-client-haskell + - ethereum-merkle-patricia-db + - evdev-streamly + - eventful-postgresql + - eventful-sqlite + - event-monad + - EventSocket + - eventsource-geteventstore-store + - every-bit-counts + - exception-monads-fd + - exference + - expand + - expat-enumerator + - expiring-containers + - explicit-iomodes-bytestring + - explicit-iomodes-text + - explicit-sharing + - explore + - expressions-z3 + - extemp + - extensible-data + - extract-dependencies + - Facts + - factual-api + - fadno-braids + - FailureT + - fallingblocks + - falling-turnip + - family-tree + - fast-digits + - fastirc + - fault-tree + - fbrnch + - fcd + - FComp + - feature-flipper-postgres + - fedora-img-dl + - feed2lj + - feed2twitter + - feed-gipeda + - feed-translator + - fei-base + - fei-cocoapi + - fei-dataiter + - fei-datasets + - fei-examples + - fei-modelzoo + - fei-nn + - feldspar-compiler + - feldspar-language + - FermatsLastMargin + - festung + - ffmpeg-tutorials + - ficketed + - fields + - FieldTrip + - filepath-crypto + - filepather + - FilePather + - filepath-io-access + - filesystem-enumerator + - Finance-Treasury + - find-clumpiness + - findhttp + - FiniteMap + - firstify + - FirstOrderTheory + - fixed-point-vector + - fixed-point-vector-space + - fixhs + - fix-parser-simple + - flac-picture + - flashblast + - flatbuffers + - flexiwrap + - flexiwrap-smallcheck + - Flippi + - flite + - flowdock-api + - flower + - flowsim + - fltkhs-demos + - fltkhs-fluid-demos + - fltkhs-fluid-examples + - fltkhs-hello-world + - fltkhs-themes + - fluent-logger + - fluent-logger-conduit + - FM-SBLEX + - foldl-transduce-attoparsec + - follower + - foo + - Forestry + - formal + - FormalGrammars + - format + - format-status + - forml + - formlets + - formlets-hsp + - forth-hll + - fortran-src-extras + - foscam-directory + - foscam-sort + - Foster + - fp-ieee + - fplll + - fpnla-examples + - frame-markdown + - Frames-beam + - Frames-dsv + - Frank + - freekick2 + - freelude + - freer-converse + - free-theorems-counterexamples + - free-theorems-seq + - free-theorems-seq-webui + - free-theorems-webui + - frpnow-gloss + - frpnow-gtk + - frpnow-gtk3 + - frpnow-vty + - ftdi + - ftp-client-conduit + - FTPLine + - ftree + - ftshell + - funbot + - funbot-git-hook + - funcons-lambda-cbv-mp + - funcons-simple + - funcons-tools + - functional-arrow + - function-combine + - functor-combo + - funflow-nix + - funion + - funnyprint + - funsat + - fused-effects-squeal + - fwgl-glfw + - fwgl-javascript + - fxpak + - g2 + - g2q + - gact + - galois-fft + - Gamgine + - gargoyle-postgresql-connect + - gbu + - gdax + - gdiff-ig + - GeBoP + - gedcom + - geek + - geek-server + - gelatin-freetype2 + - gelatin-fruity + - gelatin-gl + - gelatin-sdl2 + - gelatin-shaders + - Genbank + - Gene-CluEDO + - generics-mrsop-gdiff + - genesis + - genesis-test + - GenI + - geniconvert + - geni-gui + - geniserver + - geni-util + - GenSmsPdu + - GenussFold + - geodetic + - geolite-csv + - getemx + - ghc-imported-from + - ghc-instances + - ghci-pretty + - ghcjs-hplay + - ghc-mod + - ghc-tags-plugin + - ghc-vis + - ght + - gi-cairo-again + - gi-gsk + - gi-gstpbutils + - gi-gtk_4_0_4 + - git-fmt + - git-gpush + - github-webhook-handler-snap + - gitlib-cross + - gitlib-s3 + - git-object + - git-remote-ipfs + - givegif + - gladexml-accessor + - glazier + - glazier-pipes + - glazier-react + - glazier-react-examples + - glazier-react-widget + - GLFW-OGL + - GLFW-task + - global + - global-config + - glome-hs + - GlomeView + - gloss-banana + - gloss-devil + - gloss-examples + - gloss-sodium + - gmap + - gmndl + - gnome-desktop + - gnomevfs + - gnss-converters + - gnuidn + - goal-geometry + - goal-probability + - goal-simulation + - goat + - GoogleDirections + - google-drive + - google-mail-filters + - google-maps-geocoding + - googleplus + - GoogleSB + - google-static-maps + - GoogleTranslate + - gore-and-ash-actor + - gore-and-ash-async + - gore-and-ash-demo + - gore-and-ash-glfw + - gore-and-ash-lambdacube + - gore-and-ash-logging + - gore-and-ash-network + - gore-and-ash-sdl + - gore-and-ash-sync + - GPipe-Collada + - GPipe-Examples + - GPipe-GLFW + - GPipe-GLFW4 + - GPipe-TextureLoad + - gps + - gps2htmlReport + - GPX + - grab-form + - graflog + - grammar-combinators + - GrammarProducts + - grapefruit-examples + - grapefruit-records + - grapefruit-ui + - grapefruit-ui-gtk + - GraphHammer + - GraphHammer-examples + - graphicsFormats + - graphicstools + - graphql-client + - graph-rewriting-cl + - graph-rewriting-gl + - graph-rewriting-lambdascope + - graph-rewriting-layout + - graph-rewriting-ski + - graph-rewriting-strategies + - graph-rewriting-trs + - graph-rewriting-ww + - graphtype + - graph-visit + - greencard-lib + - gridbounds + - gridland + - grid-proto + - GrowlNotify + - grpc-etcd-client + - grpc-haskell + - grpc-haskell-core + - gruff + - gruff-examples + - gscholar-rss + - gsl-random-fu + - gsmenu + - gstorable + - gtfs + - gtk2hs-cast-glade + - gtk2hs-cast-gnomevfs + - gtk2hs-cast-gtkglext + - gtk2hs-cast-gtksourceview2 + - Gtk2hsGenerics + - GtkGLTV + - gtkimageview + - gtkrsync + - gtk-serialized-event + - guarded-rewriting + - guess-combinator + - GuiHaskell + - GuiTV + - habit + - hablo + - hablog + - Hach + - hack2-handler-happstack-server + - hack2-handler-mongrel2-http + - hack2-handler-snap-server + - hackage2twitter + - hackage-server + - hack-contrib + - hack-contrib-press + - hack-handler-epoll + - hack-handler-evhttp + - hack-handler-fastcgi + - hack-handler-hyena + - hack-handler-simpleserver + - hackmanager + - hack-middleware-cleanpath + - hack-middleware-clientsession + - hack-middleware-jsonp + - haddock + - haddock_2_23_1 + - haddocset + - hadoop-tools + - haggis + - hails-bin + - hakyll-agda + - hakyll-alectryon + - hakyll-blaze-templates + - hakyll-contrib + - hakyll-contrib-csv + - hakyll-contrib-elm + - hakyll-contrib-hyphenation + - hakyll-contrib-i18n + - hakyll-contrib-links + - hakyll-dhall + - hakyll-dir-list + - hakyll-elm + - hakyll-favicon + - hakyll-filestore + - hakyll-images + - hakyll-ogmarkup + - hakyll-process + - hakyll-R + - hakyll-sass + - hakyll-series + - hakyll-shakespeare + - hakyll-shortcut-links + - hakyll-typescript + - halberd + - hall-symbols + - halma-gui + - halma-telegram-bot + - ham + - HaMinitel + - hamusic + - hans-pcap + - happlets-lib-gtk + - HAppS-Data + - happs-hsp + - happs-hsp-template + - HAppS-IxSet + - HAppS-Server + - HAppS-State + - happstack-auth + - happstack-authenticate + - happstack-contrib + - happstack-data + - happstack-dlg + - happstack-facebook + - happstack-fay + - happstack-helpers + - happstack-ixset + - happstack-jmacro + - happstack-plugins + - happstack-state + - happstack-yui + - happs-tutorial + - happybara-webkit + - haquil + - hArduino + - hardware-edsl + - HaRe + - harg + - hark + - harmony + - HarmTrace + - haroonga-httpd + - hascat + - hascat-lib + - hascat-setup + - hascat-system + - HasGP + - Hashell + - hashflare + - haskarrow + - haskdeep + - haskeem + - haskell-abci + - haskell-aliyun + - haskell-bitmex-client + - haskelldb-connect-hdbc + - haskelldb-connect-hdbc-catchio-mtl + - haskelldb-connect-hdbc-catchio-tf + - haskelldb-connect-hdbc-catchio-transformers + - haskelldb-connect-hdbc-lifted + - haskelldb-dynamic + - haskelldb-flat + - haskelldb-hdbc + - haskelldb-hdbc-mysql + - haskelldb-hdbc-odbc + - haskelldb-hdbc-postgresql + - haskelldb-hdbc-sqlite3 + - haskelldb-hsql + - haskelldb-hsql-mysql + - haskelldb-hsql-odbc + - haskelldb-hsql-postgresql + - haskelldb-hsql-sqlite3 + - haskelldb-th + - haskell-docs + - haskell-eigen-util + - haskell-ftp + - haskell-pdf-presenter + - haskell-platform-test + - haskell-reflect + - haskell-src-exts-observe + - haskell-token-utils + - haskell-tools-ast + - haskell-tools-ast-fromghc + - haskell-tools-ast-gen + - haskell-tools-ast-trf + - haskell-tools-backend-ghc + - haskell-tools-builtin-refactorings + - haskell-tools-cli + - haskell-tools-daemon + - haskell-tools-debug + - haskell-tools-demo + - haskell-tools-experimental-refactorings + - haskell-tools-prettyprint + - haskell-tools-refactor + - haskell-tools-rewrite + - haskell-tor + - haskelm + - haskey-mtl + - haskgame + - hask-home + - haskoin-bitcoind + - haskoin-core + - haskoin-crypto + - haskoin-node + - haskoin-protocol + - haskoin-script + - haskoin-store + - haskoin-store-data + - haskoin-wallet + - haskoon + - haskoon-httpspec + - haskoon-salvia + - haskore-realtime + - haskore-supercollider + - haskore-synthesizer + - HaskRel + - hasktorch + - hasktorch-ffi-thc + - hasktorch-indef + - hasktorch-signatures + - hasktorch-zoo + - haskus-utils-compat + - haskus-web + - haslo + - hasloGUI + - hasparql-client + - hasql-cursor-query + - hasql-postgres + - hasql-postgres-options + - hasql-queue + - hastache-aeson + - haste-app + - haste-gapi + - haste-lib + - haste-markup + - haste-perch + - has-th + - Hate + - HaTeX-meta + - hatexmpp3 + - HaTeX-qq + - HaVSA + - hawitter + - Hawk + - haxy + - Hayoo + - hback + - hbayes + - hbb + - hbcd + - hbf + - hcg-minus-cairo + - hcheat + - hcheckers + - hdbi + - hdbi-conduit + - hdbi-postgresql + - hdbi-sqlite + - hdbi-tests + - hdf + - hdiff + - hdirect + - hdocs + - hdph + - heart-app + - heatitup + - heavy-logger + - heavy-logger-amazon + - heavy-logger-instances + - heavy-log-shortcuts + - hecc + - hedgehog-checkers-lens + - hedgehog-gen-json + - Hedi + - hedis-pile + - heidi + - heist-aeson + - helics + - helics-wai + - helium + - hellage + - hellnet + - hemokit + - hen + - henet + - hepevt + - her-lexer-parsec + - hermit + - hermit-syb + - herringbone + - herringbone-embed + - herringbone-wai + - hesh + - hesql + - heterolist + - hevolisa + - hevolisa-dph + - hexpat-iteratee + - hfd + - hfiar + - hgalib + - HGamer3D-API + - HGamer3D-CAudio-Binding + - HGamer3D-OIS-Binding + - hgen + - hgeometry-svg + - hgithub + - hiccup + - hierarchical-spectral-clustering + - Hieroglyph + - HiggsSet + - highjson-swagger + - highjson-th + - himpy + - hinduce-classifier + - hinduce-classifier-decisiontree + - hinduce-examples + - hint-server + - hinvaders + - hinze-streams + - hipbot + - HipmunkPlayground + - Hipmunk-Utils + - hipsql-client + - hipsql-server + - hirt + - hist-pl + - hist-pl-dawg + - hist-pl-fusion + - hist-pl-lexicon + - hist-pl-lmf + - hit + - hit-graph + - HJScript + - hjsonschema + - hjugement-cli + - hlcm + - HLearn-algebra + - HLearn-approximation + - HLearn-classification + - HLearn-datastructures + - HLearn-distributions + - hledger-api + - hls + - hly + - hmark + - hmatrix-sundials + - hmeap + - hmeap-utils + - hmep + - hmm-lapack + - hmt + - hmt-diagrams + - HNM + - hnormalise + - hob + - Hoed + - hOff-display + - hogre + - hogre-examples + - Holumbus-Distribution + - Holumbus-MapReduce + - Holumbus-Searchengine + - Holumbus-Storage + - holy-project + - hommage + - HongoDB + - hood + - hoodie + - hoodle + - hoodle-builder + - hoodle-core + - hoodle-extra + - hoodle-parser + - hoodle-publish + - hoodle-render + - hoovie + - hoq + - hp2any-graph + - hp2any-manager + - hpaco + - hpaco-lib + - hpage + - hpaste + - hpc-tracer + - hPDB + - hPDB-examples + - hplayground + - HPlot + - HPong + - hpqtypes-extras + - hprotoc-fork + - hps + - hps-cairo + - hpython + - hquantlib + - hranker + - HRay + - hreader + - hreader-lens + - hreq-client + - hreq-conduit + - HROOT + - HROOT-core + - HROOT-graf + - HROOT-hist + - HROOT-io + - HROOT-math + - HROOT-tree + - hs2dot + - Hs2lib + - hsautogui + - hsbackup + - hsbencher-codespeed + - hsbencher-fusion + - hs-blake2 + - hs-brotli + - hsc3-auditor + - hsc3-cairo + - hsc3-data + - hsc3-db + - hsc3-dot + - hsc3-forth + - hsc3-graphs + - hsc3-lang + - hsc3-lisp + - hsc3-plot + - hsc3-process + - hsc3-rec + - hsc3-server + - hsc3-sf-hsndfile + - hsc3-unsafe + - hsc3-utils + - hscassandra + - hscope + - hsdev + - Hsed + - hset + - hsfacter + - hs-ffmpeg + - hs-gen-iface + - HSGEP + - HSHHelpers + - hslogstash + - hsnock + - HSoundFile + - HsParrot + - hspec-expectations-pretty + - hspec-pg-transact + - hspec-setup + - hspec-shouldbe + - hspec-test-sandbox + - hspecVariant + - hs-pkpass + - hsprocess + - hsql-mysql + - hsql-odbc + - hsql-postgresql + - hsql-sqlite3 + - hsqml-datamodel-vinyl + - hsqml-demo-morris + - hsqml-morris + - hsreadability + - hssqlppp-th + - hs-swisstable-hashtables-class + - hstar + - hstox + - hstradeking + - HStringTemplateHelpers + - hstzaar + - hsubconvert + - HsWebots + - hswip + - hsx-jmacro + - hsx-xhtml + - HTab + - hts + - http2-client-exe + - http2-client-grpc + - http-client-auth + - http-enumerator + - http-io-streams + - https-everywhere-rules + - https-everywhere-rules-raw + - httpspec + - hubris + - hugs2yc + - hulk + - hunit-gui + - hunp + - hunt-searchengine + - hunt-server + - hurdle + - husky + - huzzy + - hw-all + - hw-dsv + - hw-json + - hw-json-lens + - hw-json-simple-cursor + - hw-json-standard-cursor + - hw-kafka-avro + - hworker-ses + - hwormhole + - hws + - hw-simd-cli + - hwsl2-bytevector + - hwsl2-reducers + - hw-uri + - HXMPP + - hxmppc + - hxournal + - hxt-binary + - hxt-filter + - hxthelper + - hxweb + - hybrid + - Hydrogen + - hydrogen-cli + - hydrogen-cli-args + - hydrogen-data + - hydrogen-parsing + - hydrogen-prelude + - hydrogen-prelude-parsec + - hydrogen-syntax + - hydrogen-util + - hyena + - hylotab + - hyloutils + - hyperpublic + - ice40-prim + - ideas-math + - ideas-math-types + - ideas-statistics + - ide-backend + - ide-backend-common + - ide-backend-server + - ige-mac-integration + - ihaskell-rlangqq + - ihttp + - imap + - imbib + - imgurder + - imj-animation + - imj-base + - imj-game-hamazed + - imj-measure-stdout + - imm + - imparse + - imperative-edsl-vhdl + - importify + - imprevu-happstack + - improve + - INblobs + - inch + - incremental-computing + - incremental-maps + - increments + - indentation + - indentation-parsec + - indentation-trifecta + - indexation + - IndexedList + - indieweb-algorithms + - infernu + - InfixApplicative + - inline-java + - inspector-wrecker + - instant-aeson + - instant-bytes + - instant-deepseq + - instant-hashable + - instant-zipper + - instapaper-sender + - interpolatedstring-qq + - interpolatedstring-qq-mwotton + - introduction-test + - intset + - invertible-hlist + - ion + - IORefCAS + - ip + - ipatch + - ipc + - ipld-cid + - ipprint + - iptadmin + - irc-fun-bot + - irc-fun-client + - irc-fun-color + - irc-fun-messages + - iri + - ironforge + - isevaluated + - ismtp + - isobmff-builder + - isohunt + - iteratee-compress + - iteratee-mtl + - iteratee-parsec + - iteratee-stm + - iterio-server + - iterm-show-diagrams + - iter-stats + - ivor + - ivory-avr-atmega328p-registers + - ivory-backend-c + - ivory-bitdata + - ivory-eval + - ivory-examples + - ivory-hw + - ivory-opts + - ivory-quickcheck + - ivory-serialize + - ivory-stdlib + - ivy-web + - iyql + - j2hs + - jail + - java-bridge-extras + - java-character + - javaclass + - java-reflect + - javasf + - Javasf + - jmacro + - jmacro-rpc + - jmacro-rpc-happstack + - jmacro-rpc-snap + - jmonkey + - jobs-ui + - join + - jot + - JsContracts + - jsmw + - json2-hdbc + - json-ast-json-encoder + - json-autotype + - json-b + - JSONb + - JSON-Combinator + - JSON-Combinator-Examples + - json-enumerator + - JsonGrammar + - jsonifier + - json-incremental-decoder + - json-query + - jsons-to-schema + - json-syntax + - json-togo + - json-tokens + - jspath + - JunkDB-driver-gdbm + - JunkDB-driver-hashtables + - JuPyTer-notebook + - jvm + - jvm-batching + - jvm-streaming + - kafka-device + - kafka-device-glut + - kafka-device-joystick + - kafka-device-leap + - kafka-device-spacenav + - kafka-device-vrpn + - kaleidoscope + - kansas-lava + - kansas-lava-cores + - kansas-lava-papilio + - kansas-lava-shake + - karakuri + - katip-elasticsearch + - katip-rollbar + - kawaii + - keera-hails-i18n + - keera-hails-mvc-environment-gtk + - keera-hails-mvc-model-lightmodel + - keera-hails-mvc-model-protectedmodel + - keera-hails-mvc-solutions-gtk + - keera-hails-reactive-cbmvar + - keera-hails-reactive-fs + - keera-hails-reactive-gtk + - keera-hails-reactive-htmldom + - keera-hails-reactivelenses + - keera-hails-reactive-network + - keera-hails-reactive-polling + - keera-hails-reactive-wx + - keera-hails-reactive-yampa + - keera-posture + - kevin + - keysafe + - keyvaluehash + - keyword-args + - kicad-data + - KiCS + - KiCS-debugger + - KiCS-prophecy + - kif-parser + - kit + - kleene + - kmeans-par + - kmeans-vector + - knead + - knead-arithmetic + - knit-haskell + - knots + - korfu + - ks-test + - kubernetes-client + - kurita + - laborantin-hs + - labsat + - labyrinth + - labyrinth-server + - laika + - lambdabot-zulip + - lambda-calculator + - lambdacms-media + - lambdacube + - lambdacube-bullet + - lambdacube-compiler + - lambdacube-core + - lambdacube-edsl + - lambdacube-engine + - lambdacube-examples + - lambdacube-gl + - lambdacube-samples + - LambdaDesigner + - lambda-devs + - lambdaFeed + - LambdaINet + - lambdaLit + - lambda-options + - LambdaPrettyQuote + - LambdaShell + - lambdaya-bus + - lambdiff + - lang + - language-boogie + - language-eiffel + - language-kort + - language-Modula2 + - language-ninja + - language-oberon + - language-python-colour + - language-qux + - language-spelling + - lapack + - lapack-carray + - lapack-comfort-array + - lat + - latex-formulae-hakyll + - latex-formulae-pandoc + - latex-svg-hakyll + - latex-svg-pandoc + - layered-state + - layers-game + - layouting + - lazy-hash + - lazy-hash-cache + - ldapply + - LDAPv3 + - leaky + - lean + - legion + - legion-discovery + - legion-discovery-client + - legion-extra + - leksah + - leksah-server + - lens-utils + - levmar + - levmar-chart + - lex-applicative + - lgtk + - lha + - lhae + - lhe + - libconfig + - libcspm + - liblastfm + - liblawless + - liblinear-enumerator + - libmolude + - libraft + - librato + - libssh2-conduit + - libxml-enumerator + - lifetimes + - lifted-base-tf + - lightning-haskell + - lightstep-haskell + - lighttpd-conf + - lighttpd-conf-qq + - linear-circuit + - linearmap-category + - linearscan-hoopl + - LinearSplit + - LinkChecker + - linkchk + - linkcore + - linux-ptrace + - lio-eci11 + - lion + - liquid-base + - liquid-bytestring + - liquid-containers + - liquid-ghc-prim + - liquidhaskell-cabal-demo + - liquid-parallel + - liquid-platform + - liquid-prelude + - liquid-vector + - listenbrainz-client + - list-t-attoparsec + - list-t-html-parser + - list-witnesses + - live-sequencer + - llvm + - llvm-analysis + - llvm-base-types + - llvm-base-util + - llvm-data-interop + - llvm-dsl + - llvm-extension + - llvm-extra + - llvm-general + - llvm-general-quote + - llvm-pretty-bc-parser + - llvm-tf + - llvm-tools + - lmonad-yesod + - localize + - local-search + - locked-poll + - log + - logging-effect-extra + - logic-classes + - LogicGrowsOnTrees + - LogicGrowsOnTrees-MPI + - LogicGrowsOnTrees-network + - LogicGrowsOnTrees-processes + - log-postgres + - log-utils + - lojban + - lojysamban + - lol-apps + - lol-benches + - lol-cpp + - loli + - lol-repa + - lol-tests + - lol-typing + - longshot + - loop-effin + - lorentz + - lostcities + - loup + - LslPlus + - ls-usb + - lsystem + - lti13 + - luachunk + - lucid-colonnade + - lucienne + - Lucu + - luhn + - lui + - luminance-samples + - lvish + - Lykah + - lz4-conduit + - lzma-enumerator + - macbeth-lib + - machines-amazonka + - macosx-make-standalone + - magicbane + - magico + - magic-wormhole + - mahoro + - maid + - mailgun + - mail-pool + - majordomo + - majority + - manatee + - manatee-anything + - manatee-core + - manatee-curl + - manatee-editor + - manatee-filemanager + - manatee-imageviewer + - manatee-ircclient + - manatee-mplayer + - manatee-pdfviewer + - manatee-processmanager + - manatee-template + - manatee-terminal + - manatee-welcome + - manifold-random + - manifolds + - marionetta + - markdown2svg + - markdown-pap + - markov-processes + - markup + - marmalade-upload + - marquise + - marvin + - masakazu-bot + - master-plan + - matchers + - mathblog + - mathlink + - math-programming-glpk + - math-programming-tests + - matsuri + - maxent + - maxent-learner-hw-gui + - maxsharing + - MaybeT-transformers + - MC-Fold-DP + - mcmc + - mcmc-samplers + - mDNSResponder-client + - mealy + - mediabus-fdk-aac + - mediabus-rtp + - mellon-gpio + - mellon-web + - memcache-conduit + - mergeful-persistent + - mergeless-persistent + - merkle-patricia-db + - MetaObject + - meta-par-accelerate + - metaplug + - metar + - metar-http + - Metrics + - metronome + - MFlow + - Mhailist + - Michelangelo + - microformats2-parser + - microformats2-types + - micro-gateway + - MicrosoftTranslator + - midimory + - mighttpd + - minecraft-data + - minesweeper + - mini-egison + - miniforth + - minilight-lua + - minimung + - minioperational + - MIP-glpk + - miss + - MissingPy + - missing-py2 + - miss-porcelain + - mixed-strategies + - mkbndl + - mkcabal + - mlist + - mmark-cli + - mmark-ext + - mmtl-base + - moan + - modify-fasta + - modsplit + - modularity + - modular-prelude-classy + - modulo + - mole + - MonadCatchIO-mtl + - MonadCatchIO-mtl-foreign + - MonadCatchIO-transformers-foreign + - monad-exception + - monadiccp-gecode + - MonadLab + - monad-state + - monad-stlike-stm + - monarch + - Monaris + - Monatron-IO + - monetdb-mapi + - mongrel2-handler + - monky + - Monocle + - monte-carlo + - moo + - morley + - morloc + - morphisms-functors-inventory + - mosaico-lib + - motor-diagrams + - mp + - mp3decoder + - mpdmate + - mprelude + - mpretty + - mprover + - mps + - mptcp-pm + - msgpack-aeson + - msgpack-idl + - msgpack-rpc + - msgpack-rpc-conduit + - MSQueue + - mtgoxapi + - MuCheck-Hspec + - MuCheck-HUnit + - MuCheck-QuickCheck + - MuCheck-SmallCheck + - mu-grpc-client + - mu-grpc-server + - multibase + - multi-cabal + - multifocal + - multihash-serialise + - multilinear-io + - multiplicity + - multirec-alt-deriver + - multirec-binary + - multisetrewrite + - murder + - murmurhash3 + - musicbrainz-email + - music-graphics + - music-parts + - music-pitch + - music-preludes + - music-score + - music-sibelius + - music-suite + - musicxml2 + - mutable-iter + - MutationOrder + - mute-unmute + - mu-tracing + - mvclient + - mvc-updates + - mxnet-dataiter + - mxnet-examples + - mxnet-nn + - mysnapsession-example + - mysql-haskell-openssl + - mysql-simple-typed + - myTestlll + - mywatch + - n2o-web + - nakadi-client + - nanovg-simple + - NaperianNetCDF + - nats-queue + - natural-number + - NearContextAlgebra + - nemesis-titan + - nerf + - nero-wai + - nero-warp + - nested-routes + - netcore + - netlines + - net-spider-cli + - net-spider-pangraph + - net-spider-rpl + - net-spider-rpl-cli + - netstring-enumerator + - nettle-frp + - nettle-netkit + - nettle-openflow + - network-anonymous-i2p + - network-anonymous-tor + - network-connection + - network-enumerator + - network-hans + - network-interfacerequest + - network-messagepack-rpc-websocket + - network-minihttp + - network-netpacket + - network-pgi + - network-protocol-xmpp + - network-rpca + - network-stream + - network-topic-models + - network-websocket + - newsletter-mailgun + - ngrams-loader + - ngx-export-tools-extra + - nikepub + - Ninjas + - nirum + - nlp-scores-scripts + - Nomyx + - nomyx-api + - nomyx-core + - Nomyx-Core + - nomyx-language + - Nomyx-Language + - nomyx-library + - Nomyx-Rules + - nomyx-server + - Nomyx-Web + - NonEmptyList + - NoSlow + - notmuch-haskell + - notmuch-web + - numerical + - numeric-ode + - numhask-hedgehog + - numhask-histogram + - numhask-range + - numhask-test + - Nussinov78 + - NXT + - nymphaea + - obd + - obdd + - oberon0 + - obj + - objectid + - ochan + - octane + - octohat + - octopus + - oculus + - odd-jobs + - off-simple + - ohloh-hs + - ois-input-manager + - olwrapper + - one-liner_2_0 + - online + - online-csv + - OnRmt + - open-adt-tutorial + - OpenAFP-Utils + - OpenGLCheck + - openpgp-crypto-api + - OpenSCAD + - openssh-github-keys + - opentracing-jaeger + - opentracing-zipkin-v1 + - open-union + - OpenVG + - optima-for-hasql + - optimal-blocks + - optimusprime + - orchid + - orchid-demo + - order-maintenance + - org-mode-lucid + - OSM + - osm-download + - otp-authenticator + - padKONTROL + - PageIO + - pairing + - panda + - pandoc-japanese-filters + - pan-os-syslog + - papa + - papa-base + - papa-base-implement + - papa-export + - papa-implement + - papa-semigroupoids + - paprika + - Paraiso + - Parallel-Arrows-Eden + - parco-attoparsec + - parconc-examples + - parco-parsec + - parquet-hs + - parse-help + - parsestar + - partial-lens + - passman-cli + - patch-image + - patterns + - pcap-enumerator + - pcapng + - pcf + - pcf-font-embed + - PCLT-DB + - pdf-slave + - peakachu + - pec + - pell + - penny + - penny-bin + - penny-lib + - penrose + - peparser + - perdure + - perf-analysis + - perfecthash + - periodic-client + - periodic-client-exe + - periodic-server + - perm + - PermuteEffects + - persistent-audit + - persistent-hssqlppp + - persistent-map + - persona-idp + - peyotls + - peyotls-codec + - pgsql-simple + - pg-transact + - phonetic-languages-examples + - phonetic-languages-simplified-lists-examples + - phooey + - photoname + - pianola + - pier + - ping + - pinpon + - pipe-enumerator + - pipes-attoparsec-streaming + - pipes-brotli + - pipes-cacophony + - pipes-cereal-plus + - pipes-conduit + - pipes-courier + - pipes-extra + - pipes-files + - pipes-illumina + - pipes-key-value-csv + - pipes-p2p + - pipes-p2p-examples + - pisigma + - pitchtrack + - pkgtreediff + - planet-mitchell + - plocketed + - Plot-ho-matic + - PlslTools + - png-file + - pngload + - pocket-dns + - pointless-lenses + - pointless-rewrite + - point-octree + - poke + - polh-lexicon + - polydata + - polysemy-extra + - polysemy-fskvstore + - polysemy-kvstore-jsonfile + - polysemy-log-co + - polysemy-methodology + - polysemy-methodology-composite + - polysemy-optics + - polysemy-path + - polysemy-RandomFu + - polysemy-vinyl + - polyseq + - polytypeable-utils + - pomodoro + - pontarius-mediaserver + - popenhs + - porcupine-core + - porcupine-http + - porcupine-s3 + - ports + - poseidon + - poseidon-postgis + - postgresql-query + - postgresql-simple-queue + - postgresql-simple-typed + - postgresql-tx-query + - postgresql-tx-squeal + - postgresql-tx-squeal-compat-simple + - postmark + - potoki + - potoki-cereal + - potoki-conduit + - potoki-hasql + - potoki-zlib + - powerqueue-sqs + - pqueue-mtl + - practice-room + - prednote-test + - pred-set + - pred-trie + - presto-hdbc + - preview + - primula-board + - primula-bot + - Printf-TH + - ProbabilityMonads + - proc + - process-iterio + - process-progress + - process-qq + - process-streaming + - procrastinating-structure + - producer + - prof2dot + - progressbar + - project-m36 + - prologue + - prolude + - prometheus-effect + - propane + - proplang + - prosidyc + - proteome + - proto3-suite + - protobuf-native + - protocol-buffers-descriptor-fork + - proto-lens-descriptors + - proton + - psc-ide + - puffytools + - Pugs + - pugs-compat + - pugs-hsregex + - punkt + - Pup-Events + - Pup-Events-Demo + - puppetresources + - pure-cdb + - pure-priority-queue-tests + - purescript + - purescript-iso + - purescript-tsd-gen + - push-notify + - push-notify-apn + - push-notify-ccs + - push-notify-general + - puzzle-draw + - puzzle-draw-cmdline + - pvd + - qd-vec + - qhs + - qr-repa + - quantum-random + - Quelea + - queryparser + - queryparser-demo + - queryparser-hive + - queryparser-presto + - queryparser-vertica + - questioner + - queuelike + - quickbench + - quickcheck-poly + - quickcheck-regex + - quickcheck-relaxng + - quickcheck-state-machine + - quickcheck-state-machine-distributed + - quicktest + - quipper + - quipper-algorithms + - quipper-all + - quipper-cabal + - quipper-demos + - quipper-language + - quipper-libraries + - quipper-rendering + - quipper-tools + - quiver-binary + - quiver-bytestring + - quiver-cell + - quiver-csv + - quiver-enumerator + - quiver-groups + - quiver-http + - quiver-instances + - quiver-interleave + - quiver-sort + - qux + - rail-compiler-editor + - rails-session + - rainbow-tests + - raketka + - rallod + - random-effin + - random-hypergeometric + - range-space + - Ranka + - rasa + - rasa-example-config + - rasa-ext-bufs + - rasa-ext-cmd + - rasa-ext-cursors + - rasa-ext-files + - rasa-ext-logger + - rasa-ext-slate + - rasa-ext-status-bar + - rasa-ext-style + - rasa-ext-views + - rasa-ext-vim + - rating-chgk-info + - raw-feldspar + - rawr + - razom-text-util + - rbr + - rc + - rdioh + - react-flux-servant + - reactive + - reactive-balsa + - reactive-banana-automation + - reactive-banana-bunch + - reactive-banana-gi-gtk + - reactive-banana-sdl + - reactive-banana-sdl2 + - reactive-banana-threepenny + - reactive-banana-wx + - reactive-fieldtrip + - reactive-glut + - reactive-jack + - reactive-midyim + - reactor + - readline-statevar + - readpyc + - reanimate + - record-aeson + - record-gl + - record-preprocessor + - records-th + - record-syntax + - reddit + - redHandlers + - reduce-equations + - refh + - reflex-animation + - reflex-backend-socket + - reflex-backend-wai + - reflex-dom-colonnade + - reflex-ghci + - reflex-gloss-scene + - reflex-process + - refurb + - reg-alloc-graph-color + - regex-deriv + - regex-genex + - regex-pcre-text + - regex-pderiv + - regexp-tries + - regex-xmlschema + - regional-pointers + - regions-monadsfd + - regions-monadstf + - regions-mtl + - registry-hedgehog + - regular-extras + - regular-web + - regular-xmlpickler + - reheat + - relative-date + - remote-json + - remote-json-client + - remote-json-server + - remotion + - repa-array + - repa-convert + - repa-examples + - repa-flow + - repa-plugin + - repa-stream + - repa-v4l2 + - replicant + - repr + - representable-tries + - req-oauth2 + - resistor-cube + - resource-pool-catchio + - resource-simple + - respond + - rest-client + - rest-core + - rest-example + - restful-snap + - rest-gen + - rest-happstack + - RESTng + - restricted-workers + - rest-snap + - rest-stringmap + - rest-types + - rest-wai + - rethinkdb-model + - rewrite + - rewriting + - rezoom + - rfc + - rfc-env + - rfc-http-client + - rfc-psql + - rfc-redis + - rfc-servant + - rhythm-game-tutorial + - rib + - ribosome-root + - ribosome-test + - ridley-extras + - rio-process-pool + - riot + - ripple + - risc-v + - rivet + - Rlang-QQ + - rlwe-challenges + - rmonad + - RMP + - RNAdesign + - RNAdraw + - RNAFold + - RNAFoldProgs + - RNAlien + - RNAwolf + - rncryptor + - rob + - robot + - roc-cluster-demo + - rock + - roguestar-engine + - roguestar-gl + - roguestar-glut + - rollbar-cli + - rollbar-wai + - rollbar-yesod + - RollingDirectory + - ron-schema + - ron-storage + - rose-trie + - roshask + - rosmsg-bin + - rounded-hw + - roundtrip-xml + - route-generator + - route-planning + - rpc + - rpf + - rsagl + - rsagl-frp + - rsagl-math + - rtcm + - ruler + - ruler-core + - runtime-arbitrary + - S3 + - safe-numeric + - safer-file-handles + - safer-file-handles-bytestring + - safer-file-handles-text + - sai-shape-syb + - sak + - saltine-quickcheck + - salvia + - salvia-demo + - salvia-extras + - salvia-sessions + - salvia-websocket + - samtools + - samtools-conduit + - samtools-enumerator + - samtools-iteratee + - sarsi + - sasl + - satchmo-backends + - satchmo-examples + - satchmo-funsat + - satchmo-minisat + - satchmo-toysat + - sat-micro-hs + - SBench + - sc2hs + - sc2-lowlevel + - sc2-support + - sc3-rdu + - scalable-server + - SCalendar + - scalpel-search + - scalp-webhooks + - scan-vector-machine + - schema + - schematic + - scholdoc + - scholdoc-citeproc + - scholdoc-texmath + - scientific-notation + - SciFlow + - SciFlow-drmaa + - scion + - scion-browser + - scope + - scope-cairo + - scotty-hastache + - scp-streams + - scrabble-bot + - scrapbook + - SCRIPTWriter + - Scurry + - sde-solver + - seakale-postgresql + - seakale-tests + - secrm + - sednaDBXML + - seitz-symbol + - SelectSequencesFromMSA + - selenium-server + - self-extract + - semi-iso + - semiring + - semiring-num + - sensenet + - sentence-jp + - seonbi + - seqaid + - seqloc + - seqloc-datafiles + - sequor + - serpentine + - serv + - servant-auth-token + - servant-auth-token-acid + - servant-auth-token-leveldb + - servant-auth-token-persistent + - servant-auth-token-rocksdb + - servant-auth-wordpress + - servant-cli + - servant-client-namedargs + - servant-csharp + - servant-db-postgresql + - servant-ede + - servant-event-stream + - servant-examples + - servant-http2-client + - servant-matrix-param + - servant-polysemy + - servant-postgresql + - servant-server-namedargs + - servant-snap + - servant-streaming-client + - servant-streaming-docs + - servant-streaming-server + - servant-swagger-tags + - servant-waargonaut + - servant-zeppelin-client + - servant-zeppelin-server + - servant-zeppelin-swagger + - serv-wai + - sessiontypes-distributed + - setdown + - s-expression + - SFML-control + - SFont + - SGdemo + - sgf + - sgrep + - sha1 + - shake-minify-css + - shaker + - shapefile + - shapely-data + - shelduck + - Shellac-compatline + - Shellac-editline + - Shellac-haskeline + - Shellac-readline + - shellmate-extras + - shine-varying + - ShortestPathProblems + - showdown + - Shpadoinkle-backend-pardiff + - Shpadoinkle-backend-static + - Shpadoinkle-developer-tools + - Shpadoinkle-disembodied + - Shpadoinkle-examples + - Shpadoinkle-html + - Shpadoinkle-router + - Shpadoinkle-template + - Shpadoinkle-widgets + - shpider + - shuffle + - sibe + - si-clock + - sigma-ij + - signable + - signals + - signature + - signify-hs + - silvi + - simgi + - simple-c-value + - simple-firewire + - SimpleGL + - simpleirc-lens + - SimpleLog + - simple-nix + - simple-pascal + - SimpleServer + - simseq + - singleton-nats_0_4_6 + - singletons-base + - siphon + - siren-json + - sirkel + - skeleton + - skeletons + - skylark-client + - slidemews + - slip32 + - small-bytearray-builder + - smallstring + - smartword + - smcdel + - smith + - smith-cli + - smith-client + - Smooth + - smtlib2-debug + - smtlib2-pipe + - smtlib2-quickcheck + - smtlib2-timing + - smtp2mta + - snap-auth-cli + - snap-elm + - snap-extras + - snaplet-actionlog + - snaplet-auth-acid + - snaplet-coffee + - snaplet-hasql + - snaplet-haxl + - snaplet-hdbc + - snaplet-lss + - snaplet-mandrill + - snaplet-mongoDB + - snaplet-mysql-simple + - snaplet-oauth + - snaplet-postmark + - snaplet-recaptcha + - snaplet-redson + - snaplet-rest + - snaplet-riak + - snaplet-sedna + - snaplet-sqlite-simple-jwt-auth + - snaplet-stripe + - snaplet-tasks + - snaplet-wordpress + - snappy-iteratee + - snap-utils + - sndfile-enumerators + - sneathlane-haste + - snm + - snmp + - snowflake-core + - snowflake-server + - snow-white + - Snusmumrik + - SoccerFun + - SoccerFunGL + - sock2stream + - sockets + - solga-swagger + - solr + - souffle-dsl + - sounddelay + - soundgen + - source-code-server + - SourceGraph + - sparkle + - sparrow + - sparsebit + - sparser + - spata + - specialize-th + - species + - spectral-clustering + - speculation-transformers + - speechmatics + - spelling-suggest + - sphero + - sphinx-cli + - spice + - SpinCounter + - spline3 + - splines + - Spock-auth + - Spock-lucid + - Spock-worker + - sprinkles + - sproxy + - sproxy2 + - sproxy-web + - sqlite-simple-typed + - sql-simple-mysql + - sql-simple-pool + - sql-simple-postgresql + - sql-simple-sqlite + - sr-extra + - sscgi + - sshd-lint + - sssp + - sstable + - stable-tree + - stackage + - stackage2nix + - stackage-build-plan + - stackage-cabal + - stackage-query + - stackage-sandbox + - stackage-setup + - stackage-upload + - stack-hpc-coveralls + - stack-network + - stack-run-auto + - starrover2 + - stateful-mtl + - static-closure + - statsd-client + - statsdi + - STLinkUSB + - STM32-Zombie + - stmcontrol + - StockholmAlignment + - storablevector-streamfusion + - Strafunski-Sdf2Haskell + - stratux + - stratux-demo + - stratux-http + - stratux-websockets + - streaming-base64 + - streaming-brotli + - streaming-concurrency + - streaming-fft + - streaming-process + - streaming-sort + - strelka + - strict-data + - string-typelits + - stripe-scotty + - structural-induction + - structured-mongoDB + - stunts + - stutter + - subhask + - substring-parser + - summoner-tui + - sump + - sunroof-examples + - sunroof-server + - supercollider-ht + - supercollider-midi + - superconstraints + - sv + - sv-cassava + - svg2q + - SVG2Q + - svgone + - sv-svfactor + - swapper + - swearjure + - sweet-egison + - switch + - sylvia + - symantic-atom + - symantic-lib + - symbiote + - symmetry-operations-symbols + - sym-plot + - syncthing-hs + - syntax + - syntax-attoparsec + - syntax-example + - syntax-example-json + - SyntaxMacros + - syntaxnet-haskell + - syntax-pretty + - syntax-printer + - synthesizer-llvm + - systemstats + - t3-client + - ta + - tagged-list + - tagged-th + - tagsoup-navigate + - tagstew + - tag-stream + - tal + - tamarin-prover + - tamarin-prover-term + - tamarin-prover-theory + - target + - task + - task-distribution + - tasty-bdd + - tasty-groundhog-converters + - tasty-integrate + - tasty-jenkins-xml + - tasty-laws + - tasty-lens + - tateti-tateti + - Taxonomy + - TaxonomyTools + - tbox + - tccli + - tdd-util + - tdlib + - tdlib-gen + - tdlib-types + - TeaHS + - techlab + - telegram-bot + - telegram-raw-api + - telegram-types + - tensorflow-core-ops + - tensorflow-logging + - tensorflow-ops + - termbox-banana + - terminal-text + - terrahs + - testbench + - test-framework-sandbox + - test-sandbox-compose + - test-sandbox-hunit + - test-sandbox-quickcheck + - test-simple + - TeX-my-math + - textmatetags + - text-plus + - text-trie + - text-xml-generic + - th-alpha + - th-context + - theatre + - theoremquest-client + - thimk + - th-instances + - th-typegraph + - thumbnail-polish + - tickle + - tic-tac-toe + - tidal-serial + - tighttp + - timberc + - time-exts + - time-http + - time-io-access + - timeprint + - time-warp + - timezone-unix + - tinyMesh + - tip-haskell-frontend + - tip-lib + - titan + - tls-extra + - tn + - toboggan + - todos + - toktok + - too-many-cells + - top + - topkata + - to-string-instances + - total-map + - toxcore + - toxcore-c + - toysolver + - tpar + - tpb + - trajectory + - transf + - transfer-db + - transformations + - transformers-convert + - transient-universe-tls + - trasa + - trasa-client + - trasa-extra + - trasa-form + - trasa-reflex + - trasa-server + - trasa-th + - TreeCounter + - treemap-html-tools + - treersec + - Treiber + - trek-app + - trek-db + - triangulation + - TrieMap + - tries + - trimpolya + - truelevel + - trurl + - tsession-happstack + - tsweb + - tuntap-simple + - tup-functor + - tuple-hlist + - tuple-morph + - tuple-ops + - turingMachine + - twentefp-eventloop-graphics + - twentefp-eventloop-trees + - twentefp-graphs + - twentefp-rosetree + - twentefp-trees + - twentyseven + - twidge + - twilight-stm + - twill + - twitter + - twitter-enumerator + - type-assertions + - type-cache + - type-cereal + - TypeClass + - type-combinators-quote + - type-combinators-singletons + - typed-encoding-encoding + - type-digits + - typed-spreadsheet + - typed-streams + - TypeIlluminator + - typelevel + - typelevel-rewrite-rules + - type-ord + - type-ord-spine-cereal + - typescript-docs + - type-sets + - type-structure + - type-sub-th + - typson-beam + - typson-esqueleto + - typson-selda + - u2f + - uber + - ucam-webauth + - uhc-light + - uhc-util + - UMM + - unagi-bloomfilter + - unbound + - unicode-normalization + - uni-events + - uniformBase + - uniform-io + - uni-graphs + - uni-htk + - uni-posixutil + - uniqueness-periods-vector-examples + - uni-reactor + - uni-uDrawGraph + - universe-th + - unix-fcntl + - unix-simple + - unpacked-maybe-numeric + - unpacked-these + - unpacked-validation + - unparse-attoparsec + - unscramble + - up + - urbit-airlock + - urbit-api + - urbit-hob + - ureader + - urembed + - uri-enumerator + - uri-enumerator-file + - url-bytes + - UrlDisp + - urlpath + - URLT + - usb + - usb-enumerator + - usb-hid + - usb-id-database + - usb-iteratee + - usb-safe + - util-exception + - util-primitive-control + - uu-cco-examples + - uu-cco-hut-parsing + - uu-cco-uu-parsinglib + - uuid-bytes + - uuid-crypto + - uvector-algorithms + - v4l2 + - v4l2-examples + - vabal + - vacuum-cairo + - vacuum-graphviz + - vacuum-opengl + - vacuum-ubigraph + - variable-precision + - vcache-trie + - vcard + - vcsgui + - vect-floating-accelerate + - vector-endian + - vector-instances-collections + - vector-text + - venzone + - verdict-json + - versioning-servant + - vflow-types + - vfr-waypoints + - ViennaRNA-extras + - vigilance + - vinyl-operational + - vision + - visual-graphrewrite + - vocoder + - vocoder-audio + - vocoder-conduit + - vocoder-dunai + - voicebase + - vty-ui-extras + - waargonaut + - wahsp + - wai-cli + - wai-devel + - wai-dispatch + - wai-handler-snap + - wai-hastache + - wai-middleware-brotli + - wai-middleware-cache + - wai-middleware-cache-redis + - wai-middleware-consul + - wai-middleware-content-type + - wai-middleware-rollbar + - wai-middleware-route + - wai-session-tokyocabinet + - wai-thrift + - waldo + - warped + - WashNGo + - WAVE + - WaveFront + - wavesurfer + - wavy + - web3 + - webapi + - WebBits-Html + - WebBits-multiplate + - WebCont + - webcrank-wai + - webdriver-w3c + - web-mongrel2 + - web-page + - web-rep + - web-routes-regular + - web-routing + - webserver + - WEditorBrick + - WEditorHyphen + - weighted + - werewolf-slack + - what4 + - wheb-mongo + - wheb-redis + - wheb-strapped + - whitespace + - wide-word-instances + - wikipedia4epub + - windowslive + - winio + - WL500gPControl + - wlc-hs + - wl-pprint-ansiterm + - wl-pprint-terminfo + - wobsurv + - wolf + - WordAlignment + - workflow-extra + - workflow-pure + - workflow-types + - wraxml + - wrecker + - wrecker-ui + - wright + - writer-cps-full + - ws + - wss-client + - wtk-gtk + - wumpus-basic + - wumpus-drawing + - wumpus-microprint + - wumpus-tree + - WURFL + - wu-wei + - wx + - wxAsteroids + - wxc + - wxcore + - WXDiffCtrl + - wxFruit + - WxGeneric + - wxhnotepad + - wxSimpleCanvas + - wxturtle + - wyvern + - xdcc + - xhb-atom-cache + - xhb-ewmh + - XML + - xml2x + - xml-catalog + - xml-enumerator + - xml-enumerator-combinators + - xml-monad + - xml-pipe + - xml-push + - xml-query-xml-conduit + - xml-query-xml-types + - xmltv + - xml-tydom-conduit + - xmms2-client + - xmms2-client-glib + - xmonad-contrib-bluetilebranch + - xmpipe + - XMPP + - xournal-builder + - xournal-convert + - xournal-parser + - xournal-render + - XSaiga + - xtc + - Yablog + - YACPong + - yajl-enumerator + - yam + - yam-datasource + - yam-logger + - yaml-rpc-scotty + - yaml-rpc-snap + - yaml-unscrambler + - yam-redis + - yam-transaction + - yam-transaction-odbc + - yam-web + - yarr-image-io + - yavie + - ycextra + - yeamer + - yeshql + - yesod-articles + - yesod-auth-ldap + - yesod-auth-lti13 + - yesod-colonnade + - yesod-continuations + - yesod-examples + - yesod-ip + - yesod-mangopay + - yesod-paypal-rest + - yesod-platform + - yesod-purescript + - yesod-raml-bin + - yesod-raml-docs + - yesod-raml-mock + - yesod-routes-typescript + - yesod-session-redis + - yjftp + - yjftp-libs + - Yogurt + - Yogurt-Standalone + - yoko + - york-lava + - yql + - yu-launch + - yuuko + - zasni-gerna + - Z-Botan + - zephyr + - zerobin + - zeromq3-conduit + - zeromq3-haskell + - zeroth + - zifter-cabal + - zifter-git + - zifter-google-java-format + - zifter-hindent + - zifter-hlint + - zifter-stack + - Z-IO + - zipper + - zippo + - ziptastic-client + - zlib-enum + - zmcat + - Z-MessagePack + - zoom-cache + - zoom-cache-pcm + - zoom-cache-sndfile + - zoovisitor + - zuramaru + - Z-YAML 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 ba00d20007..52f9e94401 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -101,17 +101,6 @@ self: super: builtins.intersectAttrs super { ormolu = enableSeparateBinOutput super.ormolu; ghcid = enableSeparateBinOutput super.ghcid; - # Ensure the necessary frameworks for Darwin. - OpenAL = if pkgs.stdenv.isDarwin - then addExtraLibrary super.OpenAL pkgs.darwin.apple_sdk.frameworks.OpenAL - else super.OpenAL; - - # Ensure the necessary frameworks for Darwin. - proteaaudio = if pkgs.stdenv.isDarwin - then addExtraLibrary super.proteaaudio pkgs.darwin.apple_sdk.frameworks.AudioToolbox - else super.proteaaudio; - - hzk = overrideCabal super.hzk (drv: { preConfigure = "sed -i -e /include-dirs/d hzk.cabal"; configureFlags = [ "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper" ]; @@ -131,39 +120,11 @@ self: super: builtins.intersectAttrs super { # Foreign dependency name clashes with another Haskell package. libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; }; - # Fix Darwin build. - halive = if pkgs.stdenv.isDarwin - then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit - else super.halive; - # Heist's test suite requires system pandoc heist = overrideCabal super.heist (drv: { testToolDepends = [pkgs.pandoc]; }); - # the system-fileio tests use canonicalizePath, which fails in the sandbox - system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio; - - # Prevents needing to add `security_tool` as a run-time dependency for - # everything using x509-system to give access to the `security` executable. - x509-system = - if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc - then - # darwin.security_tool is broken in Mojave (#45042) - - # We will use the system provided security for now. - # Beware this WILL break in sandboxes! - - # TODO(matthewbauer): If someone really needs this to work in sandboxes, - # I think we can add a propagatedImpureHost dep here, but I’m hoping to - # get a proper fix available soonish. - overrideCabal super.x509-system (drv: { - postPatch = (drv.postPatch or "") + '' - substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security - ''; - }) - else super.x509-system; - # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216 gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"]; glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"]; @@ -266,12 +227,6 @@ self: super: builtins.intersectAttrs super { # /homeless-shelter. Disabled. purescript = dontCheck super.purescript; - # https://github.com/haskell-foundation/foundation/pull/412 - foundation = - if pkgs.stdenv.isDarwin - then dontCheck super.foundation - else super.foundation; - # Hardcoded include path poppler = overrideCabal super.poppler (drv: { postPatch = '' @@ -283,23 +238,8 @@ self: super: builtins.intersectAttrs super { # Uses OpenGL in testing caramia = dontCheck super.caramia; - llvm-hs = - let llvmHsWithLlvm9 = super.llvm-hs.override { llvm-config = pkgs.llvm_9; }; - in - if pkgs.stdenv.isDarwin - then - overrideCabal llvmHsWithLlvm9 (oldAttrs: { - # One test fails on darwin. - doCheck = false; - # llvm-hs's Setup.hs file tries to add the lib/ directory from LLVM8 to - # the DYLD_LIBRARY_PATH environment variable. This messes up clang - # when called from GHC, probably because clang is version 7, but we are - # using LLVM8. - preCompileBuildDriver = oldAttrs.preCompileBuildDriver or "" + '' - substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()" - ''; - }) - else llvmHsWithLlvm9; + # requires llvm 9 specifically https://github.com/llvm-hs/llvm-hs/#building-from-source + llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_9; }; # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; @@ -307,7 +247,7 @@ self: super: builtins.intersectAttrs super { # Tries to run GUI in tests leksah = dontCheck (overrideCabal super.leksah (drv: { executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [ - gnome3.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... + gnome.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed ]); @@ -322,14 +262,6 @@ self: super: builtins.intersectAttrs super { # Patch to consider NIX_GHC just like xmonad does dyre = appendPatch super.dyre ./patches/dyre-nix.patch; - yesod-bin = if pkgs.stdenv.isDarwin - then addBuildDepend super.yesod-bin pkgs.darwin.apple_sdk.frameworks.Cocoa - else super.yesod-bin; - - hmatrix = if pkgs.stdenv.isDarwin - then addBuildDepend super.hmatrix pkgs.darwin.apple_sdk.frameworks.Accelerate - else super.hmatrix; - # https://github.com/edwinb/EpiVM/issues/13 # https://github.com/edwinb/EpiVM/issues/14 epic = addExtraLibraries (addBuildTool super.epic self.buildHaskellPackages.happy) [pkgs.boehmgc pkgs.gmp]; @@ -405,43 +337,8 @@ self: super: builtins.intersectAttrs super { # Looks like Avahi provides the missing library dnssd = super.dnssd.override { dns_sd = pkgs.avahi.override { withLibdnssdCompat = true; }; }; - # Ensure the necessary frameworks are propagatedBuildInputs on darwin - OpenGLRaw = overrideCabal super.OpenGLRaw (drv: { - librarySystemDepends = - pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; - libraryHaskellDepends = drv.libraryHaskellDepends - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]; - preConfigure = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' - frameworkPaths=($(for i in $nativeBuildInputs; do if [ -d "$i"/Library/Frameworks ]; then echo "-F$i/Library/Frameworks"; fi done)) - frameworkPaths=$(IFS=, ; echo "''${frameworkPaths[@]}") - configureFlags+=$(if [ -n "$frameworkPaths" ]; then echo -n "--ghc-options=-optl=$frameworkPaths"; fi) - ''; - }); - GLURaw = overrideCabal super.GLURaw (drv: { - librarySystemDepends = - pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; - libraryHaskellDepends = drv.libraryHaskellDepends - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]; - }); - bindings-GLFW = overrideCabal super.bindings-GLFW (drv: { - doCheck = false; # requires an active X11 display - librarySystemDepends = - pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; - libraryHaskellDepends = drv.libraryHaskellDepends - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - (with pkgs.darwin.apple_sdk.frameworks; - [ AGL Cocoa OpenGL IOKit Kernel CoreVideo - pkgs.darwin.CF ]); - }); - OpenCL = overrideCabal super.OpenCL (drv: { - librarySystemDepends = - pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; - libraryHaskellDepends = drv.libraryHaskellDepends - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]; - }); + # requires an X11 display + bindings-GLFW = dontCheck super.bindings-GLFW; # requires an X11 display in test suite gi-gtk-declarative = dontCheck super.gi-gtk-declarative; @@ -474,16 +371,8 @@ self: super: builtins.intersectAttrs super { testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ]; }); - # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required - # on darwin: https://github.com/NixOS/cabal2nix/issues/146. - hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify; - - # FSEvents API is very buggy and tests are unreliable. See - # http://openradar.appspot.com/10207999 and similar issues. # https://github.com/haskell-fswatch/hfsnotify/issues/62 - fsnotify = if pkgs.stdenv.isDarwin - then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa - else dontCheck super.fsnotify; + fsnotify = dontCheck super.fsnotify; hidapi = addExtraLibrary super.hidapi pkgs.udev; @@ -596,7 +485,7 @@ self: super: builtins.intersectAttrs super { # Compile manpages (which are in RST and are compiled with Sphinx). futhark = with pkgs; - overrideCabal (addBuildTools super.futhark [makeWrapper python37Packages.sphinx]) + overrideCabal (addBuildTools super.futhark [makeWrapper python3Packages.sphinx]) (_drv: { postBuild = (_drv.postBuild or "") + '' make -C docs man @@ -657,10 +546,6 @@ self: super: builtins.intersectAttrs super { spago = let - # spago requires an older version of megaparsec, but it appears to work - # fine with newer versions. - spagoWithOverrides = doJailbreak super.spago; - docsSearchApp_0_0_10 = pkgs.fetchurl { url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.10/docs-search-app.js"; sha256 = "0m5ah29x290r0zk19hx2wix2djy7bs4plh9kvjz6bs9r45x25pa5"; @@ -681,17 +566,8 @@ self: super: builtins.intersectAttrs super { sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6"; }; - spagoFixHpack = overrideCabal spagoWithOverrides (drv: { + spagoDocs = overrideCabal super.spago (drv: { postUnpack = (drv.postUnpack or "") + '' - # The source for spago is pulled directly from GitHub. It uses a - # package.yaml file with hpack, not a .cabal file. In the package.yaml file, - # it uses defaults from the master branch of the hspec repo. It will try to - # fetch these at build-time (but it will fail if running in the sandbox). - # - # The following line modifies the package.yaml to not pull in - # defaults from the hspec repo. - substituteInPlace "$sourceRoot/package.yaml" --replace 'defaults: hspec/hspec@master' "" - # Spago includes the following two files directly into the binary # with Template Haskell. They are fetched at build-time from the # `purescript-docs-search` repo above. If they cannot be fetched at @@ -717,9 +593,8 @@ self: super: builtins.intersectAttrs super { ''; }); - # Because of the problem above with pulling in hspec defaults to the - # package.yaml file, the tests are disabled. - spagoWithoutChecks = dontCheck spagoFixHpack; + # Tests require network access. + spagoWithoutChecks = dontCheck spagoDocs; in spagoWithoutChecks; @@ -741,7 +616,7 @@ self: super: builtins.intersectAttrs super { primitive_0_7_1_0 = dontCheck super.primitive_0_7_1_0; cut-the-crap = - let path = pkgs.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ]; + let path = pkgs.lib.makeBinPath [ pkgs.ffmpeg pkgs.youtube-dl ]; in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: { postInstall = '' wrapProgram $out/bin/cut-the-crap \ @@ -826,4 +701,106 @@ self: super: builtins.intersectAttrs super { # Tests access internet prune-juice = dontCheck super.prune-juice; + + # based on https://github.com/gibiansky/IHaskell/blob/aafeabef786154d81ab7d9d1882bbcd06fc8c6c4/release.nix + ihaskell = overrideCabal super.ihaskell (drv: { + configureFlags = (drv.configureFlags or []) ++ [ + # ihaskell's cabal file forces building a shared executable, + # but without passing --enable-executable-dynamic, the RPATH + # contains /build/ and leads to a build failure with nix + "--enable-executable-dynamic" + ]; + preCheck = '' + export HOME=$TMPDIR/home + export PATH=$PWD/dist/build/ihaskell:$PATH + export GHC_PACKAGE_PATH=$PWD/dist/package.conf.inplace/:$GHC_PACKAGE_PATH + ''; + }); + + # tests need to execute the built executable + stutter = overrideCabal super.stutter (drv: { + preCheck = '' + export PATH=dist/build/stutter:$PATH + '' + (drv.preCheck or ""); + }); + + # Install man page and generate shell completions + pinboard-notes-backup = overrideCabal + (generateOptparseApplicativeCompletion "pnbackup" super.pinboard-notes-backup) + (drv: { + postInstall = '' + install -D man/pnbackup.1 $out/share/man/man1/pnbackup.1 + '' + (drv.postInstall or ""); + }); + + # set more accurate set of platforms instead of maintaining + # an ever growing list of platforms to exclude via unsupported-platforms + cpuid = overrideCabal super.cpuid { + platforms = pkgs.lib.platforms.x86; + }; + + # Pass the correct libarchive into the package. + streamly-archive = super.streamly-archive.override { archive = pkgs.libarchive; }; + + # passes the -msse2 flag which only works on x86 platforms + hsignal = overrideCabal super.hsignal { + platforms = pkgs.lib.platforms.x86; + }; + + # uses x86 intrinsics + blake3 = overrideCabal super.blake3 { + platforms = pkgs.lib.platforms.x86; + }; + + # uses x86 intrinsics, see also https://github.com/NixOS/nixpkgs/issues/122014 + crc32c = overrideCabal super.crc32c { + platforms = pkgs.lib.platforms.x86; + }; + + # uses x86 intrinsics + seqalign = overrideCabal super.seqalign { + platforms = pkgs.lib.platforms.x86; + }; + + hls-brittany-plugin = overrideCabal super.hls-brittany-plugin (drv: { + testToolDepends = [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); + hls-class-plugin = overrideCabal super.hls-class-plugin (drv: { + testToolDepends = [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); + # Tests have file permissions expections that don‘t work with the nix store. + hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin; + hls-haddock-comments-plugin = overrideCabal super.hls-haddock-comments-plugin (drv: { + testToolDepends = [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); + hls-eval-plugin = overrideCabal super.hls-eval-plugin (drv: { + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); + + taglib = overrideCabal super.taglib (drv: { + librarySystemDepends = [ + pkgs.zlib + ] ++ (drv.librarySystemDepends or []); + }); + + # uses x86 assembler + inline-asm = overrideCabal super.inline-asm { + platforms = pkgs.lib.platforms.x86; + }; + + # uses x86 assembler in C bits + hw-prim-bits = overrideCabal super.hw-prim-bits { + platforms = pkgs.lib.platforms.x86; + }; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/default.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/default.nix index a4f0399cf3..8392e751da 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/default.nix @@ -7,6 +7,8 @@ , nonHackagePackages ? import ./non-hackage-packages.nix , configurationCommon ? import ./configuration-common.nix , configurationNix ? import ./configuration-nix.nix +, configurationArm ? import ./configuration-arm.nix +, configurationDarwin ? import ./configuration-darwin.nix }: let @@ -19,17 +21,24 @@ let inherit stdenv haskellLib ghc buildHaskellPackages extensible-self all-cabal-hashes; }; - commonConfiguration = configurationCommon { inherit pkgs haskellLib; }; - nixConfiguration = configurationNix { inherit pkgs haskellLib; }; + isArm = with stdenv.hostPlatform; isAarch64 || isAarch32; + platformConfigurations = lib.optionals isArm [ + (configurationArm { inherit pkgs haskellLib; }) + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (configurationDarwin { inherit pkgs haskellLib; }) + ]; - extensible-self = makeExtensible - (extends overrides - (extends packageSetConfig - (extends compilerConfig - (extends commonConfiguration - (extends nixConfiguration - (extends nonHackagePackages - haskellPackages)))))); + extensions = lib.composeManyExtensions ([ + nonHackagePackages + (configurationNix { inherit pkgs haskellLib; }) + (configurationCommon { inherit pkgs haskellLib; }) + ] ++ platformConfigurations ++ [ + compilerConfig + packageSetConfig + overrides + ]); + + extensible-self = makeExtensible (extends extensions haskellPackages); in diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix index faf80da0c7..2f9127e30f 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix @@ -464,7 +464,12 @@ stdenv.mkDerivation ({ installPhase = '' runHook preInstall - ${if !isLibrary then "${setupCommand} install" else '' + ${if !isLibrary && buildTarget == "" then "${setupCommand} install" + # ^^ if the project is not a library, and no build target is specified, we can just use "install". + else if !isLibrary then "${setupCommand} copy ${buildTarget}" + # ^^ if the project is not a library, and we have a build target, then use "copy" to install + # just the target specified; "install" will error here, since not all targets have been built. + else '' ${setupCommand} copy local packageConfDir="$out/lib/${ghc.name}/package.conf.d" local packageConfFile="$packageConfDir/${pname}-${version}.conf" 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 6fa8f73355..c04898da52 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -46,7 +46,6 @@ self: { description = "A tetris-like game (works with GHC 6.8.3 and Gtk2hs 0.9.13)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "AAI" = callPackage @@ -243,7 +242,6 @@ self: { description = "Fancy type-system stuff for AC-Vector"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ACME" = callPackage @@ -317,7 +315,6 @@ self: { description = "Dynamic programming on tree and forest structures"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ADPfusionSet" = callPackage @@ -343,7 +340,6 @@ self: { description = "Dynamic programming for Set data structures"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "AERN-Basics" = callPackage @@ -381,7 +377,6 @@ self: { description = "Compositional lazy dataflow networks for exact real number computation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "AERN-Real" = callPackage @@ -399,7 +394,6 @@ self: { description = "arbitrary precision real interval arithmetic"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "AERN-Real-Double" = callPackage @@ -424,7 +418,6 @@ self: { description = "arbitrary precision real interval arithmetic"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "AERN-Real-Interval" = callPackage @@ -442,7 +435,6 @@ self: { description = "arbitrary precision real interval arithmetic"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "AERN-RnToRm" = callPackage @@ -460,7 +452,6 @@ self: { description = "polynomial function enclosures (PFEs) approximating exact real functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "AERN-RnToRm-Plot" = callPackage @@ -479,7 +470,6 @@ self: { description = "GL plotting of polynomial function enclosures (PFEs)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "AES" = callPackage @@ -582,7 +572,6 @@ self: { description = "ASN.1 support for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "AVar" = callPackage @@ -618,7 +607,6 @@ self: { description = "Monads-tf instances for the AbortT monad transformer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "AbortT-mtl" = callPackage @@ -631,7 +619,6 @@ self: { description = "mtl instances for the AbortT monad transformer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "AbortT-transformers" = callPackage @@ -723,7 +710,6 @@ self: { description = "Lisperati's adventure game in Lisp translated to Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Advise-me" = callPackage @@ -754,7 +740,6 @@ self: { description = "Assessment services for the Advise-Me project"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "AesonBson" = callPackage @@ -909,7 +894,6 @@ self: { description = "Algorithmic music composition"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "AlgorithmW" = callPackage @@ -942,7 +926,6 @@ self: { description = "Collection of alignment algorithms"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Allure" = callPackage @@ -971,8 +954,9 @@ self: { ]; description = "Near-future Sci-Fi roguelike and tactical squad combat game"; license = lib.licenses.agpl3Plus; - hydraPlatforms = lib.platforms.none; - broken = true; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "AndroidViewHierarchyImporter" = callPackage @@ -993,7 +977,6 @@ self: { description = "Android view hierarchy importer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Animas" = callPackage @@ -1020,7 +1003,6 @@ self: { description = "Constructing, analyzing and destructing annotated trees"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Ansi2Html" = callPackage @@ -1067,7 +1049,6 @@ self: { description = "Library for Apple Push Notification Service"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "AppleScript" = callPackage @@ -1174,7 +1155,6 @@ self: { description = "Simple lightweight JSON parser, generator & manipulator based on ByteString"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Attrac" = callPackage @@ -1223,7 +1203,6 @@ self: { description = "GUI library based upon generic programming (SYB3)"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "AvlTree" = callPackage @@ -1236,7 +1215,6 @@ self: { description = "Balanced binary trees using the AVL algorithm"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BASIC" = callPackage @@ -1249,7 +1227,6 @@ self: { description = "Embedded BASIC"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BCMtools" = callPackage @@ -1385,7 +1362,6 @@ self: { description = "An ad-hoc P2P chat program"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Befunge93" = callPackage @@ -1461,7 +1437,6 @@ self: { description = "Factorization of polynomials over finite field"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiGUL" = callPackage @@ -1540,7 +1515,6 @@ self: { description = "Libary for Hidden Markov Models in HMMER3 format"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Biobase" = callPackage @@ -1563,7 +1537,6 @@ self: { description = "Base library for bioinformatics"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiobaseBlast" = callPackage @@ -1591,7 +1564,6 @@ self: { description = "BLAST-related tools"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiobaseDotP" = callPackage @@ -1604,7 +1576,6 @@ self: { description = "Vienna / DotBracket / ExtSS parsers"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiobaseENA" = callPackage @@ -1628,7 +1599,6 @@ self: { description = "European Nucleotide Archive data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiobaseEnsembl" = callPackage @@ -1647,7 +1617,6 @@ self: { description = "Ensembl related datastructures and functions"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiobaseFR3D" = callPackage @@ -1664,7 +1633,6 @@ self: { description = "Importer for FR3D resources"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiobaseFasta" = callPackage @@ -1690,7 +1658,6 @@ self: { description = "streaming FASTA parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiobaseHTTP" = callPackage @@ -1709,7 +1676,6 @@ self: { description = "Libary to interface with the Bioinformatics HTTP services - Entrez Ensembl"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiobaseHTTPTools" = callPackage @@ -1731,7 +1697,6 @@ self: { description = "Tools to query Bioinformatics HTTP services e.g. Entrez, Ensembl."; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiobaseInfernal" = callPackage @@ -1771,7 +1736,6 @@ self: { description = "Infernal data structures and tools"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiobaseMAF" = callPackage @@ -1784,7 +1748,6 @@ self: { description = "Multiple Alignment Format"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiobaseNewick" = callPackage @@ -1834,7 +1797,6 @@ self: { description = "RNA folding training data"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiobaseTurner" = callPackage @@ -1853,7 +1815,6 @@ self: { description = "Import Turner RNA parameters"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiobaseTypes" = callPackage @@ -1887,7 +1848,6 @@ self: { description = "Collection of types for bioinformatics"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiobaseVienna" = callPackage @@ -1904,7 +1864,6 @@ self: { description = "Import Vienna energy parameters"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiobaseXNA" = callPackage @@ -1947,7 +1906,6 @@ self: { description = "Efficient RNA/DNA/Protein Primary/Secondary Structure"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BirdPP" = callPackage @@ -1962,7 +1920,6 @@ self: { description = "A preprocessor for Bird-style Literate Haskell comments with Haddock markup"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BitStringRandomMonad" = callPackage @@ -1997,8 +1954,6 @@ self: { ]; description = "A module to aid in the (de)serialisation of binary data"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Bitly" = callPackage @@ -2011,7 +1966,6 @@ self: { description = "A library to access bit.ly URL shortener."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BlastHTTP" = callPackage @@ -2030,7 +1984,6 @@ self: { description = "Libary to interface with the NCBI blast REST interface"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Blobs" = callPackage @@ -2053,7 +2006,6 @@ self: { description = "Diagram editor"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BlogLiterately" = callPackage @@ -2079,7 +2031,6 @@ self: { description = "A tool for posting Haskelly articles to blogs"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BlogLiterately-diagrams" = callPackage @@ -2102,7 +2053,6 @@ self: { description = "Include images in blog posts with inline diagrams code"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Blogdown" = callPackage @@ -2178,7 +2128,6 @@ self: { description = "A simple document organizer with some wiki functionality"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Boolean" = callPackage @@ -2297,7 +2246,6 @@ self: { description = "Encode/Decode values to/from CBOR"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "CC-delcont" = callPackage @@ -2328,7 +2276,6 @@ self: { description = "Three new monad transformers for multi-prompt delimited control"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "CC-delcont-cxe" = callPackage @@ -2464,7 +2411,6 @@ self: { description = "Infernal covariance model comparison"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "CMQ" = callPackage @@ -2511,7 +2457,6 @@ self: { description = "A simple Brainfuck interpretter"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "CPL" = callPackage @@ -2528,7 +2473,6 @@ self: { description = "An interpreter of Hagino's Categorical Programming Language (CPL)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "CSPM-CoreLanguage" = callPackage @@ -2594,7 +2538,6 @@ self: { description = "An interpreter for CSPM"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "CSPM-ToProlog" = callPackage @@ -2609,7 +2552,6 @@ self: { description = "some modules specific for the ProB tool"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "CSPM-cspm" = callPackage @@ -2636,7 +2578,6 @@ self: { description = "cspm command line tool for analyzing CSPM specifications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "CTRex" = callPackage @@ -2907,7 +2848,6 @@ self: { description = "A translation from the Carneades argumentation model into Dung's AFs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Cartesian" = callPackage @@ -3064,7 +3004,6 @@ self: { description = "A backend for the Chart library for FLTKHS"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Chart-gtk" = callPackage @@ -3141,8 +3080,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Tests of the Charts library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ChasingBottoms" = callPackage @@ -3326,7 +3263,6 @@ self: { description = "Libary for parsing Clustal tools output"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Coadjute" = callPackage @@ -3345,7 +3281,6 @@ self: { description = "A generic build tool"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Codec-Compression-LZF" = callPackage @@ -3414,7 +3349,6 @@ self: { description = "A concurrent bittorrent client"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Command" = callPackage @@ -3470,7 +3404,6 @@ self: { description = "A library for expressing spreadsheet-like computations as the fixed-points of comonads"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Compactable" = callPackage @@ -3556,7 +3489,6 @@ self: { description = "Information retrieval library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ConfigFile" = callPackage @@ -3597,7 +3529,6 @@ self: { description = "Parse config files"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Configurable" = callPackage @@ -3740,7 +3671,6 @@ self: { description = "A Library for Writing Multi-Pass Algorithms"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Control-Monad-ST2" = callPackage @@ -3805,7 +3735,6 @@ self: { description = "Bindings to Mac OSX's CoreFoundation framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Coroutine" = callPackage @@ -4045,7 +3974,6 @@ self: { description = "Distributed Mutation Analysis framework for MuCheck"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "DOH" = callPackage @@ -4083,7 +4011,6 @@ self: { description = "DOM Level 2 bindings for the WebBits package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "DP" = callPackage @@ -4100,7 +4027,6 @@ self: { description = "Pragmatic framework for dynamic programming"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "DPM" = callPackage @@ -4241,7 +4167,6 @@ self: { description = "Database Supported Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "DSTM" = callPackage @@ -4264,7 +4189,6 @@ self: { description = "A framework for using STM within distributed systems"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "DTC" = callPackage @@ -4290,7 +4214,6 @@ self: { description = "Monads for operations that can exit early and produce warnings"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Dao" = callPackage @@ -4335,7 +4258,6 @@ self: { description = "Code used by Patch-Shack that seemed sensible to open for reusability"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Data-Angle" = callPackage @@ -4507,8 +4429,6 @@ self: { libraryHaskellDepends = [ base haskell-src mtl TypeCompose ]; description = "Arrows for \"deep application\""; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "DeepDarkFantasy" = callPackage @@ -4548,7 +4468,6 @@ self: { description = "A simple RTS game"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Delta-Lambda" = callPackage @@ -4652,7 +4571,6 @@ self: { description = "A theory solver for conjunctions of literals in difference logic"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "DifferentialEvolution" = callPackage @@ -4753,7 +4671,6 @@ self: { description = "Distributed Bug Tracking System"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "DiscussionSupportSystem" = callPackage @@ -4856,7 +4773,6 @@ self: { description = "Frameshift-aware alignment of protein sequences with DNA sequences"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "DocTest" = callPackage @@ -4875,7 +4791,6 @@ self: { description = "Test interactive Haskell examples"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Docs" = callPackage @@ -4906,7 +4821,6 @@ self: { description = "A tool for deriving hylomorphisms"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "DrIFT" = callPackage @@ -4983,7 +4897,6 @@ self: { description = "Polymorphic protocol engine"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Dust-crypto" = callPackage @@ -5037,7 +4950,6 @@ self: { description = "Network filtering exploration tools"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Dust-tools-pcap" = callPackage @@ -5060,7 +4972,6 @@ self: { description = "Network filtering exploration tools that rely on pcap"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "DynamicTimeWarp" = callPackage @@ -5107,7 +5018,6 @@ self: { description = "dysFunctional Reactive Programming on Cairo"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "DysFRP-Craftwerk" = callPackage @@ -5125,7 +5035,6 @@ self: { description = "dysFunctional Reactive Programming on Craftwerk"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "EEConfig" = callPackage @@ -5240,7 +5149,6 @@ self: { description = "Query language and report generator for edit logs"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Eight-Ball-Pool-Hack-Cheats" = callPackage @@ -5385,7 +5293,6 @@ self: { description = "Libary to interface with the NCBI Entrez REST service"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Enum" = callPackage @@ -5479,7 +5386,6 @@ self: { description = "Type-safe bindings to EsounD (ESD; Enlightened Sound Daemon)"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "EstProgress" = callPackage @@ -5518,7 +5424,6 @@ self: { description = "A new implementation of the LambdaMOO server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) pcre;}; "Etage" = callPackage @@ -5555,7 +5460,6 @@ self: { description = "Data-flow based graph algorithms"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Eternal10Seconds" = callPackage @@ -5571,7 +5475,6 @@ self: { description = "A 2-D shooting game"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Etherbunny" = callPackage @@ -5594,7 +5497,6 @@ self: { description = "A network analysis toolkit for Haskell"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) libpcap;}; "EuroIT" = callPackage @@ -5622,6 +5524,9 @@ self: { ]; description = "Library for computer music research and education"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "EventSocket" = callPackage @@ -5638,7 +5543,6 @@ self: { description = "Interfaces with FreeSwitch Event Socket"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Extra" = callPackage @@ -5698,7 +5602,6 @@ self: { description = "Compose music"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "FM-SBLEX" = callPackage @@ -5713,7 +5616,6 @@ self: { description = "A set of computational morphology tools for Swedish diachronic lexicons"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "FModExRaw" = callPackage @@ -5806,7 +5708,6 @@ self: { description = "A command-line FTP client"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Facebook-Password-Hacker-Online-Latest-Version" = callPackage @@ -5849,7 +5750,6 @@ self: { description = "A collection of facts about the real world"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "FailureT" = callPackage @@ -5862,7 +5762,6 @@ self: { description = "Failure Monad Transformer"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "FastPush" = callPackage @@ -5927,7 +5826,6 @@ self: { description = "Annotate ps and pdf documents"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "FerryCore" = callPackage @@ -5978,7 +5876,6 @@ self: { description = "Functional 3D"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "FileManip" = callPackage @@ -6030,7 +5927,6 @@ self: { description = "Functions on System.FilePath"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "FileSystem" = callPackage @@ -6083,8 +5979,6 @@ self: { ]; description = "Finite totally-ordered sets"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Finance-Quote-Yahoo" = callPackage @@ -6119,7 +6013,6 @@ self: { description = "Obtain Treasury yield curve data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "FindBin" = callPackage @@ -6143,7 +6036,6 @@ self: { description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562"; license = lib.licenses.bsdOriginal; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "FirstOrderTheory" = callPackage @@ -6156,7 +6048,6 @@ self: { description = "Grammar and typeclass for first order theories"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "FixedPoint-simple" = callPackage @@ -6187,7 +6078,6 @@ self: { description = "Wiki"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "FloatingHex" = callPackage @@ -6311,7 +6201,6 @@ self: { description = "Comparison of trees and forests"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ForkableT" = callPackage @@ -6350,7 +6239,6 @@ self: { description = "(Context-free) grammars in formal language theory"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Fortnite-Hack-Cheats-Free-V-Bucks-Generator" = callPackage @@ -6396,7 +6284,6 @@ self: { description = "Utilities to generate and solve puzzles"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "FpMLv53" = callPackage @@ -6500,7 +6387,6 @@ self: { description = "A library for accessing Postgres tables as in-memory data structures"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Frames-dsv" = callPackage @@ -6519,7 +6405,6 @@ self: { description = "Alternative CSV parser for the Frames package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Frames-map-reduce" = callPackage @@ -6545,24 +6430,18 @@ self: { }) {}; "Frames-streamly" = callPackage - ({ mkDerivation, base, binary, bytestring - , bytestring-strict-builder, cereal, clock, exceptions - , fast-builder, foldl, Frames, mtl, primitive, relude, streamly - , streamly-bytestring, strict, text, vector, vinyl + ({ mkDerivation, base, exceptions, Frames, primitive, relude + , streamly, strict, text, vinyl }: mkDerivation { pname = "Frames-streamly"; - version = "0.1.1.0"; - sha256 = "16cxgar58q9gfbs8apl4a9z3ghdxb6m042di7hwhldqy0gn584fp"; + version = "0.1.1.1"; + sha256 = "05al2v7wivvpwxq0gxypbm30ch4ssxmxw1wl4k9az3dqfvr0xgal"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base exceptions Frames primitive relude streamly strict text vinyl ]; - testHaskellDepends = [ - base binary bytestring bytestring-strict-builder cereal clock - fast-builder foldl Frames mtl primitive relude streamly - streamly-bytestring strict text vector vinyl - ]; + testHaskellDepends = [ base Frames streamly text vinyl ]; description = "A streamly layer for Frames I/O"; license = lib.licenses.bsd3; }) {}; @@ -6579,7 +6458,6 @@ self: { description = "An experimental programming language with typed algebraic effects"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "FreeTypeGL" = callPackage @@ -6701,7 +6579,6 @@ self: { description = "A binding for GLFW (OGL)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;}; "GLFW-b" = callPackage @@ -6752,7 +6629,6 @@ self: { description = "GLFW utility functions to use together with monad-task"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GLHUI" = callPackage @@ -6872,7 +6748,6 @@ self: { description = "Parse GPX files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GPipe" = callPackage @@ -6906,7 +6781,6 @@ self: { description = "Load GPipe meshes from Collada files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GPipe-Core" = callPackage @@ -6948,7 +6822,6 @@ self: { description = "Examples for the GPipes package"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GPipe-GLFW" = callPackage @@ -6962,7 +6835,6 @@ self: { description = "GLFW OpenGL context creation for GPipe"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GPipe-GLFW4" = callPackage @@ -6993,7 +6865,6 @@ self: { description = "GLFW OpenGL context creation for GPipe"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GPipe-TextureLoad" = callPackage @@ -7006,7 +6877,6 @@ self: { description = "Load GPipe textures from filesystem"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GTALib" = callPackage @@ -7049,7 +6919,6 @@ self: { description = "Some kind of game library or set of utilities"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Ganymede" = callPackage @@ -7097,7 +6966,6 @@ self: { description = "Several games"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GenI" = callPackage @@ -7132,7 +7000,6 @@ self: { description = "A natural language generator (specifically, an FB-LTAG surface realiser)"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GenSmsPdu" = callPackage @@ -7147,7 +7014,6 @@ self: { description = "Automatic SMS message generator"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Genbank" = callPackage @@ -7167,7 +7033,6 @@ self: { description = "Libary for processing the NCBI genbank format"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Gene-CluEDO" = callPackage @@ -7194,7 +7059,6 @@ self: { description = "Hox gene clustering"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GeneralTicTacToe" = callPackage @@ -7249,7 +7113,6 @@ self: { description = "MCFGs for Genus-1 RNA Pseudoknots"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GeoIp" = callPackage @@ -7454,7 +7317,6 @@ self: { description = "SDL Frontend for Glome ray tracer"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GoogleChart" = callPackage @@ -7499,7 +7361,6 @@ self: { description = "Haskell Interface to Google Directions API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GoogleSB" = callPackage @@ -7516,7 +7377,6 @@ self: { description = "Interface to Google Safe Browsing API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GoogleSuggest" = callPackage @@ -7545,7 +7405,6 @@ self: { description = "Interface to Google Translate API"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GotoT-transformers" = callPackage @@ -7595,7 +7454,6 @@ self: { description = "Grammar products and higher-dimensional grammars"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Graph500" = callPackage @@ -7631,7 +7489,6 @@ self: { description = "GraphHammer Haskell graph analyses framework inspired by STINGER"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GraphHammer-examples" = callPackage @@ -7650,7 +7507,6 @@ self: { description = "Test harness for TriangleCount analysis"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GraphSCC" = callPackage @@ -7679,6 +7535,7 @@ self: { description = "Graph-Theoretic Analysis library"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Grempa" = callPackage @@ -7758,7 +7615,6 @@ self: { description = "Notification utility for Growl"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Gtk2hsGenerics" = callPackage @@ -7775,7 +7631,6 @@ self: { description = "Convenience functions to extend Gtk2hs"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GtkGLTV" = callPackage @@ -7792,7 +7647,6 @@ self: { description = "OpenGL support for Gtk-based GUIs for Tangible Values"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GtkTV" = callPackage @@ -7806,8 +7660,6 @@ self: { ]; description = "Gtk-based GUIs for Tangible Values"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GuiHaskell" = callPackage @@ -7827,7 +7679,6 @@ self: { description = "A graphical REPL and development environment for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "GuiTV" = callPackage @@ -7840,7 +7691,6 @@ self: { description = "GUIs for Tangible Values"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "H" = callPackage @@ -7919,7 +7769,6 @@ self: { description = "HAppS data manipulation libraries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HAppS-IxSet" = callPackage @@ -7936,7 +7785,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HAppS-Server" = callPackage @@ -7958,7 +7806,6 @@ self: { description = "Web related tools and services"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HAppS-State" = callPackage @@ -7979,7 +7826,6 @@ self: { description = "Event-based distributed state"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HAppS-Util" = callPackage @@ -8030,8 +7876,6 @@ self: { ]; description = "High-level library for building command line interfaces"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HCard" = callPackage @@ -8684,7 +8528,6 @@ self: { description = "HJScript is a Haskell EDSL for writing JavaScript programs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HJVM" = callPackage @@ -8744,7 +8587,6 @@ self: { description = "Algebraic foundation for homomorphic learning"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HLearn-approximation" = callPackage @@ -8764,7 +8606,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HLearn-classification" = callPackage @@ -8788,7 +8629,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HLearn-datastructures" = callPackage @@ -8805,7 +8645,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HLearn-distributions" = callPackage @@ -8830,7 +8669,6 @@ self: { description = "Distributions for use with the HLearn library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HList" = callPackage @@ -8955,7 +8793,6 @@ self: { description = "Happy Network Manager"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HNumeric" = callPackage @@ -9030,8 +8867,6 @@ self: { testHaskellDepends = [ base HTF ]; description = "Generation of PDF documents"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HPath" = callPackage @@ -9105,7 +8940,6 @@ self: { description = "A minimal monadic PLplot interface for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {plplotd-gnome2 = null;}; "HPong" = callPackage @@ -9125,7 +8959,6 @@ self: { description = "A simple OpenGL Pong game based on GLFW"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HROOT" = callPackage @@ -9144,7 +8977,6 @@ self: { description = "Haskell binding to the ROOT data analysis framework"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HROOT-core" = callPackage @@ -9159,7 +8991,6 @@ self: { description = "Haskell binding to ROOT Core modules"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HROOT-graf" = callPackage @@ -9176,7 +9007,6 @@ self: { description = "Haskell binding to ROOT Graf modules"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HROOT-hist" = callPackage @@ -9193,7 +9023,6 @@ self: { description = "Haskell binding to ROOT Hist modules"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HROOT-io" = callPackage @@ -9210,7 +9039,6 @@ self: { description = "Haskell binding to ROOT IO modules"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HROOT-math" = callPackage @@ -9227,7 +9055,6 @@ self: { description = "Haskell binding to ROOT Math modules"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HROOT-tree" = callPackage @@ -9244,7 +9071,6 @@ self: { description = "Haskell binding to ROOT Tree modules"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HRay" = callPackage @@ -9260,7 +9086,6 @@ self: { description = "Haskell raytracer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HSFFIG" = callPackage @@ -9302,7 +9127,6 @@ self: { description = "Gene Expression Programming evolutionary algorithm in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HSH" = callPackage @@ -9340,7 +9164,6 @@ self: { description = "Convenience functions that use HSH, instances for HSH"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HSet" = callPackage @@ -9384,8 +9207,6 @@ self: { testHaskellDepends = [ aeson attoparsec base HTF text ]; description = "Small template engine"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HSoM" = callPackage @@ -9402,6 +9223,9 @@ self: { ]; description = "Library for computer music education"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "HSoundFile" = callPackage @@ -9418,7 +9242,6 @@ self: { description = "Audio file reading/writing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HStringTemplate" = callPackage @@ -9456,7 +9279,6 @@ self: { description = "Convenience functions and instances for HStringTemplate"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HSvm" = callPackage @@ -9554,7 +9376,6 @@ self: { description = "Tableau based theorem prover for hybrid logics"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HTicTacToe" = callPackage @@ -9659,7 +9480,6 @@ self: { description = "A (prototyped) easy to use XMPP library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HXQ" = callPackage @@ -9707,7 +9527,6 @@ self: { description = "An Haskell library to drive the french Minitel through a serial port"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HaPy" = callPackage @@ -9756,7 +9575,6 @@ self: { description = "the Haskell Refactorer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HaTeX" = callPackage @@ -9796,7 +9614,6 @@ self: { description = "This package is deprecated. From version 3, HaTeX does not need this anymore."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HaTeX-qq" = callPackage @@ -9813,7 +9630,6 @@ self: { description = "Quasiquoters for HaTeX"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HaVSA" = callPackage @@ -9834,7 +9650,6 @@ self: { description = "An implementation of the Version Space Algebra learning framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HaXml" = callPackage @@ -9872,7 +9687,6 @@ self: { description = "Simple chat"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HackMail" = callPackage @@ -10006,7 +9820,6 @@ self: { description = "Harmony Analysis and Retrieval of Music"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HarmTrace-Base" = callPackage @@ -10075,7 +9888,6 @@ self: { description = "A Haskell library for inference using Gaussian processes"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Haschoo" = callPackage @@ -10115,7 +9927,6 @@ self: { description = "Simple shell written in Haskell"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HaskRel" = callPackage @@ -10133,7 +9944,6 @@ self: { description = "HaskRel, Haskell as a DBMS with support for the relational algebra"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HaskellAnalysisProgram" = callPackage @@ -10212,8 +10022,6 @@ self: { ]; description = "Client support for POP3, SMTP, and IMAP"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HaskellNet-SSL" = callPackage @@ -10333,7 +10141,6 @@ self: { description = "A small 2D game framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Hawk" = callPackage @@ -10356,7 +10163,6 @@ self: { description = "Haskell Web Application Kit"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Hayoo" = callPackage @@ -10384,7 +10190,6 @@ self: { description = "The Hayoo! search engine for Haskell API search on hackage"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Hclip" = callPackage @@ -10418,7 +10223,6 @@ self: { description = "Line oriented editor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HerbiePlugin" = callPackage @@ -10477,7 +10281,6 @@ self: { description = "Purely functional 2D graphics for visualization"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HiggsSet" = callPackage @@ -10495,7 +10298,6 @@ self: { description = "A multi-index set with advanced query capabilites"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Hipmunk" = callPackage @@ -10510,6 +10312,7 @@ self: { description = "A Haskell binding for Chipmunk"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Hipmunk-Utils" = callPackage @@ -10523,7 +10326,6 @@ self: { description = "Useful functions for Hipmunk"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HipmunkPlayground" = callPackage @@ -10617,7 +10419,6 @@ self: { description = "Lightweight algorithmic debugging"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HoleyMonoid" = callPackage @@ -10692,7 +10493,6 @@ self: { description = "A search and indexing engine"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Holumbus-Storage" = callPackage @@ -10744,7 +10544,6 @@ self: { description = "A Simple Key Value Store"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HostAndPort" = callPackage @@ -10801,7 +10600,6 @@ self: { description = "A Library and Preprocessor that makes it easier to create shared libs from Haskell programs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HsASA" = callPackage @@ -10921,7 +10719,6 @@ self: { description = "Haskell integration with Parrot virtual machine"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HsPerl5" = callPackage @@ -10997,7 +10794,6 @@ self: { description = "Webots bindings for Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {Controller = null; driver = null;}; "HsYAML" = callPackage @@ -11063,7 +10859,6 @@ self: { description = "Stream Editor in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Hsmtlib" = callPackage @@ -11157,7 +10952,6 @@ self: { description = "The library for generating a WebGL scene for the web"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "I1M" = callPackage @@ -11166,8 +10960,8 @@ self: { }: mkDerivation { pname = "I1M"; - version = "0.0.3"; - sha256 = "0lk34g47iid2cfcj9zfdwbkpvhfhanh83jzh64r9sdrqgw9p25w3"; + version = "0.1.0"; + sha256 = "0a5bh9hlsn6hmdqinc47hxlav1isv9jh2i4x3zfyfp4y4xrp2h93"; libraryHaskellDepends = [ array base QuickCheck ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Code for the Haskell course taught at the University of Seville"; @@ -11224,7 +11018,6 @@ self: { description = "Editor and interpreter for Interaction Nets"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "IOR" = callPackage @@ -11258,7 +11051,6 @@ self: { description = "Atomic compare and swap for IORefs and STRefs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "IOSpec" = callPackage @@ -11389,7 +11181,6 @@ self: { description = "Length- and element-indexed lists sitting somewhere between homogeneous and fully heterogeneous"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "InfixApplicative" = callPackage @@ -11402,7 +11193,6 @@ self: { description = "liftA2 for infix operators"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "IntFormats" = callPackage @@ -11568,7 +11358,6 @@ self: { description = "A combinator library on top of a generalised JSON type"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "JSON-Combinator-Examples" = callPackage @@ -11583,7 +11372,6 @@ self: { description = "Example uses of the JSON-Combinator library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "JSONParser" = callPackage @@ -11616,7 +11404,6 @@ self: { description = "JSON parser that uses byte strings"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "JYU-Utils" = callPackage @@ -11668,7 +11455,6 @@ self: { description = "A utility to print the SourceFile attribute of one or more Java class files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Javav" = callPackage @@ -11732,7 +11518,6 @@ self: { description = "Design-by-contract for JavaScript"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "JsonGrammar" = callPackage @@ -11755,7 +11540,6 @@ self: { description = "Combinators for bidirectional JSON parsing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "JuPyTer-notebook" = callPackage @@ -11773,7 +11557,6 @@ self: { description = "JuPyTer notebook parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "JuicyPixels" = callPackage @@ -11965,7 +11748,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "JunkDB-driver-hashtables" = callPackage @@ -11981,7 +11763,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "JustParse" = callPackage @@ -12297,7 +12078,6 @@ self: { description = "Lightweight Directory Access Protocol (LDAP) version 3"; license = lib.licenses.gpl2Plus; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "LParse" = callPackage @@ -12406,7 +12186,6 @@ self: { description = "A type-safe EDSL for TouchDesigner written in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "LambdaHack" = callPackage @@ -12442,8 +12221,9 @@ self: { ]; description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "LambdaINet" = callPackage @@ -12464,7 +12244,6 @@ self: { description = "Graphical Interaction Net Evaluator for Optimal Evaluation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "LambdaNet" = callPackage @@ -12507,7 +12286,6 @@ self: { description = "Quasiquoter, and Arbitrary helpers for the lambda calculus"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "LambdaShell" = callPackage @@ -12526,7 +12304,6 @@ self: { description = "Simple shell for evaluating lambda expressions"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Lambdajudge" = callPackage @@ -12741,7 +12518,6 @@ self: { description = "Partition the sequence of items to the subsequences in the order given"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "LinguisticsTypes" = callPackage @@ -12787,7 +12563,6 @@ self: { description = "Check a bunch of local html files for broken links"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Liquorice" = callPackage @@ -12960,7 +12735,6 @@ self: { description = "a parallel implementation of logic programming using distributed tree exploration"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "LogicGrowsOnTrees-MPI" = callPackage @@ -12983,7 +12757,6 @@ self: { description = "an adapter for LogicGrowsOnTrees that uses MPI"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {openmpi = null;}; "LogicGrowsOnTrees-network" = callPackage @@ -13010,7 +12783,6 @@ self: { description = "an adapter for LogicGrowsOnTrees that uses multiple processes running in a network"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "LogicGrowsOnTrees-processes" = callPackage @@ -13038,7 +12810,6 @@ self: { description = "an adapter for LogicGrowsOnTrees that uses multiple processes for parallelism"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "LslPlus" = callPackage @@ -13060,7 +12831,6 @@ self: { description = "An execution and testing framework for the Linden Scripting Language (LSL)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Lucu" = callPackage @@ -13082,7 +12852,6 @@ self: { description = "HTTP Daemonic Library"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Lykah" = callPackage @@ -13112,7 +12881,6 @@ self: { description = "A static website and blog generator"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MASMGen" = callPackage @@ -13159,7 +12927,6 @@ self: { description = "Folding algorithm based on nucleotide cyclic motifs"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MFlow" = callPackage @@ -13186,7 +12953,6 @@ self: { description = "stateful, RESTful web framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MHask" = callPackage @@ -13254,7 +13020,6 @@ self: { description = "A GLPK backend to the MIP library"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) glpk;}; "MSQueue" = callPackage @@ -13267,7 +13032,6 @@ self: { description = "Michael-Scott queue"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MTGBuilder" = callPackage @@ -13418,7 +13182,6 @@ self: { description = "MaybeT monad transformer using transformers instead of mtl"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MazesOfMonad" = callPackage @@ -13534,7 +13297,6 @@ self: { description = "A meta-object system for Haskell based on Perl 6"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Metrics" = callPackage @@ -13547,7 +13309,6 @@ self: { description = "Evaluation metrics commonly used in supervised machine learning"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Mhailist" = callPackage @@ -13567,7 +13328,6 @@ self: { description = "Haskell mailing list manager"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Michelangelo" = callPackage @@ -13585,7 +13345,6 @@ self: { description = "OpenGL for dummies"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MicrosoftTranslator" = callPackage @@ -13603,7 +13362,6 @@ self: { description = "Interface for Microsoft Translator"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MiniAgda" = callPackage @@ -13687,7 +13445,6 @@ self: { description = "Haskell interface to Python"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Mobile-Legends-Hack-Cheats" = callPackage @@ -13772,7 +13529,6 @@ self: { description = "Monad-transformer version of the Control.Exception module"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MonadCatchIO-mtl-foreign" = callPackage @@ -13785,7 +13541,6 @@ self: { description = "Polymorphic combinators for working with foreign functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MonadCatchIO-transformers" = callPackage @@ -13819,7 +13574,6 @@ self: { description = "Polymorphic combinators for working with foreign functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MonadCompose" = callPackage @@ -13850,7 +13604,6 @@ self: { description = "Automatically generate layered monads"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MonadPrompt" = callPackage @@ -13955,7 +13708,6 @@ self: { description = "A simple tetris clone"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Monatron" = callPackage @@ -13981,7 +13733,6 @@ self: { description = "MonadIO instances for the Monatron transformers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Monocle" = callPackage @@ -13994,7 +13745,6 @@ self: { description = "Symbolic computations in strict monoidal categories with LaTeX output"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MorseCode" = callPackage @@ -14043,7 +13793,6 @@ self: { description = "Automated Mutation Testing for HUnit tests"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MuCheck-Hspec" = callPackage @@ -14059,7 +13808,6 @@ self: { description = "Automated Mutation Testing for Hspec tests"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MuCheck-QuickCheck" = callPackage @@ -14075,7 +13823,6 @@ self: { description = "Automated Mutation Testing for QuickCheck tests"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MuCheck-SmallCheck" = callPackage @@ -14091,7 +13838,6 @@ self: { description = "Automated Mutation Testing for SmallCheck tests"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Munkres" = callPackage @@ -14183,7 +13929,6 @@ self: { description = "Most likely order of mutation events in RNA"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MyPrimes" = callPackage @@ -14270,7 +14015,6 @@ self: { description = "A Haskell interface to Lego Mindstorms NXT"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {bluetooth = null;}; "NXTDSL" = callPackage @@ -14368,7 +14112,6 @@ self: { description = "Instances of NcStore for hypercuboids"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "NaturalLanguageAlphabets" = callPackage @@ -14433,7 +14176,6 @@ self: { description = "Context Algebra of near"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Neks" = callPackage @@ -14561,7 +14303,6 @@ self: { description = "Ninja game"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "NoHoed" = callPackage @@ -14593,7 +14334,6 @@ self: { description = "Microbenchmarks for various array libraries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "NoTrace" = callPackage @@ -14639,7 +14379,6 @@ self: { description = "A Nomic game in haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Nomyx-Core" = callPackage @@ -14667,7 +14406,6 @@ self: { description = "A Nomic game in haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Nomyx-Language" = callPackage @@ -14688,7 +14426,6 @@ self: { description = "Language to express rules for Nomic"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Nomyx-Rules" = callPackage @@ -14707,7 +14444,6 @@ self: { description = "Language to express rules for Nomic"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Nomyx-Web" = callPackage @@ -14733,7 +14469,6 @@ self: { description = "Web gui for Nomyx"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "NonEmpty" = callPackage @@ -14764,7 +14499,6 @@ self: { description = "A list with a length of at least one"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "NumInstances" = callPackage @@ -14843,7 +14577,6 @@ self: { description = "Nussinov78 using the ADPfusion library"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Nutri" = callPackage @@ -14912,7 +14645,6 @@ self: { description = "Parse OpenStreetMap files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "OTP" = callPackage @@ -15080,7 +14812,6 @@ self: { description = "Text UI library for performing parallel remote SSH operations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "OneTuple" = callPackage @@ -15146,7 +14877,6 @@ self: { description = "Assorted utilities to work with AFP data streams"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "OpenAL" = callPackage @@ -15239,7 +14969,6 @@ self: { description = "Quickcheck instances for various data structures"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "OpenGLRaw" = callPackage @@ -15288,7 +15017,6 @@ self: { description = "ADT wrapper and renderer for OpenSCAD models"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "OpenVG" = callPackage @@ -15301,7 +15029,6 @@ self: { description = "OpenVG (ShivaVG-0.2.1) binding"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "OpenVGRaw" = callPackage @@ -15500,7 +15227,6 @@ self: { description = "An addon to PCLT package: enchance PCLT catalog with PostgreSQL powers"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "PDBtools" = callPackage @@ -15607,7 +15333,6 @@ self: { description = "Page-oriented extraction and composition library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Paillier" = callPackage @@ -15675,7 +15400,6 @@ self: { description = "a code generator for partial differential equations solvers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Parallel-Arrows-BaseSpec" = callPackage @@ -15726,7 +15450,6 @@ self: { description = "Eden based backend for @Parallel-Arrows-Definition@"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Parallel-Arrows-Multicore" = callPackage @@ -15930,7 +15653,6 @@ self: { description = "Permutations of effectful computations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Persistence" = callPackage @@ -16060,7 +15782,6 @@ self: { description = "Real-time line plotter for generic data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "PlslTools" = callPackage @@ -16081,7 +15802,6 @@ self: { description = "So far just a lint like program for PL/SQL. Diff and refactoring tools are planned"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Plural" = callPackage @@ -16154,6 +15874,9 @@ self: { executableHaskellDepends = [ base PortMidi ]; description = "Simplified PortMidi wrapper"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "PostgreSQL" = callPackage @@ -16249,7 +15972,6 @@ self: { libraryHaskellDepends = [ base haskell98 pretty template-haskell ]; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "PriorityChansConverger" = callPackage @@ -16275,7 +15997,6 @@ self: { description = "Probability distribution monads"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Probnet" = callPackage @@ -16353,7 +16074,6 @@ self: { description = "A Perl 6 Implementation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Pup-Events" = callPackage @@ -16374,7 +16094,6 @@ self: { description = "A networked event handling framework for hooking into other programs"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Pup-Events-Client" = callPackage @@ -16409,7 +16128,6 @@ self: { description = "A networked event handling framework for hooking into other programs"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Pup-Events-PQueue" = callPackage @@ -16549,7 +16267,6 @@ self: { description = "Programming with Eventual Consistency over Cassandra"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "QuickAnnotate" = callPackage @@ -16793,7 +16510,6 @@ self: { description = "Binding to code that controls a Segway RMP"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {canlib = null; ftd2xx = null;}; "RNAFold" = callPackage @@ -16817,7 +16533,6 @@ self: { description = "RNA secondary structure prediction"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "RNAFoldProgs" = callPackage @@ -16838,7 +16553,6 @@ self: { description = "RNA secondary structure folding"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "RNAdesign" = callPackage @@ -16865,7 +16579,6 @@ self: { description = "Multi-target RNA sequence design"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "RNAdraw" = callPackage @@ -16886,7 +16599,6 @@ self: { description = "Draw RNA secondary structures"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "RNAlien" = callPackage @@ -16920,7 +16632,6 @@ self: { description = "Unsupervized construction of RNA family models"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "RNAwolf" = callPackage @@ -16942,7 +16653,6 @@ self: { description = "RNA folding with non-canonical basepairs and base-triplets"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "RSA" = callPackage @@ -17110,7 +16820,6 @@ self: { description = "HTTP to XMPP omegle chats gate"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Rasenschach" = callPackage @@ -17374,7 +17083,6 @@ self: { description = "quasiquoter for inline-R code"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "RollingDirectory" = callPackage @@ -17400,7 +17108,6 @@ self: { description = "Limits the size of a directory's contents"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "RoyalMonad" = callPackage @@ -17466,7 +17173,6 @@ self: { description = "Library for accessing S3 compatible storage services"; license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SBench" = callPackage @@ -17485,7 +17191,6 @@ self: { description = "A benchmark suite for runtime and heap measurements over a series of inputs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SCRIPTWriter" = callPackage @@ -17506,7 +17211,6 @@ self: { description = "ESCRIPT: a human friendly language for programming Bitcoin scripts"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SCalendar" = callPackage @@ -17524,7 +17228,6 @@ self: { description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SDL" = callPackage @@ -17657,7 +17360,6 @@ self: { description = "Higher level library on top of SFML"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SFont" = callPackage @@ -17670,7 +17372,6 @@ self: { description = "SFont SDL Bitmap Fonts"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SG" = callPackage @@ -17698,7 +17399,6 @@ self: { description = "An example of using the SG and OpenGL libraries"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SGplus" = callPackage @@ -17866,7 +17566,6 @@ self: { description = "STLink USB interface in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "STM32-Zombie" = callPackage @@ -17884,7 +17583,6 @@ self: { description = "control a STM32F103 microcontroller"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "STM32F103xx-SVD" = callPackage @@ -17947,7 +17645,6 @@ self: { description = "Code generation tool for Quartz code from a SVG"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SVGFonts" = callPackage @@ -18135,7 +17832,6 @@ self: { description = "Scientific workflow management system"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SciFlow-drmaa" = callPackage @@ -18153,7 +17849,6 @@ self: { description = "Scientific workflow management system"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ScratchFs" = callPackage @@ -18193,7 +17888,6 @@ self: { description = "A cross platform P2P VPN application built using Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SecureHash-SHA3" = callPackage @@ -18247,7 +17941,6 @@ self: { description = "Selects a representative subset of sequences from multiple sequence alignment"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Semantique" = callPackage @@ -18328,6 +18021,34 @@ self: { broken = true; }) {}; + "ShellCheck_0_7_1" = callPackage + ({ mkDerivation, aeson, array, base, bytestring, containers + , deepseq, Diff, directory, filepath, mtl, parsec, process + , QuickCheck, regex-tdfa + }: + mkDerivation { + pname = "ShellCheck"; + version = "0.7.1"; + sha256 = "06m4wh891nah3y0br4wh3adpsb16zawkb2ijgf1vcz61fznj6ps1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base bytestring containers deepseq Diff directory + filepath mtl parsec process QuickCheck regex-tdfa + ]; + executableHaskellDepends = [ + aeson array base bytestring containers deepseq Diff directory + filepath mtl parsec QuickCheck regex-tdfa + ]; + testHaskellDepends = [ + aeson array base bytestring containers deepseq Diff directory + filepath mtl parsec QuickCheck regex-tdfa + ]; + description = "Shell script analysis tool"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "ShellCheck" = callPackage ({ mkDerivation, aeson, array, base, bytestring, containers , deepseq, Diff, directory, filepath, mtl, parsec, process @@ -18382,7 +18103,6 @@ self: { description = "\"compatline\" backend module for Shellac"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Shellac-editline" = callPackage @@ -18397,7 +18117,6 @@ self: { description = "Editline backend module for Shellac"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Shellac-haskeline" = callPackage @@ -18410,7 +18129,6 @@ self: { description = "Haskeline backend module for Shellac"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Shellac-readline" = callPackage @@ -18425,7 +18143,6 @@ self: { description = "Readline backend module for Shellac"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ShortestPathProblems" = callPackage @@ -18447,7 +18164,6 @@ self: { description = "grammars for TSP and SHP"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ShowF" = callPackage @@ -18495,7 +18211,6 @@ self: { description = "A Virtual Dom in pure Haskell, based on Html as an Alignable Functor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Shpadoinkle-backend-snabbdom" = callPackage @@ -18527,7 +18242,6 @@ self: { description = "A backend for rendering Shpadoinkle as Text"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Shpadoinkle-console" = callPackage @@ -18574,7 +18288,6 @@ self: { description = "Chrome extension to aide in development"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Shpadoinkle-disembodied" = callPackage @@ -18594,7 +18307,6 @@ self: { description = "Shpadoinkle as a static site"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Shpadoinkle-examples" = callPackage @@ -18627,7 +18339,6 @@ self: { description = "Example usages of Shpadoinkle"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Shpadoinkle-html" = callPackage @@ -18647,7 +18358,6 @@ self: { description = "A typed, template generated Html DSL, and helpers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Shpadoinkle-lens" = callPackage @@ -18683,7 +18393,6 @@ self: { description = "A single page application rounter for Shpadoinkle based on Servant"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Shpadoinkle-streaming" = callPackage @@ -18718,7 +18427,6 @@ self: { description = "Read standard file formats into Shpadoinkle with Template Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Shpadoinkle-widgets" = callPackage @@ -18743,7 +18451,6 @@ self: { description = "A collection of common reusable types and components"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Shrub" = callPackage @@ -18807,7 +18514,6 @@ self: { description = "A Simple Graphics Library from the SimpleH framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SimpleH" = callPackage @@ -18845,7 +18551,6 @@ self: { description = "Simple, configurable logging"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SimpleServer" = callPackage @@ -18867,7 +18572,6 @@ self: { description = "A simple static file server, for when apache is overkill"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SimpleTableGenerator" = callPackage @@ -18946,7 +18650,6 @@ self: { description = "A tiny, lazy SMT solver"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SmtLib" = callPackage @@ -18983,7 +18686,6 @@ self: { description = "E-library directory based on FUSE virtual file system"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) zip;}; "SoOSiM" = callPackage @@ -19022,7 +18724,6 @@ self: { description = "Football simulation framework for teaching functional programming"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SoccerFunGL" = callPackage @@ -19043,7 +18744,6 @@ self: { description = "OpenGL UI for the SoccerFun framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Sonnex" = callPackage @@ -19077,7 +18777,6 @@ self: { description = "Static code analysis using graph-theoretic techniques"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Southpaw" = callPackage @@ -19147,7 +18846,6 @@ self: { description = "Lock free Spin Counter"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Spintax" = callPackage @@ -19239,7 +18937,6 @@ self: { description = "Provides authentification helpers for Spock"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Spock-core" = callPackage @@ -19296,7 +18993,6 @@ self: { description = "Lucid support for Spock"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Spock-worker" = callPackage @@ -19315,7 +19011,6 @@ self: { description = "Background workers for Spock"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SpreadsheetML" = callPackage @@ -19419,7 +19114,6 @@ self: { description = "Libary for Stockholm aligmnent format"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Stomp" = callPackage @@ -19470,7 +19164,6 @@ self: { description = "Converts SDF to Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Strafunski-StrategyLib" = callPackage @@ -19634,7 +19327,6 @@ self: { description = "Syntax Macros in the form of an EDSL"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Sysmon" = callPackage @@ -19769,8 +19461,6 @@ self: { libraryHaskellDepends = [ base DeepArrow TypeCompose ]; description = "Tangible Values -- composable interfaces"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "TYB" = callPackage @@ -19927,7 +19617,6 @@ self: { description = "Libary for parsing, processing and vizualization of taxonomy data"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "TaxonomyTools" = callPackage @@ -19948,7 +19637,6 @@ self: { description = "Tool for parsing, processing, comparing and visualizing taxonomy data"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "TeX-my-math" = callPackage @@ -19978,7 +19666,6 @@ self: { description = "Render general Haskell math to LaTeX. Or: math typesetting with high signal-to-noise–ratio."; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "TeaHS" = callPackage @@ -19995,7 +19682,6 @@ self: { description = "TeaHS Game Creation Library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Tensor" = callPackage @@ -20093,6 +19779,7 @@ self: { description = "Haskell bindings for the Apache Thrift RPC system"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Tic-Tac-Toe" = callPackage @@ -20325,7 +20012,6 @@ self: { description = "Wait-free Tree Counter"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "TreeStructures" = callPackage @@ -20362,7 +20048,6 @@ self: { description = "Lock free Treiber stack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "TrendGraph" = callPackage @@ -20399,7 +20084,6 @@ self: { description = "Automatic type inference of generalized tries with Template Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Twofish" = callPackage @@ -20439,7 +20123,6 @@ self: { description = "Typing speed game"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "TypeCompose" = callPackage @@ -20467,7 +20150,6 @@ self: { description = "TypeIlluminator is a prototype tool exploring debugging of type errors/"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "TypeNat" = callPackage @@ -20527,7 +20209,6 @@ self: { description = "A small command-line accounting tool"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "URLT" = callPackage @@ -20546,7 +20227,6 @@ self: { description = "Library for maintaining correctness of URLs within an application"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "URLb" = callPackage @@ -20633,6 +20313,9 @@ self: { libraryHaskellDepends = [ base unix ]; description = "A simple interface to shadow passwords (aka, shadow.h)"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "Updater" = callPackage @@ -20658,7 +20341,6 @@ self: { description = "Url dispatcher. Helps to retain friendly URLs in web applications."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Useful" = callPackage @@ -20874,7 +20556,6 @@ self: { description = "ViennaRNA v2 extensions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ViennaRNAParser" = callPackage @@ -20947,7 +20628,7 @@ self: { ]; description = "Bindings to the VulkanMemoryAllocator library"; license = lib.licenses.bsd3; - platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; }) {}; "WAVE" = callPackage @@ -20965,7 +20646,6 @@ self: { description = "WAVE audio file IO library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "WEditor" = callPackage @@ -20996,7 +20676,6 @@ self: { description = "Text-editor widget with dynamic line-wrapping for use with Brick"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "WEditorHyphen" = callPackage @@ -21010,7 +20689,6 @@ self: { description = "Language-specific hyphenation policies for WEditor"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "WL500gPControl" = callPackage @@ -21028,7 +20706,6 @@ self: { description = "A simple command line tools to control the Asus WL500gP router"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "WL500gPLib" = callPackage @@ -21078,7 +20755,6 @@ self: { description = "Convert the WURFL file into a Parsec parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "WXDiffCtrl" = callPackage @@ -21092,7 +20768,6 @@ self: { description = "WXDiffCtrl"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "WashNGo" = callPackage @@ -21112,7 +20787,6 @@ self: { description = "WASH is a family of EDSLs for programming Web applications in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "WaveFront" = callPackage @@ -21130,7 +20804,6 @@ self: { description = "Parsers and utilities for the OBJ WaveFront 3D model format"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Weather" = callPackage @@ -21175,7 +20848,6 @@ self: { description = "JavaScript analysis tools"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "WebBits-multiplate" = callPackage @@ -21193,7 +20865,6 @@ self: { description = "A Multiplate instance for JavaScript"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "WebCont" = callPackage @@ -21213,7 +20884,6 @@ self: { description = "Continuation based web programming for Happstack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "WeberLogic" = callPackage @@ -21519,7 +21189,6 @@ self: { description = "Bigram word pair alignments"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "WordNet" = callPackage @@ -21601,7 +21270,6 @@ self: { description = "Generic (SYB3) construction of wxHaskell widgets"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "X" = callPackage @@ -21802,7 +21470,6 @@ self: { description = "XMPP library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "XSaiga" = callPackage @@ -21830,7 +21497,6 @@ self: { description = "An implementation of a polynomial-time top-down parser suitable for NLP"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Xauth" = callPackage @@ -21910,7 +21576,6 @@ self: { description = "Yet Another Pong Clone using SDL"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "YFrob" = callPackage @@ -21959,7 +21624,6 @@ self: { description = "A simple blog engine powered by Yesod"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "YamlReference" = callPackage @@ -22066,7 +21730,6 @@ self: { description = "A MUD client library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Yogurt-Standalone" = callPackage @@ -22087,9 +21750,31 @@ self: { description = "A functional MUD client"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) readline;}; + "Z-Botan" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath, ghc-prim, hspec + , hspec-discover, HUnit, integer-gmp, QuickCheck + , quickcheck-instances, scientific, stm, time, Z-Data, Z-IO + }: + mkDerivation { + pname = "Z-Botan"; + version = "0.2.0.0"; + sha256 = "0xxi19gfzglp93jxxq7sq9z1ijxa5jys917a156gd4hrcqqhwi63"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + base ghc-prim integer-gmp scientific stm time Z-Data Z-IO + ]; + libraryToolDepends = [ hspec-discover ]; + testHaskellDepends = [ + base hspec HUnit QuickCheck quickcheck-instances Z-Data Z-IO + ]; + description = "Crypto for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Z-Data" = callPackage ({ mkDerivation, base, bytestring, Cabal, case-insensitive , containers, deepseq, ghc-prim, hashable, hspec, hspec-discover @@ -22098,8 +21783,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.8.1.0"; - sha256 = "19w5g5flsjnhjpvnmw7s8b5jg5nlpg0md99zgp3by8gjyigappc7"; + version = "0.8.2.0"; + sha256 = "0xjy5689ck23fyas52qrfrl716fpgmnahp7pln54yyz106hxqj4p"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim @@ -22143,7 +21828,6 @@ self: { description = "Simple and high performance IO toolkit for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Z-MessagePack" = callPackage @@ -22169,7 +21853,6 @@ self: { description = "MessagePack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Z-YAML" = callPackage @@ -22188,7 +21871,6 @@ self: { description = "YAML tools"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ZEBEDDE" = callPackage @@ -22308,7 +21990,6 @@ self: { description = "Compare genome assemblies"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "abacate" = callPackage @@ -22363,7 +22044,6 @@ self: { description = "Bindings for ABC, A System for Sequential Synthesis and Verification"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {abc = null;}; "abcnotation" = callPackage @@ -22536,7 +22216,6 @@ self: { description = "Drive Aho-Corasick machines in Conduit pipelines"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "acc" = callPackage @@ -22604,7 +22283,6 @@ self: { description = "Linear algebra and interpolation using the Accelerate framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "accelerate-bignum" = callPackage @@ -22844,7 +22522,6 @@ self: { description = "Fast Fourier transform and convolution using the Accelerate framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "accelerate-fourier-benchmark" = callPackage @@ -23122,7 +22799,6 @@ self: { description = "a typesafe way encode accelerate matrices and vectors"; license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "accelerate-utility" = callPackage @@ -23189,7 +22865,6 @@ self: { description = "Provides Access Token for Services"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "accuerr" = callPackage @@ -23765,7 +23440,6 @@ self: { description = "The flexibility of Haskell and the safety of PHP"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "acme-pointful-numbers" = callPackage @@ -23959,7 +23633,6 @@ self: { description = "AcousticBrainz API client"; license = lib.licenses.cc0; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "acquire" = callPackage @@ -24031,7 +23704,6 @@ self: { description = "Haskell code presentation tool"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "activehs-base" = callPackage @@ -24088,7 +23760,6 @@ self: { description = "Actors with multi-headed receive clauses"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "acts" = callPackage @@ -24181,8 +23852,8 @@ self: { }: mkDerivation { pname = "adblock2privoxy"; - version = "2.0.1"; - sha256 = "048l78mf3ccb7l0p1zg1wsvqmvpsaqwgik29xm333y7fjlcm0kq6"; + version = "2.0.2"; + sha256 = "0klw0rbxp5g240igrv10808inqmlh3wr3d46zphy5xjxjih07yf3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -24228,7 +23899,6 @@ self: { description = "A full-featured library for parsing, validating, and rendering email addresses"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "adhoc-network" = callPackage @@ -24247,7 +23917,6 @@ self: { description = "Ad-hoc P2P network protocol"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "adict" = callPackage @@ -24270,7 +23939,6 @@ self: { description = "Approximate dictionary searching"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "adjunction" = callPackage @@ -24388,7 +24056,6 @@ self: { description = "Subword construction in adp-multi using monadiccp"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "adtrees" = callPackage @@ -24424,8 +24091,6 @@ self: { testHaskellDepends = [ base directory filepath HUnit text ]; description = "Advent of Code REST API bindings and servant API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "advent-of-code-ocr" = callPackage @@ -24501,7 +24166,6 @@ self: { description = "Exact real numbers via Cauchy sequences and MPFR"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aeson" = callPackage @@ -24816,8 +24480,6 @@ self: { ]; description = "Extra goodies for aeson"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aeson-filthy" = callPackage @@ -24962,8 +24624,6 @@ self: { ]; description = "Injecting fields into aeson values"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aeson-iproute" = callPackage @@ -25050,7 +24710,6 @@ self: { description = "Fast JSON parsing and encoding (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aeson-optics" = callPackage @@ -25599,7 +25258,6 @@ self: { description = "Infinite state model checking of iterative C programs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ag-pictgen" = callPackage @@ -25664,7 +25322,6 @@ self: { description = "Http server for Agda (prototype)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "agda-snippets" = callPackage @@ -25704,31 +25361,28 @@ self: { description = "Literate Agda support using agda-snippets, for Hakyll pages"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "agda-unused" = callPackage ({ mkDerivation, aeson, Agda, base, containers, directory, filepath - , hspec, megaparsec, mtl, optparse-applicative, text + , hspec, mtl, optparse-applicative, text }: mkDerivation { pname = "agda-unused"; - version = "0.1.0"; - sha256 = "1g0iyv9x46ql8j9ggb6nw58274vqb6z850x26glaqcdwa3wvn1i1"; + version = "0.2.0"; + sha256 = "0fxrmcc0kn3jyjbij2fv72pw0r1l2rvg8wglj1i8d438jqpffigw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - Agda base containers directory filepath megaparsec mtl text + Agda base containers directory filepath mtl text ]; executableHaskellDepends = [ - aeson base directory filepath mtl optparse-applicative text + aeson base directory mtl optparse-applicative text ]; testHaskellDepends = [ base containers filepath hspec text ]; description = "Check for unused code in an Agda project"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "agda2lagda" = callPackage @@ -25766,7 +25420,6 @@ self: { description = "AgentX protocol for write SNMP subagents"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "agum" = callPackage @@ -25830,7 +25483,6 @@ self: { description = "Aeronautical Information Package (AIP)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "air" = callPackage @@ -25938,7 +25590,6 @@ self: { description = "A Webmachine-inspired HTTP library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "airtable-api" = callPackage @@ -26007,7 +25658,6 @@ self: { description = "Parallel distributed discrete event simulation module for the Aivika library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aivika-experiment" = callPackage @@ -26073,8 +25723,6 @@ self: { ]; description = "Diagrams-based charting backend for the Aivika simulation library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aivika-gpss" = callPackage @@ -26430,7 +26078,6 @@ self: { description = "Model and test API surfaces algebraically"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "algebra-dag" = callPackage @@ -26467,7 +26114,6 @@ self: { description = "Companion library for the book Algebra-Driven Design by Sandy Maguire"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "algebra-sql" = callPackage @@ -26495,7 +26141,6 @@ self: { description = "Relational Algebra and SQL Code Generation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "algebraic" = callPackage @@ -26637,7 +26282,6 @@ self: { description = "A client implementing the Algolia search API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "algorithmic-composition-additional" = callPackage @@ -26869,7 +26513,6 @@ self: { description = "a practical affine language"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "alpaca-netcode" = callPackage @@ -26908,7 +26551,6 @@ self: { description = "A compiler for the Alpha language"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "alphachar" = callPackage @@ -27005,7 +26647,6 @@ self: { description = "Some simple interactive programs for sending MIDI control messages via ALSA"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "alsa-midi" = callPackage @@ -27080,7 +26721,6 @@ self: { description = "Tests for the ALSA audio signal library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "alsa-seq" = callPackage @@ -27118,7 +26758,6 @@ self: { description = "Tests for the ALSA sequencer library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "altcomposition" = callPackage @@ -27304,7 +26943,6 @@ self: { description = "Client library for amazon-emailer daemon"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "amazon-products" = callPackage @@ -28187,8 +27825,6 @@ self: { ]; description = "Amazon Elastic Compute Cloud SDK"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "amazonka-ecr" = callPackage @@ -29300,8 +28936,6 @@ self: { ]; description = "Provides conduits to upload data to S3 using the Multipart API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "amazonka-sagemaker" = callPackage @@ -29823,7 +29457,6 @@ self: { description = "Toolsuite for automated design of business processes"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "amqp" = callPackage @@ -29890,7 +29523,6 @@ self: { description = "A simple streamly wrapper for amqp"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "amqp-utils" = callPackage @@ -29913,6 +29545,27 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "amqp-utils_0_6_1_1" = callPackage + ({ mkDerivation, amqp, base, bytestring, connection, containers + , data-default-class, directory, hinotify, magic, network, process + , text, time, tls, unix, utf8-string, x509-system + }: + mkDerivation { + pname = "amqp-utils"; + version = "0.6.1.1"; + sha256 = "1lffc76ybvk73k57qn5m6788m2nkfsqavs7mfs1kaqw38pya940c"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + amqp base bytestring connection containers data-default-class + directory hinotify magic network process text time tls unix + utf8-string x509-system + ]; + description = "AMQP toolset for the command line"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "amqp-worker" = callPackage ({ mkDerivation, aeson, amqp, base, bytestring, data-default , exceptions, monad-control, monad-loops, mtl, resource-pool @@ -30015,7 +29668,6 @@ self: { description = "Client for analyze service"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "anansi" = callPackage @@ -30097,7 +29749,6 @@ self: { description = "Anatomy: Atomo documentation system"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "android" = callPackage @@ -30282,7 +29933,6 @@ self: { description = "Animation for sprites"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "animate-frames" = callPackage @@ -30305,7 +29955,6 @@ self: { description = "Convert sprite frames to animate files"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "animate-preview" = callPackage @@ -30332,7 +29981,6 @@ self: { description = "Preview tool for sprite animation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "animate-sdl2" = callPackage @@ -30345,7 +29993,6 @@ self: { description = "sdl2 + animate auxiliary library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "anki-tools" = callPackage @@ -30390,7 +30037,7 @@ self: { description = "Medium-level language that desugars to Morte"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "annihilator" = callPackage @@ -30453,7 +30100,6 @@ self: { description = "QuickCheck functions to accompany the anonymous-sums package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ansi-escape-codes" = callPackage @@ -30523,8 +30169,6 @@ self: { ]; description = "sdl-like functions for terminal applications, based on ansi-terminal"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ansi-wl-pprint" = callPackage @@ -30582,7 +30226,6 @@ self: { description = "A web interface to Antisplice dungeons"; license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "antfarm" = callPackage @@ -30633,7 +30276,6 @@ self: { description = "This is an IRC bot for Mafia and Resistance"; license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "antigate" = callPackage @@ -30690,8 +30332,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "antiope-contract" = callPackage @@ -30705,8 +30345,6 @@ self: { ]; description = "Please see the README on Github at "; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "antiope-core" = callPackage @@ -30733,8 +30371,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "antiope-dynamodb" = callPackage @@ -30757,8 +30393,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "antiope-es" = callPackage @@ -30778,8 +30412,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "antiope-messages" = callPackage @@ -30804,8 +30436,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "antiope-optparse-applicative" = callPackage @@ -30857,8 +30487,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "antiope-shell" = callPackage @@ -30888,8 +30516,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "antiope-sns" = callPackage @@ -30913,8 +30539,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "antiope-sqs" = callPackage @@ -30941,8 +30565,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "antiope-swf" = callPackage @@ -31048,7 +30670,6 @@ self: { description = "Haskell binding to the ANTLR parser generator C runtime library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {antlr3c = null;}; "anydbm" = callPackage @@ -31297,7 +30918,6 @@ self: { description = "Server and community browser for the game Tremulous"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "api-builder" = callPackage @@ -31450,7 +31070,6 @@ self: { description = "simple json-rpc client for PegNet"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "api-tools" = callPackage @@ -31485,8 +31104,6 @@ self: { benchmarkHaskellDepends = [ base criterion text time ]; description = "DSL for generating API boilerplate and docs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "api-yoti" = callPackage @@ -31508,7 +31125,6 @@ self: { description = "Api bindings for Yoti services"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "apiary" = callPackage @@ -31542,7 +31158,6 @@ self: { description = "Simple and type safe web framework that generate web API documentation"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "apiary-authenticate" = callPackage @@ -31563,7 +31178,6 @@ self: { description = "authenticate support for apiary web framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "apiary-clientsession" = callPackage @@ -31582,7 +31196,6 @@ self: { description = "clientsession support for apiary web framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "apiary-cookie" = callPackage @@ -31599,7 +31212,6 @@ self: { description = "Cookie support for apiary web framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "apiary-eventsource" = callPackage @@ -31612,7 +31224,6 @@ self: { description = "eventsource support for apiary web framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "apiary-helics" = callPackage @@ -31633,7 +31244,6 @@ self: { description = "helics support for apiary web framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "apiary-http-client" = callPackage @@ -31651,7 +31261,6 @@ self: { description = "A http client for Apiary"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "apiary-logger" = callPackage @@ -31670,7 +31279,6 @@ self: { description = "fast-logger support for apiary web framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "apiary-memcached" = callPackage @@ -31690,7 +31298,6 @@ self: { description = "memcached client for apiary web framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "apiary-mongoDB" = callPackage @@ -31709,7 +31316,6 @@ self: { description = "mongoDB support for apiary web framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "apiary-persistent" = callPackage @@ -31728,7 +31334,6 @@ self: { description = "persistent support for apiary web framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "apiary-purescript" = callPackage @@ -31749,7 +31354,6 @@ self: { description = "purescript compiler for apiary web framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "apiary-redis" = callPackage @@ -31762,7 +31366,6 @@ self: { description = "redis support for apiary web framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "apiary-session" = callPackage @@ -31775,7 +31378,6 @@ self: { description = "session support for apiary web framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "apiary-websockets" = callPackage @@ -31788,7 +31390,6 @@ self: { description = "websockets support for apiary web framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "apioiaf-client" = callPackage @@ -31822,7 +31423,6 @@ self: { description = "A Template Haskell library for generating type safe API calls"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "apns-http2" = callPackage @@ -31883,7 +31483,6 @@ self: { description = "a faster debian repository"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "app-lens" = callPackage @@ -32329,8 +31928,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Datadog client for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "arbor-lru-cache" = callPackage @@ -32447,7 +32044,6 @@ self: { description = "Metric library backend for datadog"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "arbor-postgres" = callPackage @@ -32497,6 +32093,7 @@ self: { ]; description = "Automatic Rule-Based Time Tracker"; license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ maralorn rvl ]; }) {}; "arcgrid" = callPackage @@ -32562,7 +32159,6 @@ self: { description = "Distribute hackage packages to archlinux"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "arch-web" = callPackage @@ -32627,8 +32223,6 @@ self: { libraryToolDepends = [ cpphs ]; description = "Common interface using libarchive"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "archive-sig" = callPackage @@ -32738,7 +32332,6 @@ self: { description = "Website maintenance for Arch Linux packages"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "archnews" = callPackage @@ -32775,7 +32368,6 @@ self: { description = "Arduino programming in haskell using the Copilot stream DSL"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "arena" = callPackage @@ -32820,7 +32412,6 @@ self: { description = "Generate Attribute-Relation File Format (ARFF) files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "arghwxhaskell" = callPackage @@ -32835,7 +32426,6 @@ self: { description = "An interpreter for the Argh! programming language in wxHaskell"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "argon" = callPackage @@ -32863,7 +32453,6 @@ self: { description = "Measure your code's complexity"; license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "argon2" = callPackage @@ -32945,7 +32534,6 @@ self: { description = "Go-to-definition for Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "arion" = callPackage @@ -33095,7 +32683,6 @@ self: { description = "Arithmetic circuits for zkSNARKs"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "arithmoi" = callPackage @@ -33159,24 +32746,20 @@ self: { "armor" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, hspec, HUnit, lens, text + , filepath, hashable, hspec, HUnit, lens, text }: mkDerivation { pname = "armor"; - version = "0.1"; - sha256 = "0jmq6lhi1byhjzgkvnn4p481z8wik93angx7sf6cjfj5j0kqzv71"; - revision = "4"; - editedCabalFile = "1vnjq91pawr4r7parg2kxs01d47b3lp8jpsji270bbmimqa0nql9"; + version = "0.2"; + sha256 = "1flidqihfgb1vwikm3q4dyjdjzrc5z2955ph6h30q0dyv4707s94"; libraryHaskellDepends = [ - base bytestring containers directory filepath HUnit lens + base bytestring containers directory filepath hashable HUnit lens ]; testHaskellDepends = [ aeson base bytestring containers directory hspec HUnit lens text ]; description = "Prevent serialization backwards compatibility problems using golden tests"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "arpa" = callPackage @@ -33244,8 +32827,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Builders for arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "array-chunks" = callPackage @@ -33263,8 +32844,6 @@ self: { ]; description = "Lists of chunks"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "array-forth" = callPackage @@ -33291,7 +32870,6 @@ self: { description = "A simple interpreter for arrayForth, the language used on GreenArrays chips"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "array-list" = callPackage @@ -33306,8 +32884,6 @@ self: { ]; description = "IsList instances of Array for OverloadedLists extension"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "array-memoize" = callPackage @@ -33393,7 +32969,6 @@ self: { description = "Memory-efficient ArrayList implementation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "arrow-extras" = callPackage @@ -33780,7 +33355,6 @@ self: { description = "ASCII table"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ascii-th" = callPackage @@ -33886,7 +33460,6 @@ self: { description = "Action Script Instrumentation Compiler"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "asif" = callPackage @@ -34171,7 +33744,6 @@ self: { description = "integration point of assert4hs and hspec"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "assert4hs-tasty" = callPackage @@ -34185,7 +33757,6 @@ self: { description = "Provider for tasty runner to run assert4hs tests"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "assertions" = callPackage @@ -34247,7 +33818,6 @@ self: { description = "The Assimp asset import library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) assimp;}; "assoc" = callPackage @@ -34358,7 +33928,6 @@ self: { description = "A library for writing JSON"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ast-path" = callPackage @@ -34454,7 +34023,6 @@ self: { description = "A GTK-based abstract syntax tree viewer for custom languages and parsers"; license = lib.licenses.bsdOriginal; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "astview-utils" = callPackage @@ -34771,7 +34339,6 @@ self: { description = "Atlassian Connect snaplet for the Snap Framework and helper code"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "atlassian-connect-descriptor" = callPackage @@ -34793,8 +34360,6 @@ self: { ]; description = "Code that helps you create a valid Atlassian Connect Descriptor"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "atmos" = callPackage @@ -34834,7 +34399,6 @@ self: { description = "dimensional-tf wrapper on atmos package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "atndapi" = callPackage @@ -34985,7 +34549,6 @@ self: { description = "An atomic counter implemented using the FFI"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "atomic-primops-vector" = callPackage @@ -35064,7 +34627,6 @@ self: { description = "Interface to automated theorem provers"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "atp-haskell" = callPackage @@ -35419,7 +34981,6 @@ self: { description = "Pass input from an enumerator to an Attoparsec parser"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "attoparsec-expr" = callPackage @@ -35450,7 +35011,6 @@ self: { description = "Parse IP data types with attoparsec"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "attoparsec-iso8601" = callPackage @@ -35484,7 +35044,6 @@ self: { description = "An adapter to convert attoparsec Parsers into blazing-fast Iteratees"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "attoparsec-parsec" = callPackage @@ -35543,7 +35102,6 @@ self: { description = "(deprecated)"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "attoparsec-time" = callPackage @@ -35594,7 +35152,6 @@ self: { description = "URI parser / printer using attoparsec"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "attoparsec-varword" = callPackage @@ -35642,7 +35199,6 @@ self: { description = "Embedded Turtle language compiler in Haskell, with Epic output"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "audacity" = callPackage @@ -35685,7 +35241,6 @@ self: { description = "A battery-included audiovisual framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "augeas" = callPackage @@ -35800,7 +35355,6 @@ self: { description = "A secure package manager for Arch Linux and the AUR"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "authenticate" = callPackage @@ -35896,7 +35450,6 @@ self: { description = "A library for writing papers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "auto" = callPackage @@ -36085,7 +35638,6 @@ self: { description = "Generate dependencies for KDE 5 Nix expressions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "autopack" = callPackage @@ -36189,7 +35741,6 @@ self: { description = "Server-side implementation of the Avers storage model"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "avers-api" = callPackage @@ -36207,7 +35758,6 @@ self: { description = "Types describing the core and extended Avers APIs"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "avers-api-docs" = callPackage @@ -36227,7 +35777,6 @@ self: { description = "Swagger documentation for the Avers API"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "avers-server" = callPackage @@ -36249,7 +35798,6 @@ self: { description = "Server implementation of the Avers API"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aviation-cessna172-diagrams" = callPackage @@ -36412,7 +35960,6 @@ self: { description = "Tool for decoding avro"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "avwx" = callPackage @@ -36461,7 +36008,6 @@ self: { description = "High-level Awesomium bindings"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "awesomium-glut" = callPackage @@ -36474,7 +36020,6 @@ self: { description = "Utilities for using Awesomium with GLUT"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "awesomium-raw" = callPackage @@ -36607,7 +36152,6 @@ self: { description = "Configuration types, parsers & renderers for AWS services"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aws-dynamodb-conduit" = callPackage @@ -36626,7 +36170,6 @@ self: { description = "Conduit-based interface for AWS DynamoDB"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aws-dynamodb-streams" = callPackage @@ -36650,7 +36193,6 @@ self: { description = "Haskell bindings for Amazon DynamoDB Streams"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aws-easy" = callPackage @@ -36754,7 +36296,6 @@ self: { description = "Haskell suite for the Elastic Transcoder service"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aws-general" = callPackage @@ -36808,7 +36349,6 @@ self: { description = "Bindings for Amazon Kinesis"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aws-kinesis-client" = callPackage @@ -36844,7 +36384,6 @@ self: { description = "A producer & consumer client library for AWS Kinesis"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aws-kinesis-reshard" = callPackage @@ -36874,7 +36413,6 @@ self: { description = "Reshard AWS Kinesis streams in response to Cloud Watch metrics"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aws-lambda" = callPackage @@ -36895,7 +36433,6 @@ self: { description = "Haskell bindings for AWS Lambda"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aws-lambda-haskell-runtime" = callPackage @@ -36939,8 +36476,6 @@ self: { ]; description = "Run wai applications on AWS Lambda"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aws-lambda-runtime" = callPackage @@ -36965,8 +36500,6 @@ self: { executableHaskellDepends = [ aeson base lens lens-aeson text ]; description = "Haskell on AWS Lambda Runtime API"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aws-larpi" = callPackage @@ -37006,7 +36539,6 @@ self: { description = "Keep your AWS credentials file up to date with MFA-carrying credentials"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aws-performance-tests" = callPackage @@ -37082,7 +36614,6 @@ self: { description = "AWS SDK for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aws-sdk-text-converter" = callPackage @@ -37127,7 +36658,6 @@ self: { description = "The xml parser for aws-sdk package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aws-ses-easy" = callPackage @@ -37147,8 +36677,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Wrapper over Amazonka's SES"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aws-sign4" = callPackage @@ -37173,7 +36701,6 @@ self: { description = "Amazon Web Services (AWS) Signature v4 HTTP request signer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aws-simple" = callPackage @@ -37217,7 +36744,6 @@ self: { description = "Bindings for AWS SNS Version 2013-03-31"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "axel" = callPackage @@ -37288,7 +36814,6 @@ self: { description = "Web EDSL for running in browsers and server nodes using transient"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "axiomatic-classes" = callPackage @@ -37329,7 +36854,6 @@ self: { description = "Interact with Azimuth from Haskell"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "azubi" = callPackage @@ -37417,7 +36941,6 @@ self: { description = "Azure Functions Worker"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "azure-service-api" = callPackage @@ -37437,7 +36960,6 @@ self: { description = "Haskell bindings for the Microsoft Azure Service Management API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "azure-servicebus" = callPackage @@ -37456,7 +36978,6 @@ self: { description = "Haskell wrapper over Microsoft Azure ServiceBus REST API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "azurify" = callPackage @@ -37514,7 +37035,6 @@ self: { description = "Immutable disk-based B* trees"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "b9" = callPackage @@ -37588,7 +37108,6 @@ self: { description = "An implementation of a simple 2-player board game"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "backblaze-b2-hs" = callPackage @@ -37622,7 +37141,6 @@ self: { description = "A client library to access Backblaze B2 cloud storage in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "backdropper" = callPackage @@ -37641,7 +37159,6 @@ self: { description = "Rotates backdrops for X11 displays using Imagemagic"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "backprop" = callPackage @@ -37820,7 +37337,6 @@ self: { description = "Shipwire API client"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bamboo" = callPackage @@ -37842,7 +37358,6 @@ self: { description = "A blog engine on Hack"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bamboo-launcher" = callPackage @@ -37864,7 +37379,6 @@ self: { description = "bamboo-launcher"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bamboo-plugin-highlight" = callPackage @@ -37883,7 +37397,6 @@ self: { description = "A highlight middleware"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bamboo-plugin-photo" = callPackage @@ -37903,7 +37416,6 @@ self: { description = "A photo album middleware"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bamboo-theme-blueprint" = callPackage @@ -37923,7 +37435,6 @@ self: { description = "bamboo blueprint theme"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bamboo-theme-mini-html5" = callPackage @@ -37947,7 +37458,6 @@ self: { description = "bamboo mini html5 theme"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bamse" = callPackage @@ -37966,7 +37476,6 @@ self: { description = "A Windows Installer (MSI) generator framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bamstats" = callPackage @@ -37981,7 +37490,6 @@ self: { description = "A program to extract various information from BAM alignmnet files"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ban-instance" = callPackage @@ -38445,7 +37953,6 @@ self: { description = "Optics for the Base16 library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "base32" = callPackage @@ -38487,7 +37994,6 @@ self: { description = "Fast base32 and base32hex codec for ByteStrings"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "base32-lens" = callPackage @@ -38609,7 +38115,6 @@ self: { description = "Base62 encoding and decoding"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "base64" = callPackage @@ -38661,7 +38166,6 @@ self: { description = "Base64 encoding of byte sequences"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "base64-bytestring" = callPackage @@ -38862,7 +38366,6 @@ self: { description = "Baserock Definitions Schema"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "basex-client" = callPackage @@ -39042,7 +38545,6 @@ self: { description = "Batch processing toolset for Linux / Unix"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "battlenet" = callPackage @@ -39072,7 +38574,6 @@ self: { description = "Yesod integration for the battlenet package"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "battleplace" = callPackage @@ -39090,8 +38591,6 @@ self: { ]; description = "Core definitions for BattlePlace.io service"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "battleplace-api" = callPackage @@ -39105,8 +38604,6 @@ self: { ]; description = "Public API definitions of BattlePlace.io service"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "battleship-combinatorics" = callPackage @@ -39165,7 +38662,6 @@ self: { description = "A web-based implementation of battleships including an AI opponent"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bayes-stack" = callPackage @@ -39186,7 +38682,6 @@ self: { description = "Framework for inferring generative probabilistic models with Gibbs sampling"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bazel-coverage-report-renderer" = callPackage @@ -39253,7 +38748,6 @@ self: { description = "Tools for reading Big Binary Indexed files, e.g., bigBed, bigWig"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bcp47" = callPackage @@ -39273,8 +38767,6 @@ self: { ]; description = "Language tags as specified by BCP 47"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bcp47-orphans" = callPackage @@ -39294,8 +38786,6 @@ self: { ]; description = "BCP47 orphan instances"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bcrypt" = callPackage @@ -39355,7 +38845,6 @@ self: { description = "Tools for managing a content store of software packages"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) ostree;}; "bdcs-api" = callPackage @@ -39392,8 +38881,10 @@ self: { ]; description = "BDCS API Server"; license = lib.licenses.gpl3Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) libgit2-glib;}; "bdd" = callPackage @@ -39500,7 +38991,6 @@ self: { description = "DB migration library for beam, targeting Postgres"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "beam-core" = callPackage @@ -39545,7 +39035,6 @@ self: { description = "SQL DDL support and migrations support library for Beam"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "beam-mysql" = callPackage @@ -39564,7 +39053,6 @@ self: { description = "Connection layer between beam and MySQL/MariaDB"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "beam-newtype-field" = callPackage @@ -39581,7 +39069,6 @@ self: { description = "A newtype for wrapping newtypes into beam schemas"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "beam-postgres" = callPackage @@ -39609,7 +39096,6 @@ self: { description = "Connection layer between beam and postgres"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "beam-sqlite" = callPackage @@ -39633,7 +39119,6 @@ self: { description = "Beam driver for SQLite"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "beam-th" = callPackage @@ -39656,7 +39141,6 @@ self: { description = "Template Haskell utilities for beam"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "beamable" = callPackage @@ -39712,7 +39196,6 @@ self: { description = "A pretty-printer for higher-order logic"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bech32" = callPackage @@ -39760,7 +39243,6 @@ self: { description = "Template Haskell extensions to the Bech32 library"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bed-and-breakfast" = callPackage @@ -39828,7 +39310,6 @@ self: { description = "Bein is a provenance and workflow management system for bioinformatics"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "belka" = callPackage @@ -39858,7 +39339,6 @@ self: { description = "HTTP client DSL"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bench" = callPackage @@ -39878,6 +39358,7 @@ self: { ]; description = "Command-line benchmark tool"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "bench-graph" = callPackage @@ -39894,8 +39375,6 @@ self: { testHaskellDepends = [ base split text ]; description = "Plot and compare benchmarks"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bench-show" = callPackage @@ -40067,7 +39546,6 @@ self: { description = "An implementation of Python 3"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bert" = callPackage @@ -40215,7 +39693,6 @@ self: { description = "Bidirectionalization for Free! (POPL'09)"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bff-mono" = callPackage @@ -40249,7 +39726,6 @@ self: { description = "Implementation of the BGAPI serial protocol"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bgmax" = callPackage @@ -40441,28 +39917,6 @@ self: { }) {}; "bifunctors" = 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.10"; - sha256 = "03d96df4j1aq9z7hrk3n519g3h7fjgjf82fmgp6wxxbaigyrqwp7"; - 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 = lib.licenses.bsd3; - }) {}; - - "bifunctors_5_5_11" = callPackage ({ mkDerivation, base, base-orphans, comonad, containers, hspec , hspec-discover, QuickCheck, tagged, template-haskell , th-abstraction, transformers, transformers-compat @@ -40482,7 +39936,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bifunctors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bighugethesaurus" = callPackage @@ -40517,7 +39970,6 @@ self: { description = "A parser for the Billboard chord dataset"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "billeksah-forms" = callPackage @@ -40536,7 +39988,6 @@ self: { description = "Leksah library"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "billeksah-main" = callPackage @@ -40556,7 +40007,6 @@ self: { description = "Leksah plugin base"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "billeksah-main-static" = callPackage @@ -40598,7 +40048,6 @@ self: { description = "Leksah library"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "billeksah-services" = callPackage @@ -40836,7 +40285,6 @@ self: { description = "read/write binary file"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "binary-generic" = callPackage @@ -41061,7 +40509,6 @@ self: { description = "Monad to ease implementing a binary network protocol over ZeroMQ"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "binary-search" = callPackage @@ -41151,7 +40598,6 @@ self: { description = "data serialization/deserialization io-streams library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "binary-strict" = callPackage @@ -41194,8 +40640,6 @@ self: { ]; description = "Tagged binary serialisation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "binary-tree" = callPackage @@ -41305,8 +40749,6 @@ self: { testHaskellDepends = [ base HTF HUnit QuickCheck random ]; description = "Data Binding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "binding-gtk" = callPackage @@ -41338,7 +40780,6 @@ self: { description = "Data Binding in WxHaskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bindings" = callPackage @@ -41442,7 +40883,6 @@ self: { description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {apr-util = null;}; "bindings-audiofile" = callPackage @@ -41712,6 +41152,7 @@ self: { description = "Low level bindings to the C levmar (Levenberg-Marquardt) library"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) blas; liblapack = null;}; "bindings-libcddb" = callPackage @@ -41861,7 +41302,6 @@ self: { description = "bindings to Video For Linux Two (v4l2) kernel interfaces"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bindings-lxc" = callPackage @@ -41990,7 +41430,6 @@ self: { description = "PPDev bindings"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bindings-saga-cmd" = callPackage @@ -42023,6 +41462,9 @@ self: { libraryPkgconfigDepends = [ sane-backends ]; description = "FFI bindings to libsane"; license = lib.licenses.lgpl3Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) sane-backends;}; "bindings-sc3" = callPackage @@ -42180,7 +41622,6 @@ self: { description = "Example project using binembed to embed data in object files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bini" = callPackage @@ -42284,7 +41725,6 @@ self: { description = "Library for reading ace assembly files"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bioalign" = callPackage @@ -42297,7 +41737,6 @@ self: { description = "Data structures and helper functions for calculating alignments"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "biocore" = callPackage @@ -42325,7 +41764,6 @@ self: { description = "Library for reading fasta sequence files"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "biofastq" = callPackage @@ -42338,7 +41776,6 @@ self: { description = "A library for reading FASTQ files"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "biohazard" = callPackage @@ -42400,7 +41837,6 @@ self: { description = "A collection of bioinformatics tools"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "biophd" = callPackage @@ -42417,7 +41853,6 @@ self: { description = "Library for reading phd sequence files"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "biopsl" = callPackage @@ -42435,7 +41870,6 @@ self: { description = "Library and executables for working with PSL files"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "biosff" = callPackage @@ -42453,7 +41887,6 @@ self: { description = "Library and executables for working with SFF files"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "biostockholm" = callPackage @@ -42477,7 +41910,6 @@ self: { description = "Parsing and rendering of Stockholm files (used by Pfam, Rfam and Infernal)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bip32" = callPackage @@ -42499,7 +41931,6 @@ self: { description = "BIP-0032: Hierarchical Deterministic Wallets for Bitcoin and other cryptocurrencies"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "birch-beer" = callPackage @@ -42535,7 +41966,6 @@ self: { description = "Plot a colorful tree"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bird" = callPackage @@ -42557,7 +41987,6 @@ self: { description = "A simple, sinatra-inspired web framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "birds-of-paradise" = callPackage @@ -42575,21 +42004,24 @@ self: { }) {}; "bisc" = callPackage - ({ mkDerivation, base, configurator, directory, filepath, mtl - , selda, selda-sqlite, text + ({ mkDerivation, base, bytestring, configurator, data-default + , directory, exceptions, filepath, leveldb-haskell, mtl, selda + , selda-sqlite, snappy, text }: mkDerivation { pname = "bisc"; - version = "0.2.3.0"; - sha256 = "0x03smkfx0qnsxznlp1591gi938f15w057hywfp9497mhvkr7mxg"; + version = "0.3.0.0"; + sha256 = "097b25pp6pi7rq4xhk19g1i5v7v9hyx7ldyq0y3aj1cm50s2356m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base configurator directory filepath mtl selda selda-sqlite text + base bytestring configurator data-default directory exceptions + filepath leveldb-haskell mtl selda selda-sqlite text ]; - description = "A small tool that clears qutebrowser cookies"; + executableSystemDepends = [ snappy ]; + description = "A small tool that clears cookies (and more)"; license = lib.licenses.gpl3Only; - }) {}; + }) {inherit (pkgs) snappy;}; "bisect-binary" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hashable @@ -42656,7 +42088,6 @@ self: { description = "A bit array (aka bitset, bitmap, bit vector) API for numeric types"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bit-protocol" = callPackage @@ -42749,7 +42180,6 @@ self: { description = "Bitcoin address generation and rendering. Parsing coming soon."; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bitcoin-api" = callPackage @@ -42775,7 +42205,6 @@ self: { description = "Provides access to the RPC API of Bitcoin Core"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bitcoin-api-extra" = callPackage @@ -42799,7 +42228,6 @@ self: { description = "Higher level constructs on top of the bitcoin-api package"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bitcoin-block" = callPackage @@ -42821,7 +42249,6 @@ self: { description = "Utility functions for manipulating bitcoin blocks"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bitcoin-compact-filters" = callPackage @@ -42845,7 +42272,6 @@ self: { description = "BIP 158 compact block filters"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bitcoin-hash" = callPackage @@ -42903,7 +42329,6 @@ self: { description = "Bitcoin keys"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bitcoin-payment-channel" = callPackage @@ -42970,7 +42395,6 @@ self: { description = "Library to communicate with the Satoshi Bitcoin daemon"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bitcoin-script" = callPackage @@ -43014,7 +42438,6 @@ self: { description = "Resources for working with miniscript, and script descriptors"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bitcoin-tx" = callPackage @@ -43036,7 +42459,6 @@ self: { description = "Utility functions for manipulating bitcoin transactions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bitcoin-types" = callPackage @@ -43057,7 +42479,6 @@ self: { description = "Provides consistent low-level types used commonly among Bitcoin implementations"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bitcoind-regtest" = callPackage @@ -43088,7 +42509,6 @@ self: { description = "A library for working with bitcoin-core regtest networks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bitcoind-rpc" = callPackage @@ -43111,7 +42531,6 @@ self: { description = "A streamlined interface to bitcoin core using Haskoin types and Servant"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bitly-cli" = callPackage @@ -43128,7 +42547,6 @@ self: { description = "A command line tool to access bit.ly URL shortener."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bitmap" = callPackage @@ -43168,7 +42586,6 @@ self: { description = "Bitmap library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bits" = callPackage @@ -43257,8 +42674,8 @@ self: { pname = "bits-extra"; version = "0.0.2.0"; sha256 = "1c54008kinzcx93kc8vcp7wq7la662m8nk82ax76i9b0gvbkk21f"; - revision = "1"; - editedCabalFile = "1ri4z6zj20qsyyzsrl89sjcm4ir2w6538i6l36a6ffz7f0h0ahng"; + revision = "2"; + editedCabalFile = "01qlnzbc3kgbyacqg9c7ldab2s91h9s4kalld0wz9q2k1d4063lv"; libraryHaskellDepends = [ base ghc-prim vector ]; testHaskellDepends = [ base doctest doctest-discover ghc-prim hedgehog hspec hw-hedgehog @@ -43414,7 +42831,6 @@ self: { description = "Bittorrent protocol implementation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bittrex" = callPackage @@ -43496,8 +42912,6 @@ self: { ]; description = "Bitwise operations on bounded enumerations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bitx-bitcoin" = callPackage @@ -43538,8 +42952,6 @@ self: { ]; description = "A lousy Prelude replacement by a lousy dude"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bizzlelude-js" = callPackage @@ -43615,7 +43027,6 @@ self: { description = "a stupid cron"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "black-jewel" = callPackage @@ -43718,7 +43129,6 @@ self: { description = "The BLAKE SHA-3 candidate hashes, in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "blank-canvas" = callPackage @@ -43848,7 +43258,6 @@ self: { description = "Library for reading Blast XML output"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "blatex" = callPackage @@ -43867,7 +43276,6 @@ self: { description = "Blog in LaTeX"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "blaze" = callPackage @@ -43939,7 +43347,6 @@ self: { description = "Enumeratees for the incremental conversion of builders to bytestrings"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "blaze-colonnade" = callPackage @@ -43959,7 +43366,6 @@ self: { description = "blaze-html backend for colonnade"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "blaze-from-html" = callPackage @@ -44210,7 +43616,6 @@ self: { description = "Bluetooth Low Energy (BLE) peripherals"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "blindpass" = callPackage @@ -44245,7 +43650,6 @@ self: { description = "Control library for blink(1) LED from ThingM"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "blip" = callPackage @@ -44265,7 +43669,6 @@ self: { description = "Python to bytecode compiler"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bliplib" = callPackage @@ -44364,7 +43767,6 @@ self: { description = "Very simple static blog software"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bloodhound" = callPackage @@ -44418,7 +43820,6 @@ self: { description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bloomfilter" = callPackage @@ -44497,7 +43898,6 @@ self: { description = "OpenGL Logic Game"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "blubber" = callPackage @@ -44516,7 +43916,6 @@ self: { description = "The blubber client; connects to the blubber server"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "blubber-server" = callPackage @@ -44630,7 +44029,6 @@ self: { description = "full-featured tiling for the GNOME desktop environment"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk2;}; "bluetileutils" = callPackage @@ -44685,7 +44083,6 @@ self: { description = "Convert between pointfree and pointful expressions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bmp" = callPackage @@ -44711,7 +44108,6 @@ self: { description = "Library for communication with the Bosch BNO055 orientation sensor"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "board-games" = callPackage @@ -44800,7 +44196,6 @@ self: { executableHaskellDepends = [ base hogre hois random ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "boilerplate" = callPackage @@ -44964,7 +44359,6 @@ self: { description = "Runtime support for BOND serialization"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bond-haskell-compiler" = callPackage @@ -44987,7 +44381,6 @@ self: { description = "Bond code generator for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bookkeeper" = callPackage @@ -45029,7 +44422,6 @@ self: { description = "Permissions for bookkeeper records"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bookkeeping" = callPackage @@ -45255,7 +44647,6 @@ self: { description = "Boomshine clone"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "boop" = callPackage @@ -45292,7 +44683,6 @@ self: { description = "Mathematically sound sound synthesis"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "boots" = callPackage @@ -45349,7 +44739,6 @@ self: { description = "Factory for quickly building a microservice"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "boots-web" = callPackage @@ -45370,7 +44759,6 @@ self: { description = "Factory for quickly building a web application"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bootstrap-types" = callPackage @@ -45426,7 +44814,6 @@ self: { description = "Metering System for OpenStack metrics provided by Vaultaire"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "boring" = callPackage @@ -45675,7 +45062,6 @@ self: { description = "audio-visual pseudo-physical simulation of colliding circles"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "box" = callPackage @@ -45704,7 +45090,6 @@ self: { description = "boxes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "box-csv" = callPackage @@ -45722,7 +45107,6 @@ self: { description = "See readme.md"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "box-socket" = callPackage @@ -45747,7 +45131,6 @@ self: { description = "Box websockets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "box-tuples" = callPackage @@ -45907,6 +45290,7 @@ self: { libraryHaskellDepends = [ base mtl transformers ]; description = "Break from a loop"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "breakout" = callPackage @@ -45921,7 +45305,6 @@ self: { description = "A simple Breakout game implementation"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "breve" = callPackage @@ -45945,8 +45328,6 @@ self: { ]; description = "a url shortener"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "brians-brain" = callPackage @@ -45965,32 +45346,6 @@ self: { }) {}; "brick" = callPackage - ({ mkDerivation, base, bytestring, config-ini, containers - , contravariant, data-clist, deepseq, directory, dlist, exceptions - , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm - , template-haskell, text, text-zipper, transformers, unix, vector - , vty, word-wrap - }: - mkDerivation { - pname = "brick"; - version = "0.61"; - sha256 = "0cwrsndplgw5226cpdf7aad03jjidqh5wwwgm75anmya7c5lzl2d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring config-ini containers contravariant data-clist - deepseq directory dlist exceptions filepath microlens microlens-mtl - microlens-th stm template-haskell text text-zipper transformers - unix vector vty word-wrap - ]; - testHaskellDepends = [ - base containers microlens QuickCheck vector - ]; - description = "A declarative terminal user interface library"; - license = lib.licenses.bsd3; - }) {}; - - "brick_0_62" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm @@ -46014,7 +45369,6 @@ self: { ]; description = "A declarative terminal user interface library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "brick-dropdownmenu" = callPackage @@ -46095,7 +45449,6 @@ self: { description = "Bricks is a lazy functional language based on Nix"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bricks-internal" = callPackage @@ -46132,7 +45485,6 @@ self: { description = "..."; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bricks-parsec" = callPackage @@ -46154,7 +45506,6 @@ self: { description = "..."; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bricks-rendering" = callPackage @@ -46176,7 +45527,6 @@ self: { description = "..."; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bricks-syntax" = callPackage @@ -46198,7 +45548,6 @@ self: { description = "..."; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "brillig" = callPackage @@ -46428,7 +45777,6 @@ self: { description = "Streaming interface for the BronyRadioGermany API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "brotli" = callPackage @@ -46471,7 +45819,6 @@ self: { description = "Conduit interface for Brotli (RFC7932) compression"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "brotli-streams" = callPackage @@ -46493,7 +45840,6 @@ self: { description = "IO-Streams interface for Brotli (RFC7932) compression"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "browscap" = callPackage @@ -46569,8 +45915,6 @@ self: { ]; description = "BSON documents are JSON-like objects with a standard binary encoding"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bson-generic" = callPackage @@ -46608,8 +45952,6 @@ self: { libraryHaskellDepends = [ base bson lens text ]; description = "BSON lenses"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bson-mapping" = callPackage @@ -46678,7 +46020,6 @@ self: { description = "B-Tree on Unmanaged Heap"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "btree-concurrent" = callPackage @@ -46755,7 +46096,6 @@ self: { description = "Automates most of your plain text accounting data entry in ledger format"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "buffer" = callPackage @@ -46803,8 +46143,6 @@ self: { ]; description = "Library for efficiently building up buffers, one piece at a time"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "buffer-builder-aeson" = callPackage @@ -47071,7 +46409,6 @@ self: { description = "Tools for working with buildbox benchmark result files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "builder" = callPackage @@ -47126,7 +46463,6 @@ self: { description = "A library and an executable that provide an easy API for a Haskell IDE"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bullet" = callPackage @@ -47180,7 +46516,6 @@ self: { description = "Bulletproofs are short zero-knowledge proofs without a trusted setup"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bulmex" = callPackage @@ -47206,7 +46541,6 @@ self: { description = "Reflex infused with bulma (css)"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bumper" = callPackage @@ -47263,7 +46597,6 @@ self: { description = "List OP_RETURN cryptocurrency transaction outputs"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "burrito" = callPackage @@ -47313,7 +46646,6 @@ self: { description = "Haskell interface to the Bus Pirate binary interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "buster" = callPackage @@ -47349,7 +46681,6 @@ self: { description = "Almost but not quite entirely unlike FRP"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "buster-network" = callPackage @@ -47367,7 +46698,6 @@ self: { description = "Almost but not quite entirely unlike FRP"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bustle" = callPackage @@ -47467,7 +46797,6 @@ self: { description = "butterfly tilings"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "buttplug-hs-core" = callPackage @@ -47574,6 +46903,18 @@ self: { broken = true; }) {}; + "bv-sized-lens" = callPackage + ({ mkDerivation, base, bv-sized, lens, parameterized-utils }: + mkDerivation { + pname = "bv-sized-lens"; + version = "0.1.0.0"; + sha256 = "1njwizsxpmlpb3vm460ciw2x7byfz4y0g8bhsnfiimmyn7yazdr6"; + libraryHaskellDepends = [ base bv-sized lens parameterized-utils ]; + description = "Well-typed lenses for bv-sized bitvectors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "byline" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, colour , exceptions, free, haskeline, mtl, optparse-applicative, relude @@ -47595,8 +46936,6 @@ self: { ]; description = "Library for creating command-line interfaces (colors, menus, etc.)"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bytable" = callPackage @@ -47693,7 +47032,6 @@ self: { description = "Serialize to a small byte arrays"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bytedump" = callPackage @@ -47735,7 +47073,6 @@ self: { description = "Universal hashing of bytes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bytelog" = callPackage @@ -47752,7 +47089,6 @@ self: { description = "Fast logging"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "byteorder" = callPackage @@ -47817,8 +47153,6 @@ self: { benchmarkHaskellDepends = [ base gauge primitive ]; description = "Slicing managed and unmanaged memory"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bytesmith" = callPackage @@ -47844,7 +47178,6 @@ self: { description = "Nonresumable byte parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bytestring_0_11_1_0" = callPackage @@ -47982,17 +47315,17 @@ self: { }) {}; "bytestring-encoding" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, tasty-th, text + ({ mkDerivation, base, bytestring, deepseq, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, text }: mkDerivation { pname = "bytestring-encoding"; - version = "0.1.0.0"; - sha256 = "05pjx59xxpi27j3qfh2cwy9ibfdsc7g0zcsfkdhsj33yxpls363d"; + version = "0.1.1.0"; + sha256 = "0m2w1nvj5izmb4j08c57lk89i3rnhhb0n0rz511pb6s75ijqrb71"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ - base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck - tasty-th text + base bytestring deepseq QuickCheck tasty tasty-hunit + tasty-quickcheck tasty-th text ]; description = "ByteString ↔ Text converter based on GHC.IO.Encoding"; license = lib.licenses.bsd3; @@ -48142,7 +47475,6 @@ self: { description = "fast ByteString to number converting library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bytestring-rematch" = callPackage @@ -48450,6 +47782,18 @@ self: { broken = true; }) {}; + "c-enum" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "c-enum"; + version = "0.1.0.1"; + sha256 = "1mg01qzmwaks9ix0269kpvjsa60fkvfc5hjn4wb47c7a6zam2rx0"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base template-haskell ]; + description = "To make a type corresponding to an enum of C language"; + license = lib.licenses.bsd3; + }) {}; + "c-io" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -48520,7 +47864,6 @@ self: { description = "Simple C0 Syntax Check"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "c0parser" = callPackage @@ -48693,8 +48036,6 @@ self: { ]; description = "A maintenance command of Haskell cabal packages"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cabal" = callPackage @@ -48722,8 +48063,6 @@ self: { libraryHaskellDepends = [ base Cabal filepath ]; description = "Cabal support for creating AppImage applications"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cabal-audit" = callPackage @@ -48779,7 +48118,6 @@ self: { description = "A command line program for managing the dependency versions in a cabal file"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cabal-build-programs" = callPackage @@ -48845,7 +48183,6 @@ self: { description = "CI Assistant for Haskell projects"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cabal-cargs" = callPackage @@ -48869,7 +48206,6 @@ self: { description = "A command line program for extracting compiler arguments from a cabal file"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cabal-constraints" = callPackage @@ -49504,7 +48840,6 @@ self: { description = "Helpers for quering .cabal files or hackageDB's 00-index.tar"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cabal-rpm" = callPackage @@ -49631,7 +48966,6 @@ self: { description = "Automated test tool for cabal projects"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cabal-test-bin" = callPackage @@ -49738,7 +49072,6 @@ self: { description = "Create Arch Linux packages from Cabal packages"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cabal2doap" = callPackage @@ -49942,7 +49275,6 @@ self: { description = "Create mandriva rpm from cabal package"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cabalrpmdeps" = callPackage @@ -49958,7 +49290,6 @@ self: { description = "Autogenerate rpm dependencies from cabal files"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cabalvchk" = callPackage @@ -50128,8 +49459,6 @@ self: { ]; description = "A vault-style cache implementation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cachix" = callPackage @@ -50380,7 +49709,6 @@ self: { description = "A build-system library and driver"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cake3" = callPackage @@ -50430,7 +49758,6 @@ self: { description = "run turtle like LOGO with lojban"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cal-layout" = callPackage @@ -50476,7 +49803,6 @@ self: { description = "Examples for the Cal3d animation library"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cal3d-opengl" = callPackage @@ -50489,7 +49815,6 @@ self: { description = "OpenGL rendering for the Cal3D animation library"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "calamity" = callPackage @@ -50505,8 +49830,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.28.5"; - sha256 = "09ja2imqhz7kr97fhfskj1g7s7q88yrpa0p2s1n55fwkn1f2d3bs"; + version = "0.1.29.0"; + sha256 = "05i8364x6d5kh4vimg8xp5cwskbzayk71kb6r4gg95xdi6vhgnjx"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core @@ -50529,8 +49854,8 @@ self: { }: mkDerivation { pname = "calamity-commands"; - version = "0.1.0.0"; - sha256 = "0l2x65w7inib5bdfw0gzffm3pdlsylnivnjc8y82x7fi6jha8jcp"; + version = "0.1.1.0"; + sha256 = "0sx0pcxh9f7r4nlhii5i3vwxpbhngzprp4h3yvp2xvkr8mp6pyk2"; libraryHaskellDepends = [ base generic-lens lens megaparsec polysemy polysemy-plugin text text-show unordered-containers @@ -50551,7 +49876,6 @@ self: { description = "A small compiler for arithmetic expressions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "calculator" = callPackage @@ -50574,7 +49898,6 @@ self: { description = "A calculator repl, with variables, functions & Mathematica like dynamic plots"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "caldims" = callPackage @@ -50596,7 +49919,6 @@ self: { description = "Calculation tool and library supporting units"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "caledon" = callPackage @@ -50674,7 +49996,6 @@ self: { description = "The call game engine"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "call-alloy" = callPackage @@ -50768,7 +50089,6 @@ self: { description = "CamFort - Cambridge Fortran infrastructure"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) flint;}; "camh" = callPackage @@ -50802,7 +50122,6 @@ self: { description = "Haskell implementation of the Campfire API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "can-i-haz" = callPackage @@ -50848,7 +50167,6 @@ self: { description = "Candid integration"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "canon" = callPackage @@ -50931,7 +50249,6 @@ self: { description = "Utilities for HTTP programming"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "canteven-listen-http" = callPackage @@ -51060,7 +50377,6 @@ self: { description = "CAO Compiler"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cap" = callPackage @@ -51076,7 +50392,6 @@ self: { description = "Interprets and debug the cap language"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "capability" = callPackage @@ -51234,7 +50549,6 @@ self: { description = "Simple web-server for organizing car-pooling for an event"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "caramia" = callPackage @@ -51295,7 +50609,6 @@ self: { description = "Drop emails from threads being watched into special CC folder"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cardano-coin-selection" = callPackage @@ -51317,8 +50630,6 @@ self: { ]; description = "Algorithms for coin selection and fee balancing"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cardano-transactions" = callPackage @@ -51443,7 +50754,6 @@ self: { description = "Specify Cabal files in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cas-hashable" = callPackage @@ -51589,7 +50899,6 @@ self: { description = "mid-level bindings to CasADi"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {casadi = null;}; "casadi-bindings-control" = callPackage @@ -51607,7 +50916,6 @@ self: { description = "low level bindings to casadi-control"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {casadi_control = null;}; "casadi-bindings-core" = callPackage @@ -51625,7 +50933,6 @@ self: { description = "autogenerated low level bindings to casadi"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {casadi = null;}; "casadi-bindings-internal" = callPackage @@ -51657,7 +50964,6 @@ self: { description = "low level bindings to casadi-ipopt_interface"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {casadi_ipopt_interface = null;}; "casadi-bindings-snopt-interface" = callPackage @@ -51675,7 +50981,6 @@ self: { description = "low level bindings to casadi-snopt_interface"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {casadi_snopt_interface = null;}; "cascading" = callPackage @@ -51787,8 +51092,6 @@ self: { benchmarkHaskellDepends = [ gauge mwc-random rerebase ]; description = "A converter for spinal, snake and camel cases"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cash" = callPackage @@ -51806,7 +51109,6 @@ self: { description = "the Computer Algebra SHell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "casing" = callPackage @@ -52014,7 +51316,6 @@ self: { description = "Haskell client for Cassandra's CQL protocol"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cassandra-thrift" = callPackage @@ -52214,7 +51515,6 @@ self: { description = "A high level driver for the Cassandra datastore"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cast" = callPackage @@ -52303,7 +51603,6 @@ self: { description = "Equation Manipulator"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "catalyst" = callPackage @@ -52354,7 +51653,6 @@ self: { description = "Categorical Monoids and Semirings"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "categories" = callPackage @@ -52405,7 +51703,6 @@ self: { description = "A meta-package documenting various packages inspired by category theory"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "category-printf" = callPackage @@ -52650,8 +51947,8 @@ self: { pname = "cborg-json"; version = "0.2.2.0"; sha256 = "0ysilz7rrjk94sqr3a61s98hr9qfi1xg13bskmlpc6mpgi2s4s5b"; - revision = "2"; - editedCabalFile = "1hbabjvmyqha75v2ivyvj6yzrnj9vs3h9988j4p68x9bcwmgyjyd"; + revision = "3"; + editedCabalFile = "1sn2f9nfjcbr0n62n4kklbdi3pzpwrcy7ilg7m3v41nwrk53ifwy"; libraryHaskellDepends = [ aeson aeson-pretty base cborg scientific text unordered-containers vector @@ -52727,9 +52024,32 @@ self: { description = "High-level interface to CCTools' WorkQueue library"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {dttools = null;}; + "cdar-mBound" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, integer-gmp + , parallel, QuickCheck, smallcheck, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "cdar-mBound"; + version = "0.1.0.1"; + sha256 = "1a31rjs1if69987xi15qpyl2m21qscsxpyrq4jhfk3j87ilpx5zg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers deepseq integer-gmp ]; + executableHaskellDepends = [ base containers deepseq integer-gmp ]; + testHaskellDepends = [ + base containers deepseq integer-gmp QuickCheck smallcheck tasty + tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq integer-gmp parallel + ]; + description = "Exact real arithmetic using Centred Dyadic Approximations"; + license = lib.licenses.bsd3; + }) {}; + "cdeps" = callPackage ({ mkDerivation, alex, array, base, bytestring, criterion , directory, filepath, hspec, optparse-applicative, text @@ -52811,7 +52131,6 @@ self: { description = "Simple wrapper around cef3-raw"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ceilometer-common" = callPackage @@ -52836,7 +52155,6 @@ self: { description = "Common Haskell types and encoding for OpenStack Ceilometer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cellrenderer-cairo" = callPackage @@ -52877,7 +52195,6 @@ self: { description = "A tool to build a novel"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cerberus" = callPackage @@ -52982,7 +52299,6 @@ self: { description = "Deserialize things with cereal and enumerator"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cereal-ieee754" = callPackage @@ -53019,7 +52335,6 @@ self: { description = "io-streams support for the cereal binary serialization library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cereal-plus" = callPackage @@ -53068,7 +52383,6 @@ self: { description = "Use cereal to encode/decode io-streams"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cereal-text" = callPackage @@ -53150,7 +52464,6 @@ self: { description = "Certificates and Key Reader/Writer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cf" = callPackage @@ -53206,7 +52519,6 @@ self: { description = "cfipu processor for toy brainfuck-like language"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cflp" = callPackage @@ -53226,7 +52538,6 @@ self: { description = "Constraint Functional-Logic Programming in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cfopu" = callPackage @@ -53245,7 +52556,6 @@ self: { description = "cfopu processor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cg" = callPackage @@ -53359,7 +52669,6 @@ self: { description = "Command line tool"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chain-codes" = callPackage @@ -53399,7 +52708,6 @@ self: { description = "Mining Client for Kadena Chainweb"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chakra" = callPackage @@ -53448,7 +52756,6 @@ self: { description = "A REST Web Api server template for building (micro)services"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chalk" = callPackage @@ -53492,7 +52799,6 @@ self: { description = "OpenGL based viewer for chalkboard rendered images"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chalmers-lava2000" = callPackage @@ -53641,7 +52947,6 @@ self: { description = "Rapid prototyping websites with Snap and Heist"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "charset" = callPackage @@ -53668,6 +52973,9 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "Character set detection using Mozilla's Universal Character Set Detector"; license = "LGPL"; + platforms = [ + "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux" + ]; }) {}; "charsetdetect-ae" = callPackage @@ -53699,7 +53007,6 @@ self: { description = "Command-line utility to draw charts from input data easily"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chart-histogram" = callPackage @@ -53743,7 +53050,6 @@ self: { description = "Charting library targetting SVGs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chart-svg-various" = callPackage @@ -53768,7 +53074,6 @@ self: { description = "See readme.md"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chart-unit" = callPackage @@ -53794,7 +53099,6 @@ self: { description = "Native haskell charts"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "charter" = callPackage @@ -54050,7 +53354,6 @@ self: { description = "Initial project template from stack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "check-email" = callPackage @@ -54083,7 +53386,6 @@ self: { description = "Check whether module and package imports conform to the PVP"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "checked" = callPackage @@ -54237,8 +53539,8 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.6.0.0"; - sha256 = "0lc0bif9bp4h0131cy9rss90qv026mlknr16ayxlvfn3ynyarqv8"; + version = "0.6.1.0"; + sha256 = "0agrj7k2kfyfdh23m7nciywl9sgi4vy82h83p76jlclbcakdqy1c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54259,8 +53561,6 @@ self: { ]; description = "Basic chess library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chesshs" = callPackage @@ -54292,33 +53592,41 @@ self: { description = "Query interface for Chevalier"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chiasma" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, directory - , either, filepath, free, HTF, lens, mtl, parsec, posix-pty - , process, resourcet, split, transformers, typed-process, unix - , unliftio + ({ mkDerivation, aeson, attoparsec, base, bytestring, composition + , composition-extra, conduit, conduit-extra, containers, cornea + , data-default, deepseq, directory, either, exceptions, filepath + , free, hedgehog, lens, mtl, parsec, parsers, posix-pty + , prettyprinter, prettyprinter-ansi-terminal, process, random + , relude, resourcet, split, stm-chans, stm-conduit, tasty + , tasty-hedgehog, text, transformers, typed-process, unix, unliftio + , unliftio-core, uuid }: mkDerivation { pname = "chiasma"; - version = "0.1.0.0"; - sha256 = "140p3qrrdh3im5qj43swl9cvljgyc39zy7ci5048j42h8x9q7glg"; + version = "0.2.0.0"; + sha256 = "11pbg9mlmp15hs2wdca0qyhbc94d91xkl75jlcaksla8l1qnnz9m"; libraryHaskellDepends = [ - base bytestring data-default-class directory either filepath free - lens mtl parsec posix-pty process resourcet split transformers - typed-process unix unliftio + aeson attoparsec base bytestring composition composition-extra + conduit conduit-extra containers cornea data-default deepseq + directory either exceptions filepath free lens mtl parsec parsers + posix-pty prettyprinter prettyprinter-ansi-terminal process random + relude resourcet split stm-chans stm-conduit text transformers + typed-process unix unliftio unliftio-core uuid ]; testHaskellDepends = [ - base bytestring data-default-class directory either filepath free - HTF lens mtl parsec posix-pty process resourcet split transformers - typed-process unix unliftio + aeson attoparsec base bytestring composition composition-extra + conduit conduit-extra containers cornea data-default deepseq + directory either exceptions filepath free hedgehog lens mtl parsec + parsers posix-pty prettyprinter prettyprinter-ansi-terminal process + random relude resourcet split stm-chans stm-conduit tasty + tasty-hedgehog text transformers typed-process unix unliftio + unliftio-core uuid ]; description = "tmux api"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + license = "BSD-2-Clause-Patent"; }) {}; "chimera" = callPackage @@ -54358,8 +53666,6 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell bindings for Chipmunk2D physics engine"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chitauri" = callPackage @@ -54380,7 +53686,6 @@ self: { description = "Helper for the Major System"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "choice" = callPackage @@ -54422,7 +53727,6 @@ self: { description = "Command-line program to choose random element from a stream"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chorale" = callPackage @@ -54460,7 +53764,6 @@ self: { description = "A module containing basic geo functions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chp" = callPackage @@ -54490,7 +53793,6 @@ self: { description = "MTL class instances for the CHP library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chp-plus" = callPackage @@ -54508,7 +53810,6 @@ self: { description = "A set of high-level concurrency utilities built on Communicating Haskell Processes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chp-spec" = callPackage @@ -54538,7 +53839,6 @@ self: { description = "Transformers instances for the CHP library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chr-core" = callPackage @@ -54556,7 +53856,6 @@ self: { description = "Constraint Handling Rules"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chr-data" = callPackage @@ -54595,7 +53894,6 @@ self: { description = "AST + surface language around chr"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chr-parse" = callPackage @@ -54660,7 +53958,6 @@ self: { description = "neovim package manager"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chronograph" = callPackage @@ -54768,8 +54065,6 @@ self: { benchmarkHaskellDepends = [ base ]; description = "Benchmarking tool with focus on comparing results"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chs-cabal" = callPackage @@ -54818,7 +54113,6 @@ self: { description = "FFI for Chu2 Agda Web Server Interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chuchu" = callPackage @@ -54864,7 +54158,6 @@ self: { description = "Simple template library with static safety"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chunky" = callPackage @@ -54951,8 +54244,6 @@ self: { ]; description = "Channel/Arrow based streaming computation library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cielo" = callPackage @@ -55213,7 +54504,6 @@ self: { description = "Implementation of CipherSaber2 RC4 cryptography"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "circ" = callPackage @@ -55367,7 +54657,6 @@ self: { description = "convert document IDs such as DOI, ISBN, arXiv ID to bibliographic reference"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "citeproc" = callPackage @@ -55435,7 +54724,6 @@ self: { description = "A Pandoc filter for processing bibliographic references with citeproc-hs"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cityhash" = callPackage @@ -55509,8 +54797,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Clifford Algebra of three dimensional space"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cl3-hmatrix-interface" = callPackage @@ -55522,8 +54808,6 @@ self: { libraryHaskellDepends = [ base cl3 hmatrix ]; description = "Interface to/from Cl3 and HMatrix"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cl3-linear-interface" = callPackage @@ -55535,8 +54819,6 @@ self: { libraryHaskellDepends = [ base cl3 linear ]; description = "Interface to/from Cl3 and Linear"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clac" = callPackage @@ -55556,7 +54838,6 @@ self: { description = "Simple CLI RPN calculator"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clafer" = callPackage @@ -55592,7 +54873,6 @@ self: { description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "claferIG" = callPackage @@ -55626,7 +54906,6 @@ self: { description = "claferIG is an interactive tool that generates instances of Clafer models"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "claferwiki" = callPackage @@ -55647,7 +54926,6 @@ self: { description = "A wiki-based IDE for literate modeling with Clafer"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clang-compilation-database" = callPackage @@ -55742,7 +55020,6 @@ self: { description = "CAES Language for Synchronous Hardware (CLaSH)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clash-ghc" = callPackage @@ -55773,7 +55050,6 @@ self: { description = "CAES Language for Synchronous Hardware"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clash-ghc_1_4_1" = callPackage @@ -55805,7 +55081,6 @@ self: { description = "Clash: a functional hardware description language - GHC frontend"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clash-lib" = callPackage @@ -55846,7 +55121,6 @@ self: { description = "CAES Language for Synchronous Hardware - As a Library"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clash-lib_1_4_1" = callPackage @@ -55890,7 +55164,6 @@ self: { description = "Clash: a functional hardware description language - As a library"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clash-multisignal" = callPackage @@ -55906,7 +55179,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clash-prelude" = callPackage @@ -56020,7 +55292,6 @@ self: { description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clash-verilog" = callPackage @@ -56039,7 +55310,6 @@ self: { description = "CAES Language for Synchronous Hardware - Verilog backend"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clash-vhdl" = callPackage @@ -56058,7 +55328,6 @@ self: { description = "CAES Language for Synchronous Hardware - VHDL backend"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "classify" = callPackage @@ -56102,7 +55371,6 @@ self: { description = "Classify sounds produced by Xenopus laevis"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "classy-influxdb-simple" = callPackage @@ -56142,7 +55410,6 @@ self: { description = "Typeclass based support for Miso, the Tasty Web Framework for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "classy-parallel" = callPackage @@ -56287,7 +55554,6 @@ self: { description = "A secure, reliable content management system (CMS) and blogging platform"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) openssl;}; "clckwrks-cli" = callPackage @@ -56311,7 +55577,6 @@ self: { description = "a command-line interface for adminstrating some aspects of clckwrks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clckwrks-dot-com" = callPackage @@ -56334,7 +55599,6 @@ self: { description = "clckwrks.com"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clckwrks-plugin-bugs" = callPackage @@ -56361,7 +55625,6 @@ self: { description = "bug tracking plugin for clckwrks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clckwrks-plugin-ircbot" = callPackage @@ -56386,7 +55649,6 @@ self: { description = "ircbot plugin for clckwrks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clckwrks-plugin-mailinglist" = callPackage @@ -56412,7 +55674,6 @@ self: { description = "mailing list plugin for clckwrks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clckwrks-plugin-media" = callPackage @@ -56436,7 +55697,6 @@ self: { description = "media plugin for clckwrks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clckwrks-plugin-page" = callPackage @@ -56463,7 +55723,6 @@ self: { description = "support for CMS/Blogging in clckwrks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clckwrks-plugin-redirect" = callPackage @@ -56489,7 +55748,6 @@ self: { description = "support redirects for CMS/Blogging in clckwrks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clckwrks-theme-bootstrap" = callPackage @@ -56508,7 +55766,6 @@ self: { description = "simple bootstrap based template for clckwrks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clckwrks-theme-clckwrks" = callPackage @@ -56527,7 +55784,6 @@ self: { description = "simple bootstrap based template for clckwrks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clckwrks-theme-geo-bootstrap" = callPackage @@ -56541,7 +55797,6 @@ self: { description = "geo bootstrap based template for clckwrks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cld2" = callPackage @@ -56604,7 +55859,6 @@ self: { description = "Colorized LESS"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clevercss" = callPackage @@ -56687,8 +55941,6 @@ self: { ]; description = "Miscellaneous utilities for building and working with command line interfaces"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cli-git" = callPackage @@ -56705,8 +55957,6 @@ self: { ]; description = "Bindings to the git command-line interface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cli-nix" = callPackage @@ -56723,8 +55973,6 @@ self: { ]; description = "Bindings to the nix command-line interface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cli-setup" = callPackage @@ -56870,7 +56118,6 @@ self: { description = "A Clifford algebra library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clifm" = callPackage @@ -56987,7 +56234,6 @@ self: { description = "A parser/generator for Kindle-format clipping files (`My Clippings.txt`),"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clisparkline" = callPackage @@ -57111,7 +56357,6 @@ self: { description = "timer functionality to clock IO commands"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {QtCore = null;}; "clogparse" = callPackage @@ -57224,7 +56469,6 @@ self: { description = "The Cloud Haskell Application Platform"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cloud-seeder" = callPackage @@ -57254,7 +56498,6 @@ self: { description = "A tool for interacting with AWS CloudFormation"; license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cloudfront-signer" = callPackage @@ -57444,7 +56687,6 @@ self: { description = "C to Lua data wrapper generator"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clumpiness" = callPackage @@ -57515,7 +56757,6 @@ self: { description = "Tools for manipulating sequence clusters"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clutterhs" = callPackage @@ -57534,7 +56775,6 @@ self: { description = "Bindings to the Clutter animation library"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) clutter; inherit (pkgs) pango;}; "cmaes" = callPackage @@ -57701,7 +56941,6 @@ self: { description = "Data model, parser, serialiser and transformations for Content MathML 3"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cmd-item" = callPackage @@ -57868,7 +57107,6 @@ self: { description = "Compare types of any kinds"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cmt" = callPackage @@ -57940,7 +57178,6 @@ self: { description = "Detailed visualization of CMs, HMMs and their comparisions"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cnc-spec-compiler" = callPackage @@ -57963,7 +57200,6 @@ self: { description = "Compiler/Translator for CnC Specification Files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cndict" = callPackage @@ -58081,7 +57317,6 @@ self: { description = "A Polysemy logging effect for high quality (unstructured) logs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "co-log-sys" = callPackage @@ -58220,8 +57455,8 @@ self: { }: mkDerivation { pname = "code-conjure"; - version = "0.1.0"; - sha256 = "0zagchakak4mrdpgy23d2wfb357dc6fn78fpcjs1ik025wmldy88"; + version = "0.2.4"; + sha256 = "1xb8c791zcbfywz4pcqx5n5iq6a2fh0fl2mzwl6cxapj2y700dbp"; libraryHaskellDepends = [ base express leancheck speculate template-haskell ]; @@ -58263,7 +57498,6 @@ self: { description = "Simple bidirectional serialization"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "codec-beam" = callPackage @@ -58339,7 +57573,6 @@ self: { description = "A library for manipulating RPM files"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "codecov-haskell" = callPackage @@ -58384,7 +57617,6 @@ self: { description = "Tool that automatically runs arbitrary commands when files change on disk"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "codepad" = callPackage @@ -58526,8 +57758,6 @@ self: { benchmarkHaskellDepends = [ base gauge ]; description = "Utility functions for Coercible types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "coercion-extras" = callPackage @@ -58680,7 +57910,6 @@ self: { description = "Connector library for the coinbase exchange"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "coinbase-pro" = callPackage @@ -58759,7 +57988,6 @@ self: { description = "Colada implements incremental word class class induction using online LDA"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "colchis" = callPackage @@ -58847,7 +58075,6 @@ self: { description = "Collapse the duplication output into clones and return their frequencies"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "collapse-util" = callPackage @@ -58869,13 +58096,25 @@ self: { ({ mkDerivation, base, containers, QuickCheck }: mkDerivation { pname = "collect-errors"; - version = "0.1.0.0"; - sha256 = "1zspgncbnn8zqixlxm3hrck3mk4j3n91515456w8dy220a0bzbhc"; + version = "0.1.1.0"; + sha256 = "0zk7iw1fx50dzm55rcxpd8rwqm7jsb057q8hrf7c8b0jjbrx5b9v"; libraryHaskellDepends = [ base containers QuickCheck ]; description = "Error monad with a Float instance"; license = lib.licenses.bsd3; }) {}; + "collect-errors_0_1_3_0" = callPackage + ({ mkDerivation, base, containers, deepseq, QuickCheck }: + mkDerivation { + pname = "collect-errors"; + version = "0.1.3.0"; + sha256 = "03gzaqlgivlzlsqrzr8g1ijvi825p9kxzihhrrd06vib34bqswv8"; + libraryHaskellDepends = [ base containers deepseq QuickCheck ]; + description = "Error monad with a Float instance"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "collection-json" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, hspec-discover , network-arbitrary, network-uri, network-uri-json, QuickCheck @@ -58897,7 +58136,6 @@ self: { description = "Collection+JSON—Hypermedia Type Tools"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "collections" = callPackage @@ -58944,7 +58182,6 @@ self: { description = "Useful standard collections types and related functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "colock" = callPackage @@ -59004,7 +58241,6 @@ self: { description = "Count colors in images"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "colorful-monoids" = callPackage @@ -59072,7 +58308,6 @@ self: { description = "Http Client addon for Colorless"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "colorless-scotty" = callPackage @@ -59087,7 +58322,6 @@ self: { description = "Scotty server add-on for Colorless"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "colors" = callPackage @@ -59147,7 +58381,6 @@ self: { description = "Instances of the manifold-classes for colour types"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "colourista" = callPackage @@ -59203,7 +58436,6 @@ self: { description = "Enhanced serialization using seeking"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "columnar" = callPackage @@ -59221,8 +58453,6 @@ self: { ]; description = "A CSV toolkit based on cassava and enum-text"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "com" = callPackage @@ -59337,8 +58567,6 @@ self: { ]; description = "Generate and manipulate various combinatorial objects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "combinat-compat" = callPackage @@ -59520,7 +58748,6 @@ self: { description = "A format for describing comics"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "comma" = callPackage @@ -59748,7 +58975,6 @@ self: { description = "Key agreement for commsec"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "commutative" = callPackage @@ -59896,7 +59122,6 @@ self: { description = "Mutable arrays living on the compact heap"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "compact-mutable-vector" = callPackage @@ -59990,8 +59215,6 @@ self: { ]; description = "Small vectors of small integers stored very compactly"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "compactable" = callPackage @@ -60055,8 +59278,6 @@ self: { ]; description = "Compositional Data Types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "compdata-automata" = callPackage @@ -60072,8 +59293,6 @@ self: { ]; description = "Tree automata on Compositional Data Types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "compdata-dags" = callPackage @@ -60185,8 +59404,6 @@ self: { ]; description = "Client for the Compendium schema server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "compensated" = callPackage @@ -60290,7 +59507,6 @@ self: { description = "Empirical algorithmic complexity"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "componentm" = callPackage @@ -60581,8 +59797,6 @@ self: { ]; description = "Swagger for Vinyl records"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "composite-tuple" = callPackage @@ -60821,7 +60035,6 @@ self: { description = "Well-kinded computational algebra library, currently supporting Groebner basis"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "computational-geometry" = callPackage @@ -60931,7 +60144,6 @@ self: { description = "Morphological disambiguation based on constrained CRFs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "concraft-hr" = callPackage @@ -60954,7 +60166,6 @@ self: { description = "Part-of-speech tagger for Croatian"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "concraft-pl" = callPackage @@ -60984,7 +60195,6 @@ self: { description = "Morphological tagger for Polish"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "concrete-haskell" = callPackage @@ -61029,7 +60239,6 @@ self: { description = "Library for the Concrete data format"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "concrete-haskell-autogen" = callPackage @@ -61047,7 +60256,6 @@ self: { description = "Automatically generated Thrift definitions for the Concrete data format"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "concrete-relaxng-parser" = callPackage @@ -61143,8 +60351,6 @@ self: { ]; description = "Benchmarks to compare concurrency APIs"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "concurrent-barrier" = callPackage @@ -61276,8 +60482,6 @@ self: { benchmarkHaskellDepends = [ base machines time ]; description = "Concurrent networked stream transducers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "concurrent-output" = callPackage @@ -61436,7 +60640,6 @@ self: { description = "Information retrieval library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "condorcet" = callPackage @@ -61491,7 +60694,6 @@ self: { description = "a library with examples of using Conductive with hsc3"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "conductive-song" = callPackage @@ -61504,7 +60706,6 @@ self: { description = "a library of functions which are useful for composing music"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "conduino" = callPackage @@ -61956,7 +61157,6 @@ self: { description = "Zip archive interface for the Conduit Virtual File System"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "conduit-zstd" = callPackage @@ -62045,7 +61245,6 @@ self: { ]; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "conferer" = callPackage @@ -62109,8 +61308,6 @@ self: { ]; description = "Configuration for reading dhall files"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "conferer-hedis" = callPackage @@ -62156,7 +61353,6 @@ self: { description = "Configuration for reading dhall files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "conferer-provider-json" = callPackage @@ -62198,7 +61394,6 @@ self: { description = "Configuration for reading yaml files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "conferer-snap" = callPackage @@ -62242,7 +61437,6 @@ self: { description = "Configuration for reading dhall files"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "conferer-source-json" = callPackage @@ -62283,7 +61477,6 @@ self: { description = "Configuration for reading yaml files"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "conferer-warp" = callPackage @@ -62352,7 +61545,6 @@ self: { description = "A .conf file formatter"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "confide" = callPackage @@ -62460,7 +61652,6 @@ self: { description = "A small program for swapping out dot files"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "config-value" = callPackage @@ -62522,7 +61713,6 @@ self: { description = "parser for config files, shell variables, command line args"; license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "configuration" = callPackage @@ -62632,7 +61822,6 @@ self: { description = "The next generation of configuration management"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "configurator-pg" = callPackage @@ -62823,8 +62012,6 @@ self: { testHaskellDepends = [ base hedgehog ]; description = "Orders, Galois connections, and lattices"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "consistent" = callPackage @@ -63084,7 +62271,6 @@ self: { description = "Some conviencience type functions for manipulating constraints"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "constraint-reflection" = callPackage @@ -63230,7 +62416,6 @@ self: { description = "Exact computation with constructible real numbers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "constructive-algebra" = callPackage @@ -63297,7 +62482,6 @@ self: { description = "Concurrent PostgreSQL data consumers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "container" = callPackage @@ -63312,7 +62496,6 @@ self: { description = "Containers abstraction and utilities"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "container-builder" = callPackage @@ -63596,8 +62779,6 @@ self: { ]; description = "Unified interface for primitive arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "contiguous-checked" = callPackage @@ -63622,8 +62803,6 @@ self: { libraryHaskellDepends = [ base contiguous primitive semirings ]; description = "dft of contiguous memory structures"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "continue" = callPackage @@ -63689,7 +62868,6 @@ self: { ]; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "continuum-client" = callPackage @@ -63705,7 +62883,6 @@ self: { ]; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "contra-tracer" = callPackage @@ -63777,7 +62954,6 @@ self: { description = "Class of monad transformers which control operations can be lifted thru"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "control-bool" = callPackage @@ -63859,7 +63035,6 @@ self: { description = "Monad transformer for attempt. (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "control-monad-exception" = callPackage @@ -63892,7 +63067,6 @@ self: { description = "Monads-fd instances for the EMT exceptions monad transformer"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "control-monad-exception-monadstf" = callPackage @@ -64121,7 +63295,6 @@ self: { description = "Injective explicit total and partial conversions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "convert" = callPackage @@ -64140,7 +63313,6 @@ self: { description = "Safe and unsafe data conversion utilities with strong type-level operation. checking."; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "convert-annotation" = callPackage @@ -64200,7 +63372,6 @@ self: { description = "convertible instances for ascii"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "convertible-text" = callPackage @@ -64222,7 +63393,6 @@ self: { description = "Typeclasses and instances for converting between types (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cookbook" = callPackage @@ -64267,8 +63437,6 @@ self: { ]; description = "web cookies"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "coordinate" = callPackage @@ -64282,7 +63450,6 @@ self: { description = "A representation of latitude and longitude"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "copilot" = callPackage @@ -64303,7 +63470,6 @@ self: { description = "A stream DSL for writing embedded C programs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "copilot-c99" = callPackage @@ -64327,7 +63493,6 @@ self: { description = "A compiler for Copilot targeting C99"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "copilot-cbmc" = callPackage @@ -64345,7 +63510,6 @@ self: { description = "Copilot interface to a C model-checker"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "copilot-core" = callPackage @@ -64374,7 +63538,6 @@ self: { description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "copilot-libraries" = callPackage @@ -64391,7 +63554,6 @@ self: { description = "Libraries for the Copilot language"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "copilot-sbv" = callPackage @@ -64429,7 +63591,6 @@ self: { description = "k-induction for Copilot"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "copr" = callPackage @@ -64554,8 +63715,8 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.2.6.0"; - sha256 = "1qyl7kcdqxfl2inx66n7pa1z2pqjxrz1bpg3jjknjj0kpw9rlhf3"; + version = "0.2.7.1"; + sha256 = "1bm75bdmcrjizmrspl52qqs4vq9hlyh7fjv5y5lfpkmqrs45045b"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-text directory exceptions filepath fsnotify hashable hourglass mtl prettyprinter @@ -64646,30 +63807,27 @@ self: { librarySystemDepends = [ rocksdb ]; description = "Launches CoreNLP and parses the JSON output"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) rocksdb;}; "cornea" = callPackage - ({ mkDerivation, base-noprelude, either, HTF, lens, lifted-base - , monad-control, mtl, relude, template-haskell, th-abstraction - , transformers + ({ mkDerivation, base, either, hedgehog, lens, lifted-base + , monad-control, mtl, relude, tasty, tasty-hedgehog + , template-haskell, th-abstraction, transformers }: mkDerivation { pname = "cornea"; - version = "0.3.1.2"; - sha256 = "04iika5r5w3347w87b8whwrxym5nzvgl5pr76fpxw78fwvi1nvzk"; + version = "0.4.0.0"; + sha256 = "0hm17g350gnklvgi5nsx03lgbx2zs9h4q11y2gi9zjnm6gv6gjrn"; libraryHaskellDepends = [ - base-noprelude either lens lifted-base monad-control mtl relude + base either lens lifted-base monad-control mtl relude template-haskell th-abstraction transformers ]; testHaskellDepends = [ - base-noprelude either HTF lens lifted-base monad-control mtl relude - template-haskell th-abstraction transformers + base either hedgehog lens lifted-base monad-control mtl relude + tasty tasty-hedgehog template-haskell th-abstraction transformers ]; description = "classy optical monadic state"; - license = "unknown"; - hydraPlatforms = lib.platforms.none; + license = "BSD-2-Clause-Patent"; }) {}; "coroutine-enumerator" = callPackage @@ -64682,7 +63840,6 @@ self: { description = "Bridge between the monad-coroutine and enumerator packages"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "coroutine-iteratee" = callPackage @@ -64695,7 +63852,6 @@ self: { description = "Bridge between the monad-coroutine and iteratee packages"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "coroutine-object" = callPackage @@ -64756,7 +63912,7 @@ self: { description = "A modern, lightweight, complete client for CouchDB"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) couchdb;}; + }) {couchdb = null;}; "couchdb-conduit" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base @@ -64815,7 +63971,6 @@ self: { description = "Couch DB client library using http-enumerator and aeson"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "count" = callPackage @@ -64859,8 +64014,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck text ]; description = "Countable Text Inflections"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "counter" = callPackage @@ -64910,8 +64063,6 @@ self: { testHaskellDepends = [ aeson base HTF HUnit ]; description = "ISO 3166 country codes and i18n names"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "courier" = callPackage @@ -65055,8 +64206,6 @@ self: { testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ]; description = "Build tool for C"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cplex-hs" = callPackage @@ -65158,7 +64307,6 @@ self: { description = "Run random effect using cprng-aes, a crypto pseudo number generator"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cps-except" = callPackage @@ -65317,7 +64465,6 @@ self: { description = "Tinylog integration for cql-io"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cqrs" = callPackage @@ -65370,7 +64517,6 @@ self: { description = "Example for cqrs package"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cqrs-memory" = callPackage @@ -65388,7 +64534,6 @@ self: { description = "Memory backend for the cqrs package"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cqrs-postgresql" = callPackage @@ -65413,7 +64558,6 @@ self: { description = "PostgreSQL backend for the cqrs package"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cqrs-sqlite3" = callPackage @@ -65435,7 +64579,6 @@ self: { description = "SQLite3 backend for the cqrs package"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cqrs-test" = callPackage @@ -65453,7 +64596,6 @@ self: { description = "Command-Query Responsibility Segregation Test Support"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cqrs-testkit" = callPackage @@ -65472,7 +64614,6 @@ self: { description = "Command-Query Responsibility Segregation Test Support"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cqrs-types" = callPackage @@ -65583,7 +64724,6 @@ self: { description = "A UNIX configuration management library in Haskell"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "craftwerk" = callPackage @@ -65611,7 +64751,6 @@ self: { description = "Cairo backend for Craftwerk"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "craftwerk-gtk" = callPackage @@ -65630,7 +64769,6 @@ self: { description = "Gtk UI for Craftwerk"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "crawlchain" = callPackage @@ -65686,7 +64824,6 @@ self: { description = "HTTP Racing Library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "crc" = callPackage @@ -65763,8 +64900,6 @@ self: { ]; description = "Conflict-free replicated data types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "crdt-event-fold" = callPackage @@ -65897,7 +65032,6 @@ self: { description = "First-order, linear-chain conditional random fields"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "crf-chain1-constrained" = callPackage @@ -65918,7 +65052,6 @@ self: { description = "First-order, constrained, linear-chain conditional random fields"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "crf-chain2-generic" = callPackage @@ -65937,7 +65070,6 @@ self: { description = "Second-order, generic, constrained, linear conditional random fields"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "crf-chain2-tiers" = callPackage @@ -65957,7 +65089,6 @@ self: { description = "Second-order, tiered, constrained, linear conditional random fields"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "critbit" = callPackage @@ -66045,8 +65176,6 @@ self: { ]; description = "A simple tool for comparing in Criterion benchmark results"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "criterion-compare" = callPackage @@ -66151,7 +65280,6 @@ self: { description = "CRIU RPC client"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "criu-rpc-types" = callPackage @@ -66196,7 +65324,6 @@ self: { description = "An implementation of Douglas Crockford's base32 encoding"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "crocodile" = callPackage @@ -66261,7 +65388,6 @@ self: { description = "Cron datatypes and Attoparsec parser"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cronus" = callPackage @@ -66334,8 +65460,6 @@ self: { ]; description = "Pure Haskell implelementation for GNU SHA512 crypt algorithm"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "crypto-api" = callPackage @@ -66465,7 +65589,6 @@ self: { description = "Conduit interface for cryptographic operations (from crypto-api)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "crypto-enigma" = callPackage @@ -66749,7 +65872,6 @@ self: { description = "Symmetrical block and stream ciphers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cryptocompare" = callPackage @@ -66953,7 +66075,6 @@ self: { description = "Reversable and secure encoding of object ids as a bytestring"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cryptoids-class" = callPackage @@ -66968,7 +66089,6 @@ self: { description = "Typeclass-based interface to cryptoids"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cryptoids-types" = callPackage @@ -67026,7 +66146,6 @@ self: { description = "Cryptol: The Language of Cryptography"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cryptonite" = callPackage @@ -67038,6 +66157,8 @@ self: { pname = "cryptonite"; version = "0.28"; sha256 = "1nx568qv25dxhbii7lzf1hbv0dyz95z715mmxjnnrkgpwdm8ibbl"; + revision = "1"; + editedCabalFile = "0hqbpdsj1b4fgisr11a9gmin5r7bqr3f83wc2xxc18dr01xhrw7d"; libraryHaskellDepends = [ base basement bytestring deepseq ghc-prim integer-gmp memory ]; @@ -67051,6 +66172,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "cryptonite_0_29" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, gauge + , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit + , tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite"; + version = "0.29"; + sha256 = "13xhp3hshb8x06bw37kp16c9jpjmgfn06nkj9drz745fv8f04fnq"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim integer-gmp memory + ]; + testHaskellDepends = [ + base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge memory random + ]; + description = "Cryptography Primitives sink"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cryptonite-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, cryptonite, exceptions, memory, resourcet, tasty @@ -67148,7 +66292,6 @@ self: { description = "Control Crystalfontz LCD displays"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "csa" = callPackage @@ -67210,7 +66353,6 @@ self: { description = "Analytical CSG (Constructive Solid Geometry) library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "csound-catalog" = callPackage @@ -67350,7 +66492,6 @@ self: { description = "A command line type checker for CSPM files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cspretty" = callPackage @@ -67385,8 +66526,8 @@ self: { }: mkDerivation { pname = "css-easings"; - version = "0.2.0.0"; - sha256 = "0i969cp4j154ddq7x2821p53qh8dnsr7f74rsdi4y9rbbls1fnpv"; + version = "0.2.1.0"; + sha256 = "0mn3h7fqp4bs7rqjzc05k29man8i77dg1avcajdyysf84azklyrw"; libraryHaskellDepends = [ aeson base blaze-markup data-default QuickCheck scientific shakespeare text @@ -67399,22 +66540,22 @@ self: { "css-selectors" = callPackage ({ mkDerivation, aeson, alex, array, base, binary, blaze-markup - , bytestring, data-default, Decimal, happy, QuickCheck, shakespeare - , template-haskell, test-framework, test-framework-quickcheck2 - , text, zlib + , bytestring, data-default, Decimal, happy, hashable, QuickCheck + , shakespeare, template-haskell, test-framework + , test-framework-quickcheck2, text, zlib }: mkDerivation { pname = "css-selectors"; - version = "0.3.0.0"; - sha256 = "1p7zzp40gvl5nq2zrb19cjw47w3sf20qwi3mplxq67ryzljmbaz4"; + version = "0.4.0.2"; + sha256 = "1299xqp1ssxarz2i9wgzcyj4zmjry6cq02jb2a9n0vw61gw6z5g4"; libraryHaskellDepends = [ aeson array base binary blaze-markup bytestring data-default - Decimal QuickCheck shakespeare template-haskell text zlib + Decimal hashable QuickCheck shakespeare template-haskell text zlib ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ - base binary QuickCheck test-framework test-framework-quickcheck2 - text + base binary hashable QuickCheck test-framework + test-framework-quickcheck2 text ]; description = "Parsing, rendering and manipulating css selectors in Haskell"; license = lib.licenses.bsd3; @@ -67508,7 +66649,6 @@ self: { description = "A flexible, fast, enumerator-based CSV parser library for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "csv-nptools" = callPackage @@ -67604,7 +66744,6 @@ self: { description = "A programming language for text modification"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ctrie" = callPackage @@ -67646,7 +66785,6 @@ self: { description = "Cubic DSL for 3D printing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cubical" = callPackage @@ -68000,8 +67138,6 @@ self: { testHaskellDepends = [ aeson base bson hspec QuickCheck ]; description = "ISO-4217 Currency Codes"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "currency-convert" = callPackage @@ -68172,7 +67308,6 @@ self: { description = "Terminal tool for viewing tabular data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cursor" = callPackage @@ -68240,8 +67375,6 @@ self: { base criterion cursor-fuzzy-time genvalidity-criterion QuickCheck ]; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cursor-gen" = callPackage @@ -68387,6 +67520,9 @@ self: { testToolDepends = [ c2hs ]; description = "Cuts out uninteresting parts of videos by detecting silences"; license = lib.licenses.mit; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) pocketsphinx; inherit (pkgs) sphinxbase;}; "cutter" = callPackage @@ -68424,7 +67560,6 @@ self: { description = "Functional Combinators for Computer Vision"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cve" = callPackage @@ -68474,7 +67609,6 @@ self: { description = "Haskell bindings for the neo4j \"cypher\" query language"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "czipwith" = callPackage @@ -68718,7 +67852,6 @@ self: { description = "Prints a series of dates"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "darcs" = callPackage @@ -68791,7 +67924,6 @@ self: { description = "Comparative benchmark suite for darcs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "darcs-beta" = callPackage @@ -68824,7 +67956,6 @@ self: { description = "a distributed, interactive, smart revision control system"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) curl;}; "darcs-buildpackage" = callPackage @@ -68889,7 +68020,6 @@ self: { description = "Import/export git fast-import streams to/from darcs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "darcs-graph" = callPackage @@ -68989,7 +68119,6 @@ self: { description = "Darcs repository UI and hosting/collaboration app (hub.darcs.net branch)."; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "darcswatch" = callPackage @@ -69013,7 +68142,6 @@ self: { description = "Track application of Darcs patches"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "darkplaces-demo" = callPackage @@ -69042,7 +68170,6 @@ self: { description = "Utility and parser for DarkPlaces demo files"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "darkplaces-rcon" = callPackage @@ -69091,7 +68218,6 @@ self: { description = "Darplaces rcon utility"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "darkplaces-text" = callPackage @@ -69132,7 +68258,6 @@ self: { description = "Convert package Haddock to Dash docsets (IDE docs)"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-accessor" = callPackage @@ -69170,7 +68295,6 @@ self: { description = "Use Accessor to access state in monads-fd State monad class"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-accessor-monads-tf" = callPackage @@ -69301,7 +68425,6 @@ self: { description = "A database library with a focus on ease of use, type safety and useful error messages"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-binary-ieee754" = callPackage @@ -69477,7 +68600,6 @@ self: { description = "a cyclic doubly linked list"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-default" = callPackage @@ -69783,7 +68905,6 @@ self: { description = "Executable and Linkable Format (ELF) data structures"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-embed" = callPackage @@ -70102,8 +69223,6 @@ self: { ]; description = "Interval datatype, interval arithmetic and interval-based containers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-inttrie" = callPackage @@ -70172,7 +69291,6 @@ self: { description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead."; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-layout" = callPackage @@ -70215,7 +69333,6 @@ self: { description = "Lenses"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-lens-ixset" = callPackage @@ -70229,7 +69346,6 @@ self: { description = "A Lens for IxSet"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-lens-light" = callPackage @@ -70253,7 +69369,6 @@ self: { description = "Utilities for Data.Lens"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-list-sequences" = callPackage @@ -70397,7 +69512,6 @@ self: { description = "Serialize JSON data to/from Haskell using the data-object library. (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-object-yaml" = callPackage @@ -70417,7 +69531,6 @@ self: { description = "Serialize data to and from Yaml files (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-or" = callPackage @@ -70567,7 +69680,6 @@ self: { description = "Data types for returning results distinguishable by types"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-rev" = callPackage @@ -70606,7 +69718,6 @@ self: { description = "Recursive tuple data structure. It is very usefull when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes."; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-serializer" = callPackage @@ -70762,7 +69873,6 @@ self: { description = "Program that infers the fastest data structure available for your program"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-sword" = callPackage @@ -70946,8 +70056,6 @@ self: { libraryHaskellDepends = [ aeson base ]; description = "Class for types with a database id"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "database-id-groundhog" = callPackage @@ -71060,7 +70168,6 @@ self: { description = "Datadog tracing client and mock agent"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dataenc" = callPackage @@ -71132,7 +70239,6 @@ self: { description = "Generate Graphviz documents from a Haskell representation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dataflower" = callPackage @@ -71249,8 +70355,6 @@ self: { ]; description = "Classical data sets for statistics and machine learning"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dataurl" = callPackage @@ -71269,8 +70373,6 @@ self: { ]; description = "Handle data-urls"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "date-cache" = callPackage @@ -71295,7 +70397,6 @@ self: { description = "Date conversions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dates" = callPackage @@ -71457,7 +70558,6 @@ self: { description = "Decompiler Bytecode Java"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dbm" = callPackage @@ -71634,7 +70734,6 @@ self: { description = "Monadic and object-oriented interfaces to DBus"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dbus-core" = callPackage @@ -71793,7 +70892,6 @@ self: { description = "Discordian Date Types for Haskell"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ddc-base" = callPackage @@ -71831,7 +70929,6 @@ self: { description = "Disciplined Disciple Compiler build framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ddc-code" = callPackage @@ -71863,7 +70960,6 @@ self: { description = "Disciplined Disciple Compiler core language and type checker"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ddc-core-babel" = callPackage @@ -71878,7 +70974,6 @@ self: { description = "Disciplined Disciple Compiler PHP code generator"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ddc-core-eval" = callPackage @@ -71895,7 +70990,6 @@ self: { description = "Disciplined Disciple Compiler semantic evaluator for the core language"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ddc-core-flow" = callPackage @@ -71914,7 +71008,6 @@ self: { description = "Disciplined Disciple Compiler data flow compiler"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ddc-core-llvm" = callPackage @@ -71932,7 +71025,6 @@ self: { description = "Disciplined Disciple Compiler LLVM code generator"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ddc-core-salt" = callPackage @@ -71949,7 +71041,6 @@ self: { description = "Disciplined Disciple Compiler C code generator"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ddc-core-simpl" = callPackage @@ -71966,7 +71057,6 @@ self: { description = "Disciplined Disciple Compiler code transformations"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ddc-core-tetra" = callPackage @@ -71984,7 +71074,6 @@ self: { description = "Disciplined Disciple Compiler intermediate language"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ddc-driver" = callPackage @@ -72005,7 +71094,6 @@ self: { description = "Disciplined Disciple Compiler top-level driver"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ddc-interface" = callPackage @@ -72018,7 +71106,6 @@ self: { description = "Disciplined Disciple Compiler user interface support"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ddc-source-tetra" = callPackage @@ -72036,7 +71123,6 @@ self: { description = "Disciplined Disciple Compiler source language"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ddc-tools" = callPackage @@ -72060,7 +71146,6 @@ self: { description = "Disciplined Disciple Compiler command line tools"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ddc-war" = callPackage @@ -72079,7 +71164,6 @@ self: { description = "Disciplined Disciple Compiler test driver and buildbot"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ddci-core" = callPackage @@ -72099,7 +71183,6 @@ self: { description = "Disciple Core language interactive interpreter"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dde" = callPackage @@ -72260,7 +71343,6 @@ self: { description = "Simple trace-based debugger"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "debug-diff" = callPackage @@ -72355,7 +71437,6 @@ self: { description = "You do not have to write variable names twice in Debug.Trace"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "debug-tracy" = callPackage @@ -72424,7 +71505,6 @@ self: { description = "Combinators for manipulating dependently-typed predicates"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "decimal-arithmetic" = callPackage @@ -72440,7 +71520,6 @@ self: { description = "An implementation of the General Decimal Arithmetic Specification"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "decimal-literals" = callPackage @@ -72528,7 +71607,6 @@ self: { description = "A type-checker for the λΠ-modulo calculus"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "deep-transformations" = callPackage @@ -72618,7 +71696,6 @@ self: { description = "Deep Learning in Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "deepseq_1_4_5_0" = callPackage @@ -72729,7 +71806,6 @@ self: { description = "A DeepZoom image slicer. Only known to work on 32bit Linux"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "defargs" = callPackage @@ -72742,7 +71818,6 @@ self: { description = "default arguments in haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "deferred-folds" = callPackage @@ -72949,7 +72024,6 @@ self: { description = "Tests for deka, decimal floating point arithmetic"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "delaunay" = callPackage @@ -72967,7 +72041,6 @@ self: { description = "Build a Delaunay triangulation of a set of points"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "delay" = callPackage @@ -72999,7 +72072,6 @@ self: { description = "Accessing the del.icio.us APIs from Haskell (v2)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "delimited-text" = callPackage @@ -73016,7 +72088,6 @@ self: { description = "Parse character delimited textual data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "delimiter-separated" = callPackage @@ -73030,7 +72101,6 @@ self: { description = "Library for dealing with tab and/or comma (or other) separated files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "delta" = callPackage @@ -73055,7 +72125,6 @@ self: { description = "A library for detecting file changes"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "delta-h" = callPackage @@ -73078,7 +72147,6 @@ self: { description = "Online entropy-based model of lexical category acquisition"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "delude" = callPackage @@ -73146,8 +72214,6 @@ self: { ]; description = "Mutable and immutable dense multidimensional arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dense-int-set" = callPackage @@ -73231,7 +72297,6 @@ self: { description = "Giving good advice to functions in a DepT environment"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dependency" = callPackage @@ -73330,7 +72395,6 @@ self: { description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types."; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dependent-sum_0_4" = callPackage @@ -73430,7 +72494,6 @@ self: { description = "Analyze quality of nucleotide sequences"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "depq" = callPackage @@ -73479,7 +72542,6 @@ self: { description = "DepTrack applied to DevOps"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "deptrack-dot" = callPackage @@ -73493,7 +72555,6 @@ self: { description = "Facilitate Graphviz representations of DepTrack dependencies"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "deque" = callPackage @@ -73527,7 +72588,6 @@ self: { description = "A typeclass and an implementation for double-ended queues"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "derangement" = callPackage @@ -73590,7 +72650,6 @@ self: { description = "Macro to derive instances for Instant-Generics using Template Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "derive-enumerable" = callPackage @@ -73997,7 +73056,6 @@ self: { description = "JSON and CSV encoding for quantities"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "detrospector" = callPackage @@ -74073,7 +73131,6 @@ self: { description = "Haskell development tool agregate"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dewdrop" = callPackage @@ -74088,7 +73145,6 @@ self: { description = "Find gadgets for return-oriented programming on x86"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "df1" = callPackage @@ -74164,7 +73220,6 @@ self: { description = "A generic data integrity layer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) leveldb;}; "dfrac" = callPackage @@ -74276,6 +73331,7 @@ self: { description = "A configuration language guaranteed to terminate"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "dhall" = callPackage @@ -74299,6 +73355,8 @@ self: { pname = "dhall"; version = "1.38.1"; sha256 = "0g70x2crdrkwf41gvwr718am25dmbn9bg4cml9f9va7i1vx5rsgk"; + revision = "1"; + editedCabalFile = "1830jbh5q7g7r4i5n1vhs1h8fj8zzig3l6qr9kbkk00dhhgywv8b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -74330,6 +73388,7 @@ self: { doCheck = false; description = "A configuration language guaranteed to terminate"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "dhall-bash" = callPackage @@ -74353,6 +73412,7 @@ self: { ]; description = "Compile Dhall to Bash"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "dhall-check" = callPackage @@ -74385,6 +73445,8 @@ self: { pname = "dhall-docs"; version = "1.0.5"; sha256 = "00s1vhwilnr6hvv56w98kc1md08lw6v80v8a7yhwrmg9qggwdc12"; + revision = "1"; + editedCabalFile = "0y8a02jxz5cap0q4b2106ck4av7haxqlv5vjhm0nmrsq10cl4nss"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -74401,7 +73463,7 @@ self: { description = "Generate HTML docs from a dhall package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "dhall-fly" = callPackage @@ -74465,6 +73527,7 @@ self: { ]; description = "Convert between Dhall and JSON or YAML"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "dhall-lex" = callPackage @@ -74513,6 +73576,7 @@ self: { ]; description = "Language Server Protocol (LSP) server for Dhall"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "dhall-nix" = callPackage @@ -74536,8 +73600,7 @@ self: { ]; description = "Dhall to Nix compiler"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "dhall-nixpkgs" = callPackage @@ -74559,8 +73622,7 @@ self: { ]; description = "Convert Dhall projects to Nix packages"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "dhall-openapi" = callPackage @@ -74585,6 +73647,7 @@ self: { ]; description = "Convert an OpenAPI specification to a Dhall package"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "dhall-recursive-adt" = callPackage @@ -74605,8 +73668,6 @@ self: { ]; description = "Convert recursive ADTs from and to Dhall"; license = lib.licenses.cc0; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dhall-text" = callPackage @@ -74625,6 +73686,7 @@ self: { description = "Template text using Dhall"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; broken = true; }) {}; @@ -74684,6 +73746,7 @@ self: { ]; description = "Convert between Dhall and YAML"; license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "dhcp-lease-parser" = callPackage @@ -74703,7 +73766,6 @@ self: { description = "Parse a DHCP lease file"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dhrun" = callPackage @@ -74866,7 +73928,6 @@ self: { description = "An EDSL for teaching Haskell with diagrams - functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams" = callPackage @@ -74924,7 +73985,6 @@ self: { description = "Braille diagrams with plain text"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-builder" = callPackage @@ -74954,7 +74014,6 @@ self: { description = "hint-based build service for the diagrams graphics EDSL"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-cairo" = callPackage @@ -74977,8 +74036,6 @@ self: { ]; description = "Cairo backend for diagrams drawing EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-canvas" = callPackage @@ -75111,7 +74168,6 @@ self: { description = "Preprocessor for embedding diagrams in Haddock documentation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-hsqml" = callPackage @@ -75148,7 +74204,6 @@ self: { description = "HTML5 canvas backend for diagrams drawing EDSL"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-lib" = callPackage @@ -75208,7 +74263,6 @@ self: { description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-pdf" = callPackage @@ -75248,7 +74302,6 @@ self: { description = "PGF backend for diagrams drawing EDSL"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-postscript" = callPackage @@ -75342,8 +74395,6 @@ self: { ]; description = "Library for drawing the Rubik's Cube"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-solve" = callPackage @@ -75414,7 +74465,6 @@ self: { description = "Backend for rendering diagrams in wxWidgets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dialog" = callPackage @@ -75745,7 +74795,6 @@ self: { ]; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "differential" = callPackage @@ -75851,6 +74900,7 @@ self: { description = "Pure hash functions for bytestrings"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "digest-sig" = callPackage @@ -76006,7 +75056,6 @@ self: { description = "HSP support for digestive-functors"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "digestive-functors-lucid" = callPackage @@ -76162,10 +75211,8 @@ self: { }: mkDerivation { pname = "dimensional"; - version = "1.3"; - sha256 = "0i4k7m134w3pczj8qllc59djdhisj92z78qrzap9v0f4rx8jb8r9"; - revision = "2"; - editedCabalFile = "10xkgwjb9kqa95jck3b9wa3sz6vcb2lkygfmcqqz6hz6j65l79r8"; + version = "1.4"; + sha256 = "19w6plp97ylwqgwzhfy54cvjvh0dd1gj843y59cmryckh80jap8s"; libraryHaskellDepends = [ base deepseq exact-pi ieee754 numtype-dk semigroups vector ]; @@ -76174,7 +75221,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion deepseq ]; - description = "Statically checked physical dimensions, using Type Families and Data Kinds"; + description = "Statically checked physical dimensions"; license = lib.licenses.bsd3; }) {}; @@ -76182,13 +75229,11 @@ self: { ({ mkDerivation, base, dimensional, numtype-dk }: mkDerivation { pname = "dimensional-codata"; - version = "2014.0.0.2"; - sha256 = "1bmal7i0zvfivri5w7fbl4n0gyybnr2wy2cvz21b33jrzjblr1g0"; + version = "2014.0.0.3"; + sha256 = "1303i7f8c9nsr5x128qaqisny4r3fnfq7zarl4g9q0zckxgqhpgj"; libraryHaskellDepends = [ base dimensional numtype-dk ]; description = "CODATA Recommended Physical Constants with Dimensional Types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dimensional-tf" = callPackage @@ -76241,7 +75286,6 @@ self: { description = "Dingo is a Rich Internet Application platform based on the Warp web server"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dingo-example" = callPackage @@ -76262,7 +75306,6 @@ self: { description = "Dingo Example"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dingo-widgets" = callPackage @@ -76282,7 +75325,6 @@ self: { description = "Dingo Widgets"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dino" = callPackage @@ -76360,7 +75402,6 @@ self: { description = "Diplomacy board game"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diplomacy-server" = callPackage @@ -76385,7 +75426,6 @@ self: { description = "Play Diplomacy over HTTP"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dir-traverse" = callPackage @@ -76659,7 +75699,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dirichlet" = callPackage @@ -76693,6 +75732,7 @@ self: { ]; description = "Easily stream directory contents in constant memory"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "dirtree" = callPackage @@ -76750,7 +75790,6 @@ self: { description = "Client for Discogs REST API"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "discokitty" = callPackage @@ -76780,7 +75819,6 @@ self: { description = "An API wrapper for Discord in Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "discord-haskell" = callPackage @@ -76821,7 +75859,6 @@ self: { description = "An API wrapper for Discord in Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "discord-register" = callPackage @@ -76854,7 +75891,6 @@ self: { description = "Discord verification bot"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "discord-rest" = callPackage @@ -76875,7 +75911,6 @@ self: { description = "An API wrapper for Discord in Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "discord-types" = callPackage @@ -77280,7 +76315,6 @@ self: { description = "Cloud Haskell Async API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-process-azure" = callPackage @@ -77304,7 +76338,6 @@ self: { description = "Microsoft Azure backend for Cloud Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-process-client-server" = callPackage @@ -77335,7 +76368,6 @@ self: { description = "The Cloud Haskell Application Platform"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-process-ekg" = callPackage @@ -77352,7 +76384,6 @@ self: { description = "Collect node stats for EKG"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-process-execution" = callPackage @@ -77389,7 +76420,6 @@ self: { description = "Execution Framework for The Cloud Haskell Application Platform"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-process-extras" = callPackage @@ -77421,7 +76451,6 @@ self: { description = "Cloud Haskell Extras"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-process-fsm" = callPackage @@ -77455,7 +76484,6 @@ self: { description = "The Cloud Haskell implementation of Erlang/OTP gen_statem"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-process-lifted" = callPackage @@ -77482,7 +76510,6 @@ self: { description = "monad-control style typeclass and transformer instances for Process monad"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-process-monad-control" = callPackage @@ -77500,7 +76527,6 @@ self: { description = "Orphan instances for MonadBase and MonadBaseControl"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-process-p2p" = callPackage @@ -77522,7 +76548,6 @@ self: { description = "Peer-to-peer node discovery for Cloud Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-process-platform" = callPackage @@ -77554,7 +76579,6 @@ self: { description = "The Cloud Haskell Application Platform"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-process-registry" = callPackage @@ -77588,7 +76612,6 @@ self: { description = "Cloud Haskell Extended Process Registry"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-process-simplelocalnet" = callPackage @@ -77612,7 +76635,6 @@ self: { description = "Simple zero-configuration backend for Cloud Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-process-supervisor" = callPackage @@ -77645,7 +76667,6 @@ self: { description = "Supervisors for The Cloud Haskell Application Platform"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-process-systest" = callPackage @@ -77666,7 +76687,6 @@ self: { description = "Cloud Haskell Test Support"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-process-task" = callPackage @@ -77704,7 +76724,6 @@ self: { description = "Task Framework for The Cloud Haskell Application Platform"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-process-tests" = callPackage @@ -77729,7 +76748,6 @@ self: { description = "Tests and test support tools for distributed-process"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-process-zookeeper" = callPackage @@ -77759,7 +76777,6 @@ self: { description = "A Zookeeper back-end for Cloud Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributed-static" = callPackage @@ -77846,7 +76863,6 @@ self: { description = "Easily plot distributions from the distribution package.."; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "distributive" = callPackage @@ -77908,8 +76924,6 @@ self: { ]; description = "Quantify the diversity of a population"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dixi" = callPackage @@ -77948,7 +76962,6 @@ self: { description = "A wiki implemented with a firm theoretical foundation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "djembe" = callPackage @@ -78047,7 +77060,6 @@ self: { description = "Fedora image download tool"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dlist" = callPackage @@ -78185,7 +77197,6 @@ self: { description = "dmenu script for killing applications. Sortable by process id or CPU/MEM usage."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dmenu-pmount" = callPackage @@ -78204,7 +77215,6 @@ self: { description = "Mounting and unmounting linux devices as user with dmenu and pmount"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dmenu-search" = callPackage @@ -78223,7 +77233,6 @@ self: { description = "dmenu script for searching the web with customizable search engines"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dns" = callPackage @@ -78339,6 +77348,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "do-spaces" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring + , case-insensitive, conduit, conduit-extra, config-ini, containers + , cryptonite, exceptions, extra, filepath, generic-lens, hspec + , http-client-tls, http-conduit, http-types, memory, microlens + , mime-types, mtl, resourcet, text, time, transformers, xml-conduit + }: + mkDerivation { + pname = "do-spaces"; + version = "0.1.0"; + sha256 = "1xj0n2pmmwkm4ss5gvsbvw8m545w4890a3hhk1ns1vbbm06zmvsi"; + libraryHaskellDepends = [ + base base16-bytestring bytestring case-insensitive conduit + conduit-extra config-ini containers cryptonite exceptions extra + filepath generic-lens http-client-tls http-conduit http-types + memory microlens mime-types mtl text time transformers xml-conduit + ]; + testHaskellDepends = [ + base bytestring case-insensitive conduit conduit-extra containers + generic-lens hspec http-client-tls http-conduit http-types + microlens mtl resourcet text time + ]; + description = "DigitalOcean Spaces API bindings"; + license = lib.licenses.bsd3; + }) {}; + "dobutok" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -78513,7 +77548,6 @@ self: { description = "Document review Web application, like http://book.realworldhaskell.org/"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "doccheck" = callPackage @@ -78980,8 +78014,6 @@ self: { ]; description = "Low-level bindings to the DocuSign API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "docusign-base-minimal" = callPackage @@ -78998,8 +78030,6 @@ self: { ]; description = "Low-level bindings to the DocuSign API (only what is necessary for docusign-client)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "docusign-client" = callPackage @@ -79019,8 +78049,6 @@ self: { ]; description = "Client bindings for the DocuSign API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "docusign-example" = callPackage @@ -79098,7 +78126,6 @@ self: { description = "Automatic Bibtex and fulltext of scientific articles"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "doldol" = callPackage @@ -79222,7 +78249,6 @@ self: { description = "Codegen helping you define domain models"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "domain-auth" = callPackage @@ -79258,7 +78284,6 @@ self: { description = "Low-level API of \"domain\""; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "domain-optics" = callPackage @@ -79278,7 +78303,6 @@ self: { description = "Integration of domain with optics"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dominion" = callPackage @@ -79629,7 +78653,6 @@ self: { description = "Dungeons of Wor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "download" = callPackage @@ -79673,7 +78696,6 @@ self: { description = "Simple tool to download images from RSS feeds (e.g. Flickr, Picasa)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "downloader" = callPackage @@ -79760,7 +78782,6 @@ self: { description = "Data Parallel Haskell example programs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dph-lifted-base" = callPackage @@ -79778,7 +78799,6 @@ self: { description = "Data Parallel Haskell common definitions used by other dph-lifted packages"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dph-lifted-copy" = callPackage @@ -79795,7 +78815,6 @@ self: { description = "Data Parallel Haskell lifted array combinators. (deprecated version)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dph-lifted-vseg" = callPackage @@ -79813,7 +78832,6 @@ self: { description = "Data Parallel Haskell lifted array combinators"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dph-par" = callPackage @@ -79837,7 +78855,6 @@ self: { description = "Data Parallel Haskell segmented arrays. (abstract interface)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dph-prim-par" = callPackage @@ -79855,7 +78872,6 @@ self: { description = "Data Parallel Haskell segmented arrays. (production version)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dph-prim-seq" = callPackage @@ -79872,7 +78888,6 @@ self: { description = "Data Parallel Haskell segmented arrays. (sequential implementation)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dph-seq" = callPackage @@ -80068,8 +79083,6 @@ self: { ]; description = "Simple schema management for arbitrary databases"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "drifter-postgresql" = callPackage @@ -80111,8 +79124,6 @@ self: { ]; description = "SQLite support for the drifter schema migraiton tool"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "drinkery" = callPackage @@ -80187,8 +79198,6 @@ self: { ]; description = "Dropbox API client"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dropbox-sdk" = callPackage @@ -80211,7 +79220,6 @@ self: { description = "A library to access the Dropbox HTTP API"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dropsolve" = callPackage @@ -80231,7 +79239,6 @@ self: { description = "A command line tool for resolving dropbox conflicts. Deprecated! Please use confsolve."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "drunken-bishop" = callPackage @@ -80312,7 +79319,6 @@ self: { description = "SQL backend for Database Supported Haskell (DSH)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dsmc" = callPackage @@ -80352,7 +79358,6 @@ self: { description = "DSMC toolkit for rarefied gas dynamics"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dson" = callPackage @@ -80468,7 +79473,6 @@ self: { description = "Parse and render DTD files (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dtd-text" = callPackage @@ -80569,8 +79573,8 @@ self: { }: mkDerivation { pname = "dual-tree"; - version = "0.2.2.1"; - sha256 = "17kdfnf0df0z5pkiifxrlmyd1xd7hjjaazd2kzyajl0gd00vbszx"; + version = "0.2.3.0"; + sha256 = "0qyn7kb42wvlcvb1wbf1qx3isc2y6k3hzp5iq6ab0r0llw9g6qlg"; libraryHaskellDepends = [ base monoid-extras newtype-generics semigroups ]; @@ -80701,7 +79705,6 @@ self: { description = "A computer “algebra” system that knows nothing about algebra, at the core"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dump" = callPackage @@ -80921,7 +79924,6 @@ self: { description = "Efficient automatic differentiation and code generation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dvdread" = callPackage @@ -81133,7 +80135,6 @@ self: { description = "Access the functions from the Cabal library without depending on it"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dynamic-graph" = callPackage @@ -81266,7 +80267,6 @@ self: { description = "Interactive diagram windows"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dynamic-pp" = callPackage @@ -81379,7 +80379,6 @@ self: { description = "your dynamic optimization buddy"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dyre" = callPackage @@ -81706,8 +80705,6 @@ self: { ]; description = "Pure, type-indexed haskell vector, matrix, and tensor library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "easytensor-vulkan" = callPackage @@ -81719,8 +80716,6 @@ self: { libraryHaskellDepends = [ base dimensions easytensor vulkan-api ]; description = "Use easytensor with vulkan-api"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "easytest" = callPackage @@ -81813,8 +80808,6 @@ self: { ]; description = "A handy tool for uploading unikernels to Amazon's EC2"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "eccrypto" = callPackage @@ -81847,7 +80840,6 @@ self: { description = "provides \"ed25519\" API using \"eccrypto\""; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ecdsa" = callPackage @@ -82039,7 +81031,6 @@ self: { description = "Semi-explicit parallel programming skeleton library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "edentv" = callPackage @@ -82061,7 +81052,6 @@ self: { description = "A Tool to Visualize Parallel Functional Program Executions"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "edf" = callPackage @@ -82092,7 +81082,6 @@ self: { description = "Top view space combat arcade game"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "edges" = callPackage @@ -82121,7 +81110,6 @@ self: { description = "Tools for efficient immutable graphs"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "edis" = callPackage @@ -82255,7 +81243,6 @@ self: { description = "Interactive editors for Generics"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "editline" = callPackage @@ -82487,7 +81474,6 @@ self: { description = "Programming language with non-linear pattern-matching against non-free data"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "egison-pattern-src" = callPackage @@ -82531,7 +81517,6 @@ self: { description = "Parser and pretty printer for Egison pattern expressions in Haskell source code"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "egison-pattern-src-th-mode" = callPackage @@ -82555,7 +81540,6 @@ self: { description = "Parser and pretty printer for Egison pattern expressions to use with TH"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "egison-quote" = callPackage @@ -82570,7 +81554,6 @@ self: { description = "A quasi quotes for using Egison expression in Haskell code"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "egison-tutorial" = callPackage @@ -82590,7 +81573,6 @@ self: { description = "A tutorial program for the Egison programming language"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "egyptian-fractions" = callPackage @@ -82746,8 +81728,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Functions involving lists of Either"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "either-result" = callPackage @@ -82885,8 +81865,6 @@ self: { ]; description = "An ekg backend for Amazon Cloudwatch"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ekg-core" = callPackage @@ -83152,7 +82130,6 @@ self: { description = "Example applications for Elerea"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "elerea-sdl" = callPackage @@ -83271,7 +82248,6 @@ self: { description = "Elliptic curve library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "elm-bridge" = callPackage @@ -83763,7 +82739,6 @@ self: { description = "A tiny language for understanding the lambda-calculus"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "elynx" = callPackage @@ -83781,8 +82756,6 @@ self: { ]; description = "Validate and (optionally) redo ELynx analyses"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "elynx-markov" = callPackage @@ -83883,8 +82856,6 @@ self: { ]; description = "Handle phylogenetic trees"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ema" = callPackage @@ -83934,7 +82905,6 @@ self: { description = "library to parse emacs style keybinding into the modifiers and the chars"; license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "emacs-module" = callPackage @@ -83973,7 +82943,6 @@ self: { description = "Sending eMail in Haskell made easy"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "email-header" = callPackage @@ -84111,7 +83080,6 @@ self: { description = "An email parser that will parse everything"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "embeddock" = callPackage @@ -84129,7 +83097,6 @@ self: { description = "Embed the values in scope in the haddock documentation of the module"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "embeddock-example" = callPackage @@ -84142,7 +83109,6 @@ self: { description = "Example of using embeddock"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "embla" = callPackage @@ -84175,7 +83141,6 @@ self: { description = "support for embroidery formats in haskell"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "emd" = callPackage @@ -84445,8 +83410,6 @@ self: { ]; description = "A Haskell implementation of Engine.IO"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "engine-io-growler" = callPackage @@ -84466,7 +83429,6 @@ self: { ]; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "engine-io-snap" = callPackage @@ -84551,7 +83513,6 @@ self: { description = "An application (and library) to convert quipper circuits into Qpmc models"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "entropy" = callPackage @@ -84629,8 +83590,6 @@ self: { ]; description = "A text rendering and parsing toolkit for enumerated types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "enum-text-rio" = callPackage @@ -84647,8 +83606,6 @@ self: { ]; description = "Making fmt available with rio"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "enum-types" = callPackage @@ -84709,7 +83666,6 @@ self: { description = "enumerate all the values in a finite type (automatically)"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "enumerate-function" = callPackage @@ -84731,7 +83687,6 @@ self: { description = "simple package for inverting functions and testing totality, via brute enumeration of the domain"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "enumeration" = callPackage @@ -84778,7 +83733,6 @@ self: { description = "Enumerator instances for monads-fd classes"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "enumerator-tf" = callPackage @@ -84791,7 +83745,6 @@ self: { description = "Enumerator instances for monads-tf classes"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "enumfun" = callPackage @@ -84905,8 +83858,6 @@ self: { ]; description = "Safe helpers for accessing and modifying environment variables"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "env-locale" = callPackage @@ -85074,7 +84025,6 @@ self: { description = "See readme.md"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "epi-sim" = callPackage @@ -85093,8 +84043,6 @@ self: { ]; description = "A library for simulating epidemics as birth-death processes"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "epic" = callPackage @@ -85372,7 +84320,6 @@ self: { description = "Native Haskell implementation of the interface from the erf package"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "erlang" = callPackage @@ -85444,7 +84391,6 @@ self: { description = "DEPRECATED in favor of eros-http"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "eros-http" = callPackage @@ -85465,7 +84411,6 @@ self: { description = "JSON HTTP interface to Eros"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "errata" = callPackage @@ -85484,6 +84429,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Source code error pretty printing"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "errno" = callPackage @@ -85519,8 +84466,6 @@ self: { testHaskellDepends = [ base ]; description = "Error code functions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "error-context" = callPackage @@ -85611,7 +84556,6 @@ self: { description = "Composable error messages"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "error-or" = callPackage @@ -85674,6 +84618,7 @@ self: { ]; description = "Simplified error-handling"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "errors-ext" = callPackage @@ -85694,7 +84639,6 @@ self: { description = "`bracket`-like functions for `ExceptT` over `IO` monad"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ersaconcat" = callPackage @@ -85764,7 +84708,6 @@ self: { description = "toysat driver as backend for ersatz"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ert" = callPackage @@ -85880,7 +84823,6 @@ self: { description = "Esotericbot is a sophisticated, lightweight IRC bot"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "espial" = callPackage @@ -85961,6 +84903,8 @@ self: { pname = "esqueleto"; version = "3.4.1.1"; sha256 = "15355vc3ysqr4yd149xz7zm7iba7pb04p3yxgp1n6dxczwldjf43"; + revision = "1"; + editedCabalFile = "0rwj2cg7pkn4nwapyk9syb64f0qycq7kqwbpciwwq9xdviwcvqzk"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -85977,7 +84921,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "esqueleto_3_4_2_0" = callPackage + "esqueleto_3_4_2_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql , mysql-simple, persistent, persistent-mysql, persistent-postgresql @@ -85987,8 +84931,10 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.4.2.0"; - sha256 = "1gmh96a0vqvxizgs2k66p06jhjcgqrm5phbvahs7b2iavaralpr3"; + version = "3.4.2.1"; + sha256 = "0yh2fgk5rjphszn2prww190nsvw84j68js7wnd6p5iwynrw6ahxh"; + revision = "1"; + editedCabalFile = "0nsm17spkhsykizmpr29x8zq16ha6j0325r08ms675jn574ni2g1"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -86191,7 +85137,6 @@ self: { description = "Repeats from ESTs"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "etc" = callPackage @@ -86267,7 +85212,6 @@ self: { description = "Native event-sourcing database"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "eternity-timestamped" = callPackage @@ -86286,7 +85230,6 @@ self: { description = "Automatic timestamping for Eternity"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ether" = callPackage @@ -86316,7 +85259,6 @@ self: { description = "Monad transformers and classes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ethereum-analyzer" = callPackage @@ -86341,7 +85283,6 @@ self: { description = "A Ethereum contract analyzer"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ethereum-analyzer-cli" = callPackage @@ -86370,7 +85311,6 @@ self: { description = "A CLI frontend for ethereum-analyzer"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ethereum-analyzer-deps" = callPackage @@ -86417,7 +85357,6 @@ self: { description = "A web frontend for ethereum-analyzer"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ethereum-client-haskell" = callPackage @@ -86447,7 +85386,6 @@ self: { description = "A Haskell version of an Ethereum client"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ethereum-merkle-patricia-db" = callPackage @@ -86473,7 +85411,6 @@ self: { description = "A modified Merkle Patricia DB"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ethereum-rlp" = callPackage @@ -86655,7 +85592,6 @@ self: { description = "Bridge for working with evdev and streamly"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "eve" = callPackage @@ -86778,7 +85714,6 @@ self: { description = "Event-graph simulation monad transformer"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "event-transformer" = callPackage @@ -86883,7 +85818,6 @@ self: { description = "Postgres implementations for eventful"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "eventful-sql-common" = callPackage @@ -86927,7 +85861,6 @@ self: { description = "SQLite implementations for eventful"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "eventful-test-helpers" = callPackage @@ -87032,7 +85965,6 @@ self: { description = "GetEventStore store implementation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "eventsource-store-specs" = callPackage @@ -87188,7 +86120,6 @@ self: { description = "A functional pearl on encoding and decoding using question-and-answer strategies"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ewe" = callPackage @@ -87370,7 +86301,6 @@ self: { description = "Exception monad transformer instances for monads-fd classes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "exception-monads-tf" = callPackage @@ -87606,7 +86536,6 @@ self: { description = "Tool to search/generate (haskell) expressions with a given type"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "exh" = callPackage @@ -88052,7 +86981,6 @@ self: { description = "Extensible Pandoc"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "expat-enumerator" = callPackage @@ -88069,7 +86997,6 @@ self: { description = "Enumerator-based API for Expat"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "experimenter" = callPackage @@ -88144,7 +87071,6 @@ self: { description = "Expiring containers"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "expiring-mvar" = callPackage @@ -88240,7 +87166,6 @@ self: { description = "Extends explicit-iomodes with ByteString operations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "explicit-iomodes-text" = callPackage @@ -88253,7 +87178,6 @@ self: { description = "Extends explicit-iomodes with Text operations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "explicit-sharing" = callPackage @@ -88268,7 +87192,6 @@ self: { description = "Explicit Sharing of Monadic Effects"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "explore" = callPackage @@ -88283,7 +87206,6 @@ self: { description = "Experimental Plot data Reconstructor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "exploring-interpreters" = callPackage @@ -88323,8 +87245,8 @@ self: { ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "0.1.6"; - sha256 = "1yfbym97j3ih6zvlkg0d08qiivi7cyv61lbyc6qi094apazacq6c"; + version = "0.1.8"; + sha256 = "1g586cv6j79w40bmagqi156rjv09k1whhvpg67p0f707hbq1ph0a"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -88381,7 +87303,6 @@ self: { description = "Encode and Decode expressions from Z3 ASTs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "expresso" = callPackage @@ -88454,7 +87375,6 @@ self: { description = "automated printing for extemp speakers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "extend-record-data-th" = callPackage @@ -88558,7 +87478,6 @@ self: { description = "Sums/products/lists/trees which can be extended in other modules"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "extensible-effects" = callPackage @@ -88743,7 +87662,6 @@ self: { description = "Given a hackage package outputs the list of its dependencies"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "extractable-singleton" = callPackage @@ -88939,8 +87857,6 @@ self: { ]; description = "Rational arithmetic in an irrational world"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "facts" = callPackage @@ -88974,7 +87890,6 @@ self: { description = "A driver for the Factual API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fad" = callPackage @@ -89006,8 +87921,6 @@ self: { ]; description = "Minimal library for music generation and notation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fadno-braids" = callPackage @@ -89025,7 +87938,6 @@ self: { description = "Braid representations in Haskell"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fadno-xml" = callPackage @@ -89040,8 +87952,6 @@ self: { ]; description = "XML/XSD combinators/schemas/codegen"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fail" = callPackage @@ -89138,21 +88048,19 @@ self: { }) {}; "fake" = callPackage - ({ mkDerivation, base, containers, generics-sop, hspec, random - , text, time + ({ mkDerivation, base, containers, generics-sop, hspec, lens + , random, text, time }: mkDerivation { pname = "fake"; - version = "0.1.1.3"; - sha256 = "07ciaxbfvhajjdj5sidvy9cxpjfssjkxykrbgnghihrla78pwq1n"; + version = "0.1.2"; + sha256 = "03v224sag70w1ibymw1cmi3lwby25wl0254p2gzy7s330fmlbymr"; libraryHaskellDepends = [ base containers generics-sop random text time ]; - testHaskellDepends = [ base hspec random text time ]; + testHaskellDepends = [ base hspec lens random text time ]; description = "Randomly generated fake data"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fake-type" = callPackage @@ -89296,6 +88204,34 @@ self: { broken = true; }) {}; + "faktory_1_0_2_2" = callPackage + ({ mkDerivation, aeson, aeson-casing, async, base, bytestring + , connection, cryptonite, hspec, markdown-unlit, megaparsec, memory + , mtl, network, random, safe-exceptions, scanner, semigroups, text + , time, unix, unordered-containers + }: + mkDerivation { + pname = "faktory"; + version = "1.0.2.2"; + sha256 = "0w1wk40c7drdpm6wzm3hxhbgpznq8275fajb5c3z4pl8cav6hc61"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring connection cryptonite megaparsec + memory mtl network random safe-exceptions scanner semigroups text + time unix unordered-containers + ]; + executableHaskellDepends = [ aeson base safe-exceptions ]; + testHaskellDepends = [ + aeson async base hspec markdown-unlit time + ]; + testToolDepends = [ markdown-unlit ]; + description = "Faktory Worker for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "fallible" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -89325,7 +88261,6 @@ self: { description = "Falling sand game/cellular automata simulation using regular parallel arrays"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fallingblocks" = callPackage @@ -89345,7 +88280,6 @@ self: { description = "A fun falling blocks game"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "familiar-reflection" = callPackage @@ -89374,7 +88308,6 @@ self: { description = "A family tree library for the Haskell programming language"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "farmhash" = callPackage @@ -89406,8 +88339,6 @@ self: { doHaddock = false; description = "Fast functions on integers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fast-builder" = callPackage @@ -89467,7 +88398,6 @@ self: { description = "Integer-to-digits conversion"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fast-downward" = callPackage @@ -89486,26 +88416,6 @@ self: { }) {}; "fast-logger" = 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.3"; - sha256 = "0s7hsbii1km7dqkxa27v2fw553wqx6x00204s6iapv2k20ra0qsp"; - 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 = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ sternenseemann ]; - }) {}; - - "fast-logger_3_0_5" = callPackage ({ mkDerivation, array, auto-update, base, bytestring, directory , easy-file, filepath, hspec, hspec-discover, text, unix-compat , unix-time @@ -89522,7 +88432,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A fast logging system"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; @@ -89630,8 +88539,6 @@ self: { ]; description = "A simple, mindless parser for fasta files"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fastbayes" = callPackage @@ -89697,7 +88604,6 @@ self: { description = "Fast Internet Relay Chat (IRC) library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fastly" = callPackage @@ -89778,8 +88684,6 @@ self: { ]; description = "A fast open-union type suitable for 100+ contained alternatives"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fathead-util" = callPackage @@ -89808,7 +88712,6 @@ self: { description = "A fault tree analysis library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fay" = callPackage @@ -90085,7 +88988,6 @@ self: { description = "Build and create Fedora package repos and branches"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fca" = callPackage @@ -90142,7 +89044,6 @@ self: { description = "A faster way to navigate directories using the command line"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fcf-containers" = callPackage @@ -90158,8 +89059,6 @@ self: { testHaskellDepends = [ base doctest first-class-families Glob ]; description = "Data structures and algorithms for first-class-families"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fcg" = callPackage @@ -90349,7 +89248,6 @@ self: { description = "A minimally obtrusive feature flag library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fec" = callPackage @@ -90412,7 +89310,6 @@ self: { description = "Fedora image download tool"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fedora-packages" = callPackage @@ -90572,7 +89469,6 @@ self: { description = "CI service around gipeda"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "feed-translator" = callPackage @@ -90595,7 +89491,6 @@ self: { description = "Translate syndication feeds"; license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "feed2lj" = callPackage @@ -90615,7 +89510,6 @@ self: { description = "(unsupported)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "feed2twitter" = callPackage @@ -90633,7 +89527,6 @@ self: { description = "Send posts from a feed to Twitter"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fei-base" = callPackage @@ -90662,7 +89555,6 @@ self: { description = "FFI to MXNet"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) mxnet;}; "fei-cocoapi" = callPackage @@ -90691,7 +89583,6 @@ self: { description = "Cocodataset with cocoapi"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fei-dataiter" = callPackage @@ -90719,7 +89610,6 @@ self: { description = "mxnet dataiters"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) mxnet;}; "fei-datasets" = callPackage @@ -90750,7 +89640,6 @@ self: { description = "Some datasets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fei-examples" = callPackage @@ -90772,7 +89661,6 @@ self: { description = "fei examples"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fei-modelzoo" = callPackage @@ -90790,7 +89678,6 @@ self: { description = "A collection of standard models"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fei-nn" = callPackage @@ -90813,7 +89700,6 @@ self: { description = "Train a neural network with MXNet in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "feldspar-compiler" = callPackage @@ -90843,7 +89729,6 @@ self: { description = "Compiler for the Feldspar language"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {gcc_s = null;}; "feldspar-language" = callPackage @@ -90868,7 +89753,6 @@ self: { description = "A functional embedded language for DSP and parallelism"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "feldspar-signal" = callPackage @@ -91001,7 +89885,6 @@ self: { description = "Remote multi-db SQLCipher server"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fez-conf" = callPackage @@ -91105,7 +89988,6 @@ self: { description = "Tutorials on ffmpeg usage to play video/audio"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fft" = callPackage @@ -91275,7 +90157,6 @@ self: { description = "update statically hosted file in a push stule through socketed"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fields" = callPackage @@ -91292,7 +90173,6 @@ self: { description = "First-class record field combinators with infix record field syntax"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fields-json" = callPackage @@ -91385,6 +90265,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "file-embed_0_0_14_0" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , template-haskell + }: + mkDerivation { + pname = "file-embed"; + version = "0.0.14.0"; + sha256 = "1b45yk17339zw53zgp8zb5sjg5xn76kryrb6dkqk747vnbdnf0h5"; + libraryHaskellDepends = [ + base bytestring directory filepath template-haskell + ]; + testHaskellDepends = [ base bytestring filepath ]; + description = "Use Template Haskell to embed file contents directly"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "file-embed-lzma" = callPackage ({ mkDerivation, base, base-compat, bytestring, directory, filepath , lzma, template-haskell, text, th-lift-instances, transformers @@ -91517,8 +90414,6 @@ self: { ]; description = "A cache system associating values to files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "filediff" = callPackage @@ -91629,7 +90524,6 @@ self: { description = "Reversable and secure encoding of object ids as filepaths"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "filepath-io-access" = callPackage @@ -91642,7 +90536,6 @@ self: { description = "IO Access for filepath"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "filepather" = callPackage @@ -91660,7 +90553,6 @@ self: { description = "Functions on System.FilePath"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "filepattern" = callPackage @@ -91689,8 +90581,6 @@ self: { ]; description = "Library to process and search large files or a collection of files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "filestore" = callPackage @@ -91769,7 +90659,6 @@ self: { description = "Enumerator-based API for manipulating the filesystem"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "filesystem-trees" = callPackage @@ -91934,7 +90823,6 @@ self: { description = "Find the clumpiness of labels in a tree"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "find-conduit" = callPackage @@ -92003,7 +90891,6 @@ self: { description = "List http/html files"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fingertree" = callPackage @@ -92337,7 +91224,6 @@ self: { description = "Defunctionalisation for Yhc Core"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fishfood" = callPackage @@ -92361,8 +91247,6 @@ self: { ]; description = "Calculates file-size frequency-distribution"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fit" = callPackage @@ -92462,8 +91346,6 @@ self: { ]; description = "Program to manage the imports of a haskell module"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fix-parser-simple" = callPackage @@ -92478,7 +91360,6 @@ self: { description = "Simple fix-expression parser"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fix-symbols-gitit" = callPackage @@ -92571,7 +91452,6 @@ self: { description = "Unbox instances for the fixed-point package"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fixed-point-vector-space" = callPackage @@ -92584,7 +91464,6 @@ self: { description = "vector-space instances for the fixed-point package"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fixed-precision" = callPackage @@ -92824,7 +91703,6 @@ self: { description = "FIX (co)parser"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fixie" = callPackage @@ -92978,7 +91856,6 @@ self: { description = "Support for writing picture to FLAC metadata blocks with JuicyPixels"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "flaccuraterip" = callPackage @@ -93090,7 +91967,6 @@ self: { description = "Generate language learning flashcards from video"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "flat" = callPackage @@ -93117,6 +91993,7 @@ self: { ]; description = "Principled and efficient bit-oriented binary serialization"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "flat-maybe" = callPackage @@ -93197,7 +92074,6 @@ self: { description = "Haskell implementation of the FlatBuffers protocol"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "flatparse" = callPackage @@ -93207,8 +92083,8 @@ self: { }: mkDerivation { pname = "flatparse"; - version = "0.2.0.0"; - sha256 = "0f7nhspfj90ypylwvya3c3dzvipvc462zyc6191xd1x40wn7qms9"; + version = "0.2.1.0"; + sha256 = "19vwh9fqda7fp7nv7sgxafvvc5kckaayizjw2vvmd634ka0bsyrr"; libraryHaskellDepends = [ base bytestring containers template-haskell ]; @@ -93288,7 +92164,6 @@ self: { description = "Flexible wrappers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "flexiwrap-smallcheck" = callPackage @@ -93303,7 +92178,6 @@ self: { description = "SmallCheck (Serial) instances for flexiwrap"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "flick-duration" = callPackage @@ -93370,6 +92244,8 @@ self: { ]; description = "Parsing of pilot tracklogs dumped as KML"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "flink-statefulfun" = callPackage @@ -93436,7 +92312,6 @@ self: { description = "f-lite compiler, interpreter and libraries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "flo" = callPackage @@ -93665,7 +92540,6 @@ self: { description = "API integration with Flowdock"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "flowdock-rest" = callPackage @@ -93713,7 +92587,6 @@ self: { description = "Analyze 454 flowgrams (.SFF files)"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "flowlocks-framework" = callPackage @@ -93747,7 +92620,6 @@ self: { description = "Simulate 454 pyrosequencing"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "flp" = callPackage @@ -93854,7 +92726,6 @@ self: { description = "Fltkhs Fluid Examples"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fltkhs-hello-world" = callPackage @@ -93913,7 +92784,6 @@ self: { description = "A structured logger for Fluentd (Haskell)"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fluent-logger-conduit" = callPackage @@ -94141,8 +93011,6 @@ self: { libraryHaskellDepends = [ base enum-text-rio ]; description = "Adaptor for getting fmt to work with rio"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fmt-terminal-colors" = callPackage @@ -94155,8 +93023,6 @@ self: { testHaskellDepends = [ ansi-terminal base fmt ]; description = "ANSI terminal colors formatters for fmt library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fn" = callPackage @@ -94319,6 +93185,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Composable, streaming, and efficient left folds"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "foldl-exceptions" = callPackage @@ -94432,7 +93299,6 @@ self: { description = "Attoparsec and foldl-transduce integration"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "folds" = callPackage @@ -94540,6 +93406,9 @@ self: { ]; description = "Be notified when a file gets appended, solely with what was added. Warning - only works on linux and for files that are strictly appended, like log files."; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "follower" = callPackage @@ -94559,7 +93428,6 @@ self: { description = "Follow Tweets anonymously"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "foma" = callPackage @@ -94572,8 +93440,6 @@ self: { librarySystemDepends = [ foma ]; description = "Simple Haskell bindings for Foma"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) foma;}; "font-awesome-type" = callPackage @@ -94617,7 +93483,6 @@ self: { description = "Paper soccer, an OpenGL game"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "foobar" = callPackage @@ -94891,7 +93756,6 @@ self: { description = "A statically typed, functional programming language"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "format" = callPackage @@ -94905,7 +93769,6 @@ self: { description = "Rendering from and scanning to format strings"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "format-numbers" = callPackage @@ -94936,7 +93799,6 @@ self: { description = "A utility for writing the date to dzen2"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "formatn" = callPackage @@ -95043,7 +93905,6 @@ self: { description = "A statically typed, functional programming language"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "formlets" = callPackage @@ -95061,7 +93922,6 @@ self: { description = "Formlets implemented in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "formlets-hsp" = callPackage @@ -95079,7 +93939,6 @@ self: { description = "HSP support for Formlets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "formura" = callPackage @@ -95160,7 +94019,6 @@ self: { description = "A simple eDSL for generating arrayForth code"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fortran-src" = callPackage @@ -95212,7 +94070,6 @@ self: { description = "Common functions and utils for fortran-src"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fortytwo" = callPackage @@ -95260,7 +94117,6 @@ self: { description = "Foscam File format"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "foscam-filename" = callPackage @@ -95309,7 +94165,6 @@ self: { description = "Foscam File format"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "foundation" = callPackage @@ -95394,7 +94249,6 @@ self: { description = "IEEE 754-2019 compliant operations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fpco-api" = callPackage @@ -95479,7 +94333,6 @@ self: { description = "Haskell bindings to "; license = lib.licenses.lgpl21Plus; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) fplll;}; "fpnla" = callPackage @@ -95516,7 +94369,6 @@ self: { description = "Example implementations for FPNLA library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fptest" = callPackage @@ -95655,7 +94507,6 @@ self: { description = "A markdown to Frame GUI writer for Pandoc"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "franchise" = callPackage @@ -95796,8 +94647,6 @@ self: { ]; description = "Free algebras"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "free-categories" = callPackage @@ -95826,8 +94675,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "efficient data types for free categories and arrows"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "free-concurrent" = callPackage @@ -95966,7 +94813,6 @@ self: { description = "Automatically Generating Counterexamples to Naive Free Theorems"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "free-theorems-seq" = callPackage @@ -95985,7 +94831,6 @@ self: { description = "Taming Selective Strictness"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "free-theorems-seq-webui" = callPackage @@ -96005,7 +94850,6 @@ self: { description = "Taming Selective Strictness"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "free-theorems-webui" = callPackage @@ -96026,7 +94870,6 @@ self: { description = "CGI-based web interface for the free-theorems package"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "free-v-bucks-generator-no-survey" = callPackage @@ -96117,7 +94960,6 @@ self: { description = "A soccer game"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "freelude" = callPackage @@ -96138,7 +94980,6 @@ self: { description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "freenect" = callPackage @@ -96194,7 +95035,6 @@ self: { description = "Handle effects conversely using monadic conversation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "freer-effects" = callPackage @@ -96627,8 +95467,6 @@ self: { ]; description = "A reactive frontend web framework"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "frontmatter" = callPackage @@ -96719,7 +95557,6 @@ self: { description = "Program awesome stuff with Gloss and frpnow!"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "frpnow-gtk" = callPackage @@ -96737,7 +95574,6 @@ self: { description = "Program GUIs with GTK and frpnow!"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "frpnow-gtk3" = callPackage @@ -96752,7 +95588,6 @@ self: { description = "Program GUIs with GTK3 and frpnow!"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "frpnow-vty" = callPackage @@ -96768,7 +95603,6 @@ self: { description = "Program terminal applications with vty and frpnow!"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "frquotes" = callPackage @@ -97011,7 +95845,6 @@ self: { description = "A thin layer over USB to communicate with FTDI chips"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ftp-client" = callPackage @@ -97048,7 +95881,6 @@ self: { description = "Transfer file with FTP and FTPS with Conduit"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ftp-conduit" = callPackage @@ -97098,7 +95930,6 @@ self: { description = "Depth-typed functor-based trees, both top-down and bottom-up"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ftshell" = callPackage @@ -97118,7 +95949,6 @@ self: { description = "Shell interface to the FreeTheorems library"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fugue" = callPackage @@ -97211,7 +96041,6 @@ self: { description = "IRC bot for fun, learning, creativity and collaboration"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "funbot-client" = callPackage @@ -97263,7 +96092,6 @@ self: { description = "Git hook which sends events to FunBot"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "funcmp" = callPackage @@ -97316,7 +96144,6 @@ self: { description = "call-by-value lambda-calculus with meta-programming"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "funcons-simple" = callPackage @@ -97333,7 +96160,6 @@ self: { description = "A modular interpreter for executing SIMPLE funcons"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "funcons-tools" = callPackage @@ -97361,7 +96187,6 @@ self: { description = "A modular interpreter for executing funcons"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "funcons-values" = callPackage @@ -97403,7 +96228,6 @@ self: { description = "Combining functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "function-instances-algebra" = callPackage @@ -97429,7 +96253,6 @@ self: { description = "Combinators that allow for a more functional/monadic style of Arrow programming"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "functional-kmp" = callPackage @@ -97528,7 +96351,6 @@ self: { description = "Functor combinators with tries & zippers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "functor-friends" = callPackage @@ -97681,7 +96503,6 @@ self: { description = "Utility functions for using funflow with nix"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fungll-combinators" = callPackage @@ -97716,7 +96537,6 @@ self: { description = "A unioning file-system using HFuse"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "funnyprint" = callPackage @@ -97733,7 +96553,6 @@ self: { description = "funnyPrint function to colorize GHCi output"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "funpat" = callPackage @@ -97769,7 +96588,6 @@ self: { description = "A modern DPLL-style SAT solver"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "funspection" = callPackage @@ -97924,7 +96742,6 @@ self: { description = "A fused-effects adapter for squeal-postgresql"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fused-effects-th" = callPackage @@ -97941,8 +96758,6 @@ self: { ]; description = "Template Haskell helpers for fused-effects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fusion" = callPackage @@ -98029,6 +96844,46 @@ self: { license = lib.licenses.isc; }) {}; + "futhark_0_19_5" = callPackage + ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary + , blaze-html, bmp, bytestring, bytestring-to-vector, cmark-gfm + , containers, directory, directory-tree, dlist, file-embed + , filepath, free, gitrev, happy, hashable, 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 + }: + mkDerivation { + pname = "futhark"; + version = "0.19.5"; + sha256 = "1x922g3iq50an8jv75370qr0qslmxnrrqbwr7adca30ljaa7nfvh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal array base binary blaze-html bmp bytestring + bytestring-to-vector cmark-gfm containers directory directory-tree + dlist file-embed filepath free gitrev hashable 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 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 + ]; + description = "An optimising compiler for a functional, array-oriented language"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + }) {}; + "futhask" = callPackage ({ mkDerivation, base, directory, raw-strings-qq, split }: mkDerivation { @@ -98190,8 +97045,6 @@ self: { base criterion fuzzy-time genvalidity-criterion ]; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fuzzy-timings" = callPackage @@ -98316,7 +97169,6 @@ self: { description = "FWGL GLFW backend"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fwgl-javascript" = callPackage @@ -98333,7 +97185,6 @@ self: { description = "FWGL GHCJS backend"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fx" = callPackage @@ -98357,7 +97208,6 @@ self: { description = "Interface to the FXPak/FXPak Pro USB interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "g-npm" = callPackage @@ -98406,7 +97256,6 @@ self: { description = "Haskell symbolic execution engine"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "g2q" = callPackage @@ -98419,7 +97268,6 @@ self: { description = "G2Q allows constraint programming, via writing Haskell predicates"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "g4ip" = callPackage @@ -98469,7 +97317,6 @@ self: { description = "General Alignment Clustering Tool"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "galois-fft" = callPackage @@ -98497,7 +97344,6 @@ self: { description = "FFTs over finite fields"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "galois-field" = callPackage @@ -98726,7 +97572,6 @@ self: { description = "Connect to gargoyle-managed postgresql instances"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gargoyle-postgresql-nix" = callPackage @@ -98844,7 +97689,6 @@ self: { description = "planar graph embedding into a plane"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gc" = callPackage @@ -98978,7 +97822,6 @@ self: { description = "API Wrapping for Coinbase's GDAX exchange"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gdelt" = callPackage @@ -99020,7 +97863,6 @@ self: { description = "Generic diff for the instant-generics library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gdiff-th" = callPackage @@ -99104,7 +97946,6 @@ self: { description = "Parser for the GEDCOM genealogy file format"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "geek" = callPackage @@ -99126,7 +97967,6 @@ self: { description = "Geek blog engine"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "geek-server" = callPackage @@ -99151,7 +97991,6 @@ self: { description = "Geek blog engine server"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gegl" = callPackage @@ -99212,7 +98051,6 @@ self: { description = "FreeType2 based text rendering for the gelatin realtime rendering system"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gelatin-fruity" = callPackage @@ -99225,7 +98063,6 @@ self: { description = "Gelatin's support for rendering TTF outlines, using FontyFruity"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gelatin-gl" = callPackage @@ -99248,7 +98085,6 @@ self: { description = "OpenGL rendering routines for the gelatin-picture graphics EDSL"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gelatin-sdl2" = callPackage @@ -99267,7 +98103,6 @@ self: { description = "An SDL2 backend for the gelatin renderer"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gelatin-shaders" = callPackage @@ -99281,7 +98116,6 @@ self: { description = "Gelatin's OpenGL shaders"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gemini-router" = callPackage @@ -99335,8 +98169,6 @@ self: { ]; description = "A barebones textboard for the Gemini protocol"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gemstone" = callPackage @@ -99902,8 +98734,7 @@ self: { ]; description = "Generically derive traversals, lenses and prisms"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "generic-optics-lite" = callPackage @@ -100121,7 +98952,6 @@ self: { description = "Reimplementation of the gdiff algorithm for generics-mrsop"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "generics-sop" = callPackage @@ -100196,7 +99026,6 @@ self: { description = "Opinionated bootstrapping for Haskell web services"; license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "genesis-test" = callPackage @@ -100221,7 +99050,6 @@ self: { description = "Opinionated bootstrapping for Haskell web services"; license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "genetics" = callPackage @@ -100261,7 +99089,6 @@ self: { description = "GenI graphical user interface"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "geni-util" = callPackage @@ -100286,7 +99113,6 @@ self: { description = "Companion tools for use with the GenI surface realiser"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "geniconvert" = callPackage @@ -100307,7 +99133,6 @@ self: { description = "Conversion utility for the GenI generator"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "genifunctors" = callPackage @@ -100366,7 +99191,6 @@ self: { description = "Simple HTTP server for GenI results"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "genprog" = callPackage @@ -101081,7 +99905,6 @@ self: { description = "Geodetic calculations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "geodetic-types" = callPackage @@ -101194,7 +100017,6 @@ self: { description = "Geolite CSV Parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "geom2d" = callPackage @@ -101250,7 +100072,6 @@ self: { description = "Fetch from emusic using .emx files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "getflag" = callPackage @@ -101608,8 +100429,6 @@ self: { ]; description = "An AST and compiler plugin for dumping GHC's Core representation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ghc-dump-tree" = callPackage @@ -101658,8 +100477,6 @@ self: { ]; description = "Handy tools for working with ghc-dump dumps"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ghc-dup" = callPackage @@ -101681,8 +100498,8 @@ self: { }: mkDerivation { pname = "ghc-events"; - version = "0.16.0"; - sha256 = "0cr6aj4v9j2fadwhhifjlbg4anyc05phfmy3pvd9h7gn12a2ydr9"; + version = "0.17.0"; + sha256 = "059csl9j391iqbxaia9kawsksgbiy3ffdk9pqabb68gqrn0b7icc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101871,7 +100688,6 @@ self: { description = "Find the Haddock documentation for a symbol"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ghc-instances" = callPackage @@ -101894,7 +100710,6 @@ self: { description = "Easily import all instances contained in GHC distributed libraries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ghc-justdoit" = callPackage @@ -102106,7 +100921,6 @@ self: { description = "Happy Haskell Hacking"; license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ghc-mtl" = callPackage @@ -102491,8 +101305,8 @@ self: { }: mkDerivation { pname = "ghc-tags-core"; - version = "0.2.4.1"; - sha256 = "0d1srd72ajp2csyic6wpj6i7818rimqbcg5c3lxj76cz9zpjr1g8"; + version = "0.3.0.0"; + sha256 = "035k7akyhhn5jf2231ahplgggymc8h8k2kxia6i22v9cv976zgna"; libraryHaskellDepends = [ attoparsec base bytestring directory filepath-bytestring ghc mtl pipes pipes-attoparsec pipes-bytestring text transformers @@ -102521,8 +101335,8 @@ self: { }: mkDerivation { pname = "ghc-tags-plugin"; - version = "0.2.4.1"; - sha256 = "1hzv3s6pys1cqwj3hs1xww52v5yapisw9y3d5fmxzh0s6nawpxf2"; + version = "0.3.0.0"; + sha256 = "1d39jnz79vlxqqg2bw3cj1djii3bkmayqs4sm2a6bs5xzsplc5w3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102533,7 +101347,6 @@ self: { description = "A compiler plugin which generates tags file from GHC parsed syntax tree"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ghc-tcplugins-extra_0_3_2" = callPackage @@ -102721,7 +101534,6 @@ self: { description = "Live visualization of data structures in GHCi"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ghcflags" = callPackage @@ -102777,8 +101589,6 @@ self: { ]; description = "ghci-dap is a GHCi having DAP interface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ghci-diagrams" = callPackage @@ -102886,7 +101696,6 @@ self: { description = "colored pretty-printing within ghci"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ghci-websockets" = callPackage @@ -102932,69 +101741,6 @@ self: { }) {}; "ghcide" = callPackage - ({ mkDerivation, aeson, array, async, base, base16-bytestring - , binary, bytestring, bytestring-encoding, case-insensitive - , containers, cryptohash-sha1, data-default, deepseq, dependent-map - , dependent-sum, Diff, directory, dlist, extra, filepath - , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check - , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob - , haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb - , hls-plugin-api, hp2pretty, hslogger, implicit-hie - , implicit-hie-cradle, lens, lsp, lsp-test, lsp-types, mtl - , network-uri, opentelemetry, optparse-applicative, parallel - , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck - , quickcheck-instances, record-dot-preprocessor, record-hasfield - , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions - , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , tasty-rerun, text, time, transformers, unix, unliftio - , unliftio-core, unordered-containers, utf8-string, vector, yaml - }: - mkDerivation { - pname = "ghcide"; - version = "1.0.0.0"; - sha256 = "15hz49d68229bnp8g7q1ac60ryd4zbyc1rbxsfaq5lb586ps82k8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array async base base16-bytestring binary bytestring - bytestring-encoding case-insensitive containers cryptohash-sha1 - data-default deepseq dependent-map dependent-sum Diff directory - dlist extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th - ghc-check ghc-exactprint ghc-paths Glob haddock-library hashable - heapsize hie-bios hie-compat hiedb hls-plugin-api hslogger - implicit-hie-cradle lens lsp lsp-types mtl network-uri - opentelemetry parallel prettyprinter prettyprinter-ansi-terminal - regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake - sorted-list sqlite-simple stm syb text time transformers unix - unliftio unliftio-core unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ - aeson base bytestring containers data-default directory extra - filepath ghc gitrev hashable heapsize hie-bios hiedb hls-plugin-api - lens lsp lsp-test lsp-types optparse-applicative process - safe-exceptions shake text unordered-containers - ]; - testHaskellDepends = [ - aeson base binary bytestring containers data-default directory - extra filepath ghc ghc-typelits-knownnat haddock-library - hls-plugin-api lens lsp lsp-test lsp-types network-uri - optparse-applicative process QuickCheck quickcheck-instances - record-dot-preprocessor record-hasfield rope-utf16-splay safe - safe-exceptions shake tasty tasty-expected-failure tasty-hunit - tasty-quickcheck tasty-rerun text - ]; - testToolDepends = [ implicit-hie ]; - benchmarkHaskellDepends = [ - aeson base directory extra filepath optparse-applicative shake - shake-bench text yaml - ]; - benchmarkToolDepends = [ hp2pretty implicit-hie ]; - description = "The core of an IDE"; - license = lib.licenses.asl20; - }) {}; - - "ghcide_1_2_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, binary, bytestring, bytestring-encoding , case-insensitive, containers, cryptohash-sha1, data-default @@ -103018,6 +101764,8 @@ self: { pname = "ghcide"; version = "1.2.0.2"; sha256 = "0r3n23i4b51bb92q6pch9knj079a26jbz0q70qfpv66154d00wld"; + revision = "1"; + editedCabalFile = "1hv74yx0x6hh506kwg7ygkajkcczfn3l00f8rc4jnr3hkhkm5v85"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103058,6 +101806,72 @@ self: { benchmarkToolDepends = [ hp2pretty implicit-hie ]; description = "The core of an IDE"; license = lib.licenses.asl20; + }) {}; + + "ghcide_1_3_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, async, base + , base16-bytestring, binary, bytestring, bytestring-encoding + , case-insensitive, containers, cryptohash-sha1, data-default + , deepseq, dependent-map, dependent-sum, Diff, directory, dlist + , extra, filepath, fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th + , ghc-check, ghc-exactprint, ghc-paths, ghc-trace-events + , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable + , heapsize, hie-bios, hie-compat, hiedb, hls-graph, hls-plugin-api + , hp2pretty, hslogger, implicit-hie, implicit-hie-cradle, lens, lsp + , lsp-test, lsp-types, mtl, network-uri, opentelemetry + , optparse-applicative, parallel, prettyprinter + , prettyprinter-ansi-terminal, process, QuickCheck + , quickcheck-instances, record-dot-preprocessor, record-hasfield + , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions + , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck + , tasty-rerun, text, time, transformers, unix, unliftio + , unliftio-core, unordered-containers, utf8-string, vector, yaml + }: + mkDerivation { + pname = "ghcide"; + version = "1.3.0.0"; + sha256 = "1rmgrf4is669k5h5hbc9ryp2fc26fcacikzccjyg47jsc967ls9i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array async base base16-bytestring binary bytestring + bytestring-encoding case-insensitive containers cryptohash-sha1 + data-default deepseq dependent-map dependent-sum Diff directory + dlist extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th + ghc-check ghc-exactprint ghc-paths ghc-trace-events Glob + haddock-library hashable heapsize hie-bios hie-compat hiedb + hls-graph hls-plugin-api hslogger implicit-hie-cradle lens lsp + lsp-types mtl network-uri opentelemetry optparse-applicative + parallel prettyprinter prettyprinter-ansi-terminal regex-tdfa + retrie rope-utf16-splay safe safe-exceptions sorted-list + sqlite-simple stm syb text time transformers unix unliftio + unliftio-core unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring containers data-default + directory extra filepath ghc gitrev hashable heapsize hie-bios + hiedb hls-graph hls-plugin-api lens lsp lsp-test lsp-types + optparse-applicative process safe-exceptions shake text + unordered-containers + ]; + testHaskellDepends = [ + aeson async base binary bytestring containers data-default + directory extra filepath ghc ghc-typelits-knownnat haddock-library + hls-graph hls-plugin-api lens lsp lsp-test lsp-types network-uri + optparse-applicative process QuickCheck quickcheck-instances + record-dot-preprocessor record-hasfield regex-tdfa rope-utf16-splay + safe safe-exceptions shake tasty tasty-expected-failure tasty-hunit + tasty-quickcheck tasty-rerun text unordered-containers + ]; + testToolDepends = [ implicit-hie ]; + benchmarkHaskellDepends = [ + aeson base directory extra filepath optparse-applicative shake + shake-bench text yaml + ]; + benchmarkToolDepends = [ hp2pretty implicit-hie ]; + description = "The core of an IDE"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; }) {}; @@ -103163,7 +101977,9 @@ self: { ]; description = "GHCJS DOM Hello World, an example package"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "ghcjs-dom-jsaddle" = callPackage @@ -103239,7 +102055,6 @@ self: { description = "Client-side web EDSL for transient nodes running in the web browser"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ghcjs-perch" = callPackage @@ -103365,7 +102180,7 @@ self: { }) {}; "ghcup" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ascii-string, async, base + ({ mkDerivation, aeson, aeson-pretty, async, base , base16-bytestring, binary, bytestring, bz2, case-insensitive , casing, concurrent-output, containers, cryptohash-sha256 , generic-arbitrary, generics-sop, haskus-utils-types @@ -103382,15 +102197,13 @@ self: { }: mkDerivation { pname = "ghcup"; - version = "0.1.14.1"; - sha256 = "1lx6ahn4mvjzs3x4qm32sdn1n8w4v7jqj2jslvan008zk664d5l2"; - revision = "1"; - editedCabalFile = "0a9c2ha61mlz9ci652djy4vmmzi4s1g8rwl1a2miymrw5b36zsmq"; + version = "0.1.14.2"; + sha256 = "1k18ira2i2ja4hd65fdxk3ab21xzh4fvd982q2rfjshzkds1a3hv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ascii-string async base base16-bytestring binary bytestring - bz2 case-insensitive casing concurrent-output containers + aeson async base base16-bytestring binary bytestring bz2 + case-insensitive casing concurrent-output containers cryptohash-sha256 generics-sop haskus-utils-types haskus-utils-variant hpath hpath-directory hpath-filepath hpath-io hpath-posix libarchive lzma-static megaparsec monad-logger mtl @@ -103415,8 +102228,7 @@ self: { ]; description = "ghc toolchain installer"; license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "ghczdecode" = callPackage @@ -103466,7 +102278,6 @@ self: { description = "Trivial routines for inspecting git repositories"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gi-atk" = callPackage @@ -103569,7 +102380,6 @@ self: { description = "Bridge between packages gi-* and cairo-core"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gi-cairo-connector" = callPackage @@ -103621,6 +102431,9 @@ self: { libraryPkgconfigDepends = [ libdbusmenu ]; description = "Dbusmenu bindings"; license = lib.licenses.lgpl21Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) libdbusmenu;}; "gi-dbusmenu_0_4_9" = callPackage @@ -103640,6 +102453,9 @@ self: { libraryPkgconfigDepends = [ libdbusmenu ]; description = "Dbusmenu bindings"; license = lib.licenses.lgpl21Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libdbusmenu;}; @@ -103665,6 +102481,9 @@ self: { libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; description = "DbusmenuGtk bindings"; license = lib.licenses.lgpl21Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-dbusmenugtk3_0_4_10" = callPackage @@ -103689,6 +102508,9 @@ self: { libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; description = "DbusmenuGtk bindings"; license = lib.licenses.lgpl21Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; @@ -103716,6 +102538,31 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; + "gi-gdk_3_0_24" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo + , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gdk"; + version = "3.0.24"; + sha256 = "17slysv7zj3nbzh302w8jkvcfkvwfk5s80n99lqhggd6lnhf5fjx"; + setupHaskellDepends = [ + base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango + haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib + gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 ]; + description = "Gdk bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) gtk3;}; + "gi-gdk_4_0_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk4 @@ -103806,6 +102653,29 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; + "gi-gdkx11_3_0_11" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo + , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gdkx11"; + version = "3.0.11"; + sha256 = "07r47fpx6rvsahgnv8g741fl6h1s6y1xrlyacbpc3d8cv7x4aax2"; + setupHaskellDepends = [ + base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-cairo gi-gdk gi-gio gi-gobject + gi-xlib haskell-gi haskell-gi-base haskell-gi-overloading text + transformers + ]; + libraryPkgconfigDepends = [ gtk3 ]; + description = "GdkX11 bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) gtk3;}; + "gi-gdkx11_4_0_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk4-x11, haskell-gi @@ -103830,27 +102700,6 @@ self: { }) {gtk4-x11 = null;}; "gi-ggit" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, libgit2-glib, text, transformers - }: - mkDerivation { - pname = "gi-ggit"; - version = "1.0.9"; - sha256 = "0qvmppdby40ncd9alnnk8ang90qcaj00c0g0nrq0s0m1ynar8ccd"; - setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ libgit2-glib ]; - description = "libgit2-glib bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) libgit2-glib;}; - - "gi-ggit_1_0_10" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, libgit2-glib, text, transformers @@ -103869,7 +102718,9 @@ self: { libraryPkgconfigDepends = [ libgit2-glib ]; description = "libgit2-glib bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) libgit2-glib;}; "gi-gio" = callPackage @@ -103912,25 +102763,6 @@ self: { }) {inherit (pkgs) glib;}; "gi-girepository" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-girepository"; - version = "1.0.23"; - sha256 = "0a8sis3zayiywi7mgs1g4p7nr9szv392j7bimq5nvva04lj6sdzc"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gobject-introspection ]; - description = "GIRepository (gobject-introspection) bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) gobject-introspection;}; - - "gi-girepository_1_0_24" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers @@ -103947,7 +102779,6 @@ self: { libraryPkgconfigDepends = [ gobject-introspection ]; description = "GIRepository (gobject-introspection) bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gobject-introspection;}; "gi-glib" = callPackage @@ -104006,8 +102837,6 @@ self: { libraryPkgconfigDepends = [ gmodule ]; description = "GModule bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {gmodule = null;}; "gi-gobject" = callPackage @@ -104114,29 +102943,9 @@ self: { description = "Gsk bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk4;}; "gi-gst" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gstreamer, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gst"; - version = "1.0.23"; - sha256 = "0w4xscgd49d6d00gvsqc210r63c0wj748dqa5ypppr4mzllsm0qv"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gstreamer ]; - description = "GStreamer bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs.gst_all_1) gstreamer;}; - - "gi-gst_1_0_24" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gstreamer, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers @@ -104153,7 +102962,6 @@ self: { libraryPkgconfigDepends = [ gstreamer ]; description = "GStreamer bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs.gst_all_1) gstreamer;}; "gi-gstaudio" = callPackage @@ -104175,32 +102983,9 @@ self: { libraryPkgconfigDepends = [ gst-plugins-base ]; description = "GStreamerAudio bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstbase" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gst-plugins-base, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gstbase"; - version = "1.0.23"; - sha256 = "0im25z9pf9j0cxj0b6lbbr3lis9kbvzzvzns65cmargbh1018959"; - setupHaskellDepends = [ - base Cabal gi-glib gi-gobject gi-gst haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject gi-gst haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gst-plugins-base ]; - description = "GStreamerBase bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; - - "gi-gstbase_1_0_24" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gst-plugins-base, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers @@ -104219,7 +103004,6 @@ self: { libraryPkgconfigDepends = [ gst-plugins-base ]; description = "GStreamerBase bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstpbutils" = callPackage @@ -104245,7 +103029,6 @@ self: { description = "GStreamer Plugins Base Utils bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {gstreamer-pbutils = null;}; "gi-gsttag" = callPackage @@ -104272,27 +103055,6 @@ self: { }) {gstreamer-tag = null;}; "gi-gstvideo" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gstvideo"; - version = "1.0.23"; - sha256 = "1kb09kal08x7nznc0g8c2n9jfijapdndbnsfs5cvz0p9smvd092i"; - setupHaskellDepends = [ - base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase - haskell-gi haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gst-plugins-base ]; - description = "GStreamerVideo bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; - - "gi-gstvideo_1_0_24" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers @@ -104311,7 +103073,6 @@ self: { libraryPkgconfigDepends = [ gst-plugins-base ]; description = "GStreamerVideo bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gtk" = callPackage @@ -104338,6 +103099,31 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; + "gi-gtk_3_0_37" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject + , gi-pango, gtk3, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gtk"; + version = "3.0.37"; + sha256 = "1psg789lrpcnrwh1y80y7s09hcxl3hihi0gwsmd7j3v731dp7a0k"; + setupHaskellDepends = [ + base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib + gi-gobject gi-pango haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf + gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 ]; + description = "Gtk bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) gtk3;}; + "gi-gtk_4_0_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject @@ -104493,30 +103279,6 @@ self: { }) {gtksheet = null;}; "gi-gtksource" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject - , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gtksource"; - version = "3.0.23"; - sha256 = "13rsxjbl62q8zhwqr8jm2fh5njzfa86izqwag4d6aw8xi71wqfrn"; - setupHaskellDepends = [ - base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib - gi-gobject gi-gtk gi-pango haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf - gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gtksourceview3 ]; - description = "GtkSource bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) gtksourceview3;}; - - "gi-gtksource_3_0_24" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base @@ -104538,7 +103300,6 @@ self: { libraryPkgconfigDepends = [ gtksourceview3 ]; description = "GtkSource bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtksourceview3;}; "gi-handy" = callPackage @@ -104607,27 +103368,6 @@ self: { }) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;}; "gi-ibus" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, ibus, text, transformers - }: - mkDerivation { - pname = "gi-ibus"; - version = "1.5.2"; - sha256 = "14chw0qhzdxixsqsn2ra31z561kn2zclk15b7hfpfzayqr6dqci1"; - setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ ibus ]; - description = "IBus bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) ibus;}; - - "gi-ibus_1_5_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, ibus, text, transformers @@ -104646,7 +103386,9 @@ self: { libraryPkgconfigDepends = [ ibus ]; description = "IBus bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) ibus;}; "gi-javascriptcore" = callPackage @@ -104666,7 +103408,6 @@ self: { libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; "gi-javascriptcore_4_0_23" = callPackage @@ -104690,27 +103431,6 @@ self: { }) {inherit (pkgs) webkitgtk;}; "gi-notify" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, libnotify, text, transformers - }: - mkDerivation { - pname = "gi-notify"; - version = "0.7.22"; - sha256 = "0j5cxx9dsxh2wafw4xa7yasr6n98h2qwpm1y08nm7m6i0kwrksap"; - setupHaskellDepends = [ - base Cabal gi-gdkpixbuf gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gdkpixbuf gi-glib gi-gobject - haskell-gi haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ libnotify ]; - description = "Libnotify bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) libnotify;}; - - "gi-notify_0_7_23" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-glib, gi-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, libnotify, text, transformers @@ -104729,34 +103449,9 @@ self: { libraryPkgconfigDepends = [ libnotify ]; description = "Libnotify bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libnotify;}; "gi-ostree" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, ostree, text, transformers - }: - mkDerivation { - pname = "gi-ostree"; - version = "1.0.13"; - sha256 = "07k02mffidw18f104crmhayr5nf3v5xcldc8fbmxdinp7wik5c7f"; - setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ ostree ]; - description = "OSTree bindings"; - license = lib.licenses.lgpl21Only; - platforms = [ - "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" - ]; - }) {inherit (pkgs) ostree;}; - - "gi-ostree_1_0_14" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, ostree, text, transformers @@ -104778,7 +103473,6 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) ostree;}; "gi-pango" = callPackage @@ -104833,32 +103527,6 @@ self: { }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-pangocairo" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi - , haskell-gi-base, haskell-gi-overloading, pango, text - , transformers - }: - mkDerivation { - pname = "gi-pangocairo"; - version = "1.0.24"; - sha256 = "1yya5gsqrkagmm33rsasshlj691nmax47fqdn1p2rnf4aqx1jcqr"; - setupHaskellDepends = [ - base Cabal gi-cairo gi-glib gi-gobject gi-pango haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-cairo gi-glib gi-gobject gi-pango - haskell-gi haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ cairo pango ]; - preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" - ''; - description = "PangoCairo bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; - - "gi-pangocairo_1_0_25" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi , haskell-gi-base, haskell-gi-overloading, pango, text @@ -104882,7 +103550,6 @@ self: { ''; description = "PangoCairo bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-poppler" = callPackage @@ -104904,32 +103571,9 @@ self: { libraryPkgconfigDepends = [ poppler_gi ]; description = "Poppler bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) poppler_gi;}; "gi-secret" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, libsecret, text, transformers - }: - mkDerivation { - pname = "gi-secret"; - version = "0.0.12"; - sha256 = "19mr7mvay2slm5k6afqj0hhy4ddh0advrb5dyzqi75xysx7xagm8"; - setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ libsecret ]; - description = "Libsecret bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) libsecret;}; - - "gi-secret_0_0_13" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, libsecret, text, transformers @@ -104948,7 +103592,6 @@ self: { libraryPkgconfigDepends = [ libsecret ]; description = "Libsecret bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libsecret;}; "gi-soup" = callPackage @@ -105016,30 +103659,6 @@ self: { }) {inherit (pkgs) vips;}; "gi-vte" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - , vte_291 - }: - mkDerivation { - pname = "gi-vte"; - version = "2.91.27"; - sha256 = "0a4n8yah3nirwciw0y1i8vpcjqbbk3pw15nd8av109cyxgl8nzx8"; - setupHaskellDepends = [ - base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango - haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject - gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading - text transformers - ]; - libraryPkgconfigDepends = [ vte_291 ]; - description = "Vte bindings"; - license = lib.licenses.lgpl21Only; - }) {vte_291 = pkgs.vte;}; - - "gi-vte_2_91_28" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers @@ -105061,7 +103680,9 @@ self: { libraryPkgconfigDepends = [ vte_291 ]; description = "Vte bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {vte_291 = pkgs.vte;}; "gi-webkit" = callPackage @@ -105109,7 +103730,6 @@ self: { libraryPkgconfigDepends = [ webkitgtk ]; description = "WebKit2 bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; "gi-webkit2_4_0_27" = callPackage @@ -105159,7 +103779,6 @@ self: { libraryPkgconfigDepends = [ webkitgtk ]; description = "WebKit2-WebExtension bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; "gi-wnck" = callPackage @@ -105687,7 +104306,6 @@ self: { description = "Custom git command for formatting code"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "git-freq" = callPackage @@ -105731,7 +104349,6 @@ self: { description = "More intelligent push-to-GitHub utility"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "git-jump" = callPackage @@ -105804,8 +104421,6 @@ self: { ]; description = "Passively snapshots working tree changes efficiently"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "git-object" = callPackage @@ -105823,7 +104438,6 @@ self: { description = "Git object and its parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "git-remote-ipfs" = callPackage @@ -105856,7 +104470,6 @@ self: { description = "Git remote helper to store git objects on IPFS"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "git-repair" = callPackage @@ -106252,7 +104865,6 @@ self: { description = "GitHub WebHook Handler implementation for Snap"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "github-webhooks" = callPackage @@ -106412,8 +105024,6 @@ self: { ]; description = "API library for working with Git repositories"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gitlib-cmdline" = callPackage @@ -106461,7 +105071,6 @@ self: { description = "Run tests between repositories"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gitlib-libgit2" = callPackage @@ -106488,8 +105097,6 @@ self: { ]; description = "Libgit2 backend for gitlib"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gitlib-s3" = callPackage @@ -106520,7 +105127,6 @@ self: { description = "Gitlib repository backend for storing Git objects in Amazon S3"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gitlib-sample" = callPackage @@ -106534,8 +105140,6 @@ self: { ]; description = "Sample backend for gitlib showing the basic structure for any backend"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gitlib-test" = callPackage @@ -106554,8 +105158,6 @@ self: { ]; description = "Test library for confirming gitlib backend compliance"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gitlib-utils" = callPackage @@ -106663,7 +105265,6 @@ self: { description = "CLI Giphy search tool with previews in iTerm 2"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gjk" = callPackage @@ -106776,7 +105377,6 @@ self: { description = "Automagically declares getters for widget handles in specified interface file"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "glambda" = callPackage @@ -106865,7 +105465,6 @@ self: { description = "Extensible effects using ContT, State and variants"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "glazier-pipes" = callPackage @@ -106882,7 +105481,6 @@ self: { description = "A threaded rendering framework using glaizer and pipes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "glazier-react" = callPackage @@ -106903,7 +105501,6 @@ self: { description = "ReactJS binding using Glazier.Command."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "glazier-react-examples" = callPackage @@ -106929,7 +105526,6 @@ self: { description = "Examples of using glazier-react"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "glazier-react-widget" = callPackage @@ -106950,7 +105546,6 @@ self: { description = "Generic widget library using glazier-react"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gli" = callPackage @@ -107123,7 +105718,6 @@ self: { description = "Library enabling unique top-level declarations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "global-config" = callPackage @@ -107145,7 +105739,6 @@ self: { description = "Global mutable configuration"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "global-lock" = callPackage @@ -107194,7 +105787,6 @@ self: { description = "ray tracer"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gloss" = callPackage @@ -107250,7 +105842,6 @@ self: { description = "An Interface for gloss in terms of a reactive-banana Behavior"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gloss-devil" = callPackage @@ -107263,7 +105854,6 @@ self: { description = "Display images in Gloss using libdevil for decoding"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gloss-examples" = callPackage @@ -107284,7 +105874,6 @@ self: { description = "Examples using the gloss library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gloss-export" = callPackage @@ -107398,7 +105987,6 @@ self: { description = "A Sodium interface to the Gloss drawing package"; license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "glpk-headers" = callPackage @@ -107437,8 +106025,6 @@ self: { ]; description = "Comprehensive GLPK linear programming bindings"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) glpk;}; "glsl" = callPackage @@ -107637,7 +106223,6 @@ self: { description = "Composable maps and generic tries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gmndl" = callPackage @@ -107657,7 +106242,6 @@ self: { description = "Mandelbrot Set explorer using GTK"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gmpint" = callPackage @@ -107686,7 +106270,6 @@ self: { description = "Randomly set a picture as the GNOME desktop background"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gnome-keyring" = callPackage @@ -107703,7 +106286,10 @@ self: { libraryToolDepends = [ c2hs ]; description = "Bindings for libgnome-keyring"; license = lib.licenses.gpl3Only; - }) {inherit (pkgs.gnome3) gnome-keyring; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; + }) {inherit (pkgs.gnome) gnome-keyring; inherit (pkgs) libgnome-keyring;}; "gnomevfs" = callPackage @@ -107722,7 +106308,6 @@ self: { description = "Binding to the GNOME Virtual File System library"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {gnome-vfs = null; gnome-vfs_module = null;}; "gnss-converters" = callPackage @@ -107751,7 +106336,6 @@ self: { description = "GNSS Converters"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gnuidn" = callPackage @@ -107775,7 +106359,6 @@ self: { description = "Bindings for GNU IDN"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) libidn;}; "gnuplot" = callPackage @@ -107863,7 +106446,6 @@ self: { description = "Scientific computing on geometric objects"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "goal-probability" = callPackage @@ -107884,7 +106466,6 @@ self: { description = "Manifolds of probability distributions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "goal-simulation" = callPackage @@ -107909,7 +106490,6 @@ self: { description = "Mealy based simulation tools"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "goat" = callPackage @@ -107944,8 +106524,6 @@ self: { testHaskellDepends = [ base containers HUnit mtl parsec ]; description = "A monadic take on a 2,500-year-old board game - library"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "goatee-gtk" = callPackage @@ -107966,8 +106544,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "A monadic take on a 2,500-year-old board game - GTK+ UI"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gochan" = callPackage @@ -110307,8 +108883,6 @@ self: { ]; description = "A lightweight golden test runner"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gooey" = callPackage @@ -110378,7 +108952,6 @@ self: { description = "Google Drive API access"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "google-html5-slide" = callPackage @@ -110430,7 +109003,6 @@ self: { description = "Write GMail filters and output to importable XML"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "google-maps-geocoding" = callPackage @@ -110448,7 +109020,6 @@ self: { description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "google-oauth2" = callPackage @@ -110524,8 +109095,6 @@ self: { ]; description = "Get a signed JWT for Google Service Accounts"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "google-search" = callPackage @@ -110562,8 +109131,6 @@ self: { ]; description = "Google APIs for server to server applications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "google-static-maps" = callPackage @@ -110584,7 +109151,6 @@ self: { description = "Bindings to the Google Maps Static API (formerly Static Maps API)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "google-translate" = callPackage @@ -110621,7 +109187,6 @@ self: { description = "Haskell implementation of the Google+ API v1"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "googlepolyline" = callPackage @@ -110750,7 +109315,6 @@ self: { description = "Gore&Ash engine extension that implements actor style of programming"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gore-and-ash-async" = callPackage @@ -110774,7 +109338,6 @@ self: { description = "Core module for Gore&Ash engine that embeds async IO actions into game loop"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gore-and-ash-demo" = callPackage @@ -110801,7 +109364,6 @@ self: { description = "Demonstration game for Gore&Ash game engine"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gore-and-ash-glfw" = callPackage @@ -110819,7 +109381,6 @@ self: { description = "Core module for Gore&Ash engine for GLFW input events"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gore-and-ash-lambdacube" = callPackage @@ -110840,7 +109401,6 @@ self: { description = "Core module for Gore&Ash engine that do something"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gore-and-ash-logging" = callPackage @@ -110860,7 +109420,6 @@ self: { description = "Core module for gore-and-ash with logging utilities"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gore-and-ash-network" = callPackage @@ -110883,7 +109442,6 @@ self: { description = "Core module for Gore&Ash engine with low level network API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gore-and-ash-sdl" = callPackage @@ -110903,7 +109461,6 @@ self: { description = "Gore&Ash core module for integration with SDL library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gore-and-ash-sync" = callPackage @@ -110924,7 +109481,6 @@ self: { description = "Gore&Ash module for high level network synchronization"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gothic" = callPackage @@ -111049,7 +109605,6 @@ self: { description = "For manipulating GPS coordinates and trails"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gps2htmlReport" = callPackage @@ -111071,7 +109626,6 @@ self: { description = "GPS to HTML Summary Report"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gpx-conduit" = callPackage @@ -111118,7 +109672,6 @@ self: { description = "Applicative parsers for form parameter lists"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graceful" = callPackage @@ -111176,7 +109729,6 @@ self: { description = "Monadic correlated log events"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "grakn" = callPackage @@ -111220,7 +109772,6 @@ self: { description = "A parsing library of context-free grammar combinators"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "grammatical-parsers" = callPackage @@ -111256,8 +109807,6 @@ self: { ]; description = "parsers that combine into grammars"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "grapefruit-examples" = callPackage @@ -111275,7 +109824,6 @@ self: { description = "Examples using the Grapefruit library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "grapefruit-frp" = callPackage @@ -111307,7 +109855,6 @@ self: { description = "A record system for Functional Reactive Programming"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "grapefruit-ui" = callPackage @@ -111327,7 +109874,6 @@ self: { description = "Declarative user interface programming"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "grapefruit-ui-gtk" = callPackage @@ -111348,7 +109894,6 @@ self: { description = "GTK+-based backend for declarative user interface programming"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graph" = callPackage @@ -111383,8 +109928,6 @@ self: { ]; description = "Fast, memory efficient and persistent graph implementation"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graph-generators" = callPackage @@ -111457,7 +110000,6 @@ self: { description = "Interactive graph rewriting system implementing various well-known combinators"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graph-rewriting-gl" = callPackage @@ -111475,7 +110017,6 @@ self: { description = "OpenGL interface for interactive port graph rewriting"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graph-rewriting-lambdascope" = callPackage @@ -111498,7 +110039,6 @@ self: { description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graph-rewriting-layout" = callPackage @@ -111515,7 +110055,6 @@ self: { description = "Force-directed node placement intended for incremental graph drawing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graph-rewriting-ski" = callPackage @@ -111536,7 +110075,6 @@ self: { description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graph-rewriting-strategies" = callPackage @@ -111553,7 +110091,6 @@ self: { description = "Evaluation strategies for port-graph rewriting systems"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graph-rewriting-trs" = callPackage @@ -111576,7 +110113,6 @@ self: { description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graph-rewriting-ww" = callPackage @@ -111598,7 +110134,6 @@ self: { description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graph-serialize" = callPackage @@ -111645,7 +110180,6 @@ self: { description = "Graph walk abstraction"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graph-wrapper" = callPackage @@ -111747,7 +110281,6 @@ self: { description = "Classes for renderable objects"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graphicstools" = callPackage @@ -111767,7 +110300,6 @@ self: { description = "Tools for creating graphical UIs, based on wxHaskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graphite" = callPackage @@ -111850,8 +110382,6 @@ self: { ]; description = "Haskell GraphQL implementation"; license = "MPL-2.0 AND BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graphql-api" = callPackage @@ -111914,7 +110444,6 @@ self: { description = "A client for Haskell programs to query a GraphQL API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graphql-utils" = callPackage @@ -111993,7 +110522,6 @@ self: { description = "A simple tool to illustrate dependencies between Haskell types"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graphula" = callPackage @@ -112021,8 +110549,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "A declarative library for describing dependencies between data"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graphula-core" = callPackage @@ -112222,29 +110748,33 @@ self: { description = "A foreign function interface pre-processor library for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "greenclip" = callPackage ({ mkDerivation, base, binary, bytestring, directory, exceptions - , hashable, libXau, microlens, microlens-mtl, protolude, text, unix - , vector, wordexp, X11, xcb, xdmcp, xlibsWrapper + , hashable, libXau, microlens, microlens-mtl, protolude, text + , tomland, unix, vector, wordexp, X11, xcb, xdmcp, xlibsWrapper + , xscrnsaver }: mkDerivation { pname = "greenclip"; - version = "3.4.0"; - sha256 = "0763nnh7k4blkamlswnapwxyqfn1l0g6ibpz7k1w2w2asj7a3q98"; + version = "4.1.0"; + sha256 = "1z52ffb3f0iflls3bjlwzpz4w3a904vj67c1zsdyql6j2xpln6n4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base binary bytestring directory exceptions hashable microlens - microlens-mtl protolude text unix vector wordexp X11 + microlens-mtl protolude text tomland unix vector wordexp X11 + ]; + executablePkgconfigDepends = [ + libXau xcb xdmcp xlibsWrapper xscrnsaver ]; - executablePkgconfigDepends = [ libXau xcb xdmcp xlibsWrapper ]; description = "Simple clipboard manager to be integrated with rofi"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; - inherit (pkgs) xlibsWrapper;}; + inherit (pkgs) xlibsWrapper; xscrnsaver = null;}; "greg-client" = callPackage ({ mkDerivation, base, binary, bytestring, clock, hostname, network @@ -112432,7 +110962,6 @@ self: { description = "Grid-based prototyping framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gridbounds" = callPackage @@ -112446,7 +110975,6 @@ self: { description = "Collision detection for GridBox"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gridbox" = callPackage @@ -112496,7 +111024,6 @@ self: { description = "Grid-based multimedia engine"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "grids" = callPackage @@ -112883,8 +111410,6 @@ self: { libraryHaskellDepends = [ base generic-data groups ]; description = "Generically derive Group instances"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "grow-vector" = callPackage @@ -112957,7 +111482,6 @@ self: { description = "gRPC client for etcd"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "grpc-haskell" = callPackage @@ -112989,7 +111513,6 @@ self: { description = "Haskell implementation of gRPC layered on shared C library"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "grpc-haskell-core" = callPackage @@ -113016,7 +111539,6 @@ self: { description = "Haskell implementation of gRPC layered on shared C library"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {gpr = null; inherit (pkgs) grpc;}; "gruff" = callPackage @@ -113039,7 +111561,6 @@ self: { description = "fractal explorer GUI using the ruff library"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gruff-examples" = callPackage @@ -113059,7 +111580,6 @@ self: { description = "Mandelbrot Set examples using ruff and gruff"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gsasl" = callPackage @@ -113106,7 +111626,6 @@ self: { description = "scrapes google scholar, provides RSS feed"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gsl-random" = callPackage @@ -113133,7 +111652,6 @@ self: { description = "Instances for using gsl-random with random-fu"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gsmenu" = callPackage @@ -113199,7 +111717,6 @@ self: { description = "Generic implementation of Storable"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gstreamer" = callPackage @@ -113255,7 +111772,6 @@ self: { description = "The General Transit Feed Specification format"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gtfs-realtime" = callPackage @@ -113368,7 +111884,6 @@ self: { description = "GTK+ Serialized event"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk2;}; "gtk-simple-list-view" = callPackage @@ -113410,6 +111925,9 @@ self: { ]; description = "A standalone StatusNotifierItem/AppIndicator tray"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) gtk3;}; "gtk-strut" = callPackage @@ -113706,7 +112224,6 @@ self: { description = "Binding to the GtkImageView library"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) gtkimageview;}; "gtkrsync" = callPackage @@ -113726,7 +112243,6 @@ self: { description = "Gnome rsync progress display"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gtksourceview2" = callPackage @@ -113792,7 +112308,6 @@ self: { description = "Datatype-generic rewriting with preconditions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "guess-combinator" = callPackage @@ -113805,7 +112320,6 @@ self: { description = "Generate simple combinators given their type"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "guid" = callPackage @@ -114030,7 +112544,6 @@ self: { description = "Control your Arduino board from Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hBDD" = callPackage @@ -114092,8 +112605,6 @@ self: { testHaskellDepends = [ base hashable ]; description = "Conceptual modelling support for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hCsound" = callPackage @@ -114215,7 +112726,6 @@ self: { description = "The tool to transform the OFF to other image format"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hOff-parser" = callPackage @@ -114294,7 +112804,6 @@ self: { description = "Protein Databank file format library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hPDB-examples" = callPackage @@ -114322,7 +112831,6 @@ self: { description = "Examples for hPDB library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hPushover" = callPackage @@ -114524,7 +113032,6 @@ self: { description = "Haskell message bot framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hable" = callPackage @@ -114561,7 +113068,6 @@ self: { description = "A minimalist static blog generator"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hablog" = callPackage @@ -114585,7 +113091,6 @@ self: { description = "A blog system"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hacanon-light" = callPackage @@ -114629,7 +113134,6 @@ self: { description = "Hack contrib"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hack-contrib-press" = callPackage @@ -114647,7 +113151,6 @@ self: { description = "Hack helper that renders Press templates"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hack-frontend-happstack" = callPackage @@ -114710,7 +113213,6 @@ self: { description = "hack handler implementation using epoll"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hack-handler-evhttp" = callPackage @@ -114730,7 +113232,6 @@ self: { description = "Hack EvHTTP (libevent) Handler"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {event = null;}; "hack-handler-fastcgi" = callPackage @@ -114744,7 +113245,6 @@ self: { description = "Hack handler direct to fastcgi (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) fcgi;}; "hack-handler-happstack" = callPackage @@ -114781,7 +113281,6 @@ self: { description = "Hyena hack handler"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hack-handler-kibro" = callPackage @@ -114814,7 +113313,6 @@ self: { description = "A simplistic HTTP server handler for Hack. (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hack-middleware-cleanpath" = callPackage @@ -114829,7 +113327,6 @@ self: { description = "Applies some basic redirect rules to get cleaner paths. (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hack-middleware-clientsession" = callPackage @@ -114846,7 +113343,6 @@ self: { description = "Middleware for easily keeping session data in client cookies. (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hack-middleware-gzip" = callPackage @@ -114874,7 +113370,6 @@ self: { description = "Automatic wrapping of JSON responses to convert into JSONP. (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hack2" = callPackage @@ -114938,7 +113433,6 @@ self: { description = "Hack2 Happstack server handler"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hack2-handler-mongrel2-http" = callPackage @@ -114960,7 +113454,6 @@ self: { description = "Hack2 Mongrel2 HTTP handler"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hack2-handler-snap-server" = callPackage @@ -114980,7 +113473,6 @@ self: { description = "Hack2 Snap server handler"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hack2-handler-warp" = callPackage @@ -115058,6 +113550,26 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "hackage-db_2_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, exceptions, filepath, tar, time, utf8-string + }: + mkDerivation { + pname = "hackage-db"; + version = "2.1.1"; + sha256 = "16y1iqb3y019hjdsq7q3zx51qy834ky3mw5vszqmzzhflqpicd31"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers directory exceptions + filepath tar time utf8-string + ]; + description = "Access cabal-install's Hackage database via Data.Map"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "hackage-diff" = callPackage ({ mkDerivation, ansi-terminal, async, attoparsec, base, Cabal , cpphs, directory, filepath, haskell-src-exts, HTTP, mtl, process @@ -115275,7 +113787,6 @@ self: { description = "The Hackage web server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hackage-sparks" = callPackage @@ -115343,7 +113854,6 @@ self: { description = "Send new Hackage releases to Twitter"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hackager" = callPackage @@ -115426,7 +113936,6 @@ self: { description = "Generate useful files for Haskell projects"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hackport" = callPackage @@ -115512,7 +114021,6 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haddock" = callPackage @@ -115530,7 +114038,6 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haddock-api_2_23_1" = callPackage @@ -115723,7 +114230,6 @@ self: { description = "Generate docset of Dash by Haddock haskell documentation tool"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hadolint" = callPackage @@ -115736,8 +114242,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "2.3.0"; - sha256 = "03cz3inkkqbdnwwvsf7dhclp9svi8c0lpjmcp81ff9vxr1v6x73x"; + version = "2.4.0"; + sha256 = "1b24hc695v18gpj276wmzpbns6bfn0qjhj30nq6yiqbiq04md1h5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115839,7 +114345,6 @@ self: { description = "Fast command line tools for working with Hadoop"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haeredes" = callPackage @@ -115899,7 +114404,6 @@ self: { description = "A static site generator with blogging/comments support"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haggle" = callPackage @@ -115909,8 +114413,8 @@ self: { }: mkDerivation { pname = "haggle"; - version = "0.1.0.0"; - sha256 = "0fpbmllp0p23c258gam7xm0dvwphw0zpmydmg9ygl4yl1kiav470"; + version = "0.1.0.1"; + sha256 = "1j598hcjw0p9iac4h91w47k4rh9k0h2r9gk3rrfkklvw84aznkrz"; libraryHaskellDepends = [ base containers deepseq hashable monad-primitive primitive ref-tf vector @@ -116110,7 +114614,6 @@ self: { description = "Dynamic launcher of Hails applications"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hairy" = callPackage @@ -116289,7 +114792,6 @@ self: { description = "A package allowing to write Hakyll blog posts in Rmd"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-agda" = callPackage @@ -116307,7 +114809,6 @@ self: { description = "Wrapper to integrate literate Agda files with Hakyll"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-alectryon" = callPackage @@ -116325,7 +114826,6 @@ self: { description = "Hakyll extension for rendering Coq code using Alectryon"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-blaze-templates" = callPackage @@ -116338,7 +114838,6 @@ self: { description = "Blaze templates for Hakyll"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-contrib" = callPackage @@ -116355,7 +114854,6 @@ self: { description = "Extra modules for the hakyll website compiler"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-contrib-csv" = callPackage @@ -116373,7 +114871,6 @@ self: { description = "Generate Html tables from Csv files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-contrib-elm" = callPackage @@ -116393,7 +114890,6 @@ self: { description = "Compile Elm code for inclusion in Hakyll static site"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-contrib-hyphenation" = callPackage @@ -116406,7 +114902,6 @@ self: { description = "automatic hyphenation for Hakyll"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-contrib-i18n" = callPackage @@ -116452,7 +114947,6 @@ self: { description = "A hakyll library that helps maintain a separate links database"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-convert" = callPackage @@ -116502,7 +114996,6 @@ self: { description = "Dhall compiler for Hakyll"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-dir-list" = callPackage @@ -116518,7 +115011,6 @@ self: { description = "Allow Hakyll to create hierarchical menues from directories"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-elm" = callPackage @@ -116534,7 +115026,6 @@ self: { description = "Hakyll wrapper for the Elm compiler"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-favicon" = callPackage @@ -116550,7 +115041,6 @@ self: { testHaskellDepends = [ base ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-filestore" = callPackage @@ -116566,7 +115056,6 @@ self: { description = "FileStore utilities for Hakyll"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-images" = callPackage @@ -116589,7 +115078,6 @@ self: { description = "Hakyll utilities to work with images"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-ogmarkup" = callPackage @@ -116602,7 +115090,6 @@ self: { description = "Integrate ogmarkup document with Hakyll"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-process" = callPackage @@ -116615,7 +115102,6 @@ self: { description = "Hakyll compiler for arbitrary external processes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-sass" = callPackage @@ -116632,7 +115118,6 @@ self: { description = "Hakyll SASS compiler over hsass"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-series" = callPackage @@ -116645,7 +115130,6 @@ self: { description = "Adds series functionality to hakyll"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-shakespeare" = callPackage @@ -116664,7 +115148,6 @@ self: { description = "Hakyll Hamlet compiler"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-shortcode" = callPackage @@ -116705,7 +115188,6 @@ self: { description = "Use shortcut-links in markdown file for Hakyll"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hakyll-typescript" = callPackage @@ -116723,33 +115205,33 @@ self: { description = "Typescript and javascript hakyll compilers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hal" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, conduit, conduit-extra, containers, envy - , exceptions, hspec, http-client, http-types, mtl, text, time - , unordered-containers + , exceptions, hashable, hedgehog, hspec, hspec-hedgehog + , http-client, http-types, mtl, scientific, text, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "hal"; - version = "0.4.7"; - sha256 = "1bf2d4djbw8gpkcgrvjm52hsyw8hv20rsk0qdxfi8aml6mp152k5"; + version = "0.4.8"; + sha256 = "1j3prf81ni5v003byl992dxvvkv8prgmsqmnpkwpd0365ilxyv2y"; revision = "1"; - editedCabalFile = "19hic5cgxyk2nz8nnrz091hv79al49q7ah9pv9d7fwagjzi027ch"; + editedCabalFile = "0jz54lz3wd05b2vabwlid31pyhvjrwbdr35nbqb9kdf13jfdgahr"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive conduit - conduit-extra containers envy exceptions http-client http-types mtl - text time unordered-containers + conduit-extra containers envy exceptions hashable http-client + http-types mtl text time unordered-containers ]; testHaskellDepends = [ - aeson base containers hspec http-client http-types time + aeson base base64-bytestring bytestring case-insensitive containers + hedgehog hspec hspec-hedgehog http-client http-types scientific + text time transformers unordered-containers vector ]; description = "A runtime environment for Haskell applications running on AWS Lambda"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "halberd" = callPackage @@ -116779,7 +115261,6 @@ self: { description = "A tool to generate missing import statements for Haskell modules"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "half" = callPackage @@ -116885,7 +115366,6 @@ self: { description = "Symmetry operations generater of Hall Symbols"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "halma" = callPackage @@ -116895,8 +115375,8 @@ self: { }: mkDerivation { pname = "halma"; - version = "0.3.0.1"; - sha256 = "1bmc7s4vl1k2i66q1ir6mkzn67j5gycshkkwp4d2v1dd86sswf28"; + version = "0.3.0.2"; + sha256 = "1fs2095hp8m5k0iq0ilhxc6qmlasdygx9wjdb6288jssdjbvvpyq"; libraryHaskellDepends = [ aeson base containers data-default diagrams-lib grid ]; @@ -116927,7 +115407,6 @@ self: { description = "GTK application for playing Halma"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "halma-telegram-bot" = callPackage @@ -116953,7 +115432,6 @@ self: { description = "Telegram bot for playing Halma"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haltavista" = callPackage @@ -117028,7 +115506,6 @@ self: { testHaskellDepends = [ base bytestring ]; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hamid" = callPackage @@ -117178,7 +115655,6 @@ self: { description = "Library to handle abstract music"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "han2zen" = callPackage @@ -117415,7 +115891,6 @@ self: { description = "Driver for real ethernet devices for HaNS"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hans-pfq" = callPackage @@ -117589,7 +116064,6 @@ self: { description = "The \"Haskell Applets\" Gtk+ ver. 2 back-end for \"happlets\"."; license = "AGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happraise" = callPackage @@ -117619,7 +116093,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happs-hsp-template" = callPackage @@ -117637,7 +116110,6 @@ self: { description = "Utilities for using HSP templates in HAppS applications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happs-tutorial" = callPackage @@ -117663,7 +116135,6 @@ self: { description = "A Happstack Tutorial that is its own web 2.0-type demo."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happstack" = callPackage @@ -117699,7 +116170,6 @@ self: { description = "A Happstack Authentication Suite"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happstack-authenticate" = callPackage @@ -117730,7 +116200,6 @@ self: { description = "Happstack Authentication Library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happstack-clientsession" = callPackage @@ -117768,7 +116237,6 @@ self: { description = "Web related tools and services"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happstack-data" = callPackage @@ -117791,7 +116259,6 @@ self: { description = "Happstack data manipulation libraries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happstack-dlg" = callPackage @@ -117810,7 +116277,6 @@ self: { description = "Cross-request user interactions for Happstack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happstack-facebook" = callPackage @@ -117837,7 +116303,6 @@ self: { description = "A package for building Facebook applications using Happstack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happstack-fastcgi" = callPackage @@ -117870,7 +116335,6 @@ self: { description = "Support for using Fay with Happstack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happstack-fay-ajax" = callPackage @@ -117962,7 +116426,6 @@ self: { description = "Convenience functions for Happstack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happstack-hsp" = callPackage @@ -118015,7 +116478,6 @@ self: { description = "Efficient relational queries on Haskell sets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happstack-jmacro" = callPackage @@ -118034,7 +116496,6 @@ self: { description = "Support for using JMacro with Happstack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happstack-lite" = callPackage @@ -118083,7 +116544,6 @@ self: { description = "The haskell application server stack + reload"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happstack-server" = callPackage @@ -118170,7 +116630,6 @@ self: { description = "Event-based distributed state"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happstack-static-routing" = callPackage @@ -118233,7 +116692,6 @@ self: { description = "Utilities for using YUI3 with Happstack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happy_1_19_9" = callPackage @@ -118356,7 +116814,6 @@ self: { description = "WebKit Happybara driver"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "happybara-webkit-server" = callPackage @@ -118429,7 +116886,6 @@ self: { description = "A Haskell implementation of the Quil instruction set for quantum computing"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "har" = callPackage @@ -118482,7 +116938,6 @@ self: { description = "Deep embedding of hardware descriptions with code generation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "harg" = callPackage @@ -118501,7 +116956,6 @@ self: { description = "Haskell program configuration using higher kinded data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hark" = callPackage @@ -118521,7 +116975,6 @@ self: { description = "A Gentoo package query tool"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "harmony" = callPackage @@ -118548,7 +117001,6 @@ self: { description = "A web service specification compiler that generates implementation and tests"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haroonga" = callPackage @@ -118586,7 +117038,6 @@ self: { description = "Yet another Groonga http server"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "harp" = callPackage @@ -118665,34 +117116,9 @@ self: { description = "Template Haskell function for Has records"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hasbolt" = callPackage - ({ mkDerivation, base, binary, bytestring, connection, containers - , data-binary-ieee754, data-default, hspec, mtl, network - , QuickCheck, text - }: - mkDerivation { - pname = "hasbolt"; - version = "0.1.4.4"; - sha256 = "0kk1lamyms1mf8d290c3asnvgk51i8sqj810whms2a5346w9n4ll"; - revision = "1"; - editedCabalFile = "1bnbhq6k2af08riyaplfgm2lzghhi3nc0ijiw0yk1y5pq618zhxy"; - libraryHaskellDepends = [ - base binary bytestring connection containers data-binary-ieee754 - data-default mtl network text - ]; - testHaskellDepends = [ - base bytestring containers hspec QuickCheck text - ]; - description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "hasbolt_0_1_4_5" = callPackage ({ mkDerivation, base, binary, bytestring, connection, containers , data-binary-ieee754, data-default, hspec, mtl, network , QuickCheck, text @@ -118710,8 +117136,6 @@ self: { ]; description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hasbolt-extras" = callPackage @@ -118791,8 +117215,8 @@ self: { }: mkDerivation { pname = "hascard"; - version = "0.5.0.1"; - sha256 = "08j3bi6a04pkkf99ghw2h7z1bdisby0d3hyqv559a1pxwpbi7k22"; + version = "0.5.0.2"; + sha256 = "1sh4903x05fwci7nmlqd0f2wjjs5b9bqckmgrkjpnawcnsbby1ds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119151,7 +117575,6 @@ self: { description = "A library for working with HashFlare.io contracts and hashrates"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hashids" = callPackage @@ -119367,7 +117790,6 @@ self: { description = "Generate homepages for cabal packages"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskades" = callPackage @@ -119448,7 +117870,6 @@ self: { description = "A dialect of haskell with order of execution based on dependency resolution"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskbot-core" = callPackage @@ -119496,7 +117917,6 @@ self: { description = "Computes and audits file hashes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskdogs" = callPackage @@ -119534,7 +117954,6 @@ self: { description = "A small scheme interpreter"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskeline_0_8_1_2" = callPackage @@ -119624,7 +118043,6 @@ self: { description = "Haskell Application BlockChain Interface (ABCI) Server Library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-aliyun" = callPackage @@ -119648,7 +118066,6 @@ self: { description = "haskell client of aliyun service"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-awk" = callPackage @@ -119661,10 +118078,8 @@ self: { }: mkDerivation { pname = "haskell-awk"; - version = "1.2"; - sha256 = "14jfw5s3xw7amwasw37mxfinzwvxd6pr64iypmy65z7bkx3l01cj"; - revision = "1"; - editedCabalFile = "1d6smaalvf66h0d9d1vq9q8ldxcvg11m05wg70cbsq3s2vh6iz4p"; + version = "1.2.0.1"; + sha256 = "1r4hsvzbqagk06fc81cr1awfz0zqgs4hmbwl99mip47z578wrw9l"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -119672,15 +118087,15 @@ self: { base bytestring containers ghc list-t stringsearch ]; executableHaskellDepends = [ - base bytestring containers directory exceptions extra filelock - filepath ghc haskell-src-exts hint list-t mtl process stringsearch - template-haskell time transformers + base bytestring containers directory extra filelock filepath ghc + haskell-src-exts hint list-t mtl process template-haskell + transformers ]; testHaskellDepends = [ aeson attoparsec base bytestring containers directory doctest easy-file exceptions extra filelock filepath ghc haskell-src-exts - hint hspec HUnit list-t mtl process stringsearch template-haskell - temporary test-framework test-framework-hunit time transformers + hint hspec HUnit list-t mtl process template-haskell temporary + test-framework test-framework-hunit time transformers ]; description = "Transform text from the command-line using Haskell expressions"; license = lib.licenses.asl20; @@ -119725,7 +118140,6 @@ self: { description = "Complete BitMEX Client"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-bitmex-rest" = callPackage @@ -119944,8 +118358,6 @@ self: { ]; description = "Haskell Debug Adapter"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-disque" = callPackage @@ -119987,7 +118399,6 @@ self: { description = "A program to find and display the docs and type of a name"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-eigen-util" = callPackage @@ -120001,7 +118412,6 @@ self: { description = "Some utility functions for haskell-eigen library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-exp-parser" = callPackage @@ -120083,7 +118493,6 @@ self: { description = "A Haskell ftp server with configurable backend"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-generate" = callPackage @@ -120332,53 +118741,49 @@ self: { }) {}; "haskell-language-server" = callPackage - ({ mkDerivation, aeson, async, base, base16-bytestring, binary - , blaze-markup, brittany, bytestring, containers, cryptohash-sha1 - , data-default, deepseq, directory, extra, filepath, floskell - , fourmolu, fuzzy, ghc, ghc-boot-th, ghc-paths, ghcide, gitrev - , hashable, hie-bios, hiedb, hls-class-plugin, hls-eval-plugin - , hls-explicit-imports-plugin, hls-haddock-comments-plugin - , hls-hlint-plugin, hls-plugin-api, hls-retrie-plugin - , hls-splice-plugin, hls-tactics-plugin, hslogger, hspec - , hspec-core, hspec-expectations, lens, lsp, lsp-test, megaparsec - , mtl, optparse-applicative, optparse-simple, ormolu, process - , regex-tdfa, safe-exceptions, shake, sqlite-simple, stm - , stylish-haskell, tasty, tasty-ant-xml, tasty-expected-failure - , tasty-golden, tasty-hunit, tasty-rerun, temporary, text - , transformers, unordered-containers, with-utf8, yaml + ({ mkDerivation, aeson, aeson-pretty, async, base + , base16-bytestring, binary, bytestring, containers + , cryptohash-sha1, data-default, deepseq, directory, extra + , filepath, floskell, fourmolu, fuzzy, ghc, ghc-boot-th, ghc-paths + , ghcide, gitrev, hashable, hie-bios, hiedb, hls-brittany-plugin + , hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin + , hls-haddock-comments-plugin, hls-hlint-plugin, hls-plugin-api + , hls-retrie-plugin, hls-splice-plugin, hls-stylish-haskell-plugin + , hls-tactics-plugin, hls-test-utils, hslogger, hspec-expectations + , lens, lsp, lsp-test, lsp-types, mtl, optparse-applicative + , optparse-simple, ormolu, process, regex-tdfa, safe-exceptions + , shake, sqlite-simple, temporary, text, transformers + , unordered-containers }: mkDerivation { pname = "haskell-language-server"; - version = "1.0.0.0"; - sha256 = "0jchps7rwsbfq1fsyyf4jgxb4b11d8c3iaq2p4c5vz7vz2d6w1s3"; + version = "1.1.0.0"; + sha256 = "0zbr8qr097mjcsbgdkm6a8ala1ifdajmllr8basvrndn28zgi5cg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base base16-bytestring bytestring containers cryptohash-sha1 - data-default directory extra filepath ghc ghcide gitrev hie-bios - hiedb hls-plugin-api hslogger lsp optparse-applicative - optparse-simple process safe-exceptions shake sqlite-simple text - unordered-containers + aeson-pretty async base base16-bytestring bytestring containers + cryptohash-sha1 data-default directory extra filepath ghc ghcide + gitrev hie-bios hiedb hls-plugin-api hslogger lsp + optparse-applicative optparse-simple process safe-exceptions shake + sqlite-simple text unordered-containers ]; executableHaskellDepends = [ - aeson async base base16-bytestring binary brittany bytestring - containers cryptohash-sha1 data-default deepseq directory extra - filepath floskell fourmolu fuzzy ghc ghc-boot-th ghc-paths ghcide - gitrev hashable hie-bios hiedb hls-class-plugin hls-eval-plugin - hls-explicit-imports-plugin hls-haddock-comments-plugin - hls-hlint-plugin hls-plugin-api hls-retrie-plugin hls-splice-plugin + aeson async base base16-bytestring binary bytestring containers + cryptohash-sha1 data-default deepseq directory extra filepath + floskell fourmolu fuzzy ghc ghc-boot-th ghc-paths ghcide gitrev + hashable hie-bios hiedb hls-brittany-plugin hls-class-plugin + hls-eval-plugin hls-explicit-imports-plugin + hls-haddock-comments-plugin hls-hlint-plugin hls-plugin-api + hls-retrie-plugin hls-splice-plugin hls-stylish-haskell-plugin hls-tactics-plugin hslogger lens lsp mtl optparse-applicative optparse-simple ormolu process regex-tdfa safe-exceptions shake - sqlite-simple stylish-haskell temporary text transformers - unordered-containers with-utf8 + sqlite-simple temporary text transformers unordered-containers ]; testHaskellDepends = [ - aeson base blaze-markup bytestring containers data-default deepseq - directory extra filepath ghcide hie-bios hls-plugin-api hslogger - hspec hspec-core hspec-expectations lens lsp lsp-test megaparsec - process stm tasty tasty-ant-xml tasty-expected-failure tasty-golden - tasty-hunit tasty-rerun temporary text transformers - unordered-containers yaml + aeson base bytestring containers data-default directory extra + filepath ghcide hls-plugin-api hls-test-utils hspec-expectations + lens lsp-test lsp-types process text unordered-containers ]; testToolDepends = [ ghcide ]; description = "LSP server for GHC"; @@ -120726,7 +119131,6 @@ self: { description = "Tool for presenting PDF-based presentations"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-platform-test" = callPackage @@ -120756,7 +119160,6 @@ self: { description = "A test system for the Haskell Platform environment"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-player" = callPackage @@ -120899,7 +119302,6 @@ self: { description = "Reflect Haskell types"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-rules" = callPackage @@ -120947,6 +119349,9 @@ self: { ]; description = "Snake game implemetation in Haskell using SDL2"; license = lib.licenses.gpl3Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "haskell-spacegoo" = callPackage @@ -121013,7 +119418,6 @@ self: { description = "Observable orphan instances for haskell-src-exts"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-src-exts-prisms" = callPackage @@ -121226,7 +119630,6 @@ self: { description = "Utilities to tie up tokens to an AST"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-tools-ast" = callPackage @@ -121244,7 +119647,6 @@ self: { description = "Haskell AST for efficient tooling"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-tools-ast-fromghc" = callPackage @@ -121263,7 +119665,6 @@ self: { description = "Creating the Haskell-Tools AST from GHC's representations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-tools-ast-gen" = callPackage @@ -121281,7 +119682,6 @@ self: { description = "Facilities for generating new parts of the Haskell-Tools AST"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-tools-ast-trf" = callPackage @@ -121298,7 +119698,6 @@ self: { description = "Conversions on Haskell-Tools AST to prepare for refactorings"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-tools-backend-ghc" = callPackage @@ -121317,7 +119716,6 @@ self: { description = "Creating the Haskell-Tools AST from GHC's representations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-tools-builtin-refactorings" = callPackage @@ -121350,7 +119748,6 @@ self: { description = "Refactoring Tool for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-tools-cli" = callPackage @@ -121387,7 +119784,6 @@ self: { description = "Command-line frontend for Haskell-tools Refact"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-tools-daemon" = callPackage @@ -121422,7 +119818,6 @@ self: { description = "Background process for Haskell-tools that editors can connect to"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-tools-debug" = callPackage @@ -121448,7 +119843,6 @@ self: { description = "Debugging Tools for Haskell-tools"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-tools-demo" = callPackage @@ -121480,7 +119874,6 @@ self: { description = "A web-based demo for Haskell-tools Refactor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-tools-experimental-refactorings" = callPackage @@ -121512,7 +119905,6 @@ self: { description = "Refactoring Tool for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-tools-prettyprint" = callPackage @@ -121530,7 +119922,6 @@ self: { description = "Pretty printing of Haskell-Tools AST"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-tools-refactor" = callPackage @@ -121561,7 +119952,6 @@ self: { description = "Refactoring Tool for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-tools-rewrite" = callPackage @@ -121584,7 +119974,6 @@ self: { description = "Facilities for generating new parts of the Haskell-Tools AST"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-tor" = callPackage @@ -121619,7 +120008,6 @@ self: { description = "A Haskell Tor Node"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-type-exts" = callPackage @@ -121792,7 +120180,6 @@ self: { description = "Bracketed HDBC session for HaskellDB"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelldb-connect-hdbc-catchio-mtl" = callPackage @@ -121809,7 +120196,6 @@ self: { description = "Bracketed HaskellDB HDBC session using MonadCatchIO-mtl"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelldb-connect-hdbc-catchio-tf" = callPackage @@ -121827,7 +120213,6 @@ self: { description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelldb-connect-hdbc-catchio-transformers" = callPackage @@ -121845,7 +120230,6 @@ self: { description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelldb-connect-hdbc-lifted" = callPackage @@ -121863,7 +120247,6 @@ self: { description = "Bracketed HaskellDB HDBC session using lifted-base"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelldb-dynamic" = callPackage @@ -121879,7 +120262,6 @@ self: { description = "HaskellDB support for the dynamically loaded drivers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelldb-flat" = callPackage @@ -121898,7 +120280,6 @@ self: { description = "An experimental HaskellDB back-end in pure Haskell (no SQL)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelldb-hdbc" = callPackage @@ -121915,7 +120296,6 @@ self: { description = "HaskellDB support for HDBC"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelldb-hdbc-mysql" = callPackage @@ -121934,7 +120314,6 @@ self: { description = "HaskellDB support for the HDBC MySQL driver"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelldb-hdbc-odbc" = callPackage @@ -121953,7 +120332,6 @@ self: { description = "HaskellDB support for the HDBC ODBC driver"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelldb-hdbc-postgresql" = callPackage @@ -121973,7 +120351,6 @@ self: { description = "HaskellDB support for the HDBC PostgreSQL driver"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) postgresql;}; "haskelldb-hdbc-sqlite3" = callPackage @@ -121992,7 +120369,6 @@ self: { description = "HaskellDB support for the HDBC SQLite driver"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelldb-hsql" = callPackage @@ -122005,7 +120381,6 @@ self: { description = "HaskellDB support for HSQL"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelldb-hsql-mysql" = callPackage @@ -122024,7 +120399,6 @@ self: { description = "HaskellDB support for the HSQL MySQL driver"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelldb-hsql-odbc" = callPackage @@ -122043,7 +120417,6 @@ self: { description = "HaskellDB support for the HSQL ODBC driver"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelldb-hsql-oracle" = callPackage @@ -122081,7 +120454,6 @@ self: { description = "HaskellDB support for the HSQL PostgreSQL driver"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelldb-hsql-sqlite" = callPackage @@ -122119,7 +120491,6 @@ self: { description = "HaskellDB support for the HSQL SQLite3 driver"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelldb-th" = callPackage @@ -122132,7 +120503,6 @@ self: { description = "Template Haskell utilities for HaskellDB"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelldb-wx" = callPackage @@ -122160,8 +120530,6 @@ self: { ]; description = "For parsing Haskell-ish languages"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskellscrabble" = callPackage @@ -122239,7 +120607,6 @@ self: { description = "Elm to Haskell translation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskelzinc" = callPackage @@ -122347,7 +120714,6 @@ self: { description = "A monad transformer supporting Haskey transactions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskgame" = callPackage @@ -122360,7 +120726,6 @@ self: { description = "Haskell game library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskheap" = callPackage @@ -122483,7 +120848,6 @@ self: { description = "An adapter for haskoin to network-bitcoin"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskoin-core" = callPackage @@ -122516,7 +120880,6 @@ self: { description = "Bitcoin & Bitcoin Cash library for Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskoin-crypto" = callPackage @@ -122540,7 +120903,6 @@ self: { description = "Implementation of Bitcoin cryptographic primitives"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskoin-node" = callPackage @@ -122573,7 +120935,6 @@ self: { description = "P2P library for Bitcoin and Bitcoin Cash"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskoin-protocol" = callPackage @@ -122597,7 +120958,6 @@ self: { description = "Implementation of the Bitcoin network protocol messages"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskoin-script" = callPackage @@ -122623,7 +120983,6 @@ self: { description = "Implementation of Bitcoin script parsing and evaluation"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskoin-store" = callPackage @@ -122639,8 +120998,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.52.8"; - sha256 = "14qwdh0fwyqhb3pgykprgp1vs78y4ixn2dn55bsi9x53cjjvp1qp"; + version = "0.52.9"; + sha256 = "12zpjb42j048afaz1ay8ay8j35dhpgiv58cfnm69j8lndcb71q4g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122674,7 +121033,6 @@ self: { description = "Storage and index for Bitcoin and Bitcoin Cash"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskoin-store-data" = callPackage @@ -122686,8 +121044,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.52.6"; - sha256 = "0npiib582rnbk3w9f0m71y84xpk7akzkypfxrd9n1s4h3dh0qsfw"; + version = "0.52.9"; + sha256 = "1hh3yxxnwxqvjjcl45k7cpr25imnl9sghzv85i4l1n1vgs10p0nd"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -122704,7 +121062,6 @@ self: { description = "Data for Haskoin Store"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskoin-util" = callPackage @@ -122772,7 +121129,6 @@ self: { description = "Implementation of a Bitcoin SPV Wallet with BIP32 and multisig support"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskoon" = callPackage @@ -122791,7 +121147,6 @@ self: { description = "Web Application Abstraction"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskoon-httpspec" = callPackage @@ -122808,7 +121163,6 @@ self: { description = "Integrating HttpSpec with Haskoon"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskoon-salvia" = callPackage @@ -122827,7 +121181,6 @@ self: { description = "Integrating HttpSpec with Haskoon"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskore" = callPackage @@ -122872,7 +121225,6 @@ self: { description = "Routines for realtime playback of Haskore songs"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskore-supercollider" = callPackage @@ -122895,7 +121247,6 @@ self: { description = "Haskore back-end for SuperCollider"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskore-synthesizer" = callPackage @@ -122916,7 +121267,6 @@ self: { description = "Music rendering coded in Haskell"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskore-vintage" = callPackage @@ -123011,7 +121361,6 @@ self: { description = "Torch for tensors and neural networks in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hasktorch-codegen" = callPackage @@ -123102,7 +121451,6 @@ self: { description = "Bindings to Cutorch"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {ATen = null;}; "hasktorch-indef" = callPackage @@ -123132,7 +121480,6 @@ self: { description = "Core Hasktorch abstractions wrapping FFI bindings"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hasktorch-signatures" = callPackage @@ -123159,7 +121506,6 @@ self: { description = "Backpack signatures for Tensor operations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hasktorch-signatures-partial" = callPackage @@ -123256,7 +121602,6 @@ self: { description = "Neural architectures in hasktorch"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskus-binary" = callPackage @@ -123302,8 +121647,6 @@ self: { ]; description = "Haskus system build tool"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskus-utils" = callPackage @@ -123326,8 +121669,6 @@ self: { ]; description = "Haskus utility modules"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskus-utils-compat" = callPackage @@ -123345,7 +121686,6 @@ self: { description = "Compatibility modules with other external packages (ByteString, etc.)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskus-utils-data" = callPackage @@ -123363,8 +121703,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Haskus data utility modules"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskus-utils-types" = callPackage @@ -123377,8 +121715,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Haskus types utility modules"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskus-utils-variant" = callPackage @@ -123401,8 +121737,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ]; description = "Variant and EADT"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskus-web" = callPackage @@ -123420,7 +121754,6 @@ self: { description = "Haskus web"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskyapi" = callPackage @@ -123469,7 +121802,6 @@ self: { description = "Loan calculator engine"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hasloGUI" = callPackage @@ -123489,7 +121821,6 @@ self: { description = "Loan calculator Gtk GUI. Based on haslo (Haskell Loan) library."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hasmin" = callPackage @@ -123534,7 +121865,6 @@ self: { description = "This package enables to write SPARQL queries to remote endpoints"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haspell" = callPackage @@ -123638,7 +121968,6 @@ self: { description = "A declarative abstraction over PostgreSQL Cursor"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hasql-cursor-transaction" = callPackage @@ -123834,7 +122163,6 @@ self: { description = "A \"PostgreSQL\" backend for the \"hasql\" library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hasql-postgres-options" = callPackage @@ -123850,7 +122178,6 @@ self: { description = "An \"optparse-applicative\" parser for \"hasql-postgres\""; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hasql-queue" = callPackage @@ -123886,7 +122213,6 @@ self: { description = "A PostgreSQL backed queue"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hasql-simple" = callPackage @@ -123923,8 +122249,6 @@ self: { ]; description = "Template Haskell utilities for Hasql"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hasql-transaction" = callPackage @@ -123959,8 +122283,6 @@ self: { testHaskellDepends = [ base hasql tasty tasty-quickcheck ]; description = "Parse PostgreSQL connection URI into Hasql.Connection Settings"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hasqly-mysql" = callPackage @@ -124023,7 +122345,6 @@ self: { description = "render hastache templates using aeson values"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haste" = callPackage @@ -124059,7 +122380,6 @@ self: { description = "Framework for type-safe, distributed web applications"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haste-compiler" = callPackage @@ -124123,7 +122443,6 @@ self: { description = "Base libraries for haste-compiler"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haste-markup" = callPackage @@ -124139,7 +122458,6 @@ self: { description = "A port of blaze-markup and blaze-html to Haste"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haste-perch" = callPackage @@ -124439,7 +122757,6 @@ self: { description = "A twitter client for GTK+. Beta version."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hax" = callPackage @@ -124611,7 +122928,6 @@ self: { description = "A simple HTTP proxy server library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hayland" = callPackage @@ -124673,7 +122989,6 @@ self: { description = "N-back memory game"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hbayes" = callPackage @@ -124704,7 +123019,6 @@ self: { description = "Bayesian Networks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hbb" = callPackage @@ -124722,7 +123036,6 @@ self: { description = "Haskell Busy Bee, a backend for text editors"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hbcd" = callPackage @@ -124735,7 +123048,6 @@ self: { description = "Packed binary-coded decimal (BCD) serialization"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hbeanstalk" = callPackage @@ -124810,7 +123122,6 @@ self: { description = "An optimizing Brainfuck compiler and evaluator"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hblas" = callPackage @@ -124998,7 +123309,6 @@ self: { description = "haskell cg (minus) (cairo rendering)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hcheat" = callPackage @@ -125012,40 +123322,40 @@ self: { description = "A collection of code cheatsheet"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hcheckers" = callPackage ({ mkDerivation, aeson, array, base, binary, bits, bytes , bytestring, clock, concurrent-extra, containers, data-default - , directory, ekg, ekg-core, exceptions, fast-logger, filepath - , hashable, hashtables, heavy-logger, hsyslog, http-types - , megaparsec, microlens, monad-metrics, mtl, mwc-random, network - , optparse-applicative, psqueues, random, random-access-file - , random-shuffle, scotty, stm, stm-containers, store - , template-haskell, text, text-format-heavy, unix, unix-bytestring - , unordered-containers, vector, wai, warp, yaml + , directory, ekg, ekg-core, exceptions, fast-logger, filepath, Glob + , hashable, hashtables, heavy-logger, hsyslog, http-types, list-t + , megaparsec, microlens, modern-uri, monad-metrics, mtl, mwc-random + , network, optparse-applicative, psqueues, random + , random-access-file, random-shuffle, req, scotty, stm + , stm-containers, store, template-haskell, text, text-format-heavy + , unix, unix-bytestring, unordered-containers, vector, wai, warp + , yaml }: mkDerivation { pname = "hcheckers"; - version = "0.1.0.1"; - sha256 = "1l4cj7v4scnz5cq05294ym4gyv163ry09bpxp1vg1m1v88ww5i2w"; + version = "0.1.0.2"; + sha256 = "1v4hnqvi47kn10c1rjgsggxmajy7xnl462ghb2fs61ksbmrdi5b8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson array base binary bits bytes bytestring clock concurrent-extra containers data-default directory ekg ekg-core - exceptions fast-logger filepath hashable hashtables heavy-logger - hsyslog http-types megaparsec microlens monad-metrics mtl - mwc-random network optparse-applicative psqueues random - random-access-file random-shuffle scotty stm stm-containers store - template-haskell text text-format-heavy unix unix-bytestring - unordered-containers vector wai warp yaml + exceptions fast-logger filepath Glob hashable hashtables + heavy-logger hsyslog http-types list-t megaparsec microlens + modern-uri monad-metrics mtl mwc-random network + optparse-applicative psqueues random random-access-file + random-shuffle req scotty stm stm-containers store template-haskell + text text-format-heavy unix unix-bytestring unordered-containers + vector wai warp yaml ]; description = "Implementation of checkers (\"draughts\") board game - server application"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hchesslib" = callPackage @@ -125342,7 +123652,6 @@ self: { description = "Haskell Database Independent interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hdbi-conduit" = callPackage @@ -125364,7 +123673,6 @@ self: { description = "Conduit glue for HDBI"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hdbi-postgresql" = callPackage @@ -125393,7 +123701,6 @@ self: { description = "PostgreSQL driver for hdbi"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hdbi-sqlite" = callPackage @@ -125414,7 +123721,6 @@ self: { description = "SQlite driver for HDBI"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hdbi-tests" = callPackage @@ -125435,7 +123741,6 @@ self: { description = "test suite for testing HDBI"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hdevtools" = callPackage @@ -125475,7 +123780,6 @@ self: { description = "HDF: Uniform Rate Audio Signal Processing in Haskell"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hdf5-lite" = callPackage @@ -125529,7 +123833,6 @@ self: { description = "Pattern-Expression-based differencing of arbitrary types"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hdigest" = callPackage @@ -125565,7 +123868,6 @@ self: { description = "An IDL compiler for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hdis86" = callPackage @@ -125662,7 +123964,6 @@ self: { description = "Haskell docs tool"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hdph" = callPackage @@ -125690,7 +123991,6 @@ self: { description = "Haskell distributed parallel Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hdph-closure" = callPackage @@ -125884,7 +124184,6 @@ self: { description = "An opinionated app prelude and framework in the UnliftIO style"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "heart-core" = callPackage @@ -125917,8 +124216,6 @@ self: { libraryHaskellDepends = [ async base io-streams time ]; description = "Heartbeats for io-streams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "heatitup" = callPackage @@ -125949,7 +124246,6 @@ self: { description = "Find and annotate ITDs"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "heatitup-complete" = callPackage @@ -125973,8 +124269,6 @@ self: { ]; description = "Find and annotate ITDs with assembly or read pair joining"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "heatshrink" = callPackage @@ -126009,7 +124303,6 @@ self: { description = "Simle api for heavy logger"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "heavy-logger" = callPackage @@ -126032,7 +124325,6 @@ self: { description = "Full-weight logging based on fast-logger"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "heavy-logger-amazon" = callPackage @@ -126049,7 +124341,6 @@ self: { description = "heavy-logger compatibility with amazonka-core logging"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "heavy-logger-instances" = callPackage @@ -126071,7 +124362,6 @@ self: { description = "Orphan instances for data types in heavy-logger package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hebrew-time" = callPackage @@ -126099,7 +124389,6 @@ self: { description = "Elliptic Curve Cryptography for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "heckin" = callPackage @@ -126157,6 +124446,7 @@ self: { ]; description = "Release with confidence"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "hedgehog-checkers" = callPackage @@ -126186,7 +124476,6 @@ self: { testHaskellDepends = [ base hedgehog hedgehog-checkers lens ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hedgehog-classes" = callPackage @@ -126230,8 +124519,6 @@ self: { testHaskellDepends = [ base containers fakedata hedgehog ]; description = "Use 'fakedata' with 'hedgehog'"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hedgehog-fn" = callPackage @@ -126285,7 +124572,6 @@ self: { description = "JSON generators for Hedgehog"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hedgehog-generic" = callPackage @@ -126463,7 +124749,6 @@ self: { description = "Caching mandatory data with Redis"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hedis-simple" = callPackage @@ -126534,8 +124819,6 @@ self: { ]; description = "Base functor for EDN AST"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hedra" = callPackage @@ -126581,7 +124864,6 @@ self: { description = "Tidy data in Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hein" = callPackage @@ -126661,7 +124943,6 @@ self: { description = "Use JSON directly from Heist templates"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "heist-async" = callPackage @@ -126723,7 +125004,6 @@ self: { description = "New Relic® agent SDK wrapper for Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {newrelic-collector-client = null; newrelic-common = null; newrelic-transaction = null;}; @@ -126743,7 +125023,6 @@ self: { description = "New Relic® agent SDK wrapper for wai"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "helisp" = callPackage @@ -126783,7 +125062,6 @@ self: { description = "The Helium Compiler"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "helium-overture" = callPackage @@ -126871,7 +125149,6 @@ self: { description = "Distributed hackage mirror"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hellnet" = callPackage @@ -126897,7 +125174,6 @@ self: { description = "Simple, distributed, anonymous data sharing network"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hello" = callPackage @@ -127011,7 +125287,6 @@ self: { description = "Haskell port of the Emokit EEG project"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hen" = callPackage @@ -127033,7 +125308,6 @@ self: { description = "Haskell bindings to Xen hypervisor interface"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {xenctrl = null;}; "henet" = callPackage @@ -127049,7 +125323,6 @@ self: { description = "Bindings and high level interface for to ENet v1.3.9"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hepevt" = callPackage @@ -127062,7 +125335,6 @@ self: { description = "HEPEVT parser"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "her-lexer" = callPackage @@ -127088,7 +125360,6 @@ self: { description = "Parsec frontend to \"her-lexer\" for Haskell source code"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "herbalizer" = callPackage @@ -127416,7 +125687,6 @@ self: { description = "Haskell Equational Reasoning Model-to-Implementation Tunnel"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hermit-syb" = callPackage @@ -127433,7 +125703,6 @@ self: { description = "HERMIT plugin for optimizing Scrap-Your-Boilerplate traversals"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "herms" = callPackage @@ -127518,7 +125787,6 @@ self: { description = "A library for compiling and serving static web assets"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "herringbone-embed" = callPackage @@ -127536,7 +125804,6 @@ self: { description = "Embed preprocessed web assets in your executable with Template Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "herringbone-wai" = callPackage @@ -127554,7 +125821,6 @@ self: { description = "Wai adapter for the Herringbone web asset preprocessor"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hesh" = callPackage @@ -127582,7 +125848,6 @@ self: { description = "the Haskell Extensible Shell: Haskell for Bash-style scripts"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hesql" = callPackage @@ -127601,7 +125866,6 @@ self: { description = "Haskell's embedded SQL"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hetero-dict" = callPackage @@ -127685,7 +125949,6 @@ self: { description = "A heterogeneous list type"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hetris" = callPackage @@ -127786,7 +126049,6 @@ self: { description = "Genetic Mona Lisa problem in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hevolisa-dph" = callPackage @@ -127806,7 +126068,6 @@ self: { description = "Genetic Mona Lisa problem in Haskell - using Data Parallel Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hex" = callPackage @@ -127830,8 +126091,6 @@ self: { testHaskellDepends = [ base bytestring text ]; description = "ByteString-Text hexidecimal conversions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hexchat" = callPackage @@ -127974,7 +126233,6 @@ self: { description = "Chunked XML parsing using iteratees"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hexpat-lens" = callPackage @@ -128175,8 +126433,6 @@ self: { ]; description = "Streaming-friendly XML parsers"; license = lib.licenses.cc0; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "heyefi" = callPackage @@ -128231,8 +126487,6 @@ self: { ]; description = "Heyting and Boolean algebras"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hfann" = callPackage @@ -128269,7 +126523,6 @@ self: { description = "Flash debugger"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hfiar" = callPackage @@ -128286,7 +126539,6 @@ self: { description = "Four in a Row in Haskell!!"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hflags" = callPackage @@ -128474,7 +126726,6 @@ self: { description = "Haskell Genetic Algorithm Library"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hgdbmi" = callPackage @@ -128530,7 +126781,6 @@ self: { description = "Random generation of modal and hybrid logic formulas"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hgeometric" = callPackage @@ -128667,7 +126917,6 @@ self: { description = "Writing geometric primitives from HGeometry as SVG Files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hgeos" = callPackage @@ -128682,8 +126931,6 @@ self: { testHaskellDepends = [ base MissingH ]; description = "Simple Haskell bindings to GEOS C API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) geos;}; "hgettext" = callPackage @@ -128754,7 +127001,6 @@ self: { description = "Haskell bindings to the GitHub API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hgl-example" = callPackage @@ -128784,8 +127030,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Haskell interface to GMP"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hgom" = callPackage @@ -128918,8 +127162,6 @@ self: { ]; description = "Happy Haskell Programming"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hhwloc" = callPackage @@ -129024,7 +127266,6 @@ self: { description = "Relatively efficient Tcl interpreter with support for basic operations"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hichi" = callPackage @@ -129105,6 +127346,9 @@ self: { librarySystemDepends = [ systemd ]; description = "Haskell bindings to HIDAPI"; license = lib.licenses.mit; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) systemd;}; "hidden-char" = callPackage @@ -129277,8 +127521,6 @@ self: { ]; description = "Draw diagrams of dendrograms made by hierarchical-clustering"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hierarchical-env" = callPackage @@ -129288,8 +127530,8 @@ self: { }: mkDerivation { pname = "hierarchical-env"; - version = "0.2.0.0"; - sha256 = "1hslf8wppwbs9r40kfvxwnw6vxwa4fm2fjdfmxn0grpbpwz1qvf5"; + version = "0.2.0.1"; + sha256 = "162d54hxsflhns09d35nz4wyy3im45z8rsra8fjypxdr9z3j38hf"; libraryHaskellDepends = [ base method microlens microlens-mtl microlens-th rio template-haskell th-abstraction @@ -129301,6 +127543,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "hierarchical environments for dependency injection"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hierarchical-exceptions" = callPackage @@ -129345,7 +127589,6 @@ self: { description = "Hierarchical spectral clustering of a graph"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hierarchy" = callPackage @@ -129523,7 +127766,6 @@ self: { description = "Derive swagger instances from highjson specs"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "highjson-th" = callPackage @@ -129545,7 +127787,6 @@ self: { description = "Template Haskell helpers for highjson specs"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "highlight" = callPackage @@ -129736,7 +127977,6 @@ self: { description = "multithreaded snmp poller for riemann"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hindent" = callPackage @@ -129771,8 +128011,6 @@ self: { ]; description = "Extensible Haskell pretty printer"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hindley-milner" = callPackage @@ -129818,7 +128056,6 @@ self: { description = "Interface and utilities for classifiers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hinduce-classifier-decisiontree" = callPackage @@ -129837,7 +128074,6 @@ self: { description = "Decision Tree Classifiers for hInduce"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hinduce-examples" = callPackage @@ -129858,7 +128094,6 @@ self: { description = "Example data for hInduce"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hinduce-missingh" = callPackage @@ -129967,6 +128202,9 @@ self: { ]; description = "Haskell binding to inotify, using ByteString filepaths"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "hinquire" = callPackage @@ -130042,7 +128280,6 @@ self: { description = "A server process that runs hint"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hinter" = callPackage @@ -130109,7 +128346,6 @@ self: { description = "Space Invaders"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hinze-streams" = callPackage @@ -130122,7 +128358,6 @@ self: { description = "Streams and Unique Fixed Points"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hip" = callPackage @@ -130147,8 +128382,6 @@ self: { ]; description = "Haskell Image Processing (HIP) Library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hipbot" = callPackage @@ -130174,7 +128407,6 @@ self: { description = "A library for building HipChat Bots"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hipchat-hs" = callPackage @@ -130262,7 +128494,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hipsql-monad" = callPackage @@ -130295,7 +128526,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hircules" = callPackage @@ -130337,7 +128567,6 @@ self: { description = "Calculates IRT 2PL and 3PL models"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hissmetrics" = callPackage @@ -130379,7 +128608,6 @@ self: { description = "Umbrella package for the historical dictionary of Polish"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hist-pl-dawg" = callPackage @@ -130395,7 +128623,6 @@ self: { description = "A generic, DAWG-based dictionary"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hist-pl-fusion" = callPackage @@ -130413,7 +128640,6 @@ self: { description = "Merging historical dictionary with PoliMorf"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hist-pl-lexicon" = callPackage @@ -130431,7 +128657,6 @@ self: { description = "A binary representation of the historical dictionary of Polish"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hist-pl-lmf" = callPackage @@ -130444,7 +128669,6 @@ self: { description = "LMF parsing for the historical dictionary of Polish"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hist-pl-transliter" = callPackage @@ -130554,7 +128778,6 @@ self: { description = "Git like program in haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hit-graph" = callPackage @@ -130571,7 +128794,6 @@ self: { description = "Use graph algorithms to access and manipulate Git repos"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hit-on" = callPackage @@ -130745,7 +128967,6 @@ self: { description = "JSON Schema library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hjugement" = callPackage @@ -130796,7 +129017,6 @@ self: { description = "Majority Judgment and Helios-C command line tool"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hjugement-protocol" = callPackage @@ -130896,8 +129116,8 @@ self: { }: mkDerivation { pname = "hkgr"; - version = "0.2.7"; - sha256 = "1p03qigrfkjj0q8ps9gx50pnz6s2rdmn2lqnybhfz8pifsqj0z7k"; + version = "0.3"; + sha256 = "1w8ww2dkskdfs0lh6wbn5byhnrf6mwih7n5yp81fr6awdc0k1qrm"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -130985,7 +129205,6 @@ self: { description = "Fast algorithm for mining closed frequent itemsets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hleap" = callPackage @@ -131077,7 +129296,6 @@ self: { description = "Web API server for the hledger accounting tool"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hledger-chart" = callPackage @@ -131602,8 +129820,6 @@ self: { ]; description = "High-level Redis Database"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hlrdb-core" = callPackage @@ -131622,8 +129838,6 @@ self: { ]; description = "High-level Redis Database Core API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls" = callPackage @@ -131637,7 +129851,6 @@ self: { description = "Haskell Lindenmayer Systems"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-brittany-plugin" = callPackage @@ -131656,23 +129869,26 @@ self: { testHaskellDepends = [ base bytestring hls-test-utils text ]; description = "Integration with the Brittany code formatter"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {hls-test-utils = null;}; + }) {}; "hls-class-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, ghc, ghc-exactprint - , ghcide, hls-plugin-api, lens, lsp, shake, text, transformers + ({ mkDerivation, aeson, base, bytestring, containers, filepath, ghc + , ghc-exactprint, ghcide, hls-plugin-api, hls-test-utils, lens, lsp + , lsp-test, lsp-types, shake, text, transformers , unordered-containers }: mkDerivation { pname = "hls-class-plugin"; - version = "1.0.0.0"; - sha256 = "103rswyrbs35q6mmv19bnj4cp4r1n5mx6aazcabfakh1cix0fn60"; + version = "1.0.0.1"; + sha256 = "0s9pkdcgvfb9qhj9qjy6bygdyshanczcn9apq3qcw8yznl1zqilc"; libraryHaskellDepends = [ aeson base containers ghc ghc-exactprint ghcide hls-plugin-api lens lsp shake text transformers unordered-containers ]; + testHaskellDepends = [ + base bytestring filepath hls-test-utils lens lsp-test lsp-types + text + ]; description = "Class/instance management plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; @@ -131680,15 +129896,15 @@ self: { "hls-eval-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, Diff, directory , dlist, extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide - , hashable, hls-plugin-api, lens, lsp, lsp-types, megaparsec, mtl - , parser-combinators, pretty-simple, QuickCheck, safe-exceptions - , shake, temporary, text, time, transformers, unliftio - , unordered-containers + , hashable, hls-plugin-api, hls-test-utils, lens, lsp, lsp-test + , lsp-types, megaparsec, mtl, parser-combinators, pretty-simple + , QuickCheck, safe-exceptions, shake, temporary, text, time + , transformers, unliftio, unordered-containers }: mkDerivation { pname = "hls-eval-plugin"; - version = "1.0.0.0"; - sha256 = "0pslyhgvs6xrwijkyf4jdh873mnsb8iijmkbc9aq3dljdy080fdg"; + version = "1.1.0.0"; + sha256 = "138l49a8y0g7yk29xdjs0jv0xmz3y8lvig45g944spj3xi8snpfx"; libraryHaskellDepends = [ aeson base containers deepseq Diff directory dlist extra filepath ghc ghc-boot-th ghc-paths ghcide hashable hls-plugin-api lens lsp @@ -131696,6 +129912,10 @@ self: { QuickCheck safe-exceptions shake temporary text time transformers unliftio unordered-containers ]; + testHaskellDepends = [ + aeson base directory extra filepath hls-test-utils lens lsp-test + lsp-types text + ]; description = "Eval plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; @@ -131720,24 +129940,6 @@ self: { }) {}; "hls-explicit-imports-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide - , hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers - }: - mkDerivation { - pname = "hls-explicit-imports-plugin"; - version = "1.0.0.0"; - sha256 = "14j89l8pkxrffllg06fj6215xqdswrbndyv5xa22f0g00acmwi6w"; - revision = "1"; - editedCabalFile = "0gch9wkz1h4g06xc48jhvs06jji9d0npa2zrj2gv1cbf6hjs0s92"; - libraryHaskellDepends = [ - aeson base containers deepseq ghc ghcide hls-plugin-api lsp - lsp-types shake text unordered-containers - ]; - description = "Explicit imports plugin for Haskell Language Server"; - license = lib.licenses.asl20; - }) {}; - - "hls-explicit-imports-plugin_1_0_0_1" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide , hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers }: @@ -131751,21 +129953,55 @@ self: { ]; description = "Explicit imports plugin for Haskell Language Server"; license = lib.licenses.asl20; + }) {}; + + "hls-explicit-imports-plugin_1_0_0_2" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide + , hls-graph, hls-plugin-api, lsp, lsp-types, text + , unordered-containers + }: + mkDerivation { + pname = "hls-explicit-imports-plugin"; + version = "1.0.0.2"; + sha256 = "1ga7phiy7i6kmin0zi0dykbkv29vh46hzrn0bkvfqjkrb41mbi8q"; + libraryHaskellDepends = [ + aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api + lsp lsp-types text unordered-containers + ]; + description = "Explicit imports plugin for Haskell Language Server"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; }) {}; + "hls-graph" = callPackage + ({ mkDerivation, base, bytestring, shake, unordered-containers }: + mkDerivation { + pname = "hls-graph"; + version = "1.3.0.0"; + sha256 = "0mz9443jljwgi2zd6gafixfp2k8gpnrn5269qb9bjd5p4ai0bbp7"; + libraryHaskellDepends = [ + base bytestring shake unordered-containers + ]; + description = "Haskell Language Server internal graph API"; + license = lib.licenses.asl20; + }) {}; + "hls-haddock-comments-plugin" = callPackage - ({ mkDerivation, base, containers, ghc, ghc-exactprint, ghcide - , hls-plugin-api, lsp-types, text, unordered-containers + ({ mkDerivation, base, bytestring, containers, filepath, ghc + , ghc-exactprint, ghcide, hls-plugin-api, hls-test-utils, lsp-types + , text, unordered-containers }: mkDerivation { pname = "hls-haddock-comments-plugin"; - version = "1.0.0.0"; - sha256 = "1azy3rrbdi465c65f603ycj14mz1cvc9h92rrf0b0frs90hs66r3"; + version = "1.0.0.1"; + sha256 = "1qny8y52myd3ic893wxapbqhfdcdbil8acky91lfcylr9141154i"; libraryHaskellDepends = [ base containers ghc ghc-exactprint ghcide hls-plugin-api lsp-types text unordered-containers ]; + testHaskellDepends = [ + base bytestring filepath hls-test-utils text + ]; description = "Haddock comments plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; @@ -131779,8 +130015,8 @@ self: { }: mkDerivation { pname = "hls-hlint-plugin"; - version = "1.0.0.1"; - sha256 = "0hnfh6x8l20nrj54hpkkq2yj8xkgw15xcba27hagapam2yxi1xga"; + version = "1.0.0.2"; + sha256 = "1qi654azf4l24sc7zaimbxm7z59xfvdvn33fsa5d8y7910w17d73"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default deepseq Diff directory extra filepath ghc ghc-exactprint ghcide @@ -131799,8 +130035,8 @@ self: { }: mkDerivation { pname = "hls-plugin-api"; - version = "1.0.0.0"; - sha256 = "03pj0irgf9p84jn5kfd4cfyqk4xyfdf9pfrwqhb0c1ipnm4l7wal"; + version = "1.1.0.0"; + sha256 = "1i18a5gxa409882zpviy4paldaq43j4z1zmgr9mag2mn64vplrxy"; libraryHaskellDepends = [ aeson base containers data-default dependent-map dependent-sum Diff dlist hashable hslogger lens lsp opentelemetry process regex-tdfa @@ -131810,20 +130046,20 @@ self: { license = lib.licenses.asl20; }) {}; - "hls-plugin-api_1_1_0_0" = callPackage + "hls-plugin-api_1_1_0_1" = callPackage ({ mkDerivation, aeson, base, containers, data-default - , dependent-map, dependent-sum, Diff, dlist, hashable, hslogger - , lens, lsp, opentelemetry, process, regex-tdfa, shake, text, unix - , unordered-containers + , dependent-map, dependent-sum, Diff, dlist, hashable, hls-graph + , hslogger, lens, lsp, opentelemetry, process, regex-tdfa, text + , unix, unordered-containers }: mkDerivation { pname = "hls-plugin-api"; - version = "1.1.0.0"; - sha256 = "1i18a5gxa409882zpviy4paldaq43j4z1zmgr9mag2mn64vplrxy"; + version = "1.1.0.1"; + sha256 = "0xxkpaqnzm39blgaa2f9v35pwnp8rx3jbmgysnsnb9nchnjprg9z"; libraryHaskellDepends = [ aeson base containers data-default dependent-map dependent-sum Diff - dlist hashable hslogger lens lsp opentelemetry process regex-tdfa - shake text unix unordered-containers + dlist hashable hls-graph hslogger lens lsp opentelemetry process + regex-tdfa text unix unordered-containers ]; description = "Haskell Language Server API for plugin communication"; license = lib.licenses.asl20; @@ -131831,24 +130067,6 @@ self: { }) {}; "hls-retrie-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, directory, extra - , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie - , safe-exceptions, shake, text, transformers, unordered-containers - }: - mkDerivation { - pname = "hls-retrie-plugin"; - version = "1.0.0.0"; - sha256 = "1m4r6nxbq1lvjkl6g1i0lbxdx4zimw6g478alnqv8n208q6fiw26"; - libraryHaskellDepends = [ - aeson base containers deepseq directory extra ghc ghcide hashable - hls-plugin-api lsp lsp-types retrie safe-exceptions shake text - transformers unordered-containers - ]; - description = "Retrie integration plugin for Haskell Language Server"; - license = lib.licenses.asl20; - }) {}; - - "hls-retrie-plugin_1_0_0_2" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, directory, extra , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie , safe-exceptions, shake, text, transformers, unordered-containers @@ -131857,6 +130075,8 @@ self: { pname = "hls-retrie-plugin"; version = "1.0.0.2"; sha256 = "0jw1q0dk5jl80wbyvi1a6vszj9x3s7d2bnsbnyycbh4zgl33agwb"; + revision = "1"; + editedCabalFile = "03r3cb93493hr4rbd8n1ip63myssfycyijg2507kcmsly39i2qkz"; libraryHaskellDepends = [ aeson base containers deepseq directory extra ghc ghcide hashable hls-plugin-api lsp lsp-types retrie safe-exceptions shake text @@ -131864,64 +130084,99 @@ self: { ]; description = "Retrie integration plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hls-splice-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, dlist, extra, foldl, ghc - , ghc-exactprint, ghcide, hls-plugin-api, lens, lsp, retrie, shake - , syb, text, transformers, unliftio-core, unordered-containers + ({ mkDerivation, aeson, base, containers, directory, dlist, extra + , filepath, foldl, ghc, ghc-exactprint, ghcide, hls-plugin-api + , hls-test-utils, lens, lsp, retrie, shake, syb, text, transformers + , unliftio-core, unordered-containers }: mkDerivation { pname = "hls-splice-plugin"; - version = "1.0.0.0"; - sha256 = "1xm9ji64g89fn4b81gd5g0ijv88b2zhyn303hr3jxhydqpfcipjb"; + version = "1.0.0.1"; + sha256 = "0fyc2z1bh64plqf831f19nqkgkhryklgrrql2cn25jhfg55gf95q"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide hls-plugin-api lens lsp retrie shake syb text transformers unliftio-core unordered-containers ]; + testHaskellDepends = [ + base directory extra filepath hls-test-utils text + ]; description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes"; license = lib.licenses.asl20; }) {}; + "hls-stylish-haskell-plugin" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, ghc + , ghc-boot-th, ghcide, hls-plugin-api, hls-test-utils, lsp-types + , mtl, stylish-haskell, text + }: + mkDerivation { + pname = "hls-stylish-haskell-plugin"; + version = "1.0.0.0"; + sha256 = "1f2banm7lbl2grqrm0d9dnhk5fimxqan3xlsl4hjyqgy42xqqai2"; + libraryHaskellDepends = [ + base directory filepath ghc ghc-boot-th ghcide hls-plugin-api + lsp-types mtl stylish-haskell text + ]; + testHaskellDepends = [ base bytestring hls-test-utils text ]; + description = "Integration with the Stylish Haskell code formatter"; + license = lib.licenses.asl20; + }) {}; + "hls-tactics-plugin" = callPackage - ({ mkDerivation, aeson, base, bytestring, checkers, containers - , data-default, deepseq, directory, extra, filepath, fingertree - , generic-lens, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen - , ghcide, hie-bios, hls-plugin-api, hspec, hspec-discover - , hspec-expectations, lens, lsp, lsp-test, lsp-types, megaparsec - , mtl, QuickCheck, refinery, retrie, shake, syb, tasty - , tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit - , tasty-rerun, text, transformers + ({ mkDerivation, aeson, base, containers, deepseq, directory, extra + , filepath, fingertree, generic-lens, ghc, ghc-boot-th + , ghc-exactprint, ghc-source-gen, ghcide, hls-plugin-api + , hls-test-utils, hspec, hspec-discover, hspec-expectations, lens + , lsp, lsp-types, mtl, QuickCheck, refinery, retrie, shake, syb + , tasty-hspec, tasty-hunit, text, transformers + , unordered-containers }: mkDerivation { pname = "hls-tactics-plugin"; - version = "1.0.0.0"; - sha256 = "0cd6d3m3w1n7x22k5xndjl9r440s5nx6q2fg3wcmdsbd3s3pg1qa"; - isLibrary = true; - isExecutable = true; + version = "1.1.0.0"; + sha256 = "13qysl6dwrn15kn310r04g1yv7jj9xhar659lrc8h230c4khn2qv"; libraryHaskellDepends = [ aeson base containers deepseq directory extra filepath fingertree generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide hls-plugin-api lens lsp mtl refinery retrie shake syb text - transformers - ]; - executableHaskellDepends = [ - base data-default ghcide hls-plugin-api shake + transformers unordered-containers ]; testHaskellDepends = [ - aeson base bytestring checkers containers data-default deepseq - directory filepath ghc ghcide hie-bios hls-plugin-api hspec - hspec-expectations lens lsp-test lsp-types megaparsec mtl - QuickCheck tasty tasty-ant-xml tasty-expected-failure tasty-golden - tasty-hunit tasty-rerun text + aeson base containers deepseq directory filepath ghc ghcide + hls-plugin-api hls-test-utils hspec hspec-expectations lens + lsp-types mtl QuickCheck tasty-hspec tasty-hunit text ]; testToolDepends = [ hspec-discover ]; description = "Wingman plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; + "hls-test-utils" = callPackage + ({ mkDerivation, aeson, async, base, blaze-markup, bytestring + , containers, data-default, directory, extra, filepath, ghcide + , hls-plugin-api, hspec, hspec-core, lens, lsp, lsp-test, lsp-types + , shake, tasty, tasty-expected-failure, tasty-golden, tasty-hunit + , tasty-rerun, temporary, text, unordered-containers + }: + mkDerivation { + pname = "hls-test-utils"; + version = "1.0.0.0"; + sha256 = "18n7vb9fa39jkgr0gvsrjfc0nh09w2xlniifb25bn6z3qc3w0h6i"; + libraryHaskellDepends = [ + aeson async base blaze-markup bytestring containers data-default + directory extra filepath ghcide hls-plugin-api hspec hspec-core + lens lsp lsp-test lsp-types shake tasty tasty-expected-failure + tasty-golden tasty-hunit tasty-rerun temporary text + unordered-containers + ]; + description = "Utilities used in the tests of Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + "hlwm" = callPackage ({ mkDerivation, base, stm, transformers, unix, X11 }: mkDerivation { @@ -131952,7 +130207,6 @@ self: { description = "Haskell LilyPond"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hmark" = callPackage @@ -131972,7 +130226,6 @@ self: { description = "A tool and library for Markov chains based text generation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hmarkup" = callPackage @@ -132007,6 +130260,7 @@ self: { librarySystemDepends = [ openblasCompat ]; description = "Numeric Linear Algebra"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ maralorn ]; }) {inherit (pkgs) openblasCompat;}; "hmatrix-backprop" = callPackage @@ -132253,7 +130507,6 @@ self: { description = "hmatrix interface to sundials"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {sundials_arkode = null; sundials_cvode = null;}; "hmatrix-svdlibc" = callPackage @@ -132339,7 +130592,6 @@ self: { description = "Haskell Meapsoft Parser"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hmeap-utils" = callPackage @@ -132360,7 +130612,6 @@ self: { description = "Haskell Meapsoft Parser Utilities"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hmemdb" = callPackage @@ -132411,7 +130662,6 @@ self: { description = "HMEP Multi Expression Programming – a genetic programming variant"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hmidi" = callPackage @@ -132504,7 +130754,6 @@ self: { description = "Hidden Markov Models using LAPACK primitives"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hmp3" = callPackage @@ -132581,7 +130830,6 @@ self: { description = "Haskell Music Theory"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hmt-diagrams" = callPackage @@ -132600,7 +130848,6 @@ self: { description = "Haskell Music Theory Diagrams"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hmumps" = callPackage @@ -132663,18 +130910,16 @@ self: { , http-types, lens-family, lens-family-core, lens-family-th, logict , megaparsec, monad-control, monadlist, mtl, neat-interpolation , optparse-applicative, parser-combinators, pretty-show - , prettyprinter, process, ref-tf, regex-tdfa, repline, scientific - , semialign, semialign-indexed, serialise, some, split, syb, tasty + , prettyprinter, process, ref-tf, regex-tdfa, relude, repline + , scientific, semialign, serialise, some, split, syb, tasty , tasty-hedgehog, tasty-hunit, tasty-th, template-haskell, text - , these, time, transformers, transformers-base, unix - , unordered-containers, vector, xml + , th-lift-instances, these, time, transformers, transformers-base + , unix, unordered-containers, vector, xml }: mkDerivation { pname = "hnix"; - version = "0.12.0.1"; - sha256 = "013jlmzzr5fcvl0w9rrvhsg8jikg0hbc8z57yzxgz109x7hrnjzc"; - revision = "1"; - editedCabalFile = "136lwfb5hjwdbfik5c5dw1nhsmy8v410czmjn4i242s8jv5wm9yb"; + version = "0.13.0.1"; + sha256 = "1c01ns9h7va6ri568c0hzcdkmr0jdiay5z1vwwva7cv7dlvn6wl7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -132686,27 +130931,24 @@ self: { lens-family lens-family-core lens-family-th logict megaparsec monad-control monadlist mtl neat-interpolation optparse-applicative parser-combinators pretty-show prettyprinter process ref-tf - regex-tdfa scientific semialign semialign-indexed serialise some - split syb template-haskell text these time transformers + regex-tdfa relude scientific semialign serialise some split syb + template-haskell text th-lift-instances these time transformers transformers-base unix unordered-containers vector xml ]; executableHaskellDepends = [ - aeson base base16-bytestring bytestring comonad containers data-fix - deepseq exceptions filepath free haskeline mtl optparse-applicative - pretty-show prettyprinter ref-tf repline serialise template-haskell - text time transformers unordered-containers + aeson base comonad containers data-fix deepseq exceptions filepath + free haskeline optparse-applicative pretty-show prettyprinter + ref-tf relude repline serialise template-haskell time ]; testHaskellDepends = [ - base base16-bytestring bytestring containers data-fix deepseq Diff - directory exceptions filepath Glob hedgehog megaparsec mtl - neat-interpolation optparse-applicative pretty-show prettyprinter - process serialise split tasty tasty-hedgehog tasty-hunit tasty-th - template-haskell text time transformers unix unordered-containers + base containers data-fix Diff directory exceptions filepath Glob + hedgehog megaparsec neat-interpolation optparse-applicative + pretty-show prettyprinter process relude serialise split tasty + tasty-hedgehog tasty-hunit tasty-th template-haskell time unix ]; benchmarkHaskellDepends = [ - base base16-bytestring bytestring containers criterion data-fix - deepseq exceptions filepath mtl optparse-applicative serialise - template-haskell text time transformers unordered-containers + base criterion data-fix exceptions filepath optparse-applicative + relude serialise template-haskell time ]; description = "Haskell implementation of the Nix language"; license = lib.licenses.bsd3; @@ -132846,7 +131088,6 @@ self: { description = "Log message normalisation tool producing structured JSON messages"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ho-rewriting" = callPackage @@ -132931,7 +131172,6 @@ self: { description = "A source code editor aiming for the convenience of use"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hobbes" = callPackage @@ -132968,8 +131208,6 @@ self: { ]; description = "A library for canonically representing terms with binding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hocilib" = callPackage @@ -133167,8 +131405,6 @@ self: { ]; description = "Bindings to the Toggl.com REST API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hogre" = callPackage @@ -133185,7 +131421,6 @@ self: { description = "Haskell binding to a subset of OGRE"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {OGRE = null; OgreMain = null; cgen-hs = null; grgen = null;}; "hogre-examples" = callPackage @@ -133202,7 +131437,6 @@ self: { description = "Examples for using Hogre"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {OgreMain = null;}; "hois" = callPackage @@ -133363,7 +131597,6 @@ self: { description = "Start your Haskell project with cabal, git and tests"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "homeomorphic" = callPackage @@ -133391,7 +131624,6 @@ self: { description = "Haskell Offline Music Manipulation And Generation EDSL"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hommage-ds" = callPackage @@ -133507,6 +131739,9 @@ self: { libraryHaskellDepends = [ base ]; description = "Cross-platform interface to the PC speaker"; license = lib.licenses.asl20; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "hoobuddy" = callPackage @@ -133540,7 +131775,6 @@ self: { description = "Debugging by observing in place"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hood-off" = callPackage @@ -133585,7 +131819,6 @@ self: { description = "A small, toy roguelike"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hoodle" = callPackage @@ -133607,7 +131840,6 @@ self: { description = "Executable for hoodle"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hoodle-builder" = callPackage @@ -133625,7 +131857,6 @@ self: { description = "text builder for hoodle file format"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hoodle-core" = callPackage @@ -133659,7 +131890,6 @@ self: { description = "Core library for hoodle"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;}; "hoodle-extra" = callPackage @@ -133686,7 +131916,6 @@ self: { description = "extra hoodle tools"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hoodle-parser" = callPackage @@ -133705,7 +131934,6 @@ self: { description = "Hoodle file parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hoodle-publish" = callPackage @@ -133733,7 +131961,6 @@ self: { description = "publish hoodle files as a static web site"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hoodle-render" = callPackage @@ -133755,7 +131982,6 @@ self: { description = "Hoodle file renderer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hoodle-types" = callPackage @@ -133924,7 +132150,6 @@ self: { description = "Haskell Media Server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hopencc" = callPackage @@ -134193,7 +132418,6 @@ self: { description = "A language based on homotopy type theory with an interval type"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hora" = callPackage @@ -134526,7 +132750,6 @@ self: { description = "Real-time heap graphing utility and profile stream server with a reusable graphing module"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) freeglut; inherit (pkgs) libGL; inherit (pkgs) libGLU;}; @@ -134549,7 +132772,6 @@ self: { description = "A utility to visualise and compare heap profiles"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hp2html" = callPackage @@ -134683,8 +132905,6 @@ self: { ]; description = "hpack's dhalling"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hpaco" = callPackage @@ -134703,7 +132923,6 @@ self: { description = "Modular template compiler"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hpaco-lib" = callPackage @@ -134722,7 +132941,6 @@ self: { description = "Modular template compiler library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hpage" = callPackage @@ -134745,7 +132963,6 @@ self: { description = "A scrapbook for Haskell developers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hpapi" = callPackage @@ -134758,6 +132975,9 @@ self: { librarySystemDepends = [ papi ]; description = "Binding for the PAPI library"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) papi;}; @@ -134788,7 +133008,6 @@ self: { description = "Haskell paste web site"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hpasteit" = callPackage @@ -135025,7 +133244,6 @@ self: { description = "Tracer with AJAX interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hpdft" = callPackage @@ -135226,7 +133444,6 @@ self: { description = "Extra utilities for hpqtypes library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hprotoc" = callPackage @@ -135287,7 +133504,6 @@ self: { description = "Parse Google Protocol Buffer specifications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hprox" = callPackage @@ -135323,7 +133539,6 @@ self: { description = "Haskell Postscript"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hps-cairo" = callPackage @@ -135340,7 +133555,6 @@ self: { description = "Cairo rendering for the haskell postscript library"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hps-kmeans" = callPackage @@ -135448,7 +133662,6 @@ self: { description = "Python language tools"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hquantlib" = callPackage @@ -135479,7 +133692,6 @@ self: { description = "HQuantLib is a port of essencial parts of QuantLib to Haskell"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hquantlib-time" = callPackage @@ -135524,7 +133736,6 @@ self: { description = "Basic utility for ranking a list of items"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hreader" = callPackage @@ -135545,7 +133756,6 @@ self: { description = "Generalization of MonadReader and ReaderT using hset"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hreader-lens" = callPackage @@ -135562,7 +133772,6 @@ self: { description = "Optics for hreader package"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hreq-client" = callPackage @@ -135592,7 +133801,6 @@ self: { description = "A Type dependent Highlevel HTTP client library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hreq-conduit" = callPackage @@ -135618,7 +133826,6 @@ self: { description = "Conduit streaming support for Hreq"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hreq-core" = callPackage @@ -135693,8 +133900,6 @@ self: { ]; description = "A Riemann Client for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hruby" = callPackage @@ -135780,7 +133985,6 @@ self: { description = "A cryptohash-inspired library for blake2"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) libb2;}; "hs-brotli" = callPackage @@ -135800,7 +134004,6 @@ self: { description = "Compression and decompression in the brotli format"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {brotlidec = null; brotlienc = null;}; "hs-captcha" = callPackage @@ -135880,8 +134083,6 @@ self: { ]; description = "Conllu validating parser and utils"; license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hs-di" = callPackage @@ -135978,7 +134179,6 @@ self: { description = "Bindings to FFMPEG library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hs-fltk" = callPackage @@ -136036,7 +134236,6 @@ self: { description = "Utility to generate haskell-names interface files"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hs-gizapp" = callPackage @@ -136066,8 +134265,6 @@ self: { testHaskellDepends = [ base haskell-src hspec ]; description = "Haskell source code analyzer"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hs-ix" = callPackage @@ -136312,7 +134509,6 @@ self: { description = "A library for Passbook pass creation & signing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hs-popen" = callPackage @@ -136478,6 +134674,7 @@ self: { testHaskellDepends = [ base hashtables swisstable ]; description = "Data.HashTable.Class instance definition for Data.HashTable.ST.Swiss"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hs-tags" = callPackage @@ -136858,7 +135055,6 @@ self: { description = "Haskell bindings for PyAutoGUI, a library for automating user interaction"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsay" = callPackage @@ -136911,7 +135107,6 @@ self: { description = "simple utility for rolling filesystem backups"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsbc" = callPackage @@ -136970,7 +135165,6 @@ self: { description = "Backend for uploading benchmark data to CodeSpeed"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsbencher-fusion" = callPackage @@ -136995,7 +135189,6 @@ self: { description = "Backend for uploading benchmark data to Google Fusion Tables"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc2hs" = callPackage @@ -137054,7 +135247,6 @@ self: { description = "Haskell SuperCollider Auditor"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-cairo" = callPackage @@ -137068,7 +135260,6 @@ self: { description = "haskell supercollider cairo drawing"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-data" = callPackage @@ -137087,7 +135278,6 @@ self: { description = "haskell supercollider data"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-db" = callPackage @@ -137101,7 +135291,6 @@ self: { description = "Haskell SuperCollider Unit Generator Database"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-dot" = callPackage @@ -137115,7 +135304,6 @@ self: { description = "haskell supercollider graph drawing"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-forth" = callPackage @@ -137136,7 +135324,6 @@ self: { description = "FORTH SUPERCOLLIDER"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-graphs" = callPackage @@ -137162,7 +135349,6 @@ self: { description = "Haskell SuperCollider Graphs"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-lang" = callPackage @@ -137184,7 +135370,6 @@ self: { description = "Haskell SuperCollider Language"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-lisp" = callPackage @@ -137205,7 +135390,6 @@ self: { description = "LISP SUPERCOLLIDER"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-plot" = callPackage @@ -137224,7 +135408,6 @@ self: { description = "Haskell SuperCollider Plotting"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-process" = callPackage @@ -137245,7 +135428,6 @@ self: { description = "Create and control scsynth processes"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-rec" = callPackage @@ -137259,7 +135441,6 @@ self: { description = "Haskell SuperCollider Record Variants"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-rw" = callPackage @@ -137306,7 +135487,6 @@ self: { description = "SuperCollider server resource management and synchronization"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-sf" = callPackage @@ -137338,7 +135518,6 @@ self: { description = "Haskell SuperCollider SoundFile"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-unsafe" = callPackage @@ -137352,7 +135531,6 @@ self: { description = "Unsafe Haskell SuperCollider"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-utils" = callPackage @@ -137375,7 +135553,6 @@ self: { description = "Haskell SuperCollider Utilities"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hscaffold" = callPackage @@ -137437,7 +135614,6 @@ self: { description = "cassandra database interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hscd" = callPackage @@ -137602,7 +135778,6 @@ self: { description = "cscope like browser for Haskell code"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hscrtmpl" = callPackage @@ -137713,7 +135888,6 @@ self: { description = "Haskell development library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsdif" = callPackage @@ -137839,8 +136013,8 @@ self: { }: mkDerivation { pname = "hsendxmpp"; - version = "0.1.2.5"; - sha256 = "0wyfcsc0vjyx87r5dv51frfligf4d7v0n1m7967vg4d6jkw2zxd9"; + version = "0.1.2.6"; + sha256 = "1w3jm8lsll65i57iqlspw1vzvw5rr4q9qwarq896s0vr8kz68irh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -137849,8 +136023,6 @@ self: { ]; description = "sendxmpp clone, sending XMPP messages via CLI"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsenv" = callPackage @@ -137899,7 +136071,6 @@ self: { description = "Primitive list with elements of unique types"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsexif" = callPackage @@ -137930,7 +136101,6 @@ self: { description = "A small and ugly library that emulates the output of the puppet facter program"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsfcsh" = callPackage @@ -138163,8 +136333,6 @@ self: { ]; description = "Inspect Haskell source files"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsinspect-lsp" = callPackage @@ -138371,7 +136539,6 @@ self: { description = "A library to work with, or as, a logstash server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hslua" = callPackage @@ -138651,7 +136818,6 @@ self: { description = "Nock 5K interpreter"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsnoise" = callPackage @@ -138874,6 +137040,22 @@ self: { license = lib.licenses.mit; }) {}; + "hspec_2_8_1" = callPackage + ({ mkDerivation, base, hspec-core, hspec-discover + , hspec-expectations, QuickCheck + }: + mkDerivation { + pname = "hspec"; + version = "2.8.1"; + sha256 = "1lk7xylld960wld755j1f81zaydxgxq3840np4h6xcp729cf0cq5"; + libraryHaskellDepends = [ + base hspec-core hspec-discover hspec-expectations QuickCheck + ]; + description = "A Testing Framework for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -138956,6 +137138,34 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-core_2_8_1" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, clock + , deepseq, directory, filepath, hspec-expectations, hspec-meta + , HUnit, process, QuickCheck, quickcheck-io, random, setenv + , silently, stm, temporary, tf-random, transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.8.1"; + sha256 = "1yha64zfc226pc4952zqwv229kbl8p5grhl7c6wxn2y948rb688a"; + libraryHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv stm tf-random transformers + ]; + testHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently stm temporary tf-random + transformers + ]; + testToolDepends = [ hspec-meta ]; + testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; + description = "A Testing Framework for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-dirstream" = callPackage ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core , pipes, pipes-safe, system-filepath, text @@ -138993,6 +137203,26 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-discover_2_8_1" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck + }: + mkDerivation { + pname = "hspec-discover"; + version = "2.8.1"; + sha256 = "05xzxsxpxf7hyg6zdf7mxx6xb79rxrhd3pz3pwj32a0phbjkicdn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath hspec-meta QuickCheck + ]; + testToolDepends = [ hspec-meta ]; + description = "Automatically discover and run Hspec tests"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-expectations" = callPackage ({ mkDerivation, base, call-stack, HUnit, nanospec }: mkDerivation { @@ -139020,8 +137250,6 @@ self: { testHaskellDepends = [ aeson-qq base hspec ]; description = "Hspec expectations for JSON Values"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hspec-expectations-lens" = callPackage @@ -139083,7 +137311,6 @@ self: { description = "hspec-expectations with pretty printing on failure"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hspec-expectations-pretty-diff" = callPackage @@ -139133,6 +137360,24 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-golden_0_2_0_0" = callPackage + ({ mkDerivation, base, directory, filepath, hspec, hspec-core + , optparse-applicative, silently + }: + mkDerivation { + pname = "hspec-golden"; + version = "0.2.0.0"; + sha256 = "0sg9f73x2i1g6n1pjcvb1zx4nx17w5drdrrhzp2z3lsxc9yxs8nk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath hspec-core ]; + executableHaskellDepends = [ base directory optparse-applicative ]; + testHaskellDepends = [ base directory hspec hspec-core silently ]; + description = "Golden tests for hspec"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-golden-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt @@ -139190,8 +137435,6 @@ self: { ]; description = "Initial project template from stack"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hspec-hedgehog" = callPackage @@ -139385,7 +137628,6 @@ self: { description = "Helpers for creating database tests with hspec and pg-transact"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hspec-server" = callPackage @@ -139434,7 +137676,6 @@ self: { description = "Add an hspec test-suite in one command"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hspec-shouldbe" = callPackage @@ -139447,7 +137688,6 @@ self: { description = "Convenience wrapper and utilities for hspec"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hspec-slow" = callPackage @@ -139589,7 +137829,6 @@ self: { description = "Hspec convenience functions for use with test-sandbox"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hspec-wai" = callPackage @@ -139700,7 +137939,6 @@ self: { description = "Spec for testing properties for variant types"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hspkcs11" = callPackage @@ -139791,7 +138029,6 @@ self: { description = "The Haskell Stream Processor command line utility"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsql" = callPackage @@ -139820,7 +138057,6 @@ self: { description = "MySQL driver for HSQL"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {mysqlclient = null;}; "hsql-odbc" = callPackage @@ -139834,7 +138070,6 @@ self: { description = "A Haskell Interface to ODBC"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) unixODBC;}; "hsql-postgresql" = callPackage @@ -139848,7 +138083,6 @@ self: { description = "A Haskell Interface to PostgreSQL via the PQ library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) postgresql;}; "hsql-sqlite3" = callPackage @@ -139862,7 +138096,6 @@ self: { description = "SQLite3 driver for HSQL"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) sqlite;}; "hsqml" = callPackage @@ -140027,7 +138260,6 @@ self: { description = "Access to the Readability API"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsrelp" = callPackage @@ -140151,7 +138383,6 @@ self: { description = "hssqlppp extras which need template-haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hstar" = callPackage @@ -140175,7 +138406,6 @@ self: { description = "Haskell version of tar CLI utility"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hstatistics" = callPackage @@ -140308,7 +138538,6 @@ self: { description = "A Tox protocol implementation in Haskell"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hstradeking" = callPackage @@ -140334,7 +138563,6 @@ self: { description = "Tradeking API bindings for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hstyle" = callPackage @@ -140375,7 +138603,6 @@ self: { description = "A two player abstract strategy game"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsubconvert" = callPackage @@ -140398,7 +138625,6 @@ self: { description = "One-time, faithful conversion of Subversion repositories to Git"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsudoku" = callPackage @@ -140461,7 +138687,6 @@ self: { description = "embedding prolog in haskell"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) ncurses; inherit (pkgs) readline; swipl = null;}; @@ -140494,7 +138719,6 @@ self: { description = "hsp+jmacro support"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsx-xhtml" = callPackage @@ -140507,7 +138731,6 @@ self: { description = "XHTML utilities to use together with HSX"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsx2hs" = callPackage @@ -140640,8 +138863,6 @@ self: { ]; description = "A Haskell98 parsing tags program similar to ctags"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "htar" = callPackage @@ -141147,7 +139368,6 @@ self: { description = "Haskell Music Typesetting"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "htsn" = callPackage @@ -141383,7 +139603,6 @@ self: { description = "HTTP authorization (both basic and digest) done right"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "http-client-conduit" = callPackage @@ -141835,7 +140054,6 @@ self: { description = "HTTP client package with enumerator interface and HTTPS support. (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "http-grammar" = callPackage @@ -141871,7 +140089,6 @@ self: { description = "HTTP and WebSocket client based on io-streams"; license = "BSD-3-Clause AND GPL-2.0-or-later"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "http-kinder" = callPackage @@ -142225,8 +140442,6 @@ self: { ]; description = "RFC7807 style response messages"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "http-server" = callPackage @@ -142433,7 +140648,6 @@ self: { description = "A command-line http2 client"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "http2-client-grpc" = callPackage @@ -142454,7 +140668,6 @@ self: { description = "Implement gRPC-over-HTTP2 clients"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "http2-grpc-proto-lens" = callPackage @@ -142491,8 +140704,6 @@ self: { ]; description = "Encoders based on `proto3-wire` for gRPC over HTTP2"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "http2-grpc-types" = callPackage @@ -142544,7 +140755,6 @@ self: { description = "High-level access to HTTPS Everywhere rulesets"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "https-everywhere-rules-raw" = callPackage @@ -142560,7 +140770,6 @@ self: { description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets."; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "httpspec" = callPackage @@ -142579,7 +140788,6 @@ self: { description = "Specification of HTTP request/response generators and parsers"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "htune" = callPackage @@ -142779,7 +140987,6 @@ self: { description = "Hugs Front-end to Yhc Core"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hulk" = callPackage @@ -142807,7 +141014,6 @@ self: { description = "IRC server written in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hum" = callPackage @@ -142970,7 +141176,6 @@ self: { description = "A GUI testrunner for HUnit"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hunit-parsec" = callPackage @@ -143015,7 +141220,6 @@ self: { description = "Unpacker tool with DWIM"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hunspell-hs" = callPackage @@ -143066,7 +141270,6 @@ self: { description = "A search and indexing engine"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hunt-server" = callPackage @@ -143091,7 +141294,6 @@ self: { description = "A search and indexing engine server"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hunt-server-cli" = callPackage @@ -143163,7 +141365,6 @@ self: { description = "Extract function names from Windows DLLs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hurl" = callPackage @@ -143188,8 +141389,6 @@ self: { executableHaskellDepends = [ base directory network-uri ]; description = "Haskell URL resolver"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hurriyet" = callPackage @@ -143234,8 +141433,6 @@ self: { ]; description = "R5RS Scheme interpreter, compiler, and library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "husk-scheme-libs" = callPackage @@ -143251,8 +141448,6 @@ self: { ]; description = "Extra libraries for the husk Scheme platform"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "husky" = callPackage @@ -143271,7 +141466,6 @@ self: { description = "A simple command line calculator"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hutton" = callPackage @@ -143321,7 +141515,6 @@ self: { description = "Fuzzy logic library with support for T1, IT2, GT2"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hvect" = callPackage @@ -143411,7 +141604,6 @@ self: { description = "Demo library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hw-aws-sqs-conduit" = callPackage @@ -143428,8 +141620,6 @@ self: { testHaskellDepends = [ base ]; description = "AWS SQS conduit"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hw-balancedparens" = callPackage @@ -143617,7 +141807,6 @@ self: { description = "Unbelievably fast streaming DSV file parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hw-dump" = callPackage @@ -143894,7 +142083,6 @@ self: { description = "Memory efficient JSON parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hw-json-lens" = callPackage @@ -143925,7 +142113,6 @@ self: { description = "Lens for hw-json"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hw-json-simd" = callPackage @@ -143992,7 +142179,6 @@ self: { description = "Memory efficient JSON parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hw-json-standard-cursor" = callPackage @@ -144033,7 +142219,6 @@ self: { description = "Memory efficient JSON parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hw-kafka-avro" = callPackage @@ -144061,7 +142246,6 @@ self: { description = "Avro support for Kafka infrastructure"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hw-kafka-client" = callPackage @@ -144217,8 +142401,8 @@ self: { pname = "hw-prim"; version = "0.6.3.0"; sha256 = "0gqn7s0ki9x951n5whyh0pkcbbqz4kpcn80xxpsv1c0v34946xv7"; - revision = "1"; - editedCabalFile = "1z3fcff42xq0j430q72ncjv6zc0zvzzq94ifh06m342z0x8imv83"; + revision = "2"; + editedCabalFile = "14x1bijg1d8jdh963rxrlwzlqa1p1vh0bc7hjdysk8dzbrc7fbmv"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim mmap transformers unliftio-core vector @@ -144254,8 +142438,6 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Primitive support for bit manipulation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hw-rankselect" = callPackage @@ -144388,7 +142570,6 @@ self: { description = "SIMD library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hw-streams" = callPackage @@ -144505,7 +142686,6 @@ self: { description = "Supports IO on URIs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hw-vector" = callPackage @@ -144687,7 +142867,6 @@ self: { description = "Library for sending email with Amazon's SES and hworker"; license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hwormhole" = callPackage @@ -144721,7 +142900,6 @@ self: { description = "magic-wormhole client"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hws" = callPackage @@ -144741,7 +142919,6 @@ self: { description = "Simple Haskell Web Server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hwsl2" = callPackage @@ -144775,7 +142952,6 @@ self: { description = "A hashed byte-vector based on algebraic hashes and finger trees"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hwsl2-reducers" = callPackage @@ -144790,7 +142966,6 @@ self: { description = "Semigroup and Reducer instances for Data.Hash.SL2"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hx" = callPackage @@ -144823,7 +142998,6 @@ self: { description = "Haskell XMPP (Jabber Client) Command Line Interface (CLI)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hxournal" = callPackage @@ -144851,7 +143025,6 @@ self: { description = "A pen notetaking program written in haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hxt" = callPackage @@ -144903,6 +143076,7 @@ self: { description = "Cache for HXT XML Documents and other binary data"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hxt-charproperties" = callPackage @@ -145114,7 +143288,6 @@ self: { description = "Helper functions for HXT"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hxweb" = callPackage @@ -145127,7 +143300,6 @@ self: { description = "Minimal webframework using fastcgi, libxml2 and libxslt"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hyahtzee" = callPackage @@ -145141,8 +143313,6 @@ self: { executableHaskellDepends = [ base containers HUnit random ]; description = "A Yahtzee game implementation in Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hyakko" = callPackage @@ -145183,7 +143353,6 @@ self: { description = "A implementation of a type-checker for Lambda-H"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hybrid-vectors" = callPackage @@ -145286,7 +143455,6 @@ self: { description = "Hydrogen Data"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hydrogen-cli-args" = callPackage @@ -145303,7 +143471,6 @@ self: { description = "Hydrogen Command Line Arguments Parser"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hydrogen-data" = callPackage @@ -145316,7 +143483,6 @@ self: { description = "Hydrogen Data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hydrogen-multimap" = callPackage @@ -145344,7 +143510,6 @@ self: { description = "Hydrogen Parsing Utilities"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hydrogen-prelude" = callPackage @@ -145365,7 +143530,6 @@ self: { description = "Hydrogen Prelude"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hydrogen-prelude-parsec" = callPackage @@ -145378,7 +143542,6 @@ self: { description = "Hydrogen Prelude /w Parsec"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hydrogen-syntax" = callPackage @@ -145396,7 +143559,6 @@ self: { description = "Hydrogen Syntax"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hydrogen-util" = callPackage @@ -145412,7 +143574,6 @@ self: { description = "Hydrogen Tools"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hydrogen-version" = callPackage @@ -145442,7 +143603,6 @@ self: { description = "Simple web application server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hylide" = callPackage @@ -145509,7 +143669,6 @@ self: { description = "Tableau based theorem prover for hybrid logics"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hyloutils" = callPackage @@ -145526,15 +143685,14 @@ self: { description = "Very small programs for hybrid logics"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hyper" = callPackage ({ mkDerivation, base, blaze-html, deepseq, text }: mkDerivation { pname = "hyper"; - version = "0.2.1.0"; - sha256 = "14vl52v4qshdyp45qrg8ii8xzpi6n05qdgz3ri59wis8hdw1v06z"; + version = "0.2.1.1"; + sha256 = "14p7r57g75ny8l9h4ilbm6mhdsfiysfs3rd56300dl0jkpgrh8r2"; libraryHaskellDepends = [ base blaze-html deepseq text ]; description = "Display class for the HyperHaskell graphical Haskell interpreter"; license = lib.licenses.bsd3; @@ -145546,15 +143704,13 @@ self: { }: mkDerivation { pname = "hyper-extra"; - version = "0.2.0.0"; - sha256 = "1zcbs9cpr6rfzhsqrv867j79gb3521pyrl32qbp5jwqiy1iyddm5"; + version = "0.2.0.1"; + sha256 = "13ipxwhxrndl505zzxcq7gz874l0r2g0ma1yhq14bihvlwh3qr8d"; libraryHaskellDepends = [ base diagrams-lib diagrams-svg hyper QuickCheck svg-builder text ]; description = "Display instances for the HyperHaskell graphical Haskell interpreter"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hyper-haskell-server" = callPackage @@ -145574,8 +143730,6 @@ self: { ]; description = "Server back-end for the HyperHaskell graphical Haskell interpreter"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hyperdrive" = callPackage @@ -145694,7 +143848,6 @@ self: { description = "A thin wrapper for the Hyperpublic API"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hyphenate" = callPackage @@ -145859,8 +144012,6 @@ self: { testSystemDepends = [ zookeeper_mt ]; description = "Haskell client library for Apache Zookeeper"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) zookeeper_mt;}; "hzulip" = callPackage @@ -146085,7 +144236,6 @@ self: { description = "Lattice iCE40 Primitive IP"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "icepeak" = callPackage @@ -146231,7 +144381,6 @@ self: { description = "An IDE backend library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ide-backend-common" = callPackage @@ -146257,7 +144406,6 @@ self: { description = "Shared library used be ide-backend and ide-backend-server"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ide-backend-rts" = callPackage @@ -146293,7 +144441,6 @@ self: { description = "An IDE backend server"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ideas" = callPackage @@ -146333,7 +144480,6 @@ self: { description = "Interactive domain reasoner for logic and mathematics"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ideas-math-types" = callPackage @@ -146348,7 +144494,6 @@ self: { description = "Common types for mathematical domain reasoners"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ideas-statistics" = callPackage @@ -146365,7 +144510,6 @@ self: { description = "Interactive domain reasoner for statistics"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "idempotent" = callPackage @@ -146758,7 +144902,6 @@ self: { description = "Bindings for the Gtk/OS X integration library"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {ige-mac-integration = null;}; "ignore" = callPackage @@ -146847,8 +144990,6 @@ self: { ]; description = "A Haskell backend kernel for the IPython project"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-aeson" = callPackage @@ -146864,8 +145005,6 @@ self: { ]; description = "IHaskell display instances for Aeson"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-basic" = callPackage @@ -146877,8 +145016,6 @@ self: { libraryHaskellDepends = [ base ihaskell ]; description = "IHaskell display instances for basic types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-blaze" = callPackage @@ -146890,8 +145027,6 @@ self: { libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ]; description = "IHaskell display instances for blaze-html types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-charts" = callPackage @@ -146908,8 +145043,6 @@ self: { ]; description = "IHaskell display instances for charts types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-diagrams" = callPackage @@ -146926,8 +145059,6 @@ self: { ]; description = "IHaskell display instances for diagram types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-display" = callPackage @@ -146939,8 +145070,6 @@ self: { libraryHaskellDepends = [ base classy-prelude ihaskell ]; description = "IHaskell display instances for basic types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-gnuplot" = callPackage @@ -146952,8 +145081,6 @@ self: { libraryHaskellDepends = [ base bytestring gnuplot ihaskell ]; description = "IHaskell display instance for Gnuplot (from gnuplot package)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-graphviz" = callPackage @@ -146965,8 +145092,6 @@ self: { libraryHaskellDepends = [ base bytestring ihaskell process ]; description = "IHaskell display instance for GraphViz (external binary)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-hatex" = callPackage @@ -146978,8 +145103,6 @@ self: { libraryHaskellDepends = [ base HaTeX ihaskell text ]; description = "IHaskell display instances for hatex"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-hvega" = callPackage @@ -146991,8 +145114,6 @@ self: { libraryHaskellDepends = [ aeson base hvega ihaskell text ]; description = "IHaskell display instance for hvega types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-inline-r" = callPackage @@ -147010,8 +145131,6 @@ self: { ]; description = "Embed R quasiquotes and plots in IHaskell notebooks"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-juicypixels" = callPackage @@ -147026,8 +145145,6 @@ self: { ]; description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-magic" = callPackage @@ -147044,8 +145161,6 @@ self: { ]; description = "IHaskell display instances for bytestrings"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-parsec" = callPackage @@ -147074,8 +145189,6 @@ self: { libraryHaskellDepends = [ base bytestring hmatrix ihaskell plot ]; description = "IHaskell display instance for Plot (from plot package)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-rlangqq" = callPackage @@ -147094,7 +145207,6 @@ self: { description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-widgets" = callPackage @@ -147146,7 +145258,6 @@ self: { description = "Incremental HTTP iteratee"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ilist" = callPackage @@ -147303,7 +145414,6 @@ self: { description = "An efficient IMAP client library, with SSL and streaming"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "imapget" = callPackage @@ -147345,7 +145455,6 @@ self: { description = "Minimalistic reference manager"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "imgur" = callPackage @@ -147384,7 +145493,6 @@ self: { description = "Uploader for Imgur"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "imj-animation" = callPackage @@ -147398,7 +145506,6 @@ self: { description = "Animation Framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "imj-base" = callPackage @@ -147424,7 +145531,6 @@ self: { description = "Game engine with geometry, easing, animated text, delta rendering"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "imj-game-hamazed" = callPackage @@ -147446,7 +145552,6 @@ self: { description = "A game with flying numbers and 8-bit color animations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "imj-measure-stdout" = callPackage @@ -147463,7 +145568,6 @@ self: { description = "An application to determine the maximum capacity of stdout buffer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "imj-prelude" = callPackage @@ -147492,8 +145596,8 @@ self: { }: mkDerivation { pname = "imm"; - version = "2.1.0.0"; - sha256 = "01jpwxqp2c5ih9cw38w4j7x1dff0z7z1d43yx1rri83w8shpjbl3"; + version = "2.1.1.0"; + sha256 = "1w3kypakf8zqz8r44r9bx0z5v4wxvhnf446jzarawn9fg7yigcqn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -147516,7 +145620,6 @@ self: { description = "Execute arbitrary actions for each item from RSS/Atom feeds"; license = lib.licenses.cc0; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "immortal_0_2_2_1" = callPackage @@ -147604,7 +145707,6 @@ self: { description = "Multi-platform parser analyzer and generator"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "imperative-edsl" = callPackage @@ -147649,7 +145751,6 @@ self: { description = "Deep embedding of VHDL programs with code generation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "impl" = callPackage @@ -147801,7 +145902,6 @@ self: { description = "Tool for haskell imports refactoring"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "imports" = callPackage @@ -147900,7 +146000,6 @@ self: { description = "An imperative, verifiable programming language for high assurance applications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "impure-containers" = callPackage @@ -148010,7 +146109,6 @@ self: { description = "A type-checker for Haskell with integer constraints"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "inchworm" = callPackage @@ -148079,7 +146177,6 @@ self: { description = "Incremental computing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "incremental-maps" = callPackage @@ -148104,7 +146201,6 @@ self: { description = "Package for doing incremental computations on maps"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "incremental-parser" = callPackage @@ -148159,7 +146255,6 @@ self: { description = "type classes for incremental updates to data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "indent" = callPackage @@ -148191,7 +146286,6 @@ self: { description = "Indentation sensitive parsing combinators for Parsec and Trifecta"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "indentation-core" = callPackage @@ -148220,7 +146314,6 @@ self: { description = "Indentation sensitive parsing combinators for Parsec"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "indentation-trifecta" = callPackage @@ -148238,7 +146331,6 @@ self: { description = "Indentation sensitive parsing combinators for Trifecta"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "indentparser" = callPackage @@ -148266,8 +146358,6 @@ self: { testHaskellDepends = [ base mtl parsec tasty tasty-hunit ]; description = "indentation sensitive parser-combinators for parsec"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "index-core" = callPackage @@ -148280,6 +146370,7 @@ self: { description = "Indexed Types"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; broken = true; }) {}; @@ -148303,7 +146394,6 @@ self: { description = "Tools for entity indexation"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "indexed" = callPackage @@ -148492,7 +146582,6 @@ self: { description = "A collection of implementations of IndieWeb algorithms"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "indigo" = callPackage @@ -148601,8 +146690,6 @@ self: { ]; description = "The Infernal Machine - An AWS Lambda Custom Runtime for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "infernu" = callPackage @@ -148624,7 +146711,6 @@ self: { description = "Type inference and checker for JavaScript (experimental)"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "infinite-search" = callPackage @@ -148903,8 +146989,6 @@ self: { ]; description = "Inline some Assembly in ur Haskell!"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "inline-c" = callPackage @@ -148976,6 +147060,8 @@ self: { pname = "inline-java"; version = "0.10.0"; sha256 = "0rs2rw21y0yc0h4c1rz25qblk39flkg19fwjz87s6l0ly1hvcrm5"; + revision = "1"; + editedCabalFile = "07qpgqy66zpmg1yz38y1w5gbbcc0nvidmlg2z4anj0k5rifzgdv6"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ghc jni jvm language-java mtl process template-haskell temporary text @@ -148989,7 +147075,6 @@ self: { description = "Java interop via inline Java code in Haskell modules"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "inline-r" = callPackage @@ -149132,22 +147217,6 @@ self: { }) {}; "inspection-testing" = callPackage - ({ mkDerivation, base, containers, ghc, mtl, template-haskell - , transformers - }: - mkDerivation { - pname = "inspection-testing"; - version = "0.4.4.0"; - sha256 = "1zr7c7xpmnfwn2p84rqw69n1g91rdkh7d20awvj0s56nbdikgiyh"; - libraryHaskellDepends = [ - base containers ghc mtl template-haskell transformers - ]; - testHaskellDepends = [ base ]; - description = "GHC plugin to do inspection testing"; - license = lib.licenses.mit; - }) {}; - - "inspection-testing_0_4_5_0" = callPackage ({ mkDerivation, base, containers, ghc, mtl, template-haskell , transformers }: @@ -149161,7 +147230,6 @@ self: { testHaskellDepends = [ base ]; description = "GHC plugin to do inspection testing"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "inspector-wrecker" = callPackage @@ -149185,7 +147253,6 @@ self: { description = "Create benchmarks from the HAR files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "instana-haskell-trace-sdk" = callPackage @@ -149270,7 +147337,6 @@ self: { description = "Generic Aeson instances through instant-generics"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "instant-bytes" = callPackage @@ -149288,7 +147354,6 @@ self: { description = "Generic Serial instances through instant-generics"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "instant-deepseq" = callPackage @@ -149301,7 +147366,6 @@ self: { description = "Generic NFData instances through instant-generics"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "instant-generics" = callPackage @@ -149329,7 +147393,6 @@ self: { description = "Generic Hashable instances through instant-generics"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "instant-zipper" = callPackage @@ -149344,7 +147407,6 @@ self: { description = "Heterogenous Zipper in Instant Generics"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "instapaper-sender" = callPackage @@ -149365,7 +147427,6 @@ self: { description = "Basic HTTP gateway to save articles to Instapaper"; license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "instinct" = callPackage @@ -149912,7 +147973,6 @@ self: { description = "QuasiQuoter for Ruby-style multi-line interpolated strings"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "interpolatedstring-qq-mwotton" = callPackage @@ -149929,7 +147989,6 @@ self: { description = "DO NOT USE THIS. interpolatedstring-qq works now."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "interpolatedstring-qq2" = callPackage @@ -150051,17 +148110,19 @@ self: { }) {}; "interval-algebra" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, time + ({ mkDerivation, base, containers, hspec, QuickCheck, safe, time , witherable }: mkDerivation { pname = "interval-algebra"; - version = "0.4.0"; - sha256 = "0852yv0d7c3gh6ggab6wvnk7g1pad02nnpbmzw98c9zkzw2zk9wh"; + version = "0.6.3"; + sha256 = "10nrba4q2pyfa028ih079fzyc4l2gp5kfvbmh43lw739mh8kp5aa"; libraryHaskellDepends = [ - base containers QuickCheck time witherable + base containers QuickCheck safe time witherable + ]; + testHaskellDepends = [ + base containers hspec QuickCheck safe time ]; - testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "An implementation of Allen's interval algebra for temporal logic"; license = lib.licenses.bsd3; }) {}; @@ -150220,7 +148281,6 @@ self: { description = "A prelude for the tests of safe new projects"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "intset" = callPackage @@ -150233,7 +148293,6 @@ self: { description = "Pure, mergeable, succinct Int sets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "intset-imperative" = callPackage @@ -150374,7 +148433,6 @@ self: { description = "invertible functions and instances for HList"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "invertible-hxt" = callPackage @@ -150559,6 +148617,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "io-streams_1_5_2_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, deepseq, directory + , filepath, HUnit, mtl, network, primitive, process, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, transformers, vector, zlib, zlib-bindings + }: + mkDerivation { + pname = "io-streams"; + version = "1.5.2.1"; + sha256 = "1y3sqmxrwiksz7pl4hf3vzvg8p8n00qnv98nj5xbpcadlh468rny"; + configureFlags = [ "-fnointeractivetests" ]; + libraryHaskellDepends = [ + attoparsec base bytestring network primitive process text time + transformers vector zlib-bindings + ]; + testHaskellDepends = [ + attoparsec base bytestring deepseq directory filepath HUnit mtl + network primitive process QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers vector zlib zlib-bindings + ]; + description = "Simple, composable, and easy-to-use stream I/O"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "io-streams-haproxy" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams , network, test-framework, test-framework-hunit, transformers @@ -150657,7 +148741,6 @@ self: { description = "EDSL for concurrent, realtime, embedded programming on top of Ivory"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ioref-stable" = callPackage @@ -150739,7 +148822,6 @@ self: { description = "Library for IP and MAC addresses"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ip-quoter" = callPackage @@ -150798,16 +148880,15 @@ self: { }) {}; "ipa" = callPackage - ({ mkDerivation, attoparsec, base, hspec, text, unicode-transforms + ({ mkDerivation, attoparsec, base, hspec, template-haskell, text + , unicode-transforms }: mkDerivation { pname = "ipa"; - version = "0.3"; - sha256 = "0cm9ahqaf2kdqny6nmk9ff1h413v0iqbfsf6glrr5vkhmx60h9qm"; - revision = "2"; - editedCabalFile = "1jafvzz7vdbkcwywdhx49g2q1f0gah0bz921kia6lbi5jnyaail1"; + version = "0.3.1"; + sha256 = "1l658qnqfs63dwarmiaw7vf6v2xl8hhvzlb95w168rpa7wfkrh5n"; libraryHaskellDepends = [ - attoparsec base text unicode-transforms + attoparsec base template-haskell text unicode-transforms ]; testHaskellDepends = [ base hspec text ]; description = "Internal Phonetic Alphabet (IPA)"; @@ -150831,7 +148912,6 @@ self: { description = "interactive patch editor"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ipc" = callPackage @@ -150848,7 +148928,6 @@ self: { description = "High level inter-process communication library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ipcvar" = callPackage @@ -150908,8 +148987,6 @@ self: { ]; description = "Auto-generated IPFS HTTP API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ipld-cid" = callPackage @@ -150932,7 +149009,6 @@ self: { description = "IPLD Content-IDentifiers "; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ipopt-hs" = callPackage @@ -150968,7 +149044,6 @@ self: { description = "Tiny helper for pretty-printing values in ghci console"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "iproute" = callPackage @@ -151033,7 +149108,6 @@ self: { description = "web-interface for iptables"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ipynb" = callPackage @@ -151117,8 +149191,8 @@ self: { }: mkDerivation { pname = "irc-client"; - version = "1.1.2.0"; - sha256 = "0gd7ww2cmnh7im0gicsj1617540kl97780860hzf8nkixn71hwqr"; + version = "1.1.2.1"; + sha256 = "1zaa8na730m96flgiyzcwq95v2ianvflsw3abvdavf7xpq4s71ld"; libraryHaskellDepends = [ base bytestring conduit connection containers contravariant exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale @@ -151232,7 +149306,6 @@ self: { description = "Library for writing fun IRC bots"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "irc-fun-client" = callPackage @@ -151252,7 +149325,6 @@ self: { description = "Another library for writing IRC clients"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "irc-fun-color" = callPackage @@ -151270,7 +149342,6 @@ self: { description = "Add color and style decorations to IRC messages"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "irc-fun-messages" = callPackage @@ -151285,7 +149356,6 @@ self: { description = "Types and functions for working with the IRC protocol"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "irc-fun-types" = callPackage @@ -151368,7 +149438,6 @@ self: { description = "RFC-based resource identifier library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "iridium" = callPackage @@ -151434,7 +149503,6 @@ self: { description = "A technical demo for Antisplice"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "irt" = callPackage @@ -151505,7 +149573,6 @@ self: { description = "Check whether a value has been evaluated"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "isiz" = callPackage @@ -151547,7 +149614,6 @@ self: { description = "Advanced ESMTP library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "iso-deriving" = callPackage @@ -151685,7 +149751,6 @@ self: { description = "A (bytestring-) builder for the ISO-14496-12 base media file format"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "isohunt" = callPackage @@ -151703,7 +149768,6 @@ self: { description = "Bindings to the isoHunt torrent search API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "isotope" = callPackage @@ -151836,7 +149900,6 @@ self: { description = "iteratees for statistical processing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "iterIO" = callPackage @@ -151915,7 +149978,6 @@ self: { description = "Enumeratees for compressing and decompressing streams"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) bzip2; inherit (pkgs) zlib;}; "iteratee-mtl" = callPackage @@ -151934,7 +149996,6 @@ self: { description = "Iteratee-based I/O"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "iteratee-parsec" = callPackage @@ -151951,7 +150012,6 @@ self: { description = "Package allowing parsec parser initeratee"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "iteratee-stm" = callPackage @@ -151966,7 +150026,6 @@ self: { description = "Concurrent iteratees using STM"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "iterio-server" = callPackage @@ -151984,7 +150043,6 @@ self: { description = "Library for building servers with IterIO"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "iterm-show" = callPackage @@ -152001,8 +150059,6 @@ self: { executableHaskellDepends = [ base bytestring ]; description = "Enable graphical display of images inline on some terminals"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "iterm-show-JuicyPixels" = callPackage @@ -152016,8 +150072,6 @@ self: { libraryHaskellDepends = [ base iterm-show JuicyPixels ]; description = "Orphan Show instances for JuciyPixels image types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "iterm-show-diagrams" = callPackage @@ -152036,7 +150090,6 @@ self: { description = "Orphan Show instances for diagrams package that render inline in some terminals"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ival" = callPackage @@ -152083,7 +150136,6 @@ self: { description = "Theorem proving library based on dependent type theory"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ivory" = callPackage @@ -152133,7 +150185,6 @@ self: { description = "Ivory register bindings for the Atmega328p"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ivory-backend-c" = callPackage @@ -152155,7 +150206,6 @@ self: { description = "Ivory C backend"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ivory-bitdata" = callPackage @@ -152175,7 +150225,6 @@ self: { description = "Ivory bit-data support"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ivory-eval" = callPackage @@ -152195,7 +150244,6 @@ self: { description = "Simple concrete evaluator for Ivory programs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ivory-examples" = callPackage @@ -152219,7 +150267,6 @@ self: { description = "Ivory examples"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ivory-hw" = callPackage @@ -152233,7 +150280,6 @@ self: { description = "Ivory hardware model (STM32F4)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ivory-opts" = callPackage @@ -152251,7 +150297,6 @@ self: { description = "Ivory compiler optimizations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ivory-quickcheck" = callPackage @@ -152274,7 +150319,6 @@ self: { description = "QuickCheck driver for Ivory"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ivory-serialize" = callPackage @@ -152292,7 +150336,6 @@ self: { description = "Serialization library for Ivory"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ivory-stdlib" = callPackage @@ -152306,7 +150349,6 @@ self: { description = "Ivory standard library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ivy-web" = callPackage @@ -152323,7 +150365,6 @@ self: { description = "A lightweight web framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "iwlib" = callPackage @@ -152336,6 +150377,9 @@ self: { librarySystemDepends = [ wirelesstools ]; description = "Bindings for the iw C library"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) wirelesstools;}; "ix" = callPackage @@ -152509,7 +150553,6 @@ self: { description = "CLI (command line interface) to YQL"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "j" = callPackage @@ -152547,7 +150590,6 @@ self: { description = "j2hs"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ja-base-extra" = callPackage @@ -152664,7 +150706,6 @@ self: { description = "Jailed IO monad"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jailbreak-cabal" = callPackage @@ -152880,7 +150921,6 @@ self: { description = "Utilities for working with the java-bridge package"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "java-character" = callPackage @@ -152893,7 +150933,6 @@ self: { description = "Functions to simulate Java's Character class"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "java-poker" = callPackage @@ -152920,7 +150959,6 @@ self: { description = "Tools for reflecting on Java classes"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "javaclass" = callPackage @@ -153006,7 +151044,6 @@ self: { description = "A utility to print the SourceFile attribute of one or more Java class files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "javav" = callPackage @@ -153230,7 +151267,6 @@ self: { description = "QuasiQuotation library for programmatic generation of Javascript code"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jmacro-rpc" = callPackage @@ -153250,7 +151286,6 @@ self: { description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jmacro-rpc-happstack" = callPackage @@ -153268,7 +151303,6 @@ self: { description = "Happstack backend for jmacro-rpc"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jmacro-rpc-snap" = callPackage @@ -153285,7 +151319,6 @@ self: { description = "Snap backend for jmacro-rpc"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jml-web-service" = callPackage @@ -153321,7 +151354,6 @@ self: { description = "Jmonkey is very restricted but handy EDSL for JavaScript"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jni" = callPackage @@ -153333,6 +151365,8 @@ self: { pname = "jni"; version = "0.8.0"; sha256 = "0m94p2zx877snh3imwcdnwa8ajfb76cg2rjgjx3pan508ham1h5i"; + revision = "2"; + editedCabalFile = "1ql65nfmd5mhn7y2xdifx240mk5my5z8w3pn85497hzk27qllybi"; libraryHaskellDepends = [ async base bytestring choice constraints containers deepseq inline-c singletons stm text @@ -153392,7 +151426,6 @@ self: { description = "A library for creating a jobs management website running custom jobs"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "join" = callPackage @@ -153406,7 +151439,6 @@ self: { description = "Parallel Join Patterns with Guards and Propagation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "join-api" = callPackage @@ -153572,7 +151604,6 @@ self: { description = "Tiny markdown notebook"; license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jpeg" = callPackage @@ -153775,7 +151806,9 @@ self: { ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "jsaddle-webkitgtk" = callPackage @@ -153842,7 +151875,6 @@ self: { description = "Javascript Monadic Writer base package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "json" = callPackage @@ -153968,7 +152000,6 @@ self: { description = "Encoders of JSON AST"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "json-ast-quickcheck" = callPackage @@ -154020,7 +152051,6 @@ self: { description = "Automatic type declaration for JSON input data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "json-b" = callPackage @@ -154044,7 +152074,6 @@ self: { description = "JSON parser that uses byte strings"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "json-builder" = callPackage @@ -154139,7 +152168,6 @@ self: { description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "json-extra" = callPackage @@ -154222,7 +152250,6 @@ self: { description = "Incremental JSON parser with early termination and a declarative DSL"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "json-litobj" = callPackage @@ -154367,7 +152394,6 @@ self: { description = "Kitchen sink for querying JSON"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "json-rpc" = callPackage @@ -154515,8 +152541,6 @@ self: { ]; description = "Generics JSON (de)serialization using generics-sop"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "json-state" = callPackage @@ -154581,7 +152605,6 @@ self: { description = "High-performance JSON parser and encoder"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "json-to-haskell" = callPackage @@ -154613,8 +152636,6 @@ self: { recursion-schemes text unordered-containers vector ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "json-togo" = callPackage @@ -154633,7 +152654,6 @@ self: { description = "Effectful parsing of JSON documents"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "json-tokens" = callPackage @@ -154662,7 +152682,6 @@ self: { description = "Tokenize JSON"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "json-tools" = callPackage @@ -154754,7 +152773,6 @@ self: { description = "Support JSON for SQL Database"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "json2-types" = callPackage @@ -154837,7 +152855,6 @@ self: { description = "Fast and simple JSON encoding toolkit"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jsonnet" = callPackage @@ -154932,8 +152949,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "JSON-RPC 2.0 server over a Conduit."; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jsons-to-schema" = callPackage @@ -154966,7 +152981,6 @@ self: { description = "JSON to JSON Schema"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jsonschema-gen" = callPackage @@ -155096,7 +153110,6 @@ self: { description = "Extract substructures from JSON by following a path"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "juandelacosa" = callPackage @@ -155120,8 +153133,6 @@ self: { ]; description = "Manage users in MariaDB >= 10.1.1"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "judge" = callPackage @@ -155210,8 +153221,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.5.2"; - sha256 = "1nhz7rf8sczrhph0h9hia1vqxig1bcpc8v6zvxgrywmacl1mnky6"; + version = "0.5.3"; + sha256 = "00774gby970jxa69zw8baki40r6nw7vrprc670n8skmlp03p38j2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155317,6 +153328,8 @@ self: { pname = "jvm"; version = "0.6.0"; sha256 = "119davscv5mrw2mnlrklx8hbjrc7lhf5a9jphdnnxs6bywi8i2zm"; + revision = "2"; + editedCabalFile = "1p0p50w0zjf79a3p5wiwg1wfnsgvqf2n04ydpacrfwm96id667kp"; libraryHaskellDepends = [ base bytestring choice constraints distributed-closure exceptions jni singletons template-haskell text vector @@ -155330,7 +153343,6 @@ self: { description = "Call JVM methods from Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jvm-batching" = callPackage @@ -155342,6 +153354,8 @@ self: { pname = "jvm-batching"; version = "0.2.0"; sha256 = "19z0db10y181n4adkz23cmly0q4zp953zh6f3r7rmxcd78758pbk"; + revision = "1"; + editedCabalFile = "1ni0gnww6r18dg2pm1hmdkfzaghq5ssirpp737i1c81ya1k95m2n"; setupHaskellDepends = [ base Cabal inline-java ]; libraryHaskellDepends = [ base bytestring distributed-closure inline-java jni jvm singletons @@ -155356,7 +153370,6 @@ self: { description = "Provides batched marshalling of values between Java and Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jvm-binary" = callPackage @@ -155368,8 +153381,8 @@ self: { }: mkDerivation { pname = "jvm-binary"; - version = "0.9.0"; - sha256 = "1ks5mbp1anrgm100sf3ycv1prwm3vj1vyag7l0ihs4cr2sqzq3a2"; + version = "0.10.0"; + sha256 = "11c3rhny06zjw8xv830khq1kdjbpzkr7wmzzymld4zcmhfmk9qda"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 @@ -155420,6 +153433,8 @@ self: { pname = "jvm-streaming"; version = "0.4.0"; sha256 = "0k8y6kvbymmjlr3bvgcws0z2hwdznyr3b3alkwsjag49lsgp21sd"; + revision = "1"; + editedCabalFile = "01f3j02qzqi7ls876vwzl2db3621xr7psmzm3cx9pk414bhj5f56"; setupHaskellDepends = [ base Cabal inline-java jvm-batching ]; libraryHaskellDepends = [ base distributed-closure inline-java jni jvm jvm-batching @@ -155434,7 +153449,6 @@ self: { description = "Expose Java iterators as streams from the streaming package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jwt" = callPackage @@ -155555,7 +153569,6 @@ self: { description = "UI device events via a Kafka message broker"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kafka-device-glut" = callPackage @@ -155571,7 +153584,6 @@ self: { description = "GLUT events via a Kafka message broker"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kafka-device-joystick" = callPackage @@ -155593,7 +153605,6 @@ self: { description = "Linux joystick events via a Kafka message broker"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kafka-device-leap" = callPackage @@ -155613,7 +153624,6 @@ self: { description = "Leap Motion events via a Kafka message broker"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kafka-device-spacenav" = callPackage @@ -155635,7 +153645,6 @@ self: { description = "Linux SpaceNavigator events via a Kafka message broker"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kafka-device-vrpn" = callPackage @@ -155651,7 +153660,6 @@ self: { description = "VRPN events via a Kafka message broker"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kaleidoscope" = callPackage @@ -155675,7 +153683,6 @@ self: { description = "Haskell Kaleidoscope tutorial"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kalman" = callPackage @@ -155796,7 +153803,6 @@ self: { description = "Kansas Lava is a hardware simulator and VHDL generator"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kansas-lava-cores" = callPackage @@ -155817,7 +153823,6 @@ self: { description = "FPGA Cores Written in Kansas Lava"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kansas-lava-papilio" = callPackage @@ -155837,7 +153842,6 @@ self: { description = "Kansas Lava support files for the Papilio FPGA board"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kansas-lava-shake" = callPackage @@ -155855,7 +153859,6 @@ self: { description = "Shake rules for building Kansas Lava projects"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "karakuri" = callPackage @@ -155872,7 +153875,6 @@ self: { description = "Good stateful automata"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "karps" = callPackage @@ -156009,7 +154011,6 @@ self: { description = "ElasticSearch scribe for the Katip logging framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "katip-kafka" = callPackage @@ -156102,7 +154103,6 @@ self: { description = "Katip scribe that logs to Rollbar"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "katip-scalyr-scribe" = callPackage @@ -156246,7 +154246,6 @@ self: { description = "Utilities for serving static sites and blogs with Wai/Warp"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kawhi" = callPackage @@ -156493,7 +154492,6 @@ self: { description = "Rapid Gtk Application Development - I18N"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keera-hails-mvc-controller" = callPackage @@ -156522,7 +154520,6 @@ self: { description = "Haskell on Gtk rails - Gtk-based global environment for MVC applications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keera-hails-mvc-model-lightmodel" = callPackage @@ -156540,7 +154537,6 @@ self: { description = "Rapid Gtk Application Development - Reactive Protected Light Models"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keera-hails-mvc-model-protectedmodel" = callPackage @@ -156558,7 +154554,6 @@ self: { description = "Rapid Gtk Application Development - Protected Reactive Models"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keera-hails-mvc-solutions-config" = callPackage @@ -156592,7 +154587,6 @@ self: { description = "Haskell on Gtk rails - Common solutions to recurrent problems in Gtk applications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keera-hails-mvc-view" = callPackage @@ -156636,7 +154630,6 @@ self: { description = "Reactive Haskell on Rails - CBMVars as reactive values"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keera-hails-reactive-fs" = callPackage @@ -156653,7 +154646,6 @@ self: { description = "Haskell on Rails - Files as Reactive Values"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keera-hails-reactive-gtk" = callPackage @@ -156671,7 +154663,6 @@ self: { description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keera-hails-reactive-htmldom" = callPackage @@ -156690,7 +154681,6 @@ self: { description = "Keera Hails Reactive bindings for HTML DOM via GHCJS"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keera-hails-reactive-network" = callPackage @@ -156707,7 +154697,6 @@ self: { description = "Haskell on Rails - Sockets as Reactive Values"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keera-hails-reactive-polling" = callPackage @@ -156723,7 +154712,6 @@ self: { description = "Haskell on Rails - Polling based Readable RVs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keera-hails-reactive-wx" = callPackage @@ -156738,7 +154726,6 @@ self: { description = "Haskell on Rails - Reactive Fields for WX widgets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keera-hails-reactive-yampa" = callPackage @@ -156755,7 +154742,6 @@ self: { description = "Haskell on Rails - FRP Yampa Signal Functions as RVs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keera-hails-reactivelenses" = callPackage @@ -156768,7 +154754,6 @@ self: { description = "Reactive Haskell on Rails - Lenses applied to Reactive Values"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keera-hails-reactivevalues" = callPackage @@ -156984,7 +154969,6 @@ self: { description = "a dAmn ↔ IRC proxy"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "key" = callPackage @@ -157147,7 +155131,6 @@ self: { description = "back up a secret key securely to the cloud"; license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keystore" = callPackage @@ -157179,8 +155162,6 @@ self: { ]; description = "Managing stores of secret things"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keyvaluehash" = callPackage @@ -157198,7 +155179,6 @@ self: { description = "Pure Haskell key/value store implementation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keyword-args" = callPackage @@ -157221,7 +155201,6 @@ self: { description = "Extract data from a keyword-args config file format"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "khph" = callPackage @@ -157288,7 +155267,6 @@ self: { description = "Parser and writer for KiCad files"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kickass-torrents-dump-parser" = callPackage @@ -157347,7 +155325,6 @@ self: { description = "Process KIF iOS test logs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kind-apply" = callPackage @@ -157418,7 +155395,6 @@ self: { description = "A dependency manager for Xcode (Objective-C) projects"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kleene" = callPackage @@ -157441,7 +155417,6 @@ self: { description = "Kleene algebra"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kleene-list" = callPackage @@ -157492,7 +155467,6 @@ self: { description = "Sequential and parallel implementations of Lloyd's algorithm"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kmeans-vector" = callPackage @@ -157510,7 +155484,6 @@ self: { description = "An implementation of the kmeans clustering algorithm based on the vector package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kmonad" = callPackage @@ -157568,7 +155541,6 @@ self: { description = "Repa-like array processing using LLVM JIT"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "knead-arithmetic" = callPackage @@ -157583,7 +155555,6 @@ self: { description = "Linear algebra and interpolation using LLVM JIT"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "knit" = callPackage @@ -157636,7 +155607,6 @@ self: { description = "a minimal Rmarkdown sort-of-thing for haskell, by way of Pandoc"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "knob" = callPackage @@ -157667,7 +155637,6 @@ self: { description = "Khovanov homology computations"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "koellner-phonetic" = callPackage @@ -157689,8 +155658,8 @@ self: { ({ mkDerivation, base, haxr, mtl }: mkDerivation { pname = "koji"; - version = "0.0.1"; - sha256 = "0yxx6xk5xld7jf7ph4x0r7k4bqcg02yl7597awbgbq82x97gyfb8"; + version = "0.0.2"; + sha256 = "1ypr552453r0b9s5xlsw0gllka2jaf9xwphlnx55fn05f17zh7qd"; libraryHaskellDepends = [ base haxr mtl ]; description = "Koji buildsystem XML-RPC API bindings"; license = lib.licenses.gpl2Only; @@ -157782,7 +155751,6 @@ self: { description = "The Korfu ORF Utility"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kparams" = callPackage @@ -157931,7 +155899,6 @@ self: { description = "Kolmogorov distribution and Kolmogorov-Smirnov test"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ksystools" = callPackage @@ -158014,7 +155981,6 @@ self: { description = "Client library for Kubernetes"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kubernetes-client-core" = callPackage @@ -158042,8 +156008,6 @@ self: { ]; description = "Auto-generated kubernetes-client-core API Client"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kubernetes-webhook-haskell" = callPackage @@ -158084,8 +156048,6 @@ self: { libraryHaskellDepends = [ base dlist transformers ]; description = "Combinators for Strategic Programming"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kure-your-boilerplate" = callPackage @@ -158132,7 +156094,6 @@ self: { description = "Find the alpha emoji"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kvitable" = callPackage @@ -158249,7 +156210,6 @@ self: { description = "an experiment management framework"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "labsat" = callPackage @@ -158274,7 +156234,6 @@ self: { description = "LabSat TCP Interface Wrapper"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "labyrinth" = callPackage @@ -158297,7 +156256,6 @@ self: { description = "A complicated turn-based game"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "labyrinth-server" = callPackage @@ -158332,7 +156290,6 @@ self: { description = "A complicated turn-based game - Web server"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lackey" = callPackage @@ -158345,8 +156302,6 @@ self: { testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lacroix" = callPackage @@ -158400,7 +156355,6 @@ self: { description = "Minimalistic type-checked compile-time template engine"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambda-ast" = callPackage @@ -158448,7 +156402,6 @@ self: { description = "A lambda calculus interpreter"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambda-calculus-interpreter" = callPackage @@ -158504,7 +156457,6 @@ self: { description = "a Paralell-DEVS implementaion based on distributed-process"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambda-options" = callPackage @@ -158520,7 +156472,6 @@ self: { description = "Declarative command-line parser with type-driven pattern matching"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambda-placeholders" = callPackage @@ -158605,7 +156556,6 @@ self: { description = "RSS 2.0 feed generator"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambdaLit" = callPackage @@ -158624,7 +156574,6 @@ self: { description = "..."; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambdabot" = callPackage @@ -158864,7 +156813,6 @@ self: { description = "Lambdabot for Zulip Chat"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambdacat" = callPackage @@ -158927,7 +156875,6 @@ self: { description = "LambdaCms \"media\" extension"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambdacube" = callPackage @@ -158942,7 +156889,6 @@ self: { description = "A simple lambda cube type checker"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambdacube-bullet" = callPackage @@ -158957,7 +156903,6 @@ self: { description = "Example for combining LambdaCube and Bullet"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambdacube-compiler" = callPackage @@ -158983,7 +156928,6 @@ self: { description = "LambdaCube 3D is a DSL to program GPUs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambdacube-core" = callPackage @@ -159000,7 +156944,6 @@ self: { description = "LambdaCube 3D IR"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambdacube-edsl" = callPackage @@ -159018,7 +156961,6 @@ self: { description = "LambdaCube 3D EDSL definition"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambdacube-engine" = callPackage @@ -159039,7 +156981,6 @@ self: { description = "3D rendering engine written entirely in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambdacube-examples" = callPackage @@ -159057,7 +156998,6 @@ self: { description = "Examples for LambdaCube"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambdacube-gl" = callPackage @@ -159077,7 +157017,6 @@ self: { description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambdacube-ir" = callPackage @@ -159113,7 +157052,6 @@ self: { description = "Samples for LambdaCube 3D"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambdatex" = callPackage @@ -159177,7 +157115,6 @@ self: { description = "Fpga bus core and serialization for RedPitaya"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambdiff" = callPackage @@ -159196,7 +157133,6 @@ self: { description = "Diff Viewer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lame" = callPackage @@ -159254,7 +157190,6 @@ self: { description = "A Lisp"; license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "language-Modula2" = callPackage @@ -159288,7 +157223,6 @@ self: { description = "Parser, pretty-printer, and more for the Modula-2 programming language"; license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "language-asn" = callPackage @@ -159411,7 +157345,6 @@ self: { description = "Interpreter and language infrastructure for Boogie"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "language-c" = callPackage @@ -159485,30 +157418,6 @@ self: { }) {}; "language-c-quote" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , exception-mtl, exception-transformers, filepath, happy - , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb - , symbol, template-haskell, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "language-c-quote"; - version = "0.12.2.1"; - sha256 = "0hwv4b40wj953f39gqn8ji4ycli67c90b8xbizskd4i1x3nqbi35"; - libraryHaskellDepends = [ - array base bytestring containers exception-mtl - exception-transformers filepath haskell-src-meta mainland-pretty - mtl srcloc syb symbol template-haskell - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - base bytestring HUnit mainland-pretty srcloc symbol test-framework - test-framework-hunit - ]; - description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; - license = lib.licenses.bsd3; - }) {}; - - "language-c-quote_0_13" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , exception-mtl, exception-transformers, filepath, happy , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb @@ -159530,7 +157439,6 @@ self: { ]; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "language-c99" = callPackage @@ -159682,8 +157590,6 @@ self: { doHaddock = false; description = "A language for generative literature"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "language-docker" = callPackage @@ -159693,8 +157599,8 @@ self: { }: mkDerivation { pname = "language-docker"; - version = "9.3.0"; - sha256 = "1n9v0b6lwr528b6919y11a8d27mhsp0mm870rx0rjg9l5j4mnbvn"; + version = "10.0.0"; + sha256 = "0h2jq15niz77h2vpqyq7gblgbsrrvsr3qjw1cmjvr474zgzxmrv7"; libraryHaskellDepends = [ base bytestring containers data-default-class megaparsec prettyprinter split text time @@ -159809,7 +157715,6 @@ self: { description = "Parser and pretty printer for the Eiffel language"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "language-elm" = callPackage @@ -159842,8 +157747,6 @@ self: { libraryToolDepends = [ alex happy ]; description = "Fortran lexer and parser, language support, and extensions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "language-gcl" = callPackage @@ -160052,7 +157955,6 @@ self: { description = "Parser and serializer for the Kort information language"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "language-lua" = callPackage @@ -160177,7 +158079,6 @@ self: { description = "A library for dealing with the Ninja build language"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "language-nix" = callPackage @@ -160226,7 +158127,6 @@ self: { description = "Parser, pretty-printer, and more for the Oberon programming language"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "language-objc" = callPackage @@ -160400,7 +158300,6 @@ self: { description = "Generate coloured XHTML for Python code"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "language-python-test" = callPackage @@ -160431,7 +158330,6 @@ self: { description = "Utilities for working with the Qux language"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "language-rust" = callPackage @@ -160532,7 +158430,6 @@ self: { description = "Various tools to detect/correct mistakes in words"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "language-sqlite" = callPackage @@ -160588,8 +158485,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Parser and pretty printer for the Thrift IDL format"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "language-tl" = callPackage @@ -160699,7 +158594,6 @@ self: { description = "Numerical Linear Algebra using LAPACK"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lapack-carray" = callPackage @@ -160717,7 +158611,6 @@ self: { description = "Auto-generated interface to Fortran LAPACK via CArrays"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lapack-comfort-array" = callPackage @@ -160735,7 +158628,6 @@ self: { description = "Auto-generated interface to Fortran LAPACK via comfort-array"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lapack-ffi" = callPackage @@ -160802,8 +158694,10 @@ self: { ]; description = "Efficiently hash (large) Haskell values"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + platforms = [ + "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux" + ]; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "largeword" = callPackage @@ -160841,7 +158735,6 @@ self: { description = "Tool to track security alerts on LWN"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "latest-npm-version" = callPackage @@ -160904,7 +158797,6 @@ self: { description = "Use actual LaTeX to render formulae inside Hakyll pages"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "latex-formulae-image" = callPackage @@ -160947,7 +158839,6 @@ self: { description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX installation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "latex-function-tables" = callPackage @@ -161001,7 +158892,6 @@ self: { description = "Use actual LaTeX to render formulae inside Hakyll pages"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "latex-svg-image" = callPackage @@ -161041,7 +158931,6 @@ self: { description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lattices" = callPackage @@ -161100,8 +158989,6 @@ self: { ]; description = "Server-side SDK for integrating with LaunchDarkly"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "launchpad-control" = callPackage @@ -161200,7 +159087,6 @@ self: { description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types."; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "layers" = callPackage @@ -161234,7 +159120,6 @@ self: { description = "A prototypical 2d platform game"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "layout" = callPackage @@ -161272,8 +159157,6 @@ self: { libraryHaskellDepends = [ alex-tools base text ]; description = "A collection of different layout implementations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "layouting" = callPackage @@ -161290,7 +159173,6 @@ self: { description = "General layouting library. Currently supports layouting 2D areas and can be used as a backend for text pretty printing or automatic windows layouting managers."; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lazy" = callPackage @@ -161335,7 +159217,6 @@ self: { description = "Identifiers for not-yet-computed values"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lazy-hash-cache" = callPackage @@ -161357,7 +159238,6 @@ self: { description = "Storing computed values for re-use when the same program runs again"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lazy-io" = callPackage @@ -161382,8 +159262,6 @@ self: { libraryHaskellDepends = [ base bytestring io-streams ]; description = "Get lazy with your io-streams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lazy-priority-queue" = callPackage @@ -161413,8 +159291,6 @@ self: { libraryHaskellDepends = [ base size-based ]; description = "Finds values satisfying a lazy predicate"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lazyarray" = callPackage @@ -161605,7 +159481,6 @@ self: { description = "LDIF idempotent apply tool"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ldif" = callPackage @@ -161669,7 +159544,6 @@ self: { description = "Robust space leak, and its strictification"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lean" = callPackage @@ -161686,7 +159560,6 @@ self: { description = "Bonds to Lean theorem prover"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lean-peano" = callPackage @@ -161789,8 +159662,6 @@ self: { ]; description = "Use the Leanpub API via Wreq"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "leapseconds" = callPackage @@ -161973,7 +159844,6 @@ self: { description = "Distributed, stateful, homogeneous microservice framework"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "legion-discovery" = callPackage @@ -162000,7 +159870,6 @@ self: { description = "A discovery service based on Legion"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "legion-discovery-client" = callPackage @@ -162021,7 +159890,6 @@ self: { description = "Client library for communicating with legion-discovery"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "legion-extra" = callPackage @@ -162044,7 +159912,6 @@ self: { description = "Extra non-essential utilities for building legion applications"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "leksah" = callPackage @@ -162121,7 +159988,6 @@ self: { description = "Metadata collection for leksah"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lendingclub" = callPackage @@ -162631,6 +160497,7 @@ self: { description = "Tutorial for the lens library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; broken = true; }) {}; @@ -162662,7 +160529,6 @@ self: { description = "Collection of missing lens utilities"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lens-xml" = callPackage @@ -162728,8 +160594,7 @@ self: { ]; description = "frugal issue tracker"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ rvl ]; }) {}; "lenz" = callPackage @@ -162883,7 +160748,6 @@ self: { description = "An implementation of the Levenberg-Marquardt algorithm"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "levmar-chart" = callPackage @@ -162898,7 +160762,6 @@ self: { description = "Plots the results of the Levenberg-Marquardt algorithm in a chart"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lex-applicative" = callPackage @@ -162919,7 +160782,6 @@ self: { description = "See README for more info"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lexer-applicative" = callPackage @@ -162978,7 +160840,6 @@ self: { description = "Lens GUI Toolkit"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lha" = callPackage @@ -162991,7 +160852,6 @@ self: { description = "Data structures for the Les Houches Accord"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lhae" = callPackage @@ -163012,7 +160872,6 @@ self: { description = "Simple spreadsheet program"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lhc" = callPackage @@ -163040,7 +160899,6 @@ self: { description = "Parser and writer for Les-Houches event files"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lhs2TeX-hl" = callPackage @@ -163175,8 +161033,6 @@ self: { ]; description = "Haskell interface to libarchive"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) libarchive;}; "libarchive-conduit" = callPackage @@ -163214,7 +161070,6 @@ self: { description = "Haskell bindings to libconfig"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) libconfig;}; "libcspm" = callPackage @@ -163236,7 +161091,6 @@ self: { description = "A library providing a parser, type checker and evaluator for CSPM"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "libexpect" = callPackage @@ -163480,7 +161334,6 @@ self: { description = "Lastfm API interface"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "liblawless" = callPackage @@ -163517,7 +161370,6 @@ self: { description = "Prelude based on protolude for GHC 8 and beyond"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "liblinear-enumerator" = callPackage @@ -163532,7 +161384,6 @@ self: { description = "liblinear iteratee"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "libltdl" = callPackage @@ -163560,6 +161411,9 @@ self: { librarySystemDepends = [ modbus ]; description = "Haskell bindings to the C modbus library"; license = lib.licenses.bsd2; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {modbus = null;}; "libmolude" = callPackage @@ -163593,7 +161447,6 @@ self: { description = "Prelude based on protolude for GHC 8 and beyond"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "libmpd" = callPackage @@ -163789,7 +161642,6 @@ self: { description = "Raft consensus algorithm"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "librandomorg" = callPackage @@ -163824,7 +161676,6 @@ self: { description = "Bindings to the Librato API"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "libravatar" = callPackage @@ -163941,7 +161792,6 @@ self: { description = "Conduit wrappers for libssh2 FFI bindings (see libssh2 package)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "libstackexchange" = callPackage @@ -164000,6 +161850,9 @@ self: { libraryPkgconfigDepends = [ systemd ]; description = "Haskell bindings to libsystemd-journal"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) systemd;}; "libtagc" = callPackage @@ -164024,12 +161877,17 @@ self: { pname = "libtelnet"; version = "0.1.0.1"; sha256 = "13g7wpibjncj9h6yva8gj9fqs8j806r1vnina78wgv8f980dqxks"; + revision = "1"; + editedCabalFile = "13lg79nlwmhd5qqyr31bk7wpfl0mvr37q4ha3q83gxya03f34v5h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ libtelnet ]; description = "Bindings to libtelnet"; license = lib.licenses.gpl3Plus; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) libtelnet;}; "libversion" = callPackage @@ -164110,7 +161968,6 @@ self: { description = "Enumerator-based API for libXML's SAX interface"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "libxml-sax" = callPackage @@ -164167,6 +162024,9 @@ self: { executableSystemDepends = [ nvpair zfs ]; description = "Bindings to libzfs, for dealing with the Z File System and Zpools"; license = lib.licenses.mit; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {nvpair = null; inherit (pkgs) zfs;}; "licensor" = callPackage @@ -164261,7 +162121,6 @@ self: { description = "Flexible manual resource management"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lift-generics" = callPackage @@ -164373,7 +162232,6 @@ self: { description = "lifted IO operations from the base library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lifted-protolude" = callPackage @@ -164504,7 +162362,6 @@ self: { description = "Haskell client for lightning-viz REST API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lightstep-haskell" = callPackage @@ -164537,7 +162394,6 @@ self: { description = "LightStep OpenTracing client library"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lighttpd-conf" = callPackage @@ -164555,7 +162411,6 @@ self: { description = "Lighttpd configuration file tools"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lighttpd-conf-qq" = callPackage @@ -164573,7 +162428,6 @@ self: { description = "A QuasiQuoter for lighttpd configuration files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lilypond" = callPackage @@ -164750,8 +162604,6 @@ self: { ]; description = "Haskell SDK for LINE Messaging API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "line-break" = callPackage @@ -164922,7 +162774,6 @@ self: { description = "Compute resistance of linear electrical circuits"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "linear-code" = callPackage @@ -165046,6 +162897,9 @@ self: { libraryHaskellDepends = [ base sbv ]; description = "Use SMT solvers to solve linear systems over integers and rationals"; license = lib.licenses.bsd3; + platforms = [ + "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux" + ]; }) {}; "linearmap-category" = callPackage @@ -165066,7 +162920,6 @@ self: { description = "Native, complete, matrix-free linear algebra"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "linearscan" = callPackage @@ -165103,7 +162956,6 @@ self: { description = "Makes it easy to use the linearscan register allocator with Hoopl"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "linebreak" = callPackage @@ -165214,7 +163066,6 @@ self: { description = "linkchk is a network interface link ping monitor"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "linkcore" = callPackage @@ -165232,7 +163083,6 @@ self: { description = "Combines multiple GHC Core modules into a single module"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "linked-list-with-iterator" = callPackage @@ -165321,8 +163171,6 @@ self: { ]; description = "Lightweight library for building HTTP API"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "linnet-aeson" = callPackage @@ -165340,8 +163188,6 @@ self: { ]; description = "Aeson JSON support for Linnet"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "linnet-conduit" = callPackage @@ -165362,8 +163208,6 @@ self: { ]; description = "Conduit-backed support for streaming in Linnet"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "linode" = callPackage @@ -165460,6 +163304,9 @@ self: { libraryHaskellDepends = [ base bytestring time unix ]; description = "Bindings to Linux evdev input device interface"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "linux-file-extents" = callPackage @@ -165473,6 +163320,9 @@ self: { libraryHaskellDepends = [ base unix ]; description = "Retrieve file fragmentation information under Linux"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "linux-framebuffer" = callPackage @@ -165496,6 +163346,9 @@ self: { libraryHaskellDepends = [ base bytestring hashable unix ]; description = "Thinner binding to the Linux Kernel's inotify interface"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "linux-kmod" = callPackage @@ -165521,6 +163374,9 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "Mount and unmount filesystems"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "linux-namespaces" = callPackage @@ -165532,6 +163388,9 @@ self: { libraryHaskellDepends = [ base bytestring unix ]; description = "Work with linux namespaces: create new or enter existing ones"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "linux-perf" = callPackage @@ -165574,7 +163433,6 @@ self: { description = "Wrapping of Linux' ptrace(2)"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "linux-xattr" = callPackage @@ -165636,7 +163494,6 @@ self: { description = "Labeled IO library"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lio-fs" = callPackage @@ -165699,7 +163556,6 @@ self: { description = "RISC-V Core"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lipsum-gen" = callPackage @@ -165753,7 +163609,6 @@ self: { description = "Drop-in base replacement for LiquidHaskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "liquid-bytestring" = callPackage @@ -165770,7 +163625,6 @@ self: { description = "LiquidHaskell specs for the bytestring package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "liquid-containers" = callPackage @@ -165787,7 +163641,6 @@ self: { description = "LiquidHaskell specs for the containers package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "liquid-fixpoint" = callPackage @@ -165836,7 +163689,6 @@ self: { description = "Drop-in ghc-prim replacement for LiquidHaskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "liquid-parallel" = callPackage @@ -165852,7 +163704,6 @@ self: { description = "LiquidHaskell specs for the parallel package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "liquid-platform" = callPackage @@ -165873,7 +163724,6 @@ self: { description = "A battery-included platform for LiquidHaskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "liquid-prelude" = callPackage @@ -165891,7 +163741,6 @@ self: { description = "General utility modules for LiquidHaskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "liquid-vector" = callPackage @@ -165906,7 +163755,6 @@ self: { description = "LiquidHaskell specs for the vector package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "liquidhaskell" = callPackage @@ -166172,7 +164020,6 @@ self: { description = "An \"attoparsec\" adapter for \"list-t\""; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "list-t-html-parser" = callPackage @@ -166197,7 +164044,6 @@ self: { description = "Streaming HTML parser"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "list-t-http-client" = callPackage @@ -166264,6 +164110,7 @@ self: { testHaskellDepends = [ base doctest ]; description = "List monad transformer"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "list-tries" = callPackage @@ -166320,7 +164167,6 @@ self: { description = "Witnesses for working with type-level lists"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "list-zip-def" = callPackage @@ -166376,7 +164222,6 @@ self: { description = "A client library to the ListenBrainz project"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "listlike-instances" = callPackage @@ -166513,8 +164358,6 @@ self: { ]; description = "Basic logging based on co-log"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "little-rio" = callPackage @@ -166559,7 +164402,6 @@ self: { description = "Live coding of MIDI music"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "liveplot" = callPackage @@ -166647,7 +164489,6 @@ self: { description = "Bindings to the LLVM compiler toolkit"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "llvm-analysis" = callPackage @@ -166676,7 +164517,6 @@ self: { description = "A Haskell library for analyzing LLVM bitcode"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "llvm-base" = callPackage @@ -166711,7 +164551,6 @@ self: { description = "The base types for a mostly pure Haskell LLVM analysis library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "llvm-base-util" = callPackage @@ -166724,7 +164563,6 @@ self: { description = "Utilities for bindings to the LLVM compiler toolkit"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "llvm-data-interop" = callPackage @@ -166746,7 +164584,6 @@ self: { description = "A low-level data interoperability binding for LLVM"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "llvm-dsl" = callPackage @@ -166765,7 +164602,6 @@ self: { description = "Support for writing an EDSL with LLVM-JIT as target"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "llvm-extension" = callPackage @@ -166785,7 +164621,6 @@ self: { description = "Processor specific intrinsics for the llvm interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "llvm-extra" = callPackage @@ -166812,7 +164647,6 @@ self: { description = "Utility functions for the llvm interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "llvm-ffi" = callPackage @@ -166875,7 +164709,6 @@ self: { description = "General purpose LLVM bindings"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {llvm-config = null;}; "llvm-general-pure" = callPackage @@ -166922,7 +164755,6 @@ self: { description = "QuasiQuoting llvm code for llvm-general"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "llvm-hs" = callPackage @@ -167071,7 +164903,6 @@ self: { description = "LLVM bitcode parsing library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "llvm-tf" = callPackage @@ -167094,7 +164925,6 @@ self: { description = "Bindings to the LLVM compiler toolkit using type families"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "llvm-tools" = callPackage @@ -167123,7 +164953,6 @@ self: { description = "Useful tools built on llvm-analysis"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lmdb" = callPackage @@ -167216,7 +165045,6 @@ self: { description = "LMonad for Yesod integrates LMonad's IFC with Yesod web applications"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "load-balancing" = callPackage @@ -167328,7 +165156,6 @@ self: { description = "Generalised local search within Haskell, for applications in combinatorial optimisation"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "localization" = callPackage @@ -167359,7 +165186,6 @@ self: { description = "GNU Gettext-based messages localization library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "located" = callPackage @@ -167486,7 +165312,6 @@ self: { description = "Very simple poll lock"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lockfree-queue" = callPackage @@ -167545,7 +165370,6 @@ self: { description = "Structured logging solution with multiple backends"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "log-base" = callPackage @@ -167661,7 +165485,6 @@ self: { description = "Structured logging solution (PostgreSQL back end)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "log-utils" = callPackage @@ -167685,7 +165508,6 @@ self: { description = "Utils for working with logs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "log-warper" = callPackage @@ -167900,7 +165722,6 @@ self: { description = "Supplemental packages for `logging-effect`"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "logging-effect-extra-file" = callPackage @@ -167972,6 +165793,9 @@ self: { ]; description = "Journald back-end for logging-facade"; license = lib.licenses.mit; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "logging-facade-syslog" = callPackage @@ -168032,7 +165856,6 @@ self: { description = "Framework for propositional and first order logic, theorem proving"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "logicst" = callPackage @@ -168152,7 +165975,6 @@ self: { description = "Useful utilities for the Lojban language"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lojbanParser" = callPackage @@ -168199,7 +166021,6 @@ self: { description = "Prolog with lojban"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lol" = callPackage @@ -168251,7 +166072,6 @@ self: { description = "Lattice-based cryptographic applications using ."; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lol-benches" = callPackage @@ -168269,7 +166089,6 @@ self: { description = "A library for benchmarking ."; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lol-calculus" = callPackage @@ -168313,7 +166132,6 @@ self: { description = "A fast C++ backend for ."; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lol-repa" = callPackage @@ -168334,7 +166152,6 @@ self: { description = "A repa backend for ."; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lol-tests" = callPackage @@ -168355,7 +166172,6 @@ self: { description = "A library for testing ."; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lol-typing" = callPackage @@ -168381,7 +166197,6 @@ self: { description = "Type inferencer for LOL (λω language)"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "loli" = callPackage @@ -168400,7 +166215,6 @@ self: { description = "A minimum web dev DSL in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "long-double" = callPackage @@ -168457,7 +166271,6 @@ self: { description = "Fast Brute-force search using parallelism"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lookup-tables" = callPackage @@ -168502,7 +166315,6 @@ self: { description = "control-monad-loop port for effin"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "loop-while" = callPackage @@ -168674,7 +166486,6 @@ self: { description = "EDSL for the Michelson Language"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "loris" = callPackage @@ -168728,7 +166539,6 @@ self: { description = "An implementation of an adictive two-player card game"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "louis" = callPackage @@ -168763,7 +166573,6 @@ self: { description = "Amazon Simple Workflow Service Wrapper for Work Pools"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lowgl" = callPackage @@ -168889,7 +166698,6 @@ self: { description = "List USB devices"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lscabal" = callPackage @@ -168932,36 +166740,6 @@ self: { }) {}; "lsp" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , containers, data-default, dependent-map, directory, filepath - , hashable, hslogger, hspec, hspec-discover, lens, lsp-types, mtl - , network-uri, QuickCheck, quickcheck-instances, random - , rope-utf16-splay, scientific, sorted-list, stm, text, time - , transformers, unliftio-core, unordered-containers, uuid - }: - mkDerivation { - pname = "lsp"; - version = "1.1.1.0"; - sha256 = "04ndz4v1mwga13qndmnaaj145y5zqw7zv64px7ak26qvd1m26h9r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async attoparsec base bytestring containers data-default - dependent-map directory filepath hashable hslogger lens lsp-types - mtl network-uri random scientific sorted-list stm text time - transformers unliftio-core unordered-containers uuid - ]; - testHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hashable hspec lens network-uri QuickCheck quickcheck-instances - rope-utf16-splay sorted-list stm text unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = lib.licenses.mit; - }) {}; - - "lsp_1_2_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, dependent-map, directory, filepath , hashable, hslogger, hspec, hspec-discover, lens, lsp-types, mtl @@ -168989,7 +166767,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lsp-test" = callPackage @@ -169019,34 +166796,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "lsp-test_0_13_0_0" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base - , bytestring, conduit, conduit-parse, containers, data-default - , Diff, directory, filepath, Glob, hspec, lens, lsp-types, mtl - , parser-combinators, process, some, text, time, transformers, unix - , unordered-containers - }: - mkDerivation { - pname = "lsp-test"; - version = "0.13.0.0"; - sha256 = "1xyxmzcd6r56jj1k11lz1g6yld5q3k6cgb0bsf45px120dsf1dpy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal async base bytestring conduit - conduit-parse containers data-default Diff directory filepath Glob - lens lsp-types mtl parser-combinators process some text time - transformers unix unordered-containers - ]; - testHaskellDepends = [ - aeson base data-default directory filepath hspec lens lsp-types - text unordered-containers - ]; - description = "Functional test framework for LSP servers"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "lsp-test_0_14_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default @@ -169076,29 +166825,6 @@ self: { }) {}; "lsp-types" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , data-default, deepseq, dependent-sum, dependent-sum-template - , directory, filepath, hashable, hslogger, lens, network-uri - , rope-utf16-splay, scientific, some, template-haskell, temporary - , text, unordered-containers - }: - mkDerivation { - pname = "lsp-types"; - version = "1.1.0.0"; - sha256 = "19lkdqwh9a5rsx5nby37v54zhwyja306z0dyslsmdmwqw92qxx54"; - revision = "1"; - editedCabalFile = "0iifws4r1h9v1mbsrmbvssvm0gmvzm9yh9h85izly0s51869bbq4"; - libraryHaskellDepends = [ - aeson base binary bytestring containers data-default deepseq - dependent-sum dependent-sum-template directory filepath hashable - hslogger lens network-uri rope-utf16-splay scientific some - template-haskell temporary text unordered-containers - ]; - description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = lib.licenses.mit; - }) {}; - - "lsp-types_1_2_0_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , data-default, deepseq, dependent-sum, dependent-sum-template , directory, filepath, hashable, hslogger, lens, network-uri @@ -169117,7 +166843,6 @@ self: { ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lss" = callPackage @@ -169156,7 +166881,6 @@ self: { description = "Paint an L-System Grammar"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ltext" = callPackage @@ -169188,6 +166912,8 @@ self: { ]; description = "Parameterized file evaluator"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lti13" = callPackage @@ -169209,7 +166935,6 @@ self: { description = "Core functionality for LTI 1.3."; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ltiv1p1" = callPackage @@ -169327,7 +167052,6 @@ self: { description = "Library functions for reading and writing Lua chunks"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "luautils" = callPackage @@ -169408,7 +167132,6 @@ self: { description = "Helper functions for using lucid with colonnade"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lucid-extras" = callPackage @@ -169476,7 +167199,6 @@ self: { description = "Server side feed aggregator/reader"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "luhn" = callPackage @@ -169489,7 +167211,6 @@ self: { description = "An implementation of Luhn's check digit algorithm"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lui" = callPackage @@ -169506,7 +167227,6 @@ self: { description = "Purely FunctionaL User Interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "luis-client" = callPackage @@ -169615,7 +167335,6 @@ self: { description = "Luminance samples"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lushtags" = callPackage @@ -169684,7 +167403,6 @@ self: { description = "Parallel scheduler, LVar data structures, and infrastructure to build more"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lvmlib" = callPackage @@ -169837,8 +167555,6 @@ self: { ]; description = "Bindings to LZ4"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lz4-conduit" = callPackage @@ -169863,7 +167579,6 @@ self: { description = "LZ4 compression for conduits"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lz4-frame-conduit" = callPackage @@ -170018,7 +167733,6 @@ self: { description = "Enumerator interface for lzma/xz compression"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) xz;}; "lzma-static" = callPackage @@ -170091,7 +167805,6 @@ self: { description = "Library for talking to the mDNSResponder daemon"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "maam" = callPackage @@ -170171,7 +167884,6 @@ self: { description = "Macbeth - A beautiful and minimalistic FICS client"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "maccatcher" = callPackage @@ -170261,7 +167973,6 @@ self: { description = "Machine transducers for Amazonka calls"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "machines-attoparsec" = callPackage @@ -170282,8 +167993,6 @@ self: { ]; description = "Parse machines streams with attoparsec parsers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "machines-binary" = callPackage @@ -170295,8 +168004,6 @@ self: { libraryHaskellDepends = [ base binary bytestring machines ]; description = "Binary utilities for the machines library"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "machines-bytestring" = callPackage @@ -170355,8 +168062,6 @@ self: { ]; description = "IO utilities for the machines library"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "machines-process" = callPackage @@ -170371,8 +168076,6 @@ self: { ]; description = "Process (system) utilities for the machines library"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "machines-zlib" = callPackage @@ -170489,7 +168192,6 @@ self: { description = "Make a macosx app standalone deployable"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "macrm" = callPackage @@ -170643,7 +168345,6 @@ self: { description = "Interact with Magic Wormhole"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "magicbane" = callPackage @@ -170675,7 +168376,6 @@ self: { description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "magico" = callPackage @@ -170694,7 +168394,6 @@ self: { description = "Compute solutions for Magico puzzle"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "magma" = callPackage @@ -170742,7 +168441,6 @@ self: { description = "ImageBoards to XMPP gate"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "maid" = callPackage @@ -170765,7 +168463,6 @@ self: { description = "A simple static web server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mail-pool" = callPackage @@ -170789,7 +168486,6 @@ self: { description = "Preconfigured email connection pool on top of smtp"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mail-reports" = callPackage @@ -170805,8 +168501,6 @@ self: { ]; description = "A parser library for DMARC and SMTP TLS reports"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mailbox-count" = callPackage @@ -170891,7 +168585,6 @@ self: { description = "API binding for Mailgun"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "main-tester" = callPackage @@ -170911,19 +168604,6 @@ self: { }) {}; "mainland-pretty" = callPackage - ({ mkDerivation, base, containers, srcloc, text, transformers }: - mkDerivation { - pname = "mainland-pretty"; - version = "0.7.0.1"; - sha256 = "0cifvdpqcb1cvjazgqwaxvl2ga7kap5a6f89yw1xn8y5yw7nz1c8"; - libraryHaskellDepends = [ - base containers srcloc text transformers - ]; - description = "Pretty printing designed for printing source code"; - license = lib.licenses.bsd3; - }) {}; - - "mainland-pretty_0_7_1" = callPackage ({ mkDerivation, base, containers, srcloc, text, transformers }: mkDerivation { pname = "mainland-pretty"; @@ -170934,7 +168614,6 @@ self: { ]; description = "Pretty printing designed for printing source code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "majordomo" = callPackage @@ -170956,7 +168635,6 @@ self: { description = "Majordomo protocol for ZeroMQ"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "majority" = callPackage @@ -170969,7 +168647,6 @@ self: { description = "Boyer-Moore Majority Vote Algorithm"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "make-hard-links" = callPackage @@ -171111,6 +168788,7 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "A monad for managed values"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "manatee" = callPackage @@ -171132,7 +168810,6 @@ self: { description = "The Haskell/Gtk+ Integrated Live Environment"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "manatee-all" = callPackage @@ -171180,7 +168857,6 @@ self: { description = "Multithread interactive input/search framework for Manatee"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "manatee-browser" = callPackage @@ -171225,7 +168901,6 @@ self: { description = "The core of Manatee"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "manatee-curl" = callPackage @@ -171249,7 +168924,6 @@ self: { description = "Download Manager extension for Manatee"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "manatee-editor" = callPackage @@ -171271,7 +168945,6 @@ self: { description = "Editor extension for Manatee"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "manatee-filemanager" = callPackage @@ -171293,7 +168966,6 @@ self: { description = "File manager extension for Manatee"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "manatee-imageviewer" = callPackage @@ -171315,7 +168987,6 @@ self: { description = "Image viewer extension for Manatee"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "manatee-ircclient" = callPackage @@ -171341,7 +169012,6 @@ self: { description = "IRC client extension for Manatee"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "manatee-mplayer" = callPackage @@ -171364,7 +169034,6 @@ self: { description = "Mplayer client extension for Manatee"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "manatee-pdfviewer" = callPackage @@ -171386,7 +169055,6 @@ self: { description = "PDF viewer extension for Manatee"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "manatee-processmanager" = callPackage @@ -171407,7 +169075,6 @@ self: { description = "Process manager extension for Manatee"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "manatee-reader" = callPackage @@ -171449,7 +169116,6 @@ self: { description = "Template code to create Manatee application"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "manatee-terminal" = callPackage @@ -171470,7 +169136,6 @@ self: { description = "Terminal Emulator extension for Manatee"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "manatee-welcome" = callPackage @@ -171491,7 +169156,6 @@ self: { description = "Welcome module to help user play Manatee quickly"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mancala" = callPackage @@ -171629,7 +169293,6 @@ self: { description = "Sampling random points on general manifolds"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "manifolds" = callPackage @@ -171660,7 +169323,6 @@ self: { description = "Coordinate-free hypersurfaces"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "manifolds-core" = callPackage @@ -171855,7 +169517,6 @@ self: { description = "A study of marionetta movements"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "markdown" = callPackage @@ -171915,7 +169576,6 @@ self: { description = "markdown parser with papillon"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "markdown-unlit" = callPackage @@ -171956,7 +169616,6 @@ self: { description = "markdown to svg converter"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "marked-pretty" = callPackage @@ -172027,7 +169686,6 @@ self: { description = "Hidden Markov processes"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "markov-realization" = callPackage @@ -172040,8 +169698,6 @@ self: { testHaskellDepends = [ base HTF MonadRandom ]; description = "Realizations of Markov chains"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "markup" = callPackage @@ -172061,7 +169717,6 @@ self: { description = "Abstraction for HTML-embedded content"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "markup-preview" = callPackage @@ -172111,7 +169766,6 @@ self: { description = "Upload packages to Marmalade"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "marquise" = callPackage @@ -172147,7 +169801,6 @@ self: { description = "Client library for Vaultaire"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mars" = callPackage @@ -172215,7 +169868,6 @@ self: { description = "A framework for modular, portable chat bots"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "marvin-interpolate" = callPackage @@ -172280,7 +169932,6 @@ self: { description = "@minamiyama1994_bot on haskell"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mason" = callPackage @@ -172447,7 +170098,6 @@ self: { description = "The project management tool for hackers"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mastermind" = callPackage @@ -172523,7 +170173,6 @@ self: { description = "Text matchers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) pcre;}; "math-extras" = callPackage @@ -172647,7 +170296,6 @@ self: { description = "A GLPK backend to the math-programming library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) glpk;}; "math-programming-tests" = callPackage @@ -172664,7 +170312,6 @@ self: { description = "Utility functions for testing implementations of the math-programming library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mathblog" = callPackage @@ -172692,7 +170339,6 @@ self: { description = "A program for creating and managing a static weblog with LaTeX math and diagrams"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mathexpr" = callPackage @@ -172784,7 +170430,6 @@ self: { description = "Write Mathematica packages in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "matlab" = callPackage @@ -173020,7 +170665,6 @@ self: { description = "ncurses XMPP client"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "matterhorn" = callPackage @@ -173146,7 +170790,6 @@ self: { description = "Compute Maximum Entropy Distributions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "maxent-learner-hw" = callPackage @@ -173194,7 +170837,6 @@ self: { description = "GUI for maxent-learner-hw"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "maximal-cliques" = callPackage @@ -173228,7 +170870,6 @@ self: { description = "Maximal sharing of terms in the lambda calculus with letrec"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "maybe-justify" = callPackage @@ -173463,7 +171104,6 @@ self: { description = "Sample from a posterior using Markov chain Monte Carlo"; license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mcmc-samplers" = callPackage @@ -173480,7 +171120,6 @@ self: { description = "Combinators for MCMC sampling"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mcmc-synthesis" = callPackage @@ -173640,7 +171279,6 @@ self: { description = "See readme.md"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "means" = callPackage @@ -173809,7 +171447,6 @@ self: { description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {fdk-aac = null;}; "mediabus-rtp" = callPackage @@ -173848,7 +171485,6 @@ self: { description = "Receive and Send RTP Packets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "median-stream" = callPackage @@ -174074,7 +171710,6 @@ self: { description = "GPIO support for mellon"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mellon-web" = callPackage @@ -174117,7 +171752,6 @@ self: { description = "A REST web service for Mellon controllers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "melody" = callPackage @@ -174194,8 +171828,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "A memcached client library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "memcache-conduit" = callPackage @@ -174216,7 +171848,6 @@ self: { description = "Conduit library for memcache procotol"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "memcache-haskell" = callPackage @@ -174446,6 +172077,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "memory_0_16_0" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, foundation + , ghc-prim + }: + mkDerivation { + pname = "memory"; + version = "0.16.0"; + sha256 = "0zzxyr2b7gj92h3jzaq1lfqfyfkfj4l636ry35191i9bp3wa0v8l"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim + ]; + testHaskellDepends = [ base basement bytestring foundation ]; + description = "memory and related abstraction stuff"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "memorypool" = callPackage ({ mkDerivation, base, containers, transformers, unsafe, vector }: mkDerivation { @@ -174609,7 +172257,6 @@ self: { description = "Support for using mergeful from persistent-based databases"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mergeless" = callPackage @@ -174649,7 +172296,6 @@ self: { description = "Support for using mergeless from persistent-based databases"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "merkle-log" = callPackage @@ -174702,7 +172348,6 @@ self: { description = "A modified Merkle Patricia DB"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "merkle-tree" = callPackage @@ -174853,7 +172498,6 @@ self: { description = "Support for integrated Accelerate computations within Meta-par"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "metadata" = callPackage @@ -174904,7 +172548,6 @@ self: { description = "a tiny ghc api wrapper"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "metar" = callPackage @@ -174931,7 +172574,6 @@ self: { description = "Australian METAR"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "metar-http" = callPackage @@ -174957,17 +172599,23 @@ self: { description = "HTTP for METAR"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "method" = callPackage - ({ mkDerivation, base, hspec, hspec-discover, rio, transformers }: + ({ mkDerivation, base, containers, hspec, hspec-discover, rio + , template-haskell, th-abstraction, transformers + }: mkDerivation { pname = "method"; - version = "0.3.1.0"; - sha256 = "0a96av07vbh3mvyczh2jiziqb098q81jx6q0c5kgn7pmlxijw1ba"; - libraryHaskellDepends = [ base rio transformers ]; - testHaskellDepends = [ base hspec rio transformers ]; + version = "0.4.0.0"; + sha256 = "0ca7xfy5yb8d68l530q6h82843i5yvp9grr9r23s7rfbisbysfpb"; + libraryHaskellDepends = [ + base containers rio template-haskell th-abstraction transformers + ]; + testHaskellDepends = [ + base containers hspec rio template-haskell th-abstraction + transformers + ]; testToolDepends = [ hspec-discover ]; description = "rebindable methods for improving testability"; license = lib.licenses.bsd3; @@ -175128,7 +172776,6 @@ self: { description = "Time Synchronized execution"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mezzo" = callPackage @@ -175258,7 +172905,6 @@ self: { description = "A Micro service gateway"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "micro-recursion-schemes" = callPackage @@ -175378,7 +173024,6 @@ self: { description = "A Microformats 2 parser"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "microformats2-types" = callPackage @@ -175395,7 +173040,6 @@ self: { description = "Microformats 2 types (with Aeson instances)"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "microgroove" = callPackage @@ -175547,6 +173191,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "microlens-th_0_4_3_10" = callPackage + ({ mkDerivation, base, containers, microlens, tagged + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "microlens-th"; + version = "0.4.3.10"; + sha256 = "1dg2xhj85fy8q39m5dd94kjlabjyxgc0336vzkg0174l6l110l1c"; + libraryHaskellDepends = [ + base containers microlens template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base microlens tagged ]; + description = "Automatic generation of record lenses for microlens"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "micrologger" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec, lens , text, text-format, time, transformers @@ -175803,7 +173465,6 @@ self: { description = "A Memory-like (Concentration, Pairs, ...) game for tones"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "midisurface" = callPackage @@ -175844,7 +173505,6 @@ self: { description = "Simple Web Server in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mighttpd2" = callPackage @@ -175913,8 +173573,6 @@ self: { ]; description = "Semi-automatic database schema migrations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "migrant-hdbc" = callPackage @@ -175974,8 +173632,6 @@ self: { ]; description = "Semi-automatic database schema migrations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mikmod" = callPackage @@ -176212,7 +173868,6 @@ self: { description = "a DSL for generating minecraft commands and levels"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mines" = callPackage @@ -176248,7 +173903,6 @@ self: { description = "Minesweeper game which is always solvable without guessing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mini-egison" = callPackage @@ -176271,7 +173925,6 @@ self: { description = "Template Haskell Implementation of Egison Pattern Matching"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "miniball" = callPackage @@ -176305,7 +173958,6 @@ self: { description = "Miniature FORTH-like interpreter"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "minilens" = callPackage @@ -176377,7 +174029,6 @@ self: { description = "A binding library of minilight for Lua langauge"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "minimal-configuration" = callPackage @@ -176420,7 +174071,6 @@ self: { description = "Shows how to run grabber on Mac OS X"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "minio-hs" = callPackage @@ -176492,7 +174142,6 @@ self: { description = "fast and simple operational monad"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "miniplex" = callPackage @@ -176858,8 +174507,6 @@ self: { ]; description = "A tasty Haskell front-end framework"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "miso-action-logger" = callPackage @@ -176935,7 +174582,6 @@ self: { description = "A Haskell git implimentation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "miss-porcelain" = callPackage @@ -176955,7 +174601,6 @@ self: { description = "Useability extras built on top of miss"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "missing-foreign" = callPackage @@ -176982,7 +174627,6 @@ self: { description = "Haskell interface to Python"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mit-3qvpPyAi6mH" = callPackage @@ -177068,26 +174712,47 @@ self: { description = "Find optimal mixed strategies for two-player games"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mixed-types-num" = callPackage - ({ mkDerivation, base, hspec, hspec-smallcheck, mtl, QuickCheck - , smallcheck, template-haskell + ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl + , QuickCheck, smallcheck, template-haskell }: mkDerivation { pname = "mixed-types-num"; - version = "0.4.1"; - sha256 = "159zx9b5p3g1ywhnbihjbxkpxylgrkhhrswmazymqbh49f4s758y"; + version = "0.5.0.3"; + sha256 = "0pi91nwnqm2mb2dhyl1l0nq81dlaw9ar538d4n948k2r9lwf56cd"; libraryHaskellDepends = [ - base hspec hspec-smallcheck mtl QuickCheck smallcheck - template-haskell + base collect-errors hspec hspec-smallcheck mtl QuickCheck + smallcheck template-haskell + ]; + testHaskellDepends = [ + base collect-errors hspec hspec-smallcheck QuickCheck smallcheck ]; - testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; license = lib.licenses.bsd3; }) {}; + "mixed-types-num_0_5_1_0" = callPackage + ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl + , QuickCheck, smallcheck, template-haskell + }: + mkDerivation { + pname = "mixed-types-num"; + version = "0.5.1.0"; + sha256 = "09dkrx05mlbdvy1334q6zg3ay6k0ydl87naxhg4zr5p51i9p8lsg"; + libraryHaskellDepends = [ + base collect-errors hspec hspec-smallcheck mtl QuickCheck + smallcheck template-haskell + ]; + testHaskellDepends = [ + base collect-errors hspec hspec-smallcheck QuickCheck smallcheck + ]; + description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mixpanel-client" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec , hspec-discover, http-client, http-client-tls, markdown-unlit @@ -177126,7 +174791,6 @@ self: { description = "Makes an OS X .app bundle from a binary."; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mkcabal" = callPackage @@ -177146,7 +174810,6 @@ self: { description = "Generate cabal files for a Haskell project"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ml-w" = callPackage @@ -177175,7 +174838,6 @@ self: { description = "Monadic List alternative to lazy I/O"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mltool" = callPackage @@ -177311,7 +174973,6 @@ self: { description = "Command line interface to the MMark markdown processor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mmark-ext" = callPackage @@ -177333,7 +174994,6 @@ self: { description = "Commonly useful extensions for the MMark markdown processor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mmorph_1_1_3" = callPackage @@ -177348,6 +175008,7 @@ self: { description = "Monad morphisms"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "mmorph" = callPackage @@ -177363,6 +175024,7 @@ self: { ]; description = "Monad morphisms"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "mmsyn2" = callPackage @@ -177489,8 +175151,6 @@ self: { ]; description = "Produces a sound recording specified by the Ukrainian text"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mmsyn7l" = callPackage @@ -177606,7 +175266,6 @@ self: { description = "MonadBase type-class for mmtl"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mnist-idx" = callPackage @@ -177622,6 +175281,23 @@ self: { license = lib.licenses.lgpl3Only; }) {}; + "mnist-idx-conduit" = callPackage + ({ mkDerivation, base, binary, bytestring, conduit, containers + , exceptions, hspec, resourcet, vector + }: + mkDerivation { + pname = "mnist-idx-conduit"; + version = "0.3.0.0"; + sha256 = "0vqb4yhb51lykcd66kgh9dn14nf4xfr74hamg72s35aa22lhw932"; + libraryHaskellDepends = [ + base binary bytestring conduit containers exceptions hspec + resourcet vector + ]; + testHaskellDepends = [ base bytestring conduit hspec vector ]; + description = "conduit utilities for MNIST IDX files"; + license = lib.licenses.bsd3; + }) {}; + "moan" = callPackage ({ mkDerivation, base, binary, bytestring, containers, dawg , regex-tdfa, regex-tdfa-text, tagset-positional, text, zlib @@ -177637,7 +175313,6 @@ self: { description = "Language-agnostic analyzer for positional morphosyntactic tags"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mock-httpd" = callPackage @@ -177837,7 +175512,6 @@ self: { description = "Modify fasta (and CLIP) files in several optional ways"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "modsplit" = callPackage @@ -177859,7 +175533,6 @@ self: { description = "Haskell source splitter driven by special comments"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "modular" = callPackage @@ -177914,7 +175587,6 @@ self: { description = "Reifying ClassyPrelude a la ModularPrelude"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "modularity" = callPackage @@ -177931,7 +175603,6 @@ self: { description = "Find the modularity of a network"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "module-management" = callPackage @@ -178002,7 +175673,6 @@ self: { description = "Modular C code generator"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "moe" = callPackage @@ -178100,7 +175770,6 @@ self: { description = "A glorified string replacement tool"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mollie-api-haskell" = callPackage @@ -178433,7 +176102,6 @@ self: { description = "Exstensible monadic exceptions"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "monad-extras" = callPackage @@ -178883,8 +176551,6 @@ self: { ]; description = "An extensible and type-safe wrapper around EKG metrics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "monad-mock" = callPackage @@ -179158,7 +176824,6 @@ self: { description = "Utility library for monads, particularly those involving state"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "monad-statevar" = callPackage @@ -179219,7 +176884,6 @@ self: { description = "ST-like monad capturing variables to regions and supporting STM"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "monad-stm" = callPackage @@ -179378,8 +177042,6 @@ self: { libraryHaskellDepends = [ base base-compat stm ]; description = "Generic operations over variables"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "monad-wrap" = callPackage @@ -179552,7 +177214,6 @@ self: { description = "Constraint Programming"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {gecodeint = null; gecodekernel = null; gecodesearch = null; gecodeset = null; gecodesupport = null;}; @@ -179709,7 +177370,6 @@ self: { description = "Monadic interface for TokyoTyrant"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mondo" = callPackage @@ -179747,7 +177407,6 @@ self: { description = "Mid-level bindings for the MonetDB API (mapi)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "money" = callPackage @@ -179794,8 +177453,6 @@ self: { ]; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mongodb-queue" = callPackage @@ -179836,7 +177493,6 @@ self: { description = "Mongrel2 Handler Library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "monitor" = callPackage @@ -179877,7 +177533,6 @@ self: { description = "A system state collecting library and application"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mono-foldable" = callPackage @@ -180003,6 +177658,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "monoid-extras_0_6" = callPackage + ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups + }: + mkDerivation { + pname = "monoid-extras"; + version = "0.6"; + sha256 = "0ki1d3b1xpf653qj7brlqdgngghwrnmapy5gja75iiydfx2506a1"; + libraryHaskellDepends = [ base groups semigroupoids ]; + benchmarkHaskellDepends = [ base criterion semigroups ]; + description = "Various extra monoid-related definitions and utilities"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "monoid-owns" = callPackage ({ mkDerivation, base, bytestring, containers }: mkDerivation { @@ -180241,7 +177910,6 @@ self: { description = "A monad and transformer for Monte Carlo calculations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "months" = callPackage @@ -180327,7 +177995,6 @@ self: { description = "Genetic algorithm library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "moonshine" = callPackage @@ -180453,7 +178120,6 @@ self: { description = "Developer tools for the Michelson Language"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "morley-prelude" = callPackage @@ -180537,7 +178203,6 @@ self: { description = "A multi-lingual, typed, workflow language"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "morph" = callPackage @@ -180584,8 +178249,6 @@ self: { ]; description = "Morpheus GraphQL"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "morpheus-graphql-app" = callPackage @@ -180612,8 +178275,6 @@ self: { ]; description = "Morpheus GraphQL Core"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "morpheus-graphql-cli" = callPackage @@ -180708,8 +178369,6 @@ self: { ]; description = "Morpheus GraphQL Subscriptions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "morphisms" = callPackage @@ -180745,7 +178404,6 @@ self: { description = "Inventory is state and store"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "morphisms-objects" = callPackage @@ -180793,6 +178451,7 @@ self: { description = "A bare-bones calculus of constructions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; broken = true; }) {}; @@ -180813,7 +178472,6 @@ self: { description = "Generación interactiva de mosaicos"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mosquitto-hs" = callPackage @@ -180925,7 +178583,6 @@ self: { description = "Generate state diagrams from Motor FSM typeclasses"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "motor-reflection" = callPackage @@ -181031,7 +178688,6 @@ self: { description = "Music player for linux"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mp3decoder" = callPackage @@ -181064,7 +178720,6 @@ self: { description = "MPD/PowerMate executable"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mpg123-bindings" = callPackage @@ -181096,6 +178751,7 @@ self: { testSystemDepends = [ mpich ]; description = "MPI bindings for Haskell"; license = lib.licenses.asl20; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) mpich;}; "mpi-hs-binary" = callPackage @@ -181113,6 +178769,7 @@ self: { testHaskellDepends = [ base ]; description = "MPI bindings for Haskell"; license = lib.licenses.asl20; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {}; "mpi-hs-cereal" = callPackage @@ -181130,6 +178787,7 @@ self: { testHaskellDepends = [ base ]; description = "MPI bindings for Haskell"; license = lib.licenses.asl20; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {}; "mpi-hs-store" = callPackage @@ -181147,6 +178805,7 @@ self: { testHaskellDepends = [ base ]; description = "MPI bindings for Haskell"; license = lib.licenses.asl20; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {}; "mplayer-spot" = callPackage @@ -181167,6 +178826,9 @@ self: { executableHaskellDepends = [ base ]; description = "Save your spot when watching movies with @mplayer@"; license = lib.licenses.bsd3; + platforms = [ + "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux" + ]; }) {}; "mpppc" = callPackage @@ -181201,7 +178863,6 @@ self: { description = "A minimalish prelude"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mpretty" = callPackage @@ -181219,7 +178880,6 @@ self: { description = "a monadic, extensible pretty printing library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mpris" = callPackage @@ -181251,7 +178911,6 @@ self: { description = "Simple equational reasoning for a Haskell-ish language"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mps" = callPackage @@ -181272,7 +178931,6 @@ self: { description = "simply oo"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mptcp-pm" = callPackage @@ -181298,7 +178956,6 @@ self: { description = "A work in progress Multipath TCP path manager"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mpvguihs" = callPackage @@ -181495,7 +179152,6 @@ self: { description = "Aeson adapter for MessagePack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "msgpack-binary" = callPackage @@ -181546,7 +179202,6 @@ self: { description = "An IDL Compiler for MessagePack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "msgpack-rpc" = callPackage @@ -181568,7 +179223,6 @@ self: { description = "A MessagePack-RPC Implementation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "msgpack-rpc-conduit" = callPackage @@ -181591,7 +179245,6 @@ self: { description = "A MessagePack-RPC Implementation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "msgpack-types" = callPackage @@ -181721,7 +179374,6 @@ self: { description = "Library to communicate with Mt.Gox"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mtl_2_2_2" = callPackage @@ -181929,8 +179581,6 @@ self: { ]; description = "Avro serialization support for Mu microservices"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mu-graphql" = callPackage @@ -181960,8 +179610,6 @@ self: { ]; description = "GraphQL support for Mu"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mu-grpc-client" = callPackage @@ -181986,7 +179634,6 @@ self: { description = "gRPC clients from Mu definitions"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mu-grpc-common" = callPackage @@ -182006,8 +179653,6 @@ self: { ]; description = "gRPC for Mu, common modules for client and server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mu-grpc-server" = callPackage @@ -182035,7 +179680,6 @@ self: { description = "gRPC servers for Mu definitions"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mu-kafka" = callPackage @@ -182052,8 +179696,6 @@ self: { ]; description = "Utilities for interoperation between Mu and Kafka"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mu-lens" = callPackage @@ -182069,8 +179711,6 @@ self: { ]; description = "Lenses for @mu-schema@ terms"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mu-optics" = callPackage @@ -182085,8 +179725,6 @@ self: { ]; description = "Optics for @mu-schema@ terms"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mu-persistent" = callPackage @@ -182103,8 +179741,6 @@ self: { ]; description = "Utilities for interoperation between Mu and Persistent"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mu-prometheus" = callPackage @@ -182121,8 +179757,6 @@ self: { ]; description = "Metrics support for Mu using Prometheus"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mu-protobuf" = callPackage @@ -182150,8 +179784,6 @@ self: { ]; description = "Protocol Buffers serialization and gRPC schema import for Mu microservices"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mu-rpc" = callPackage @@ -182168,8 +179800,6 @@ self: { ]; description = "Protocol-independent declaration of services and servers"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mu-schema" = callPackage @@ -182188,8 +179818,6 @@ self: { ]; description = "Format-independent schemas for serialization"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mu-servant-server" = callPackage @@ -182213,8 +179841,6 @@ self: { ]; description = "Servant servers for Mu definitions"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mu-tracing" = callPackage @@ -182229,7 +179855,6 @@ self: { description = "Tracing support for Mu"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mucipher" = callPackage @@ -182396,7 +180021,6 @@ self: { description = "A tool supporting multi cabal project builds"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "multi-containers" = callPackage @@ -182412,6 +180036,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "multi-except" = callPackage + ({ mkDerivation, base, dlist }: + mkDerivation { + pname = "multi-except"; + version = "0.1.0.0"; + sha256 = "0gqmj28anzl596akgkqpgk5cd4b1ic2m6dxzv3hhnvifyxxflli8"; + revision = "1"; + editedCabalFile = "1w1zzsd87qzzad8yqq28hf5amg17i94x9snxvya4pn5raibn24sm"; + libraryHaskellDepends = [ base dlist ]; + description = "Multiple Exceptions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "multi-instance" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { @@ -182436,8 +180075,6 @@ self: { testHaskellDepends = [ base containers HTF ]; description = "Trie of sets, as a model for compound names having multiple values"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "multiaddr" = callPackage @@ -182503,7 +180140,6 @@ self: { description = "Self-identifying base encodings, implementation of "; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "multifile" = callPackage @@ -182548,7 +180184,6 @@ self: { description = "Bidirectional Two-level Transformation of XML Schemas"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "multihash" = callPackage @@ -182611,7 +180246,6 @@ self: { description = "CBOR encoding of multihashes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "multihashmap" = callPackage @@ -182670,7 +180304,6 @@ self: { description = "Conduit-based input/output capability for multilinear package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "multimap" = callPackage @@ -182785,7 +180418,6 @@ self: { description = "Wrapper program for duplicity, adding config files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "multipool" = callPackage @@ -182913,7 +180545,6 @@ self: { description = "Alternative multirec instances deriver"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "multirec-binary" = callPackage @@ -182926,7 +180557,6 @@ self: { description = "Generic Data.Binary instances using MultiRec."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "multiset" = callPackage @@ -182969,7 +180599,6 @@ self: { description = "Multi-set rewrite rules with guards and a parallel execution scheme"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "multistate" = callPackage @@ -183079,7 +180708,6 @@ self: { description = "MUtually Recursive Definitions Explicitly Represented"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "murmur" = callPackage @@ -183152,7 +180780,6 @@ self: { description = "32-bit non-cryptographic hashing"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mushu" = callPackage @@ -183246,7 +180873,6 @@ self: { description = "Diagrams-based visualization of musical data structures"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "music-parts" = callPackage @@ -183270,7 +180896,6 @@ self: { description = "Musical instruments, parts and playing techniques"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "music-pitch" = callPackage @@ -183289,7 +180914,6 @@ self: { description = "Musical pitch representation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "music-pitch-literal" = callPackage @@ -183331,7 +180955,6 @@ self: { description = "Some useful preludes for the Music Suite"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "music-score" = callPackage @@ -183356,7 +180979,6 @@ self: { description = "Musical score and part representation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "music-sibelius" = callPackage @@ -183377,7 +180999,6 @@ self: { description = "Interaction with Sibelius"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "music-suite" = callPackage @@ -183398,7 +181019,6 @@ self: { description = "A set of libraries for composition, analysis and manipulation of music"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "music-util" = callPackage @@ -183478,7 +181098,6 @@ self: { description = "Send an email to all MusicBrainz editors"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "musicw" = callPackage @@ -183534,7 +181153,6 @@ self: { description = "A representation of the MusicXML format"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mustache" = callPackage @@ -183665,7 +181283,6 @@ self: { description = "iteratees based upon mutable buffers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mutable-lens" = callPackage @@ -183703,7 +181320,6 @@ self: { description = "Watches your screensaver and (un)mutes music when you (un)lock the screen"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mvar-lock" = callPackage @@ -183734,6 +181350,7 @@ self: { description = "Model-view-controller"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; broken = true; }) {}; @@ -183747,7 +181364,7 @@ self: { description = "Concurrent and combinable updates"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "mvclient" = callPackage @@ -183767,7 +181384,6 @@ self: { description = "Client library for metaverse systems like Second Life"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mwc-probability" = callPackage @@ -183921,7 +181537,6 @@ self: { description = "mxnet dataiters"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mxnet-examples" = callPackage @@ -183936,7 +181551,6 @@ self: { description = "Examples for MXNet in Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mxnet-nn" = callPackage @@ -183963,7 +181577,6 @@ self: { description = "Train a neural network with MXNet in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mxnet-nnvm" = callPackage @@ -184056,7 +181669,6 @@ self: { description = "None"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "myanimelist-export" = callPackage @@ -184158,7 +181770,6 @@ self: { description = "Example projects using mysnapsession"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mysql" = callPackage @@ -184248,7 +181859,6 @@ self: { description = "TLS support for mysql-haskell package using openssl"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mysql-simple" = callPackage @@ -184258,8 +181868,8 @@ self: { }: mkDerivation { pname = "mysql-simple"; - version = "0.4.5"; - sha256 = "1cbwdsxysz6a4182fgkkd869hm44v834lqv2igwsfbx6v0p44g5h"; + version = "0.4.6"; + sha256 = "1am8ck092s9cv4x1ambalil4mlazkp8w5qhjbl4nq0j2hpy73rby"; libraryHaskellDepends = [ attoparsec base base16-bytestring blaze-builder blaze-textual bytestring containers mysql old-locale pcre-light text time @@ -184300,7 +181910,6 @@ self: { description = "Typed extension to mysql simple"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mystem" = callPackage @@ -184346,7 +181955,6 @@ self: { description = "Web application to view and kill MySQL queries"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "myxine-client" = callPackage @@ -184494,7 +182102,6 @@ self: { description = "N2O adapter for WebSockets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nagios-check" = callPackage @@ -184605,7 +182212,6 @@ self: { description = "Client library for the Nakadi Event Broker"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "namecoin-update" = callPackage @@ -184684,8 +182290,6 @@ self: { libraryHaskellDepends = [ base named servant ]; description = "support records and named (from the named package) parameters in servant"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "named-servant-client" = callPackage @@ -184701,8 +182305,6 @@ self: { ]; description = "client support for named-servant"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "named-servant-server" = callPackage @@ -184788,8 +182390,6 @@ self: { testHaskellDepends = [ base ]; description = "A Generic Haskell library for managing namespaces"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nano-cryptr" = callPackage @@ -184987,7 +182587,6 @@ self: { description = "Simple interface to rendering with NanoVG"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nanq" = callPackage @@ -185186,7 +182785,6 @@ self: { description = "Haskell API for NATS messaging system"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "natural" = callPackage @@ -185248,7 +182846,6 @@ self: { description = "Natural numbers tagged with a type-level representation of the number"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "natural-numbers" = callPackage @@ -185595,7 +183192,6 @@ self: { description = "A collection of Nemesis tasks to bootstrap a Haskell project with a focus on continuous integration"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "neptune-backend" = callPackage @@ -185658,7 +183254,6 @@ self: { description = "Nerf, a named entity recognition tool based on linear-chain CRFs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nero" = callPackage @@ -185695,7 +183290,6 @@ self: { description = "WAI adapter for Nero server applications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nero-warp" = callPackage @@ -185708,7 +183302,6 @@ self: { description = "Run Nero server applications with Warp"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nest" = callPackage @@ -185756,7 +183349,6 @@ self: { description = "Declarative, compositional Wai responses"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nested-sequence" = callPackage @@ -185939,7 +183531,6 @@ self: { description = "CLI option parsers for NetSpider objects"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "net-spider-pangraph" = callPackage @@ -185959,7 +183550,6 @@ self: { description = "Conversion between net-spider and pangraph"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "net-spider-rpl" = callPackage @@ -185982,7 +183572,6 @@ self: { description = "NetSpider data model and utility for RPL networks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "net-spider-rpl-cli" = callPackage @@ -186010,7 +183599,6 @@ self: { description = "CLI executable of NetSpider.RPL."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "netclock" = callPackage @@ -186072,7 +183660,6 @@ self: { description = "The NetCore compiler and runtime system for OpenFlow networks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "netease-fm" = callPackage @@ -186163,7 +183750,6 @@ self: { description = "Enumerator tools for text-based network protocols"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "netlink" = callPackage @@ -186182,6 +183768,9 @@ self: { executableHaskellDepends = [ base ]; description = "Netlink communication for Haskell"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "netlist" = callPackage @@ -186294,7 +183883,6 @@ self: { description = "Enumerator-based netstring parsing"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nettle" = callPackage @@ -186337,7 +183925,6 @@ self: { description = "FRP for controlling networks of OpenFlow switches"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nettle-netkit" = callPackage @@ -186354,7 +183941,6 @@ self: { description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nettle-openflow" = callPackage @@ -186372,7 +183958,6 @@ self: { description = "OpenFlow protocol messages, binary formats, and servers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "netwire" = callPackage @@ -186553,7 +184138,6 @@ self: { description = "Haskell API for I2P anonymous networking"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "network-anonymous-tor" = callPackage @@ -186584,7 +184168,6 @@ self: { description = "Haskell API for Tor anonymous networking"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "network-api-support" = callPackage @@ -186625,8 +184208,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Arbitrary Instances for Network Types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "network-attoparsec" = callPackage @@ -186754,8 +184335,6 @@ self: { ]; description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "network-conduit" = callPackage @@ -186804,7 +184383,6 @@ self: { description = "A wrapper around a generic stream-like connection"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "network-data" = callPackage @@ -186873,7 +184451,6 @@ self: { description = "Enumerators for network sockets"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "network-fancy" = callPackage @@ -186897,7 +184474,6 @@ self: { description = "HaNS to Network shims for easier HaNS integration"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "network-house" = callPackage @@ -186936,7 +184512,6 @@ self: { description = "Haskell bindings for the ifreq structure"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "network-ip" = callPackage @@ -187019,7 +184594,6 @@ self: { description = "WebSocket backend for MessagePack RPC"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "network-metrics" = callPackage @@ -187036,6 +184610,7 @@ self: { description = "Send metrics to Ganglia, Graphite, and statsd"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "network-minihttp" = callPackage @@ -187056,7 +184631,6 @@ self: { description = "A ByteString based library for writing HTTP(S) servers and clients"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "network-msg" = callPackage @@ -187069,6 +184643,7 @@ self: { description = "Recvmsg and sendmsg bindings"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "network-msgpack-rpc" = callPackage @@ -187121,7 +184696,6 @@ self: { description = "Haskell bindings for low-level packet sockets (AF_PACKET)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "network-packet-linux" = callPackage @@ -187174,7 +184748,6 @@ self: { description = "Client library for the XMPP protocol"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "network-rpca" = callPackage @@ -187193,7 +184766,6 @@ self: { description = "A cross-platform RPC library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "network-run" = callPackage @@ -187353,7 +184925,6 @@ self: { description = "ByteString and Text streams for networking"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "network-topic-models" = callPackage @@ -187376,7 +184947,6 @@ self: { description = "A few network topic model implementations for bayes-stack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "network-transport" = callPackage @@ -187648,7 +185218,6 @@ self: { description = "WebSocket library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "networked-game" = callPackage @@ -187917,7 +185486,6 @@ self: { description = "A mailgun backend for the newsletter package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "newsynth" = callPackage @@ -188038,8 +185606,6 @@ self: { ]; description = "Newtype Wrapper Zoo"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "newtyper" = callPackage @@ -188146,7 +185712,6 @@ self: { description = "Ngrams loader based on http://www.ngrams.info format"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ngx-export" = callPackage @@ -188201,7 +185766,6 @@ self: { description = "More extra tools for Nginx haskell module"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "niagra" = callPackage @@ -188336,7 +185900,6 @@ self: { description = "Command line utility publishes Nike+ runs on blogs and Twitter"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nimber" = callPackage @@ -188387,7 +185950,6 @@ self: { description = "IDL compiler and RPC/distributed object framework for microservices"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nist-beacon" = callPackage @@ -188513,7 +186075,7 @@ self: { benchmarkHaskellDepends = [ attoparsec base criterion text ]; description = "Parse and render *.drv files"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ sorki ]; + maintainers = with lib.maintainers; [ Gabriel439 sorki ]; }) {}; "nix-diff" = callPackage @@ -188533,7 +186095,7 @@ self: { ]; description = "Explain why two Nix derivations differ"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ terlar ]; + maintainers = with lib.maintainers; [ Gabriel439 terlar ]; }) {}; "nix-eval" = callPackage @@ -188642,8 +186204,6 @@ self: { ]; description = "Lightweight dependency management with Nix"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nix-tools" = callPackage @@ -188871,7 +186431,6 @@ self: { description = "NLP scoring command-line programs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nm" = callPackage @@ -189079,8 +186638,6 @@ self: { ]; description = "A static site generator"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nom" = callPackage @@ -189555,8 +187112,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; description = "Normalization insensitive string comparison"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "normalize" = callPackage @@ -189738,7 +187293,6 @@ self: { description = "Binding for notmuch MUA library"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) notmuch;}; "notmuch-web" = callPackage @@ -189777,7 +187331,6 @@ self: { description = "A web interface to the notmuch email indexer"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "notzero" = callPackage @@ -190116,8 +187669,6 @@ self: { testHaskellDepends = [ base vector ]; description = "Multidimensional arrays, Linear algebra, Numerical analysis"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "null-canvas" = callPackage @@ -190368,7 +187919,6 @@ self: { description = "Ode solvers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "numeric-prelude" = callPackage @@ -190473,7 +188023,6 @@ self: { description = "core package for Numerical Haskell project"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "numericpeano" = callPackage @@ -190570,7 +188119,6 @@ self: { description = "Laws and tests for numhask"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "numhask-histogram" = callPackage @@ -190588,7 +188136,6 @@ self: { description = "See readme.md"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "numhask-prelude" = callPackage @@ -190624,7 +188171,6 @@ self: { description = "Numbers that are range representations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "numhask-space" = callPackage @@ -190662,7 +188208,6 @@ self: { description = "Laws and tests for numhask"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nums" = callPackage @@ -190750,6 +188295,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "nvfetcher" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, extra, free + , neat-interpolation, shake, text, tomland, transformers + , unordered-containers, validation-selective + }: + mkDerivation { + pname = "nvfetcher"; + version = "0.1.0.0"; + sha256 = "1flzivh84fxik5zw3n8j4b65lh8cxd15mjh72y4622rnlnfn2xvv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring extra free neat-interpolation shake + text transformers unordered-containers + ]; + executableHaskellDepends = [ + aeson base binary bytestring extra free neat-interpolation shake + text tomland transformers unordered-containers validation-selective + ]; + description = "Generate nix sources expr for the latest version of packages"; + license = lib.licenses.mit; + }) {}; + "nvim-hs" = callPackage ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit , containers, data-default, deepseq, foreign-store, hslogger, hspec @@ -190901,7 +188469,6 @@ self: { description = "An interactive GUI for manipulating L-systems"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nyx-game" = callPackage @@ -191101,7 +188668,6 @@ self: { description = "Communicate to OBD interfaces over ELM327"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "obdd" = callPackage @@ -191119,7 +188685,6 @@ self: { description = "Ordered Reduced Binary Decision Diagrams"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "oberon0" = callPackage @@ -191140,7 +188705,6 @@ self: { description = "Oberon0 Compiler"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "obj" = callPackage @@ -191161,7 +188725,6 @@ self: { description = "Reads and writes obj models"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "objectid" = callPackage @@ -191183,7 +188746,6 @@ self: { description = "Rather unique identifier for things that need to be stored"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "objective" = callPackage @@ -191311,7 +188873,6 @@ self: { description = "Owned channels in the Ownership Monad"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ochintin-daicho" = callPackage @@ -191353,7 +188914,6 @@ self: { description = "Parse Rocket League replays"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "octohat" = callPackage @@ -191385,7 +188945,6 @@ self: { description = "A tested, minimal wrapper around GitHub's API"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "octopus" = callPackage @@ -191407,7 +188966,6 @@ self: { description = "Lisp with more dynamism, more power, more simplicity"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "oculus" = callPackage @@ -191424,8 +188982,10 @@ self: { librarySystemDepends = [ libGL libX11 libXinerama ovr systemd ]; description = "Oculus Rift ffi providing head tracking data"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; ovr = null; inherit (pkgs) systemd;}; @@ -191510,7 +189070,6 @@ self: { description = "A full-featured PostgreSQL-backed job queue (with an admin UI)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "oden-go-packages" = callPackage @@ -191598,7 +189157,6 @@ self: { description = "A parser for simplified-syntax OFF files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ofx" = callPackage @@ -191655,7 +189213,6 @@ self: { description = "Interface to the Ohloh API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "oi" = callPackage @@ -191714,7 +189271,6 @@ self: { description = "wrapper for OIS input manager for use with hogre"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {OIS = null;}; "old-locale" = callPackage @@ -191779,7 +189335,6 @@ self: { description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "om-actor" = callPackage @@ -192168,7 +189723,6 @@ self: { description = "See readme.md"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "online-csv" = callPackage @@ -192188,7 +189742,6 @@ self: { description = "See readme.md"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "only" = callPackage @@ -192350,8 +189903,6 @@ self: { ]; description = "A monad transformer for Opaleye"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "open-adt" = callPackage @@ -192389,7 +189940,6 @@ self: { description = "Open algebraic data type examples"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "open-browser" = callPackage @@ -192484,8 +190034,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Open type representations and dynamic types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "open-union" = callPackage @@ -192501,7 +190049,6 @@ self: { description = "Extensible, type-safe unions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "open-witness" = callPackage @@ -192560,8 +190107,6 @@ self: { ]; description = "Unofficial OpenAI servant types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "openapi-petstore" = callPackage @@ -193097,7 +190642,6 @@ self: { description = "Fetch OpenSSH keys from a GitHub team"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "openssh-protocol" = callPackage @@ -193539,7 +191083,6 @@ self: { description = "Jaeger backend for OpenTracing"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "opentracing-wai" = callPackage @@ -193582,7 +191125,6 @@ self: { description = "Zipkin V1 backend for OpenTracing"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "opentracing-zipkin-v2" = callPackage @@ -193641,8 +191183,6 @@ self: { ]; description = "Access data at OpenWeatherMap"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "operate-do" = callPackage @@ -193822,6 +191362,7 @@ self: { ]; description = "Optics as an abstract interface"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "optics_0_4" = callPackage @@ -193851,6 +191392,7 @@ self: { description = "Optics as an abstract interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "optics-core" = callPackage @@ -194010,7 +191552,6 @@ self: { description = "Command-line arguments parsing for Hasql"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "optimal-blocks" = callPackage @@ -194036,7 +191577,6 @@ self: { description = "Optimal Block boundary determination for rsync-like behaviours"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "optimization" = callPackage @@ -194073,7 +191613,6 @@ self: { description = "A supercompiler for f-lite"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "option" = callPackage @@ -194114,6 +191653,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Optional function arguments"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "options" = callPackage @@ -194222,8 +191762,6 @@ self: { ]; description = "An enum-text based toolkit for optparse-applicative"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "optparse-generic" = callPackage @@ -194242,6 +191780,7 @@ self: { ]; description = "Auto-generate a command-line parser for your datatype"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "optparse-helper" = callPackage @@ -194383,7 +191922,6 @@ self: { description = "Haskell Wiki Library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "orchid-demo" = callPackage @@ -194404,7 +191942,6 @@ self: { description = "Haskell Wiki Demo"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ord-adhoc" = callPackage @@ -194433,7 +191970,6 @@ self: { description = "Algorithms for the order maintenance problem with a safe interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "order-statistic-tree" = callPackage @@ -194480,6 +192016,7 @@ self: { description = "A definition of Posets"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ordered-containers" = callPackage @@ -194524,11 +192061,11 @@ self: { }: mkDerivation { pname = "ordinal"; - version = "0.4.0.0"; - sha256 = "1k0hpp5p546zlvwsy1d8hypryfwqvqdifmk3cqifw3xsdrqv3d8y"; + version = "0.4.0.3"; + sha256 = "1ar7l68cx9zci7mi6qx7a6ja7vp9axxjczyzxrbnjrvd2k3zxg51"; libraryHaskellDepends = [ - base containers data-default regex template-haskell text time - vector + base containers data-default QuickCheck regex template-haskell text + time vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; testToolDepends = [ hspec-discover ]; @@ -194602,7 +192139,6 @@ self: { description = "Lucid integration for org-mode"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "org2anki" = callPackage @@ -195003,7 +192539,6 @@ self: { description = "Download Open Street Map tiles"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "oso2pdf" = callPackage @@ -195086,7 +192621,6 @@ self: { description = "OTP Authenticator (a la google) command line client"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ottparse-pretty" = callPackage @@ -195510,6 +193044,24 @@ self: { broken = true; }) {}; + "pact-time" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal, clock + , Decimal, deepseq, microlens, mtl, tasty, tasty-hunit, text + , vector, vector-space + }: + mkDerivation { + pname = "pact-time"; + version = "0.2.0.0"; + sha256 = "04d8hd4hnbsjvzjjvnyabc68srhyp8k9459pp0y1sdc7z6c0qq1m"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring cereal clock Decimal deepseq + microlens mtl text vector vector-space + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Time Library for Pact"; + license = lib.licenses.bsd3; + }) {}; + "padKONTROL" = callPackage ({ mkDerivation, base, containers, hmidi, minioperational , transformers @@ -195524,7 +193076,6 @@ self: { description = "Controlling padKONTROL native mode"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "paddle" = callPackage @@ -195726,7 +193277,6 @@ self: { description = "Bilinear pairings"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "palette" = callPackage @@ -195775,8 +193325,6 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - hydraPlatforms = lib.platforms.none; - broken = true; }) {pam = null;}; "pan-os-syslog" = callPackage @@ -195795,7 +193343,6 @@ self: { description = "Parse syslog traffic from PAN-OS"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "panda" = callPackage @@ -195817,7 +193364,6 @@ self: { description = "A simple static blog engine"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pandoc" = callPackage @@ -195983,8 +193529,6 @@ self: { executableHaskellDepends = [ base csv pandoc pandoc-types ]; description = "Convert CSV to Pandoc Table Markdown"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pandoc-dhall-decoder" = callPackage @@ -196156,7 +193700,6 @@ self: { description = "Japanese-specific markup filters for pandoc"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pandoc-lens" = callPackage @@ -196256,8 +193799,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Render and insert PlantUML diagrams with Pandoc"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pandoc-plot" = callPackage @@ -196270,8 +193811,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "1.1.1"; - sha256 = "10wwci7p3kphmjxlnpymbnx3cw2l3yfydm29l6k2vakz1pd7zdh0"; + version = "1.2.0"; + sha256 = "091283hcp3rin1rpg6b4lkh32svqr1gjxsa15id3qic7a7knx2r0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196640,6 +194181,48 @@ self: { license = lib.licenses.bsd3; }) {}; + "pantry_0_5_2" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , casa-client, casa-types, conduit, conduit-extra, containers + , cryptonite, cryptonite-conduit, digest, exceptions, filelock + , generic-deriving, hackage-security, hedgehog, hpack, hspec + , http-client, http-client-tls, http-conduit, http-download + , http-types, memory, mtl, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , tar-conduit, text, text-metrics, time, transformers, unix-compat + , unliftio, unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + version = "0.5.2"; + sha256 = "0gg4fzqsh4c41vydrwr12kb8ahj0xy0vy7axwpd9j39dzxwcksnv"; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest filelock generic-deriving hackage-security hpack http-client + http-client-tls http-conduit http-download http-types memory mtl + network-uri path path-io persistent persistent-sqlite + persistent-template primitive resourcet rio rio-orphans + rio-prettyprint tar-conduit text text-metrics time transformers + unix-compat unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest exceptions filelock generic-deriving hackage-security + hedgehog hpack hspec http-client http-client-tls http-conduit + http-download http-types memory mtl network-uri path path-io + persistent persistent-sqlite persistent-template primitive + QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint + tar-conduit text text-metrics time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + description = "Content addressable Haskell package management"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -196718,7 +194301,6 @@ self: { description = "Reasonable default import"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "papa-base" = callPackage @@ -196733,7 +194315,6 @@ self: { description = "Prelude with only useful functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "papa-base-export" = callPackage @@ -196759,7 +194340,6 @@ self: { description = "Useful base functions reimplemented"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "papa-bifunctors" = callPackage @@ -196820,7 +194400,6 @@ self: { description = "Reasonable default import"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "papa-implement" = callPackage @@ -196843,7 +194422,6 @@ self: { description = "Reasonable default import"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "papa-include" = callPackage @@ -197003,7 +194581,6 @@ self: { description = "Prelude with only useful functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "papa-semigroupoids-export" = callPackage @@ -197136,7 +194713,6 @@ self: { description = "The Haskell library and examples for the kids programming robot paprika"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "par-dual" = callPackage @@ -197309,8 +194885,6 @@ self: { ]; description = "Classes and data structures for working with data-kind indexed types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "paramtree" = callPackage @@ -197381,7 +194955,6 @@ self: { description = "Generalised parser combinators - Attoparsec interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "parco-parsec" = callPackage @@ -197394,7 +194967,6 @@ self: { description = "Generalised parser combinators - Parsec interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "parcom-lib" = callPackage @@ -197441,7 +195013,6 @@ self: { description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\""; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pareto" = callPackage @@ -197501,8 +195072,6 @@ self: { ]; description = "Help Manage project specific documentation"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "parport" = callPackage @@ -197514,6 +195083,9 @@ self: { libraryHaskellDepends = [ array base ]; description = "Simply interfacing the parallel port on linux"; license = "GPL"; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "parquet-hs" = callPackage @@ -197540,7 +195112,6 @@ self: { description = "Streaming Parquet reader"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "parse-dimacs" = callPackage @@ -197589,7 +195160,6 @@ self: { description = "generate command line arguments from a --help output"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "parseargs" = callPackage @@ -198058,7 +195628,6 @@ self: { description = "NMR-STAR file format parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "parsimony" = callPackage @@ -198179,7 +195748,6 @@ self: { description = "Haskell 98 Partial Lenses"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "partial-order" = callPackage @@ -198310,8 +195878,8 @@ self: { }: mkDerivation { pname = "passman"; - version = "0.3.0"; - sha256 = "1m3g4ah1wvga3kq9krvg13niisq4rqkb7i6f6lil39v6lplq5drq"; + version = "0.3.0.2"; + sha256 = "0iy5x8v3liclzh3qczkzmql9l6sq5mvplk4xhpnqqhwx3bkik47w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198377,6 +195945,7 @@ self: { description = "Deterministic password generator core"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "password" = callPackage @@ -198389,6 +195958,8 @@ self: { pname = "password"; version = "3.0.0.0"; sha256 = "0x6f4zkqqsa6vi5dvy5sj0f7pqkqq9zw3ph9f0d8vl631zcs2inb"; + revision = "1"; + editedCabalFile = "0083j7wnq6dv663i22n0lmrgq8df5pl96xlyad3jv9l27r4z4gdk"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base64 bytestring cryptonite memory password-types @@ -198401,6 +195972,8 @@ self: { ]; description = "Hashing and checking of passwords"; license = lib.licenses.bsd3; + platforms = [ "i686-linux" "x86_64-darwin" "x86_64-linux" ]; + maintainers = with lib.maintainers; [ cdepillabout ]; }) {}; "password-instances" = callPackage @@ -198424,6 +195997,8 @@ self: { ]; description = "typeclass instances for password package"; license = lib.licenses.bsd3; + platforms = [ "i686-linux" "x86_64-darwin" "x86_64-linux" ]; + maintainers = with lib.maintainers; [ cdepillabout ]; }) {}; "password-types" = callPackage @@ -198435,6 +196010,8 @@ self: { pname = "password-types"; version = "1.0.0.0"; sha256 = "090aqq2xs6m5djvr9zfdj7rxafbmj8d05vij5rchj1f9c46dclb5"; + revision = "1"; + editedCabalFile = "1nw1fskhr42xmhdc1bp290333vzgmc3fkfvydfwjvlw0962lxzvy"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring memory text ]; testHaskellDepends = [ @@ -198978,7 +196555,6 @@ self: { description = "Common patterns in message-oriented applications"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pava" = callPackage @@ -199174,7 +196750,6 @@ self: { description = "Convert a pcap into an enumerator"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pcapng" = callPackage @@ -199205,7 +196780,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pcd-loader" = callPackage @@ -199250,7 +196824,6 @@ self: { description = "A one file compiler for PCF"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pcf-font" = callPackage @@ -199283,7 +196856,6 @@ self: { description = "Template Haskell for embedding text rendered using PCF fonts"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pcg-random" = callPackage @@ -199437,7 +197009,6 @@ self: { description = "Tool to generate PDF from haskintex templates and YAML input"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pdf-slave-server" = callPackage @@ -199511,8 +197082,6 @@ self: { ]; description = "A collection of tools for processing PDF files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pdf-toolbox-core" = callPackage @@ -199538,8 +197107,6 @@ self: { ]; description = "A collection of tools for processing PDF files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pdf-toolbox-document" = callPackage @@ -199561,8 +197128,6 @@ self: { ]; description = "A collection of tools for processing PDF files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pdf-toolbox-viewer" = callPackage @@ -199710,7 +197275,6 @@ self: { description = "Experiemental library for composable interactive programs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "peano" = callPackage @@ -199761,7 +197325,6 @@ self: { description = "pec embedded compiler"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pecoff" = callPackage @@ -199870,7 +197433,6 @@ self: { description = "Package to solve the Generalized Pell Equation"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pem" = callPackage @@ -199976,7 +197538,6 @@ self: { description = "Extensible double-entry accounting system"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "penny-bin" = callPackage @@ -199996,7 +197557,6 @@ self: { description = "Deprecated - use penny package instead"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "penny-lib" = callPackage @@ -200019,7 +197579,6 @@ self: { description = "Deprecated - use penny package instead"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "penrose" = callPackage @@ -200056,7 +197615,6 @@ self: { description = "Create beautiful diagrams just by typing mathematical notation in plain text"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "peparser" = callPackage @@ -200069,7 +197627,6 @@ self: { description = "A parser for PE object files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "percent-encoder" = callPackage @@ -200143,8 +197700,6 @@ self: { benchmarkToolDepends = [ cpphs ]; description = "Find duplicate images"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "perdure" = callPackage @@ -200234,7 +197789,6 @@ self: { description = "analysis example using perf"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "perfect-hash-generator" = callPackage @@ -200314,7 +197868,6 @@ self: { description = "A perfect hashing library for mapping bytestrings to values"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "perhaps" = callPackage @@ -200390,7 +197943,6 @@ self: { description = "Periodic task system haskell client"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "periodic-client-exe" = callPackage @@ -200416,7 +197968,6 @@ self: { description = "Periodic task system haskell client executables"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "periodic-common" = callPackage @@ -200476,7 +198027,6 @@ self: { description = "Periodic task system haskell server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "perm" = callPackage @@ -200494,7 +198044,6 @@ self: { description = "permutation Applicative and Monad with many mtl instances"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "permutation" = callPackage @@ -200585,6 +198134,7 @@ self: { ]; description = "Serialization library with state and leb128 encoding"; license = lib.licenses.bsd3; + platforms = [ "i686-linux" "x86_64-darwin" "x86_64-linux" ]; }) {}; "persist2er" = callPackage @@ -200672,32 +198222,34 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; - "persistent_2_12_1_1" = callPackage + "persistent_2_13_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , deepseq-generics, fast-logger, file-embed, hspec, http-api-data - , monad-logger, mtl, path-pieces, QuickCheck, resource-pool - , resourcet, scientific, shakespeare, silently, template-haskell - , text, th-lift-instances, time, transformers, unliftio - , unliftio-core, unordered-containers, vector + , lift-type, monad-logger, mtl, path-pieces, QuickCheck + , quickcheck-instances, resource-pool, resourcet, scientific + , shakespeare, silently, template-haskell, text, th-lift-instances + , time, transformers, unliftio, unliftio-core, unordered-containers + , vector }: mkDerivation { pname = "persistent"; - version = "2.12.1.1"; - sha256 = "00n463mvfnjpi7dz4i3lz379cf4gprsiv57j4jb7wh5a8xr2vfhz"; + version = "2.13.0.1"; + sha256 = "0yvipx9y33pr1vz7818w2ylr5zf9bmng8ka70mdb4f563l4ynp96"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger http-api-data monad-logger mtl - path-pieces resource-pool resourcet scientific silently + conduit containers fast-logger http-api-data lift-type monad-logger + mtl path-pieces resource-pool resourcet scientific silently template-haskell text th-lift-instances time transformers unliftio unliftio-core unordered-containers vector ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger hspec http-api-data monad-logger mtl - path-pieces QuickCheck resource-pool resourcet scientific - shakespeare silently template-haskell text th-lift-instances time - transformers unliftio unliftio-core unordered-containers vector + path-pieces QuickCheck quickcheck-instances resource-pool resourcet + scientific shakespeare silently template-haskell text + th-lift-instances time transformers unliftio unliftio-core + unordered-containers vector ]; benchmarkHaskellDepends = [ base criterion deepseq deepseq-generics file-embed template-haskell @@ -200737,7 +198289,6 @@ self: { description = "Parses a Persist Model file and produces Audit Models"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "persistent-cereal" = callPackage @@ -200774,6 +198325,35 @@ self: { broken = true; }) {}; + "persistent-discover" = callPackage + ({ mkDerivation, base, directory, dlist, file-embed, filepath + , hspec, hspec-discover, mtl, persistent, template-haskell + }: + mkDerivation { + pname = "persistent-discover"; + version = "0.1.0.0"; + sha256 = "1cpjbks5cmh2w3370xnmm29rk8j3xdxmry04fyi0aqyg5f91hrdi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory dlist file-embed filepath mtl persistent + template-haskell + ]; + executableHaskellDepends = [ + base directory dlist file-embed filepath mtl persistent + template-haskell + ]; + testHaskellDepends = [ + base directory dlist file-embed filepath hspec hspec-discover mtl + persistent template-haskell + ]; + testToolDepends = [ hspec-discover ]; + description = "Persistent module discover utilities"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "persistent-documentation" = callPackage ({ mkDerivation, base, containers, hspec, hspec-discover, mtl , persistent, persistent-template, template-haskell, text @@ -200833,7 +198413,6 @@ self: { description = "Declare Persistent entities using SQL SELECT query syntax"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "persistent-instances-iproute" = callPackage @@ -200878,7 +198457,6 @@ self: { description = "A thread-safe (STM) persistency interface for finite map types"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "persistent-migration" = callPackage @@ -200890,8 +198468,8 @@ self: { }: mkDerivation { pname = "persistent-migration"; - version = "0.1.0"; - sha256 = "025hrjm95klj4b7wqlzwkcwra5yj37ilirr06hxxw6d3g668rllm"; + version = "0.2.1"; + sha256 = "0jxhd9bkzcak48nz02g1s8rmbc9fkylf13p4vxkn3x26g2qlig7i"; libraryHaskellDepends = [ base containers fgl mtl persistent text time unordered-containers ]; @@ -200918,6 +198496,8 @@ self: { pname = "persistent-mongoDB"; version = "2.12.0.0"; sha256 = "1s49d4c4kiqcblkap96wcrp3nc0179vpzbqp4fdibljq9ylzxmzg"; + revision = "1"; + editedCabalFile = "047riy3grn68jw99095qgqxvfs5bvxmcvmnz170nrqflrlr4l4dd"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -200987,26 +198567,27 @@ self: { license = lib.licenses.mit; }) {}; - "persistent-mysql_2_12_1_0" = callPackage + "persistent-mysql_2_13_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, fast-logger, hspec, HUnit, monad-logger, mysql - , mysql-simple, persistent, persistent-qq, persistent-test - , QuickCheck, quickcheck-instances, resource-pool, resourcet, text - , time, transformers, unliftio-core + , containers, fast-logger, hspec, http-api-data, HUnit + , monad-logger, mysql, mysql-simple, path-pieces, persistent + , persistent-qq, persistent-test, QuickCheck, quickcheck-instances + , resource-pool, resourcet, text, time, transformers, unliftio-core }: mkDerivation { pname = "persistent-mysql"; - version = "2.12.1.0"; - sha256 = "08494wc935gfr3007w2x9lvqcp8y2jvapgwjxz1l0mnl120vh8hw"; + version = "2.13.0.0"; + sha256 = "1lqd1j9r973081yzvvz9c65csqjd8bzapb4dayzwbhwjq2p0sxiz"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text transformers unliftio-core ]; testHaskellDepends = [ - base bytestring containers fast-logger hspec HUnit monad-logger - mysql persistent persistent-qq persistent-test QuickCheck - quickcheck-instances resourcet text time transformers unliftio-core + aeson base bytestring containers fast-logger hspec http-api-data + HUnit monad-logger mysql path-pieces persistent persistent-qq + persistent-test QuickCheck quickcheck-instances resourcet text time + transformers unliftio-core ]; description = "Backend for the persistent library using MySQL database server"; license = lib.licenses.mit; @@ -201132,20 +198713,20 @@ self: { license = lib.licenses.mit; }) {}; - "persistent-postgresql_2_12_1_1" = callPackage + "persistent-postgresql_2_13_0_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , conduit, containers, fast-logger, hspec, hspec-expectations - , hspec-expectations-lifted, HUnit, monad-logger, mtl, persistent - , persistent-qq, persistent-test, postgresql-libpq - , postgresql-simple, QuickCheck, quickcheck-instances - , resource-pool, resourcet, string-conversions, text, time - , transformers, unliftio, unliftio-core, unordered-containers - , vector + , hspec-expectations-lifted, http-api-data, HUnit, monad-logger + , mtl, path-pieces, persistent, persistent-qq, persistent-test + , postgresql-libpq, postgresql-simple, QuickCheck + , quickcheck-instances, resource-pool, resourcet + , string-conversions, text, time, transformers, unliftio + , unliftio-core, unordered-containers, vector }: mkDerivation { pname = "persistent-postgresql"; - version = "2.12.1.1"; - sha256 = "1zyh40490r3vjr5qyr8hp2ih1pjqjwbmwm1ashdm1b1n9y5ary53"; + version = "2.13.0.0"; + sha256 = "0a18h7ib01if2dspq8f3vwb02cwi74c12i0n3ax4aq6819qy12gb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201156,10 +198737,10 @@ self: { ]; testHaskellDepends = [ aeson base bytestring containers fast-logger hspec - hspec-expectations hspec-expectations-lifted HUnit monad-logger - persistent persistent-qq persistent-test QuickCheck - quickcheck-instances resourcet text time transformers unliftio - unliftio-core unordered-containers vector + hspec-expectations hspec-expectations-lifted http-api-data HUnit + monad-logger path-pieces persistent persistent-qq persistent-test + QuickCheck quickcheck-instances resourcet text time transformers + unliftio unliftio-core unordered-containers vector ]; description = "Backend for the persistent library using postgresql"; license = lib.licenses.mit; @@ -201248,8 +198829,8 @@ self: { }: mkDerivation { pname = "persistent-redis"; - version = "2.12.0.0"; - sha256 = "0zibmgvlpkx4knh23jnz2vam1la6w57x2cibrdn17h0zd3s872p5"; + version = "2.13.0.0"; + sha256 = "1d43rlcx0islf7gn14kpxi922zaz6k5x6s4k4xc947l2r1zx40qs"; libraryHaskellDepends = [ aeson base binary bytestring hedis http-api-data mtl path-pieces persistent scientific text time transformers utf8-string @@ -201355,7 +198936,7 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; - "persistent-sqlite_2_12_0_0" = callPackage + "persistent-sqlite_2_13_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th , monad-logger, mtl, persistent, persistent-test, QuickCheck @@ -201365,8 +198946,10 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.12.0.0"; - sha256 = "0qwh2zrg1dqrv7i752jkqgqfxwjbdvkxmdgnzhcfzhgn6bq1018m"; + version = "2.13.0.0"; + sha256 = "1xbf22cnvhjs59wqml0n5flk1fhrhjw3flm3lnhh1nik3scfny0w"; + revision = "1"; + editedCabalFile = "0y21azb1cvaxwlypprh3wqxr0w0hchf3r509vqxvywqymckqc71i"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -201475,33 +199058,32 @@ self: { ]; description = "Tests for Persistent"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; - "persistent-test_2_12_0_0" = callPackage + "persistent-test_2_13_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit - , containers, exceptions, hspec, hspec-expectations, HUnit - , monad-control, monad-logger, mtl, path-pieces, persistent + , containers, exceptions, hspec, hspec-expectations, http-api-data + , HUnit, monad-control, monad-logger, mtl, path-pieces, persistent , QuickCheck, quickcheck-instances, random, resourcet, text, time , transformers, transformers-base, unliftio, unliftio-core , unordered-containers }: mkDerivation { pname = "persistent-test"; - version = "2.12.0.0"; - sha256 = "0vn6f8wmax68qg27ifw2sfr3d0zk12p6gaax5xshwmb5ypamrc50"; + version = "2.13.0.0"; + sha256 = "1fyahnnx9f3dg36kqviah5l9410d0x819dz3afxapcq27myccdw7"; + revision = "1"; + editedCabalFile = "16yzpsy11bcglipgcy0x8mcxlx7w00gfvnw5fhjkbj99lxdwwgm0"; libraryHaskellDepends = [ aeson base blaze-html bytestring conduit containers exceptions - hspec hspec-expectations HUnit monad-control monad-logger mtl - path-pieces persistent QuickCheck quickcheck-instances random - resourcet text time transformers transformers-base unliftio - unliftio-core unordered-containers + hspec hspec-expectations http-api-data HUnit monad-control + monad-logger mtl path-pieces persistent QuickCheck + quickcheck-instances random resourcet text time transformers + transformers-base unliftio unliftio-core unordered-containers ]; description = "Tests for Persistent"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "persistent-typed-db" = callPackage @@ -201568,8 +199150,6 @@ self: { benchmarkHaskellDepends = [ base containers criterion deepseq ]; description = "A persistent sequence based on array mapped tries"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "persistent-zookeeper" = callPackage @@ -201641,7 +199221,6 @@ self: { description = "Persona (BrowserID) Identity Provider"; license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pesca" = callPackage @@ -201685,7 +199264,6 @@ self: { description = "Pretty Easy YOshikuni-made TLS library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "peyotls-codec" = callPackage @@ -201704,7 +199282,6 @@ self: { description = "Codec parts of Pretty Easy YOshikuni-made TLS library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pez" = callPackage @@ -201868,7 +199445,6 @@ self: { description = "A postgresql-simple transaction monad"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pgdl" = callPackage @@ -201902,8 +199478,8 @@ self: { ({ mkDerivation, base, containers, gu, pgf, pretty }: mkDerivation { pname = "pgf2"; - version = "1.2.1"; - sha256 = "10nbwhdirhlsh68f14z8y75wlbs9f9xcn8cbgkf47m74x71jqqb3"; + version = "1.3.0"; + sha256 = "1sd21p6f9m9l6xnf853v7lxj6j6sbsrd7i09y0w0lsysp86p8h7m"; libraryHaskellDepends = [ base containers pretty ]; librarySystemDepends = [ gu pgf ]; description = "Bindings to the C version of the PGF runtime"; @@ -201958,7 +199534,6 @@ self: { description = "A mid-level PostgreSQL client library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pgstream" = callPackage @@ -202248,7 +199823,6 @@ self: { description = "A generalization of the uniqueness-periods-vector-examples functionality"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "phonetic-languages-filters-array" = callPackage @@ -202306,8 +199880,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.5.1.0"; - sha256 = "1pqc16llr1ar7z6lfbniinxx7q09qpamajmbl3d9njhk4pwdl6b8"; + version = "0.6.2.0"; + sha256 = "1vzx21pp9hkksbw5vpl8rarxpnbhmj04xys3qx0xk0zqf2p1f86q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202461,6 +200035,66 @@ self: { license = lib.licenses.mit; }) {}; + "phonetic-languages-simplified-generalized-examples-array" = callPackage + ({ mkDerivation, base, heaps, mmsyn2-array, parallel + , phonetic-languages-constraints-array + , phonetic-languages-filters-array + , phonetic-languages-permutations-array + , phonetic-languages-phonetics-basics, phonetic-languages-plus + , phonetic-languages-simplified-base + , phonetic-languages-simplified-generalized-examples-common + , phonetic-languages-simplified-generalized-properties-array, subG + }: + mkDerivation { + pname = "phonetic-languages-simplified-generalized-examples-array"; + version = "0.1.1.0"; + sha256 = "04b65k6jjrlfx93m7625f991vll136y0lbh82f9qgxlmwv1vwmm8"; + libraryHaskellDepends = [ + base heaps mmsyn2-array parallel + phonetic-languages-constraints-array + phonetic-languages-filters-array + phonetic-languages-permutations-array + phonetic-languages-phonetics-basics phonetic-languages-plus + phonetic-languages-simplified-base + phonetic-languages-simplified-generalized-examples-common + phonetic-languages-simplified-generalized-properties-array subG + ]; + description = "Helps to create texts with the given phonetic properties (e. g. poetic)."; + license = lib.licenses.mit; + }) {}; + + "phonetic-languages-simplified-generalized-examples-common" = callPackage + ({ mkDerivation, base, heaps, phonetic-languages-phonetics-basics + , subG + }: + mkDerivation { + pname = "phonetic-languages-simplified-generalized-examples-common"; + version = "0.1.1.0"; + sha256 = "0yhpw7bpfag5d6cbm385dy5jxll2vn8104ypqngdv0qlxqx25m9l"; + libraryHaskellDepends = [ + base heaps phonetic-languages-phonetics-basics subG + ]; + description = "Some common code for phonetic languages generalized functionality"; + license = lib.licenses.mit; + }) {}; + + "phonetic-languages-simplified-generalized-properties-array" = callPackage + ({ mkDerivation, base, phonetic-languages-phonetics-basics + , phonetic-languages-rhythmicity + , phonetic-languages-simplified-base + }: + mkDerivation { + pname = "phonetic-languages-simplified-generalized-properties-array"; + version = "0.1.1.0"; + sha256 = "04jg2b2qzm3yhbckbpn7zarfdy921lryx8d5r3cx9vcp55xvain0"; + libraryHaskellDepends = [ + base phonetic-languages-phonetics-basics + phonetic-languages-rhythmicity phonetic-languages-simplified-base + ]; + description = "Generalization of the functionality of the phonetic-languages-simplified-properties-array"; + license = lib.licenses.mit; + }) {}; + "phonetic-languages-simplified-lists-examples" = callPackage ({ mkDerivation, base, heaps, mmsyn2, parallel , phonetic-languages-constraints, phonetic-languages-permutations @@ -202494,7 +200128,6 @@ self: { description = "Simplified and somewhat optimized version of the phonetic-languages-examples"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "phonetic-languages-simplified-properties-array" = callPackage @@ -202601,7 +200234,6 @@ self: { description = "Functional user interfaces"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "photoname" = callPackage @@ -202624,7 +200256,6 @@ self: { description = "Rename photo image files based on EXIF shoot date"; license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "phraskell" = callPackage @@ -202825,7 +200456,6 @@ self: { description = "Remotely controlling Java Swing applications"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "picedit" = callPackage @@ -202988,7 +200618,6 @@ self: { description = "Yet another Haskell build system"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pier-core" = callPackage @@ -203081,8 +200710,6 @@ self: { ]; description = "Access to the Pinboard API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pinboard-notes-backup" = callPackage @@ -203103,6 +200730,7 @@ self: { ]; description = "Back up the notes you've saved to Pinboard"; license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ bdesham ]; }) {}; "pinch" = callPackage @@ -203148,8 +200776,6 @@ self: { ]; description = "A code generator for the pinch Thrift library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pinchot" = callPackage @@ -203212,7 +200838,6 @@ self: { description = "icmp echo requests"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ping-parser-attoparsec" = callPackage @@ -203260,13 +200885,15 @@ self: { }) {}; "pinned-warnings" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, ghc }: + ({ mkDerivation, base, bytestring, containers, directory, ghc, time + , transformers + }: mkDerivation { pname = "pinned-warnings"; - version = "0.1.0.1"; - sha256 = "0yrd4lqr1sklswalpx7j1bmqjsc19y080wcgq4qd0fmc3qhcixjc"; + version = "0.1.0.2"; + sha256 = "0mm7d185syrbksl751hx0541qdin064ixm7bbqq3ji8jcgbg42x5"; libraryHaskellDepends = [ - base bytestring containers directory ghc + base bytestring containers directory ghc time transformers ]; description = "Preserve warnings in a GHCi session"; license = lib.licenses.bsd3; @@ -203305,7 +200932,6 @@ self: { description = "A gateway for various cloud notification services"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipe-enumerator" = callPackage @@ -203318,7 +200944,6 @@ self: { description = "A bidirectional bridge between pipes and iteratees"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipeclip" = callPackage @@ -203376,8 +201001,8 @@ self: { }: mkDerivation { pname = "pipes"; - version = "4.3.15"; - sha256 = "01hvzm7cp6y3wrdhca3wlb99y0az0rjy5lscmnds0v6i767kyxk1"; + version = "4.3.16"; + sha256 = "163lx5sf68zx5kik5h1fjsyckwr9shdsn5k2dsjq3mhg077nxqgl"; libraryHaskellDepends = [ base exceptions mmorph mtl transformers void ]; @@ -203390,6 +201015,7 @@ self: { ]; description = "Compositional pipelines"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "pipes-aeson" = callPackage @@ -203468,7 +201094,6 @@ self: { description = "Streaming parsing in the pipes-core framework with Attoparsec"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-bgzf" = callPackage @@ -203540,7 +201165,6 @@ self: { description = "Brotli (RFC7932) compressors and decompressors for the Pipes package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-bytestring" = callPackage @@ -203557,6 +201181,7 @@ self: { ]; description = "ByteString support for pipes"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "pipes-bzip" = callPackage @@ -203597,7 +201222,6 @@ self: { description = "Pipes for Noise-secured network connections"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-category" = callPackage @@ -203691,7 +201315,6 @@ self: { description = "A streaming serialization library on top of \"pipes\" and \"cereal-plus\""; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-cliff" = callPackage @@ -203727,6 +201350,7 @@ self: { testHaskellDepends = [ async base pipes stm ]; description = "Concurrency for the pipes ecosystem"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "pipes-conduit" = callPackage @@ -203739,7 +201363,6 @@ self: { description = "Conduit adapters"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-core" = callPackage @@ -203769,7 +201392,6 @@ self: { description = "Pipes utilities for interfacing with the courier message-passing framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-csv" = callPackage @@ -203791,6 +201413,7 @@ self: { ]; description = "Fast, streaming csv parser"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "pipes-errors" = callPackage @@ -203832,7 +201455,6 @@ self: { description = "Various basic utilities for Pipes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-extras" = callPackage @@ -203851,6 +201473,7 @@ self: { ]; description = "Extra utilities for pipes"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "pipes-fastx" = callPackage @@ -203894,7 +201517,6 @@ self: { description = "Fast traversal of directory trees using pipes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-fluid" = callPackage @@ -203935,6 +201557,7 @@ self: { testHaskellDepends = [ base doctest lens-family-core ]; description = "Group streams into substreams"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "pipes-http" = callPackage @@ -203952,6 +201575,7 @@ self: { ]; description = "HTTP client with pipes interface"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "pipes-illumina" = callPackage @@ -203968,7 +201592,6 @@ self: { description = "Illumina NGS data processing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-interleave" = callPackage @@ -204041,7 +201664,6 @@ self: { description = "Streaming processing of CSV files preceded by key-value pairs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-lines" = callPackage @@ -204109,8 +201731,6 @@ self: { testHaskellDepends = [ base monad-control mongoDB pipes text ]; description = "Stream results from MongoDB"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-network" = callPackage @@ -204187,7 +201807,6 @@ self: { description = "P2P network nodes with pipes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-p2p-examples" = callPackage @@ -204207,7 +201826,6 @@ self: { description = "Examples using pipes-p2p"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-parse" = callPackage @@ -204219,6 +201837,7 @@ self: { libraryHaskellDepends = [ base pipes transformers ]; description = "Parsing infrastructure for the pipes ecosystem"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "pipes-postgresql-simple" = callPackage @@ -204341,6 +201960,7 @@ self: { ]; description = "Safety for the pipes ecosystem"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "pipes-shell" = callPackage @@ -204529,7 +202149,6 @@ self: { description = "A dependently typed core language"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pit" = callPackage @@ -204575,7 +202194,6 @@ self: { description = "Pitch tracking library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pivotal-tracker" = callPackage @@ -204693,8 +202311,6 @@ self: { ]; description = "Pixiv API binding based on servant-client"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "piyo" = callPackage @@ -204719,6 +202335,9 @@ self: { ]; description = "Haskell game engine like fantasy console"; license = lib.licenses.mit; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "pkcs1" = callPackage @@ -204803,7 +202422,6 @@ self: { description = "Package tree diff tool"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pktree" = callPackage @@ -205025,7 +202643,6 @@ self: { description = "Planet Mitchell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "planet-mitchell-test" = callPackage @@ -205229,7 +202846,6 @@ self: { description = "plot data from stdin through socketed"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "plot" = callPackage @@ -205349,6 +202965,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "ploterific" = callPackage + ({ mkDerivation, base, bytestring, cassava, containers, hvega + , hvega-theme, lens, mtl, optparse-generic, text + }: + mkDerivation { + pname = "ploterific"; + version = "0.1.0.1"; + sha256 = "03m0zi7izlv8n5jsisym595sn7cfl2p1mhch086ajyd2g6zlxya7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cassava containers hvega hvega-theme lens mtl + optparse-generic text + ]; + executableHaskellDepends = [ base mtl optparse-generic text ]; + description = "Basic plotting of tabular data for the command line"; + license = lib.licenses.gpl3Only; + }) {}; + "plotfont" = callPackage ({ mkDerivation, base, containers, tasty, tasty-hunit }: mkDerivation { @@ -205419,8 +203054,6 @@ self: { ]; description = "Diagrams based plotting library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "plotserver-api" = callPackage @@ -205461,8 +203094,6 @@ self: { ]; description = "Dynamic linking for Haskell and C objects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "plugins-auto" = callPackage @@ -205598,7 +203229,6 @@ self: { description = "read/write png file"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pngload" = callPackage @@ -205616,7 +203246,6 @@ self: { description = "Pure Haskell loader for PNG images"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pngload-fixed" = callPackage @@ -205694,7 +203323,6 @@ self: { description = "Multi-backend (zookeeper and sqlite) DNS Server using persistent-library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "point-octree" = callPackage @@ -205714,7 +203342,6 @@ self: { description = "Point octree, with bounding boxes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pointed" = callPackage @@ -205765,8 +203392,8 @@ self: { }: mkDerivation { pname = "pointfree"; - version = "1.1.1.7"; - sha256 = "19yvkh4akcsiy0blmrwy7ayirg729s3vs4w0qkb2w171aas34090"; + version = "1.1.1.8"; + sha256 = "0jfl6sp0kv2fdjdhzn85j3hb7a83w9g64girs67v6j53yljqx8vz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -205866,7 +203493,6 @@ self: { description = "Pointless Lenses library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pointless-rewrite" = callPackage @@ -205883,7 +203509,6 @@ self: { description = "Pointless Rewrite library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "poke" = callPackage @@ -205916,7 +203541,6 @@ self: { description = "Discord verification bot"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pokemon-go-protobuf-types" = callPackage @@ -206026,7 +203650,6 @@ self: { description = "A library for manipulating the historical dictionary of Polish (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "policeman" = callPackage @@ -206176,7 +203799,6 @@ self: { description = "Wrap together data and it's constraints"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polydata-core" = callPackage @@ -206328,7 +203950,6 @@ self: { description = "Experimental, RandomFu effect and interpreters for polysemy"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-chronos" = callPackage @@ -206350,8 +203971,6 @@ self: { ]; description = "Polysemy effect for chronos"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-conc" = callPackage @@ -206375,8 +203994,6 @@ self: { ]; description = "Polysemy Effects for Concurrency"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-extra" = callPackage @@ -206393,7 +204010,6 @@ self: { description = "Extra Input and Output functions for polysemy.."; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-fs" = callPackage @@ -206425,7 +204041,6 @@ self: { description = "Run a KVStore as a filesystem in polysemy"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-http" = callPackage @@ -206455,8 +204070,6 @@ self: { ]; description = "Polysemy effect for http-client"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-kvstore-jsonfile" = callPackage @@ -206474,7 +204087,6 @@ self: { description = "Run a KVStore as a single json file in polysemy"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-log" = callPackage @@ -206498,8 +204110,6 @@ self: { ]; description = "Polysemy effects for logging"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-log-co" = callPackage @@ -206523,7 +204133,6 @@ self: { description = "polysemy-log interpreter for co-log"; license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-log-di" = callPackage @@ -206545,8 +204154,6 @@ self: { ]; description = "polysemy-log interpreter for di"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-methodology" = callPackage @@ -206563,7 +204170,6 @@ self: { description = "Domain modelling algebra for polysemy"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-methodology-composite" = callPackage @@ -206581,7 +204187,6 @@ self: { description = "Functions for using polysemy-methodology with composite"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-mocks" = callPackage @@ -206609,7 +204214,6 @@ self: { description = "Optics for Polysemy"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-path" = callPackage @@ -206626,7 +204230,6 @@ self: { description = "Polysemy versions of Path functions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-plugin" = callPackage @@ -206667,8 +204270,6 @@ self: { ]; description = "Polysemy error tracking"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-test" = callPackage @@ -206693,8 +204294,6 @@ self: { ]; description = "Polysemy effects for testing"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-time" = callPackage @@ -206718,8 +204317,6 @@ self: { ]; description = "Polysemy effect for time"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-video" = callPackage @@ -206746,7 +204343,6 @@ self: { description = "Functions for mapping vinyl records in polysemy"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-webserver" = callPackage @@ -206815,7 +204411,6 @@ self: { description = "Taming Selective Strictness"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysoup" = callPackage @@ -206854,7 +204449,6 @@ self: { description = "Utilities for polytypeable"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polyvariadic" = callPackage @@ -206892,8 +204486,6 @@ self: { ]; description = "Maps and sets of partial orders"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pomodoro" = callPackage @@ -206913,7 +204505,6 @@ self: { description = "pomodoro timer"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pomohoro" = callPackage @@ -207039,8 +204630,6 @@ self: { ]; description = "An XMPP client library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pontarius-xmpp-extras" = callPackage @@ -207165,7 +204754,6 @@ self: { description = "popenhs is a popen-like library for Haskell"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "popkey" = callPackage @@ -207266,7 +204854,6 @@ self: { description = "Express portable, composable and reusable data tasks and pipelines"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "porcupine-http" = callPackage @@ -207296,7 +204883,6 @@ self: { description = "A location accessor for porcupine to connect to HTTP sources/sinks"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "porcupine-s3" = callPackage @@ -207328,7 +204914,6 @@ self: { description = "A location accessor for porcupine to connect to AWS S3 sources/sinks"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "porpoise" = callPackage @@ -207457,7 +205042,6 @@ self: { description = "The Haskell Ports Library"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ports-tools" = callPackage @@ -207493,7 +205077,6 @@ self: { description = "Simple extensible library to run SQL file against PostgreSQL database"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "poseidon-postgis" = callPackage @@ -207515,7 +205098,6 @@ self: { description = "Extension of Poseidon library for Postgis (Spatial and Geographic objects for PostgreSQL)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "positive" = callPackage @@ -207585,6 +205167,9 @@ self: { ]; description = "posix bindings"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) systemd;}; @@ -208170,7 +205755,6 @@ self: { description = "Sql interpolating quasiquote plus some kind of primitive ORM using it"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "postgresql-schema" = callPackage @@ -208284,8 +205868,6 @@ self: { testHaskellDepends = [ base bytestring hspec postgresql-simple ]; description = "PostgreSQL Schema Migrations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "postgresql-simple-named" = callPackage @@ -208356,7 +205938,6 @@ self: { description = "A PostgreSQL backed queue"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "postgresql-simple-sop" = callPackage @@ -208387,7 +205968,6 @@ self: { description = "Typed extension for PostgreSQL simple"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "postgresql-simple-url" = callPackage @@ -208434,8 +206014,6 @@ self: { ]; description = "PostgreSQL AST parsing and rendering"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "postgresql-transactional" = callPackage @@ -208491,7 +206069,6 @@ self: { description = "postgresql-tx interfacing for use with postgresql-query"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "postgresql-tx-simple" = callPackage @@ -208524,7 +206101,6 @@ self: { description = "postgresql-tx interfacing for use with squeal-postgresql"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "postgresql-tx-squeal-compat-simple" = callPackage @@ -208539,7 +206115,6 @@ self: { description = "Connection interop from postgresql-simple connections to postgresql-libpq connections"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "postgresql-typed" = callPackage @@ -208710,7 +206285,6 @@ self: { description = "Library for postmarkapp.com HTTP Api"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "postmark-streams" = callPackage @@ -208778,7 +206352,6 @@ self: { description = "Simple streaming in IO"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "potoki-cereal" = callPackage @@ -208802,7 +206375,6 @@ self: { description = "Streaming serialization"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "potoki-conduit" = callPackage @@ -208826,7 +206398,6 @@ self: { description = "Integration of \"potoki\" and \"conduit\""; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "potoki-core" = callPackage @@ -208872,7 +206443,6 @@ self: { description = "Integration of \"potoki\" and \"hasql\""; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "potoki-zlib" = callPackage @@ -208887,7 +206457,6 @@ self: { description = "Streaming ZLib decompression"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "potrace" = callPackage @@ -208917,8 +206486,6 @@ self: { libraryHaskellDepends = [ base diagrams-lib JuicyPixels potrace ]; description = "Potrace bindings for the diagrams library"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "powermate" = callPackage @@ -209021,7 +206588,6 @@ self: { description = "A Amazon SQS backend for powerqueue"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ppm" = callPackage @@ -209110,7 +206676,6 @@ self: { description = "Fully encapsulated monad transformers with queuelike functionality"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "practice-room" = callPackage @@ -209130,7 +206695,6 @@ self: { description = "Practice Room"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "praglude" = callPackage @@ -209259,7 +206823,6 @@ self: { description = "Simple cached predicates"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pred-trie" = callPackage @@ -209289,7 +206852,6 @@ self: { description = "Predicative tries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "predicate-class" = callPackage @@ -209314,8 +206876,6 @@ self: { libraryHaskellDepends = [ adjunctions base deepseq lens mtl ]; description = "A library for writing predicates and transformations over predicates in Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "predicate-typed" = callPackage @@ -209412,7 +206972,6 @@ self: { description = "Tests and QuickCheck generators to accompany prednote"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "prefetch" = callPackage @@ -209783,7 +207342,6 @@ self: { description = "An HDBC connector for Presto"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "prettify" = callPackage @@ -210076,8 +207634,6 @@ self: { testHaskellDepends = [ base hspec tagged ]; description = "A small pretty printing DSL for complex types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "prettyFunctionComposing" = callPackage @@ -210223,8 +207779,6 @@ self: { libraryHaskellDepends = [ base lucid prettyprinter text ]; description = "A prettyprinter backend for lucid"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "prettyprinter-vty" = callPackage @@ -210256,7 +207810,6 @@ self: { description = "The method of previewing data (instead of wholly show-ing it)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "prim" = callPackage @@ -210357,8 +207910,6 @@ self: { ]; description = "Primeval world of Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "primal-memory" = callPackage @@ -210378,8 +207929,6 @@ self: { ]; description = "Unified interface for memory managemenet"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "prime" = callPackage @@ -210517,8 +208066,6 @@ self: { ]; description = "containers backed by arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "primitive-convenience" = callPackage @@ -210648,8 +208195,6 @@ self: { benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ]; description = "Sort primitive arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "primitive-stablename" = callPackage @@ -210730,7 +208275,6 @@ self: { description = "ImageBoard on Happstack and HSP"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "primula-bot" = callPackage @@ -210750,7 +208294,6 @@ self: { description = "Jabber-bot for primula-board ImageBoard"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pringletons" = callPackage @@ -211017,7 +208560,6 @@ self: { description = "Parse process information for Linux"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "proc-net" = callPackage @@ -211108,7 +208650,6 @@ self: { description = "IterIO Process Library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "process-leksah" = callPackage @@ -211157,7 +208698,6 @@ self: { description = "Run a process and do reportsing on its progress"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "process-qq" = callPackage @@ -211175,7 +208715,6 @@ self: { description = "Quasi-Quoters for exec process"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "process-sequential" = callPackage @@ -211219,7 +208758,6 @@ self: { description = "Streaming interface to system processes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "processing" = callPackage @@ -211358,7 +208896,6 @@ self: { description = "Simple streaming datatype"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "product" = callPackage @@ -211433,7 +208970,6 @@ self: { description = "Convert GHC profiles into GraphViz's dot format"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "prof2pretty" = callPackage @@ -211657,7 +209193,6 @@ self: { description = "Progressbar API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "progression" = callPackage @@ -211781,7 +209316,6 @@ self: { description = "Relational Algebra Engine"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "project-template" = callPackage @@ -211865,8 +209399,6 @@ self: { ]; description = "Profunctor-based lightweight implementation of optics"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "prolog" = callPackage @@ -211939,7 +209471,6 @@ self: { description = "Better, more general Prelude exporting common utilities"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "prolude" = callPackage @@ -211962,7 +209493,6 @@ self: { description = "ITProTV's custom prelude"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "prometheus" = callPackage @@ -212034,7 +209564,6 @@ self: { description = "Instrument applications with metrics and publish/push to Prometheus"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "prometheus-metrics-ghc" = callPackage @@ -212173,7 +209702,6 @@ self: { description = "Functional synthesis of images and animations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "propeller" = callPackage @@ -212264,7 +209792,6 @@ self: { description = "A library for functional GUI development"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "props" = callPackage @@ -212323,7 +209850,6 @@ self: { description = "A DSL for processing Prosidy documents"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "prospect" = callPackage @@ -212440,7 +209966,6 @@ self: { description = "neovim project manager"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "proto-lens" = callPackage @@ -212519,7 +210044,6 @@ self: { description = "Protocol buffers for describing the definitions of messages"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "proto-lens-jsonpb" = callPackage @@ -212663,7 +210187,6 @@ self: { description = "A low level library for writing out data in the Protocol Buffers wire format"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "proto3-wire" = callPackage @@ -212687,8 +210210,30 @@ self: { ]; description = "A low-level implementation of the Protocol Buffers (version 3) wire format"; license = lib.licenses.asl20; + }) {}; + + "proto3-wire_1_2_2" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, deepseq + , doctest, ghc-prim, hashable, parameterized, primitive, QuickCheck + , safe, tasty, tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "proto3-wire"; + version = "1.2.2"; + sha256 = "1fdzml0nsbz1bqf3lskvmfn46pgl5rnrc4b7azq8f0csm0v9ah4d"; + libraryHaskellDepends = [ + base bytestring cereal containers deepseq ghc-prim hashable + parameterized primitive QuickCheck safe text transformers + unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring cereal doctest QuickCheck tasty tasty-hunit + tasty-quickcheck text transformers vector + ]; + description = "A low-level implementation of the Protocol Buffers (version 3) wire format"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "protobuf" = callPackage @@ -212734,7 +210279,6 @@ self: { description = "Protocol Buffers via C++"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "protobuf-simple" = callPackage @@ -212823,7 +210367,6 @@ self: { description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "protocol-buffers-fork" = callPackage @@ -212928,7 +210471,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "proton-haskell" = callPackage @@ -213112,7 +210654,6 @@ self: { description = "Language support for the PureScript programming language"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pseudo-boolean" = callPackage @@ -213123,10 +210664,8 @@ self: { }: mkDerivation { pname = "pseudo-boolean"; - version = "0.1.9.0"; - sha256 = "00n5mf7abprhr9xvh3k1mw40jn4l94wwxpc2h0546h0n9v7srb1b"; - revision = "3"; - editedCabalFile = "0x0a5rjylmh4pdmr9iyadywzh06qxypq48b78skvm09bkkvrxghq"; + version = "0.1.10.0"; + sha256 = "1p9w1d80d2kp7wp7wp6xf9dz1iv9knhy8b75mklz7zq3cf5gvnrh"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -213137,8 +210676,6 @@ self: { ]; description = "Reading/Writing OPB/WBO files used in pseudo boolean competition"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pseudo-trie" = callPackage @@ -213379,26 +210916,25 @@ self: { "publish" = callPackage ({ mkDerivation, base, bytestring, chronologique, core-data - , core-program, core-text, deepseq, directory, filepath, hinotify - , hspec, megaparsec, pandoc, pandoc-types, template-haskell, text + , core-program, core-text, deepseq, directory, filepath, hspec + , megaparsec, pandoc, pandoc-types, template-haskell, text , typed-process, unix, unordered-containers }: mkDerivation { pname = "publish"; - version = "2.1.5"; - sha256 = "1ncz9bijln0xmkmy5x6lv4w6xiqr08crgqiyb8cchc88dqacddhi"; + version = "2.1.6"; + sha256 = "1clb9sxrsskklzany9q5600v77qywdszgzxjxrvsihrirf0akry2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring chronologique core-data core-program core-text - deepseq directory filepath hinotify megaparsec pandoc pandoc-types + deepseq directory filepath megaparsec pandoc pandoc-types template-haskell text typed-process unix unordered-containers ]; testHaskellDepends = [ base bytestring chronologique core-data core-program core-text - deepseq directory filepath hinotify hspec megaparsec pandoc - pandoc-types template-haskell text typed-process unix - unordered-containers + deepseq directory filepath hspec megaparsec pandoc pandoc-types + template-haskell text typed-process unix unordered-containers ]; description = "Publishing tools for papers, books, and presentations"; license = lib.licenses.mit; @@ -213488,7 +211024,6 @@ self: { description = "A CLI assistant"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pugixml" = callPackage @@ -213565,7 +211100,6 @@ self: { description = "Portable Haskell/POSIX layer for Pugs"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pugs-hsregex" = callPackage @@ -213578,7 +211112,6 @@ self: { description = "Haskell PCRE binding"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pulse" = callPackage @@ -213636,7 +211169,6 @@ self: { description = "Multilingual unsupervised sentence tokenization with Punkt"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "punycode" = callPackage @@ -213672,7 +211204,6 @@ self: { description = "A program that displays the puppet resources associated to a node given .pp files."; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pure-cdb" = callPackage @@ -213692,7 +211223,6 @@ self: { description = "Another pure-haskell CDB (Constant Database) implementation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pure-fft" = callPackage @@ -213751,7 +211281,6 @@ self: { description = "Tests for the pure-priority-queue package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pure-shuffle" = callPackage @@ -213863,8 +211392,6 @@ self: { testHaskellDepends = [ base ]; description = "Simple Routing functions for Wai Applications"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "purescript" = callPackage @@ -213940,7 +211467,6 @@ self: { description = "PureScript Programming Language Compiler"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "purescript-ast" = callPackage @@ -213958,8 +211484,6 @@ self: { ]; description = "PureScript Programming Language Abstract Syntax Tree"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "purescript-bridge" = callPackage @@ -214053,7 +211577,6 @@ self: { description = "Isomorphic trivial data type definitions over JSON"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "purescript-tsd-gen" = callPackage @@ -214077,7 +211600,6 @@ self: { description = "TypeScript Declaration File (.d.ts) generator for PureScript"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pursuit-client" = callPackage @@ -214139,7 +211661,6 @@ self: { description = "A server-side library for sending push notifications"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "push-notify-apn" = callPackage @@ -214166,7 +211687,6 @@ self: { description = "Send push notifications to mobile iOS devices"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "push-notify-ccs" = callPackage @@ -214187,7 +211707,6 @@ self: { description = "A server-side library for sending/receiving push notifications through CCS (Google Cloud Messaging)"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "push-notify-general" = callPackage @@ -214207,7 +211726,6 @@ self: { description = "A general library for sending/receiving push notif. through dif. services."; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pushbullet" = callPackage @@ -214267,8 +211785,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.1.0.0"; - sha256 = "1zmcpbd20m7pc1bc0dwkhy33vbakdwc478dmzpr4l80kck0mpmy6"; + version = "2.1.0.2"; + sha256 = "0xrmjdika7y2hkp67kzh7xqc3v9j6db1rq2ksih1j9yypa1iihka"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-client-tls http-types memory text time @@ -214397,7 +211915,6 @@ self: { description = "Creating graphics for pencil puzzles"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "puzzle-draw-cmdline" = callPackage @@ -214417,7 +211934,6 @@ self: { description = "Creating graphics for pencil puzzles, command line tools"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pvar" = callPackage @@ -214456,7 +211972,6 @@ self: { description = "A photo viewer daemon application with remote controlling abilities"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) libdevil;}; "pvss" = callPackage @@ -214683,7 +212198,6 @@ self: { description = "'Vec' instances for 'qd' types"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "qed" = callPackage @@ -214728,7 +212242,6 @@ self: { description = "Command line tool qhs, SQL queries on CSV and TSV files"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "qhull-simple" = callPackage @@ -214908,7 +212421,6 @@ self: { description = "Library to generate QR codes from bytestrings and objects and scale image files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "qrcode" = callPackage @@ -215216,7 +212728,6 @@ self: { description = "Retrieve, store and manage real quantum random data"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quarantimer" = callPackage @@ -215304,7 +212815,6 @@ self: { description = "Analysis and parsing library for SQL queries"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "queryparser-demo" = callPackage @@ -215322,7 +212832,6 @@ self: { description = "Demo package containing queryparser examples"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "queryparser-hive" = callPackage @@ -215343,7 +212852,6 @@ self: { description = "Parsing for Hive SQL queries"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "queryparser-presto" = callPackage @@ -215364,7 +212872,6 @@ self: { description = "Parsing for Presto SQL queries"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "queryparser-vertica" = callPackage @@ -215385,7 +212892,6 @@ self: { description = "Parsing for Vertica SQL queries"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "querystring-pickle" = callPackage @@ -215420,7 +212926,6 @@ self: { description = "A package for prompting values from the command-line"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "queue" = callPackage @@ -215444,7 +212949,6 @@ self: { description = "A library of queuelike data structures, both functional and stateful"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quick-generator" = callPackage @@ -215498,7 +213002,6 @@ self: { description = "quick & easy benchmarking of command-line programs"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quickbooks" = callPackage @@ -215552,8 +213055,6 @@ self: { ]; description = "Generate QuickCheck Gen for Sum Types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quickcheck-assertions" = callPackage @@ -215693,7 +213194,6 @@ self: { description = "Automating QuickCheck for polymorphic and overlaoded properties"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quickcheck-properties" = callPackage @@ -215747,7 +213247,6 @@ self: { description = "Generate regex-constrained strings for QuickCheck"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quickcheck-relaxng" = callPackage @@ -215764,7 +213263,6 @@ self: { description = "Generate RelaxNG-constrained XML documents for QuickCheck"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quickcheck-rematch" = callPackage @@ -215871,7 +213369,6 @@ self: { description = "Test monadic programs using state machine based models"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quickcheck-state-machine-distributed" = callPackage @@ -215896,7 +213393,6 @@ self: { description = "Test monadic programs using state machine based models"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quickcheck-string-random" = callPackage @@ -215913,8 +213409,6 @@ self: { ]; description = "Helper to build generators with Text.StringRandom"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quickcheck-text" = callPackage @@ -216124,7 +213618,6 @@ self: { description = "A reflective batch tester for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quickwebapp" = callPackage @@ -216174,7 +213667,6 @@ self: { description = "Meta-package for Quipper"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quipper-algorithms" = callPackage @@ -216199,7 +213691,6 @@ self: { description = "A set of algorithms implemented in Quipper"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quipper-all" = callPackage @@ -216216,7 +213707,6 @@ self: { description = "Meta-package for Quipper"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quipper-cabal" = callPackage @@ -216229,7 +213719,6 @@ self: { description = "Some functions to aid in the creation of Cabal packages for Quipper"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quipper-core" = callPackage @@ -216268,7 +213757,6 @@ self: { description = "Miscellaneous code snippets that illustrate various Quipper features"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quipper-language" = callPackage @@ -216290,7 +213778,6 @@ self: { description = "Quipper, an embedded functional programming language for quantum computation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quipper-libraries" = callPackage @@ -216314,7 +213801,6 @@ self: { description = "The standard libraries for Quipper"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quipper-rendering" = callPackage @@ -216332,7 +213818,6 @@ self: { description = "An embedded, scalable functional programming language for quantum computing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quipper-tools" = callPackage @@ -216355,7 +213840,6 @@ self: { description = "Miscellaneous stand-alone tools for Quipper"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quipper-utils" = callPackage @@ -216404,7 +213888,6 @@ self: { description = "Binary serialisation support for Quivers"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quiver-bytestring" = callPackage @@ -216417,7 +213900,6 @@ self: { description = "Quiver combinators for bytestring streaming"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quiver-cell" = callPackage @@ -216430,7 +213912,6 @@ self: { description = "Quiver combinators for cellular data processing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quiver-csv" = callPackage @@ -216447,7 +213928,6 @@ self: { description = "Quiver combinators for cellular CSV data processing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quiver-enumerator" = callPackage @@ -216460,7 +213940,6 @@ self: { description = "Bridge between Quiver and Iteratee paradigms"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quiver-groups" = callPackage @@ -216474,7 +213953,6 @@ self: { description = "Group and chunk values within a Quiver"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quiver-http" = callPackage @@ -216493,7 +213971,6 @@ self: { description = "Adapter to stream over HTTP(s) with quiver"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quiver-instances" = callPackage @@ -216510,7 +213987,6 @@ self: { description = "Extra instances for Quiver"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quiver-interleave" = callPackage @@ -216524,7 +214000,6 @@ self: { description = "Interleave values from multiple Quivers"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quiver-sort" = callPackage @@ -216549,7 +214024,6 @@ self: { description = "Sort the values in a quiver"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "quokka" = callPackage @@ -216632,7 +214106,6 @@ self: { description = "Command line binary for working with the Qux language"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "r-glpk-phonetic-languages-ukrainian-durations" = callPackage @@ -216707,8 +214180,6 @@ self: { ]; description = "The raaz cryptographic library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rabocsv2qif" = callPackage @@ -216934,7 +214405,6 @@ self: { description = "Compiler and editor for the esolang rail"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rails-session" = callPackage @@ -216959,7 +214429,6 @@ self: { description = "Decrypt Ruby on Rails sessions in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rainbow" = callPackage @@ -216991,7 +214460,6 @@ self: { description = "Tests and QuickCheck generators to accompany rainbow"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rainbox" = callPackage @@ -217053,7 +214521,6 @@ self: { description = "distributed-process node"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rakhana" = callPackage @@ -217155,8 +214622,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Random access list with a list compatible interface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rallod" = callPackage @@ -217170,7 +214635,6 @@ self: { description = "'$' in reverse"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "raml" = callPackage @@ -217407,7 +214871,6 @@ self: { description = "A simple random generator library for effin"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "random-extras" = callPackage @@ -217487,7 +214950,6 @@ self: { description = "Random variate generation from hypergeometric distributions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "random-names" = callPackage @@ -217725,7 +215187,6 @@ self: { description = "A Range type with vector-space instances"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ranged-list" = callPackage @@ -217877,7 +215338,6 @@ self: { description = "A modular text editor"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rasa-example-config" = callPackage @@ -217898,7 +215358,6 @@ self: { description = "Example user config for Rasa"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rasa-ext-bufs" = callPackage @@ -217914,7 +215373,6 @@ self: { description = "Rasa Ext for useful buffer utilities"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rasa-ext-cmd" = callPackage @@ -217930,7 +215388,6 @@ self: { description = "Rasa Ext for running commands"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rasa-ext-cursors" = callPackage @@ -217947,7 +215404,6 @@ self: { description = "Rasa Ext adding cursor(s)"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rasa-ext-files" = callPackage @@ -217965,7 +215421,6 @@ self: { description = "Rasa Ext for filesystem actions"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rasa-ext-logger" = callPackage @@ -217978,7 +215433,6 @@ self: { description = "Rasa Ext for logging state/actions"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rasa-ext-slate" = callPackage @@ -217996,7 +215450,6 @@ self: { description = "Rasa extension for rendering to terminal with vty"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rasa-ext-status-bar" = callPackage @@ -218009,7 +215462,6 @@ self: { description = "Rasa Ext for populating status-bar"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rasa-ext-style" = callPackage @@ -218022,7 +215474,6 @@ self: { description = "Rasa Ext managing rendering styles"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rasa-ext-views" = callPackage @@ -218040,7 +215491,6 @@ self: { description = "Rasa Ext managing rendering views"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rasa-ext-vim" = callPackage @@ -218060,7 +215510,6 @@ self: { description = "Rasa Ext for vim bindings"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rascal" = callPackage @@ -218209,7 +215658,6 @@ self: { description = "Client for rating.chgk.info API and CSV tables (documentation in Russian)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rating-systems" = callPackage @@ -218293,8 +215741,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "11.1.0"; - sha256 = "1q915fq9bjwridd67rsmavxcbkgp3xxq9ps09z6mi62608c26987"; + version = "11.1.1"; + sha256 = "0cfxdi2h6aqa6zylg1hgn563fpi72zqfqzl9gsipm7jz1532j2a3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -218368,7 +215816,6 @@ self: { description = "Resource-Aware Feldspar"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "raw-strings-qq" = callPackage @@ -218411,7 +215858,6 @@ self: { description = "Anonymous extensible records"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rawstring-qm" = callPackage @@ -218461,7 +215907,6 @@ self: { description = "Common text/parsing tools for Razom language packages"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rbpcp-api" = callPackage @@ -218498,7 +215943,6 @@ self: { description = "Mask nucleotide (EST) sequences in Fasta format"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rbst" = callPackage @@ -218547,7 +215991,6 @@ self: { description = "Reservoir Computing, fast RNNs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rclient" = callPackage @@ -218659,7 +216102,6 @@ self: { description = "A Haskell wrapper for Rdio's API"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rdtsc" = callPackage @@ -218727,7 +216169,6 @@ self: { description = "Allow react-flux stores to send requests to a servant server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "react-haskell" = callPackage @@ -218835,7 +216276,6 @@ self: { description = "Programmatically edit MIDI events via ALSA and reactive-banana"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reactive-banana" = callPackage @@ -218877,7 +216317,6 @@ self: { description = "home (etc) automation using reactive-banana"; license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reactive-banana-bunch" = callPackage @@ -218894,7 +216333,6 @@ self: { description = "Extend reactive-banana to multiple events per time point"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reactive-banana-gi-gtk" = callPackage @@ -218912,7 +216350,6 @@ self: { description = "Simple reactive programming with GTK GObject Introspection"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reactive-banana-sdl" = callPackage @@ -218930,7 +216367,6 @@ self: { description = "Reactive Banana bindings for SDL"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reactive-banana-sdl2" = callPackage @@ -218944,7 +216380,6 @@ self: { description = "Reactive Banana integration with SDL2"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reactive-banana-threepenny" = callPackage @@ -218960,7 +216395,6 @@ self: { description = "Examples for the reactive-banana library, using threepenny-gui"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reactive-banana-wx" = callPackage @@ -218979,7 +216413,6 @@ self: { description = "Examples for the reactive-banana library, using wxHaskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reactive-fieldtrip" = callPackage @@ -218997,7 +216430,6 @@ self: { description = "Connect Reactive and FieldTrip"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reactive-glut" = callPackage @@ -219014,7 +216446,6 @@ self: { description = "Connects Reactive and GLUT"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reactive-haskell" = callPackage @@ -219058,7 +216489,6 @@ self: { description = "Process MIDI events via reactive-banana and JACK"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reactive-midyim" = callPackage @@ -219079,7 +216509,6 @@ self: { description = "Process MIDI events via reactive-banana"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reactive-thread" = callPackage @@ -219133,7 +216562,6 @@ self: { description = "Reactor - task parallel reactive programming"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "read-bounded" = callPackage @@ -219299,7 +216727,6 @@ self: { description = "Readline with variables (setX/getY) wrapped in state vars"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "readme-lhs" = callPackage @@ -219337,7 +216764,6 @@ self: { description = "Read and pretty print Python bytecode (.pyc) files."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "readshp" = callPackage @@ -219388,6 +216814,17 @@ self: { broken = true; }) {}; + "realworldhaskell" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "realworldhaskell"; + version = "0.0.1.0"; + sha256 = "0695y4af42vm50njpldx3i03ia4bws0lx3yhw6p2rv032jhmp5w6"; + libraryHaskellDepends = [ base ]; + description = "The Real World Haskell Book"; + license = lib.licenses.publicDomain; + }) {}; + "reanimate" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base , base64-bytestring, bytestring, cassava, cereal, colour @@ -219423,7 +216860,6 @@ self: { description = "Animation library based on SVGs"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reanimate-svg" = callPackage @@ -219612,7 +217048,6 @@ self: { description = "Instances of \"aeson\" classes for the \"record\" types"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "record-dot-preprocessor" = callPackage @@ -219672,7 +217107,6 @@ self: { description = "Utilities for working with OpenGL's GLSL shading language and Nikita Volkov's \"Record\"s"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "record-hasfield" = callPackage @@ -219705,7 +217139,6 @@ self: { description = "Compiler preprocessor introducing a syntactic extension for anonymous records"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "record-syntax" = callPackage @@ -219730,7 +217163,6 @@ self: { description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "record-wrangler" = callPackage @@ -219791,7 +217223,6 @@ self: { description = "Template Haskell declarations for the records package"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "recover-rtti" = callPackage @@ -219842,8 +217273,6 @@ self: { testHaskellDepends = [ base HUnit template-haskell transformers ]; description = "Representing common recursion patterns as higher-order functions"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "recursion-schemes-ext" = callPackage @@ -219863,8 +217292,6 @@ self: { ]; description = "Amateur addenda to recursion-schemes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "recursion-schemes-ix" = callPackage @@ -219986,7 +217413,6 @@ self: { description = "Library for interfacing with Reddit's API"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "redesigned-carnival" = callPackage @@ -220168,7 +217594,6 @@ self: { description = "Simplify a set of equations by removing redundancies"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reducers" = callPackage @@ -220274,17 +217699,6 @@ self: { }) {}; "ref-fd" = callPackage - ({ mkDerivation, base, stm, transformers }: - mkDerivation { - pname = "ref-fd"; - version = "0.4.0.2"; - sha256 = "1camr7cv1fglicyp2ivv7qv1yidj36zxcglfvmw7giqdj7r7j5w8"; - libraryHaskellDepends = [ base stm transformers ]; - description = "A type class for monads with references using functional dependencies"; - license = lib.licenses.bsd3; - }) {}; - - "ref-fd_0_5" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "ref-fd"; @@ -220293,7 +217707,6 @@ self: { libraryHaskellDepends = [ base stm transformers ]; description = "A type class for monads with references using functional dependencies"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ref-mtl" = callPackage @@ -220310,17 +217723,6 @@ self: { }) {}; "ref-tf" = callPackage - ({ mkDerivation, base, stm, transformers }: - mkDerivation { - pname = "ref-tf"; - version = "0.4.0.2"; - sha256 = "0pq9pm8jsx9w1q81pf5pvc361ad8dbyklw94jq47drr2i0dc7n20"; - libraryHaskellDepends = [ base stm transformers ]; - description = "A type class for monads with references using type families"; - license = lib.licenses.bsd3; - }) {}; - - "ref-tf_0_5" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "ref-tf"; @@ -220329,7 +217731,6 @@ self: { libraryHaskellDepends = [ base stm transformers ]; description = "A type class for monads with references using type families"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "refact" = callPackage @@ -220417,7 +217818,6 @@ self: { description = "A command-line tool for pasting to https://www.refheap.com"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "refined" = callPackage @@ -220579,7 +217979,6 @@ self: { description = "Continuous animations support for reflex"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reflex-backend-socket" = callPackage @@ -220606,7 +218005,6 @@ self: { description = "Reflex bindings for TCP sockets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reflex-backend-wai" = callPackage @@ -220628,7 +218026,6 @@ self: { description = "Reflex interface to `wai`"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reflex-basic-host" = callPackage @@ -220670,6 +218067,7 @@ self: { ]; description = "Functional Reactive Web Apps with Reflex"; license = lib.licenses.bsd3; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; maintainers = with lib.maintainers; [ maralorn ]; }) {}; @@ -220707,6 +218105,7 @@ self: { description = "A playground for experimenting with infrastructure and common code for reflex applications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "reflex-dom-core" = callPackage @@ -220766,7 +218165,7 @@ self: { executableHaskellDepends = [ base reflex-dom text ]; description = "A reflex-dom widget to draw on a canvas with a fragment shader program"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {}; "reflex-dom-helpers" = callPackage @@ -220784,6 +218183,7 @@ self: { description = "Html tag helpers for reflex-dom"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "reflex-dom-pandoc" = callPackage @@ -220943,7 +218343,6 @@ self: { description = "A GHCi widget library for use in reflex applications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reflex-gi-gtk" = callPackage @@ -221016,7 +218415,6 @@ self: { description = "A simple scene-graph using reflex and gloss"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reflex-jsx" = callPackage @@ -221034,6 +218432,7 @@ self: { description = "Use jsx-like syntax in Reflex"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "reflex-libtelnet" = callPackage @@ -221067,8 +218466,6 @@ self: { ]; description = "Localization library for reflex"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reflex-localize-dom" = callPackage @@ -221086,8 +218483,7 @@ self: { ]; description = "Helper widgets for reflex-localize"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {}; "reflex-monad-auth" = callPackage @@ -221147,7 +218543,6 @@ self: { description = "Reflex FRP interface for running system processes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reflex-sdl2" = callPackage @@ -221406,7 +218801,6 @@ self: { description = "Tools for maintaining a database"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reg-alloc" = callPackage @@ -221446,7 +218840,6 @@ self: { description = "Register allocation by graph colorization"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reg-alloc-types" = callPackage @@ -221566,7 +218959,6 @@ self: { description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Brzozowski's Deriviatives"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "regex-dfa" = callPackage @@ -221756,7 +219148,6 @@ self: { description = "Text-based PCRE API for regex-base"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "regex-pderiv" = callPackage @@ -221774,7 +219165,6 @@ self: { description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Antimirov's partial derivatives."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "regex-posix" = callPackage @@ -222010,8 +219400,6 @@ self: { ]; description = "Types that can only be constructed if they match a regular expression"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "regex-xmlschema" = callPackage @@ -222024,7 +219412,6 @@ self: { description = "A regular expression library for W3C XML Schema regular expressions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "regexchar" = callPackage @@ -222081,7 +219468,6 @@ self: { description = "Regular Expressions on Tries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "regexpr" = callPackage @@ -222137,7 +219523,6 @@ self: { description = "Regional memory pointers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "regions" = callPackage @@ -222171,7 +219556,6 @@ self: { description = "Monads-fd instances for the RegionT monad transformer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "regions-monadstf" = callPackage @@ -222188,7 +219572,6 @@ self: { description = "Monads-tf instances for the RegionT monad transformer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "regions-mtl" = callPackage @@ -222201,7 +219584,6 @@ self: { description = "mtl instances for the RegionT monad transformer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "register-machine-typelevel" = callPackage @@ -222270,7 +219652,6 @@ self: { description = "utilities to work with Hedgehog generators and `registry`"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "regress" = callPackage @@ -222324,7 +219705,6 @@ self: { description = "Additional functions for regular: arbitrary, coarbitrary, and binary get/put"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "regular-web" = callPackage @@ -222341,7 +219721,6 @@ self: { description = "Generic programming for the web"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "regular-xmlpickler" = callPackage @@ -222354,7 +219733,6 @@ self: { description = "Generic generation of HXT XmlPickler instances using Regular"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reheat" = callPackage @@ -222370,7 +219748,6 @@ self: { description = "to make notes and reduce impact on idle time on writing other programms"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rehoo" = callPackage @@ -222673,7 +220050,6 @@ self: { description = "Durations and generalized time parsing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "releaser" = callPackage @@ -222939,7 +220315,6 @@ self: { description = "Remote Monad implementation of the JSON RPC protocol"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "remote-json-client" = callPackage @@ -222958,7 +220333,6 @@ self: { description = "Web client wrapper for remote-json"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "remote-json-server" = callPackage @@ -222977,7 +220351,6 @@ self: { description = "Web server wrapper for remote-json"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "remote-monad" = callPackage @@ -223035,7 +220408,6 @@ self: { description = "A library for client-server applications based on custom protocols"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "render-utf8" = callPackage @@ -223051,8 +220423,6 @@ self: { ]; description = "Simple Utf8 wrapper for ByteString Builder with conversion classes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "renderable" = callPackage @@ -223156,7 +220526,6 @@ self: { description = "Bulk array representations and operators"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "repa-bytestring" = callPackage @@ -223187,7 +220556,6 @@ self: { description = "Packing and unpacking flat tables"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "repa-devil" = callPackage @@ -223236,7 +220604,6 @@ self: { description = "Examples using the Repa array library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "repa-fftw" = callPackage @@ -223276,7 +220643,6 @@ self: { description = "Data-parallel data flows"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "repa-io" = callPackage @@ -223324,7 +220690,6 @@ self: { description = "Data Flow Fusion GHC Plugin"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "repa-scalar" = callPackage @@ -223387,7 +220752,6 @@ self: { description = "Stream functions not present in the vector library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "repa-v4l2" = callPackage @@ -223408,7 +220772,6 @@ self: { description = "Provides high-level access to webcams"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "repl" = callPackage @@ -223523,7 +220886,6 @@ self: { description = "Initial project template from stack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "repline" = callPackage @@ -223586,7 +220948,6 @@ self: { description = "Render overloaded expressions to their textual representation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "repr-tree-syb" = callPackage @@ -223649,7 +221010,6 @@ self: { description = "Tries from representations of polynomial functors"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reprinter" = callPackage @@ -223667,8 +221027,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Scrap Your Reprinter"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reproject" = callPackage @@ -223714,6 +221072,7 @@ self: { doCheck = false; description = "Easy-to-use, type-safe, expandable, high-level HTTP client library"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "req-conduit" = callPackage @@ -223763,7 +221122,6 @@ self: { description = "Provides OAuth2 authentication for use with Req"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "req-url-extra" = callPackage @@ -223807,8 +221165,8 @@ self: { }: mkDerivation { pname = "request"; - version = "0.2.0.0"; - sha256 = "023bldkfjqbwmd6mh4vb2k7z5vi8lfkhf5an057h04dzhpgb3r9l"; + version = "0.2.1.0"; + sha256 = "1a2zx0gb03mv6g4sw0r6pxkvih8ca5w9w44k6d3n7b5b7s8yznhk"; libraryHaskellDepends = [ base bytestring case-insensitive http-client http-client-tls http-types @@ -223893,8 +221251,6 @@ self: { ]; description = "Regular-expressions extended with fixpoints for context-free powers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rerebase" = callPackage @@ -223973,8 +221329,6 @@ self: { ]; description = "More understandable exceptions"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reserve" = callPackage @@ -224040,7 +221394,6 @@ self: { description = "Compute total resistance of a cube of resistors"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "resolv_0_1_1_2" = callPackage @@ -224187,7 +221540,6 @@ self: { description = "Fork of resource-pool, with a MonadCatchIO constraint"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "resource-pool-monad" = callPackage @@ -224220,7 +221572,6 @@ self: { description = "Allocate resources which are guaranteed to be released"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "resourcet" = callPackage @@ -224277,7 +221628,6 @@ self: { description = "process and route HTTP requests and generate responses on top of WAI"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rest-client" = callPackage @@ -224300,7 +221650,6 @@ self: { description = "Utility library for use in generated API client libraries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rest-core" = callPackage @@ -224329,7 +221678,6 @@ self: { description = "Rest API library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rest-example" = callPackage @@ -224353,7 +221701,6 @@ self: { description = "Example project for rest"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rest-gen" = callPackage @@ -224382,7 +221729,6 @@ self: { description = "Documentation and client generation from rest definition"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rest-happstack" = callPackage @@ -224401,7 +221747,6 @@ self: { description = "Rest driver for Happstack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rest-snap" = callPackage @@ -224420,7 +221765,6 @@ self: { description = "Rest driver for Snap"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rest-stringmap" = callPackage @@ -224438,7 +221782,6 @@ self: { description = "Maps with stringy keys that can be transcoded to JSON and XML"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rest-types" = callPackage @@ -224459,7 +221802,6 @@ self: { description = "Silk Rest Framework Types"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rest-wai" = callPackage @@ -224480,7 +221822,6 @@ self: { description = "Rest driver for WAI applications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "restartable" = callPackage @@ -224514,7 +221855,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "restless-git" = callPackage @@ -224552,7 +221892,6 @@ self: { description = "Running worker processes under system resource restrictions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "restyle" = callPackage @@ -224664,7 +222003,6 @@ self: { description = "Useful tools for modeling data with rethinkdb"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rethinkdb-wereHamster" = callPackage @@ -224846,7 +222184,6 @@ self: { description = "open file and rewrite it with new contents"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rewrite-inspector" = callPackage @@ -224880,7 +222217,6 @@ self: { description = "Generic rewriting library for regular datatypes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rex" = callPackage @@ -224917,7 +222253,6 @@ self: { description = "Github resume generator"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rfc" = callPackage @@ -224952,7 +222287,6 @@ self: { description = "Robert Fischer's Common library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rfc-env" = callPackage @@ -224965,7 +222299,6 @@ self: { description = "Environment variable support from the Robert Fischer Commons"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rfc-http-client" = callPackage @@ -224984,7 +222317,6 @@ self: { description = "The HTTP client extensions from the Robert Fischer Commons"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rfc-prelude" = callPackage @@ -225027,7 +222359,6 @@ self: { description = "The PostgreSQL extensions from the Robert Fischer Commons"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rfc-redis" = callPackage @@ -225040,7 +222371,6 @@ self: { description = "The Redis extensions from the Robert Fischer Commons"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rfc-servant" = callPackage @@ -225063,7 +222393,6 @@ self: { description = "The Servant extensions from the Robert Fischer Commons"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rfc1413-server" = callPackage @@ -225147,8 +222476,6 @@ self: { ]; description = "A dynamic/unbounded alternative to Bounded Enum"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rgb-color-model" = callPackage @@ -225234,7 +222561,6 @@ self: { description = "Haskell rhythm game tutorial"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "riak" = callPackage @@ -225337,7 +222663,6 @@ self: { description = "Static site generator based on Shake"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rib-core" = callPackage @@ -225375,28 +222700,28 @@ self: { }) {}; "ribosome" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring - , cereal, cereal-conduit, chiasma, composition, composition-extra - , conduit, conduit-extra, containers, cornea, data-default, deepseq - , directory, either, exceptions, filepath, free, hslogger, lens - , lifted-async, lifted-base, messagepack, MissingH, monad-control - , monad-loops, mtl, nvim-hs, path, path-io, pretty-terminal - , prettyprinter, prettyprinter-ansi-terminal, process, relude - , resourcet, safe, split, stm, stm-chans, stm-conduit - , template-haskell, text, th-abstraction, time, transformers - , transformers-base, typed-process, unix, unliftio, unliftio-core - , utf8-string + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cereal + , cereal-conduit, chiasma, composition, composition-extra, conduit + , conduit-extra, containers, cornea, data-default, deepseq + , directory, either, exceptions, filepath, free, fuzzy, hourglass + , hslogger, lens, lifted-async, lifted-base, messagepack + , monad-control, monad-loops, mtl, nvim-hs, path, path-io + , pretty-terminal, prettyprinter, prettyprinter-ansi-terminal + , process, relude, resourcet, safe, split, stm, stm-chans + , stm-conduit, template-haskell, text, th-abstraction, time + , transformers, transformers-base, typed-process, unix, unliftio + , unliftio-core, utf8-string }: mkDerivation { pname = "ribosome"; - version = "0.3.0.1"; - sha256 = "1dka9hqh48nib7y0rz4bxr6d3iqavzw0163q64xwcjxaib293kks"; + version = "0.4.0.0"; + sha256 = "1h8x9gwm5g0jwf8zgpjb0wm76nj54x664l78v58n8cl5kwykr8ig"; libraryHaskellDepends = [ - aeson ansi-terminal base-noprelude bytestring cereal cereal-conduit - chiasma composition composition-extra conduit conduit-extra - containers cornea data-default deepseq directory either exceptions - filepath free hslogger lens lifted-async lifted-base messagepack - MissingH monad-control monad-loops mtl nvim-hs path path-io + aeson ansi-terminal base bytestring cereal cereal-conduit chiasma + composition composition-extra conduit conduit-extra containers + cornea data-default deepseq directory either exceptions filepath + free fuzzy hourglass hslogger lens lifted-async lifted-base + messagepack monad-control monad-loops mtl nvim-hs path path-io pretty-terminal prettyprinter prettyprinter-ansi-terminal process relude resourcet safe split stm stm-chans stm-conduit template-haskell text th-abstraction time transformers @@ -225404,8 +222729,9 @@ self: { utf8-string ]; description = "api extensions for nvim-hs"; - license = "unknown"; + license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ribosome-root" = callPackage @@ -225441,24 +222767,39 @@ self: { }) {}; "ribosome-test" = callPackage - ({ mkDerivation, base-noprelude, bytestring, chiasma, cornea - , data-default, directory, exceptions, filepath, free, hslogger - , HTF, lifted-base, messagepack, monad-control, mtl, nvim-hs - , process, relude, resourcet, ribosome, text, transformers - , typed-process, unix, unliftio, unliftio-core + ({ mkDerivation, aeson, base, bytestring, chiasma, composition + , composition-extra, conduit, containers, cornea, data-default + , directory, either, exceptions, filepath, free, hedgehog, hslogger + , lens, lifted-async, lifted-base, messagepack, monad-control, mtl + , nvim-hs, path, path-io, prettyprinter + , prettyprinter-ansi-terminal, process, relude, resourcet, ribosome + , tasty, tasty-hedgehog, template-haskell, text, transformers + , typed-process, unix, unliftio }: mkDerivation { pname = "ribosome-test"; - version = "0.3.0.1"; - sha256 = "18pmb6db23ak29y5vqzvblvq3yqpi2zn8qk0cp7825sbahqxn320"; + version = "0.4.0.0"; + sha256 = "1kjs1h4qvgal67xg177dfbc4zcinjsjvjvbkdv3zilxsc6scfq1n"; libraryHaskellDepends = [ - base-noprelude bytestring chiasma cornea data-default directory - exceptions filepath free hslogger HTF lifted-base messagepack - monad-control mtl nvim-hs process relude resourcet ribosome text - transformers typed-process unix unliftio unliftio-core + aeson base bytestring chiasma composition composition-extra conduit + containers cornea data-default directory either exceptions filepath + free hedgehog hslogger lens lifted-async lifted-base messagepack + monad-control mtl nvim-hs path path-io prettyprinter + prettyprinter-ansi-terminal process relude resourcet ribosome tasty + tasty-hedgehog template-haskell text transformers typed-process + unix unliftio + ]; + testHaskellDepends = [ + aeson base bytestring chiasma composition composition-extra conduit + containers cornea data-default directory either exceptions filepath + free hedgehog hslogger lens lifted-async lifted-base messagepack + monad-control mtl nvim-hs path path-io prettyprinter + prettyprinter-ansi-terminal process relude resourcet ribosome tasty + tasty-hedgehog template-haskell text transformers typed-process + unix unliftio ]; description = "test helpers for ribosome"; - license = "unknown"; + license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; }) {}; @@ -225519,7 +222860,6 @@ self: { description = "Handy metrics that don't belong to ridley"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "riemann" = callPackage @@ -225619,8 +222959,6 @@ self: { testHaskellDepends = [ base HUnit primitive QuickCheck ]; description = "mutable ring buffers with atomic updates in GHC Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rings" = callPackage @@ -225734,7 +223072,6 @@ self: { description = "A library for process pools coupled with asynchronous message queues"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "riot" = callPackage @@ -225755,7 +223092,6 @@ self: { description = "Riot is an Information Organisation Tool"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) ncurses;}; "ripple" = callPackage @@ -225814,7 +223150,6 @@ self: { description = "RISC-V"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "risc386" = callPackage @@ -225830,8 +223165,6 @@ self: { executableToolDepends = [ alex happy ]; description = "Reduced instruction set i386 simulator"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "riscv-isa" = callPackage @@ -225895,7 +223228,6 @@ self: { description = "A project management tool for Haskell applications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rivet-adaptor-postgresql" = callPackage @@ -226045,7 +223377,6 @@ self: { description = "Ring-LWE/LWR challenges using Lol"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rmonad" = callPackage @@ -226063,7 +223394,6 @@ self: { description = "Restricted monad library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rncryptor" = callPackage @@ -226093,7 +223423,6 @@ self: { description = "Haskell implementation of the RNCryptor file format"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rng-utils" = callPackage @@ -226133,7 +223462,6 @@ self: { description = "Simple projects generator"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "robin" = callPackage @@ -226245,7 +223573,6 @@ self: { description = "Gloss interactive demo for roc-cluster package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "roc-id" = callPackage @@ -226291,7 +223618,6 @@ self: { description = "A build system for incremental, parallel, and demand-driven computations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rocksdb-haskell" = callPackage @@ -226314,8 +223640,6 @@ self: { ]; description = "Haskell bindings to RocksDB"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) rocksdb;}; "rocksdb-haskell-jprupp" = callPackage @@ -226336,8 +223660,6 @@ self: { ]; description = "Haskell bindings for RocksDB"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) rocksdb;}; "rocksdb-query" = callPackage @@ -226357,8 +223679,6 @@ self: { ]; description = "RocksDB database querying library for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "roguestar" = callPackage @@ -226494,7 +223814,6 @@ self: { description = "Simple CLI tool to perform commons tasks such as tracking deploys"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rollbar-client" = callPackage @@ -226569,7 +223888,6 @@ self: { description = "Provides error reporting capabilities to WAI based applications through Rollbar API"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rollbar-yesod" = callPackage @@ -226592,7 +223910,6 @@ self: { description = "Provides error reporting capabilities to Yesod applications through Rollbar API"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "roller" = callPackage @@ -226711,7 +224028,6 @@ self: { description = "RON-Schema"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ron-storage" = callPackage @@ -226730,7 +224046,6 @@ self: { description = "RON Storage"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "roots" = callPackage @@ -226853,7 +224168,6 @@ self: { description = "Trees with polymorphic paths to nodes, combining properties of Rose Trees and Tries"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rosebud" = callPackage @@ -226915,7 +224229,6 @@ self: { description = "Haskell support for the ROS robotics framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rosmsg" = callPackage @@ -226953,7 +224266,6 @@ self: { description = "ROS message management tools"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rospkg" = callPackage @@ -227054,8 +224366,6 @@ self: { testHaskellDepends = [ base long-double ]; description = "Correctly-rounded arbitrary-precision floating-point arithmetic"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;}; "rounded-hw" = callPackage @@ -227081,7 +224391,6 @@ self: { description = "Directed rounding for built-in floating types"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rounding" = callPackage @@ -227165,7 +224474,6 @@ self: { description = "Bidirectional (de-)serialization for XML"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "route-generator" = callPackage @@ -227201,7 +224509,6 @@ self: { description = "A library and utilities for creating a route"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "row" = callPackage @@ -227275,6 +224582,34 @@ self: { broken = true; }) {}; + "rp-tree" = callPackage + ({ mkDerivation, base, boxes, bytestring, conduit, containers + , deepseq, exceptions, hspec, microlens, microlens-th, mtl + , QuickCheck, serialise, splitmix-distributions, transformers + , vector, vector-algorithms + }: + mkDerivation { + pname = "rp-tree"; + version = "0.1.0.0"; + sha256 = "02ws7i6qgixpfr0pw623sz99wr7q605n1hacpdw1il8h8fdzy0r5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base boxes bytestring conduit containers deepseq exceptions hspec + microlens microlens-th mtl serialise splitmix-distributions + transformers vector vector-algorithms + ]; + executableHaskellDepends = [ + base conduit containers exceptions splitmix-distributions + transformers vector + ]; + testHaskellDepends = [ + base hspec QuickCheck splitmix-distributions + ]; + description = "Random projection trees"; + license = lib.licenses.bsd3; + }) {}; + "rpc" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, derive , network-fancy, template-haskell, th-lift @@ -227290,7 +224625,6 @@ self: { description = "type safe rpcs provided as basic IO actions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rpc-framework" = callPackage @@ -227331,7 +224665,6 @@ self: { description = "Receiver Policy Framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rpm" = callPackage @@ -227410,7 +224743,6 @@ self: { description = "The RogueStar Animation and Graphics Library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rsagl-frp" = callPackage @@ -227427,7 +224759,6 @@ self: { description = "The RogueStar Animation and Graphics Library: Functional Reactive Programming"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rsagl-math" = callPackage @@ -227445,7 +224776,6 @@ self: { description = "The RogueStar Animation and Graphics Library: Mathematics"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rset" = callPackage @@ -227517,8 +224847,6 @@ self: { ]; description = "Streaming parser/renderer for the RSS standard"; license = lib.licenses.cc0; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rss2irc" = callPackage @@ -227586,7 +224914,6 @@ self: { description = "Haskell bindings for RTCM"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rtld" = callPackage @@ -227811,7 +225138,6 @@ self: { description = "Ruler tool for UHC"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ruler-core" = callPackage @@ -227830,7 +225156,6 @@ self: { ]; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "run-haskell-module" = callPackage @@ -227853,8 +225178,6 @@ self: { libraryHaskellDepends = [ base primitive primitive-unlifted ]; description = "runST without boxing penalty"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rungekutta" = callPackage @@ -227948,7 +225271,6 @@ self: { description = "Runtime generation of Arbitrary values"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rv" = callPackage @@ -227966,8 +225288,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "RISC-V"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rvar" = callPackage @@ -228076,7 +225396,6 @@ self: { description = "simple general-purpose s-expressions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "s3-signer" = callPackage @@ -228452,7 +225771,6 @@ self: { description = "Safe arithmetic operations"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "safe-plugins" = callPackage @@ -228645,7 +225963,6 @@ self: { description = "Type-safe file handling"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "safer-file-handles-bytestring" = callPackage @@ -228663,7 +225980,6 @@ self: { description = "Extends safer-file-handles with ByteString operations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "safer-file-handles-text" = callPackage @@ -228680,7 +225996,6 @@ self: { description = "Extends safer-file-handles with Text operations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "saferoute" = callPackage @@ -228710,7 +226025,6 @@ self: { description = "Obtain homogeneous values from arbitrary values, transforming or culling data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sajson" = callPackage @@ -228757,7 +226071,6 @@ self: { description = "Compression command-line tool"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sakuraio-platform" = callPackage @@ -228891,7 +226204,6 @@ self: { description = "Quickcheck implementations for some NaCl data"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) libsodium;}; "salve" = callPackage @@ -228925,7 +226237,6 @@ self: { description = "Modular web application framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "salvia-demo" = callPackage @@ -228949,7 +226260,6 @@ self: { description = "Demo Salvia servers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "salvia-extras" = callPackage @@ -228971,7 +226281,6 @@ self: { description = "Collection of non-fundamental handlers for the Salvia web server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "salvia-protocol" = callPackage @@ -229008,7 +226317,6 @@ self: { description = "Session support for the Salvia webserver"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "salvia-websocket" = callPackage @@ -229026,7 +226334,6 @@ self: { description = "Websocket implementation for the Salvia Webserver"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sample-frame" = callPackage @@ -229084,7 +226391,6 @@ self: { description = "Binding to the C samtools library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) zlib;}; "samtools-conduit" = callPackage @@ -229106,7 +226412,6 @@ self: { description = "Conduit interface to SAM/BAM format files through samtools"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "samtools-enumerator" = callPackage @@ -229123,7 +226428,6 @@ self: { description = "Enumerator interface to SamTools library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "samtools-iteratee" = callPackage @@ -229141,7 +226445,6 @@ self: { description = "Iteratee interface to SamTools library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sandi" = callPackage @@ -229197,49 +226500,6 @@ self: { }) {}; "sandwich" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, base, brick - , bytestring, colour, containers, directory, exceptions, filepath - , free, haskell-src-exts, lens, lifted-async, microlens - , microlens-th, monad-control, monad-logger, mtl - , optparse-applicative, pretty-show, process, safe, safe-exceptions - , stm, string-interpolate, template-haskell, text, time - , transformers, transformers-base, unix, unliftio-core, vector, vty - }: - mkDerivation { - pname = "sandwich"; - version = "0.1.0.3"; - sha256 = "1gd8k4dx25bgqrw16dwvq9lnk7gpvpci01kvnn3s08ylkiq2qax9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lens - lifted-async microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - executableHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lens - lifted-async microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - testHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lens - lifted-async microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - description = "Yet another test framework for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "sandwich_0_1_0_5" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, brick , bytestring, colour, containers, directory, exceptions, filepath , free, haskell-src-exts, lens, lifted-async, microlens @@ -229280,66 +226540,29 @@ self: { ]; description = "Yet another test framework for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sandwich-quickcheck" = callPackage - ({ mkDerivation, base, free, monad-control, QuickCheck - , safe-exceptions, sandwich, string-interpolate, time + ({ mkDerivation, base, brick, free, monad-control, QuickCheck + , safe-exceptions, sandwich, string-interpolate, text, time }: mkDerivation { pname = "sandwich-quickcheck"; - version = "0.1.0.4"; - sha256 = "0sljlpnhv5wpda1w9nh5da2psmg9snias8k9dr62y9khymn3aya7"; - isLibrary = true; - isExecutable = true; + version = "0.1.0.5"; + sha256 = "03z8g5q3yxfpazbwi56ji9554z3l2ac776mzz06xsb7cha3kf7lw"; libraryHaskellDepends = [ - base free monad-control QuickCheck safe-exceptions sandwich - string-interpolate time - ]; - executableHaskellDepends = [ - base free monad-control QuickCheck safe-exceptions sandwich - string-interpolate time + base brick free monad-control QuickCheck safe-exceptions sandwich + string-interpolate text time ]; testHaskellDepends = [ - base free monad-control QuickCheck safe-exceptions sandwich - string-interpolate time + base brick free monad-control QuickCheck safe-exceptions sandwich + string-interpolate text time ]; description = "Sandwich integration with QuickCheck"; license = lib.licenses.bsd3; }) {}; "sandwich-slack" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, lens - , lens-aeson, monad-logger, mtl, safe, safe-exceptions, sandwich - , stm, string-interpolate, text, time, vector, wreq - }: - mkDerivation { - pname = "sandwich-slack"; - version = "0.1.0.3"; - sha256 = "1g8ymxy4q08jxlfbd7ar6n30wm1mcm942vr5627bpx63m83yld1y"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers lens lens-aeson monad-logger mtl - safe safe-exceptions sandwich stm string-interpolate text time - vector wreq - ]; - executableHaskellDepends = [ - aeson base bytestring containers lens lens-aeson monad-logger mtl - safe safe-exceptions sandwich stm string-interpolate text time - vector wreq - ]; - testHaskellDepends = [ - aeson base bytestring containers lens lens-aeson monad-logger mtl - safe safe-exceptions sandwich stm string-interpolate text time - vector wreq - ]; - description = "Sandwich integration with Slack"; - license = lib.licenses.bsd3; - }) {}; - - "sandwich-slack_0_1_0_4" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, lens , lens-aeson, monad-logger, mtl, safe, safe-exceptions, sandwich , stm, string-interpolate, text, time, vector, wreq @@ -229367,7 +226590,6 @@ self: { ]; description = "Sandwich integration with Slack"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sandwich-webdriver" = callPackage @@ -229453,7 +226675,6 @@ self: { description = "A universal quickfix toolkit and his protocol"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sasl" = callPackage @@ -229471,7 +226692,6 @@ self: { description = "SASL implementation using simple-pipe"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sat" = callPackage @@ -229505,7 +226725,6 @@ self: { description = "A minimal SAT solver"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "satchmo" = callPackage @@ -229542,7 +226761,6 @@ self: { description = "driver for external satchmo backends"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "satchmo-examples" = callPackage @@ -229561,7 +226779,6 @@ self: { description = "examples that show how to use satchmo"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "satchmo-funsat" = callPackage @@ -229578,7 +226795,6 @@ self: { description = "funsat driver as backend for satchmo"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "satchmo-minisat" = callPackage @@ -229591,7 +226807,6 @@ self: { description = "minisat driver as backend for satchmo"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "satchmo-toysat" = callPackage @@ -229608,7 +226823,6 @@ self: { description = "toysat driver as backend for satchmo"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "savage" = callPackage @@ -229728,6 +226942,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "sbv_7_13" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , crackNum, deepseq, directory, doctest, filepath, generic-deriving + , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , template-haskell, time, z3 + }: + mkDerivation { + pname = "sbv"; + version = "7.13"; + sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array async base containers crackNum deepseq directory filepath + generic-deriving ghc mtl pretty process QuickCheck random syb + template-haskell time + ]; + testHaskellDepends = [ + base bytestring containers crackNum directory doctest filepath Glob + hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit + tasty-quickcheck template-haskell + ]; + testSystemDepends = [ z3 ]; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = lib.licenses.bsd3; + platforms = [ + "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux" + ]; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) z3;}; + "sbv" = callPackage ({ mkDerivation, array, async, base, bench-show, bytestring , containers, deepseq, directory, doctest, filepath, gauge, Glob @@ -229757,6 +227002,9 @@ self: { ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = lib.licenses.bsd3; + platforms = [ + "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux" + ]; }) {inherit (pkgs) z3;}; "sbvPlugin" = callPackage @@ -229798,7 +227046,6 @@ self: { description = "Low-level Starcraft II API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sc2-proto" = callPackage @@ -229837,7 +227084,6 @@ self: { description = "Support and utility library for sc2hs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sc2hs" = callPackage @@ -229879,7 +227125,6 @@ self: { description = "Haskell bindings to sc3-rdu (sc3 rd ugens)"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scalable-server" = callPackage @@ -229898,7 +227143,6 @@ self: { description = "Library for writing fast/scalable TCP-based services"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scaleimage" = callPackage @@ -229959,7 +227203,6 @@ self: { description = "Test webhooks locally"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scalpel" = callPackage @@ -230012,7 +227255,6 @@ self: { description = "scalpel scrapers for search engines"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scan" = callPackage @@ -230045,8 +227287,6 @@ self: { ]; description = "Metadata types for Albedo Scanners"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scan-vector-machine" = callPackage @@ -230060,7 +227300,6 @@ self: { description = "An implementation of the Scan Vector Machine instruction set in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scanf" = callPackage @@ -230127,6 +227366,7 @@ self: { ]; description = "Generates unique passwords for various websites from a single password"; license = lib.licenses.bsd3; + platforms = [ "i686-linux" "x86_64-darwin" "x86_64-linux" ]; }) {}; "scc" = callPackage @@ -230306,7 +227546,6 @@ self: { description = "Encoding-independent schemas for Haskell data types"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "schemas" = callPackage @@ -230362,7 +227601,6 @@ self: { description = "JSON-biased spec and validation tool"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scholdoc" = callPackage @@ -230408,7 +227646,6 @@ self: { description = "Converts ScholarlyMarkdown documents to HTML5/LaTeX/Docx format"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scholdoc-citeproc" = callPackage @@ -230443,7 +227680,6 @@ self: { description = "Scholdoc fork of pandoc-citeproc"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scholdoc-texmath" = callPackage @@ -230467,7 +227703,6 @@ self: { description = "Scholdoc fork of texmath"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scholdoc-types" = callPackage @@ -230619,7 +227854,6 @@ self: { description = "Scientific notation intended for tokenization"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scion" = callPackage @@ -230646,7 +227880,6 @@ self: { description = "Haskell IDE library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scion-browser" = callPackage @@ -230682,7 +227915,6 @@ self: { description = "Command-line interface for browsing and searching packages documentation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scons2dot" = callPackage @@ -230716,7 +227948,6 @@ self: { description = "An interactive renderer for plotting time-series data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scope-cairo" = callPackage @@ -230741,7 +227972,6 @@ self: { description = "An interactive renderer for plotting time-series data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scottish" = callPackage @@ -230922,7 +228152,6 @@ self: { description = "Easy Mustache templating support for Scotty"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scotty-haxl" = callPackage @@ -231098,7 +228327,6 @@ self: { description = "An SCP protocol implementation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scrabble-bot" = callPackage @@ -231119,7 +228347,6 @@ self: { description = "Scrabble play generation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scrapbook" = callPackage @@ -231144,7 +228371,6 @@ self: { description = "collect posts of site that is wrote in config yaml using feed or scraping"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "scrapbook-core" = callPackage @@ -231300,6 +228526,7 @@ self: { ]; description = "Stronger password hashing via sequential memory-hard functions"; license = lib.licenses.bsd3; + platforms = [ "i686-linux" "x86_64-darwin" "x86_64-linux" ]; }) {}; "scrz" = callPackage @@ -231400,7 +228627,6 @@ self: { description = "Distributed SDE solver"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sdf2p1-parser" = callPackage @@ -231872,7 +229098,6 @@ self: { description = "PostgreSQL backend for Seakale"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "seakale-tests" = callPackage @@ -231889,7 +229114,6 @@ self: { description = "Helpers to test code using Seakale"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "seal-module" = callPackage @@ -232150,7 +229374,6 @@ self: { description = "Example of writing \"secure\" file removal in Haskell rather than C"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "secure-sockets" = callPackage @@ -232211,7 +229434,6 @@ self: { description = "Sedna C API XML Binding"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {sedna = null;}; "seitz-symbol" = callPackage @@ -232232,7 +229454,6 @@ self: { description = "Read and Display Seitz Symbol"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "selda" = callPackage @@ -232390,7 +229611,6 @@ self: { description = "Run the selenium standalone server for usage with webdriver"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "self-extract" = callPackage @@ -232411,7 +229631,6 @@ self: { description = "A Haskell library to make self-extracting executables"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "selfrestart" = callPackage @@ -232519,7 +229738,6 @@ self: { description = "Weakened partial isomorphisms, reversible computations"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "semialign" = callPackage @@ -232759,7 +229977,6 @@ self: { description = "Semirings, ring-like structures used for dynamic programming applications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "semiring-num" = callPackage @@ -232786,7 +230003,6 @@ self: { description = "Basic semiring class and instances"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "semiring-simple" = callPackage @@ -232944,7 +230160,6 @@ self: { description = "Distributed sensor network for the raspberry pi"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sensu-run" = callPackage @@ -232982,7 +230197,6 @@ self: { description = "Easily generating message of japanese natural language"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sentiwordnet-parser" = callPackage @@ -233069,7 +230283,6 @@ self: { description = "SmartyPants for Korean language"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "separated" = callPackage @@ -233117,7 +230330,6 @@ self: { description = "Dynamic strictness control, including space leak repair"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "seqalign" = callPackage @@ -233172,7 +230384,6 @@ self: { description = "Handle sequence locations for bioinformatics"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "seqloc-datafiles" = callPackage @@ -233207,7 +230418,6 @@ self: { description = "Read and write BED and GTF format genome annotations"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sequence" = callPackage @@ -233323,7 +230533,6 @@ self: { description = "A sequence labeler based on Collins's sequence perceptron"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "serf" = callPackage @@ -233505,7 +230714,6 @@ self: { description = "Simple project template from stack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "serv" = callPackage @@ -233520,7 +230728,6 @@ self: { description = "Dependently typed API framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "serv-wai" = callPackage @@ -233546,7 +230753,6 @@ self: { description = "Dependently typed API servers with Serv"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant" = callPackage @@ -233719,8 +230925,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "servant-docs/servant-auth compatibility"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-auth-hmac" = callPackage @@ -233826,7 +231030,6 @@ self: { description = "Servant based API and server for token based authorisation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-auth-token-acid" = callPackage @@ -233849,7 +231052,6 @@ self: { description = "Acid-state backend for servant-auth-token server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-auth-token-api" = callPackage @@ -233890,7 +231092,6 @@ self: { description = "Leveldb backend for servant-auth-token server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-auth-token-persistent" = callPackage @@ -233911,7 +231112,6 @@ self: { description = "Persistent backend for servant-auth-token server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-auth-token-rocksdb" = callPackage @@ -233935,7 +231135,6 @@ self: { description = "RocksDB backend for servant-auth-token server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-auth-wordpress" = callPackage @@ -233952,7 +231151,6 @@ self: { description = "Authenticate Routes Using Wordpress Cookies"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-avro" = callPackage @@ -233977,24 +231175,22 @@ self: { "servant-benchmark" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, hspec, http-media, http-types, QuickCheck - , servant, text, yaml + , servant, text, utf8-string, yaml }: mkDerivation { pname = "servant-benchmark"; - version = "0.1.1.1"; - sha256 = "1rsj819kg17p31ky5ad28hydrkh39nsfwkq3f9zdkqm2j924idhx"; + version = "0.1.2.0"; + sha256 = "0lqqk410nx48g895pfxkbbk85b1ijs4bfl9zr2li2p7wwwc4gyi9"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive http-media http-types QuickCheck servant text yaml ]; testHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive hspec - http-media http-types QuickCheck servant text yaml + http-media http-types QuickCheck servant text utf8-string yaml ]; description = "Generate benchmark files from a Servant API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-blaze" = callPackage @@ -234028,8 +231224,6 @@ self: { ]; description = "Servant CSV content-type for cassava"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-checked-exceptions" = callPackage @@ -234054,8 +231248,6 @@ self: { ]; description = "Checked exceptions for Servant APIs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-checked-exceptions-core" = callPackage @@ -234077,8 +231269,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Checked exceptions for Servant APIs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-cli" = callPackage @@ -234107,7 +231297,6 @@ self: { description = "Command line interface for Servant API clients"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-client" = callPackage @@ -234204,7 +231393,6 @@ self: { description = "Automatically derive API client functions with named and optional parameters"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-conduit" = callPackage @@ -234245,7 +231433,6 @@ self: { description = "Generate servant client library for C#"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-db" = callPackage @@ -234285,7 +231472,6 @@ self: { description = "Derive a postgres client to database API specified by servant-db"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-dhall" = callPackage @@ -234385,7 +231571,6 @@ self: { description = "Combinators for rendering EDE templates in servant web applications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-ekg" = callPackage @@ -234482,7 +231667,6 @@ self: { description = "Servant support for Server-Sent events"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-examples" = callPackage @@ -234506,7 +231690,6 @@ self: { description = "Example programs for servant"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-exceptions" = callPackage @@ -234777,7 +231960,6 @@ self: { description = "Generate HTTP2 clients from Servant API descriptions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-iCalendar" = callPackage @@ -234794,8 +231976,6 @@ self: { ]; description = "Servant support for iCalendar"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-jquery" = callPackage @@ -234978,7 +232158,6 @@ self: { description = "Matrix parameter combinator for servant"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-mock" = callPackage @@ -235041,8 +232220,6 @@ self: { ]; description = "multipart/form-data (e.g file upload) support for servant"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-named" = callPackage @@ -235227,7 +232404,6 @@ self: { description = "Utilities for using servant in a polysemy stack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-pool" = callPackage @@ -235260,7 +232436,6 @@ self: { description = "Useful functions and instances for using servant with a PostgreSQL context"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-proto-lens" = callPackage @@ -235406,8 +232581,6 @@ self: { libraryHaskellDepends = [ base servant-client-core servant-rawm ]; description = "The client implementation of servant-rawm"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-rawm-docs" = callPackage @@ -235423,8 +232596,6 @@ self: { ]; description = "Documentation generator for 'RawM' endpoints"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-rawm-server" = callPackage @@ -235598,8 +232769,6 @@ self: { doHaddock = false; description = "Generates a servant API module"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-server" = callPackage @@ -235653,7 +232822,6 @@ self: { description = "Automatically derive API server functions with named and optional parameters"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-smsc-ru" = callPackage @@ -235716,7 +232884,6 @@ self: { description = "A family of combinators for defining webservices APIs and serving them"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-stache" = callPackage @@ -235809,7 +232976,6 @@ self: { description = "Client instances for the 'servant-streaming' package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-streaming-docs" = callPackage @@ -235828,7 +232994,6 @@ self: { description = "Client instances for the 'servant-docs' package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-streaming-server" = callPackage @@ -235856,7 +233021,6 @@ self: { description = "Server instances for the 'servant-streaming' package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-subscriber" = callPackage @@ -235928,7 +233092,6 @@ self: { description = "Swagger Tags for Servant"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-swagger-ui" = callPackage @@ -236092,7 +233255,6 @@ self: { description = "Servant Integration for Waargonaut JSON Package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-wasm" = callPackage @@ -236208,7 +233370,6 @@ self: { description = "Client library for servant-zeppelin combinators"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-zeppelin-server" = callPackage @@ -236233,7 +233394,6 @@ self: { description = "Server library for servant-zeppelin combinators"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-zeppelin-swagger" = callPackage @@ -236256,7 +233416,6 @@ self: { description = "Swagger instances for servant-zeppelin combinators"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "server-generic" = callPackage @@ -236273,6 +233432,7 @@ self: { description = "Auto-generate a server for your datatype"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; broken = true; }) {}; @@ -236325,8 +233485,6 @@ self: { ]; description = "Secure, modular server-side sessions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "serversession-backend-acid-state" = callPackage @@ -236347,8 +233505,6 @@ self: { ]; description = "Storage backend for serversession using acid-state"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "serversession-backend-persistent" = callPackage @@ -236417,8 +233573,6 @@ self: { ]; description = "Snap bindings for serversession"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "serversession-frontend-wai" = callPackage @@ -236436,8 +233590,6 @@ self: { ]; description = "wai-session bindings for serversession"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "serversession-frontend-yesod" = callPackage @@ -236606,7 +233758,6 @@ self: { description = "Session types distributed"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "set-cover" = callPackage @@ -236709,7 +233860,6 @@ self: { description = "Treating files as sets to perform rapid set manipulation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "setenv" = callPackage @@ -236917,8 +234067,6 @@ self: { ]; description = "Invertible grammar combinators for S-expressions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sexp-show" = callPackage @@ -237100,7 +234248,6 @@ self: { description = "SGF (Smart Game Format) parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sgrep" = callPackage @@ -237115,7 +234262,6 @@ self: { description = "Sgrep - grep Fasta files for sequences matching a regular expression"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sh2md" = callPackage @@ -237177,7 +234323,6 @@ self: { description = "SHA-1 Hash"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "shade" = callPackage @@ -237562,7 +234707,6 @@ self: { description = "Shake rules for CSS"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "shake-pack" = callPackage @@ -237714,7 +234858,6 @@ self: { description = "simple and interactive command-line build tool"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "shakers" = callPackage @@ -237882,7 +235025,6 @@ self: { description = "Parser and related tools for ESRI shapefile format"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "shapely-data" = callPackage @@ -237902,7 +235044,6 @@ self: { description = "Generics using @(,)@ and @Either@, with algebraic operations and typed conversions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "shapes" = callPackage @@ -238089,7 +235230,6 @@ self: { description = "Test webhooks locally"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "shell-conduit" = callPackage @@ -238218,7 +235358,6 @@ self: { description = "Extra functionality for shellmate"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "shellmet" = callPackage @@ -238583,8 +235722,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Link shortcuts for use in text markup"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "shorten-strings" = callPackage @@ -238700,7 +235837,6 @@ self: { description = "A simple gtk based Russian Roulette game"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "shower" = callPackage @@ -238743,7 +235879,6 @@ self: { description = "Web automation library in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "shplit" = callPackage @@ -238794,7 +235929,6 @@ self: { description = "Shuffle tool for UHC"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "shunya-library" = callPackage @@ -238851,7 +235985,6 @@ self: { description = "An interface to the Silicon Labs Si5351 clock chip"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sibe" = callPackage @@ -238878,7 +236011,6 @@ self: { description = "Machine Learning algorithms"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sieve" = callPackage @@ -238976,7 +236108,6 @@ self: { description = "Thom polynomials of second order Thom-Boardman singularities"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sign" = callPackage @@ -238999,8 +236130,6 @@ self: { ]; description = "Arithmetic over signs and sets of signs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "signable" = callPackage @@ -239030,7 +236159,6 @@ self: { description = "Deterministic serialisation and signatures with proto-lens support"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "signable-haskell-protoc" = callPackage @@ -239081,7 +236209,6 @@ self: { description = "Synchronous signal processing for DSLs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "signature" = callPackage @@ -239100,7 +236227,6 @@ self: { description = "Hmac sha256 signature json and http payload"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "signed-multiset" = callPackage @@ -239138,7 +236264,6 @@ self: { description = "A Haskell clone of OpenBSD signify"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "silently" = callPackage @@ -239162,8 +236287,6 @@ self: { libraryHaskellDepends = [ base prettyprinter ]; description = "Prettyprinting transformers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "silvi" = callPackage @@ -239182,7 +236305,6 @@ self: { description = "A generator for different kinds of data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "simd" = callPackage @@ -239214,7 +236336,6 @@ self: { description = "stochastic simulation engine"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "simple" = callPackage @@ -239332,7 +236453,6 @@ self: { description = "A simple C value type"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "simple-cabal" = callPackage @@ -239517,7 +236637,6 @@ self: { description = "Simplified interface for firewire cameras"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "simple-form" = callPackage @@ -239736,7 +236855,6 @@ self: { description = "Simple parsing/pretty printing for Nix expressions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "simple-observer" = callPackage @@ -239787,7 +236905,6 @@ self: { description = "Simplified Pascal language to SSVM compiler"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "simple-pipe" = callPackage @@ -240165,7 +237282,6 @@ self: { description = "Lenses for simpleirc types"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "simplelru" = callPackage @@ -240314,6 +237430,50 @@ self: { license = lib.licenses.bsd3; }) {}; + "simplexmq" = callPackage + ({ mkDerivation, ansi-terminal, asn1-encoding, asn1-types, async + , attoparsec, base, base64-bytestring, bytestring, containers + , cryptonite, cryptostore, directory, filepath, generic-random + , hspec, hspec-core, HUnit, ini, iso8601-time, memory, mtl, network + , network-transport, optparse-applicative, QuickCheck, random + , simple-logger, sqlite-simple, stm, template-haskell, text, time + , timeit, transformers, unliftio, unliftio-core, x509 + }: + mkDerivation { + pname = "simplexmq"; + version = "0.3.1"; + sha256 = "0rc443nq4m1ghi5wbsaj6ravqs488lb2si0xmisg9h5ghsh204bf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal asn1-encoding asn1-types async attoparsec base + base64-bytestring bytestring containers cryptonite directory + filepath generic-random iso8601-time memory mtl network + network-transport QuickCheck random simple-logger sqlite-simple stm + template-haskell text time transformers unliftio unliftio-core x509 + ]; + executableHaskellDepends = [ + ansi-terminal asn1-encoding asn1-types async attoparsec base + base64-bytestring bytestring containers cryptonite cryptostore + directory filepath generic-random ini iso8601-time memory mtl + network network-transport optparse-applicative QuickCheck random + simple-logger sqlite-simple stm template-haskell text time + transformers unliftio unliftio-core x509 + ]; + testHaskellDepends = [ + ansi-terminal asn1-encoding asn1-types async attoparsec base + base64-bytestring bytestring containers cryptonite directory + filepath generic-random hspec hspec-core HUnit iso8601-time memory + mtl network network-transport QuickCheck random simple-logger + sqlite-simple stm template-haskell text time timeit transformers + unliftio unliftio-core x509 + ]; + description = "SimpleXMQ message broker"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "simplistic-generics" = callPackage ({ mkDerivation, base, containers, deepseq, kind-apply, mtl , template-haskell @@ -240342,7 +237502,6 @@ self: { description = "Simulate sequencing with different models for priming and errors"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "simtreelo" = callPackage @@ -240554,7 +237713,6 @@ self: { description = "A promoted and singled version of the base library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "singletons-presburger" = callPackage @@ -240685,7 +237843,6 @@ self: { description = "Encode and decode CSV files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "siren-json" = callPackage @@ -240711,7 +237868,6 @@ self: { description = "Siren Tools for Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sirkel" = callPackage @@ -240729,7 +237885,6 @@ self: { description = "Sirkel, a Chord DHT"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sitemap" = callPackage @@ -241036,7 +238191,6 @@ self: { description = "a tool to access the OSX keychain"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "skeletons" = callPackage @@ -241056,7 +238210,6 @@ self: { description = "Manage project skeletons"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "skell" = callPackage @@ -241175,7 +238328,6 @@ self: { description = "Skylark client"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "skylighting" = callPackage @@ -241442,8 +238594,6 @@ self: { ]; description = "Bindings for the Slack web API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "slate" = callPackage @@ -241586,7 +238736,6 @@ self: { description = "ws convert markdown to reveal-js"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "slim" = callPackage @@ -241625,7 +238774,6 @@ self: { description = "SLIP-0032: Extended serialization format for BIP-32 wallets"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "slist" = callPackage @@ -241788,8 +238936,6 @@ self: { executableHaskellDepends = [ base ]; description = "Handle molecular sequences"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "small-bytearray-builder" = callPackage @@ -241803,7 +238949,6 @@ self: { description = "Serialize to bytes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "smallarray" = callPackage @@ -241949,7 +239094,6 @@ self: { description = "A Unicode text type, optimized for low memory overhead"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "smaoin" = callPackage @@ -242090,7 +239234,6 @@ self: { description = "Web based flash card for Word Smart I and II vocabularies"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "smash" = callPackage @@ -242198,7 +239341,6 @@ self: { description = "Symbolic Model Checking for Dynamic Epistemic Logic"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sme" = callPackage @@ -242257,7 +239399,6 @@ self: { description = "Parse arrays of tokens"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "smith-cli" = callPackage @@ -242282,7 +239423,6 @@ self: { description = "Command line tool for ."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "smith-client" = callPackage @@ -242307,7 +239447,6 @@ self: { description = "API client for ."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "smoothie" = callPackage @@ -242426,7 +239565,6 @@ self: { description = "Dump the communication with an SMT solver for debugging purposes"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "smtlib2-pipe" = callPackage @@ -242449,7 +239587,6 @@ self: { description = "A type-safe interface to communicate with an SMT solver"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "smtlib2-quickcheck" = callPackage @@ -242466,7 +239603,6 @@ self: { description = "Helper functions to create SMTLib expressions in QuickCheck"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "smtlib2-timing" = callPackage @@ -242479,7 +239615,6 @@ self: { description = "Get timing informations for SMT queries"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "smtp-mail" = callPackage @@ -242664,6 +239799,7 @@ self: { ]; description = "Top-level package for the Snap Web Framework"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "snap-accept" = callPackage @@ -242713,7 +239849,6 @@ self: { description = "Command-line tool to manage Snap AuthManager database"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snap-blaze" = callPackage @@ -242818,7 +239953,6 @@ self: { description = "Serve Elm files through the Snap web framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snap-error-collector" = callPackage @@ -242869,7 +240003,6 @@ self: { description = "A collection of useful helpers and utilities for Snap web applications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snap-language" = callPackage @@ -243080,7 +240213,6 @@ self: { description = "Snap Framework utilities"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snap-web-routes" = callPackage @@ -243138,7 +240270,6 @@ self: { description = "Generic action log snaplet for the Snap Framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-amqp" = callPackage @@ -243179,7 +240310,6 @@ self: { description = "Provides an Acid-State backend for the Auth Snaplet"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-coffee" = callPackage @@ -243198,7 +240328,6 @@ self: { description = "CoffeeScript for Snap, auto-compilation and pre-compilation"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-css-min" = callPackage @@ -243315,7 +240444,6 @@ self: { description = "A Hasql snaplet"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-haxl" = callPackage @@ -243332,7 +240460,6 @@ self: { description = "Snaplet for Facebook's Haxl"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-hdbc" = callPackage @@ -243354,7 +240481,6 @@ self: { description = "HDBC snaplet for Snap Framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-hslogger" = callPackage @@ -243433,7 +240559,6 @@ self: { description = "Lexical Style Sheets - Snap Web Framework adaptor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-mandrill" = callPackage @@ -243451,7 +240576,6 @@ self: { description = "Snap framework snaplet for the Mandrill API library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-mongoDB" = callPackage @@ -243472,7 +240596,6 @@ self: { description = "Snap Framework MongoDB support as Snaplet"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-mongodb-minimalistic" = callPackage @@ -243510,7 +240633,6 @@ self: { description = "mysql-simple snaplet for the Snap Framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-oauth" = callPackage @@ -243537,7 +240659,6 @@ self: { description = "snaplet-oauth"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-persistent" = callPackage @@ -243605,7 +240726,6 @@ self: { description = "Postmark snaplet for the Snap Framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-purescript" = callPackage @@ -243622,8 +240742,6 @@ self: { ]; description = "Automatic (re)compilation of purescript projects"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-recaptcha" = callPackage @@ -243642,7 +240760,6 @@ self: { description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-redis" = callPackage @@ -243662,8 +240779,6 @@ self: { ]; description = "Redis support for Snap Framework"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-redson" = callPackage @@ -243684,7 +240799,6 @@ self: { description = "CRUD for JSON data with Redis storage"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-rest" = callPackage @@ -243703,7 +240817,6 @@ self: { description = "REST resources for the Snap web framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-riak" = callPackage @@ -243722,7 +240835,6 @@ self: { description = "A Snaplet for the Riak database"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-sass" = callPackage @@ -243777,7 +240889,6 @@ self: { description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc."; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-ses-html" = callPackage @@ -243848,7 +240959,6 @@ self: { description = "Snaplet for JWT authentication with snaplet-sqlite-simple"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-stripe" = callPackage @@ -243868,7 +240978,6 @@ self: { description = "Stripe snaplet for the Snap Framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-tasks" = callPackage @@ -243886,7 +240995,6 @@ self: { description = "Snaplet for Snap Framework enabling developers to administrative tasks akin to Rake tasks from Ruby On Rails framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-typed-sessions" = callPackage @@ -243933,7 +241041,6 @@ self: { description = "A snaplet that communicates with wordpress over its api"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snappy" = callPackage @@ -243988,7 +241095,6 @@ self: { description = "An enumeratee that uses Google's snappy compression library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snappy-lazy" = callPackage @@ -244022,7 +241128,6 @@ self: { description = "Audio file reading/writing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sneakyterm" = callPackage @@ -244100,7 +241205,6 @@ self: { description = "The Simple Nice-Looking Manual Generator"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snmp" = callPackage @@ -244120,7 +241224,6 @@ self: { description = "SNMP protocol library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snorkels" = callPackage @@ -244158,7 +241261,6 @@ self: { description = "encode any binary instance to white space"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snowball" = callPackage @@ -244207,7 +241309,6 @@ self: { description = "twitter's snowflake"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snowflake-server" = callPackage @@ -244227,7 +241328,6 @@ self: { description = "snowflake http server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snowglobe" = callPackage @@ -244410,8 +241510,6 @@ self: { transformers unordered-containers vector ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "socket-sctp" = callPackage @@ -244534,22 +241632,19 @@ self: { description = "High-level network sockets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sockets-and-pipes" = callPackage ({ mkDerivation, aeson, ascii, async, base, blaze-html, bytestring - , containers, network, safe-exceptions, stm, text, time + , containers, network, pipes, safe-exceptions, stm, text, time }: mkDerivation { pname = "sockets-and-pipes"; - version = "0.1"; - sha256 = "02xc2kddcz93d9yqdchml0yh9gypcx64315baj766adgf8np42nv"; - revision = "4"; - editedCabalFile = "1lv2zpyblqryr59ii3zvwi5f06vxsgnla1xa14rardhncs36fa8r"; + version = "0.2"; + sha256 = "13xc6f525la66k76y515r0dwjqh583zl7z1k4z1w6hraim6kg95v"; libraryHaskellDepends = [ aeson ascii async base blaze-html bytestring containers network - safe-exceptions stm text time + pipes safe-exceptions stm text time ]; description = "Support for the Sockets and Pipes book"; license = lib.licenses.asl20; @@ -244692,7 +241787,6 @@ self: { description = "Swagger generation for Solga"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "solr" = callPackage @@ -244718,7 +241812,6 @@ self: { description = "A minimal Solr client library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "solve" = callPackage @@ -244916,27 +242009,33 @@ self: { description = "Haskell EDSL for Souffle"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "souffle-haskell" = callPackage - ({ mkDerivation, array, base, containers, deepseq, directory - , filepath, hedgehog, hspec, hspec-hedgehog, mtl - , neat-interpolation, process, template-haskell, temporary, text - , type-errors-pretty, vector + ({ mkDerivation, array, base, bytestring, containers, criterion + , deepseq, directory, filepath, hedgehog, hspec, hspec-hedgehog + , mtl, neat-interpolation, process, template-haskell, temporary + , text, text-short, type-errors-pretty, vector }: mkDerivation { pname = "souffle-haskell"; - version = "2.1.0"; - sha256 = "1szkv27my46xgwqanhb6wkgncll08yznpl0p2m1wq5cifxir2m7h"; + version = "3.0.0"; + sha256 = "0zwz28w8fmz8lfwd5bzhysc43y5gfsa1px2xhlkxg5psy0j1935q"; libraryHaskellDepends = [ - array base containers deepseq directory filepath mtl process - template-haskell temporary text type-errors-pretty vector + array base bytestring containers deepseq directory filepath mtl + process template-haskell temporary text text-short + type-errors-pretty vector ]; testHaskellDepends = [ - array base containers deepseq directory filepath hedgehog hspec - hspec-hedgehog mtl neat-interpolation process template-haskell - temporary text type-errors-pretty vector + array base bytestring containers deepseq directory filepath + hedgehog hspec hspec-hedgehog mtl neat-interpolation process + template-haskell temporary text text-short type-errors-pretty + vector + ]; + benchmarkHaskellDepends = [ + array base bytestring containers criterion deepseq directory + filepath mtl process template-haskell temporary text text-short + type-errors-pretty vector ]; description = "Souffle Datalog bindings for Haskell"; license = lib.licenses.mit; @@ -244980,7 +242079,6 @@ self: { description = "Audio delay line"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "soundgen" = callPackage @@ -244995,7 +242093,6 @@ self: { description = "sound generator"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "source-code-server" = callPackage @@ -245020,7 +242117,6 @@ self: { description = "The server backend for the source code iPhone app"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "source-constraints" = callPackage @@ -245290,6 +242386,8 @@ self: { pname = "sparkle"; version = "0.7.4"; sha256 = "174rs21fgj43rq3nshzgff6mydi93n26nkcq9cadq0bzcasc2n3q"; + revision = "1"; + editedCabalFile = "1jwg12rmsa1il8y53ip535bjf02z7jnrnws1qi9y0xfpqblzmw6r"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal inline-java jvm-streaming ]; @@ -245304,7 +242402,6 @@ self: { description = "Distributed Apache Spark applications in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sparql-protocol" = callPackage @@ -245351,7 +242448,6 @@ self: { description = "Unified streaming data-dependency framework for web apps"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "spars" = callPackage @@ -245469,7 +242565,6 @@ self: { description = "Sparse bitmaps for pattern match coverage"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sparsecheck" = callPackage @@ -245499,7 +242594,6 @@ self: { description = "Lightweight parsing library based on partial functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "spartacon" = callPackage @@ -245531,7 +242625,6 @@ self: { description = "brainless form validation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "spatial-math" = callPackage @@ -245703,7 +242796,6 @@ self: { description = "Create specialized types from polymorphic ones using TH"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "species" = callPackage @@ -245723,7 +242815,6 @@ self: { description = "Computational combinatorial species"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "spectral-clustering" = callPackage @@ -245742,7 +242833,6 @@ self: { description = "Library for spectral clustering"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "speculate" = callPackage @@ -245784,7 +242874,6 @@ self: { description = "Merged into 'speculation'. Use that instead."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "speechmatics" = callPackage @@ -245816,7 +242905,6 @@ self: { description = "Speechmatics api client"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "speedy-slice" = callPackage @@ -245856,7 +242944,6 @@ self: { description = "Spelling suggestion tool with library and command-line interfaces"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "spherical" = callPackage @@ -245884,7 +242971,6 @@ self: { description = "Orbotix Sphero client library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sphinx" = callPackage @@ -245917,7 +243003,6 @@ self: { description = "Sphinx CLI and demo of Haskell Sphinx library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sphinxesc" = callPackage @@ -245955,7 +243040,6 @@ self: { description = "An FRP-based game engine written in Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "spike" = callPackage @@ -246096,7 +243180,6 @@ self: { description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme"; license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "splines" = callPackage @@ -246119,7 +243202,6 @@ self: { description = "B-Splines, other splines, and NURBS"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "splint" = callPackage @@ -246226,6 +243308,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "splitmix-distributions" = callPackage + ({ mkDerivation, base, containers, erf, exceptions, hspec, mtl + , splitmix, transformers + }: + mkDerivation { + pname = "splitmix-distributions"; + version = "0.8.0.0"; + sha256 = "1l7fh6nycsxy15m2w60pq6zp4iq811wzbklkyrc7z3wlghskqrmk"; + libraryHaskellDepends = [ + base containers erf exceptions mtl splitmix transformers + ]; + testHaskellDepends = [ base erf hspec mtl splitmix transformers ]; + description = "Random samplers for some common distributions, based on splitmix"; + license = lib.licenses.bsd3; + }) {}; + "splitter" = callPackage ({ mkDerivation, base, directory, filepath, parsec, range }: mkDerivation { @@ -246392,7 +243490,6 @@ self: { description = "JSON API to HTML website wrapper"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "spritz" = callPackage @@ -246431,7 +243528,6 @@ self: { description = "HTTP proxy for authenticating users via OAuth2"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sproxy-web" = callPackage @@ -246458,7 +243554,6 @@ self: { description = "Web interface to sproxy database"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sproxy2" = callPackage @@ -246485,7 +243580,6 @@ self: { description = "Secure HTTP proxy for authenticating users via OAuth2"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "spsa" = callPackage @@ -246568,7 +243662,6 @@ self: { description = "mysql backend for sql-simple"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sql-simple-pool" = callPackage @@ -246586,7 +243679,6 @@ self: { description = "conection pool for sql-simple"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sql-simple-postgresql" = callPackage @@ -246603,7 +243695,6 @@ self: { description = "postgresql backend for sql-simple"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sql-simple-sqlite" = callPackage @@ -246616,7 +243707,6 @@ self: { description = "sqlite backend for sql-simple"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sql-words" = callPackage @@ -246743,7 +243833,6 @@ self: { description = "Typed extension to sqlite simple"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sqlvalue-list" = callPackage @@ -246845,8 +243934,8 @@ self: { }: mkDerivation { pname = "squeather"; - version = "0.6.0.0"; - sha256 = "05cs67xcvfq0497kddmvzrccf7ihav87mv4hmi8kgl2jp8hqmk7p"; + version = "0.8.0.0"; + sha256 = "1pjiq97gq8rjp4v7cx2bhj7zcwkswc593fxdwqajssi1i39679r6"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base bytestring directory filepath hedgehog lifted-base temporary @@ -246877,8 +243966,6 @@ self: { ]; description = "A file-packing application"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sr-extra" = callPackage @@ -246907,7 +243994,6 @@ self: { description = "Module limbo"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "srcinst" = callPackage @@ -246931,17 +244017,6 @@ self: { }) {}; "srcloc" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "srcloc"; - version = "0.5.1.2"; - sha256 = "0vn0zqsk191ghh2993hls05hp7kvnskaafnfrrqhfbmpdg7dp7h6"; - libraryHaskellDepends = [ base ]; - description = "Data types for managing source code locations"; - license = lib.licenses.bsd3; - }) {}; - - "srcloc_0_6" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "srcloc"; @@ -246950,7 +244025,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Data types for managing source code locations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "srec" = callPackage @@ -247000,7 +244074,6 @@ self: { description = "Simple SCGI Library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sscript" = callPackage @@ -247108,7 +244181,6 @@ self: { description = "Check sshd configuration for adherence to best practices"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sshtun" = callPackage @@ -247157,7 +244229,6 @@ self: { description = "HTTP proxy for S3"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sstable" = callPackage @@ -247177,7 +244248,6 @@ self: { description = "SSTables in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ssv" = callPackage @@ -247290,7 +244360,6 @@ self: { description = "Trees whose branches are resistant to change"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stache" = callPackage @@ -247302,8 +244371,8 @@ self: { }: mkDerivation { pname = "stache"; - version = "2.2.1"; - sha256 = "1vkvi9rrf15a8lbihvcmrslykby4qc4jmc5zaqm1ikxsid9x5704"; + version = "2.3.0"; + sha256 = "1gfmr9gcq9zm7ljp2nqmc41lpig11d19xsqzazr2mvm5ddsi69cr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -247349,8 +244418,8 @@ self: { }: mkDerivation { pname = "stack"; - version = "2.5.1.1"; - sha256 = "0fdm4wc8hxawfab7dv2ayr853mna93gznb7g162gw4h4zxnyzwyc"; + version = "2.7.1"; + sha256 = "09mw5jwgcmbkwsgvg1ls114hq9v2vl49pdvix8ir7vvgicvdhnv0"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -247521,7 +244590,6 @@ self: { description = "Initial project template from stack"; license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stack-lib" = callPackage @@ -247581,7 +244649,6 @@ self: { description = "A program for extending Stack to add distributed capabilities"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stack-prism" = callPackage @@ -247651,7 +244718,6 @@ self: { description = "Initial project template from stack"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stack-tag" = callPackage @@ -247810,7 +244876,6 @@ self: { description = "Dummy package forcing installation of other Stackage packages"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stackage-build-plan" = callPackage @@ -247836,7 +244901,6 @@ self: { description = "Calculate and print (in different formats) Stackage build plans"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stackage-cabal" = callPackage @@ -247858,7 +244922,6 @@ self: { description = "A CLI executable for cabal-based stackage commands"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stackage-cli" = callPackage @@ -248002,7 +245065,6 @@ self: { description = "Tool for querying Stackage"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stackage-sandbox" = callPackage @@ -248024,7 +245086,6 @@ self: { description = "Work with shared stackage sandboxes"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stackage-setup" = callPackage @@ -248049,7 +245110,6 @@ self: { description = "An executable for downloading a Haskell setup"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stackage-to-hackage" = callPackage @@ -248135,7 +245195,6 @@ self: { description = "A more secure version of cabal upload which uses HTTPS"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stackage2nix" = callPackage @@ -248167,7 +245226,6 @@ self: { description = "Convert Stack files into Nix build instructions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stackcollapse-ghc" = callPackage @@ -248195,6 +245253,31 @@ self: { broken = true; }) {}; + "stackcollapse-ghc_0_0_1_4" = callPackage + ({ mkDerivation, base, bytestring, containers, extra, filepath + , foldl, hspec, hspec-golden, recursion-schemes, rosezipper, safe + , text, transformers, utf8-string + }: + mkDerivation { + pname = "stackcollapse-ghc"; + version = "0.0.1.4"; + sha256 = "1scqjjp1cpz3zzvqa6wmfz11qrhsbqwgq7h8qjg0d8ri3r9z82lb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers extra foldl recursion-schemes rosezipper + safe text transformers + ]; + testHaskellDepends = [ + base bytestring containers extra filepath foldl hspec hspec-golden + recursion-schemes rosezipper safe text transformers utf8-string + ]; + description = "Program to fold GHC prof files into flamegraph input"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "stacked-dag" = callPackage ({ mkDerivation, base, containers, doctest, graphviz , optparse-applicative, text @@ -248540,7 +245623,6 @@ self: { description = "Typeclass instances for monad transformer stacks with an ST thread at the bottom"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stateref" = callPackage @@ -248647,7 +245729,6 @@ self: { description = "Serialisable static pointers to functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "static-hash" = callPackage @@ -248726,8 +245807,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Lists, Texts, ByteStrings and Vectors of statically known length"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "staticanalysis" = callPackage @@ -248902,7 +245981,6 @@ self: { description = "Statsd UDP client"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "statsd-datadog" = callPackage @@ -248942,7 +246020,6 @@ self: { description = "A lovely [Dog]StatsD implementation"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "status-notifier-item" = callPackage @@ -249719,7 +246796,6 @@ self: { description = "Control communication among retrying transactions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stochastic" = callPackage @@ -249754,8 +246830,6 @@ self: { testHaskellDepends = [ base bytestring HUnit ]; description = "Library for the IEX Trading API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stomp-conduit" = callPackage @@ -249969,7 +247043,6 @@ self: { description = "Conversion between storablevector and stream-fusion lists with fusion"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "store" = callPackage @@ -250151,7 +247224,6 @@ self: { description = "A library for stratux"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stratux-demo" = callPackage @@ -250175,7 +247247,6 @@ self: { description = "A demonstration of the stratux library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stratux-http" = callPackage @@ -250192,7 +247263,6 @@ self: { description = "A library for using HTTP with stratux"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stratux-types" = callPackage @@ -250227,7 +247297,6 @@ self: { description = "A library for using websockets with stratux"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stream" = callPackage @@ -250368,7 +247437,6 @@ self: { description = "Streaming conversion from/to base64"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "streaming-benchmarks" = callPackage @@ -250394,8 +247462,6 @@ self: { ]; description = "Benchmarks to compare streaming packages"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "streaming-binary" = callPackage @@ -250452,7 +247518,6 @@ self: { description = "Streaming interface for Brotli (RFC7932) compression"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "streaming-bytestring" = callPackage @@ -250495,8 +247560,6 @@ self: { ]; description = "Cassava support for the streaming ecosystem"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "streaming-commons" = callPackage @@ -250544,7 +247607,6 @@ self: { description = "Concurrency support for the streaming ecosystem"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "streaming-conduit" = callPackage @@ -250617,7 +247679,6 @@ self: { description = "online streaming fft"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "streaming-histogram" = callPackage @@ -250779,7 +247840,6 @@ self: { description = "Streaming support for running system process"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "streaming-sort" = callPackage @@ -250802,7 +247862,6 @@ self: { description = "Sorting streams"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "streaming-utils" = callPackage @@ -250888,6 +247947,7 @@ self: { ]; description = "Beautiful Streaming, Concurrent and Reactive Composition"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "streamly-archive" = callPackage @@ -250897,8 +247957,8 @@ self: { }: mkDerivation { pname = "streamly-archive"; - version = "0.0.1"; - sha256 = "055jcqndkzg14c2fvkncn9034bw60n8s8yjkkjx7kqrj9p0kp01a"; + version = "0.0.2"; + sha256 = "00cd5ssa5hi4pvc5li24z68f1k50h02frn4668gcrv8lr5kh6s50"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring streamly ]; librarySystemDepends = [ archive ]; @@ -250909,8 +247969,6 @@ self: { testSystemDepends = [ archive ]; description = "Stream data from archives using the streamly library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {archive = null;}; "streamly-binary" = callPackage @@ -251000,8 +248058,8 @@ self: { }: mkDerivation { pname = "streamly-lmdb"; - version = "0.2.0"; - sha256 = "1mkcnn7y4rwc8m0qvcqyw20jd7ax3nm455228fwp3yaslgw4mcvy"; + version = "0.2.1"; + sha256 = "08rj29i3vb4ahgrd2zhyi2sl1lk95s7vk020xx9mwzi8sbn0ay05"; libraryHaskellDepends = [ async base bytestring streamly ]; librarySystemDepends = [ lmdb ]; testHaskellDepends = [ @@ -251011,8 +248069,6 @@ self: { testSystemDepends = [ lmdb ]; description = "Stream data to or from LMDB databases using the streamly library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) lmdb;}; "streamly-posix" = callPackage @@ -251086,7 +248142,6 @@ self: { description = "A simple, flexible and composable web-router"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "strelka-core" = callPackage @@ -251163,8 +248218,6 @@ self: { ]; description = "Strict variants of the types provided in base"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "strict-concurrency" = callPackage @@ -251255,7 +248308,6 @@ self: { description = "A collection of commonly used strict data structures"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "strict-ghc-plugin" = callPackage @@ -251569,8 +248621,8 @@ self: { ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "string-like"; - version = "0.1.0.0"; - sha256 = "1b87532fhv2wn6pnzsaw20lzj5j399smlfn7lai0h0ph2axb2dbi"; + version = "0.1.0.1"; + sha256 = "1sadf4cdxs3ilax99w1yvkfz2v1n77rj9grck4csjbwswxw2d2dn"; libraryHaskellDepends = [ base bytestring text ]; description = "A package that aims to provide a uniform interface to string-like types"; license = lib.licenses.bsd3; @@ -251670,7 +248722,6 @@ self: { description = "Type-level Chars and Strings, with decidable equality"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stringable" = callPackage @@ -251937,7 +248988,6 @@ self: { description = "Listen for Stripe webhook events with Scotty"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stripe-servant" = callPackage @@ -252006,8 +249056,6 @@ self: { ]; description = "Use the Stripe API via Wreq"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stripeapi" = callPackage @@ -252103,25 +249151,6 @@ self: { }) {}; "structs" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck - , tasty, tasty-hunit, tasty-quickcheck, template-haskell - , th-abstraction - }: - mkDerivation { - pname = "structs"; - version = "0.1.5"; - sha256 = "1qsj5w6g0lcvbrm0zs37f1yk3im1swhnb4j1mbpr3fyc3zswwbjf"; - libraryHaskellDepends = [ - base deepseq ghc-prim primitive template-haskell th-abstraction - ]; - testHaskellDepends = [ - base primitive QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "Strict GC'd imperative object-oriented programming with cheap pointers"; - license = lib.licenses.bsd3; - }) {}; - - "structs_0_1_6" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, template-haskell , th-abstraction @@ -252138,7 +249167,6 @@ self: { ]; description = "Strict GC'd imperative object-oriented programming with cheap pointers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "structural-induction" = callPackage @@ -252160,7 +249188,6 @@ self: { description = "Instantiate structural induction schemas for algebraic data types"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "structural-traversal" = callPackage @@ -252252,7 +249279,6 @@ self: { description = "Structured MongoDB interface"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "structures" = callPackage @@ -252349,7 +249375,6 @@ self: { description = "A revival of the classic game Stunts (LambdaCube tech demo)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stutter" = callPackage @@ -252378,7 +249403,6 @@ self: { description = "(Stutter Text|String)-Utterer"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stylish-cabal" = callPackage @@ -252460,8 +249484,6 @@ self: { ]; description = "Apply CSS styles to a document tree"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stylized" = callPackage @@ -252514,8 +249536,6 @@ self: { ]; description = "An applicative functor that seamlessly talks to HTML inputs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sub-state" = callPackage @@ -252613,7 +249633,6 @@ self: { description = "Type safe interface for programming in subcategories of Hask"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "subleq-toolchain" = callPackage @@ -252721,7 +249740,6 @@ self: { description = "Match / replace substrings with a parser combinators"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "subtitleParser" = callPackage @@ -252798,8 +249816,6 @@ self: { libraryHaskellDepends = [ base ]; description = "An applicative functor to manage successors"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "suffix-array" = callPackage @@ -252950,7 +249966,6 @@ self: { description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects using TUI"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sump" = callPackage @@ -252969,7 +249984,6 @@ self: { description = "A Haskell interface to SUMP-compatible logic analyzers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sundown" = callPackage @@ -253040,7 +250054,6 @@ self: { description = "Tests for Sunroof"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sunroof-server" = callPackage @@ -253063,7 +250076,6 @@ self: { description = "Monadic Javascript Compiler - Server Utilities"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "super-user-spark" = callPackage @@ -253146,7 +250158,6 @@ self: { description = "Haskell SuperCollider utilities"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "supercollider-midi" = callPackage @@ -253170,7 +250181,6 @@ self: { description = "Demonstrate how to control SuperCollider via ALSA-MIDI"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "superconstraints" = callPackage @@ -253188,7 +250198,6 @@ self: { description = "Access an instance's constraints"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "superdoc" = callPackage @@ -253413,7 +250422,6 @@ self: { description = "Encode and decode separated values (CSV, PSV, ...)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sv-cassava" = callPackage @@ -253436,7 +250444,6 @@ self: { description = "Integration to use sv with cassava's parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sv-core" = callPackage @@ -253484,7 +250491,6 @@ self: { description = "sv-core + svfactor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "svfactor" = callPackage @@ -253583,7 +250589,6 @@ self: { description = "Code generation tool for Quartz code from a SVG"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "svgcairo" = callPackage @@ -253626,7 +250631,6 @@ self: { description = "Optimise SVGs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "svgutils" = callPackage @@ -253836,7 +250840,6 @@ self: { description = "Transparently swapping data from in-memory structures to disk"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) tokyocabinet;}; "swearjure" = callPackage @@ -253857,7 +250860,6 @@ self: { description = "Clojure without alphanumerics"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sweet-egison" = callPackage @@ -253881,7 +250883,6 @@ self: { description = "Shallow embedding implementation of non-linear pattern matching"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "swf" = callPackage @@ -253976,6 +250977,8 @@ self: { ]; description = "SwissTable hash map"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "switch" = callPackage @@ -253993,7 +250996,6 @@ self: { description = "Nintendo Switch Controller Library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sws" = callPackage @@ -254017,8 +251019,6 @@ self: { ]; description = "A simple web server for serving directories"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sxml" = callPackage @@ -254269,7 +251269,6 @@ self: { description = "Lambda calculus visualization"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sym" = callPackage @@ -254296,7 +251295,6 @@ self: { description = "Plot permutations; an addition to the sym package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "symantic" = callPackage @@ -254337,7 +251335,6 @@ self: { description = "Library for reading and writing Atom"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "symantic-base" = callPackage @@ -254415,8 +251412,6 @@ self: { ]; description = "Symantic combinators for deriving clients or a server from an HTTP API"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "symantic-http-client" = callPackage @@ -254435,8 +251430,6 @@ self: { ]; description = "symantic-http applied to the derivation of HTTP clients"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "symantic-http-demo" = callPackage @@ -254463,8 +251456,6 @@ self: { ]; description = "Demo for symantic-http and its companion libraries"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "symantic-http-pipes" = callPackage @@ -254486,8 +251477,6 @@ self: { ]; description = "Streaming support through pipes for symantic-http"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "symantic-http-server" = callPackage @@ -254506,8 +251495,6 @@ self: { ]; description = "symantic-http applied to the derivation of HTTP servers"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "symantic-http-test" = callPackage @@ -254560,7 +251547,6 @@ self: { description = "Symantics for common types"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "symantic-parser" = callPackage @@ -254643,7 +251629,6 @@ self: { description = "Data serialization, communication, and operation verification implementation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "symbol" = callPackage @@ -254749,7 +251734,6 @@ self: { description = "Derivation of symbols and coordinate triplets Library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "symon" = callPackage @@ -254856,7 +251840,6 @@ self: { description = "Haskell bindings for the Syncthing REST API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "synt" = callPackage @@ -254905,8 +251888,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Generic representation and manipulation of abstract syntax"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "syntactical" = callPackage @@ -254936,7 +251917,6 @@ self: { description = "Reversible parsing and pretty-printing"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "syntax-attoparsec" = callPackage @@ -254953,7 +251933,6 @@ self: { description = "Syntax instances for Attoparsec"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "syntax-example" = callPackage @@ -254973,7 +251952,6 @@ self: { description = "Example application using syntax, a library for abstract syntax descriptions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "syntax-example-json" = callPackage @@ -254993,7 +251971,6 @@ self: { description = "Example JSON parser/pretty-printer"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "syntax-pretty" = callPackage @@ -255009,7 +251986,6 @@ self: { description = "Syntax instance for pretty, the pretty printing library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "syntax-printer" = callPackage @@ -255027,7 +252003,6 @@ self: { description = "Text and ByteString printers for 'syntax'"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "syntax-trees" = callPackage @@ -255081,7 +252056,6 @@ self: { description = "Working with Google's SyntaxNet output files - CoNLL, Tree"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "synthesizer" = callPackage @@ -255127,6 +252101,9 @@ self: { ]; description = "Control synthesizer effects via ALSA/MIDI"; license = "GPL"; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "synthesizer-core" = callPackage @@ -255244,7 +252221,6 @@ self: { description = "Efficient signal processing using runtime compilation"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "synthesizer-midi" = callPackage @@ -255672,7 +252648,6 @@ self: { description = "An application that regularly logs system stats for later analysis"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "syz" = callPackage @@ -255715,7 +252690,6 @@ self: { description = "tic-tac-toe Rexports for client"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "t3-game" = callPackage @@ -255769,7 +252743,6 @@ self: { description = "Transito Abierto: convenience library when using Takusen and Oracle"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tabl" = callPackage @@ -256015,6 +252988,10 @@ self: { executablePkgconfigDepends = [ gtk3 ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; + maintainers = with lib.maintainers; [ rvl ]; }) {inherit (pkgs) gtk3;}; "tag-bits" = callPackage @@ -256044,7 +253021,6 @@ self: { description = "streamlined html tag parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tagchup" = callPackage @@ -256144,7 +253120,6 @@ self: { description = "Lists tagged with a type-level natural number representing their length"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tagged-th" = callPackage @@ -256159,7 +253134,6 @@ self: { description = "QuasiQuoter and Template Haskell splices for creating proxies at higher-kinds"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tagged-timers" = callPackage @@ -256382,7 +253356,6 @@ self: { description = "Tagsoup Navigate"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tagsoup-parsec" = callPackage @@ -256430,7 +253403,6 @@ self: { description = "Black magic tagsoup"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tagstream-conduit" = callPackage @@ -256596,7 +253568,6 @@ self: { description = "An implementation of Typed Assembly Language (Morrisett, Walker, Crary, Glew)"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tamarin-prover" = callPackage @@ -256627,7 +253598,6 @@ self: { description = "The Tamarin prover for security protocol analysis"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tamarin-prover-term" = callPackage @@ -256647,7 +253617,6 @@ self: { description = "Term manipulation library for the tamarin prover"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tamarin-prover-theory" = callPackage @@ -256670,7 +253639,6 @@ self: { description = "Term manipulation library for the tamarin prover"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tamarin-prover-utils" = callPackage @@ -256884,7 +253852,6 @@ self: { description = "Generate test-suites from refinement types"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) z3;}; "tart" = callPackage @@ -256927,7 +253894,6 @@ self: { description = "A command line tool for keeping track of tasks you worked on"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "task-distribution" = callPackage @@ -256965,7 +253931,6 @@ self: { description = "Distributed processing of changing tasks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "taskell" = callPackage @@ -257120,7 +254085,6 @@ self: { description = "BDD tests language and tasty provider"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tasty-bench" = callPackage @@ -257153,8 +254117,6 @@ self: { ]; description = "Check multiple items during a tasty test"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tasty-dejafu" = callPackage @@ -257305,7 +254267,6 @@ self: { description = "Tasty Tests for groundhog converters"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tasty-hedgehog" = callPackage @@ -257401,8 +254362,6 @@ self: { ]; description = "Render tasty output to HTML"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tasty-hunit" = callPackage @@ -257438,6 +254397,21 @@ self: { license = lib.licenses.mpl20; }) {}; + "tasty-inspection-testing" = callPackage + ({ mkDerivation, base, ghc, inspection-testing, tasty + , template-haskell + }: + mkDerivation { + pname = "tasty-inspection-testing"; + version = "0.1"; + sha256 = "18awafrclxg8lfw8gg4ndzfwwpaz8qmad23fi24rhpdj9c7xdyhw"; + libraryHaskellDepends = [ + base ghc inspection-testing tasty template-haskell + ]; + description = "Inspection testing support for tasty"; + license = lib.licenses.mit; + }) {}; + "tasty-integrate" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, containers , deepseq, directory, either, haskell-src-exts @@ -257467,7 +254441,6 @@ self: { description = "automated integration of QuickCheck properties into tasty suites"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tasty-jenkins-xml" = callPackage @@ -257488,7 +254461,6 @@ self: { description = "Render tasty output to both console and XML for Jenkins"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tasty-json" = callPackage @@ -257538,7 +254510,6 @@ self: { description = "Test common laws"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tasty-leancheck" = callPackage @@ -257568,7 +254539,6 @@ self: { description = "Tasty TestTrees for Lens validation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tasty-lua" = callPackage @@ -257700,8 +254670,6 @@ self: { ]; description = "A fancy test runner, including support for golden tests"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tasty-smallcheck" = callPackage @@ -257888,7 +254856,6 @@ self: { description = "Meta tic-tac-toe ncurses game"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tau" = callPackage @@ -257931,7 +254898,6 @@ self: { description = "Transactional variables and data structures with IO hooks"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tcache-AWS" = callPackage @@ -257967,7 +254933,6 @@ self: { description = "TokyoCabinet CLI interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tce-conf" = callPackage @@ -258100,7 +255065,6 @@ self: { description = "Test framework wrapper"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tdigest" = callPackage @@ -258143,8 +255107,6 @@ self: { ]; description = "Chart generation from tdigest"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tdlib" = callPackage @@ -258173,7 +255135,6 @@ self: { description = "complete binding to the Telegram Database Library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) tdlib;}; "tdlib-gen" = callPackage @@ -258203,7 +255164,6 @@ self: { description = "Codegen for TDLib"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tdlib-types" = callPackage @@ -258225,7 +255185,6 @@ self: { description = "Types and Functions generated from tdlib api spec"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tdoc" = callPackage @@ -258320,7 +255279,6 @@ self: { description = "Bleeding edge prelude"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "technique" = callPackage @@ -258447,7 +255405,6 @@ self: { description = "Telegram Bot microframework for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "telegram-bot-simple" = callPackage @@ -258479,8 +255436,6 @@ self: { ]; description = "Easy to use library for building Telegram bots"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "telegram-raw-api" = callPackage @@ -258506,7 +255461,6 @@ self: { description = "Servant bindings to the Telegram bot API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "telegram-types" = callPackage @@ -258529,7 +255483,6 @@ self: { description = "Types used in Telegram bot API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "telegraph" = callPackage @@ -259117,7 +256070,6 @@ self: { description = "Haskell wrappers for Core Tensorflow Ops"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tensorflow-logging" = callPackage @@ -259147,7 +256099,6 @@ self: { description = "TensorBoard related functionality"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tensorflow-mnist" = callPackage @@ -259232,7 +256183,6 @@ self: { description = "Friendly layer around TensorFlow bindings"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tensorflow-proto" = callPackage @@ -259356,7 +256306,6 @@ self: { description = "reactive-banana + termbox"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "termbox-bindings" = callPackage @@ -259470,7 +256419,6 @@ self: { description = "Text data type for styled terminal output, including all standard ANSI effects (bold, italic, blinking) and ANSI / 256 / truecolor colors support for Unix and Windows (whenever possible)"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "termination-combinators" = callPackage @@ -259548,6 +256496,10 @@ self: { ]; description = "Terminal emulator configurable in Haskell"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; + maintainers = with lib.maintainers; [ cdepillabout ]; }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2; vte_291 = pkgs.vte;}; @@ -259623,7 +256575,6 @@ self: { description = "A Haskell GIS Programming Environment"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {terralib4c = null; translib = null;}; "tersmu" = callPackage @@ -259674,8 +256625,6 @@ self: { ]; description = "Tesla API client"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "test-fixture" = callPackage @@ -259850,7 +256799,6 @@ self: { description = "test-sandbox support for the test-framework package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "test-framework-skip" = callPackage @@ -259983,8 +256931,6 @@ self: { ]; description = "Testing framework"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "test-lib" = callPackage @@ -260098,7 +257044,6 @@ self: { description = "Lightweight development enviroments using test-sandbox"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "test-sandbox-hunit" = callPackage @@ -260111,7 +257056,6 @@ self: { description = "HUnit convenience functions for use with test-sandbox"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "test-sandbox-quickcheck" = callPackage @@ -260128,7 +257072,6 @@ self: { description = "QuickCheck convenience functions for use with test-sandbox"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "test-shouldbe" = callPackage @@ -260163,7 +257106,6 @@ self: { description = "Simple Perl inspired testing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "testCom" = callPackage @@ -260219,7 +257161,6 @@ self: { description = "Create tests and benchmarks together"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "testcontainers" = callPackage @@ -260981,7 +257922,6 @@ self: { description = "Utils for text"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "text-position" = callPackage @@ -261248,7 +258188,6 @@ self: { description = "An efficient finite map from Text to values, based on bytestring-trie"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "text-utf7" = callPackage @@ -261304,8 +258243,6 @@ self: { testHaskellDepends = [ base HTF text ]; description = "Various text utilities"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "text-xml-generic" = callPackage @@ -261422,7 +258359,6 @@ self: { description = "A simple Haskell program to provide tags for Haskell code completion in TextMate"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "textocat-api" = callPackage @@ -261580,7 +258516,6 @@ self: { description = "Alpha equivalence for TH Exp"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "th-bang-compat" = callPackage @@ -261669,7 +258604,6 @@ self: { description = "Test instance context"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "th-data-compat" = callPackage @@ -261867,7 +258801,6 @@ self: { description = "A place to collect orphan instances for Template Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "th-kinds" = callPackage @@ -262171,7 +259104,6 @@ self: { description = "Graph of the subtype relation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "th-utilities" = callPackage @@ -262233,7 +259165,6 @@ self: { description = "Minimalistic actor library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "themoviedb" = callPackage @@ -262335,7 +259266,6 @@ self: { description = "A simple client for the TheoremQuest theorem proving game"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "these" = callPackage @@ -262441,7 +259371,6 @@ self: { description = "Command-line spelling word suggestion tool"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "thock" = callPackage @@ -262932,7 +259861,6 @@ self: { description = "Image thumbnail creation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "thyme" = callPackage @@ -263001,6 +259929,7 @@ self: { description = "A desktop bar based on WebKit"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;}; "tibetan-utils" = callPackage @@ -263034,7 +259963,6 @@ self: { description = "Useful if reading \"Why FP matters\" by John Hughes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ticker" = callPackage @@ -263072,7 +260000,6 @@ self: { description = "A port of @Data.Binary@"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tictactoe3d" = callPackage @@ -263141,7 +260068,6 @@ self: { description = "Serial support for tidal"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tidal-vis" = callPackage @@ -263256,7 +260182,26 @@ self: { description = "Tiny and Incrementally-Growing HTTP library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; + }) {}; + + "tikzsd" = callPackage + ({ mkDerivation, array, base, containers, lens, mtl, parsec + , transformers + }: + mkDerivation { + pname = "tikzsd"; + version = "1.0.0"; + sha256 = "1y2pxbmm22dmrvgsqv2gvy3nf8vh3ln5pinrfsbim8qk1qfayina"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers lens mtl parsec transformers + ]; + executableHaskellDepends = [ + array base containers lens mtl parsec transformers + ]; + description = "A program for generating LaTeX code of string diagrams"; + license = lib.licenses.mit; }) {}; "tile" = callPackage @@ -263300,7 +260245,6 @@ self: { description = "The Timber Compiler"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "time_1_11_1_2" = callPackage @@ -263388,7 +260332,6 @@ self: { description = "Yet another time library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "time-http" = callPackage @@ -263413,7 +260356,6 @@ self: { description = "Parse and format HTTP/1.1 Date and Time strings"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "time-interval" = callPackage @@ -263437,7 +260379,6 @@ self: { description = "IO Access for time"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "time-lens" = callPackage @@ -263693,7 +260634,6 @@ self: { description = "Distributed systems execution emulation"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "timecalc" = callPackage @@ -263927,7 +260867,6 @@ self: { description = "Prints timestamps after each line evaluated"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "timer-wheel" = callPackage @@ -264177,7 +261116,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "timing-convenience" = callPackage @@ -264259,7 +261197,6 @@ self: { description = "TinyMesh - communicating with auto-meshing sensor network"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tinyXml" = callPackage @@ -264354,7 +261291,6 @@ self: { description = "Convert from Haskell to Tip"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tip-lib" = callPackage @@ -264379,7 +261315,6 @@ self: { description = "tons of inductive problems - support library and tools"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tiphys" = callPackage @@ -264425,7 +261360,6 @@ self: { description = "Testing Infrastructure for Temporal AbstractioNs - GUI to debug temporal programs"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "titan-debug-yampa" = callPackage @@ -264559,16 +261493,18 @@ self: { "tlex" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest - , hspec, hspec-discover, QuickCheck, tlex-core + , enummapset-th, hspec, hspec-discover, QuickCheck, tlex-core }: mkDerivation { pname = "tlex"; - version = "0.2.0.0"; - sha256 = "0ad2zxlwrkpz2lgqp9lyj4aaq0nicj8vxfys0hn63cv23arwr0cc"; + version = "0.3.0.0"; + sha256 = "1sbs6zxa6x2isxvynlqjf8rgy0y1syr6svvgb22bj43qsg3p3vnx"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base containers tlex-core ]; + libraryHaskellDepends = [ + base containers enummapset-th tlex-core + ]; testHaskellDepends = [ - base containers doctest hspec QuickCheck tlex-core + base containers doctest enummapset-th hspec QuickCheck tlex-core ]; testToolDepends = [ hspec-discover ]; description = "A lexer generator"; @@ -264577,20 +261513,21 @@ self: { "tlex-core" = callPackage ({ mkDerivation, array, base, Cabal, cabal-doctest, containers - , doctest, hashable, hspec, hspec-discover, QuickCheck - , transformers, unordered-containers + , doctest, enummapset-th, hashable, hspec, hspec-discover + , QuickCheck, transformers, unordered-containers }: mkDerivation { pname = "tlex-core"; - version = "0.2.1.0"; - sha256 = "1qjzxsz7rl1fmfp1yzc2cdxjwz9nwjrxz6d18023cz41v1jympzq"; + version = "0.3.0.0"; + sha256 = "0nmxy35xxz6d2i7hcci68cwv9fm1ffsg00n9minaqgkwcyrk2qba"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - array base containers hashable transformers unordered-containers + array base containers enummapset-th hashable transformers + unordered-containers ]; testHaskellDepends = [ - array base containers doctest hashable hspec QuickCheck - transformers unordered-containers + array base containers doctest enummapset-th hashable hspec + QuickCheck transformers unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "A lexer generator"; @@ -264599,20 +261536,20 @@ self: { "tlex-debug" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest - , hspec, hspec-discover, QuickCheck, tlex, tlex-core + , enummapset-th, hspec, hspec-discover, QuickCheck, tlex, tlex-core , unordered-containers }: mkDerivation { pname = "tlex-debug"; - version = "0.2.0.0"; - sha256 = "0qj1wcdg9spf7vfwmpkqp5z74qzh9xkb4m6gv0v015krr8qvwc01"; + version = "0.3.0.0"; + sha256 = "012554saxmnqfm1rvgjgzn7aakvp1ai95xpavr6b3h1pqy63md6s"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base containers tlex tlex-core unordered-containers + base containers enummapset-th tlex tlex-core unordered-containers ]; testHaskellDepends = [ - base containers doctest hspec QuickCheck tlex tlex-core - unordered-containers + base containers doctest enummapset-th hspec QuickCheck tlex + tlex-core unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "Debug utilities for Tlex"; @@ -264621,16 +261558,20 @@ self: { "tlex-encoding" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, charset, containers - , doctest, hspec, hspec-discover, QuickCheck, tlex, tlex-core + , doctest, enummapset-th, hspec, hspec-discover, QuickCheck, tlex + , tlex-core }: mkDerivation { pname = "tlex-encoding"; - version = "0.2.0.0"; - sha256 = "0krisx0fh85dccgcw6y1b3b1q2brwqz75hqg6r7w39rn0w7b5xm7"; + version = "0.3.0.0"; + sha256 = "1ip1zfjfn5jw817i4q8cav98d261jq7h00qaxfsmkcv7kqiqzbac"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base charset containers tlex tlex-core ]; + libraryHaskellDepends = [ + base charset containers enummapset-th tlex tlex-core + ]; testHaskellDepends = [ - base charset containers doctest hspec QuickCheck tlex tlex-core + base charset containers doctest enummapset-th hspec QuickCheck tlex + tlex-core ]; testToolDepends = [ hspec-discover ]; description = "Encoding plugin for Tlex"; @@ -264639,20 +261580,21 @@ self: { "tlex-th" = callPackage ({ mkDerivation, array, base, Cabal, cabal-doctest, containers - , doctest, ghc-prim, hspec, hspec-discover, QuickCheck - , template-haskell, tlex, tlex-core + , doctest, enummapset-th, ghc-prim, hspec, hspec-discover + , QuickCheck, template-haskell, tlex, tlex-core }: mkDerivation { pname = "tlex-th"; - version = "0.2.0.1"; - sha256 = "19hlj81rxnki90imiz4zjklfl4ffbpkkd9iycq4wbj92i9vw4n8v"; + version = "0.3.0.0"; + sha256 = "1fhp2md3v2n51irivgdij5zdql1lx8iay9yvsrmj9nhvlfjq2b4g"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - array base containers ghc-prim template-haskell tlex tlex-core + array base containers enummapset-th ghc-prim template-haskell tlex + tlex-core ]; testHaskellDepends = [ - array base containers doctest ghc-prim hspec QuickCheck - template-haskell tlex tlex-core + array base containers doctest enummapset-th ghc-prim hspec + QuickCheck template-haskell tlex tlex-core ]; testToolDepends = [ hspec-discover ]; description = "TemplateHaskell plugin for Tlex"; @@ -264723,7 +261665,6 @@ self: { description = "TLS extra default values and helpers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tls-session-manager" = callPackage @@ -264761,8 +261702,6 @@ self: { executableHaskellDepends = [ base ]; description = "Handle phylogenetic trees"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tmapchan" = callPackage @@ -264873,7 +261812,6 @@ self: { description = "A simple daily journal program"; license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tnet" = callPackage @@ -264948,7 +261886,6 @@ self: { description = "Instances for the ToString class"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "toboggan" = callPackage @@ -264968,7 +261905,6 @@ self: { description = "Twitter bot generator"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "todo" = callPackage @@ -265008,7 +261944,6 @@ self: { description = "Easy-to-use TODOs manager"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tofromxml" = callPackage @@ -265211,7 +262146,6 @@ self: { executableHaskellDepends = [ base bytestring gf iconv ]; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tokyocabinet-haskell" = callPackage @@ -265434,8 +262368,6 @@ self: { ]; description = "tonatona plugin for google-server-api"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tonatona-logger" = callPackage @@ -265561,7 +262493,6 @@ self: { description = "Cluster single cells and analyze cell clade relationships"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "toodles" = callPackage @@ -265641,7 +262572,6 @@ self: { description = "Top (typed oriented protocol) API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "topkata" = callPackage @@ -265661,7 +262591,6 @@ self: { description = "OpenGL Arcade Game"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "topograph" = callPackage @@ -265740,6 +262669,7 @@ self: { libraryHaskellDepends = [ base void ]; description = "Exhaustive pattern matching using lenses, traversals, and prisms"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "total-alternative" = callPackage @@ -265763,7 +262693,6 @@ self: { description = "Finitely represented total maps"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "total-maps" = callPackage @@ -265843,7 +262772,6 @@ self: { description = "A Tox protocol implementation in Haskell"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "toxcore-c" = callPackage @@ -265870,7 +262798,6 @@ self: { description = "Haskell bindings to the C reference implementation of Tox"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {toxcore = null;}; "toxiproxy-haskell" = callPackage @@ -265948,7 +262875,6 @@ self: { description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tpar" = callPackage @@ -265986,7 +262912,6 @@ self: { description = "simple, parallel job scheduling"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tpb" = callPackage @@ -266013,7 +262938,6 @@ self: { description = "Applications for interacting with the Pushbullet API"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tpdb" = callPackage @@ -266165,8 +263089,6 @@ self: { ]; description = "Distributed tracing"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tracing-control" = callPackage @@ -266360,7 +263282,6 @@ self: { description = "Tools and a library for working with Trajectory"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "trans-fx-core" = callPackage @@ -266445,7 +263366,6 @@ self: { description = "Text transformer and interpreter"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "transfer-db" = callPackage @@ -266475,7 +263395,6 @@ self: { description = "ODBC database transfer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "transformations" = callPackage @@ -266497,7 +263416,6 @@ self: { description = "Generic representation of tree transformations"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "transformers_0_5_6_2" = callPackage @@ -266608,7 +263526,6 @@ self: { description = "Sensible conversions between some of the monad transformers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "transformers-eff" = callPackage @@ -266790,7 +263707,6 @@ self: { description = "transient with secure communications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "translatable-intset" = callPackage @@ -266858,7 +263774,6 @@ self: { description = "Type Safe Web Routing"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "trasa-client" = callPackage @@ -266876,7 +263791,6 @@ self: { description = "Type safe http requests"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "trasa-extra" = callPackage @@ -266895,7 +263809,6 @@ self: { description = "Extra functions for trasa"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "trasa-form" = callPackage @@ -266915,7 +263828,6 @@ self: { description = "generate forms using lucid, ditto and trasa"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "trasa-reflex" = callPackage @@ -266950,7 +263862,6 @@ self: { description = "Type safe web server"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "trasa-th" = callPackage @@ -266968,7 +263879,6 @@ self: { description = "Template Haskell to generate trasa routes"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "traversal-template" = callPackage @@ -267427,7 +264337,6 @@ self: { description = "Treemap related commands for producing foldable TreeMap HTML"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "treersec" = callPackage @@ -267509,7 +264418,6 @@ self: { description = "A PostgreSQL Database Migrator"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "trek-db" = callPackage @@ -267534,7 +264442,6 @@ self: { description = "A PostgreSQL Database Migrator"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "trek-lens" = callPackage @@ -267629,7 +264536,6 @@ self: { description = "triangulation of polygons"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "trie-simple" = callPackage @@ -267679,7 +264585,6 @@ self: { description = "Various trie implementations in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "trifecta" = callPackage @@ -267758,7 +264663,6 @@ self: { description = "Search for, annotate and trim poly-A tail"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tripLL" = callPackage @@ -267814,13 +264718,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "trivial-constraint"; - version = "0.6.0.0"; - sha256 = "0y0iyll7ml5qz271cqa0dc3w2j3w1d8jjaxwaf2flcidigws69z5"; + version = "0.7.0.0"; + sha256 = "0kyjifqfjf4lmrba4fb65m82s8qqv2nld9lj0qvh2qxc8bfw4hj7"; libraryHaskellDepends = [ base ]; description = "Constraints that any type, resp. no type fulfills"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tropical" = callPackage @@ -267890,7 +264792,6 @@ self: { description = "Audio file compressor-limiter"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "trurl" = callPackage @@ -267914,7 +264815,6 @@ self: { description = "Haskell template code generator"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "truthful" = callPackage @@ -267955,7 +264855,6 @@ self: { description = "A Transaction Framework for Happstack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tsetchan" = callPackage @@ -268163,7 +265062,6 @@ self: { description = "An API binding Web.Spock to Database.Beam"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ttask" = callPackage @@ -268365,7 +265263,6 @@ self: { description = "A simple tun/tap library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tup-functor" = callPackage @@ -268381,7 +265278,6 @@ self: { description = "Homogeneous tuples"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tuple" = callPackage @@ -268456,7 +265352,6 @@ self: { description = "Morph between tuples, or convert them from and to HLists"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tuple-ops" = callPackage @@ -268469,7 +265364,6 @@ self: { description = "various operations on n-ary tuples via GHC.Generics"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tuple-sop" = callPackage @@ -268590,7 +265484,6 @@ self: { description = "An implementation of Turing Machine and Automaton"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "turkish-deasciifier" = callPackage @@ -268653,6 +265546,7 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Shell programming, Haskell-style"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "turtle-options" = callPackage @@ -268686,6 +265580,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "twain" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, cookie + , either, http-types, text, time, transformers, wai, wai-extra + , warp + }: + mkDerivation { + pname = "twain"; + version = "1.0.0.0"; + sha256 = "0brxvqddnhxs4q5hm9g8fzkznk3xjagivy0glfiqrx24p4k8s9yb"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive cookie either http-types + text time transformers wai wai-extra warp + ]; + description = "Tiny web application framework for WAI"; + license = lib.licenses.bsd3; + }) {}; + "tweak" = callPackage ({ mkDerivation, base, containers, lens, stm, transformers }: mkDerivation { @@ -268714,8 +265625,6 @@ self: { ]; description = "An equational theorem prover"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "twee-lib" = callPackage @@ -268759,8 +265668,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; description = "Command-line tool for twitter"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "twentefp" = callPackage @@ -268790,7 +265697,6 @@ self: { description = "Used as Lab Assignments Environment at the University of Twente"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "twentefp-eventloop-trees" = callPackage @@ -268803,7 +265709,6 @@ self: { description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "twentefp-graphs" = callPackage @@ -268816,7 +265721,6 @@ self: { description = "Lab Assignments Environment at Univeriteit Twente"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "twentefp-number" = callPackage @@ -268843,7 +265747,6 @@ self: { description = "RoseTree type and show functions for lab assignment of University of Twente"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "twentefp-trees" = callPackage @@ -268856,7 +265759,6 @@ self: { description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "twentefp-websockets" = callPackage @@ -268907,7 +265809,6 @@ self: { description = "Rubik's cube solver"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "twfy-api-client" = callPackage @@ -268988,7 +265889,6 @@ self: { description = "Unix Command-Line Twitter and Identica Client"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "twilight-stm" = callPackage @@ -269001,7 +265901,6 @@ self: { description = "STM library with safe irrevocable I/O and inconsistency repair"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "twilio" = callPackage @@ -269049,7 +265948,6 @@ self: { description = "Twilio API interaction"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "twiml" = callPackage @@ -269161,7 +266059,6 @@ self: { description = "A Haskell-based CLI Twitter client"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "twitter-conduit" = callPackage @@ -269192,8 +266089,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Twitter API package with conduit interface and Streaming API support"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "twitter-enumerator" = callPackage @@ -269213,7 +266108,6 @@ self: { description = "Twitter API package with enumerator interface and Streaming API support"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "twitter-feed" = callPackage @@ -269308,8 +266202,6 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Text"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "txt-sushi" = callPackage @@ -269424,7 +266316,6 @@ self: { description = "Runtime type assertions for testing"; license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "type-booleans" = callPackage @@ -269452,7 +266343,6 @@ self: { description = "Utilities for caching type families results. Sometimes complex type families take long time to compile, so it is proficient to cache them and use the final result without the need of re-computation."; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "type-cereal" = callPackage @@ -269470,7 +266360,6 @@ self: { description = "Type-level serialization of type constructors"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "type-combinators" = callPackage @@ -269502,7 +266391,6 @@ self: { description = "Quasiquoters for the 'type-combinators' package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "type-combinators-singletons" = callPackage @@ -269515,7 +266403,6 @@ self: { description = "Interop between /type-combinators/ and /singletons/"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "type-digits" = callPackage @@ -269528,7 +266415,6 @@ self: { description = "Arbitrary-base type-level digits"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "type-eq" = callPackage @@ -269945,7 +266831,6 @@ self: { description = "Type-level comparison operator"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "type-ord-spine-cereal" = callPackage @@ -269962,7 +266847,6 @@ self: { description = "Generic type-level comparison of types"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "type-prelude" = callPackage @@ -269989,7 +266873,6 @@ self: { description = "Type-level sets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "type-settheory" = callPackage @@ -270059,7 +266942,6 @@ self: { description = "Type structure analysis"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "type-sub-th" = callPackage @@ -270085,7 +266967,6 @@ self: { description = "Substitute types for other types with Template Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "type-tree" = callPackage @@ -270254,7 +267135,6 @@ self: { description = "Bridge between encoding and typed-encoding packages"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "typed-process" = callPackage @@ -270294,7 +267174,7 @@ self: { description = "Typed and composable spreadsheets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; "typed-streams" = callPackage @@ -270317,7 +267197,6 @@ self: { description = "A stream based replacement for lists"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "typed-uuid" = callPackage @@ -270457,7 +267336,6 @@ self: { description = "Useful type level operations (type families and related operators)"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "typelevel-rewrite-rules" = callPackage @@ -270475,7 +267353,6 @@ self: { description = "Solve type equalities using custom type-level rewrite rules"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "typelevel-tensor" = callPackage @@ -270530,8 +267407,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Type level numbers using existing Nat functionality"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "typeof" = callPackage @@ -270654,7 +267529,6 @@ self: { description = "A documentation generator for TypeScript Definition files"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "typical" = callPackage @@ -270732,7 +267606,6 @@ self: { description = "Typson Beam Integration"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "typson-core" = callPackage @@ -270773,7 +267646,6 @@ self: { description = "Typson Esqueleto Integration"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "typson-selda" = callPackage @@ -270797,7 +267669,6 @@ self: { description = "Typson Selda Integration"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tyro" = callPackage @@ -270887,7 +267758,6 @@ self: { description = "Haskell Universal Two Factor helper toolbox library thing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uAgda" = callPackage @@ -270966,7 +267836,6 @@ self: { description = "Uber client for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uberlast" = callPackage @@ -271010,7 +267879,6 @@ self: { description = "The Ucam-Webauth protocol, used by Raven"; license = "(BSD-3-Clause OR Apache-2.0)"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ucam-webauth-types" = callPackage @@ -271217,7 +268085,6 @@ self: { description = "Part of UHC packaged as cabal/hackage installable library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uhc-util" = callPackage @@ -271238,7 +268105,6 @@ self: { description = "UHC utilities"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uhexdump" = callPackage @@ -271391,7 +268257,6 @@ self: { description = "A fast, cache-efficient, concurrent bloom filter"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unagi-chan" = callPackage @@ -271491,7 +268356,6 @@ self: { description = "Generic support for programming with names and binders"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unbound-generics" = callPackage @@ -271706,8 +268570,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Tiny package providing unescaping versions of show and print"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unexceptionalio" = callPackage @@ -271805,7 +268667,6 @@ self: { description = "Event handling for the uniform workbench"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uni-graphs" = callPackage @@ -271822,7 +268683,6 @@ self: { description = "Graphs"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uni-htk" = callPackage @@ -271840,7 +268700,6 @@ self: { description = "Graphical User Interface for Haskell Programs"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uni-posixutil" = callPackage @@ -271857,7 +268716,6 @@ self: { description = "Posix utilities for the uniform workbench"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uni-reactor" = callPackage @@ -271873,7 +268731,6 @@ self: { description = "Reactors for the uniform workbench"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uni-uDrawGraph" = callPackage @@ -271891,7 +268748,6 @@ self: { description = "Graphs binding"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uni-util" = callPackage @@ -271995,7 +268851,6 @@ self: { description = "Unicode normalization using the ICU library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) icu;}; "unicode-prelude" = callPackage @@ -272074,14 +268929,16 @@ self: { }) {}; "unicode-tricks" = callPackage - ({ mkDerivation, base, data-default, hspec, hspec-discover - , QuickCheck, text + ({ mkDerivation, base, containers, data-default, hspec + , hspec-discover, QuickCheck, text }: mkDerivation { pname = "unicode-tricks"; - version = "0.8.0.0"; - sha256 = "1ilbl1f5kigb09n1a8nkm484sjyvi7k3wnga6gj5jgss00xj4xfb"; - libraryHaskellDepends = [ base data-default QuickCheck text ]; + version = "0.9.1.0"; + sha256 = "1jqljawh6xvavp9g8mjlw4pkiagd59yybbizr9vcg70dd8pnanv2"; + libraryHaskellDepends = [ + base containers data-default QuickCheck text + ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Functions to work with unicode blocks more convenient"; @@ -272135,6 +268992,55 @@ self: { license = lib.licenses.bsd3; }) {}; + "uniform-algebras" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "uniform-algebras"; + version = "0.1.0"; + sha256 = "19grz10hagzi8x9am59i6jifm1zjf31698k8r4l7bbhyww4w6p91"; + libraryHaskellDepends = [ base ]; + description = "Pointless functions and a simplistic zero and monoid"; + license = lib.licenses.gpl2Only; + }) {}; + + "uniform-error" = callPackage + ({ mkDerivation, base, monads-tf, safe, uniform-strings }: + mkDerivation { + pname = "uniform-error"; + version = "0.1.0"; + sha256 = "1ap8wrnh08yvv9hwd92mp1g5fz4g7l0aij1h0hfl3j7ijd028pmx"; + libraryHaskellDepends = [ base monads-tf safe uniform-strings ]; + description = "Handling errors in the uniform framework"; + license = lib.licenses.gpl2Only; + }) {}; + + "uniform-fileio" = callPackage + ({ mkDerivation, base, bytestring, deepseq, directory, exceptions + , filepath, HTF, monads-tf, path, path-io, pipes, pureMD5 + , quickcheck-text, safe, test-invariant, text, uniform-algebras + , uniform-error, uniform-strings, uniform-time, unix, zlib + }: + mkDerivation { + pname = "uniform-fileio"; + version = "0.1.0"; + sha256 = "0rxhjn4qv2dbdycdfqblymyfj3wax586ar77zwdgkyld7v7s12ya"; + libraryHaskellDepends = [ + base bytestring deepseq directory exceptions filepath monads-tf + path path-io pipes pureMD5 safe text uniform-algebras uniform-error + uniform-strings uniform-time unix zlib + ]; + testHaskellDepends = [ + base bytestring deepseq directory exceptions filepath HTF monads-tf + path path-io pipes pureMD5 quickcheck-text safe test-invariant text + uniform-algebras uniform-error uniform-strings uniform-time unix + zlib + ]; + description = "Uniform file handling operations"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "uniform-io" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal , data-default-class, interruptible, iproute, monad-control @@ -272153,7 +269059,6 @@ self: { description = "Uniform IO over files, network, anything"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) openssl;}; "uniform-pair" = callPackage @@ -272172,6 +269077,56 @@ self: { license = lib.licenses.bsd3; }) {}; + "uniform-strings" = callPackage + ({ mkDerivation, base, bytestring, MissingH, monads-tf, network-uri + , pretty-show, safe, snap-core, split, text, text-icu + , uniform-algebras + }: + mkDerivation { + pname = "uniform-strings"; + version = "0.1.0"; + sha256 = "17w04fxx81gk02xl7ca64amc0hb06i77fbanhykp3qd70nd2k8ix"; + libraryHaskellDepends = [ + base bytestring MissingH monads-tf network-uri pretty-show safe + snap-core split text text-icu uniform-algebras + ]; + description = "Manipulate and convert strings of characters uniformly and consistently"; + license = lib.licenses.gpl2Only; + }) {}; + + "uniform-time" = callPackage + ({ mkDerivation, base, convertible, monads-tf, time + , uniform-algebras, uniform-error, uniform-strings + }: + mkDerivation { + pname = "uniform-time"; + version = "0.1.0"; + sha256 = "08p40xl4zzswhax3i6j4ps0zy2m9qsbcpj4b00xvizc3g9fxnzsh"; + libraryHaskellDepends = [ + base convertible monads-tf time uniform-algebras uniform-error + uniform-strings + ]; + description = "Time in the uniform framework"; + license = lib.licenses.gpl2Only; + }) {}; + + "uniformBase" = callPackage + ({ mkDerivation, base, uniform-algebras, uniform-error + , uniform-fileio, uniform-strings, uniform-time + }: + mkDerivation { + pname = "uniformBase"; + version = "0.1.0"; + sha256 = "1ya87jzfmzldd66rwxrccidkrpknqws5rslq9zdsjcdngn2w0sa9"; + libraryHaskellDepends = [ + base uniform-algebras uniform-error uniform-fileio uniform-strings + uniform-time + ]; + description = "A uniform base to build apps on"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "union" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, lens , profunctors, tagged, vinyl @@ -272188,8 +269143,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "union-find" = callPackage @@ -272444,7 +269397,6 @@ self: { description = "Usage examples for the uniqueness-periods-vector series of packages"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uniqueness-periods-vector-filters" = callPackage @@ -272717,8 +269669,6 @@ self: { ]; description = "A class for finite and recursively enumerable types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "universe-base" = callPackage @@ -272756,8 +269706,6 @@ self: { libraryHaskellDepends = [ base universe-base ]; description = "Universe instances for types from the base package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "universe-instances-extended" = callPackage @@ -272775,8 +269723,6 @@ self: { ]; description = "Universe instances for types from selected extra packages"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "universe-instances-trans" = callPackage @@ -272790,8 +269736,6 @@ self: { libraryHaskellDepends = [ base universe-base ]; description = "Universe instances for types from the transformers and mtl packages"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "universe-reverse-instances" = callPackage @@ -272843,7 +269787,6 @@ self: { description = "Construct a Dec's ancestor list"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "universum" = callPackage @@ -272919,7 +269862,6 @@ self: { description = "Comprehensive bindings to fcntl(2)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unix-handle" = callPackage @@ -273027,7 +269969,6 @@ self: { description = "Straightforward bindings to the posix API"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unix-time" = callPackage @@ -273133,8 +270074,8 @@ self: { }: mkDerivation { pname = "unliftio"; - version = "0.2.14"; - sha256 = "0gwifnzfcpjhzch06vkx1jkl7jf6j844grd4frl7w513bipb7w0r"; + version = "0.2.15"; + sha256 = "08yclgvk6slaisqc08b8bblh4fl77qicj0w90l46q419ya3drixd"; libraryHaskellDepends = [ async base bytestring deepseq directory filepath process stm time transformers unix unliftio-core @@ -273151,6 +270092,32 @@ self: { license = lib.licenses.mit; }) {}; + "unliftio_0_2_16" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, gauge, hspec, process, QuickCheck, stm, time + , transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.16"; + sha256 = "1zawfyjr8immg5sqvwknwqp3xym0acjhlqm0y6xs63wjvp72wb3r"; + libraryHaskellDepends = [ + async base bytestring deepseq directory filepath process stm time + transformers unix unliftio-core + ]; + testHaskellDepends = [ + async base bytestring containers deepseq directory filepath hspec + process QuickCheck stm time transformers unix unliftio-core + ]; + benchmarkHaskellDepends = [ + async base bytestring deepseq directory filepath gauge process stm + time transformers unix unliftio-core + ]; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -273236,8 +270203,6 @@ self: { ]; description = "Generalization of io-streams to MonadUnliftIO"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unlit" = callPackage @@ -273436,7 +270401,6 @@ self: { description = "maybes of numeric values with fewer indirections"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unpacked-maybe-text" = callPackage @@ -273465,7 +270429,6 @@ self: { description = "An unpacked these data type"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unpacked-validation" = callPackage @@ -273483,7 +270446,6 @@ self: { description = "An unpacked validation data type"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unparse-attoparsec" = callPackage @@ -273505,7 +270467,6 @@ self: { description = "An attoparsec roundtrip"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unroll-ghc-plugin" = callPackage @@ -273588,7 +270549,6 @@ self: { description = "Solve Boggle-like word games"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unsequential" = callPackage @@ -273701,7 +270661,6 @@ self: { description = "Command-line tool to generate paths for moving upward in a file system"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "up-grade" = callPackage @@ -273838,7 +270797,6 @@ self: { description = "Talk to Urbit from Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "urbit-api" = callPackage @@ -273856,7 +270814,6 @@ self: { description = "Talk to Urbit from Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "urbit-hob" = callPackage @@ -273873,7 +270830,6 @@ self: { description = "Hoon-style atom manipulation and printing functions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ureader" = callPackage @@ -273898,7 +270854,6 @@ self: { description = "Minimalistic CLI RSS reader"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "urembed" = callPackage @@ -273920,7 +270875,6 @@ self: { description = "Ur/Web static content generator"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uri" = callPackage @@ -274050,7 +271004,6 @@ self: { description = "Read and write URIs (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uri-enumerator-file" = callPackage @@ -274070,7 +271023,6 @@ self: { description = "uri-enumerator backend for the file scheme (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uri-parse" = callPackage @@ -274165,7 +271117,6 @@ self: { description = "Memory efficient url type and parser"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "url-decoders" = callPackage @@ -274289,7 +271240,6 @@ self: { description = "Painfully simple URL deployment"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "urn" = callPackage @@ -274368,7 +271318,6 @@ self: { description = "Communicate with USB devices"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "usb-enumerator" = callPackage @@ -274386,7 +271335,6 @@ self: { description = "Iteratee enumerators for the usb package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "usb-hid" = callPackage @@ -274401,7 +271349,6 @@ self: { description = "Parser and request Library for USB HIDs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "usb-id-database" = callPackage @@ -274422,7 +271369,6 @@ self: { description = "A database of USB identifiers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "usb-iteratee" = callPackage @@ -274440,7 +271386,6 @@ self: { description = "Iteratee enumerators for the usb package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "usb-safe" = callPackage @@ -274458,7 +271403,6 @@ self: { description = "Type-safe communication with USB devices"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "useragents" = callPackage @@ -274488,8 +271432,6 @@ self: { ]; description = "The UserId type and useful instances for web development"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "users" = callPackage @@ -274725,7 +271667,6 @@ self: { description = "Exceptional utilities"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "util-logict" = callPackage @@ -274791,7 +271732,6 @@ self: { description = "Utilities for stateful primitive types and types based on them"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "util-universe" = callPackage @@ -274855,7 +271795,6 @@ self: { description = "Utilities for compiler construction: example programs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uu-cco-hut-parsing" = callPackage @@ -274868,7 +271807,6 @@ self: { description = "Utilities for compiler construction: Feedback wrapper around parser in uulib"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uu-cco-uu-parsinglib" = callPackage @@ -274881,7 +271819,6 @@ self: { description = "Utilities for compiler construction: Feedback wrapper around parser in uu-parsinglib"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uu-interleaved" = callPackage @@ -275007,8 +271944,6 @@ self: { libraryHaskellDepends = [ base diagrams-lib SVGFonts ]; description = "Utility for drawing attribute grammar pictures with the diagrams package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uuagd" = callPackage @@ -275034,8 +271969,8 @@ self: { }: mkDerivation { pname = "uuid"; - version = "1.3.14"; - sha256 = "1msj296faldr9fiwjqi9ixx3xl638mg6ffk7axic14wf8b9zw73a"; + version = "1.3.15"; + sha256 = "0r05h16gd7fgfpq9iz43jcn9jzrgfa0gk4cv1xy0p4rli66rb1gq"; libraryHaskellDepends = [ base binary bytestring cryptohash-md5 cryptohash-sha1 entropy network-info random text time uuid-types @@ -275082,7 +272017,6 @@ self: { description = "UUID parsing using byteverse packages"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uuid-crypto" = callPackage @@ -275102,7 +272036,6 @@ self: { description = "Reversable and secure encoding of object ids as uuids"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uuid-le" = callPackage @@ -275129,6 +272062,8 @@ self: { ]; description = "Orphan instances for the UUID datatype"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "uuid-quasi" = callPackage @@ -275145,18 +272080,19 @@ self: { "uuid-types" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, ghc-byteorder , hashable, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, text + , tasty-quickcheck, template-haskell, text }: mkDerivation { pname = "uuid-types"; - version = "1.0.4"; - sha256 = "01pc93z6in6g717mxkhl111qc842fz1c2z7ml6n5jhm7lg52ran2"; + version = "1.0.5"; + sha256 = "1pd7xd6inkmmwjscf7pmiwqjks9y0gi1p8ahqbapvh34gadvhs5d"; libraryHaskellDepends = [ - base binary bytestring deepseq hashable random text + base binary bytestring deepseq hashable random template-haskell + text ]; testHaskellDepends = [ base binary bytestring ghc-byteorder QuickCheck tasty tasty-hunit - tasty-quickcheck + tasty-quickcheck template-haskell ]; description = "Type definitions for Universally Unique Identifiers"; license = lib.licenses.bsd3; @@ -275219,7 +272155,6 @@ self: { description = "Efficient algorithms for uvector unboxed arrays"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "uxadt" = callPackage @@ -275261,7 +272196,6 @@ self: { description = "interface to Video For Linux Two (V4L2)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "v4l2-examples" = callPackage @@ -275276,7 +272210,6 @@ self: { description = "video for linux two examples"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vabal" = callPackage @@ -275299,7 +272232,6 @@ self: { description = "the cabal companion"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vabal-lib" = callPackage @@ -275349,7 +272281,6 @@ self: { description = "Visualize live Haskell data structures using vacuum, graphviz and cairo"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vacuum-graphviz" = callPackage @@ -275362,7 +272293,6 @@ self: { description = "A library for transforming vacuum graphs into GraphViz output"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vacuum-opengl" = callPackage @@ -275383,7 +272313,6 @@ self: { description = "Visualize live Haskell data structures using vacuum, graphviz and OpenGL"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vacuum-ubigraph" = callPackage @@ -275396,7 +272325,6 @@ self: { description = "Visualize Haskell data structures using vacuum and Ubigraph"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vado" = callPackage @@ -275472,8 +272400,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "Input validation combinator library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "validated-literals" = callPackage @@ -275865,7 +272791,6 @@ self: { description = "variable-precision floating point"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "variables" = callPackage @@ -275897,6 +272822,8 @@ self: { benchmarkHaskellDepends = [ base criterion mmorph mtl ]; description = "Abstractions for working with variadic functions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "variation" = callPackage @@ -276065,7 +272992,6 @@ self: { description = "patricia tries modeled above VCache"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vcard" = callPackage @@ -276080,7 +273006,6 @@ self: { description = "A library for parsing/printing vCards from/to various formats"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vcatt" = callPackage @@ -276128,6 +273053,31 @@ self: { broken = true; }) {}; + "vcs-ignore" = callPackage + ({ mkDerivation, base, containers, directory, doctest, exceptions + , filepath, Glob, hspec, hspec-discover, optparse-applicative, text + }: + mkDerivation { + pname = "vcs-ignore"; + version = "0.0.1.0"; + sha256 = "0zz4vwvzxgdqpi30ncp82irdwjyam23z0bdz834xxghfg70q2b5m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory exceptions filepath Glob text + ]; + executableHaskellDepends = [ + base containers directory exceptions filepath optparse-applicative + text + ]; + testHaskellDepends = [ + base containers directory doctest exceptions filepath hspec text + ]; + testToolDepends = [ hspec-discover ]; + description = "Library for handling files ignored by VCS systems"; + license = lib.licenses.bsd3; + }) {}; + "vcs-revision" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -276172,7 +273122,6 @@ self: { description = "GUI library for source code management systems"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vcswrapper" = callPackage @@ -276280,7 +273229,6 @@ self: { description = "Accelerate instances for vect-floating types"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vect-opengl" = callPackage @@ -276504,7 +273452,6 @@ self: { description = "Storable vectors with cpu-independent representation"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vector-extras" = callPackage @@ -276610,7 +273557,6 @@ self: { description = "Instances of the Data.Collections classes for Data.Vector.*"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vector-mmap" = callPackage @@ -276808,7 +273754,6 @@ self: { description = "Text implementation based on unboxed char vector"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vector-th-unbox" = callPackage @@ -276867,8 +273812,6 @@ self: { ]; description = "Easily view Vega or Vega-Lite visualizations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "venzone" = callPackage @@ -276896,7 +273839,6 @@ self: { description = "ASCII platform-adventure game"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "verbalexpressions" = callPackage @@ -276965,7 +273907,6 @@ self: { description = "JSON instances and JSON Schema for verdict"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "verifiable-expressions" = callPackage @@ -276981,8 +273922,9 @@ self: { ]; description = "An intermediate language for Hoare logic style verification"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; + platforms = [ + "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux" + ]; }) {}; "verify" = callPackage @@ -277094,7 +274036,6 @@ self: { description = "Servant combinators for the versioning library"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "versions" = callPackage @@ -277157,7 +274098,6 @@ self: { description = "types for ingesting vflow data with aeson"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vformat" = callPackage @@ -277236,7 +274176,6 @@ self: { description = "VFR waypoints, as published in the AIP (ERSA)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vgrep" = callPackage @@ -277268,8 +274207,6 @@ self: { ]; description = "A pager for grep"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vhd" = callPackage @@ -277401,7 +274338,6 @@ self: { description = "An extensible dead-man's switch system"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vimeta" = callPackage @@ -277428,8 +274364,6 @@ self: { ]; description = "Frontend for video metadata tagging tools"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vimus" = callPackage @@ -277600,7 +274534,6 @@ self: { description = "Initial project template from stack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vinyl-plus" = callPackage @@ -277711,7 +274644,6 @@ self: { description = "An XMMS2 client"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "visual-graphrewrite" = callPackage @@ -277740,7 +274672,6 @@ self: { description = "Visualize the graph-rewrite steps of a Haskell program"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "visual-prof" = callPackage @@ -277904,7 +274835,6 @@ self: { description = "Phase vocoder"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vocoder-audio" = callPackage @@ -277924,7 +274854,6 @@ self: { description = "Phase vocoder for conduit-audio"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vocoder-conduit" = callPackage @@ -277947,7 +274876,6 @@ self: { description = "Phase vocoder for Conduit"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vocoder-dunai" = callPackage @@ -277970,7 +274898,6 @@ self: { description = "Phase vocoder for Dunai and Rhine"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "voicebase" = callPackage @@ -277996,7 +274923,6 @@ self: { description = "Upload audio files to voicebase to get a transcription"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "void" = callPackage @@ -278106,6 +275032,9 @@ self: { executableSystemDepends = [ quat vrpn ]; description = "Bindings to VRPN"; license = lib.licenses.mit; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {quat = null; inherit (pkgs) vrpn;}; "vt-utils" = callPackage @@ -278277,7 +275206,6 @@ self: { description = "Extra vty-ui functionality not included in the core library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vulkan" = callPackage @@ -278290,7 +275218,7 @@ self: { libraryPkgconfigDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; license = lib.licenses.bsd3; - platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; }) {vulkan = null;}; "vulkan-api" = callPackage @@ -278302,8 +275230,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Low-level low-overhead vulkan api bindings"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vulkan-utils" = callPackage @@ -278325,6 +275251,9 @@ self: { testHaskellDepends = [ base doctest ]; description = "Utils for the vulkan package"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "waargonaut" = callPackage @@ -278364,7 +275293,6 @@ self: { description = "JSON wrangling"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wacom-daemon" = callPackage @@ -278435,7 +275363,6 @@ self: { description = "A haskell binding of the Web Audio API ala blank-canvas"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wai" = callPackage @@ -278556,7 +275483,6 @@ self: { description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wai-conduit" = callPackage @@ -278641,7 +275567,6 @@ self: { description = "A web server for the development of WAI compliant web applications"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wai-digestive-functors" = callPackage @@ -278860,8 +275785,6 @@ self: { ]; description = "Wrap WAI applications to run on AWS Lambda"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wai-handler-launch" = callPackage @@ -278908,7 +275831,6 @@ self: { description = "Web Application Interface handler using snap-server. (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wai-handler-webkit" = callPackage @@ -279231,7 +276153,6 @@ self: { description = "Caching middleware for WAI"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wai-middleware-cache-redis" = callPackage @@ -279251,7 +276172,6 @@ self: { description = "Redis backend for wai-middleware-cache"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wai-middleware-caching" = callPackage @@ -279358,7 +276278,6 @@ self: { description = "Wai Middleware for Consul"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wai-middleware-content-type" = callPackage @@ -279392,7 +276311,6 @@ self: { description = "Route to different middlewares based on the incoming Accept header"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wai-middleware-crowd" = callPackage @@ -279639,7 +276557,6 @@ self: { description = "Middleware that communicates to Rollbar"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wai-middleware-route" = callPackage @@ -279661,7 +276578,6 @@ self: { description = "Wai dispatch middleware"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wai-middleware-slack-verify" = callPackage @@ -279800,8 +276716,8 @@ self: { }: mkDerivation { pname = "wai-middleware-validation"; - version = "0.1.0.0"; - sha256 = "0cbp32j31xkmniml56gnh278g94zhhfc8xlp842n8lll5hh13bf4"; + version = "0.1.0.2"; + sha256 = "1qrkfy31slmlbiw9gkz96yd9q6mrw72rjyjl0a5pnjif5ps12vpq"; libraryHaskellDepends = [ aeson base bytestring containers filepath http-types insert-ordered-containers lens openapi3 text wai @@ -279812,8 +276728,6 @@ self: { ]; description = "WAI Middleware to validate the request and response bodies"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wai-middleware-verbs" = callPackage @@ -280270,7 +277184,6 @@ self: { description = "Thrift transport layer for Wai"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wai-throttler" = callPackage @@ -280446,7 +277359,6 @@ self: { description = "A generator of comics based on some ascertainable data about the requester"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wallpaper" = callPackage @@ -280659,7 +277571,6 @@ self: { description = "Warp and Wai Library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wasm" = callPackage @@ -280842,7 +277753,6 @@ self: { description = "Parse WaveSurfer files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wavy" = callPackage @@ -280864,7 +277774,6 @@ self: { description = "Process WAVE files in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wcwidth" = callPackage @@ -281018,7 +277927,6 @@ self: { description = "Bindings for the Mongrel2 web server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "web-output" = callPackage @@ -281059,7 +277967,6 @@ self: { description = "Monoidally construct web pages"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "web-plugins" = callPackage @@ -281128,7 +278035,6 @@ self: { description = "representations of a web page"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "web-routes" = callPackage @@ -281235,7 +278141,6 @@ self: { description = "portable, type-safe URL routing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "web-routes-th" = callPackage @@ -281300,7 +278205,6 @@ self: { description = "simple routing library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "web3" = callPackage @@ -281341,7 +278245,6 @@ self: { description = "Web3 API for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "webapi" = callPackage @@ -281369,7 +278272,6 @@ self: { description = "WAI based library for web api"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "webapp" = callPackage @@ -281413,8 +278315,6 @@ self: { ]; description = "Web Authentication API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "webby" = callPackage @@ -281521,7 +278421,6 @@ self: { description = "Build a WAI Application from Webcrank Resources"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "webdriver" = callPackage @@ -281632,7 +278531,6 @@ self: { description = "Bindings to the WebDriver API"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "webex-teams-api" = callPackage @@ -281851,6 +278749,9 @@ self: { libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) webkitgtk;}; "webkitgtk3" = callPackage @@ -281972,7 +278873,6 @@ self: { description = "HTTP server library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "webshow" = callPackage @@ -282257,7 +279157,6 @@ self: { description = "Writer monad which uses semiring constraint"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "weighted-regexp" = callPackage @@ -282369,7 +279268,6 @@ self: { description = "A chat interface for playing werewolf in Slack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "what4" = callPackage @@ -282408,7 +279306,6 @@ self: { description = "Solver-agnostic symbolic values support for issuing queries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wheb-mongo" = callPackage @@ -282421,7 +279318,6 @@ self: { description = "MongoDB plugin for Wheb"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wheb-redis" = callPackage @@ -282434,7 +279330,6 @@ self: { description = "Redis connection for Wheb"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wheb-strapped" = callPackage @@ -282447,7 +279342,6 @@ self: { description = "Strapped templates for Wheb"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "which" = callPackage @@ -282520,7 +279414,6 @@ self: { description = "Whitespace, an esoteric programming language"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "whois" = callPackage @@ -282605,7 +279498,6 @@ self: { description = "Instances for wide-word"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wigner-symbols" = callPackage @@ -282674,7 +279566,6 @@ self: { description = "Wikipedia EPUB E-Book construction from Firefox history"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wild-bind" = callPackage @@ -282711,8 +279602,6 @@ self: { ]; description = "Graphical indicator for WildBind"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wild-bind-task-x11" = callPackage @@ -282729,8 +279618,6 @@ self: { testHaskellDepends = [ base ]; description = "Task to install and export everything you need to use WildBind in X11"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wild-bind-x11" = callPackage @@ -282835,7 +279722,6 @@ self: { description = "Implements Windows Live Web Authentication and Delegated Authentication"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "winerror" = callPackage @@ -282886,8 +279772,6 @@ self: { ]; description = "A compact, well-typed seralisation format for Haskell values"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "winio" = callPackage @@ -282905,7 +279789,6 @@ self: { description = "I/O library for Windows"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {kernel32 = null; ws2_32 = null;}; "wire-streams" = callPackage @@ -282985,29 +279868,13 @@ self: { }) {}; "witch" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec - , template-haskell, text - }: - mkDerivation { - pname = "witch"; - version = "0.2.0.2"; - sha256 = "13y5zbs9lwniamwq2cm45rsc7xp11ny2m7x3f965qd6az66ds396"; - libraryHaskellDepends = [ - base bytestring containers template-haskell text - ]; - testHaskellDepends = [ base bytestring containers hspec text ]; - description = "Convert values from one type into another"; - license = lib.licenses.isc; - }) {}; - - "witch_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, hspec, QuickCheck , template-haskell, text }: mkDerivation { pname = "witch"; - version = "0.2.1.0"; - sha256 = "0zvq9axjmqksk4fqq42qgbj4whx27p4m40cgvdqmq4vpj4csvswl"; + version = "0.2.1.1"; + sha256 = "0z3c7ni1sd4mqv2v35sj2qls9bdkkk3sclpclxll420b7qbicf1r"; libraryHaskellDepends = [ base bytestring containers template-haskell text ]; @@ -283016,7 +279883,6 @@ self: { ]; description = "Convert values from one type into another"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "with-index" = callPackage @@ -283276,7 +280142,6 @@ self: { description = "ANSI Terminal support with wl-pprint-extras"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wl-pprint-console" = callPackage @@ -283331,7 +280196,6 @@ self: { description = "A color pretty printer with terminfo support"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wl-pprint-text" = callPackage @@ -283362,7 +280226,6 @@ self: { description = "Haskell bindings for the wlc library"; license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; - broken = true; }) {wlc = null;}; "wobsurv" = callPackage @@ -283399,7 +280262,6 @@ self: { description = "A simple and highly performant HTTP file server"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "woe" = callPackage @@ -283469,7 +280331,6 @@ self: { description = "Amazon Simple Workflow Service Wrapper"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "woot" = callPackage @@ -283500,8 +280361,6 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Words of arbitrary size"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "word-trie" = callPackage @@ -283627,8 +280486,6 @@ self: { benchmarkHaskellDepends = [ base criterion pandoc text ]; description = "Get word counts and distributions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wordcloud" = callPackage @@ -283866,7 +280723,6 @@ self: { description = "Utilities (e.g. Googling the clipboard contents) for the `workflow` pacakge"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "workflow-osx" = callPackage @@ -283911,7 +280767,6 @@ self: { description = "manipulate `workflow-types:Workflow`'s"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "workflow-types" = callPackage @@ -283931,7 +280786,6 @@ self: { description = "Automate keyboard\\/mouse\\/clipboard\\/application interaction"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "workflow-windows" = callPackage @@ -284035,7 +280889,6 @@ self: { description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wrecker" = callPackage @@ -284075,7 +280928,6 @@ self: { description = "An HTTP Performance Benchmarker"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wrecker-ui" = callPackage @@ -284109,7 +280961,6 @@ self: { description = "A web interface for Wrecker, the HTTP Performance Benchmarker"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wreq" = callPackage @@ -284271,7 +281122,6 @@ self: { description = "Colour space transformations and metrics"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "write-buffer-core" = callPackage @@ -284333,7 +281183,6 @@ self: { description = "WriteT and RWST monad transformers (Reexport with all dependencies)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "writer-cps-lens" = callPackage @@ -284447,7 +281296,6 @@ self: { description = "A simple CLI utility for interacting with a websocket"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ws-chans" = callPackage @@ -284531,8 +281379,6 @@ self: { ]; description = "Terminal emulator over websockets"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wsjtx-udp" = callPackage @@ -284572,7 +281418,6 @@ self: { description = "A-little-higher-level WebSocket client"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wstunnel" = callPackage @@ -284630,7 +281475,6 @@ self: { description = "GTK tools within Wojcik Tool Kit"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wu-wei" = callPackage @@ -284647,7 +281491,6 @@ self: { description = "Unimportant Unix adminstration tool"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wumpus-basic" = callPackage @@ -284664,7 +281507,6 @@ self: { description = "Basic objects and system code built on Wumpus-Core"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wumpus-core" = callPackage @@ -284696,7 +281538,6 @@ self: { description = "High-level drawing objects built on Wumpus-Basic"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wumpus-microprint" = callPackage @@ -284713,7 +281554,6 @@ self: { description = "Microprints - \"greek-text\" pictures"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wumpus-tree" = callPackage @@ -284731,7 +281571,6 @@ self: { description = "Drawing trees"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wuss" = callPackage @@ -284774,7 +281613,6 @@ self: { description = "Try to avoid the asteroids with your space ship"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wxFruit" = callPackage @@ -284790,7 +281628,6 @@ self: { description = "An implementation of Fruit using wxHaskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wxSimpleCanvas" = callPackage @@ -284803,7 +281640,6 @@ self: { description = "Simple zoomable canvas for wxHaskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wxc" = callPackage @@ -284883,7 +281719,6 @@ self: { description = "An example of how to implement a basic notepad with wxHaskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wxturtle" = callPackage @@ -284900,7 +281735,6 @@ self: { description = "turtle like LOGO with wxHaskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wybor" = callPackage @@ -284941,7 +281775,6 @@ self: { description = "An autoresponder for Dragon Go Server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "x-dsp" = callPackage @@ -285238,7 +282071,6 @@ self: { description = "A wget-like utility for retrieving files from XDCC bots on IRC"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xdg-basedir" = callPackage @@ -285300,8 +282132,6 @@ self: { ]; description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xeno" = callPackage @@ -285390,6 +282220,7 @@ self: { executableSystemDepends = [ xgboost ]; description = "XGBoost library for Haskell"; license = lib.licenses.mit; + platforms = [ "i686-linux" "x86_64-darwin" "x86_64-linux" ]; }) {inherit (pkgs) xgboost;}; "xhaskell-library" = callPackage @@ -285441,7 +282272,6 @@ self: { description = "Atom cache for XHB"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xhb-ewmh" = callPackage @@ -285459,7 +282289,6 @@ self: { description = "EWMH utilities for XHB"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xhtml_3000_2_2_1" = callPackage @@ -285716,8 +282545,6 @@ self: { testHaskellDepends = [ base ]; description = "Xlsx table cell value extraction utility"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xlsx-templater" = callPackage @@ -285784,7 +282611,6 @@ self: { description = "Parse XML catalog files (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xml-conduit" = callPackage @@ -285935,7 +282761,6 @@ self: { description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xml-enumerator-combinators" = callPackage @@ -285954,7 +282779,6 @@ self: { description = "Parser combinators for xml-enumerator and compatible XML parsers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xml-extractors" = callPackage @@ -286113,7 +282937,6 @@ self: { description = "Monadic extensions to the xml package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xml-optics" = callPackage @@ -286170,7 +282993,6 @@ self: { description = "XML parser which uses simple-pipe"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xml-prettify" = callPackage @@ -286208,7 +283030,6 @@ self: { description = "Push XML from/to client to/from server over XMPP or HTTP"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xml-query" = callPackage @@ -286239,7 +283060,6 @@ self: { description = "A binding for the \"xml-query\" and \"xml-conduit\" libraries"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xml-query-xml-types" = callPackage @@ -286264,7 +283084,6 @@ self: { description = "An interpreter of \"xml-query\" queries for the \"xml-types\" documents"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xml-to-json" = callPackage @@ -286322,7 +283141,6 @@ self: { description = "Typed XML encoding for an xml-conduit backend"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xml-tydom-core" = callPackage @@ -286408,7 +283226,6 @@ self: { description = "Convert BLAST output in XML format to CSV or HTML"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xmlbf" = callPackage @@ -286541,7 +283358,6 @@ self: { description = "Show tv channels in the terminal"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xmms2-client" = callPackage @@ -286559,7 +283375,6 @@ self: { description = "An XMMS2 client library"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xmms2-client-glib" = callPackage @@ -286573,7 +283388,6 @@ self: { description = "An XMMS2 client library — GLib integration"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xmobar" = callPackage @@ -286710,7 +283524,6 @@ self: { description = "Third party extensions for xmonad"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xmonad-contrib-gpl" = callPackage @@ -286793,6 +283606,9 @@ self: { ]; description = "Third party extensions for xmonad with wacky dependencies"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "xmonad-screenshot" = callPackage @@ -286870,6 +283686,9 @@ self: { ]; description = "XMonad volume controls"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "xmonad-wallpaper" = callPackage @@ -286917,7 +283736,6 @@ self: { description = "XMPP implementation using simple-PIPE"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xor" = callPackage @@ -287001,7 +283819,6 @@ self: { description = "text builder for xournal file format"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xournal-convert" = callPackage @@ -287024,7 +283841,6 @@ self: { description = "convert utility for xoj files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xournal-parser" = callPackage @@ -287045,7 +283861,6 @@ self: { description = "Xournal file parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xournal-render" = callPackage @@ -287064,7 +283879,6 @@ self: { description = "Xournal file renderer"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xournal-types" = callPackage @@ -287242,7 +284056,6 @@ self: { description = "eXtended & Typed Controls for wxHaskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xtest" = callPackage @@ -287490,7 +284303,6 @@ self: { description = "Enumerator-based interface to YAJL, an event-based JSON implementation"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yak" = callPackage @@ -287554,7 +284366,6 @@ self: { description = "A wrapper of servant"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yam-app" = callPackage @@ -287614,7 +284425,6 @@ self: { description = "Yam DataSource Middleware"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yam-job" = callPackage @@ -287641,7 +284451,6 @@ self: { description = "Yam Logger"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yam-redis" = callPackage @@ -287659,7 +284468,6 @@ self: { description = "Yam Redis Middleware"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yam-servant" = callPackage @@ -287699,7 +284507,6 @@ self: { description = "Yam transaction"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yam-transaction-odbc" = callPackage @@ -287713,7 +284520,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yam-transaction-postgresql" = callPackage @@ -287758,7 +284564,6 @@ self: { description = "Yam Web"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yamemo" = callPackage @@ -287917,7 +284722,6 @@ self: { description = "Scotty server backend for yaml-rpc"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yaml-rpc-snap" = callPackage @@ -287935,7 +284739,6 @@ self: { description = "Snap server backend for yaml-rpc"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yaml-union" = callPackage @@ -287990,7 +284793,6 @@ self: { description = "Flexible declarative YAML parsing toolkit"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yaml2owl" = callPackage @@ -288326,7 +285128,6 @@ self: { description = "Image IO for Yarr library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) libdevil;}; "yasi" = callPackage @@ -288346,8 +285147,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Yet another string interpolator"; license = lib.licenses.cc0; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yate" = callPackage @@ -288387,7 +285186,6 @@ self: { description = "yet another visual editor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yaya" = callPackage @@ -288484,7 +285282,6 @@ self: { description = "Additional utilities to work with Yhc Core"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yeamer" = callPackage @@ -288521,7 +285318,6 @@ self: { description = "Yesod-based server for interactive presentation slides"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yeganesh" = callPackage @@ -288600,7 +285396,6 @@ self: { description = "YesQL-style SQL database abstraction (legacy compatibility wrapper)"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yeshql-core" = callPackage @@ -288763,7 +285558,6 @@ self: { description = "Automatically generate article previews for a yesod site"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-auth" = callPackage @@ -289016,7 +285810,6 @@ self: { description = "LDAP Authentication for Yesod"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-auth-ldap-mediocre" = callPackage @@ -289076,7 +285869,6 @@ self: { description = "A yesod-auth plugin for LTI 1.3"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-auth-nopassword" = callPackage @@ -289133,8 +285925,29 @@ self: { testHaskellDepends = [ base hspec uri-bytestring ]; description = "OAuth 2.0 authentication plugins"; license = lib.licenses.mit; + }) {}; + + "yesod-auth-oauth2_0_6_3_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, cryptonite, errors + , hoauth2, hspec, http-client, http-conduit, http-types, memory + , microlens, mtl, safe-exceptions, text, unliftio, uri-bytestring + , yesod-auth, yesod-core + }: + mkDerivation { + pname = "yesod-auth-oauth2"; + version = "0.6.3.1"; + sha256 = "1q49a99n2h1b06zm0smqqxr9jr487b14cf8xmayvkqr0q1q5xrwa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cryptonite errors hoauth2 http-client + http-conduit http-types memory microlens mtl safe-exceptions text + unliftio uri-bytestring yesod-auth yesod-core + ]; + testHaskellDepends = [ base hspec uri-bytestring ]; + description = "OAuth 2.0 authentication plugins"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-auth-pam" = callPackage @@ -289254,7 +286067,6 @@ self: { description = "Helper functions for using yesod with colonnade"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-comments" = callPackage @@ -289317,7 +286129,6 @@ self: { description = "Continuations for Yesod"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-core" = callPackage @@ -289357,6 +286168,44 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-core_1_6_20" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, bytestring, case-insensitive, cereal, clientsession + , conduit, conduit-extra, containers, cookie, deepseq, entropy + , fast-logger, gauge, hspec, hspec-expectations, http-types, HUnit + , memory, monad-logger, mtl, network, parsec, path-pieces + , primitive, random, resourcet, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.20"; + sha256 = "1f3imbd22i9vl30760063p308byddwxafpl5hdric2z7vmnxayqy"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq entropy fast-logger http-types memory + monad-logger mtl parsec path-pieces primitive random resourcet + shakespeare template-haskell text time transformers unix-compat + unliftio unordered-containers vector wai wai-extra wai-logger warp + word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces random resourcet shakespeare streaming-commons + template-haskell text transformers unliftio wai wai-extra warp + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text + ]; + description = "Creation of type-safe, RESTful web applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -289534,7 +286383,6 @@ self: { description = "Example programs using the Yesod Web Framework. (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) sqlite;}; "yesod-fast-devel" = callPackage @@ -289577,8 +286425,6 @@ self: { ]; description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-fb" = callPackage @@ -289821,7 +286667,6 @@ self: { description = "Code for using the ip package with yesod"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-job-queue" = callPackage @@ -289919,7 +286764,6 @@ self: { description = "Yesod library for MangoPay API access"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-markdown" = callPackage @@ -289938,8 +286782,6 @@ self: { testHaskellDepends = [ base blaze-html hspec text ]; description = "Tools for using markdown in a yesod application"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-media-simple" = callPackage @@ -289956,8 +286798,6 @@ self: { ]; description = "Simple display of media types, served by yesod"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-newsfeed" = callPackage @@ -289998,8 +286838,6 @@ self: { time unliftio unliftio-core wai-extra yesod yesod-core yesod-test ]; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-paginate" = callPackage @@ -290070,7 +286908,6 @@ self: { description = "Yesod plugin to use PayPal with the paypal-rest-client library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-persistent" = callPackage @@ -290080,8 +286917,8 @@ self: { }: mkDerivation { pname = "yesod-persistent"; - version = "1.6.0.6"; - sha256 = "169bwdnaxw926yr5wbcgf7n6v914sgv2vw6ywc95b5xpm0i0dyph"; + version = "1.6.0.7"; + sha256 = "102xmp7n08sk1g5rv31jpln2v9kqf1zsqsnmi83mnhmgggcbj1k4"; libraryHaskellDepends = [ base blaze-builder conduit persistent persistent-template resource-pool resourcet transformers yesod-core @@ -290162,7 +286999,6 @@ self: { description = "Meta package for Yesod (deprecated)"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-pnotify" = callPackage @@ -290218,7 +287054,6 @@ self: { description = "PureScript integration for Yesod"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-raml" = callPackage @@ -290267,7 +287102,6 @@ self: { description = "The raml helper executable"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-raml-docs" = callPackage @@ -290285,7 +287119,6 @@ self: { description = "A html documentation generator library for RAML"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-raml-mock" = callPackage @@ -290310,7 +287143,6 @@ self: { description = "A mock-handler generator library from RAML"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-recaptcha" = callPackage @@ -290404,7 +287236,6 @@ self: { description = "generate TypeScript routes for Yesod"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-rst" = callPackage @@ -290477,7 +287308,6 @@ self: { description = "Redis-Powered Sessions for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-sitemap" = callPackage @@ -290875,8 +287705,6 @@ self: { ]; description = "Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-contrib" = callPackage @@ -290927,8 +287755,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq yi-rope ]; description = "Yi editor core library"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-dynamic-configuration" = callPackage @@ -290945,8 +287771,6 @@ self: { ]; description = "Dynamic configuration support for Yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-emacs-colours" = callPackage @@ -290958,8 +287782,6 @@ self: { libraryHaskellDepends = [ base containers split yi-language ]; description = "Simple mapping from colour names used in emacs to Color"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-frontend-pango" = callPackage @@ -290979,8 +287801,6 @@ self: { ]; description = "Pango frontend for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-frontend-vty" = callPackage @@ -290998,8 +287818,6 @@ self: { ]; description = "Vty frontend for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-fuzzy-open" = callPackage @@ -291018,8 +287836,6 @@ self: { ]; description = "Fuzzy open plugin for yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-gtk" = callPackage @@ -291047,8 +287863,6 @@ self: { ]; description = "Yi editor incremental reader"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-keymap-cua" = callPackage @@ -291064,8 +287878,6 @@ self: { ]; description = "Cua keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-keymap-emacs" = callPackage @@ -291083,8 +287895,6 @@ self: { ]; description = "Emacs keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-keymap-vim" = callPackage @@ -291111,8 +287921,6 @@ self: { ]; description = "Vim keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-language" = callPackage @@ -291140,8 +287948,6 @@ self: { ]; description = "Collection of language-related Yi libraries"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-misc-modes" = callPackage @@ -291159,8 +287965,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor miscellaneous modes"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-mode-haskell" = callPackage @@ -291178,8 +287982,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor haskell mode"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-mode-javascript" = callPackage @@ -291198,8 +288000,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor javascript mode"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-monokai" = callPackage @@ -291252,8 +288052,6 @@ self: { ]; description = "Snippet support for yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-solarized" = callPackage @@ -291378,7 +288176,6 @@ self: { description = "CUI FTP client like 'ftp', 'ncftp'"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yjftp-libs" = callPackage @@ -291393,7 +288190,6 @@ self: { description = "CUI FTP client like 'ftp', 'ncftp'"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yjsvg" = callPackage @@ -291445,8 +288241,6 @@ self: { libraryHaskellDepends = [ base free mtl ]; description = "A truly tiny monadic parsing library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yoda" = callPackage @@ -291493,7 +288287,6 @@ self: { description = "Generic Programming with Disbanded Data Types"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "york-lava" = callPackage @@ -291506,7 +288299,6 @@ self: { description = "A library for digital circuit description"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "youtube" = callPackage @@ -291548,7 +288340,6 @@ self: { description = "A YQL engine to execute Open Data Tables"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yst" = callPackage @@ -291601,8 +288392,6 @@ self: { testHaskellDepends = [ base MonadRandom random yu-utils ]; description = "Auth module for Yu"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yu-core" = callPackage @@ -291633,7 +288422,6 @@ self: { description = "The launcher for Yu"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yu-tool" = callPackage @@ -291676,8 +288464,6 @@ self: { ]; description = "Utils for Yu"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yuiGrid" = callPackage @@ -291714,7 +288500,6 @@ self: { description = "A transcendental HTML parser gently wrapping the HXT library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yx" = callPackage @@ -291727,8 +288512,6 @@ self: { testHaskellDepends = [ array base bytestring hspec mtl ]; description = "Row-major coordinates"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yxdb-utils" = callPackage @@ -291882,7 +288665,6 @@ self: { description = "lojban parser (zasni gerna)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zbar" = callPackage @@ -291896,8 +288678,6 @@ self: { libraryToolDepends = [ c2hs ]; description = "zbar bindings in Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) zbar;}; "zcache" = callPackage @@ -292089,7 +288869,6 @@ self: { description = "Zephyr, tree-shaking for the PureScript language"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zero" = callPackage @@ -292123,7 +288902,6 @@ self: { description = "Post to 0bin services"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zeromq-haskell" = callPackage @@ -292161,7 +288939,6 @@ self: { description = "Conduit bindings for zeromq3-haskell"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zeromq3-haskell" = callPackage @@ -292185,7 +288962,6 @@ self: { description = "Bindings to ZeroMQ 3.x"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) zeromq;}; "zeromq4-clone-pattern" = callPackage @@ -292319,7 +289095,6 @@ self: { description = "ZeroTH - remove unnecessary TH dependencies"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zettelkast" = callPackage @@ -292387,7 +289162,6 @@ self: { description = "zifter-cabal"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zifter-git" = callPackage @@ -292400,7 +289174,6 @@ self: { description = "zifter-git"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zifter-google-java-format" = callPackage @@ -292417,7 +289190,6 @@ self: { description = "zifter-google-java-format"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zifter-hindent" = callPackage @@ -292434,7 +289206,6 @@ self: { description = "zifter-hindent"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zifter-hlint" = callPackage @@ -292450,7 +289221,6 @@ self: { description = "zifter-hlint"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zifter-stack" = callPackage @@ -292471,7 +289241,6 @@ self: { description = "zifter-stack"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zigbee-znet25" = callPackage @@ -292702,7 +289471,6 @@ self: { description = "Generic zipper for families of recursive datatypes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zipper-extra" = callPackage @@ -292746,7 +289514,6 @@ self: { description = "A simple lens-based, generic, heterogenous, type-checked zipper library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ziptastic-client" = callPackage @@ -292769,7 +289536,6 @@ self: { description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ziptastic-core" = callPackage @@ -292852,7 +289618,6 @@ self: { description = "Enumerator interface for zlib compression"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zlib-lens" = callPackage @@ -292903,7 +289668,6 @@ self: { description = "Command-line tool for ZeroMQ"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zmidi-core" = callPackage @@ -293017,7 +289781,6 @@ self: { description = "A streamable, seekable, zoomable cache file format"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zoom-cache-pcm" = callPackage @@ -293035,7 +289798,6 @@ self: { description = "Library for zoom-cache PCM audio codecs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zoom-cache-sndfile" = callPackage @@ -293056,7 +289818,6 @@ self: { description = "Tools for generating zoom-cache-pcm files"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zoom-refs" = callPackage @@ -293084,7 +289845,6 @@ self: { description = "A haskell binding to Apache Zookeeper C library(mt) using Haskell Z project"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) zookeeper_mt;}; "zot" = callPackage @@ -293285,7 +290045,6 @@ self: { description = "A lisp processor, An inline-lisp, in Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zuul" = callPackage diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/lib.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/lib.nix index 1537cd6466..b0d036e0e3 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/lib.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/lib.nix @@ -196,6 +196,16 @@ rec { appendPatch = drv: x: appendPatches drv [x]; appendPatches = drv: xs: overrideCabal drv (drv: { patches = (drv.patches or []) ++ xs; }); + /* Set a specific build target instead of compiling all targets in the package. + * For example, imagine we have a .cabal file with a library, and 2 executables "dev" and "server". + * We can build only "server" and not wait on the compilation of "dev" by using setBuildTarget as follows: + * + * setBuildTarget (callCabal2nix "thePackageName" thePackageSrc {}) "server" + * + */ + setBuildTargets = drv: xs: overrideCabal drv (drv: { buildTarget = lib.concatStringsSep " " xs; }); + setBuildTarget = drv: x: setBuildTargets drv [x]; + doHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = true; }); dontHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = false; }); diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix index 2641892672..5d178e3b5a 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix @@ -249,7 +249,7 @@ in package-set { inherit pkgs lib callPackage; } self // { # a cabal flag with '--flag=myflag'. developPackage = { root - , name ? builtins.baseNameOf root + , name ? if builtins.typeOf root == "path" then builtins.baseNameOf root else "" , source-overrides ? {} , overrides ? self: super: {} , modifier ? drv: drv diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix index 86123d8a70..1882d68f23 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -11,6 +11,10 @@ self: super: { ldgallery-compiler = self.callPackage ../../tools/graphics/ldgallery/compiler { }; + # Used by maintainers/scripts/regenerate-hackage-packages.sh, and generated + # from the latest master instead of the current version on Hackage. + cabal2nix-unstable = self.callPackage ./cabal2nix-unstable.nix { }; + # https://github.com/channable/vaultenv/issues/1 vaultenv = self.callPackage ../tools/haskell/vaultenv { }; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch new file mode 100644 index 0000000000..33c276926f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch @@ -0,0 +1,65 @@ +From 09f44aa3271390c14f92a3f196ab2ba475b4907f Mon Sep 17 00:00:00 2001 +From: Malte Brandy +Date: Fri, 14 Aug 2020 17:52:28 +0200 +Subject: [PATCH 1/2] jsaddle-webkit2gtk: Bump haskell-gi-base upper bound + +--- + jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal b/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal +index 93d0b77..60c2312 100644 +--- a/jsaddle-webkit2gtk.cabal ++++ b/jsaddle-webkit2gtk.cabal +@@ -35,7 +35,7 @@ library + gi-gtk >=3.0.17 && <3.1, + gi-webkit2 >=4.0.14 && <4.1, + gi-javascriptcore >=4.0.14 && <4.1, +- haskell-gi-base >=0.20 && <0.24, ++ haskell-gi-base >=0.20 && <0.26, + haskell-gi-overloading >=0.0 && < 2.0, + jsaddle >=0.9.4.0 && <0.10, + text >=1.2.1.3 && <1.3, + +From f8427480ca827b2bee1d9b33dfa6118e14fe2924 Mon Sep 17 00:00:00 2001 +From: Malte Brandy +Date: Fri, 14 Aug 2020 18:10:26 +0200 +Subject: [PATCH 2/2] Locally define noAdjustment and noCancellable + +Those two convenience definitions disappeared from gi-gio and gi-gtk in +newer versions. +--- + .../src/Language/Javascript/JSaddle/WebKitGTK.hs | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs b/jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs +index 898dac2..5249477 100644 +--- a/src/Language/Javascript/JSaddle/WebKitGTK.hs ++++ b/src/Language/Javascript/JSaddle/WebKitGTK.hs +@@ -55,11 +55,11 @@ import GI.GLib (timeoutAdd, idleAdd, pattern PRIORITY_HIGH, pattern PRIORITY_DEF + import qualified GI.Gtk as Gtk (main, init) + import GI.Gtk + (windowSetPosition, windowSetDefaultSize, windowNew, +- scrolledWindowNew, noAdjustment, containerAdd, ++ scrolledWindowNew, Adjustment, containerAdd, + WindowType(..), WindowPosition(..), widgetDestroy, + widgetGetToplevel, widgetShowAll, onWidgetDestroy, + mainQuit) +-import GI.Gio (noCancellable) ++import GI.Gio (Cancellable) + import GI.JavaScriptCore (valueToString) + import GI.WebKit2 + (scriptDialogPromptSetText, scriptDialogPromptGetDefaultText, +@@ -82,6 +82,12 @@ import Language.Javascript.JSaddle (JSM, Results, Batch) + import Language.Javascript.JSaddle.Run (runJavaScript) + import Language.Javascript.JSaddle.Run.Files (initState, runBatch, ghcjsHelpers) + ++noAdjustment :: Maybe Adjustment ++noAdjustment = Nothing ++ ++noCancellable :: Maybe Cancellable ++noCancellable = Nothing ++ + quitWebView :: WebView -> IO () + quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't this be postGUISync? + widgetDestroy w diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix index 0e566aa2e6..fdcd40fc99 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,5 +1,5 @@ { lib, stdenv, ghc, llvmPackages, packages, symlinkJoin, makeWrapper -, withLLVM ? false +, withLLVM ? !(stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isPowerPC) , postBuild ? "" , ghcLibdir ? null # only used by ghcjs, when resolving plugins }: diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/data.nix b/third_party/nixpkgs/pkgs/development/idris-modules/data.nix deleted file mode 100644 index 0517edec2d..0000000000 --- a/third_party/nixpkgs/pkgs/development/idris-modules/data.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ build-idris-package -, fetchFromGitHub -, contrib -, lib -}: -build-idris-package { - name = "data"; - version = "2018-03-19"; - - idrisDeps = [ contrib ]; - - src = fetchFromGitHub { - owner = "jdevuyst"; - repo = "idris-data"; - rev = "105b78ac13235edc596287367a675d7cd04ce5d5"; - sha256 = "17wz4jddan39984qibx2x7nv2zkqznv0fpab20nrm4zgy17v77ii"; - }; - - meta = { - description = "Functional data structures in Idris"; - homepage = "https://github.com/jdevuyst/idris-data"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.brainrape ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/default.nix b/third_party/nixpkgs/pkgs/development/idris-modules/default.nix index 7011a513c1..d6fb1ac78b 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/default.nix @@ -75,8 +75,6 @@ cube = callPackage ./cube.nix {}; - data = callPackage ./data.nix {}; - derive = callPackage ./derive.nix {}; descncrunch = callPackage ./descncrunch.nix {}; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/sdl2.nix b/third_party/nixpkgs/pkgs/development/idris-modules/sdl2.nix index 943db9e87a..2e06b03682 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/sdl2.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/sdl2.nix @@ -12,8 +12,11 @@ build-idris-package rec { idrisDeps = [ effects ]; - extraBuildInputs = [ + nativeBuildInputs = [ pkg-config + ]; + + extraBuildInputs = [ SDL2 SDL2_gfx ]; @@ -24,7 +27,7 @@ build-idris-package rec { owner = "steshaw"; repo = "idris-sdl2"; rev = version; - sha256 = "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv"; + sha256 = "1jslnlzyw04dcvcd7xsdjqa7waxzkm5znddv76sv291jc94xhl4a"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix index b9a61b88a3..5c10c176c1 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix @@ -1,6 +1,11 @@ { lib, stdenv, fetchurl, zlib, unzip }: -stdenv.mkDerivation rec { +let + + cxx = "${stdenv.cc.targetPrefix}c++"; + libName = "libipasirglucose4" + stdenv.targetPlatform.extensions.sharedLibrary; + +in stdenv.mkDerivation rec { pname = "libipasirglucose4"; # This library has no version number AFAICT (beyond generally being based on # Glucose 4.x), but it was submitted to the 2017 SAT competition so let's use @@ -18,13 +23,16 @@ stdenv.mkDerivation rec { sourceRoot = "sat/glucose4"; patches = [ ./0001-Support-shared-library-build.patch ]; + makeFlags = [ "CXX=${cxx}" ]; + postBuild = '' - g++ -shared -Wl,-soname,libipasirglucose4.so -o libipasirglucose4.so \ + ${cxx} -shared -o ${libName} \ + ${if stdenv.cc.isClang then "" else "-Wl,-soname,${libName}"} \ ipasirglucoseglue.o libipasirglucose4.a ''; installPhase = '' - install -D libipasirglucose4.so $out/lib/libipasirglucose4.so + install -D ${libName} $out/lib/${libName} ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/interpreters/angelscript/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/angelscript/default.nix index 3fbd64467f..9a6aae053f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/angelscript/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/angelscript/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, unzip}: +{ lib, stdenv, fetchurl, unzip, cmake }: let s = # Generated upstream information rec { @@ -12,25 +12,32 @@ let in stdenv.mkDerivation { inherit (s) name version; - nativeBuildInputs = [ unzip ]; + src = fetchurl { inherit (s) url sha256; }; + + nativeBuildInputs = [ unzip cmake ]; + preConfigure = '' - cd angelscript/projects/gnuc - export makeFlags="$makeFlags PREFIX=$out" + export ROOT=$PWD + cd angelscript/projects/cmake ''; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + postInstall = '' mkdir -p "$out/share/docs/angelscript" - cp -r ../../../docs/* "$out/share/docs/angelscript" + cp -r $ROOT/docs/* "$out/share/docs/angelscript" ''; - meta = { + + meta = with lib; { inherit (s) version; description = "Light-weight scripting library"; - license = lib.licenses.zlib ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; - downloadPage = "http://www.angelcode.com/angelscript/downloads.html"; - homepage="http://www.angelcode.com/angelscript/"; + license = licenses.zlib; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.all; + downloadPage = "https://www.angelcode.com/angelscript/downloads.html"; + homepage = "https://www.angelcode.com/angelscript/"; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix index dbc2751e78..73ed5b523d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix @@ -10,6 +10,7 @@ , runCommandNoCC , llvmPackages_5 , glibc +, ncurses }: let @@ -38,8 +39,8 @@ let chmod -R a+w ./tools/cling ''; - nativeBuildInputs = [ python3 git cmake ]; - buildInputs = [ libffi llvmPackages_5.llvm zlib ]; + nativeBuildInputs = [ python3 git cmake llvmPackages_5.llvm.dev ]; + buildInputs = [ libffi llvmPackages_5.llvm zlib ncurses ]; strictDeps = true; @@ -76,8 +77,8 @@ let "-nostdinc" "-nostdinc++" "-isystem" "${lib.getDev stdenv.cc.libc}/include" - "-I" "${unwrapped}/include" - "-I" "${unwrapped}/lib/clang/5.0.2/include" + "-I" "${lib.getDev unwrapped}/include" + "-I" "${lib.getLib unwrapped}/lib/clang/5.0.2/include" ]; # Autodetect the include paths for the compiler used to build Cling, in the same way Cling does at diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix index 774bcbe11b..543f443a79 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "babashka"; - version = "0.3.5"; + version = "0.4.1"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-tOLT5W5kK38fb9XL9jOQpw0LjHPjbn+BarckbCuwQAc="; + sha256 = "sha256-tKMxi0umMmM99NusSSE9tT95TBcfXm1lfo95fQRUBrs="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix index a18a51aa62..c7608ae027 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.3.822"; + version = "1.10.3.839"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "14vl2lycbcihashs8443rgwi4llkjkrfwls9sfr7dq3mi2g7fidb"; + sha256 = "sha256-nf8Vd60Opobj3gUPyYohQTzkG1G4kW9wWdBKRUba9+c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R21.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R21.nix index f0291bcfd9..3959c13e57 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R21.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R21.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "21.3.8.22"; - sha256 = "sha256-k6dChY/ogWqmcNz9P3t+p9C7oywXhR5oqdBfNtkh6I4="; + version = "21.3.8.23"; + sha256 = "sha256-zIEXn2HuXeRKHfXmm0AAv9rEqqc4gIgaYek0hSUK5YU="; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix index 5334429fbb..8fc7d8feac 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "23.3.2"; - sha256 = "eU3BmBJqrcg3FmkuAIfB3UoSNfQQfvGNyC2jBffwm/w="; + version = "23.3.4"; + sha256 = "EKewwcK1Gr84mmFVxVmOLaPiFtsG3r/1ubGOUwM/EYY="; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R24.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R24.nix new file mode 100644 index 0000000000..6808d0a849 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R24.nix @@ -0,0 +1,8 @@ +{ mkDerivation }: + +# How to obtain `sha256`: +# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz +mkDerivation { + version = "24.0"; + sha256 = "0p4p920ncsvls9q3czdc7wz2p7m15bi3nr4306hqddnxz1kxcm4w"; +} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix index c32a1b038e..aba4c318be 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix @@ -76,7 +76,8 @@ in stdenv.mkDerivation ({ ./otp_build autoconf ''; - configureFlags = [ "--with-ssl=${lib.getDev opensslPackage}" ] + configureFlags = [ "--with-ssl=${lib.getOutput "out" opensslPackage}" ] + ++ [ "--with-ssl-incl=${lib.getDev opensslPackage}" ] # This flag was introduced in R24 ++ optional enableThreads "--enable-threads" ++ optional enableSmpSupport "--enable-smp-support" ++ optional enableKernelPoll "--enable-kernel-poll" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix index 7f248c8d43..a6e995c9bc 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix @@ -1,22 +1,25 @@ -{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, lib, stdenv, gcc, Security, cmake }: +{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, lib, stdenv +, gcc, cmake, libiconv, CoreServices, Security }: rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-5YbvPDyGaoKPelLep2tVica08SI7Cyo9SLMnE6dmWe4="; + sha256 = "sha256-89+RZrG/QUo3JY9N5eTiMigUnlUP+wZWRW8PSnCcsrY="; }; - cargoSha256 = "sha256-hqVmNBrvagqhGPWTaBXuY8lULolWIoR5ovEhH5k1tz4="; + cargoSha256 = "sha256-gZLSTWS5cLfJvk4/tv8FG2I2vH3PKljWbJDOflNDmTQ="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; nativeBuildInputs = [ pkg-config makeWrapper cmake ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin + [ libiconv CoreServices Security ]; + postInstall = let wrap = exe: '' wrapProgram $out/bin/${exe} \ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/falcon/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/falcon/default.nix index ecac643f1e..0d2aa0b642 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/falcon/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/falcon/default.nix @@ -1,23 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }: +{ lib, gccStdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }: -stdenv.mkDerivation { +gccStdenv.mkDerivation { pname = "falcon"; - version = "2013-09-19"; + version = "unstable-2018-10-23"; src = fetchFromGitHub { owner = "falconpl"; repo = "falcon"; - rev = "095141903c4ebab928ce803055f9bda363215c37"; - sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf"; + rev = "637e2d5cd950a874496042993c02ab7d17c1b688"; + sha256 = "iCyvvZJjXb1CR396EJ6GiP6d4e7iAc6QQlAOQoAfehg="; }; + # -Wnarrowing is enabled by default in recent GCC versions, + # causing compilation to fail. + NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ pcre zlib sqlite ]; meta = with lib; { description = "Programming language with macros and syntax at once"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ pSub ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix index 9ae373ff7a..abfa74bb67 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { "-Wno-error=class-memaccess" "-Wno-error=restrict" "-Wno-error=format-truncation" + # Needed with GCC 10 + "-Wno-error=maybe-uninitialized" ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference"); patchPhase = lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix index be1a1a15c8..4e540dc8aa 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" ""; jruby = stdenv.mkDerivation rec { pname = "jruby"; - version = "9.2.16.0"; + version = "9.2.17.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "sha256-WuJ/FJ9z8/6k80NZy7dzwl2dmH5yte3snouTlXmX6zA="; + sha256 = "sha256-dwHTU3s6YG0nZaxtXEDmdd2qAdPOutJqIaZuOq3VwgI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lfe/fix-rebar-config.patch b/third_party/nixpkgs/pkgs/development/interpreters/lfe/fix-rebar-config.patch new file mode 100644 index 0000000000..ac385351b1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/lfe/fix-rebar-config.patch @@ -0,0 +1,29 @@ +diff --git a/rebar.config b/rebar.config +index 1d5a68e..a86ee39 100644 +--- a/rebar.config ++++ b/rebar.config +@@ -2,20 +2,20 @@ + + {erl_opts, [debug_info]}. + +-{profiles, [{test, [{deps, [proper]}]}]}. ++%%{profiles, [{test, [{deps, [proper]}]}]}. + + {pre_hooks, [{"(linux|darwin|solaris|freebsd|netbsd|openbsd)", ct, + "bin/lfe bin/lfec" +- " -o $REBAR_DEPS_DIR/lfe/test" ++ " -o test" + " test/*_SUITE.lfe"}, + {"(linux|darwin|solaris|freebsd|netbsd|openbsd)", eunit, + "bin/lfe bin/lfec" +- " -o $REBAR_DEPS_DIR/lfe/ebin" ++ " -o ebin" + " test/clj-tests.lfe"}, + %% TODO: Test this on a win32 box + %% {"win32", ct, + %% "bin/lfe bin/lfec -o $REBAR_DEPS_DIR/lfe/test test/*_SUITE.lfe"} + {"(linux|darwin|solaris|freebsd|netbsd|openbsd)", app_compile, +- "bin/lfe bin/lfec -o $REBAR_DEPS_DIR/lfe/ebin src/*.lfe"} ++ "bin/lfe bin/lfec -o ebin src/*.lfe"} + %% TODO: equivalent win32 hook + ]}. diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix index 397be81e7c..6205689674 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lfe/generic-builder.nix @@ -39,7 +39,7 @@ buildRebar3 { buildInputs = [ erlang makeWrapper ]; beamDeps = [ proper ]; - patches = [ ./no-test-deps.patch ./dedup-ebins.patch ] ++ patches; + patches = [ ./fix-rebar-config.patch ./dedup-ebins.patch ] ++ patches; doCheck = true; checkTarget = "travis"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lfe/no-test-deps.patch b/third_party/nixpkgs/pkgs/development/interpreters/lfe/no-test-deps.patch deleted file mode 100644 index 8c3faf1ff4..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/lfe/no-test-deps.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/rebar.config b/rebar.config -index 1d5a68e..ca33be7 100644 ---- a/rebar.config -+++ b/rebar.config -@@ -2,7 +2,7 @@ - - {erl_opts, [debug_info]}. - --{profiles, [{test, [{deps, [proper]}]}]}. -+%% {profiles, [{test, [{deps, [proper]}]}]}. - - {pre_hooks, [{"(linux|darwin|solaris|freebsd|netbsd|openbsd)", ct, - "bin/lfe bin/lfec" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/5.4.darwin.patch b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/5.4.darwin.patch new file mode 100644 index 0000000000..eb16ed9c68 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/5.4.darwin.patch @@ -0,0 +1,48 @@ +--- a/Makefile 2021-05-14 22:39:14.407200562 +0300 ++++ b/Makefile 2021-05-14 22:36:23.828513407 +0300 +@@ -41,7 +41,7 @@ + # What to install. + TO_BIN= lua luac + TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp +-TO_LIB= liblua.a ++TO_LIB= liblua.${version}.dylib + TO_MAN= lua.1 luac.1 + + # Lua version and release. +@@ -60,6 +60,8 @@ + cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) + cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) + cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) ++ ln -s -f liblua.${version}.dylib $(INSTALL_LIB)/liblua.${luaversion}.dylib ++ ln -s -f liblua.${luaversion}.dylib $(INSTALL_LIB)/liblua.dylib + + uninstall: + cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN) +--- a/src/Makefile 2021-05-14 22:35:38.575051882 +0300 ++++ b/src/Makefile 2021-05-14 22:35:33.584631206 +0300 +@@ -32,7 +32,7 @@ + + PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris + +-LUA_A= liblua.a ++LUA_A= liblua.${version}.dylib + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o + LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o + BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) +@@ -57,11 +57,13 @@ + a: $(ALL_A) + + $(LUA_A): $(BASE_O) +- $(AR) $@ $(BASE_O) +- $(RANLIB) $@ ++ $(CC) -dynamiclib -install_name $(out)/lib/liblua.${version}.dylib \ ++ -compatibility_version ${version} -current_version ${version} \ ++ -o liblua.${version}.dylib $^ + + $(LUA_T): $(LUA_O) $(LUA_A) +- $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) ++ $(CC) -fno-common $(MYLDFLAGS) \ ++ -o $@ $(LUA_O) $(LUA_A) -L. -llua.${version} $(LIBS) + + $(LUAC_T): $(LUAC_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix index 3a52d58ffa..95b593fb5d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix @@ -1,27 +1,12 @@ # similar to interpreters/python/default.nix { stdenv, lib, callPackage, fetchurl, fetchpatch }: -let - dsoPatch51 = fetchurl { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lua-arch.patch?h=packages/lua51"; - sha256 = "11fcyb4q55p4p7kdb8yp85xlw8imy14kzamp2khvcyxss4vw8ipw"; - name = "lua-arch.patch"; - }; - dsoPatch52 = fetchurl { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/liblua.so.patch?h=packages/lua52"; - sha256 = "1by1dy4ql61f5c6njq9ibf9kaqm3y633g2q8j54iyjr4cxvqwqz9"; - name = "lua-arch.patch"; - }; - -in rec { +rec { lua5_4 = callPackage ./interpreter.nix { sourceVersion = { major = "5"; minor = "4"; patch = "2"; }; hash = "0ksj5zpj74n0jkamy3di1p6l10v4gjnd2zjnb453qc6px6bhsmqi"; - patches = [ - # build lua as a shared library as well, MIT-licensed from - # https://github.com/archlinux/svntogit-packages/tree/packages/lua/trunk - ./liblua.so.patch - ]; + + patches = lib.optional stdenv.isDarwin ./5.4.darwin.patch; }; lua5_4_compat = lua5_4.override({ @@ -35,11 +20,6 @@ in rec { patches = lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ]; - postConfigure = lib.optionalString (!stdenv.isDarwin) '' - cat ${./lua-5.3-dso.make} >> src/Makefile - sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile - ''; - postBuild = lib.optionalString (!stdenv.isDarwin) '' ( cd src; make $makeFlags "''${makeFlagsArray[@]}" liblua.so ) ''; @@ -53,7 +33,7 @@ in rec { lua5_2 = callPackage ./interpreter.nix { sourceVersion = { major = "5"; minor = "2"; patch = "4"; }; hash = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"; - patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else [ dsoPatch52 ]; + patches = lib.optional stdenv.isDarwin ./5.2.darwin.patch; }; lua5_2_compat = lua5_2.override({ @@ -64,7 +44,7 @@ in rec { lua5_1 = callPackage ./interpreter.nix { sourceVersion = { major = "5"; minor = "1"; patch = "5"; }; hash = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; - patches = (if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch51 ]) + patches = (lib.optional stdenv.isDarwin ./5.1.darwin.patch) ++ [ ./CVE-2014-5461.patch ]; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix index 35a074add0..fd8c47d751 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix @@ -11,6 +11,15 @@ let luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; +plat = if stdenv.isLinux then "linux" + else if stdenv.isDarwin then "macosx" + else if stdenv.hostPlatform.isMinGW then "mingw" + else if stdenv.isFreeBSD then "freebsd" + else if stdenv.isSunOS then "solaris" + else if stdenv.hostPlatform.isBSD then "bsd" + else if stdenv.hostPlatform.isUnix then "posix" + else "generic"; + self = stdenv.mkDerivation rec { pname = "lua"; luaversion = with sourceVersion; "${major}.${minor}"; @@ -29,6 +38,14 @@ self = stdenv.mkDerivation rec { inherit patches; + postPatch = lib.optionalString (!stdenv.isDarwin) '' + # Add a target for a shared library to the Makefile. + sed -e '1s/^/LUA_SO = liblua.so/' \ + -e 's/ALL_T *= */&$(LUA_SO) /' \ + -i src/Makefile + cat ${./lua-dso.make} >> src/Makefile + ''; + # see configurePhase for additional flags (with space) makeFlags = [ "INSTALL_TOP=${placeholder "out"}" @@ -36,21 +53,17 @@ self = stdenv.mkDerivation rec { "R=${version}" "LDFLAGS=-fPIC" "V=${luaversion}" - ] ++ (if stdenv.isDarwin then [ - "PLAT=macosx" - ] else [ - "PLAT=linux" - ]) ++ (if stdenv.buildPlatform != stdenv.hostPlatform then [ - "CC=${stdenv.hostPlatform.config}-gcc" - "RANLIB=${stdenv.hostPlatform.config}-ranlib" - ] else []) - ; + "PLAT=${plat}" + "CC=${stdenv.cc.targetPrefix}cc" + "RANLIB=${stdenv.cc.targetPrefix}ranlib" + ]; configurePhase = '' runHook preConfigure - makeFlagsArray+=(CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" ) - makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.hostPlatform.config}-ar rcu'"}) + makeFlagsArray+=(CFLAGS='-O2 -fPIC${lib.optionalString compat " -DLUA_COMPAT_ALL"} $(${ + if lib.versionAtLeast luaversion "5.2" then "SYSCFLAGS" else "MYCFLAGS"})' ) + makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.cc.targetPrefix}ar rcu'"}) installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \ TO_LIB="${if stdenv.isDarwin then "liblua.${version}.dylib" else "liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}"}" ) @@ -80,7 +93,7 @@ self = stdenv.mkDerivation rec { Description: An Extensible Extension Language Version: ${version} Requires: - Libs: -L$out/lib -llua -lm + Libs: -L$out/lib -llua Cflags: -I$out/include EOF ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua-${luaversion}.pc" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/liblua.so.patch b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/liblua.so.patch deleted file mode 100644 index 197832116c..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/liblua.so.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/Makefile b/Makefile -index 416f444..eeaff03 100644 ---- a/Makefile -+++ b/Makefile -@@ -52,7 +52,7 @@ R= $V.0 - all: $(PLAT) - - $(PLATS) help test clean: -- @cd src && $(MAKE) $@ -+ @cd src && $(MAKE) $@ V=$(V) R=$(R) - - install: dummy - cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) -diff --git a/src/Makefile b/src/Makefile -index 514593d..372a6dc 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -33,6 +33,7 @@ CMCFLAGS= -Os - PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris - - LUA_A= liblua.a -+LUA_SO= liblua.so - CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o - LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o - BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) -@@ -44,7 +45,7 @@ LUAC_T= luac - LUAC_O= luac.o - - ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) --ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) - ALL_A= $(LUA_A) - - # Targets start here. -@@ -60,6 +61,12 @@ $(LUA_A): $(BASE_O) - $(AR) $@ $(BASE_O) - $(RANLIB) $@ - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) -+ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) -+ ln -sf $(LUA_SO).$(R) $(LUA_SO) -+ -+ - $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) - -diff --git a/src/luaconf.h b/src/luaconf.h -index bdf927e..7e15198 100644 ---- a/src/luaconf.h -+++ b/src/luaconf.h -@@ -227,7 +227,7 @@ - - #else /* }{ */ - --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" - #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" - diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/lua-5.3-dso.make b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/lua-dso.make similarity index 50% rename from third_party/nixpkgs/pkgs/development/interpreters/lua-5/lua-5.3-dso.make rename to third_party/nixpkgs/pkgs/development/interpreters/lua-5/lua-dso.make index c70dbc4f9c..19c5768567 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/lua-5.3-dso.make +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/lua-dso.make @@ -1,8 +1,4 @@ - -LUA_SO=liblua.so - $(LUA_SO): $(CORE_O) $(LIB_O) - $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) + $(CC) -shared $(LIBS) -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? $(MYLDFLAGS) ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ln -sf $(LUA_SO).$(R) $(LUA_SO) - diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/7.3.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/7.3.nix index d611cb7693..569fb1b540 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/7.3.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/7.3.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.3.27"; - sha256 = "00z0vadxazm2flks9g8qmchj2pwkli880kg313jgbb1mx3shc84x"; + version = "7.3.28"; + sha256 = "0r4r8famg3a8x6ch24y1370nsphkxg4k9zq5x8v88f4l8mj6wqwg"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix index 812a59ec8a..dd5c6452a5 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.4.16"; - sha256 = "0gnfb4vaj71fiap0q9lk6vs1xs7l6sha60isw6aaw3zxgh00ywc5"; + version = "7.4.18"; + sha256 = "0bw4q7svijsqi5vinaspzzqyli2pvmpz6yf83ndqixf6x4r5ji9f"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix index 233b0da438..5e392549e0 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "8.0.3"; - sha256 = "04mh5sznbgwv67x9p0qz4i377zwdb5cc6r1mb3925y1lkqfn5y4m"; + version = "8.0.5"; + sha256 = "1q08xx9pbn7plsnfh6j16jj294vm968ng1n5kaqw7apgxd7r6p8r"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/pure/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/pure/default.nix index 863df66899..d1c03bba5a 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/pure/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/pure/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, - llvm, gmp, mpfr, readline, bison, flex }: + libllvm, gmp, mpfr, readline, bison, flex }: stdenv.mkDerivation rec { baseName="pure"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bison flex ]; - propagatedBuildInputs = [ llvm gmp mpfr readline ]; + propagatedBuildInputs = [ libllvm gmp mpfr readline ]; NIX_LDFLAGS = "-lLLVMJIT"; postPatch = '' @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-release" ]; doCheck = true; checkPhase = '' - LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${llvm}/lib make check + LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${libllvm}/lib make check ''; postInstall = '' - wrapProgram $out/bin/pure --prefix LD_LIBRARY_PATH : ${llvm}/lib + wrapProgram $out/bin/pure --prefix LD_LIBRARY_PATH : ${libllvm}/lib ''; meta = { diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index d74e017d83..5f13418aa5 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -69,6 +69,7 @@ with pkgs; recursivePthLoader ; }; + extra = _: {}; optionalExtensions = cond: as: if cond then as else []; python2Extension = import ../../../top-level/python2-packages.nix; extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ [ overrides ]); @@ -77,6 +78,7 @@ with pkgs; pkgs.newScope otherSplices keep + extra (lib.extends extensions pythonPackagesFun)) { overrides = packageOverrides; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix index ae5227fb19..b0c10c8a65 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, python2Packages, pkg-config, SDL2 -, libpng, ffmpeg_3, freetype, glew, libGL, libGLU, fribidi, zlib +, libpng, ffmpeg, freetype, glew, libGL, libGLU, fribidi, zlib , glib }: @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ python cython wrapPython tkinter - SDL2 libpng ffmpeg_3 freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib + SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib ]; pythonPath = [ pygame_sdl2 tkinter ]; RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [ - SDL2 SDL2.dev libpng ffmpeg_3 ffmpeg_3.out freetype glew.dev glew.out libGLU libGL fribidi zlib + SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU libGL fribidi zlib ]); buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix index 4b185f038a..9179866fe9 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -12,7 +12,7 @@ let opString = lib.optionalString; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; config = import ./config.nix { inherit fetchFromSavannah; }; - rubygems = import ./rubygems { inherit stdenv lib fetchurl fetchpatch; }; + rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; @@ -55,13 +55,7 @@ let # Or (usually): # $(nix-build -A ruby)/lib/ruby/2.6.0/x86_64-linux/rbconfig.rb # - In $out/lib/libruby.so and/or $out/lib/libruby.dylib - # - # Since some Gems require JIT support, there's probably no - # escape from this reference. Hence, it was decided to enable this - # feature by default, as it's enabled by default by ruby's ./configure - # script. If you'd like to have a ruby without reference to cc, setting - # jitSupport to false should remove all known references mentioned above. - , removeReferencesTo, jitSupport ? true + , removeReferencesTo, jitSupport ? false , autoreconfHook, bison, autoconf , buildEnv, bundler, bundix , libiconv, libobjc, libunwind, Foundation @@ -112,7 +106,17 @@ let patchLevel = ver.patchLevel; }).${ver.majMinTiny} ++ op atLeast27 ./do-not-regenerate-revision.h.patch - ++ op (atLeast30 && useRailsExpress) ./do-not-update-gems-baseruby.patch; + ++ op (atLeast30 && useRailsExpress) ./do-not-update-gems-baseruby.patch + # Ruby prior to 3.0 has a bug the installer (tools/rbinstall.rb) but + # the resulting error was swallowed. Newer rubygems no longer swallows + # this error. We upgrade rubygems when rubygemsSupport is enabled, so + # we have to fix this bug to prevent the install step from failing. + # See https://github.com/ruby/ruby/pull/2930 + ++ op (!atLeast30 && rubygemsSupport) + (fetchpatch { + url = "https://github.com/ruby/ruby/commit/261d8dd20afd26feb05f00a560abd99227269c1c.patch"; + sha256 = "0wrii25cxcz2v8bgkrf7ibcanjlxwclzhayin578bf0qydxdm9qy"; + }); postUnpack = opString rubygemsSupport '' rm -rf $sourceRoot/{lib,test}/rubygems* @@ -167,8 +171,9 @@ let installFlags = lib.optional docSupport "install-doc"; # Bundler tries to create this directory postInstall = '' + rbConfig=$(find $out/lib/ruby -name rbconfig.rb) # Remove unnecessary groff reference from runtime closure, since it's big - sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb + sed -i '/NROFF/d' $rbConfig ${ lib.optionalString (!jitSupport) '' # Get rid of the CC runtime dependency @@ -177,7 +182,8 @@ let $out/lib/libruby* ${removeReferencesTo}/bin/remove-references-to \ -t ${stdenv.cc} \ - $out/${passthru.libPath}/${stdenv.hostPlatform.system}/rbconfig.rb + $rbConfig + sed -i '/CC_VERSION_MESSAGE/d' $rbConfig '' } # Bundler tries to create this directory @@ -195,8 +201,6 @@ let addEnvHooks "$hostOffset" addGemPath addEnvHooks "$hostOffset" addRubyLibPath EOF - - rbConfig=$(find $out/lib/ruby -name rbconfig.rb) '' + opString docSupport '' # Prevent the docs from being included in the closure sed -i "s|\$(DESTDIR)$devdoc|\$(datarootdir)/\$(RI_BASE_NAME)|" $rbConfig diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix index 19eed817ec..db508caae3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -1,23 +1,18 @@ -{ stdenv, lib, fetchurl, fetchpatch }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "rubygems"; - version = "3.1.3"; + version = "3.2.16"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - sha256 = "181wjclxnq5lrwnr53famy9pg8911hi9w2v0vy7dqgjqnc4iy1hp"; + sha256 = "1bpn45hchcbirqvqwxcxyk1xy2xkdd915jci2hfjq4y6zc4idns0"; }; patches = [ ./0001-add-post-extract-hook.patch ./0002-binaries-with-env-shebang.patch ./0003-gem-install-default-to-user.patch - - (fetchpatch { - url = "https://github.com/rubygems/rubygems/commit/0af4d2d369ff580ef54839ec15a8c7ec419978cb.patch"; - sha256 = "13gyfxn4rmxq1dbxq5rzphnhagn8n8kpp8lb9h6h4s9d4zaklax9"; - }) ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix deleted file mode 100644 index 4892e0b8ab..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkg-config, nspr, perl, python2, zip }: - -stdenv.mkDerivation { - pname = "spidermonkey"; - version = "1.8.5"; - - src = fetchurl { - url = "mirror://mozilla/js/js185-1.0.0.tar.gz"; - sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687"; - }; - - propagatedBuildInputs = [ nspr ]; - - nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isAarch32 autoconf213; - buildInputs = [ perl python2 zip ]; - - postUnpack = "sourceRoot=\${sourceRoot}/js/src"; - - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" - export LIBXUL_DIST=$out - ${lib.optionalString stdenv.isAarch32 "autoreconf --verbose --force"} - ''; - - patches = [ - (fetchpatch { - name = "gcc6.patch"; - url = "https://sources.debian.org/data/main/m/mozjs/1.8.5-1.0.0+dfsg-6/debian/patches/fix-811665.patch"; - sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99"; - }) - ] ++ lib.optionals stdenv.isAarch32 [ - # Explained below in configureFlags for ARM - ./1.8.5-findvanilla.patch - # Fix for hard float flags. - ./1.8.5-arm-flags.patch - ]; - - patchFlags = [ "-p3" ]; - - # fixes build on gcc8 - postPatch = '' - substituteInPlace ./methodjit/MethodJIT.cpp \ - --replace 'asm volatile' 'asm' - ''; - - # On the Sheevaplug, ARM, its nanojit thing segfaults in japi-tests in - # "make check". Disabling tracejit makes it work, but then it needs the - # patch findvanilla.patch do disable a checker about allocator safety. In case - # of polkit, which is what matters most, it does not override the allocator - # so the failure of that test does not matter much. - configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ] ++ - lib.optionals (stdenv.hostPlatform.system == "armv5tel-linux") [ - "--with-cpu-arch=armv5t" - "--disable-tracejit" ]; - - # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 - preBuild = '' - touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl} - ${if stdenv.isAarch32 then "rm -r jit-test/tests/jaeger/bug563000" else ""} - ''; - - enableParallelBuilding = true; - - doCheck = true; - - preCheck = '' - rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522 - ''; - - meta = with lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = "https://developer.mozilla.org/en/SpiderMonkey"; - # TODO: MPL/GPL/LGPL tri-license. - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; - broken = stdenv.isAarch64; # 2018-08-21, broken since 2017-03-08 - }; -} - diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix index 0ac005b07d..f867e60614 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { "--with-system-zlib" "--with-system-icu" - "--with-libclang-path=${llvmPackages.libclang}/lib" + "--with-libclang-path=${llvmPackages.libclang.lib}/lib" "--with-clang-path=${llvmPackages.clang}/bin/clang" "--enable-shared-js" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix index 8077177d8b..eb17fda083 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { "--features" "test-cranelift,test-jit" ]; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; meta = with lib; { description = "The Universal WebAssembly Runtime"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index 3d13dddb64..9afca8f1f7 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ python cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix index 96f85ddb0e..a0f770178c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libwebp, libXpm, zlib, Foundation }: +{ lib, stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, giflib, libwebp, libXpm, zlib, Foundation }: stdenv.mkDerivation rec { pname = "SDL2_image"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx"; }; - buildInputs = [ SDL2 libpng libjpeg libtiff libungif libwebp libXpm zlib ] + buildInputs = [ SDL2 libpng libjpeg libtiff giflib libwebp libXpm zlib ] ++ lib.optional stdenv.isDarwin Foundation; diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL_image/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL_image/default.nix index 2e5841b3f4..fe97f01674 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL_image/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL_image/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }: +{ lib, stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, giflib, libXpm }: stdenv.mkDerivation rec { pname = "SDL_image"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--disable-tif-shared" ] ++ lib.optional stdenv.isDarwin "--disable-sdltest"; - buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ]; + buildInputs = [ SDL libpng libjpeg libtiff giflib libXpm ]; meta = with lib; { description = "SDL image library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix index 8210bdb442..b27cb8aae3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ace"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "sha256-5nH5a0tBOcGfA07eeh9EjH0vgT3gTRWYHXoeO+QFQjQ="; + sha256 = "sha256-IftPSQOrZOqMLHHlUFEFa3WcvsqN5kdS5rSlGE8ETC4="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix index cbfec4dd46..333dbb053f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "sha256-c4SN3kNY8415+O/2AYuHNQFEmuTBtLaWj5fsj0yJ2vs="; + sha256 = "sha256-ObjpWreabeVzKYVgC62JaoGUf1BZCxP0STjox3akDvo="; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/amtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amtk/default.nix index f144f847bc..5743a18c0f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/amtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/amtk/default.nix @@ -1,23 +1,27 @@ { lib, stdenv , fetchurl , gtk3 +, meson +, ninja , pkg-config , gobject-introspection -, gnome3 +, gnome , dbus -, xvfb_run +, xvfb-run }: stdenv.mkDerivation rec { pname = "amtk"; - version = "5.2.0"; + version = "5.3.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0y3hmmflw4i0y0yb9a8rlihbv3cbwnvdcf1n5jycwzpq9jxla1c2"; + sha256 = "12v3nj1bb7507ndprjggq0hpz8k719b4bwvl8sm43p3ibmn27anm"; }; nativeBuildInputs = [ + meson + ninja pkg-config dbus gobject-introspection @@ -30,12 +34,15 @@ stdenv.mkDerivation rec { doCheck = stdenv.isLinux; checkPhase = '' export NO_AT_BRIDGE=1 - ${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + ${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - make check + meson test --print-errorlogs ''; - passthru.updateScript = gnome3.updateScript { packageName = pname; }; + passthru.updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "none"; + }; meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Amtk"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix index 136ffb7980..79c1715c61 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.16.1"; + version = "5.16.2"; src = fetchurl { - sha256 = "sha256-Q9PzqJC/+uhcbxAC6c+VD8wf0X8/XlXcO4XTnQni4yM="; + sha256 = "sha256-IS/soe5Lx1C+/UWnNcv+8AwMmu5FHvURbpkTMMGrEFs="; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/applet-window-buttons/default.nix b/third_party/nixpkgs/pkgs/development/libraries/applet-window-buttons/default.nix new file mode 100644 index 0000000000..9ff9d6fdf2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/applet-window-buttons/default.nix @@ -0,0 +1,50 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, fetchpatch +, cmake +, extra-cmake-modules +, kcoreaddons +, kdeclarative +, kdecoration +, plasma-framework +}: + +mkDerivation rec { + pname = "applet-window-buttons"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "psifidotos"; + repo = "applet-window-buttons"; + rev = version; + sha256 = "0r1h4kbdv6pxj15w4n1w50g8zsl0jrc4808dyfygzwf87mghziyz"; + }; + + patches = [ + (fetchpatch { + name = "fix-compilation-error-with-plasma-5.21.patch"; + url = "https://github.com/psifidotos/applet-window-buttons/commit/dc5ed862fa3cb943f9c0d561c864ff461156a19e.patch"; + sha256 = "17bdkkmy7k402viynj2bpw281qzsn0f1w8gf98gq65wkm4sf4j6k"; + }) + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kcoreaddons + kdeclarative + kdecoration + plasma-framework + ]; + + meta = with lib; { + description = "Plasma 5 applet in order to show window buttons in your panels"; + homepage = "https://github.com/psifidotos/applet-window-buttons"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} 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 1cd9fb2c8b..64c0b031e4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://people.freedesktop.org/~hughsient/appstream-glib/"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ lethalman matthewbauer ]; + maintainers = with maintainers; [ matthewbauer ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix b/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix index 6fa4a6e0a4..96c6b36239 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix @@ -1,20 +1,40 @@ -{ lib, stdenv, substituteAll, fetchFromGitHub, meson, ninja, pkg-config, gettext -, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt -, libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection -, pcre, itstool, gperf, vala, lmdb, libsoup +{ lib +, stdenv +, substituteAll +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gettext +, xmlto +, docbook-xsl-nons +, docbook_xml_dtd_45 +, libxslt +, libstemmer +, glib +, xapian +, libxml2 +, libyaml +, gobject-introspection +, pcre +, itstool +, gperf +, vala +, lmdb +, curl }: stdenv.mkDerivation rec { pname = "appstream"; - version = "0.14.0"; + version = "0.14.3"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { - owner = "ximion"; - repo = "appstream"; - rev = "v${version}"; - sha256 = "sha256-iYqmQ1/58t3ZdJTxYLDc5jkTG1lMBtQWMFFsYsszH9Q="; + owner = "ximion"; + repo = "appstream"; + rev = "v${version}"; + sha256 = "sha256-wCQR+4/F5lVqWHHcH/WS4irBGRivz3c1imasyLDIZIs="; }; patches = [ @@ -26,12 +46,30 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - meson ninja pkg-config gettext - libxslt xmlto docbook_xsl docbook_xml_dtd_45 - gobject-introspection itstool vala + meson + ninja + pkg-config + gettext + libxslt + xmlto + docbook-xsl-nons + docbook_xml_dtd_45 + gobject-introspection + itstool + vala ]; - buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf lmdb libsoup ]; + buildInputs = [ + libstemmer + pcre + glib + xapian + libxml2 + libyaml + gperf + lmdb + curl + ]; mesonFlags = [ "-Dapidocs=false" @@ -41,14 +79,14 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software metadata handling library"; - homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; + homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; longDescription = '' AppStream is a cross-distro effort for building Software-Center applications and enhancing metadata provided by software components. It provides specifications for meta-information which is shipped by upstream projects and can be consumed by other software. ''; - license = licenses.lgpl21Plus; - platforms = platforms.unix; + license = licenses.lgpl21Plus; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix index a915723e2c..67e621ad85 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix @@ -6,7 +6,7 @@ , gst-plugins-good ? null , gst-plugins-bad ? null , libnotify ? null -, gnome3 ? null +, gnome ? null , gtk3 ? null , enableUsb ? true , enablePacketSocket ? true @@ -26,7 +26,7 @@ in assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; assert enableViewer -> enableGstPlugin; assert enableViewer -> libnotify != null; - assert enableViewer -> gnome3 != null; + assert enableViewer -> gnome != null; assert enableViewer -> gtk3 != null; assert enableViewer -> gstreamerAtLeastVersion1; @@ -56,7 +56,7 @@ in ++ lib.optional enableUsb libusb1 ++ lib.optional enablePacketSocket audit ++ lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] - ++ lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ]; + ++ lib.optionals (enableViewer) [ libnotify gtk3 gnome.adwaita-icon-theme ]; preAutoreconf = "./autogen.sh"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix index 1e5a1d3fd6..7989cfd857 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix @@ -11,7 +11,7 @@ , glib , libxml2 -, gnome3 # To pass updateScript +, gnome # To pass updateScript }: stdenv.mkDerivation rec { @@ -29,8 +29,9 @@ stdenv.mkDerivation rec { doCheck = false; # fails with "No test data file provided" passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix index 7e1181cf3b..4e85c7a92a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix @@ -14,23 +14,25 @@ , libX11 , libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case , libXi +, libXext -, gnome3 # To pass updateScript +, gnome # To pass updateScript }: stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.38.0"; + version = "2.40.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "hONsP+ZoYhM/X+Ipdyt2qiUm4Q3lAUo3ePL6Rs5VDaU="; + sha256 = "0miqn8531czy9ffpxnsxsnk12w3d6sqjda3qyix8kns2xsjf6rlz"; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ meson ninja pkg-config gobject-introspection makeWrapper ]; - buildInputs = [ libX11 libXtst libXi ]; + # libXext is a transitive dependency of libXi + buildInputs = [ libX11 libXtst libXi libXext ]; # In atspi-2.pc dbus-1 glib-2.0 propagatedBuildInputs = [ dbus glib ]; @@ -43,8 +45,9 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/atk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/atk/default.nix index 53eb445977..7961211dc6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/atk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/atk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib -, fixDarwinDylibNames, gobject-introspection, gnome3 +, fixDarwinDylibNames, gobject-introspection, gnome }: let @@ -34,8 +34,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/atkmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/atkmm/default.nix index e9c63eb650..b357ed0472 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/atkmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/atkmm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome3 }: +{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome }: stdenv.mkDerivation rec { pname = "atkmm"; @@ -18,8 +18,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/avahi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/avahi/default.nix index dd54ba79db..a52d1be566 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/avahi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/avahi/default.nix @@ -1,5 +1,6 @@ { fetchurl, fetchpatch, lib, stdenv, pkg-config, libdaemon, dbus, perlPackages , expat, gettext, intltool, glib, libiconv, writeShellScriptBin, libevent +, nixosTests , gtk3Support ? false, gtk3 ? null , qt4 ? null , qt4Support ? false @@ -77,6 +78,11 @@ stdenv.mkDerivation rec { ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc */ + passthru.tests = { + smoke-test = nixosTests.avahi; + smoke-test-resolved = nixosTests.avahi-with-resolved; + }; + meta = with lib; { description = "mDNS/DNS-SD implementation"; homepage = "http://avahi.org"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix index 057aad447d..3246c57296 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-common openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ aws-c-common openssl ]; + + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix index 337149e6f8..39230cc088 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix @@ -13,15 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-cal aws-c-common s2n-tls] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ aws-c-cal aws-c-common s2n-tls]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error"; - meta = with lib; { description = "AWS SDK for C module for IO and TLS"; homepage = "https://github.com/awslabs/aws-c-io"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix index 7fd7b2fbbd..dd215dc01c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -26,12 +26,15 @@ stdenv.mkDerivation rec { buildInputs = [ curl openssl s2n-tls zlib - aws-c-cal aws-c-common aws-c-event-stream aws-c-io aws-checksums + aws-c-common aws-c-event-stream aws-checksums ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || (builtins.elem "*" apis))) [ CoreAudio AudioToolbox ]; + # propagation is needed for Security.framework to be available when linking + propagatedBuildInputs = [ aws-c-cal aws-c-io ]; + cmakeFlags = [ "-DBUILD_DEPS=OFF" "-DCMAKE_SKIP_BUILD_RPATH=OFF" diff --git a/third_party/nixpkgs/pkgs/development/libraries/bamf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bamf/default.nix index 95d54993e0..faee853808 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bamf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bamf/default.nix @@ -3,7 +3,7 @@ , autoconf , automake , libtool -, gnome3 +, gnome , which , fetchgit , libgtop @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { automake dbus docbook_xsl - gnome3.gnome-common + gnome.gnome-common gobject-introspection gtk-doc libtool diff --git a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix index 1d8f35cd01..c482b55c60 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.5.7"; + version = "4.5.15"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-JQ2HgFVqgO+LLXmN95ZTHyT+htCFUC3VRreKLwPYo9Y="; + sha256 = "sha256-yN9dfeJBuUxXfG7zDoawn2nKGsrhetBcXpGDmcekU20="; }; # Do not build static libraries diff --git a/third_party/nixpkgs/pkgs/development/libraries/beignet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/beignet/default.nix index 8e8e455e59..3d88c93784 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/beignet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/beignet/default.nix @@ -2,8 +2,8 @@ , fetchFromGitHub , cmake , pkg-config -, clang-unwrapped -, llvm +, libclang +, libllvm , libdrm , libX11 , libpthreadstubs @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { patchShebangs src/git_sha1.sh ''; - cmakeFlags = [ "-DCLANG_LIBRARY_DIR=${clang-unwrapped}/lib" ]; + cmakeFlags = [ "-DCLANG_LIBRARY_DIR=${libclang.lib}/lib" ]; buildInputs = [ - llvm - clang-unwrapped + libllvm + libclang libX11 libXext libpthreadstubs diff --git a/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix index 0f8a61bed2..4032734416 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "4.5.1"; + version = "4.5.14"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "0d1wf0jv9lb0s6r49i9gz5nrx8jzpkx558hywll7idma9d0mr61p"; + sha256 = "sha256-L6dhgBJrzYgBuMNd2eMZJCqB/GIZjKipfn1SffxBFWw="; }; nativeBuildInputs = [ antlr3_4 cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix index b698cf7b40..5236c92527 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "4.5.1"; + version = "4.5.10"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1a500ncgznwha0j3c27ak3p4jh5jm6fnnb531k7c0a4i91745agj"; + sha256 = "sha256-8qlCTkiRKMDODKMsa52pskBJ7pjqCDYkUJDb/5gFoKg="; }; buildInputs = [ bctoolbox sqlite ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cairomm/1.16.nix b/third_party/nixpkgs/pkgs/development/libraries/cairomm/1.16.nix new file mode 100644 index 0000000000..2e936607e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/cairomm/1.16.nix @@ -0,0 +1,74 @@ +{ stdenv +, lib +, fetchurl +, boost +, meson +, ninja +, pkg-config +, cairo +, fontconfig +, libsigcxx30 +, ApplicationServices +}: + +stdenv.mkDerivation rec { + pname = "cairomm"; + version = "1.16.0"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "https://www.cairographics.org/releases/${pname}-${version}.tar.xz"; + sha256 = "1ya4y7qa000cjawqwswbqv26y5icfkmhs5iiiil4dxgrqn91923y"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + boost # for tests + fontconfig + ] ++ lib.optionals stdenv.isDarwin [ + ApplicationServices + ]; + + propagatedBuildInputs = [ + cairo + libsigcxx30 + ]; + + mesonFlags = [ + "-Dbuild-tests=true" + "-Dboost-shared=true" + ]; + + # Meson is no longer able to pick up Boost automatically. + # https://github.com/NixOS/nixpkgs/issues/86131 + BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; + + # Tests fail on Darwin, possibly because of sandboxing. + doCheck = !stdenv.isDarwin; + + meta = with lib; { + description = "A 2D graphics library with support for multiple output devices"; + longDescription = '' + Cairo is a 2D graphics library with support for multiple output + devices. Currently supported output targets include the X + Window System, Quartz, Win32, image buffers, PostScript, PDF, + and SVG file output. Experimental backends include OpenGL + (through glitz), XCB, BeOS, OS/2, and DirectFB. + + Cairo is designed to produce consistent output on all output + media while taking advantage of display hardware acceleration + when available (e.g., through the X Render Extension). + ''; + homepage = "https://www.cairographics.org/"; + license = with licenses; [ lgpl2Plus mpl10 ]; + maintainers = teams.gnome.members; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/clutter-gst/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clutter-gst/default.nix index 166d4e12c2..e4752c7748 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/clutter-gst/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/clutter-gst/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }: +{ fetchurl, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "clutter-gst"; @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { postBuild = "rm -rf $out/share/gtk-doc"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ lethalman ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/clutter-gtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clutter-gtk/default.nix index 0dfb8c7b9d..7573da66c0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/clutter-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, pkg-config, meson, ninja -, gobject-introspection, clutter, gtk3, gnome3 }: +, gobject-introspection, clutter, gtk3, gnome }: let pname = "clutter-gtk"; @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { postBuild = "rm -rf $out/share/gtk-doc"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { description = "Clutter-GTK"; homepage = "http://www.clutter-project.org/"; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ lethalman ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/clutter/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clutter/default.nix index 002db004dc..aacb8581c8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/clutter/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/clutter/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, libGLU, libGL, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib -, gobject-introspection, gtk3, gnome3, libinput, libgudev, libxkbcommon +, gobject-introspection, gtk3, gnome, libinput, libgudev, libxkbcommon }: let @@ -29,8 +29,9 @@ stdenv.mkDerivation rec { #doCheck = true; # no tests possible without a display passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; homepage = "http://www.clutter-project.org/"; - maintainers = with lib.maintainers; [ lethalman ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.mesaPlatforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/cogl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cogl/default.nix index 8fd1520728..75ec2a2acc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cogl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cogl/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, libGL, glib, gdk-pixbuf, xorg, libintl -, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3 +, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome , mesa, automake, autoconf , gstreamerSupport ? true, gst_all_1 }: @@ -59,8 +59,9 @@ in stdenv.mkDerivation rec { #doCheck = true; # all tests fail (no idea why) passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix index 3121741ca0..9dcfb79f3e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "coordgenlibs"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "schrodinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BcDqrOotqRPMnzvfjzbeCf8gT3yQzKihywKrpah1D7w="; + sha256 = "sha256-uperQnJ1Q+s15pAlg/f4XR5VJI484ygZ0F6pMvcVDv8="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index 1d666d4d98..14e2c8878f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -1,32 +1,35 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , cppunit }: stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.10.2"; + version = "5.10.3"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hPcmO2nzXCuhU2GjE0B1Bz9OkJ4mY2txFr+cWGaw1bo="; + sha256 = "sha256-bEdDRvm5W12wJnW4xC+AcRLevZ0H7C625eknKzNrLLU="; }; nativeBuildInputs = [ cmake ]; checkInputs = [ cppunit ]; # Otherwise, tests fail since the resulting shared object libc++utilities.so is only available in PWD of the make files - checkFlagsArray = [ "LD_LIBRARY_PATH=$(PWD)" ]; + preCheck = '' + checkFlagsArray+=( + "LD_LIBRARY_PATH=$PWD" + ) + ''; doCheck = true; meta = with lib; { homepage = "https://github.com/Martchus/cpp-utilities"; description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ctpl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ctpl/default.nix index 69380c2eee..634c2cf44c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ctpl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ctpl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = "http://ctpl.tuxfamily.org/"; description = "Template engine library written in C"; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; license = licenses.gpl3Plus; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/cxxopts/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cxxopts/default.nix index 1df570d7d2..855a9eef8e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cxxopts/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cxxopts/default.nix @@ -12,11 +12,17 @@ stdenv.mkDerivation rec { }; buildInputs = lib.optional enableUnicodeHelp [ icu.dev ]; - cmakeFlags = lib.optional enableUnicodeHelp [ "-DCXXOPTS_USE_UNICODE_HELP=TRUE" ]; + cmakeFlags = [ "-DCXXOPTS_BUILD_EXAMPLES=OFF" ] + ++ lib.optional enableUnicodeHelp "-DCXXOPTS_USE_UNICODE_HELP=TRUE" + # Due to -Wsuggest-override, remove when cxxopts is updated + ++ lib.optional stdenv.isDarwin "-DCXXOPTS_ENABLE_WARNINGS=OFF"; nativeBuildInputs = [ cmake ] ++ lib.optional enableUnicodeHelp [ pkg-config ]; doCheck = true; + # Conflict on case-insensitive filesystems. + dontUseCmakeBuildDir = true; + meta = with lib; { homepage = "https://github.com/jarro2783/cxxopts"; description = "Lightweight C++ GNU-style option parser library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix index fd7df4d5ba..e9543fd95f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { description = "Simple interprocess messaging system"; homepage = "http://www.freedesktop.org/wiki/Software/dbus/"; license = licenses.gpl2Plus; # most is also under AFL-2.1 - maintainers = with maintainers; [ worldofpeace ]; + maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix index 6834a605f1..550940f5a1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix @@ -9,7 +9,7 @@ , glib , bash-completion , dbus -, gnome3 +, gnome , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_42 @@ -19,14 +19,14 @@ let in stdenv.mkDerivation rec { pname = "dconf"; - version = "0.38.0"; + version = "0.40.0"; outputs = [ "out" "lib" "dev" ] ++ lib.optional (!isCross) "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0n2gqkp6d61h7gnnp2xnxp6w5wcl7w9ay58krrf729qd6d0hzxj5"; + sha256 = "0cs5nayg080y8pb9b7qccm1ni8wkicdmqp1jsgc22110r6j24zyg"; }; nativeBuildInputs = [ @@ -61,8 +61,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dee/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dee/default.nix index 3d46028ec4..a023d164d8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dee/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dee/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://launchpad.net/dee"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar worldofpeace ]; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix index b5baab5972..3350c046a5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "embree"; - version = "3.12.2"; + version = "3.13.0"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "sha256-aIZAkpAGvE332HxT4rR+rykww/ZLq2qKGLKiZTWyHCk="; + sha256 = "sha256-w93GYslQRg0rvguMKv/CuT3+JzIis2CRbY9jYUFKWOM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix index 2c9eb3ca44..dcb10b8ba0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto"; homepage = "https://github.com/ethereum/ethash"; platforms = platforms.unix; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; license = licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/fcl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fcl/default.nix new file mode 100644 index 0000000000..33a6008058 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/fcl/default.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, eigen, libccd, octomap }: + +stdenv.mkDerivation rec { + pname = "fcl"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "flexible-collision-library"; + repo = pname; + rev = version; + sha256 = "1i1sd0fsvk5d529aw8aw29bsmymqgcmj3ci35sz58nzp2wjn0l5d"; + }; + + patches = [ + # Disable SSE on Emscripten (required for the next patch to apply cleanly) + # https://github.com/flexible-collision-library/fcl/pull/470 + (fetchpatch { + url = "https://github.com/flexible-collision-library/fcl/commit/83a1af61ba4efa81ec0b552b3121100044a8cf46.patch"; + sha256 = "0bbkv4xpkl3c0i8qdlkghj6qkybrrd491c8rd2cqnxfgspcd40p0"; + }) + # Detect SSE support to fix building on ARM + # https://github.com/flexible-collision-library/fcl/pull/506 + (fetchpatch { + url = "https://github.com/flexible-collision-library/fcl/commit/cbfe1e9405aa68138ed1a8f33736429b85500dea.patch"; + sha256 = "18qip8gwhm3fvbz1cvzf625rh5msq8m4669ld1m60fv6z50clr9h"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ eigen libccd octomap ]; + + outputs = [ "out" "dev" ]; + + meta = with lib; { + description = "Flexible Collision Library"; + longDescription = '' + FCL is a library for performing three types of proximity queries on a + pair of geometric models composed of triangles. + ''; + homepage = "https://github.com/flexible-collision-library/fcl"; + license = licenses.bsd3; + maintainers = with maintainers; [ lopsided98 ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix index d861d25e67..dcd1388143 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkg-config, perl, texinfo, yasm +{ lib, stdenv, ffmpeg, addOpenGLRunpath, pkg-config, perl, texinfo, yasm /* * Licensing options (yes some are listed twice, filters and such are not listed) */ @@ -126,13 +126,14 @@ , vid-stab ? null # Video stabilization #, vo-aacenc ? null # AAC encoder , vo-amrwbenc ? null # AMR-WB encoder -, wavpack ? null # Wavpack encoder , x264 ? null # H.264/AVC encoder , x265 ? null # H.265/HEVC encoder , xavs ? null # AVS encoder , xvidcore ? null # Xvid encoder, native encoder exists , zeromq4 ? null # Message passing , zlib ? null +, vulkan-loader ? null +, glslang ? null #, zvbi ? null # Teletext support /* * Developer options @@ -244,15 +245,6 @@ stdenv.mkDerivation rec { pname = "ffmpeg-full"; inherit (ffmpeg) src version; - # this should go away in the next release - patches = [ - # Patch ffmpeg for svt-av1 until version 4.4 - (fetchpatch { - url = "https://raw.githubusercontent.com/AOMediaCodec/SVT-AV1/v0.8.4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch"; - sha256 = "1p4g8skr5gjw5h1648j7qrks81zx49lrnx9g0p81qgnrvxc2wwx0"; - }) - ]; - prePatch = '' patchShebangs . '' + lib.optionalString stdenv.isDarwin '' @@ -280,7 +272,6 @@ stdenv.mkDerivation rec { # On some ARM platforms --enable-thumb "--enable-shared" (enableFeature true "pic") - (if stdenv.cc.isClang then "--cc=clang" else null) (enableFeature smallBuild "small") (enableFeature runtimeCpuDetectBuild "runtime-cpudetect") (enableFeature enableLto "lto") @@ -405,13 +396,14 @@ stdenv.mkDerivation rec { (enableFeature (vid-stab != null && gplLicensing) "libvidstab") # Actual min. version 2.0 #(enableFeature (vo-aacenc != null && version3Licensing) "libvo-aacenc") (enableFeature (vo-amrwbenc != null && version3Licensing) "libvo-amrwbenc") - (enableFeature (wavpack != null) "libwavpack") (enableFeature (x264 != null && gplLicensing) "libx264") (enableFeature (x265 != null && gplLicensing) "libx265") (enableFeature (xavs != null && gplLicensing) "libxavs") (enableFeature (xvidcore != null && gplLicensing) "libxvid") (enableFeature (zeromq4 != null) "libzmq") (enableFeature (zlib != null) "zlib") + (enableFeature (isLinux && vulkan-loader != null) "vulkan") + (enableFeature (isLinux && vulkan-loader != null && glslang != null) "libglslang") #(enableFeature (zvbi != null && gplLicensing) "libzvbi") /* * Developer flags @@ -423,6 +415,9 @@ stdenv.mkDerivation rec { ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" + ] ++ optionals stdenv.cc.isClang [ + "--cc=clang" + "--cxx=clang++" ]; nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ]; @@ -432,13 +427,13 @@ stdenv.mkDerivation rec { libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libxcb libXv libXext xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr - samba SDL2 soxr speex srt vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore + samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore zeromq4 zlib ] ++ optionals openglExtlib [ libGL libGLU ] ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf - ++ optionals isLinux [ alsaLib libraw1394 libv4l ] + ++ optionals isLinux [ alsaLib libraw1394 libv4l vulkan-loader glslang ] ++ optional (isLinux && !isAarch64 && libmfx != null) libmfx ++ optional nvenc nv-codec-headers ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation @@ -465,6 +460,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; homepage = "https://www.ffmpeg.org/"; + changelog = "https://github.com/FFmpeg/FFmpeg/blob/n${version}/Changelog"; longDescription = '' FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix index 309cd2b3b3..6d94c2e997 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix @@ -4,4 +4,7 @@ callPackage ./generic.nix (rec { version = "${branch}.17"; branch = "2.8"; sha256 = "05bnhvs2f82aq95z1wd3wr42sljdfq4kiyzqwhpji983mndx14vl"; + knownVulnerabilities = [ + "CVE-2021-30123" + ]; } // args) diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix index be341d588c..25c0a12f73 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchpatch +{ callPackage # Darwin frameworks , Cocoa, CoreMedia , ... @@ -9,4 +9,7 @@ callPackage ./generic.nix (rec { branch = "3.4.8"; sha256 = "1d0r4yja2dkkyhdwx1migq46gsrcbajiv66263a5sq5bfr9dqkch"; darwinFrameworks = [ Cocoa CoreMedia ]; + knownVulnerabilities = [ + "CVE-2021-30123" + ]; } // args) diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix index 95207b5386..df3d073239 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix @@ -1,12 +1,17 @@ -{ callPackage, fetchpatch +{ callPackage # Darwin frameworks , Cocoa, CoreMedia, VideoToolbox +, stdenv, lib , ... }@args: callPackage ./generic.nix (rec { - version = "4.3.2"; - branch = "4.3"; - sha256 = "0flik4y7c5kchj65p3p908mk1dsncqgzjdvzysjs12rmf1m6sfmb"; + version = "4.4"; + branch = "4.4"; + sha256 = "03kxc29y8190k4y8s8qdpsghlbpmchv1m8iqygq2qn0vfm4ka2a2"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; + + /* Work around https://trac.ffmpeg.org/ticket/9242 */ + patches = lib.optional stdenv.isDarwin + ./v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch; } // args) diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index 82f1a8bf56..7e4a6a0809 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -17,7 +17,7 @@ # Darwin frameworks , Cocoa, darwinFrameworks ? [ Cocoa ] # Inherit generics -, branch, sha256, version, patches ? [], ... +, branch, sha256, version, patches ? [], knownVulnerabilities ? [], ... }: /* Maintainer notes: @@ -213,7 +213,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; - homepage = "http://www.ffmpeg.org/"; + homepage = "https://www.ffmpeg.org/"; + changelog = "https://github.com/FFmpeg/FFmpeg/blob/n${version}/Changelog"; longDescription = '' FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines @@ -224,6 +225,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ codyopel ]; - inherit branch; + inherit branch knownVulnerabilities; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch new file mode 100644 index 0000000000..c0c2c1fb23 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch @@ -0,0 +1,35 @@ +From 5b562aaddbc6e7a94a079c2e88230b205a7f4d73 Mon Sep 17 00:00:00 2001 +From: Zane van Iperen +Date: Sat, 15 May 2021 19:33:52 +1000 +Subject: [PATCH v2] avcodec/videotoolboxenc: #define TARGET_CPU_ARM64 to 0 if + not provided by the SDK + +Fixes build failure on older SDKs without it. + +Fixes #9242 + +Signed-off-by: Zane van Iperen +--- + libavcodec/videotoolboxenc.c | 4 ++++ + 1 file changed, 4 insertions(+) + +NB: This is untested, I do not have a Mac to try it on. + +diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c +index 58239e0ab9..f063a86e73 100644 +--- a/libavcodec/videotoolboxenc.c ++++ b/libavcodec/videotoolboxenc.c +@@ -50,6 +50,10 @@ enum { kCVPixelFormatType_420YpCbCr10BiPlanarFullRange = 'xf20' }; + enum { kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange = 'x420' }; + #endif + ++#ifndef TARGET_CPU_ARM64 ++# define TARGET_CPU_ARM64 0 ++#endif ++ + typedef OSStatus (*getParameterSetAtIndex)(CMFormatDescriptionRef videoDesc, + size_t parameterSetIndex, + const uint8_t **parameterSetPointerOut, +-- +2.29.3 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/flint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flint/default.nix index 0adaa2fe5e..4754281670 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flint/default.nix @@ -13,10 +13,12 @@ assert withBlas -> openblas != null && blas.implementation == "openblas" && lapa stdenv.mkDerivation rec { pname = "flint"; version = "2.7.1"; + src = fetchurl { url = "http://www.flintlib.org/flint-${version}.tar.gz"; sha256 = "07j8r96kdzp19cy3a5yvpjxf90mkd6103yr2n42qmpv7mgcjyvhq"; }; + buildInputs = [ gmp mpir @@ -37,9 +39,6 @@ stdenv.mkDerivation rec { "--with-blas=${openblas}" ]; - # issues with ntl -- https://github.com/wbhart/flint2/issues/487 - NIX_CXXSTDLIB_COMPILE = "-std=c++11"; - doCheck = true; meta = { inherit version; diff --git a/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix index c930adbe9b..6cd651e66e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix @@ -1,11 +1,10 @@ { fetchurl , lib, stdenv , pkg-config -, fetchpatch , meson , ninja , glib -, gnome3 +, gnome , nspr , gettext , gobject-introspection @@ -18,6 +17,7 @@ , dbus , libgee , evolution-data-server +, libgdata , libsecret , db , python3 @@ -34,29 +34,15 @@ stdenv.mkDerivation rec { pname = "folks"; - version = "0.14.0"; + version = "0.15.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn"; + sha256 = "08nirjax4m4g4ljr8ksq16wzmrvzq6myqh5rm0dw6pnijqk7nxzg"; }; - patches = [ - # Fix tests with e-d-s linked with libphonenumber support - # https://gitlab.gnome.org/GNOME/folks/merge_requests/40 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/folks/commit/6d443480a137f6a6ff345b21bf3cb31066eefbcd.patch"; - sha256 = "D/Y2g12TT0qrcH+iJ2umu4Hmp0EJ3Hoedh0H3aWI+HY="; - }) - ]; - - mesonFlags = [ - "-Ddocs=true" - "-Dtelepathy_backend=${lib.boolToString telepathySupport}" - ]; - nativeBuildInputs = [ gettext gobject-introspection @@ -75,6 +61,7 @@ stdenv.mkDerivation rec { db dbus-glib evolution-data-server + libgdata # required for some backends transitively libsecret libsoup libxml2 @@ -100,7 +87,17 @@ stdenv.mkDerivation rec { ])) ]; - doCheck = true; + mesonFlags = [ + "-Ddocs=true" + "-Dtelepathy_backend=${lib.boolToString telepathySupport}" + # For some reason, the tests are getting stuck on 31/32, + # even though the one missing test finishes just fine on next run, + # when tests are permuted differently. And another test that + # previously passed will be stuck instead. + "-Dtests=false" + ]; + + doCheck = false; # Prevents e-d-s add-contacts-stress-test from timing out checkPhase = '' @@ -116,7 +113,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fontconfig/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fontconfig/default.nix index a7f8fa89c1..5eb180731f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fontconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fontconfig/default.nix @@ -118,6 +118,6 @@ stdenv.mkDerivation rec { homepage = "http://fontconfig.org/"; license = licenses.bsd2; # custom but very bsd-like platforms = platforms.all; - maintainers = [ maintainers.vcunat ]; + maintainers = with maintainers; teams.freedesktop.members ++ [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/freeimage/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freeimage/default.nix index b50783e271..236305a572 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freeimage/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freeimage/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchsvn, darwin, libtiff , libpng, zlib, libwebp, libraw, openexr, openjpeg -, libjpeg, jxrlib, pkg-config }: +, libjpeg, jxrlib, pkg-config +, fixDarwinDylibNames }: stdenv.mkDerivation { pname = "freeimage"; @@ -17,7 +18,12 @@ stdenv.mkDerivation { prePatch = "rm -rf Source/Lib* Source/OpenEXR Source/ZLib"; patches = [ ./unbundle.diff ]; - nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin darwin.cctools; + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + darwin.cctools + fixDarwinDylibNames + ]; buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ]; postBuild = lib.optionalString (!stdenv.isDarwin) '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix index 0a9a4684e1..56f0e03921 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.2.18"; + version = "1.2.21"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ENR+YJhs/FH4Fw+p6rpDEU7r3eC6bmscSBPYbwIaqt0="; + sha256 = "sha256-pea79tbz3AgWsZy9CDCNJ6CEsEkmqqBaxn+AjqB9PY0="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/fstrm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fstrm/default.nix index 46a7118cef..15daa7e5a9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fstrm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fstrm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fstrm"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "farsightsec"; repo = "fstrm"; rev = "v${version}"; - sha256 = "0b6x9wgyn92vykkmd3ynhnpbdl77zb4wf4rm7p0h8p9pwq953hdm"; + sha256 = "sha256-/WFP2g3Vuf/qaY8pprY8XFAlpEE+0SJUlFNWfa+7ZlE="; }; outputs = [ "bin" "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gcab/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gcab/default.nix index 0ad9f607df..efc533c550 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gcab/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gcab/default.nix @@ -12,7 +12,7 @@ , vala , glib , zlib -, gnome3 +, gnome , nixosTests }: @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gcr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gcr/default.nix index 92c0ec293c..94487ff6b4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gcr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gcr/default.nix @@ -15,18 +15,18 @@ , makeWrapper , libxslt , vala -, gnome3 +, gnome , python3 , shared-mime-info }: stdenv.mkDerivation rec { pname = "gcr"; - version = "3.38.1"; + version = "3.40.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "F/yvnEqTpl+xxyuCZDuxAsEzRAhGh9WIbqZjE4aNnsk="; + sha256 = "udNkWl/ZU6VChcxk1PwEZzZGPb1NzCXK9ce1m+0wJ/U="; }; postPatch = '' @@ -82,13 +82,14 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; meta = with lib; { - platforms = platforms.linux; + platforms = platforms.unix; maintainers = teams.gnome.members; description = "GNOME crypto services (daemon and tools)"; homepage = "https://gitlab.gnome.org/GNOME/gcr"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/2.4.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/2.4.nix index 70ae3b2b12..234d986b21 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdal/2.4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/2.4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib +{ lib, stdenv, fetchurl, libjpeg, libtiff, zlib , postgresql, libmysqlclient, libgeotiff, python2Packages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libiconv, libxml2 @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3"; }; - nativeBuildInputs = [ unzip ]; buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite libspatialite poppler hdf4 qhull giflib expat libxml2 proj ] ++ (with python2Packages; [ python numpy wrapPython ]) diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix index 2d8e60d06a..fd2d62a032 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -7,16 +7,15 @@ , pkg-config , gettext , python3 -, libxml2 , libxslt , docbook-xsl-nons , docbook_xml_dtd_43 -, gtk-doc +, gi-docgen , glib , libtiff , libjpeg , libpng -, gnome3 +, gnome , gobject-introspection , doCheck ? false , makeWrapper @@ -25,13 +24,13 @@ stdenv.mkDerivation rec { pname = "gdk-pixbuf"; - version = "2.42.2"; + version = "2.42.6"; outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"; + sha256 = "0zz7pmw2z46g7mr1yjxbsdldd5pd03xbjc58inj8rxfqgrdvg9n4"; }; patches = [ @@ -45,14 +44,15 @@ stdenv.mkDerivation rec { pkg-config gettext python3 - libxml2 - libxslt - docbook-xsl-nons - docbook_xml_dtd_43 - gtk-doc gobject-introspection makeWrapper glib + gi-docgen + + # for man pages + libxslt + docbook-xsl-nons + docbook_xml_dtd_43 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ @@ -75,19 +75,26 @@ stdenv.mkDerivation rec { substituteInPlace tests/meson.build --subst-var-by installedtestsprefix "$installedTests" ''; + preInstall = '' + PATH=$PATH:$out/bin # for install script + ''; + postInstall = - # meson erroneously installs loaders with .dylib extension on Darwin. - # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them. - lib.optionalString stdenv.isDarwin '' + '' + # All except one utility seem to be only useful during building. + moveToOutput "bin" "$dev" + moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" + + # So that devhelp can find this. + mkdir -p "$devdoc/share/devhelp" + mv "$out/share/doc" "$devdoc/share/devhelp/books" + '' + lib.optionalString stdenv.isDarwin '' + # meson erroneously installs loaders with .dylib extension on Darwin. + # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them. for f in $out/${passthru.moduleDir}/*.dylib; do install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f mv $f ''${f%.dylib}.so done - '' - # All except one utility seem to be only useful during building. - + '' - moveToOutput "bin" "$dev" - moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ $dev/bin/gdk-pixbuf-query-loaders --update-cache @@ -100,10 +107,6 @@ stdenv.mkDerivation rec { done ''; - preInstall = '' - PATH=$PATH:$out/bin # for install script - ''; - # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). inherit doCheck; @@ -112,8 +115,9 @@ stdenv.mkDerivation rec { separateDebugInfo = stdenv.isLinux; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; tests = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdl/default.nix index f924571dea..5b73e3d7a1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome3, intltool }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome, intltool }: stdenv.mkDerivation rec { pname = "gdl"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 gtk3 ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gdl"; }; }; 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 2093328f57..11f4f070c0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gegl/4.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gegl/4.0.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config , vala @@ -35,14 +36,14 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.28"; + version = "0.4.30"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-HRENhXfVTMo7NCOTFb03xXzLJ91DVWVQdKLSs/2JeQA="; + sha256 = "sha256-wRJ4LPQJaWniMhfM36vkIoTjXVQ1/wxD1A5McPrsqN0="; }; nativeBuildInputs = [ @@ -103,8 +104,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-lm"; postPatch = '' - chmod +x tests/opencl/opencl_test.sh tests/buffer/buffer-tests-run.sh - patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tests/buffer/buffer-tests-run.sh tools/xml_insert.sh + chmod +x tests/opencl/opencl_test.sh + patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh ''; # tests fail to connect to the com.apple.fonts daemon in sandboxed mode diff --git a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix index aef412468a..a0c4f5a3e2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tdMdIudB8zZWXF+Q0YhFo9Q4VHjLJh3rdfQsYhgo2DU="; + sha256 = "sha256-QC07NGgZa++qHyGZY3fjosjJVuRFfc7HYmdGxQHAz4s="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix index f401c25aa3..458e0d59a0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }: +{ fetchurl, lib, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome, libsoup, json-glib, glib }: stdenv.mkDerivation rec { pname = "geocode-glib"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix index 19b03eb620..355e9e5f07 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "geos"; @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ python ]; - # https://trac.osgeo.org/geos/ticket/993 configureFlags = lib.optional stdenv.isAarch32 "--disable-inline"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix index 071e749b40..c46a42049b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: stdenv.mkDerivation rec { pname = "gexiv2"; @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix index e3550b82a9..7f4625b665 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, glib, librest, gnome-online-accounts -, gnome3, libsoup, json-glib, gobject-introspection +, gnome, libsoup, json-glib, gobject-introspection , gtk-doc, pkgs, docbook-xsl-nons, autoconf, automake, libtool }: stdenv.mkDerivation rec { @@ -35,8 +35,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ghc_filesystem/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ghc_filesystem/default.nix new file mode 100644 index 0000000000..76cfc4fbce --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/ghc_filesystem/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, cmake, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "filesystem"; + version = "1.5.4"; + + src = fetchFromGitHub { + owner = "gulrak"; + repo = "filesystem"; + rev = "v${version}"; + hash = "sha256-SvNUzKoNiSIM0no+A0NUT6hmeUH9SzgLQLrC5XOC0Ho="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "header-only single-file C++ std::filesystem compatible helper library"; + homepage = "https://github.com/gulrak/filesystem"; + license = licenses.mit; + maintainers = with maintainers; [ lourkeur ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/giflib/libungif.nix b/third_party/nixpkgs/pkgs/development/libraries/giflib/libungif.nix deleted file mode 100644 index d8c32d14fc..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/giflib/libungif.nix +++ /dev/null @@ -1,17 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "libungif-4.1.4"; - src = fetchurl { - url = "mirror://sourceforge/giflib/libungif-4.1.4.tar.gz"; - sha256 = "5e65e1e5deacd0cde489900dbf54c6c2ee2ebc818199e720dbad685d87abda3d"; - }; - - hardeningDisable = [ "format" ]; - - meta = with lib; { - description = "Library and utilities for processing GIFs"; - platforms = platforms.unix; - license = licenses.mit; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix index 52b53a15b4..342d498f15 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix @@ -1,10 +1,10 @@ { fetchurl -, fetchpatch -, lib, stdenv +, lib +, stdenv , meson , ninja , pkg-config -, gnome3 +, gnome , gtk3 , atk , gobject-introspection @@ -16,27 +16,36 @@ , libxml2 , dbus , gdk-pixbuf +, harfbuzz , makeWrapper , which -, xvfb_run +, xvfb-run , nixosTests }: let testDeps = [ gobject-introspection # for Gio and cairo typelibs - gtk3 atk pango.out gdk-pixbuf + gtk3 atk pango.out gdk-pixbuf harfbuzz ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.66.2"; + version = "1.68.1"; + + outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "vX9fixcSd8wLue4XVLAkC2Lwana4sYyWjPRxs0qzTlk="; + sha256 = "0w2cbfpmc6alz7z8ycchhlkn586av5y8zk2xmgwzq10i0k13xyig"; }; - outputs = [ "out" "dev" "installedTests" ]; + patches = [ + # Hard-code various paths + ./fix-paths.patch + + # Allow installing installed tests to a separate output. + ./installed-tests-path.patch + ]; nativeBuildInputs = [ meson @@ -56,7 +65,7 @@ in stdenv.mkDerivation rec { ]; checkInputs = [ - xvfb_run + xvfb-run ] ++ testDeps; propagatedBuildInputs = [ @@ -68,14 +77,6 @@ in stdenv.mkDerivation rec { "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; - patches = [ - # Hard-code various paths - ./fix-paths.patch - - # Allow installing installed tests to a separate output. - ./installed-tests-path.patch - ]; - doCheck = true; postPatch = '' @@ -91,6 +92,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0 ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so + ln -s $PWD/installed-tests/js/libgjstesttools/libgjstesttools.so $installedTests/libexec/installed-tests/gjs/libgjstesttools.so ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so ''; @@ -122,7 +124,7 @@ in stdenv.mkDerivation rec { installed-tests = nixosTests.installed-tests.gjs; }; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gjs"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glfw/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/glfw/3.x.nix index 38ef25770a..37c1522586 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glfw/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glfw/3.x.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "3.3.3"; + version = "3.3.4"; pname = "glfw"; src = fetchFromGitHub { owner = "glfw"; repo = "GLFW"; rev = version; - sha256 = "sha256-NfEPXjpVnFvh3Y70RZm8nDG0QwJbefF9wYNUq0BZTN4="; + sha256 = "sha256-BP4wxjgm0x0E68tNz5eudkVUyBnXkQlP7LY3ppZunhw="; }; propagatedBuildInputs = [ libGL ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix index 5858973416..690279fcf2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix @@ -12,19 +12,19 @@ , gnutls , p11-kit , libproxy -, gnome3 +, gnome , gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.66.0"; + version = "2.68.1"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16807qwflbghp0c66jdx2gnaffvdp4bla35ppzp9dlgx6wjbxmy5"; + sha256 = "0c1vylxly8k7g454g02spi44ybjidlwg461vp713zxd94k8qnpfh"; }; patches = [ @@ -74,8 +74,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; tests = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix index ce64bef95a..08f7c9a4c7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl, gettext, meson, ninja, pkg-config, perl, python3 -, libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 +, libiconv, zlib, libffi, pcre, libelf, gnome, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) , util-linuxMinimal ? null , buildPackages @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.66.8"; + version = "2.68.1"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-l7yH3ZE2VYmvXLv+oldIM66nobcYQP02Xs0oUsdrnIs="; + sha256 = "sha256-JBZUuWvTa4iqoSgU78SEO1eOVdR0QBA3J5Waw0aUQzM="; }; patches = optionals stdenv.isDarwin [ @@ -92,13 +92,23 @@ stdenv.mkDerivation rec { buildInputs = [ libelf setupHook pcre bash gnum4 # install glib-gettextize and m4 macros for other apps to use - gtk-doc ] ++ optionals stdenv.isLinux [ libselinux util-linuxMinimal # for libmount ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Carbon Cocoa CoreFoundation CoreServices Foundation - ]); + ]) ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ + # Note: this needs to be both in buildInputs and nativeBuildInputs. The + # Meson gtkdoc module uses find_program to look it up (-> build dep), but + # glib's own Meson configuration uses the host pkg-config to find its + # version (-> host dep). We could technically go and fix this in glib, add + # pkg-config to depsBuildBuild, but this would be a futile exercise since + # Meson's gtkdoc integration does not support cross compilation[1] anyway + # and this derivation disables the docs build when cross compiling. + # + # [1] https://github.com/mesonbuild/meson/issues/2003 + gtk-doc + ]; strictDeps = true; @@ -184,14 +194,14 @@ stdenv.mkDerivation rec { makeSchemaPath = dir: name: "${dir}/share/gsettings-schemas/${name}/glib-2.0/schemas"; getSchemaPath = pkg: makeSchemaPath pkg pkg.name; inherit flattenInclude; - updateScript = gnome3.updateScript { packageName = "glib"; }; + updateScript = gnome.updateScript { packageName = "glib"; }; }; meta = with lib; { description = "C library of programming buildings blocks"; homepage = "https://www.gtk.org/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ lovek323 raskin worldofpeace ]; + maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]); platforms = platforms.unix; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz index bcf4d13443cf5e51b80d5f4cce4f65f8d4878585..2fda4294130a8676fc706ce7adb4b8cbe8878aab 100644 GIT binary patch delta 7524 zcmV-q9h>6M#RJs;1F*E>f2>{WPa`)F{|tY{9u-njk|PUAAaGX+h1?y|9UvaMR#z15 zBcWT!L)k1)UHRYZ-^}>2n+E~)6JghDkH=$sW<36l9HQrmE~7tUB+qtCiJLK%BV}nu ztuU@N{ID79gpK`J8OgQ1FpTQWR^4wj`%$aeXj)VGHNh0xX8truf4n0#%UjA)K4>%! z>J4o&H+IEjmc{dc;0G0Jf{?8jWm5IwnNb!{dYb?NFu9MNgHwPN($RsjKBcCvs)PXK z(<~Hxx-J|pU8;uM^65Bu#CptTq^(~2vL@M(Tx=TNj=VldCNg>ilv8la@M}7ytUinA zJtcy|C-rcp0xPeBe`GYh0d-TK(<0<$>K+IXYBgi-B=$fy%@9W}zPiC^K$bGQ_6NZo z5||uuBUPm${R~#_Cdv3&=K1jEWf97GtpaOJ|D5pHFbX0=W zbYyWCPj4LG0B_%P&W%KVJ)Cj(h7attl_M(MCq?LyNN&ghwNt5z9GT=%;NxQ&Fx@X| zC&b+m!bw+LQw4(|k9i~j>7zL`$kAAai0#wSqnp1l&7!E+i|LMqIS_*f8c27fZ(N^V zUZ0L zqJFOx)RY1A{(W2zeSfzVHF`5B?29Tf0PKqjP}~p{e`5p=)qq=@Pc(--ahQCCta8~< z?S?TYk6Q-6;?2I3zl(rdatkM|S@WxLFKZGR+7V5A^S7hVCvCMMeZKzIIlba5@j$gw z6Fm#=3D#;uscFBM9CRqoAwHhpTCdX0NWsSlyw4}cRv58<0DVYYpLoe`Nb8mq!KB+2 zpqH-=e*%Aqg4;aOI~aymh*px{ovv4-zec09*Tp=Lo37QL8BXcOF;`WcU`z6InXeDL&B33;jk1ASrk$hY>j%&HLu7fs@)z_%n*QiLMG|^N zZQ8rVQn)Nc4RPbDK(>4#1r6~i_kWYF2Z`GUe_Oc_zXc?@Ey1YM1nH}@Qq>OCpAYB( z5Pg#(X`q@(`jOn=@`+Sd)&-ohbncLA&wP34mf^T!`{dc_6NTcIT)xRZ= zg4?5UBEcw5233l<4(Nb!l911yjUQ!j(nd~uA#@ ze{&^*eR51&jar)3WJ}E)ux;n19#^}os$|y|U=69n<1?i!DS8sH(yd5^`V0vSQYY=) zc7A2s{5#&zDUW4G>Z(sGG`54_2?!9X=$J%;dCB#Il=%&W$xzwj(!Le%WQe4K1ph5h zM%lFZi06QQpeh{PsfxUk)K>9od$n45f2sJ>7c-)NJHl1R$;1_Xp-A9Gwy}s}n6oqqkp&OG{HS=(GyzNYd@v}j&%4Vt+i;`;@N@cval+ZUaqEBe*>z5P{~ zVW{IOUM6od)g)Cs-OzI4XvD*;|D#@OHE-`L#mQ0djzB;VHrb>AAP1`(R24n*10G z7;fPh5_P8^C%V&*bcK{hM7oWdtKL{hCwTlxo=V9&JRGSCI;Urs=k3|DADps3&E*us zBWgF#q{5gAK0a|4_bQ}fhlS5tf1dhkmsJ|4?uA+fGFk;Hdc9dHYx?WgOPjPk7{#V- zW$rd=FSbWtysbR})}ZE=x05Tm+A?G7$23@}dMda=?Rwq3OJdH=bEkK1w2G%od8W#* z+y!dl<7{n|10-)d+Y}!>tCYB;q+9;|3fPsU9F?zDX6n1|C!YXUrA$7Fw@3Vi z_Z`nf%{I^9eaz|K3u(9>_MXNZV?ceC`20<6rn!S9sfRt!Ue#VsG;h#Q0oSYQ)j@vq z`OV5lZl2_K(AiQX?xv6#f3!jmam{sj=e#$Rvcgw(ysF>@!7*_e_#a1!hHF_+w^y@h@v#&)$ znV@Q{>_B@PZSoKh`h7xZDsWbj(hH>(n|lU$Q>7iM4f`$`k11kHe-WM&n1Yg+IZC4K zRc$T@=P9$Yt#HmM`}jYPq9>XlwWHYeC#KzE+`a6Fba&X2CXe{9eYkgH=>e?|eDz|jfc zvbrMkV%IRh2(x;qnEpZy4pnSpc8kQldj)Zd#qb8lu#Acn*2_7Sf9??GsISkZezu7% z9r?&r(h6{S-EMa-FLP<9y@KmMPI-_1;WM9X$Ux=Ozr6OBlds3!lVciSRdWVU<9mv4v;o$*aRE1dngY?> z1hkS@$S&XRfe}?FgjDz_K@da4C2DZMbV3_*@FdFwe{FOt>~CmE!Z)bpZW5EgVs$<4 z$&GCeR(A#fS6Dr%76(`EG2Wa3lTc*}8d+Sb%L>xV!~Y)u00960>|IN5+c*$D=U-&^ zP`IXT=xy0S_fqT@d)lJg$Egq$J+?*DBv=_qF8%N2%#h+kq^vm3BEaSn2NESw)R3I{ zzHi9+f6Fs>NAYwJN5{y|lO$^EwBj8jPTIB(q9$+L9b=?J3_3!b;|>_P*m%x*7l#Rt z7{0gkVTS(a<;~T%rZ;cg{|;@KPsJa5+wFjcB=Ih6yLeX!eh3zM0}>E?xUW03PfW9- z9fnq?60MiF*DTv%kruT`MmX(d$TUC6x>$xOe^%`yHudehzg};*ZxI!Jr#cSw8@Q>d>y z;E~(e20c;~ox=dLYv3obxvFsvNiXW!JD{yDcNaF>gv^6fCwFu?tG!XV}IF6#CCBmTtxr6pF-f-E9PU`Jsy*hAS2=3q07g=%3xje-wWG;E0o z&Ya#BA^`qJtz^50+5qBqM~r#5>@Xk|e*_1cOmMLK6C7+naIhi4!E}NnT&UnS)Yto^ z70i9K2S#9LG6Le9 zPPF>_Xb>i85ay&o*j^fhd1w&EgE@A88iYA%5ay&o;Hc4H@}l3Uy-x1cSk?z0P$3M0 zUyAi?EAw+AFiIVxgAO0)AVQA+9FqWfwEGhQa-?yLl7eX+TUe49hnfXuZ;>->`kWvJ z!^j4`W?{}lN4H<*_*UrHZXt&ce^;&?y37j%66B1BD!v^!=lx3dJzlQHmHBBulM7Zv zjeKhE1EA!GxNHD~+KRs!-YfV_Bnb_#h|aSiI?o*FJR6|%Y>3V?6P;IRjyWPaPsHsOO1RVUsTsWle~#Rt1>QlY^^I}Xe~Ib5;P>v$6q(n< zuph8WnPU-GQLwHyRkUf=X|idnDz4Hfjy8Fgwn1ITc~a#~+&(PFLas{?W~X7ajn~^W z9wb@duEm!(B7WWCep{0O;$EEnp_4f9lq8E@S*|B?XZQf3rc}Is~X@+u%^)IxL2WB&;jQhKciy*`q_`a}$+wu)L;V+2wRO}o_z8bPel$3Lo^f9c>TH#FGvSndL>MPDyRdmKTU_C%{@)5S8&QL)VOK#iMjMaS2;xt==KD$YLge@Ykd zW9m;VX&`vce;Ihr8F<~9|Lk4sPuo@${|tYHMTbh1$Lu6_ND-5OWi1-e zibpr8Ly;fXAzQGc1ll64|NGA4zU-KU0+l+cp9t5!?}yL%opaCc$DM)IcLvIS`R4Gj zH35x6H;wDJCBsRq`G+U?7j~LRGYr&7UqcxI!TKPRf8yu|jjrp|`+lR-E_j1K#ZT9s zvH!J~?rJyP1sU`^an-%w#aM?MH-d^;Af(_p_AD7=g|lW|3Mguk1qpfQK`yI~jM=uZ zET}QlkTlS(+OoQFh(Rq^-j~|pQYwc9EotS=1zmmN_JUlA755g_p5xNO+L9X!YlZ6y z3c7#Pe?5f4ezXSgL02D|+9ali=qoNStS!H}ph~R1y|DI7R~M+i2qfg!f~gZe;o|xP z>hXv+5h6l(crlkkPVtaMqSudgL91REI9J>D_&S6_q{z;!W7(6Fq&!y*x*LR|?TVlm zbko=sktb5G9mHKvblueJB13T8bvxd3qr2S&e{^?{T~SbV)}*v%Ma$GCh|+OGrbK`; za$X-D?jH=#FHZLMj|OMX$8jimEC_hu;4=8GiEv|{7`J!!!{O~taplJp7h6U>ndF}^ zq6@_~QSG6CP#85vl|he1Hm9JW#16&bkHb+Za1DnyAzPjae@hm1iBZla2^qoFAyU+a ze-o70@1R_?&@0`N7RNEgiKQ4j9E6&JcEj>Sj;Yx<#H-!FOGPK$hT6J8xZRI>UB4r? zdm@aYJ_ca&UDt;NRE1X`gKkeBps4V#GGY0?0Bx+(i(0Kt6!ubBh-titPwQ+3m)1$- zUKn)RjcsH-?Vzy=l78CCqra!==NfA7e_5Ug^!;rn6B4poAc?(N{z@~M=dF2;6m07y zgG6(1^4`Ilh(||n58#j+9Q;1qZL9x}kN4gU&)=L5&fdI*Z`3X-e@yL0I~kHVmKKt% z@4BD8^=7Gb4K;8zNWfQI`MX4U*}5i=_Z9)?yX{wn#Ov#DI>ew%^Q(N4P#drxe}x_= zBDx)UI1G?8nbayDSBw-t0Ik7;@mXb{(7n0GQeiz;_dt4H;&1ock=JVVy(H=+J>U0N znJnyb?z3Ik@31V|==e?@{`hXuhOxl`KwDQEka$Zn?GUE`Pj+?Y+G2zCd#EZYy~&>o z^V53IMy;yekm&x-;(Mhk&5KaEf9^}!fU{wnNS1mx*Q>mni;2*bio|>&4I@dF6Yu6f zV}~k|mHDV%Wj?YJp?3HHPv@m%3Vb)5h-`FoMUR#moSy1A{a}Mr9esX{Et^hq8W_?* zr3HKAQJWiOaAI{R8L8gy9i5$@9-h3$Ul)T?=~V@p65j2d4o=P&iXbNFe@C{mH~{Pf zuxbdF_14xdoA>XW^}4Na5QLiQ@UM1@kl}xa$c(s^Kh zXr(H|Sua=?oEJ(JTWG0Me~s^y>Olo4o(K#mEj`mp?^8RMW}^0)E1Op1w7zIY6~7jN zN7vYUL8D7yKbI^w=S$_nkA;%c}dpby}B9%_dG>(Uey&p(>TGU-!W!-!<0o zfX!Hau+?l!Xi49?54#9&^09`Y?yLXl+i$^(vkXp{)w>J{F}|j>fBi}`Zd;MGuB@%$ zDmWys9Rda`jPv$~mw^>|WYyq#y>1)_wQ1xKCSw2MH{^O7?ju_!m04qVPTP)gCgWvt zz(}Zj6E@H$uL;Ngl#VYO&RBZH&oh;O!G_XsHa7Vj7~Agi_iU-fD!iJWjG}V`xBC&G z3ARdQhjHJB&4BhTe+N!1R2Wmox?!Sr(%0i7tD-xsG0Oe#uJQ0SP>>Dz8XyA2tJOfn z3PCFVMMD*?==M|3?Sx6}AyHW%`a#f5f@E9t`%&z7gHA69(%`wFip6NZ$ZdW0=i#rz z!Rg-Fz|j67{}MxIavotVN|x)MXAuVefd*?h_UFQ!`mly1e}FJUwLf&^6FBH*sCb8S zyGq62SgNjp=5moGbBs-EQ(MC7{TL!~){GfDk$^^V>SUT}u%SKtVLM1)B@D@X$Bi{a zPqJ<0{IL99!>na&&^OQq@zPu?4<@FCVMqmpIq1r@U>`j^+;20y?J&wLp4fZe^peFH8hNk=uyp`QLZwUL+8qPwKMTCyq+@TVhwSr!O~5^V#;hfZxOPA z19@z<6e-xya0my6gS>8o zWDF$bsVr)oK%2+u*d9Kb4{R9|SuMiEAX0G(blnb|0sV!yS+ z2~Y0KyZl|WaujN&$+!w7=4fW3b;9TwXP-I8<6r% zYcEVs;xavnC*vzTs#PQj9H!_q1E|yw-&8*x7mcb7jf6ai2=Dv4^0{`I5)z7xQHoI(IrUw><~30 zQ~^UNNh~c2qwz7r9jIkBOy#=D#lGs%rzBnz zBVYZJ<4n-wOG6Gv7~Yz%U?25wbqfMX+Yo5`%ZtA*Ex-?h{-EKEDTQt z#HHGqTw=xt>T3el*AfJ<|BttTf1AGiB6af$b5EE+Nu4krBPQVDl%gTkbfK;_69)Wy zHoW1sb&Z)16(*WQEly$N4QqN;qB+9^x>nRCYUi&w!eAJgoUAy-VD?#^yY}k0cNd2A zL`V3mbPs*?=hgN6PVU4o8?99-%;kVhSITkSn#UD~C|S4)d9U)>TC@vff1?#jD`j(j z_ozF9*64-?jvm>m?d_h@ouH<{e`GiOf}QWUj{m9Y4bX$oNzH#!dGhg>_6UK>ursBq zK9_~LZbJYUKeA72oeb5em{sg$*B*hOW8bRX^<-k{71za5X1}Vv>ZD1vZDrbVF!Wzd z)UBr)w(ktvy`@j@fOCtme_Q`~yM8o<(CXkuSwn7|H}Hb;hcbKg)PvLA#~azqB!#FP z_m$?WKdvqaXfuXPXl@Y42QGseCMM4&Vq^2l;LMUsw?m+t*_mL_B#kQ@MQ(iWq4pSh zUXigv6hRah-@ze0}Q!%e;&`6XO_4L?vw#>8Z%A!89H`J|Yc2F%;;5K5bB7c|%e-qC` zjkvjs=VKrJ7nC)zPoJvkXPRA%jr0B8#8d8hDlKtyyj_K`99;AGBV70 zl$R+B>ZIn8@Z<0}e>3nqxiUgCaEy7m*sXbnuv?K@l4Z%lc#X>F;Lg z)=9XA&NQ<4b)wg3nTVN9ce3PEX)L0Y)uP~0l_X3ySy=di$iuwKcmx(0QHOQXNkMfq zDuF>F@H|#B#_K!}%JESNM1(1MBemE$3Y6e!5E39OONz?Jf8+XUPVpXA<>GPm`F?(1 zf#2`-fn~_Pv&&G9JiNIFY5-+*au1<3M>cUhJrSFm-m>#Z`z0FL^?90Rg{ZQ;58$v2hjfBY|U1WLW9(i{>-;>oE;^uNmjOXWU+T`eZP>qUuZNVdr_WI7d0uq-UA zQiyu-mTA0t3Arga(w(;D8z3HOf>{&n;H-`enY(=JF5VWkCyBL50ZKzT*<7a0vuy;%B u+{Sw?GyXsA`yT)R0RR6Za7YqlCIJ5_N$~4&L1iIiAQ1pjMdxv6%L4#M2c?|= delta 37 vcmV+=0NVf5{{zp(1F*E>8-q@wqdHm> 2.32-master.patch.gz To compare the archive contents zdiff can be used. diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix b/third_party/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix new file mode 100644 index 0000000000..660e3b3b9b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, gnum4 +, glib +, libsigcxx30 +, gnome +, Cocoa +, meson +, ninja +}: + +stdenv.mkDerivation rec { + pname = "glibmm"; + version = "2.68.0"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-wfOFcxkdzu2FoFYAiIz0z0aVlB8zlxW9Z9UcJBb083U="; + }; + + nativeBuildInputs = [ + meson + pkg-config + ninja + gnum4 + glib # for glib-compile-schemas + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + Cocoa + ]; + + propagatedBuildInputs = [ + glib + libsigcxx30 + ]; + + doCheck = false; # fails. one test needs the net, another /etc/fstab + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "glibmm_2_68"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "C++ interface to the GLib library"; + homepage = "https://gtkmm.org/"; + license = licenses.lgpl2Plus; + maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]); + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix index a9abfbd177..9c4488a04a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin, meson, ninja }: +{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome, darwin, meson, ninja }: stdenv.mkDerivation rec { pname = "glibmm"; @@ -29,8 +29,9 @@ stdenv.mkDerivation rec { doCheck = false; # fails. one test needs the net, another /etc/fstab passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix index c8e77148c6..0b3d6689cb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome }: stdenv.mkDerivation rec { pname = "gnome-menus"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gobject-introspection ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix index ab71b2ccf9..2d349181de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -20,7 +20,7 @@ , libsoup , docbook-xsl-nons , docbook_xml_dtd_412 -, gnome3 +, gnome , gcr , libkrb5 , gvfs @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "gnome-online-accounts"; - version = "3.38.1"; + version = "3.40.0"; # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 src = fetchFromGitLab { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "gnome-online-accounts"; rev = version; - sha256 = "sha256-th7P++MC3GXX+349PJFEwHGGeMhxsGgoEDGnSYpY7E4="; + sha256 = "sha256-GuUWypfmfbovpDKnj6wSBuNeKJIfIyipY+01u/p4znU="; }; outputs = [ "out" "man" "dev" "devdoc" ]; @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dfedora=false" # not useful in NixOS or for NixOS users. "-Dgtk_doc=true" - "-Dlastfm=true" "-Dman=true" "-Dmedia_server=true" ]; @@ -90,7 +89,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix index a2206c19b1..e8fd3ca7e2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix @@ -4,7 +4,7 @@ , meson , ninja , gettext -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch index d4160b51d6..f74a7af1cf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch @@ -1,8 +1,10 @@ +diff --git a/gir/cairo-1.0.gir.in b/gir/cairo-1.0.gir.in +index e4c9fb3d..3351b184 100644 --- a/gir/cairo-1.0.gir.in +++ b/gir/cairo-1.0.gir.in -@@ -5,7 +5,7 @@ - xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> +@@ -6,7 +6,7 @@ + Date: Thu, 16 May 2019 21:15:15 -0400 Subject: [PATCH] meson: add options for tests installation dirs --- meson_options.txt | 6 ++++++ - tests/meson.build | 19 ++++++++++++++----- - 2 files changed, 20 insertions(+), 5 deletions(-) + tests/meson.build | 23 ++++++++++++++++------- + 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/meson_options.txt b/meson_options.txt -index 578bdae..6f5fa23 100644 +index b9a2fb5..4b8629f 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -22,3 +22,9 @@ option('tests', type: 'boolean', +@@ -23,3 +23,9 @@ option('tests', type: 'boolean', option('installed_tests', type: 'boolean', value: true, description: 'Install tests') @@ -23,12 +23,12 @@ index 578bdae..6f5fa23 100644 + value: '', + description: 'Installation directory for binary files in tests') diff --git a/tests/meson.build b/tests/meson.build -index 1f9bd0e..0253ac3 100644 +index 77281f5..c4c7fac 100644 --- a/tests/meson.build +++ b/tests/meson.build -@@ -22,8 +22,17 @@ unit_tests = [ - python = python3.find_python() - gen_installed_test = join_paths(meson.current_source_dir(), 'gen-installed-test.py') +@@ -21,8 +21,17 @@ unit_tests = [ + + gen_installed_test = find_program('gen-installed-test.py') -installed_test_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'installed-tests', graphene_api_path) -installed_test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), 'installed-tests', graphene_api_path) @@ -46,9 +46,9 @@ index 1f9bd0e..0253ac3 100644 # Make tests conditional on having mutest-1 installed system-wide, or # available as a subproject -@@ -42,13 +51,13 @@ if mutest_dep.found() +@@ -40,13 +49,13 @@ if mutest_dep.found() + output: wrapper, command: [ - python, gen_installed_test, - '--testdir=@0@'.format(installed_test_bindir), + '--testdir=@0@'.format(test_bindir), @@ -62,7 +62,7 @@ index 1f9bd0e..0253ac3 100644 ) test(unit, -@@ -57,7 +66,7 @@ if mutest_dep.found() +@@ -55,7 +64,7 @@ if mutest_dep.found() include_directories: graphene_inc, c_args: common_cflags, install: get_option('installed_tests'), @@ -71,6 +71,22 @@ index 1f9bd0e..0253ac3 100644 ), env: ['MUTEST_OUTPUT=tap'], protocol: 'tap', +@@ -70,13 +79,13 @@ if build_gir and host_system == 'linux' and not meson.is_cross_build() + output: wrapper, + command: [ + gen_installed_test, +- '--testdir=@0@'.format(installed_test_bindir), ++ '--testdir=@0@'.format(test_bindir), + '--testname=@0@'.format(unit), + '--outdir=@OUTDIR@', + '--outfile=@0@'.format(wrapper), + ], + install: get_option('installed_tests'), +- install_dir: installed_test_datadir, ++ install_dir: test_datadir, + ) + + test(unit, -- -2.22.0 +2.31.1 diff --git a/third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix b/third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix index 57cad44976..a9c647268a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "graphene"; - version = "1.10.2"; + version = "1.10.6"; outputs = [ "out" "devdoc" "installedTests" ]; @@ -24,19 +24,14 @@ stdenv.mkDerivation rec { owner = "ebassi"; repo = pname; rev = version; - sha256 = "1ljhhjafi1nlndjswx7mg0d01zci90wz77yvz5w8bd9mm8ssw38s"; + sha256 = "v6YH3fRMTzhp7wmU8in9ukcavzHmOAW54EK9ZwQyFxc="; }; patches = [ + # Add option for changing installation path of installed tests. ./0001-meson-add-options-for-tests-installation-dirs.patch ]; - mesonFlags = [ - "-Dgtk_doc=true" - "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" - "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" - ]; - nativeBuildInputs = [ docbook_xml_dtd_43 docbook_xsl @@ -57,8 +52,18 @@ stdenv.mkDerivation rec { mutest ]; + mesonFlags = [ + "-Dgtk_doc=true" + "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" + "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" + ]; + doCheck = true; + postPatch = '' + patchShebangs tests/gen-installed-test.py + ''; + passthru = { tests = { installedTests = nixosTests.installed-tests.graphene; @@ -73,7 +78,7 @@ stdenv.mkDerivation rec { description = "A thin layer of graphic data types"; homepage = "https://ebassi.github.com/graphene"; license = licenses.mit; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = teams.gnome.members ++ (with maintainers; [ ]); platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix index b80e6256e4..13ec503fae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix @@ -10,7 +10,7 @@ , librest , libarchive , libsoup -, gnome3 +, gnome , libxml2 , lua5_3 , liboauth @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "grilo-plugins"; - version = "0.3.12"; + version = "0.3.13"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xr59gzb8gw2bgj14mjllgn8y7srh373j0fp0v16ak8nd84dzdn6"; + sha256 = "HEMF1nNkqTBUODbMGYLzDpRpc7j/avPv4x2HcJq1IPg="; }; patches = [ @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/grilo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grilo/default.nix index fbab49273e..1b8c46394d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grilo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grilo/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }: +, libxml2, gnome, gobject-introspection, libsoup, totem-pl-parser }: let pname = "grilo"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib liboauth gtk3 libxml2 libsoup totem-pl-parser ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 318d07dfac..e9814a43b2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -7,16 +7,16 @@ , ninja , python3 # just for passthru -, gnome3 +, gnome }: stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "3.38.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rwcg9sd5rv7gjwapcd1jjk6l16w0p3j7wkicq1rdch4c0kch12p"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "11an29br55dp0b26kfqlrfxj19glfrmhcdpds2n1w9n04gq3pf7i"; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsignond/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsignond/default.nix index 92123dbc3e..912054eb85 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsignond/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsignond/default.nix @@ -54,7 +54,7 @@ unwrapped = stdenv.mkDerivation rec { description = "D-Bus service which performs user authentication on behalf of its clients"; homepage = "https://gitlab.com/accounts-sso/gsignond"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix index a05069f205..6141528a9f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-lastfm"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/mail.nix b/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/mail.nix index 8bce32f976..977bc14894 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/mail.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/mail.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-mail"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix b/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix index 3bf3ab1946..bc496e8ac2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-oa"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix b/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix index b73559f8a5..bd87d4f72b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-sasl"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsound/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsound/default.nix index 2a3e846d38..bcd39ce227 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsound/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsound/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome }: stdenv.mkDerivation rec { pname = "gsound"; @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib libcanberra ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gspell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gspell/default.nix index 890fcb9811..f591246eaf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gspell/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gspell/default.nix @@ -8,7 +8,7 @@ , icu , vala , gobject-introspection -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gssdp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gssdp/default.nix index 440caba254..6a76c07fec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gssdp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gssdp/default.nix @@ -11,7 +11,7 @@ , libsoup , gtk3 , glib -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index 40b10d0983..faf38a1a05 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , meson , ninja , gettext @@ -103,6 +104,15 @@ stdenv.mkDerivation rec { patches = [ # Use pkgconfig to inject the includedirs ./fix_pkgconfig_includedir.patch + ] ++ lib.optionals stdenv.isDarwin [ + # Fix “error: cannot initialize a parameter of type 'unsigned long *' with an rvalue of type 'typename std::remove_reference::type *' (aka 'volatile unsigned long *')” on Darwin. + (fetchpatch { + url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/640a65bf966df065d41a511e2d76d1f26a2e770c.patch"; + sha256 = "E5pig+qEfR58Jticr6ydFxZOhM3ZJ8zgrf5K4BdiB/Y="; + includes = [ + "ext/opencv/gstcvdilateerode.cpp" + ]; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix index 4f39262206..7e9095ef0e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-base"; - version = "1.18.2"; + version = "1.18.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1b05kg46azrxxvq42c71071lfsnc34pw4vynnkczdqi6g0gzn16x"; + sha256 = "08w3ivbc6n4vdds2ap6q7l8zdk9if8417nznyqidf0adm0lk5r99"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index 84badf3041..2d43a02725 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "gstreamer"; - version = "1.18.2"; + version = "1.18.4"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0ijlmvr660m8zn09xlmnq1ajrziqsivp2hig5a9mabhcjx7ypkb6"; + sha256 = "1igv9l4hm21kp1jmlwlagzs7ly1vaxv1sbda29q8247372dwkvls"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix index a39eadafb0..517fe9b302 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.18.2"; + version = "1.18.4"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0mhascwvgirgh7b5dykpnk06f7f5g62gh3sl30i6kygiidqkv9vf"; + sha256 = "1kvcabcfzm7wqih3lzgrg9xjbn4xpx43d1m2zkkvab4i8161kggz"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix index 774fefbc35..6ada053ea0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.18.2"; + version = "1.18.4"; outputs = [ "out" @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0pv2k8zlpn3vv2sdlspi3m63ixcwzi90pjly2ypbkg59ab97rb15"; + sha256 = "010xg960qsh5dwmf0y9l1q13h0cymmrgapzla2zsw66ylxqbi1s6"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index b08759b8db..86684893ef 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -48,13 +48,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.18.2"; + version = "1.18.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1929nhjsvbl4bw37nfagnfsnxz737cm2x3ayz9ayrn9lwkfm45zp"; + sha256 = "1c1rpq709cy8maaykyn1n0kckj9c6fl3mhvixkk6xmdwkcx0xrdn"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 2c683a84da..7123aa0d3a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome }: stdenv.mkDerivation rec { pname = "gstreamermm"; version = "1.10.0"; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - versionPolicy = "none"; # Unpredictable version stability + updateScript = gnome.updateScript { + packageName = "gst_all_1.gstreamermm"; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix index f0755f201d..009a1555f7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.18.2"; + version = "1.18.4"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0jbzams9ggk3sq9ywv4gsl9rghyn203l2582m6l5c1sz9ka9m5in"; + sha256 = "15n3x3vhshqa3icw93g4vqmqd46122anzqvfxwn6q8famlxlcjil"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 037face3d1..5659696001 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.18.2"; + version = "1.18.4"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1qjlp7az0hkzxvq53hwnp55sp6xhbybfwzaj66hp45jslsmj4fcp"; + sha256 = "153c78klvzlmi86d0gmdf7w9crv11rkd4y82b14a0wdr83gbhsx4"; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix index 7c70b7ead1..049e8a99f0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.18.2"; + version = "1.18.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1nwbcv5yaib3d8icvyja3zf6lyjf5zf1hndbijrhj8j7xlia0dx3"; + sha256 = "0g6i4db1883q3j0l2gdv46fcqwiiaw63n6mhvsfcms1i1p7g1391"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix index 2c92cd2236..19e65c5a75 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.18.2"; + version = "1.18.4"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1h67n7wk1297rzynknbyv44gdacblvkcvb37x8yxi5d0zms2qywc"; + sha256 = "1sia4l88z7kkxm2z9j20l43rqkrnsa47xccski10s5gkhsprinwj"; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-engine-bluecurve/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-engine-bluecurve/default.nix index 84920060c5..918e1679eb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk-engine-bluecurve/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-engine-bluecurve/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { description = "Original Bluecurve engine from Red Hat's artwork package"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.gnidorah ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix new file mode 100644 index 0000000000..e6c6d93919 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, vala +, gobject-introspection +, glib +, gtk3 +, freerdp +, nix-update-script +}: + +stdenv.mkDerivation rec { + pname = "gtk-frdp"; + version = "3.37.1-unstable-2020-10-26"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = "805721e82ca1df6a50da3b5bd3b75d6747016482"; + sha256 = "q/UFKYj3LUkAzll3KeKd6oec0GJnDtTuFMTTatKFlcs="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gobject-introspection + ]; + + buildInputs = [ + glib + gtk3 + freerdp + ]; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/gtk-frdp"; + description = "RDP viewer widget for GTK"; + maintainers = teams.gnome.members; + license = licenses.lgpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix index 1e7c865306..f35f5e0552 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -20,6 +20,7 @@ , automake , libtool , which +, fetchpatch }: stdenv.mkDerivation rec { @@ -34,6 +35,13 @@ stdenv.mkDerivation rec { sha256 = "1vy6yfwkfv6bb45bzf4g6dayiqkvqqvlr02rsnhd10793hlpqlgg"; }; + patches = [ + (fetchpatch { + url = "https://projects.archlinux.de/svntogit/packages.git/plain/trunk/gtk-sharp2-2.12.12-gtkrange.patch?h=packages/gtk-sharp-2"; + sha256 = "bjx+OfgWnN8SO82p8G7pbGuxJ9EeQxMLeHnrtEm8RV8="; + }) + ]; + postInstall = '' pushd $out/bin for f in gapi2-* diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix index 491656a0c6..6b996244a9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -42,6 +42,12 @@ stdenv.mkDerivation rec { url = "https://github.com/mono/gtk-sharp/commit/401df51bc461de93c1a78b6a7a0d5adc63cf186c.patch"; sha256 = "0hrkcr5a7wkixnyp60v4d6j3arsb63h54rd30lc5ajfjb3p92kcf"; }) + # @see https://github.com/mono/gtk-sharp/pull/263 + (fetchpatch { + name = "disambiguate_Gtk.Range.patch"; + url = "https://github.com/mono/gtk-sharp/commit/a00552ad68ae349e89e440dca21b86dbd6bccd30.patch"; + sha256 = "1ylplr9g9x7ybsgrydsgr6p3g7w6i46yng1hnl3afgn4vj45rag2"; + }) ]; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix index 8f50c922f5..ea112b3d33 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix @@ -1,15 +1,12 @@ { config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg , gdk-pixbuf, xlibsWrapper, gobject-introspection , xineramaSupport ? stdenv.isLinux -, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null +, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups , gdktarget ? if stdenv.isDarwin then "quartz" else "x11" , AppKit, Cocoa , fetchpatch }: -assert xineramaSupport -> xorg.libXinerama != null; -assert cupsSupport -> cups != null; - with lib; let diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index 0d4bec5f34..f9b5d5f68b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -29,7 +29,7 @@ , libxkbcommon , libxml2 , gmp -, gnome3 +, gnome , gsettings-desktop-schemas , sassc , trackerSupport ? stdenv.isLinux @@ -42,14 +42,12 @@ , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux , withGtkDoc ? stdenv.isLinux -, cups ? null +, cups , AppKit , Cocoa , broadwaySupport ? true }: -assert cupsSupport -> cups != null; - let gtkCleanImmodulesCache = substituteAll { @@ -208,7 +206,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtk+"; attrPath = "gtk3"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix index b64b8bc36f..8791d24ad3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix @@ -5,9 +5,7 @@ , pkg-config , gettext , graphene -, docbook-xsl-nons -, docbook_xml_dtd_43 -, gtk-doc +, gi-docgen , meson , ninja , python3 @@ -30,7 +28,7 @@ , libsoup , ffmpeg , gmp -, gnome3 +, gnome , gsettings-desktop-schemas , gst_all_1 , sassc @@ -45,15 +43,12 @@ , wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux -, withGtkDoc ? stdenv.isLinux -, cups ? null +, cups , AppKit , Cocoa , broadwaySupport ? true }: -assert cupsSupport -> cups != null; - let gtkCleanImmodulesCache = substituteAll { @@ -66,9 +61,9 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.0.3"; + version = "4.2.1"; - outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; + outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; setupHooks = [ @@ -78,7 +73,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "18mJNyV5C1C9mjuyeIVtnVQ7RLa5uVHXtg573swTGJA="; + sha256 = "AjFpd13kPwof3gZvvBnXhUXqanViwZFavem4rkpzCeY="; }; nativeBuildInputs = [ @@ -90,21 +85,17 @@ stdenv.mkDerivation rec { pkg-config python3 sassc - ] ++ setupHooks ++ lib.optionals withGtkDoc [ - pandoc - docbook_xml_dtd_43 - docbook-xsl-nons - gtk-doc - # For xmllint - libxml2 - ]; + gi-docgen + ] ++ setupHooks; buildInputs = [ libxkbcommon epoxy json-glib isocodes + ] ++ lib.optionals (!stdenv.isDarwin) [ vulkan-headers + ] ++ [ librest libsoup ffmpeg @@ -143,18 +134,27 @@ stdenv.mkDerivation rec { glib graphene pango - vulkan-loader # TODO: Possibly not used on Darwin - + ] ++ lib.optionals (!stdenv.isDarwin) [ + vulkan-loader + ] ++ [ # Required for GSettings schemas at runtime. # Will be picked up by wrapGAppsHook. gsettings-desktop-schemas ]; mesonFlags = [ - "-Dgtk_doc=${lib.boolToString withGtkDoc}" - "-Dtests=false" - "-Dtracker3=${lib.boolToString trackerSupport}" - "-Dbroadway_backend=${lib.boolToString broadwaySupport}" + # ../docs/tools/shooter.c:4:10: fatal error: 'cairo-xlib.h' file not found + "-Dgtk_doc=${lib.boolToString x11Support}" + "-Dbuild-tests=false" + "-Dtracker=${if trackerSupport then "enabled" else "disabled"}" + "-Dbroadway-backend=${lib.boolToString broadwaySupport}" + ] ++ lib.optionals (!cupsSupport) [ + "-Dprint-cups=disabled" + ] ++ lib.optionals stdenv.isDarwin [ + "-Dvulkan=disabled" + "-Dmedia-gstreamer=disabled" # requires gstreamer-gl + ] ++ lib.optionals (!x11Support) [ + "-Dx11-backend=false" ]; doCheck = false; # needs X11 @@ -173,20 +173,12 @@ stdenv.mkDerivation rec { gdk/gen-gdk-gresources-xml.py gtk/gen-gtk-gresources-xml.py gtk/gentypefuncs.py - docs/reference/gtk/gtk-markdown-to-docbook ) chmod +x ''${files[@]} patchShebangs ''${files[@]} ''; - postBuild = lib.optionalString withGtkDoc '' - # Meson not building `custom_target`s passed to `custom_files` argument of `gnome.gtkdoc` function - # as part of the `install` target. We have to build the docs manually first. - # https://github.com/mesonbuild/meson/issues/2831 - ninja g{t,d,s}k4-doc - ''; - preInstall = '' OLD_PATH="$PATH" PATH="$PATH:$dev/bin" # so the install script finds gtk4-update-icon-cache @@ -204,6 +196,13 @@ stdenv.mkDerivation rec { for f in $dev/bin/gtk4-encode-symbolic-svg; do wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" done + + '' + lib.optionalString x11Support '' + # So that DevHelp can find this. + # TODO: Remove this with DevHelp 41. + mkdir -p "$devdoc/share/devhelp/books" + mv "$out/share/doc/"* "$devdoc/share/devhelp/books" + rmdir -p --ignore-fail-on-non-empty "$out/share/doc" ''; # Wrap demos @@ -217,7 +216,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtk"; attrPath = "gtk4"; }; @@ -237,7 +236,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin lethalman worldofpeace ]; + maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]); platforms = platforms.all; changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkd/default.nix index a3aa18b058..eaf8a94d13 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtkd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtkd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome3, gst_all_1, librsvg +{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome, gst_all_1, librsvg , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }: let diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix index 521f4ca15f..cf26e22da5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/2.x.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ raskin vcunat ]; + maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix index 950e1a976a..1e5932c385 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome }: stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.3"; + version = "3.24.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-YEl8T381TDvSVXSF8CVPi3tM9L68n+4L4mp3dE6s1DU="; + sha256 = "sha256-m+txw+kM/Pt5A5a1Hj9ecWmWZ1Hv1PPvlpcRS+O+Z0M="; }; outputs = [ "out" "dev" ]; @@ -22,9 +22,10 @@ stdenv.mkDerivation rec { doCheck = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "${pname}3"; + versionPolicy = "odd-unstable"; }; }; @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin vcunat ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix new file mode 100644 index 0000000000..5083956846 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix @@ -0,0 +1,91 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, meson +, ninja +, python3 +, gtk4 +, glibmm_2_68 +, cairomm_1_16 +, pangomm_2_48 +, epoxy +, gnome +, makeFontsConf +, xvfb-run +}: + +stdenv.mkDerivation rec { + pname = "gtkmm"; + version = "4.0.1"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-iXPZvHhI4CyyBR4F8+46S6/+L+tK9KVIfw4xMu7AOIQ="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + python3 + ]; + + buildInputs = [ + epoxy + ]; + + propagatedBuildInputs = [ + glibmm_2_68 + gtk4 + cairomm_1_16 + pangomm_2_48 + ]; + + checkInputs = [ + xvfb-run + ]; + + # Tests require fontconfig. + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ ]; + }; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + xvfb-run -s '-screen 0 800x600x24' \ + meson test --print-errorlogs + + runHook postCheck + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "${pname}4"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "C++ interface to the GTK graphical user interface library"; + longDescription = '' + gtkmm is the official C++ interface for the popular GUI library + GTK. Highlights include typesafe callbacks, and a + comprehensive set of widgets that are easily extensible via + inheritance. You can create user interfaces either in code or + with the Glade User Interface designer, using libglademm. + There's extensive documentation, including API reference and a + tutorial. + ''; + homepage = "https://gtkmm.org/"; + license = licenses.lgpl2Plus; + maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]); + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix index 84a20154b1..dce589dd64 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala -, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb_run, shared-mime-info }: +, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb-run, shared-mime-info }: stdenv.mkDerivation rec { pname = "gtksourceview"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ]; - checkInputs = [ xvfb_run dbus ]; + checkInputs = [ xvfb-run dbus ]; buildInputs = [ atk cairo glib pango libxml2 gettext ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix index 9ead894e0d..eb92586ce8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,32 +1,42 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala -, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info -, meson, ninja }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkg-config +, atk +, cairo +, glib +, gtk3 +, pango +, fribidi +, vala +, libxml2 +, perl +, gettext +, gnome +, gobject-introspection +, dbus +, xvfb-run +, shared-mime-info +}: stdenv.mkDerivation rec { pname = "gtksourceview"; version = "4.8.1"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0WPXG1/K+8Wx7sbdhB7b283dOnURzV/c/9hri7/mmsE="; }; - propagatedBuildInputs = [ - # Required by gtksourceview-4.0.pc - gtk3 - # Used by gtk_source_language_manager_guess_language - shared-mime-info - ]; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ meson ninja pkg-config gettext perl gobject-introspection vala ]; - - checkInputs = [ xvfb_run dbus ]; - - buildInputs = [ atk cairo glib pango fribidi libxml2 ]; - patches = [ + # By default, the library loads syntaxes from XDG_DATA_DIRS and user directory + # but not from its own datadr (it assumes it will be in XDG_DATA_DIRS). + # Since this is not generally true with Nix, let’s add $out/share unconditionally. ./4.x-nix_share_path.patch # fixes intermittent "gtksourceview-gresources.h: no such file" errors @@ -37,27 +47,63 @@ stdenv.mkDerivation rec { }) ]; - enableParallelBuilding = true; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + perl + gobject-introspection + vala + ]; + + buildInputs = [ + atk + cairo + glib + pango + fribidi + libxml2 + ]; + + propagatedBuildInputs = [ + # Required by gtksourceview-4.0.pc + gtk3 + # Used by gtk_source_language_manager_guess_language + shared-mime-info + ]; + + checkInputs = [ + xvfb-run + dbus + ]; doCheck = stdenv.isLinux; + checkPhase = '' + runHook preCheck + XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ meson test --no-rebuild --print-errorlogs + + runHook postCheck ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtksourceview"; attrPath = "gtksourceview4"; + versionPolicy = "odd-unstable"; }; }; meta = with lib; { + description = "Source code editing widget for GTK"; homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; - platforms = with platforms; linux ++ darwin; - license = licenses.lgpl21; + platforms = platforms.unix; + license = licenses.lgpl21Plus; maintainers = teams.gnome.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix new file mode 100644 index 0000000000..fd4a420012 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix @@ -0,0 +1,99 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, glib +, pcre2 +, gtk4 +, pango +, fribidi +, vala +, libxml2 +, perl +, gettext +, gnome +, gobject-introspection +, dbus +, xvfb-run +, shared-mime-info +}: + +stdenv.mkDerivation rec { + pname = "gtksourceview"; + version = "5.0.0"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1hyrmh9r1zd5kjh5ch9d7bhk2kphbqhm7ijfxfkcdln8q0rnd0k4"; + }; + + patches = [ + # By default, the library loads syntaxes from XDG_DATA_DIRS and user directory + # but not from its own datadr (it assumes it will be in XDG_DATA_DIRS). + # Since this is not generally true with Nix, let’s add $out/share unconditionally. + ./4.x-nix_share_path.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + perl + gobject-introspection + vala + ]; + + buildInputs = [ + glib + pcre2 + pango + fribidi + libxml2 + ]; + + propagatedBuildInputs = [ + # Required by gtksourceview-5.0.pc + gtk4 + # Used by gtk_source_language_manager_guess_language + shared-mime-info + ]; + + checkInputs = [ + xvfb-run + dbus + ]; + + doCheck = stdenv.isLinux; + + checkPhase = '' + runHook preCheck + + XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test --no-rebuild --print-errorlogs + + runHook postCheck + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gtksourceview"; + attrPath = "gtksourceview5"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "Source code editing widget for GTK"; + homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + platforms = platforms.unix; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceviewmm/4.x.nix index 5e80f91abc..3011a126c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceviewmm/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview4, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview4, gnome }: stdenv.mkDerivation rec { pname = "gtksourceviewmm"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix index 7ee6b656ea..fc4439e223 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview3, gnome }: stdenv.mkDerivation rec { pname = "gtksourceviewmm"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtksourceviewmm"; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix index 9bf39d94ae..8d800f9794 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix @@ -8,7 +8,7 @@ , docbook_xml_dtd_412 , glib , libxml2 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -43,8 +43,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix index e11d86f82e..f9efe352a8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix @@ -8,7 +8,7 @@ , docbook_xml_dtd_412 , libxml2 , gst_all_1 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -48,8 +48,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix index 233eb7e3c8..6eb44b9172 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix @@ -10,7 +10,7 @@ , docbook_xml_dtd_412 , glib , gupnp -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -49,8 +49,9 @@ stdenv.mkDerivation rec { #doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix index d6465d71c5..bd8151d603 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix @@ -14,7 +14,7 @@ , libsoup , libxml2 , libuuid -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix index 2c9bac002f..547c35e66e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix @@ -23,7 +23,7 @@ , samba , libmtp , gnomeSupport ? false -, gnome3 +, gnome , gcr , glib-networking , gnome-online-accounts @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.46.2"; + version = "1.48.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "2D+hYChmcMA+uJAkBgbYr6fqajqBjorRfu7Y2XZIe9c="; + sha256 = "1hlxl6368h6nyqp1888szxs9hnpcw98k3h23dgqi29xd38klzsmj"; }; postPatch = '' @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas # TODO: a ligther version of libsoup to have FTP/HTTP support? ] ++ lib.optionals gnomeSupport [ - gnome3.libsoup + gnome.libsoup gcr glib-networking # TLS support gnome-online-accounts @@ -117,8 +117,9 @@ stdenv.mkDerivation rec { doInstallCheck = doCheck; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; @@ -126,6 +127,6 @@ stdenv.mkDerivation rec { description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)"; license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ] ++ teams.gnome.members; + maintainers = [ ] ++ teams.gnome.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/herqq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/herqq/default.nix index f35d7528f4..65eacd7fff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/herqq/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/herqq/default.nix @@ -1,10 +1,10 @@ -{ lib, mkDerivation, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }: +{ lib, mkDerivation, fetchFromGitHub, qmake, qtmultimedia, qtbase }: mkDerivation rec { version = "unstable-20-06-26"; pname = "herqq"; - nativeBuildInputs = [ qmake unzip ]; + nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtmultimedia ]; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hivex/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hivex/default.nix index fb77e08ca6..b151db07df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hivex/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hivex/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "hivex"; - version = "1.3.19"; + version = "1.3.20"; src = fetchurl { url = "https://libguestfs.org/download/hivex/${pname}-${version}.tar.gz"; - sha256 = "0qppahpf7jq950nf8ial47h90nyqgnsffsj3zgdjjwkn958wq0ji"; + sha256 = "sha256-9SPDe7BkpLq321IkkCw07uT5+rLZuBz2FbMsC4UJ0y0="; }; patches = [ ./hivex-syms.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hotpatch/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hotpatch/default.nix index 9857f9f281..2dd894ff4a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hotpatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hotpatch/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Hot patching executables on Linux using .so file injection"; homepage = src.meta.homepage; license = licenses.bsd3; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = ["i686-linux" "x86_64-linux"]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index 37b5678963..f1bcd4ad00 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -761,11 +761,11 @@ in rec { da_DK = da-dk; da-dk = mkDict rec { name = "hunspell-dict-da-dk-${version}"; - version = "2.5.137"; + version = "2.5.189"; src = fetchurl { url = "https://stavekontrolden.dk/dictionaries/da_DK/da_DK-${version}.oxt"; - sha256 = "16y0smkg1mq0133r1fbw5ak6s2xw39281knk5ivhanakayq789qx"; + sha256 = "sha256:0i1cw0nfg24b0sg2yc3q7315ng5vc5245nvh0l1cndkn2c9z4978"; }; shortName = "da-dk"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/icu/69.nix b/third_party/nixpkgs/pkgs/development/libraries/icu/69.nix new file mode 100644 index 0000000000..8cea41daad --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/icu/69.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "69.1"; + sha256 = "0icps0avkwy5df3wwc5kybxcg63hcgk4phdh9g244g0xrmx7pfjc"; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix index 86b8b7130f..29e12cc854 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "sha256-Ylw02Mz9H4wIWfq59za/X7xfhgW9o0DNU55nLFqeUeo="; + sha256 = "sha256-StRXtP2PelPcS+l5O1AOVFkza3hiKFwCdp8XLal4grE="; }; # Normally, igraph wants us to call bootstrap.sh, which will call @@ -77,15 +77,17 @@ stdenv.mkDerivation rec { "-DIGRAPH_USE_INTERNAL_GMP=OFF" "-DIGRAPH_GLPK_SUPPORT=ON" "-DIGRAPH_GRAPHML_SUPPORT=ON" - "-DIGRAPH_ENABLE_LTO=ON" + "-DIGRAPH_ENABLE_LTO=AUTO" "-DIGRAPH_ENABLE_TLS=ON" "-DBUILD_SHARED_LIBS=ON" ]; doCheck = true; - preCheck = '' - # needed to find libigraph.so + # needed to find libigraph, and liblas on darwin + preCheck = if stdenv.isDarwin then '' + export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [ blas ]}:$PWD/src" + '' else '' export LD_LIBRARY_PATH="$PWD/src" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/imlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/imlib/default.nix index 53612f8205..1d6fed2281 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/imlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/imlib/default.nix @@ -1,4 +1,6 @@ -{lib, stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}: +{ lib, stdenv, fetchurl, fetchpatch +, libX11, libXext, xorgproto, libjpeg, giflib, libtiff, libpng +}: stdenv.mkDerivation { name = "imlib-1.9.15"; @@ -13,6 +15,16 @@ stdenv.mkDerivation { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-bpp16-CVE-2007-3568.patch"; sha256 = "0lxfibi094gki39sq1w4p0hcx25xlk0875agbhjkjngzx862wvbg"; }) + + # The following two patches fix the build with recent giflib. + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-giflib51-1.patch?id=c6d0ed89ad5653421f21cbf3b3d40fd9a1361828"; + sha256 = "0jynlhxcyjiwnz1m8j48xwz4z5csgyg03jfjc8xgpvvcyid4m65l"; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-giflib51-2.patch?id=c6d0ed89ad5653421f21cbf3b3d40fd9a1361828"; + sha256 = "164x7rd992930rqllmr89p5ahfmbz37ipi8x0igd8gkvc8a4fd5x"; + }) ]; configureFlags = [ @@ -21,11 +33,11 @@ stdenv.mkDerivation { "--x-libraries=${libX11.out}/lib" ]; - buildInputs = [libjpeg libXext libX11 xorgproto libtiff libungif libpng]; + buildInputs = [ libjpeg libXext libX11 xorgproto libtiff giflib libpng ]; meta = with lib; { description = "An image loading and rendering library for X11"; platforms = platforms.unix; - license = with licenses; [ gpl2 lgpl2 ]; + license = with licenses; [ gpl2Only lgpl2Only ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index 715e562145..78e2ebae96 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "20.5.1"; + version = "21.2.0"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "0l5m7r8585ycifbbi5i0bs63c9sb8rsmk43ik97mhfl1ivswf1mv"; + sha256 = "sha256-LusgmvlWOMEQjy47IpA9IYcl/cUTSMmvxSwvV/ihs2g="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix b/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix index 6331084597..260be948ce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }: +{ lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm }: let common = import ./common.nix { inherit fetchzip; }; @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - nativeBuildInputs = [ unzip ]; buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix b/third_party/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix index 1235941b2d..a790146608 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: +{ lib, stdenv, fetchzip, libGLU, libGL, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: let common = import ./common.nix { inherit fetchzip; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "-DIRRLICHT_BUILD_TOOLS=OFF" ]; - nativeBuildInputs = [ cmake unzip ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ OpenGL Cocoa IOKit ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix index ed086dac90..9ef66fd2ce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix @@ -6,48 +6,64 @@ , ninja , pkg-config , gettext +, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform , gobject-introspection , fixDarwinDylibNames , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 -, gnome3 +, gnome }: stdenv.mkDerivation rec { pname = "json-glib"; version = "1.6.2"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] + ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"; }; + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja pkg-config gettext - gobject-introspection glib - gtk-doc docbook-xsl-nons docbook_xml_dtd_43 ] ++ lib.optional stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames + ] ++ lib.optionals withIntrospection [ + gobject-introspection + gtk-doc ]; propagatedBuildInputs = [ glib ]; + mesonFlags = lib.optionals (!withIntrospection) [ + "-Dintrospection=disabled" + # doc gen uses introspection, doesn't work properly + "-Dgtk_doc=disabled" + ]; + doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix index 90d3f1da6e..f41bf0f0c8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { inherit version; homepage = "https://github.com/open-source-parsers/jsoncpp"; description = "A C++ library for interacting with JSON"; - maintainers = with maintainers; [ ttuegel cpages nand0p ]; + maintainers = with maintainers; [ ttuegel cpages ]; license = licenses.mit; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix index 1ec9c3da41..b43bcd07ca 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome }: stdenv.mkDerivation rec { pname = "jsonrpc-glib"; version = "3.38.0"; @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { doCheck = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix index b2cc4ab08b..3dcec13a18 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "jxrlib"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace '.so' '.dylib' ''; - nativeBuildInputs = [ python3 ]; + nativeBuildInputs = [ python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/keybinder/default.nix b/third_party/nixpkgs/pkgs/development/libraries/keybinder/default.nix index 663abb1528..fb481c19d0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/keybinder/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/keybinder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome3 +{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome , gtk-doc, gtk2, python2Packages, lua, gobject-introspection }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - autoconf automake libtool gnome3.gnome-common gtk-doc gtk2 + autoconf automake libtool gnome.gnome-common gtk-doc gtk2 python pygtk lua gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/keybinder3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/keybinder3/default.nix index e291ec56bb..78755a8791 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/keybinder3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/keybinder3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome3 +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome , gtk-doc, gtk3, libX11, libXext, libXrender, gobject-introspection }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ - gnome3.gnome-common gtk-doc gtk3 + gnome.gnome-common gtk-doc gtk3 libX11 libXext libXrender gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kmsxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kmsxx/default.nix index c88dde7e44..222747b4d7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kmsxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kmsxx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; homepage = "https://github.com/tomba/kmsxx"; license = licenses.mpl20; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; broken = true; # marked broken 2021-03-26 }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix index c74ff6716f..cc282d9abc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "kronosnet"; - version = "1.20"; + version = "1.21"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-lP5W+4b9McU2Uqibh2SucIu2y4KluO3B1RpAJKgYq/M="; + sha256 = "14i4fl3g60gn5ay3dbwjcay3dnmnqr16zcp3g0wv9a3hjwh1if28"; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/l-smash/default.nix b/third_party/nixpkgs/pkgs/development/libraries/l-smash/default.nix index b1b5fd0120..40eb4bd10d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/l-smash/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/l-smash/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; + configureFlags = [ + "--cc=cc" + "--cross-prefix=${stdenv.cc.targetPrefix}" + ]; + meta = with lib; { homepage = "http://l-smash.github.io/l-smash/"; description = "MP4 container utilities"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lasem/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lasem/default.nix index 22f0436edc..9c49429ece 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lasem/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lasem/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, pkg-config, intltool, gobject-introspection, glib, gdk-pixbuf -, libxml2, cairo, pango, gnome3 }: +, libxml2, cairo, pango, gnome }: stdenv.mkDerivation rec { pname = "lasem"; @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libAfterImage/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libAfterImage/default.nix index 1c88459ba9..de463cdf42 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libAfterImage/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libAfterImage/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, giflib, libjpeg, libpng, libX11, zlib +, static ? stdenv.hostPlatform.isStatic +, withX ? !stdenv.isDarwin }: stdenv.mkDerivation { pname = "libAfterImage"; @@ -13,7 +15,56 @@ stdenv.mkDerivation { sha256 = "0n74rxidwig3yhr6fzxsk7y19n1nq1f296lzrvgj5pfiyi9k48vf"; }; - buildInputs = [ zlib ]; + patches = [ + # add back --with-gif option + (fetchpatch { + name = "libafterimage-gif.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-gif.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; + sha256 = "16pa94wlqpd7h6mzs4f0qm794yk1xczrwsgf93kdd3g0zbjq3rnr"; + }) + + # fix build with newer giflib + (fetchpatch { + name = "libafterimage-giflib5-v2.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-giflib5-v2.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; + sha256 = "0qwydqy9bm73cg5n3vm97aj4jfi70p7fxqmfbi54vi78z593brln"; + stripLen = 1; + }) + + # fix build with newer libpng + (fetchpatch { + name = "libafterimage-libpng15.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-libpng15.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; + sha256 = "1qyvf7786hayasfnnilfbri3p99cfz5wjpbli3gdqj2cvk6mpydv"; + }) + + # fix an ldconfig problem + (fetchpatch { + name = "libafterimage-makefile.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-makefile.in.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; + sha256 = "1n6fniz6dldms615046yhc4mlg9gb53y4yfia8wfz6szgq5zicj4"; + }) + ]; + patchFlags = [ "-p0" ]; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ giflib libjpeg libpng zlib ] ++ lib.optional withX libX11; + + preConfigure = '' + rm -rf {libjpeg,libpng,libungif,zlib}/ + substituteInPlace Makefile.in \ + --replace "include .depend" "" + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile.in \ + --replace "-soname," "-install_name,$out/lib/" + ''; + + configureFlags = [ + "--with-gif" + "--disable-mmx-optimization" + "--${if static then "enable" else "disable"}-staticlibs" + "--${if !static then "enable" else "disable"}-sharedlibs" + ] ++ lib.optional withX "--with-x"; meta = with lib; { homepage = "http://www.afterstep.org/afterimage/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix index 486326f15f..f3b9cad072 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix @@ -10,7 +10,7 @@ , vala , gobject-introspection , gtk4 -, xvfb_run +, xvfb-run }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ]; checkInputs = [ - xvfb_run + xvfb-run ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix index 67404f9e5c..ee34afad4f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.3.11"; + version = "4.3.12"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "sha256-ZEvzZ++0f7Kf3iVbf3vQbyE8yd/dasU+dSxDDUu8Xug="; + sha256 = "sha256-veiD2RrJ08HYZ1Jy8EUe6ct2qh7a2xZCn3TTM+Hvu+0="; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix index 62045a79eb..83f5de4d01 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchgit, yasm, perl, cmake, pkg-config, python3 }: +{ lib, stdenv, fetchzip, yasm, perl, cmake, pkg-config, python3 }: stdenv.mkDerivation rec { pname = "libaom"; - version = "3.0.0"; + version = "3.1.0"; - src = fetchgit { - url = "https://aomedia.googlesource.com/aom"; - rev = "v${version}"; - sha256 = "178rq1d7i9q4lg40bipkyhdrk18j9wi5k5avpa5bls0zm7g5ifsx"; + src = fetchzip { + url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; + sha256 = "1v3i34jmbz1p3x8msj3vx46nl6jdzxbkr2lfbh06vard8adb16il"; + stripRoot = false; }; patches = [ ./outputs.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix index 6a180cb62c..3a8c2a2655 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix @@ -17,11 +17,11 @@ in with lib; stdenv.mkDerivation rec { pname = "libass"; - version = "0.15.0"; + version = "0.15.1"; src = fetchurl { url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "0cz8v6kh3f2j5rdjrra2z0h715fa16vjm7kambvqx9hak86262cz"; + sha256 = "sha256-HN05ydAHsG5zfnc4AE1/OM+bHpKEPzcweyTn/2OrjlM="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix index 584ea93293..9b1654420e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc +{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, autoreconfHook, pkg-config, gtk-doc , docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted , cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key , libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive @@ -22,6 +22,13 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; sgdisk = "${gptfdisk}/bin/sgdisk"; }) + + # fix build with glib 2.68 (g_memdup is deprecated) + # https://github.com/storaged-project/libblockdev/pull/623 + (fetchpatch { + url = "https://github.com/storaged-project/libblockdev/commit/5528baef6ccc835a06c45f9db34a2c9c3f2dd940.patch"; + sha256 = "jxq4BLeyTMeNvBvY8k8QXIvYSJ2Gah0J75pq6FpG7PM="; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libccd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libccd/default.nix new file mode 100644 index 0000000000..a9e0c2b3fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libccd/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libccd"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "danfis"; + repo = pname; + rev = "v${version}"; + sha256 = "0sfmn5pd7k5kyhbxnd689xmsa5v843r7sska96dlysqpljd691jc"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Library for collision detection between two convex shapes"; + homepage = "https://github.com/danfis/libccd"; + license = licenses.bsd3; + maintainers = with maintainers; [ lopsided98 ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix index 22a062acd6..20609509b6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome3 +{ fetchurl, lib, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome , clutter-gtk, libsoup, gobject-introspection /*, libmemphis */ }: stdenv.mkDerivation rec { @@ -24,8 +24,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libchardet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libchardet/default.nix index 260c332f7e..47ce911a69 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libchardet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libchardet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libchardet"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "Joungkyun"; repo = "libchardet"; rev = version; - sha256 = "0c1k5hf3ssh3cm72w2zpy5k73vhy1gyq5s9rqdawqqa4al8syyvn"; + sha256 = "sha256-JhEiWM3q8X+eEBHxv8k9yYOaTGoJOzI+/iFYC0gZJJs="; }; nativeBuildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix index b864c279d3..a6f2e05d73 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - hash = "sha256-vJ4OyU9HYQvF1SWmniNGAuHQ7K/TfiK8C4celK5hjiA="; + hash = "sha256-nsIyosn8dBf217UmjXSKLTM2RhIQHCSvPlrvlqo5KLc="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcommuni/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcommuni/default.nix index 532c91a0ed..3e2c0daf0b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcommuni/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcommuni/default.nix @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; dontUseQmakeConfigure = true; - configureFlags = [ "-config" "release" ]; + configureFlags = [ "-config" "release" ] + # Build mixes up dylibs/frameworks if one is not explicitely specified. + ++ lib.optionals stdenv.isDarwin [ "-config" "qt_framework" ]; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcrafter/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcrafter/default.nix index e7a6e6c983..37ac9bf7f1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcrafter/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcrafter/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/pellegre/libcrafter"; description = "High level C++ network packet sniffing and crafting library"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.lethalman ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcryptui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcryptui/default.nix index 5fdd60abe1..e816846842 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcryptui/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcryptui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }: stdenv.mkDerivation rec { pname = "libcryptui"; @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix index d6ecb6e974..d62614c56c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix @@ -1,19 +1,19 @@ { lib, stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome3 }: +, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb-run, glib, gtk3, gnome }: stdenv.mkDerivation rec { pname = "libdazzle"; - version = "3.38.0"; + version = "3.40.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libdazzle/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13v7s46cgw135ycx0byn7am4inn33slrhljq0v0wwfwl2y1g52p1"; + sha256 = "19abrrjsyjhhl1xflnb0likb9wwzz78fa1mk2b064rpscmz9mafv"; }; - nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ]; + nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb-run glib ]; buildInputs = [ glib gtk3 ]; mesonFlags = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix new file mode 100644 index 0000000000..a5c0752b9a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, openssl +, perl +, pkg-config +, rustPlatform +, sqlite +}: + +stdenv.mkDerivation rec { + pname = "libdeltachat"; + version = "1.55.0"; + + src = fetchFromGitHub { + owner = "deltachat"; + repo = "deltachat-core-rust"; + rev = version; + sha256 = "sha256-D30usAVpyiqXQMrTvmdaGFig7jhyb3rMTBQL/E2UL50="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "1hf7lrqbv0ba9c0kmnjn5x1fispyyjip1gmllq77z6nsjpn0f9w8"; + }; + + nativeBuildInputs = [ + cmake + perl + pkg-config + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + ]); + + buildInputs = [ + openssl + sqlite + ]; + + checkInputs = with rustPlatform; [ + cargoCheckHook + ]; + + meta = with lib; { + description = "Delta Chat Rust Core library"; + homepage = "https://github.com/deltachat/deltachat-core-rust/"; + changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${version}/CHANGELOG.md"; + license = licenses.mpl20; + platforms = platforms.linux; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix index 5b2914c141..c7a7673dc1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.5"; + version = "3.14.6"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - sha256 = "sha256-PSrYoz5ID88pYs/4rP2kz0NpI0pK6wcnx62HokE0g20="; + sha256 = "sha256-zDMxJyL/T3cXrqgMT15yZlCozgyOt5nNreottuuiGHk="; }; nativeBuildInputs = [ cmake pkg-config xxd ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix index 0f65a5cee5..4a9a4b0980 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libdivecomputer"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { url = "https://www.libdivecomputer.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0nm1mcscpxb9dv4p0lidd6rf5xg4vmcbigj6zqxvgn7pwnvpbzm0"; + sha256 = "sha256-gNnxlOokUCA535hZhILgr8aw4zPeeds0wpstaJNNJbk="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libepc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libepc/default.nix index ee8dfb6e94..9755d0977c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libepc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libepc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome }: let avahiWithGtk = avahi.override { gtk3Support = true; }; @@ -32,8 +32,9 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix index d99cf6ef62..cef1fbc512 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix @@ -13,11 +13,11 @@ # ''; # See also . , gtkSupport ? true, glib ? null, gtk3 ? null -, videoSupport ? true, ffmpeg_3 ? null, libmpeg2 ? null}: +, videoSupport ? true, ffmpeg ? null, libmpeg2 ? null}: assert gstreamerSupport -> gst_all_1 != null && builtins.isList (gstPlugins gst_all_1); assert gtkSupport -> glib != null && gtk3 != null; -assert videoSupport -> ffmpeg_3 != null && libmpeg2 != null; +assert videoSupport -> ffmpeg != null && libmpeg2 != null; stdenv.mkDerivation rec { pname = "libextractor"; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals gstreamerSupport ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) ++ lib.optionals gtkSupport [ glib gtk3 ] - ++ lib.optionals videoSupport [ ffmpeg_3 libmpeg2 ]; + ++ lib.optionals videoSupport [ ffmpeg libmpeg2 ]; configureFlags = [ "--disable-ltdl-install" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix index f44ae4d01f..64c16e92c4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , fetchpatch , cmake @@ -7,30 +8,47 @@ , libcbor , openssl , udev +, zlib }: stdenv.mkDerivation rec { pname = "libfido2"; - version = "1.5.0"; + version = "1.7.0"; + + # releases on https://developers.yubico.com/libfido2/Releases/ are signed src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "08iizxq3w8mpkwfrfpl59csffc20yz8x398bl3kf23rrr4izk42r"; + sha256 = "13khkp2q8g447797l09p83qxy0z8vgmzr54l8dcnapy9lsr4jrqi"; }; + patches = [ + # fix log truncation + # https://github.com/Yubico/libfido2/issues/318 + # https://github.com/Yubico/libfido2/pull/319 + (fetchpatch { + url = "https://github.com/Yubico/libfido2/commit/8edb9a204b2f4aeb487e282908c3187f1d02d606.patch"; + sha256 = "1i360bghwbdccgkzjfzvhilscnwsj9lhfiviy000n928698l4wan"; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ hidapi libcbor openssl ] + buildInputs = [ libcbor openssl zlib ] + ++ lib.optionals stdenv.isDarwin [ hidapi ] ++ lib.optionals stdenv.isLinux [ udev ]; cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" - "-DUSE_HIDAPI=1" "-DCMAKE_INSTALL_LIBDIR=lib" + ] ++ lib.optionals stdenv.isDarwin [ + "-DUSE_HIDAPI=1" + ] ++ lib.optionals stdenv.isLinux [ + "-DNFC_LINUX=1" ]; meta = with lib; { description = '' - Provides library functionality for FIDO 2.0, including communication with a device over USB. + Provides library functionality for FIDO 2.0, including communication with a device over USB. ''; homepage = "https://github.com/Yubico/libfido2"; license = licenses.bsd2; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfive/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfive/default.nix index 0f6ad84fe7..3833a7fe88 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfive/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfive/default.nix @@ -10,6 +10,7 @@ , libpng , boost , guile +, stdenv }: mkDerivation { @@ -26,8 +27,19 @@ mkDerivation { nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ]; buildInputs = [ eigen zlib libpng boost guile ]; - # Link "Studio" binary to "libfive-studio" to be more obvious: - postFixup = '' + postInstall = if stdenv.isDarwin then '' + # No rules to install the mac app, so do it manually. + mkdir -p $out/Applications + cp -r studio/Studio.app $out/Applications/Studio.app + + install_name_tool \ + -change libfive.dylib $out/lib/libfive.dylib \ + -change libfive-guile.dylib $out/lib/libfive-guile.dylib \ + $out/Applications/Studio.app/Contents/MacOS/Studio + + wrapQtApp $out/Applications/Studio.app/Contents/MacOS/Studio + '' else '' + # Link "Studio" binary to "libfive-studio" to be more obvious: ln -s "$out/bin/Studio" "$out/bin/libfive-studio" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgda/6.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libgda/6.x.nix index fc24fe41c4..28235d65d9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgda/6.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgda/6.x.nix @@ -12,7 +12,7 @@ , json-glib , isocodes , openssl -, gnome3 +, gnome , gobject-introspection , vala , libgee @@ -71,9 +71,10 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "libgda6"; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgda/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgda/default.nix index 307cc14a6e..b3f6e1a7cd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgda/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgda/default.nix @@ -7,7 +7,7 @@ , libxml2 , gtk3 , openssl -, gnome3 +, gnome , gobject-introspection , vala , libgee @@ -84,8 +84,9 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgdamm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgdamm/default.nix index 44a0e8bc21..ad5e0cbecd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgdamm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgdamm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome3 +{ lib, stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome , mysqlSupport ? false , postgresSupport ? false }: @@ -24,8 +24,9 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix index fdaace2dc4..f85dbea54d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix @@ -12,7 +12,7 @@ , gcr , gnome-online-accounts , gobject-introspection -, gnome3 +, gnome , p11-kit , openssl , uhttpmock @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; # Stable version has not been updated for a long time. }; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GData API library"; homepage = "https://wiki.gnome.org/Projects/libgdata"; - maintainers = with maintainers; [ raskin lethalman ] ++ teams.gnome.members; + maintainers = with maintainers; [ raskin ] ++ teams.gnome.members; platforms = platforms.linux; license = licenses.lgpl21Plus; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgee/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgee/default.nix index 407b99b5a5..1a40d1f17b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgee/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgee/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome }: stdenv.mkDerivation rec { pname = "libgee"; - version = "0.20.3"; + version = "0.20.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pm525wm11dhwz24m8bpcln9547lmrigl6cxf3qsbg4cr3pyvdfh"; + sha256 = "03nyf8n7i7f67fsh220g52slmihdk1lv4iwspm7xmkgrj3rink2j"; }; doCheck = true; @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgepub/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgepub/default.nix index e058c7ed5a..7ae7bff50e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgepub/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgepub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome , webkitgtk, libsoup, libxml2, libarchive }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgig/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgig/default.nix index f78a51db5d..26e3b46d55 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgig/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libgig"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; - sha256 = "1zs5yy124bymfyapsnljr6rv2lnn5inwchm0xnwiw44b2d39l8hn"; + sha256 = "sha256-oG0Jh4eAxsGd2NucM1RNU6kzV/niexSpg6qrpo//p5Q="; }; nativeBuildInputs = [ autoconf automake libtool pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix index fe36a9d663..56259814d8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkg-config, vala, libssh2 +{ lib, stdenv, fetchurl, gnome, meson, ninja, pkg-config, vala, libssh2 , gtk-doc, gobject-introspection, libgit2, glib, python3 }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgksu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgksu/default.nix index cf8f5ab487..b00e7b3245 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgksu/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgksu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome3, +{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome, libstartup_notification, libgtop, perlPackages, autoreconfHook, intltool, docbook_xsl, xauth }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 gnome2.GConf libstartup_notification - gnome3.libgnome-keyring libgtop gnome2.libglade + gnome.libgnome-keyring libgtop gnome2.libglade ] ++ (with perlPackages; [ perl XMLParser ]); enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix index 31a9579a89..65d0651ed4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "glvnd"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "10x7fgb114r4gikdg6flszl3kwzcb9y5qa7sj9936mk0zxhjaylz"; + sha256 = "0gjk6m3gkdm12bmih2jflp0v5s1ibkixk7mrzrk0cj884m3hy1z6"; }; nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix index 62228b8837..957c213425 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome }: stdenv.mkDerivation rec { pname = "libgnomekbd"; @@ -11,10 +11,6 @@ stdenv.mkDerivation rec { sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = pname; }; - }; - nativeBuildInputs = [ file intltool @@ -29,6 +25,13 @@ stdenv.mkDerivation rec { glib ]; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + meta = with lib; { description = "Keyboard management library"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgrss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgrss/default.nix index b8c7c7bc49..8c5ea73af0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgrss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgrss/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }: let version = "0.7.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix index 77fa161b77..1ccc5d7789 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, pkg-config, intltool, gettext, glib, libxml2, zlib, bzip2 -, perl, gdk-pixbuf, libiconv, libintl, gnome3 }: +, perl, gdk-pixbuf, libiconv, libintl, gnome }: stdenv.mkDerivation rec { pname = "libgsf"; @@ -23,8 +23,9 @@ stdenv.mkDerivation rec { preCheck = "patchShebangs ./tests/"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgtop/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgtop/default.nix index af4fe04a0b..98b0dc89fe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgtop/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgtop/default.nix @@ -5,7 +5,7 @@ , perl , gettext , gobject-introspection -, gnome3 +, gnome , gtk-doc }: @@ -31,8 +31,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix index feeae05bf5..a35cf51679 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix @@ -1,31 +1,46 @@ { lib, stdenv , fetchurl , pkg-config +, meson +, ninja , udev , glib , gobject-introspection -, gnome3 +, gnome +, vala }: stdenv.mkDerivation rec { pname = "libgudev"; - version = "234"; + version = "236"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0drf39qhsdz35kwb18hnfj2ig4yfxhfks66m783zlhnvy2narbhv"; + sha256 = "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5"; }; - nativeBuildInputs = [ pkg-config gobject-introspection ]; - buildInputs = [ udev glib ]; + nativeBuildInputs = [ + pkg-config + gobject-introspection + meson + ninja + vala + ]; - # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway. - configureFlags = [ "--disable-umockdev" ]; + buildInputs = [ + udev + glib + ]; + + mesonFlags = [ + # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway + "-Dtests=disabled" + ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix index 9351d3f707..fbab67e086 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix @@ -1,24 +1,57 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, libxml2, glib, gtk3, gettext, libsoup -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobject-introspection, python3, tzdata, geocode-glib, vala, gnome3 }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, libxml2 +, glib +, gtk3 +, gettext +, libsoup +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, gobject-introspection +, python3 +, tzdata +, geocode-glib +, vala +, gnome +}: stdenv.mkDerivation rec { pname = "libgweather"; - version = "3.36.1"; + version = "40.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0l74hc02rvzm4p530y539a67jwb080fqdaazdl8j0fr3xvq0j9yy"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1rkf4yv43qcahyx7bismdv6z2vh5azdnm1fqfmnzrada9cm8ykna"; }; - nativeBuildInputs = [ meson ninja pkg-config gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; - buildInputs = [ glib gtk3 libsoup libxml2 geocode-glib ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + vala + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + gobject-introspection + python3 + python3.pkgs.pygobject3 + ]; - postPatch = '' - chmod +x meson/meson_post_install.py - patchShebangs meson/meson_post_install.py - ''; + buildInputs = [ + glib + gtk3 + libsoup + libxml2 + geocode-glib + ]; mesonFlags = [ "-Dzoneinfo_dir=${tzdata}/share/zoneinfo" @@ -26,9 +59,16 @@ stdenv.mkDerivation rec { "-Dgtk_doc=true" ]; + postPatch = '' + chmod +x meson/meson_post_install.py + patchShebangs meson/meson_post_install.py + patchShebangs data/gen_locations_variant.py + ''; + passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix index be088496f2..fc871f174e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, cairo -, libarchive, freetype, libjpeg, libtiff, gnome3, lcms2 +, libarchive, freetype, libjpeg, libtiff, gnome, lcms2 }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix index ff2093255c..7597aee697 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala , gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, gtk3, gnome3 -, dbus, xvfb_run, libxml2 +, gtk3, gnome +, dbus, xvfb-run, libxml2 , hicolor-icon-theme }: @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meson ninja pkg-config gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gnome3.gnome-desktop gtk3 libxml2 ]; - checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; + buildInputs = [ gnome.gnome-desktop gtk3 libxml2 ]; + checkInputs = [ dbus xvfb-run hicolor-icon-theme ]; mesonFlags = [ "-Dgtk_doc=true" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix index 4532edfd88..891bd04ea5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , meson , ninja @@ -6,35 +7,45 @@ , gobject-introspection , vala , gtk-doc -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_43 , gtk3 +, enableGlade ? false , glade , dbus -, xvfb_run +, xvfb-run , libxml2 , gdk-pixbuf , librsvg , hicolor-icon-theme , at-spi2-atk , at-spi2-core +, gnome +, libhandy +, runCommand }: stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.2.0"; + version = "1.2.2"; - outputs = [ "out" "dev" "devdoc" "glade" ]; + outputs = [ + "out" + "dev" + "devdoc" + ] ++ lib.optionals enableGlade [ + "glade" + ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-OfWQriCRDnb+HAYHsuvliXUPRWENau7Fww4u5gKiCyU="; + sha256 = "sha256-R//Shl0CvRyleVIt6t1+L5U2Lx8gJGL9XuriuBZosEg="; }; nativeBuildInputs = [ docbook_xml_dtd_43 - docbook_xsl + docbook-xsl-nons gobject-introspection gtk-doc libxml2 @@ -46,14 +57,15 @@ stdenv.mkDerivation rec { buildInputs = [ gdk-pixbuf - glade gtk3 libxml2 + ] ++ lib.optionals enableGlade [ + glade ]; checkInputs = [ dbus - xvfb_run + xvfb-run at-spi2-atk at-spi2-core librsvg @@ -62,6 +74,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" + "-Dglade_catalog=${if enableGlade then "enabled" else "disabled"}" ]; # Uses define_variable in pkg-config, but we still need it to use the glade output @@ -79,6 +92,23 @@ stdenv.mkDerivation rec { meson test --print-errorlogs ''; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + } // lib.optionalAttrs (!enableGlade) { + glade = + let + libhandyWithGlade = libhandy.override { + enableGlade = true; + }; + in runCommand "${libhandy.name}-glade" {} '' + cp -r "${libhandyWithGlade.glade}" "$out" + chmod -R +w "$out" + sed -e "s#${libhandyWithGlade.out}#${libhandy.out}#g" -e "s#${libhandyWithGlade.glade}#$out#g" -i $(find "$out" -type f) + ''; + }; + meta = with lib; { changelog = "https://gitlab.gnome.org/GNOME/libhandy/-/tags/${version}"; description = "Building blocks for modern adaptive GNOME apps"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix index ab0ad6fab2..f8db7075ca 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libhdhomerun"; - version = "20200907"; + version = "20210224"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; - sha256 = "1v80jk056ii2iv2w7sq24i3prjrbhxql5vqhafs7vq54qmwvgbnb"; + sha256 = "sha256:1y1kwv34qg8nayfkbrxkw8163l46krsfqx8yvkcsc97ilsd3i5mr"; }; patchPhase = lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix index 71dfca5e64..d445a7c386 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "libheif"; - version = "1.11.0"; + version = "1.12.0"; outputs = [ "bin" "out" "dev" "man" ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "sha256-xT0sfYPp5atYXnVpP8TYu2TC9/Z/ClyEP1OTSfcw1gw="; + sha256 = "sha256-RjGLaDSBO8T7ijRb5a16aUlkCy5vdFPs4O9caIJo4jI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix index 648eb89a51..975ad22581 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch -, gnome3, libgee, glib, json-glib, libarchive, libsoup, gobject-introspection }: +, gnome, libgee, glib, json-glib, libarchive, libsoup, gobject-introspection }: let pname = "libhttpseverywhere"; @@ -34,8 +34,9 @@ in stdenv.mkDerivation rec { outputs = [ "out" "devdoc" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix index fa396e9665..d7eb085df7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix @@ -12,13 +12,12 @@ , libical , python3 , tzdata +, fixDarwinDylibNames , introspectionSupport ? stdenv.buildPlatform == stdenv.hostPlatform -, gobject-introspection ? null -, vala ? null +, gobject-introspection +, vala }: -assert introspectionSupport -> gobject-introspection != null && vala != null; - stdenv.mkDerivation rec { pname = "libical"; version = "3.0.9"; @@ -47,6 +46,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals introspectionSupport [ gobject-introspection vala + ] ++ lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames ]; installCheckInputs = [ # running libical-glib tests @@ -80,6 +81,13 @@ stdenv.mkDerivation rec { # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables doInstallCheck = true; enableParallelChecking = false; + preInstallCheck = if stdenv.isDarwin then '' + for testexe in $(find ./src/test -maxdepth 1 -type f -executable); do + for lib in $(cd lib && ls *.3.dylib); do + install_name_tool -change $lib $out/lib/$lib $testexe + done + done + '' else null; installCheckPhase = '' runHook preInstallCheck diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix index 2e75894eb8..f027fbe3cb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix @@ -8,7 +8,6 @@ , gpgme , gobject-introspection , vala -, help2man , gtk-doc , meson , ninja @@ -19,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.6"; + version = "0.1.7"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "sha256-X+mFl0YZpnt6zzvVTGZN7PROVUaQ8ZmU3T0EgyoZX6g="; + sha256 = "sha256-WYCYRFjjy9nr1p1SqzBGCBZ5vkhFybddXpHUcwdEDIQ="; }; patches = [ @@ -43,7 +42,6 @@ stdenv.mkDerivation rec { docbook-xsl-nons gobject-introspection vala - help2man gtk-doc (python3.withPackages (pkgs: with pkgs; [ setuptools diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjwt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjwt/default.nix index 9c7d624e7f..a81b60c425 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libjwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libjwt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libjwt"; - version = "1.12.1"; + version = "1.13.1"; src = fetchFromGitHub { owner = "benmcollins"; repo = "libjwt"; rev = "v${version}"; - sha256 = "1c69slf9k56gh0xcg6269v712ysm6wckracms4grdsc72xg6x7h2"; + sha256 = "sha256-hS10Ecq0VVuYLDrBu4x+Y2mz6eeJV1SvnqttgbiQbi0="; }; buildInputs = [ jansson openssl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix index 3ef64823a0..bc1fcc9f6a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { pname = "liblinphone"; - version = "4.5.1"; + version = "4.5.15"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "05ybbxq2yqzy3f3vzq8c3szs3qr0zl64la53icpqnmfakwnps5gs"; + sha256 = "sha256-lDj2OkWuodPHpvoJ5W2GivzVIeMnprb42kAnJKfKtdg="; }; # Do not build static libraries diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix index 76dd4eb20c..645b521b81 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix @@ -11,7 +11,7 @@ , glib , libgudev , libevdev -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -49,8 +49,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix index 05ae1af2e2..1c15519aaf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmaxminddb"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-UjcHbSUKX3wpfjMcNaQz7qrw3CBeBw5Ns1PJuhDzQKI="; + sha256 = "sha256-diCsGHxZHOIbzXvzUjdqPFapM+aEVYofa+9L1PP5gmc="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmediaart/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmediaart/default.nix index 28c8ae6db9..ee1b306c3e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmediaart/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmediaart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome, fetchpatch }: stdenv.mkDerivation rec { pname = "libmediaart"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { doCheck = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix index f95d39a02d..edadff523f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libmodulemd"; - version = "2.12.0"; + version = "2.12.1"; outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "fedora-modularity"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1mq9as98q4wyka404f8xwfc44cn5j4bsk0fch5pf07v81sagc1q9"; + sha256 = "sha256-Relj14uG+dp9r5xWEbw/eAmlUJJ/kRwlPclcWGQxoJg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix index 1b8c30f9a8..aa42edfead 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.18"; + version="0.3.19"; name="${baseName}-${version}"; - hash="sha256-/F0FFoD4AAvmT/68CwxYcWscm/BgA+w5k4exCdHtHg8="; - url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.18/libmwaw-0.3.18.tar.xz"; - sha256="sha256-/F0FFoD4AAvmT/68CwxYcWscm/BgA+w5k4exCdHtHg8="; + hash="sha256-snLiNO78goxLuDRK8PBHpi4HD1MOni+6EbBMjbjtpa8="; + url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.19/libmwaw-0.3.19.tar.xz"; + sha256="sha256-snLiNO78goxLuDRK8PBHpi4HD1MOni+6EbBMjbjtpa8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libndp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libndp/default.nix index fc68149c14..524f948703 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libndp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libndp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { homepage = "http://libndp.org/"; description = "Library for Neighbor Discovery Protocol"; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; license = licenses.lgpl21; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnixxml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnixxml/default.nix index 40459dbca2..48edfbfce2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnixxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnixxml/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }: +{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix, bash}: stdenv.mkDerivation { pname = "libnixxml"; @@ -11,17 +11,45 @@ stdenv.mkDerivation { sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ="; }; - preConfigure = '' - ./bootstrap + prePatch = '' + # Remove broken test + substituteInPlace tests/draw/Makefile.am \ + --replace "draw-wrong.sh" "" + rm tests/draw/draw-wrong.sh + + # Fix bash path + substituteInPlace scripts/nixexpr2xml.in \ + --replace "/bin/bash" "${bash}/bin/bash" + ''; + + preAutoreconf = '' + # Copied from bootstrap script + ln -s README.md README + mkdir -p config ''; configureFlags = [ "--with-gd" "--with-glib" ]; CFLAGS = "-Wall"; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libxml2 gd.dev glib getopt libxslt nix ]; + strictDeps = true; + nativeBuildInputs = [ + autoreconfHook + pkg-config + getopt + libxslt + ]; + buildInputs = [ + bash + libxml2 + gd.dev + glib + nix + ]; + checkInputs = [ + nix + ]; - doCheck = false; + doCheck = true; meta = with lib; { description = "XML-based Nix-friendly data integration library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix index 29b3716422..b108a5c5ee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix @@ -8,7 +8,7 @@ , glib , gdk-pixbuf , gobject-introspection -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix index dc40086ad0..2cd480ee01 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libofx"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "LibOFX"; repo = pname; rev = version; - sha256 = "sha256-QIasZKwSD9YCidHCxT/HOThxE5HEQWD0I2/loDP6mlU="; + sha256 = "sha256-V9FyOVH9CB6UtTxDvXRyX6mWaXq2Y2K3t9lotjigK0M="; }; preConfigure = "./autogen.sh"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libow/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libow/default.nix index e4a8d95f4b..5340caeff0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libow/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libow/default.nix @@ -11,7 +11,28 @@ stdenv.mkDerivation rec { sha256 = "0dln1ar7bxwhpi36sccmpwapy7iz4j097rbf02mgn42lw5vrcg3s"; }; - nativeBuildInputs = [ autoconf automake pkg-config ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; + + preConfigure = '' + # Tries to use glibtoolize on Darwin, but it shouldn't for Nix. + sed -i -e 's/glibtoolize/libtoolize/g' bootstrap + ./bootstrap + ''; + + configureFlags = [ + "--disable-owtcl" + "--disable-owphp" + "--disable-owpython" + "--disable-zero" + "--disable-owshell" + "--disable-owhttpd" + "--disable-owftpd" + "--disable-owserver" + "--disable-owperl" + "--disable-owtap" + "--disable-owmon" + "--disable-owexternal" + ]; meta = with lib; { description = "1-Wire File System full library"; @@ -20,24 +41,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ disserman ]; platforms = platforms.unix; }; - - buildInputs = [ libtool ]; - - preConfigure = "./bootstrap"; - - configureFlags = [ - "--disable-owtcl" - "--disable-owphp" - "--disable-owpython" - "--disable-zero" - "--disable-owshell" - "--disable-owhttpd" - "--disable-owftpd" - "--disable-owserver" - "--disable-owperl" - "--disable-owtcl" - "--disable-owtap" - "--disable-owmon" - "--disable-owexternal" - ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpeas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpeas/default.nix index a8ef9e2f9b..55c884d215 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpeas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpeas/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome , glib, gtk3, gobject-introspection, python3, ncurses }: stdenv.mkDerivation rec { pname = "libpeas"; - version = "1.28.0"; + version = "1.30.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05cb7drn6arc4gi02wgsvzibigi2riz5gnfnmlb0zmbfnj9ikna2"; + sha256 = "18xrk1c1ixlhkmykcfiafrl2am470ws687xqvjlq40zwkcp5dx8b"; }; nativeBuildInputs = [ pkg-config meson ninja gettext gobject-introspection ]; @@ -21,8 +21,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix index 478e01f357..a7da64f787 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "3.120.2"; + version = "3.120.3"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "0wh5w7bx789ynnzr27xi0csql4jaxq80csawg6znabw3ld54wb86"; + sha256 = "02hiyhnjdz3zqnzks9bi7my62a85k9k9vfgmh9fy19snsbkd6l80"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libportal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libportal/default.nix index 5eacdaa8f3..97c5303eab 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libportal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libportal/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub -, fetchpatch , meson , ninja , pkg-config @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libportal"; - version = "0.3"; + version = "0.4"; outputs = [ "out" "dev" "devdoc" ]; @@ -20,22 +20,9 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1s3g17zbbmq3m5jfs62fl94p4irln9hfhpybj7jb05z0p1939rk3"; + sha256 = "fuYZWGkdazq6H0rThqpF6KIcvwgc17o+CiISb1LjBso="; }; - patches = [ - # Fix build and .pc file - # https://github.com/flatpak/libportal/pull/20 - (fetchpatch { - url = "https://github.com/flatpak/libportal/commit/7828be4ec8f05f8de7b129a1e35b5039d8baaee3.patch"; - sha256 = "04nadcxx69mbnzljwjrzm88cgapn14x3mghpkhr8b9yrjn7yj86h"; - }) - (fetchpatch { - url = "https://github.com/flatpak/libportal/commit/bf5de2f6fefec65f701b4ec8712b48b29a33fb71.patch"; - sha256 = "1v0b09diq49c01j5gg2bpvn5f5gfw1a5nm1l8grc4qg4z9jck1z8"; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpst/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpst/default.nix index f27b58a02b..f51db1d6c6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpst/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpst/default.nix @@ -12,11 +12,12 @@ }: stdenv.mkDerivation rec { - name = "libpst-0.6.75"; + pname = "libpst"; + version = "0.6.76"; src = fetchurl { - url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz"; - sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac"; + url = "http://www.five-ten-sg.com/libpst/packages/${pname}-${version}.tar.gz"; + sha256 = "0hhbbb8ddsgjhv9y1xd8s9ixlhdnjmhw12v06jwx4j6vpgp1na9x"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix index 6607a4d00f..4015ab02a3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -7,7 +7,7 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.43.0"; + version = "2.45.0"; outputs = [ "out" "dev" ]; @@ -15,17 +15,18 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N7EvpcJjtK3INHK7PgoiEVIMq9zGcHKMeI+/dwZ3bNs="; + sha256 = "0aqf48zl7825v7x8c3x5w4d17m4qq377f1mn6xyqzf9b0dnk4i1j"; }; buildInputs = [ libusb1 gcc.cc.lib ] ++ lib.optional cudaSupport cudatoolkit - ++ lib.optional enablePython pythonPackages.python; + ++ lib.optionals enablePython (with pythonPackages; [python pybind11 ]); patches = lib.optionals enablePython [ ./py_sitepackage_dir.patch + ./py_pybind11_no_external_download.patch ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch b/third_party/nixpkgs/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch new file mode 100644 index 0000000000..2b48edb62e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch @@ -0,0 +1,39 @@ +From 01e51b9c90ba51b2d0ca797dde676812cf3db415 Mon Sep 17 00:00:00 2001 +From: "Robert T. McGibbon" +Date: Mon, 10 May 2021 17:26:04 -0400 +Subject: [PATCH 1/1] V1 + +--- + wrappers/python/CMakeLists.txt | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/wrappers/python/CMakeLists.txt b/wrappers/python/CMakeLists.txt +index aa83e4c77..4ec92ccfa 100644 +--- a/wrappers/python/CMakeLists.txt ++++ b/wrappers/python/CMakeLists.txt +@@ -8,21 +8,8 @@ if (NOT BUILD_PYTHON_BINDINGS) + endif() + + set(DEPENDENCIES realsense2) +-# In order for the external project clone to occur during cmake configure step(rather than during compilation, as would normally happen), +-# we copy the external project declaration to the build folder and then execute it +-configure_file(${CMAKE_SOURCE_DIR}/third-party/pybind11/CMakeLists.txt ${CMAKE_BINARY_DIR}/external-projects/pybind11/CMakeLists.txt) +-execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . +- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11" +-) +-execute_process(COMMAND "${CMAKE_COMMAND}" --build . +- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11" +-) + +-# Add pybind11 makefile +-add_subdirectory("${CMAKE_BINARY_DIR}/third-party/pybind11" +- "${CMAKE_BINARY_DIR}/third-party/pybind11" +- EXCLUDE_FROM_ALL +-) ++find_package(pybind11 REQUIRED) + + set(PYBIND11_CPP_STANDARD -std=c++11) + # Force Pybind11 not to share pyrealsense2 resources with other pybind modules. +-- +2.29.3 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/librest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librest/default.nix index 7b1ff8235a..0c885f0764 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librest/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librest/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libsoup, gobject-introspection, gnome3 }: +{ lib +, stdenv +, fetchurl +, pkg-config +, glib +, libsoup +, gobject-introspection +, gnome +}: stdenv.mkDerivation rec { pname = "rest"; @@ -9,23 +17,34 @@ stdenv.mkDerivation rec { sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"; }; - nativeBuildInputs = [ pkg-config gobject-introspection ]; - buildInputs = [ glib libsoup ]; + nativeBuildInputs = [ + pkg-config + gobject-introspection + ]; - configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; + buildInputs = [ + glib + libsoup + ]; + + configureFlags = [ + # Remove when https://gitlab.gnome.org/GNOME/librest/merge_requests/2 is merged. + "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" + ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "librest"; + versionPolicy = "odd-unstable"; }; }; meta = with lib; { description = "Helper library for RESTful services"; homepage = "https://wiki.gnome.org/Projects/Librest"; - license = licenses.lgpl21; - platforms = platforms.linux; + license = licenses.lgpl21Only; + platforms = platforms.unix; maintainers = teams.gnome.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix index efdbf59346..02cd9accba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -1,47 +1,79 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, gdk-pixbuf, pango, cairo, libxml2 -, bzip2, libintl, darwin, rustc, cargo, gnome3 -, vala, gobject-introspection }: +{ lib +, stdenv +, fetchurl +, pkg-config +, glib +, gdk-pixbuf +, pango +, cairo +, libxml2 +, bzip2 +, libintl +, ApplicationServices +, Foundation +, libobjc +, rustc +, cargo +, gnome +, vala +, gobject-introspection +, nixosTests +}: -let - pname = "librsvg"; - version = "2.50.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "02csvx2nzygh8kyal2qiy3y6xb7d52vszxxr37dzav704a9pkncv"; - }; + pname = "librsvg"; + version = "2.50.5"; outputs = [ "out" "dev" "installedTests" ]; - buildInputs = [ libxml2 bzip2 pango libintl ] - ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ]; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0wlj5g1jgp93sj3rr6qspj282whz13ahnv8ca99d7zilq9s1aw1j"; + }; - NIX_LDFLAGS = if stdenv.isDarwin then "-lobjc" else null; + nativeBuildInputs = [ + pkg-config + rustc + cargo + vala + gobject-introspection + ] ++ lib.optionals stdenv.isDarwin [ + ApplicationServices + Foundation + ]; - propagatedBuildInputs = [ glib gdk-pixbuf cairo ]; + buildInputs = [ + libxml2 + bzip2 + pango + libintl + ] ++ lib.optionals stdenv.isDarwin [ + libobjc + ]; - nativeBuildInputs = [ pkg-config rustc cargo vala gobject-introspection ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - ApplicationServices - ]); + propagatedBuildInputs = [ + glib + gdk-pixbuf + cairo + ]; configureFlags = [ "--enable-introspection" + ] ++ lib.optionals (!stdenv.isDarwin) [ + # Vapi does not build on MacOS. + # https://github.com/NixOS/nixpkgs/pull/117081#issuecomment-827782004 "--enable-vala" + ] ++ [ "--enable-installed-tests" "--enable-always-build-tests" ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic"; makeFlags = [ - "installed_test_metadir=$(installedTests)/share/installed-tests/RSVG" - "installed_testdir=$(installedTests)/libexec/installed-tests/RSVG" + "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/RSVG" + "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/RSVG" ]; - NIX_CFLAGS_COMPILE - = lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo"; + doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils # It wants to add loaders and update the loaders.cache in gdk-pixbuf # Patching the Makefiles to it creates rsvg specific loaders and the @@ -63,8 +95,6 @@ stdenv.mkDerivation rec { -i gdk-pixbuf-loader/librsvg.thumbnailer.in ''; - doCheck = false; # fails 20 of 145 tests, very likely to be buggy - # Merge gdkpixbuf and librsvg loaders postInstall = '' mv $GDK_PIXBUF/loaders.cache $GDK_PIXBUF/loaders.cache.tmp @@ -73,8 +103,13 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; + }; + + tests = { + installedTests = nixosTests.installed-tests.librsvg; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix index 6c28b7d16c..18f00a0933 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3 , docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala -, gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }: +, gtk-doc, gnome, gjs, libintl, dbus, xvfb-run }: stdenv.mkDerivation rec { pname = "libsecret"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; installCheckInputs = [ - python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb_run dbus gjs + python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb-run dbus gjs ]; # needs to run after install because typelibs point to absolute paths @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; # Does not seem to use the odd-unstable policy: https://gitlab.gnome.org/GNOME/libsecret/issues/30 versionPolicy = "none"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix b/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix new file mode 100644 index 0000000000..edb74c807b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix @@ -0,0 +1,42 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, meson +, ninja +, gnome +}: + +stdenv.mkDerivation rec { + pname = "libsigc++"; + version = "3.0.6"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "tw7c9GEWUcVKQm4QmxcZbh+hfaCQWSpQAOLRNMA6xc4="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "libsigcxx30"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; + description = "A typesafe callback system for standard C++"; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix index c933d92f32..cbc2c8a617 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix @@ -1,22 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gnum4, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gnome }: stdenv.mkDerivation rec { pname = "libsigc++"; - version = "2.10.1"; + version = "2.10.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9"; + sha256 = "sha256-3aF23EaBvanVoqwbxVJzvdOBZit6bUnpGCZ9E+h3Ths="; }; - nativeBuildInputs = [ pkg-config gnum4 ]; + nativeBuildInputs = [ pkg-config meson ninja ]; doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "libsigcxx"; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsignon-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsignon-glib/default.nix index ae7a6775de..f20f80c284 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsignon-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsignon-glib/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { description = "A library for managing single signon credentials which can be used from GLib applications"; homepage = "https://gitlab.com/accounts-sso/libsignon-glib"; license = licenses.lgpl21; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libslirp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libslirp/default.nix index 8bd74d2924..5da6cf6bbb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libslirp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libslirp/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitLab , meson , ninja @@ -8,14 +9,14 @@ stdenv.mkDerivation rec { pname = "libslirp"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "slirp"; repo = pname; rev = "v${version}"; - sha256 = "0abh337jvij664w65zszjql42n720zzfap0ab0amr4qcvkzw7bjx"; + sha256 = "sha256-UdKBED7xR0gDf3aj3+6I62CnAwGP7XxskaFzWeUUkkk="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix index 089fbe4b35..c7dede355d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.17"; + version = "0.7.19"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-LPOS+yDwNpyO9tkFoIy4SCQymytOGB26Pfyd/EFEYnc="; + sha256 = "sha256-AN4cgpMBqTtK04CU89Yqd1ZfWyPrCociPd3XKdVONMU="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix index 47fcdd41f8..fc805b2db9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkg-config, gnome3, libsysprof-capture +{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkg-config, gnome, libsysprof-capture , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala , libpsl, python3, brotli }: @@ -46,8 +46,9 @@ stdenv.mkDerivation rec { passthru = { propagatedUserEnvPackages = [ glib-networking.out ]; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix index fb2a2744d6..53aad1019b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, libX11}: +{ stdenv, lib, fetchFromGitHub, libX11, fixDarwinDylibNames }: stdenv.mkDerivation rec { version = "0.2.3"; @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { sha256 = "098h1jhlj87axpza5zgy58prp0zn94wyrbch6x0s7q4mzh7dc8ba"; }; + nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ libX11 ]; configureFlags = [ "--disable-debug"]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; preInstall = '' mkdir -p $out/{lib,include} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix index c67be24692..953800cdd5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix @@ -3,12 +3,12 @@ with lib; stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.3.2"; pname = "libthreadar"; src = fetchurl { url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz"; - sha256 = "0x1kkccy81rcqbhlw88sw7lykp7398vmrvp6f9yy42k9bl4yxn2q"; + sha256 = "sha256-q5FiBlncbhdXDgRm7wgxcd4rkxqje/1ls9kPGqmomP0="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix index 7ed8fca3ba..936c92bf7c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, libtool }: +{ lib, stdenv, fetchurl, fetchpatch, libtool, libtommath }: stdenv.mkDerivation rec { pname = "libtomcrypt"; @@ -17,14 +17,16 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ libtool ]; + nativeBuildInputs = [ libtool libtommath ]; postPatch = '' substituteInPlace makefile.shared --replace "LT:=glibtool" "LT:=libtool" ''; preBuild = '' - makeFlagsArray=(PREFIX=$out \ + makeFlagsArray+=(PREFIX=$out \ + CFLAGS="-DUSE_LTM -DLTM_DESC -DLTC_PTHREAD" \ + EXTRALIBS=\"-ltommath\" \ INSTALL_GROUP=$(id -g) \ INSTALL_USER=$(id -u)) ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunique/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libunique/default.nix index 27db05ee98..82f71f5907 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libunique/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libunique/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75"; }; + # Don't make deprecated usages hard errors + prePatch = '' + substituteInPlace configure --replace "-Werror" ""; + ''; + # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; @@ -23,9 +28,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 dbus-glib ]; - # Don't make deprecated usages hard errors - preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""''; - doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunity/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libunity/default.nix index f6fb9a13e4..c27fce32ec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libunity/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libunity/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchgit , pkg-config , glib @@ -14,16 +15,24 @@ stdenv.mkDerivation { pname = "libunity"; - version = "unstable-2019-03-19"; + version = "unstable-2021-02-01"; outputs = [ "out" "dev" "py" ]; + # Obtained from https://git.launchpad.net/ubuntu/+source/libunity/log/ src = fetchgit { url = "https://git.launchpad.net/ubuntu/+source/libunity"; - rev = "import/7.1.4+19.04.20190319-0ubuntu1"; - sha256 = "15b49v88v74q20a5c0lq867qnlz7fx20xifl6j8ha359r0zkfwzj"; + rev = "import/7.1.4+19.04.20190319-5"; + sha256 = "LHUs6kl1srS6Xektx+jmm4SXLR47VuQ9IhYbBxf2Wc8="; }; + patches = [ + # Fix builf with latest Vala + # https://code.launchpad.net/~jtojnar/libunity/libunity + # Did not send upstream because Ubuntu is stuck on Vala 0.48. + ./fix-vala.patch + ]; + nativeBuildInputs = [ autoreconfHook gobject-introspection @@ -43,11 +52,6 @@ stdenv.mkDerivation { libdbusmenu ]; - patches = [ - # See: https://gitlab.gnome.org/GNOME/vala/issues/766 - ./fix-vala.patch - ]; - preConfigure = '' intltoolize ''; @@ -61,6 +65,6 @@ stdenv.mkDerivation { homepage = "https://launchpad.net/libunity"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunity/fix-vala.patch b/third_party/nixpkgs/pkgs/development/libraries/libunity/fix-vala.patch index ec34229b44..555c2ad7bc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libunity/fix-vala.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/libunity/fix-vala.patch @@ -1,36 +1,12 @@ -diff -ru old/libunity/src/unity-aggregator-scope.vala libunity/src/unity-aggregator-scope.vala ---- old/libunity/src/unity-aggregator-scope.vala 1969-12-31 19:00:01.000000000 -0500 -+++ libunity/src/unity-aggregator-scope.vala 2019-09-21 17:06:12.663864891 -0400 -@@ -51,7 +51,7 @@ - */ - public abstract int category_index_for_scope_id (string scope_id); - -- public AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false) -+ protected AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false) - { - Object (dbus_path: dbus_path_, id: id_, is_master: true, - merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints); -diff -ru old/libunity/src/unity-deprecated-scope.vala libunity/src/unity-deprecated-scope.vala ---- old/libunity/src/unity-deprecated-scope.vala 1969-12-31 19:00:01.000000000 -0500 -+++ libunity/src/unity-deprecated-scope.vala 2019-09-21 17:06:39.721627805 -0400 -@@ -61,7 +61,7 @@ - internal CategorySet _categories; - internal FilterSet _filters; - -- public DeprecatedScopeBase (string dbus_path_, string id_) -+ protected DeprecatedScopeBase (string dbus_path_, string id_) - { - Object (dbus_path: dbus_path_, id: id_); +--- a/protocol/protocol-icon.vala 2013-08-27 12:53:57 +0000 ++++ b/protocol/protocol-icon.vala 2021-04-13 22:34:41 +0000 +@@ -185,7 +185,7 @@ } -diff -ru old/libunity/tools/preview-renderer.vala libunity/tools/preview-renderer.vala ---- old/libunity/tools/preview-renderer.vala 1969-12-31 19:00:01.000000000 -0500 -+++ libunity/tools/preview-renderer.vala 2019-09-21 17:09:16.201522110 -0400 -@@ -63,7 +63,7 @@ - */ - public abstract class GridRenderer: PreviewRenderer - { -- public GridRenderer() -+ protected GridRenderer() - { - Object(); - } + + /* Added to GIcon interface in 2.37 */ +- private Variant serialize () ++ private Variant? serialize () + { + Variant? ret = null; + return ret; + diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvdpau-va-gl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvdpau-va-gl/default.nix index 85ebef12fe..7a042a172c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libpthreadstubs, libXau, libXdmcp -, libXext, libvdpau, glib, libva, ffmpeg_3, libGLU }: +, libXext, libvdpau, glib, libva, libGLU }: stdenv.mkDerivation rec { pname = "libvdpau-va-gl"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg_3 libGLU ]; + buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva libGLU ]; doCheck = false; # fails. needs DRI access diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix index a61094d17f..5e1c0c671d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,21 +1,47 @@ -{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, intltool, vala -, libcap_ng, libvirt, libxml2 +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, gobject-introspection +, gettext +, gtk-doc +, docbook-xsl-nons +, vala +, libcap_ng +, libvirt +, libxml2 }: stdenv.mkDerivation rec { - name = "libvirt-glib-3.0.0"; + name = "libvirt-glib-4.0.0"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "https://libvirt.org/sources/glib/${name}.tar.gz"; - sha256 = "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz"; + url = "https://libvirt.org/sources/glib/${name}.tar.xz"; + sha256 = "hCP3Bp2qR2MHMh0cEeLswoU0DNMsqfwFIHdihD7erL0="; }; - nativeBuildInputs = [ pkg-config intltool vala gobject-introspection ]; - buildInputs = [ libcap_ng libvirt libxml2 gobject-introspection ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + gtk-doc + docbook-xsl-nons + vala + gobject-introspection + ]; + + buildInputs = [ + libcap_ng + libvirt + libxml2 + gobject-introspection + ]; - enableParallelBuilding = true; strictDeps = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix index ea4b40c3c8..28b67a8019 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -9,6 +9,7 @@ , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi , enableCeph ? false, ceph +, enableGlusterfs ? false, glusterfs }: with lib; @@ -72,6 +73,8 @@ in stdenv.mkDerivation rec { openiscsi ] ++ optionals enableCeph [ ceph + ] ++ optionals enableGlusterfs [ + glusterfs ] ++ optionals stdenv.isDarwin [ libiconv gmp ]; @@ -119,6 +122,7 @@ in stdenv.mkDerivation rec { "-Dsecdriver_apparmor=enabled" "-Dnumad=enabled" "-Dstorage_disk=enabled" + (opt "glusterfs" enableGlusterfs) (opt "storage_rbd" enableCeph) ] ++ optionals stdenv.isDarwin [ "-Dinit_script=none" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvncserver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvncserver/default.nix index 7c8d4a76fc..01a079a205 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvncserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvncserver/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchzip, fetchpatch, cmake , libjpeg, openssl, zlib, libgcrypt, libpng -, systemd +, systemd, Carbon }: let @@ -19,10 +19,11 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ - libjpeg openssl libgcrypt libpng - ] ++ lib.optional stdenv.isLinux systemd; + buildInputs = [ libjpeg openssl libgcrypt libpng ] + ++ lib.optional stdenv.isLinux systemd + ++ lib.optional stdenv.isDarwin Carbon; propagatedBuildInputs = [ zlib ]; + meta = { inherit (s) version; description = "VNC server library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix index 3792b826f5..425a1bab35 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix @@ -16,7 +16,7 @@ , libstartup_notification , gettext , gobject-introspection -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -60,9 +60,10 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "${pname}${lib.versions.major version}"; + versionPolicy = "odd-unstable"; }; }; @@ -70,6 +71,6 @@ stdenv.mkDerivation rec { description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = [ maintainers.worldofpeace ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwpe/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwpe/default.nix index 4397f65ac4..9e7886eb68 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwpe/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwpe/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "libwpe"; - version = "1.8.0"; + version = "1.10.0"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-pvAKfQkcvU21f+fuO0wSxjUJIdZU7XmBKACibIiEgdI="; + sha256 = "sha256-JBXicNReNZXtQFK8EF9zN0TcLTZ34S/0qDHlAphBCE0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix index d4f6391fe6..48c5a4f9b4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }: let - version = "5.1.3"; + version = "5.1.4"; in stdenv.mkDerivation { pname = "libxc"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { owner = "libxc"; repo = "libxc"; rev = version; - sha256 = "14czspifznsmvvix5hcm1rk18iy590qk8p5m00p0y032gmn9i2zj"; + sha256 = "0rs6v72zz3jr22r29zxxdk8wdsfv6wid6cx2661974z09dbvbr1f"; }; buildInputs = [ gfortran ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix index 8c37bb0c17..b738089c85 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,34 +1,46 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, bison, doxygen -, xkeyboard_config, libxcb, libxml2 +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, bison +, doxygen +, xkeyboard_config +, libxcb +, libxml2 , python3 , libX11 -# To enable the "interactive-wayland" subcommand of xkbcli: -, withWaylandSupport ? false, wayland, wayland-protocols + # To enable the "interactive-wayland" subcommand of xkbcli. This is the + # wayland equivalent of `xev` on X11. +, withWaylandTools ? stdenv.isLinux +, wayland +, wayland-protocols }: stdenv.mkDerivation rec { pname = "libxkbcommon"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - sha256 = "1cqzd4vd5jw3ghibmdqvy90mb1h8vvazc81bxgavk6sc0b9sfcz8"; + sha256 = "0ysynzzgzd9jdrh1321r4bgw8wd5zljrlyn5y1a31g39xacf02bv"; }; outputs = [ "out" "dev" "doc" ]; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config bison doxygen ] - ++ lib.optional withWaylandSupport wayland; + ++ lib.optional withWaylandTools wayland; buildInputs = [ xkeyboard_config libxcb libxml2 ] - ++ lib.optionals withWaylandSupport [ wayland wayland-protocols ]; + ++ lib.optionals withWaylandTools [ wayland wayland-protocols ]; checkInputs = [ python3 ]; mesonFlags = [ "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb" "-Dxkb-config-extra-path=/etc/xkb" # default=$sysconfdir/xkb ($out/etc) "-Dx-locale-root=${libX11.out}/share/X11/locale" - "-Denable-wayland=${lib.boolToString withWaylandSupport}" + "-Denable-wayland=${lib.boolToString withWaylandTools}" ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix index 849ebcf3c8..d323c2d962 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.0.3"; + version = "1.0.5"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "14c5rgx87nhzasr0j7mcfr1w7ifz0gmdiqy2xq59di5xvcdrpxpv"; + sha256 = "1jjmwg1mk7pvf36q30rng42qphgz6qdjvn96agrym2q0hhwxc99v"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix index 161833a928..b476edaf5e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.0"; + version = "0.3.1"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "sha256-prHsigfjifwiuBSUHaCWhjJIaw1LkOGHJu20cdPgH9c="; + sha256 = "sha256-4gJBmSbo5uGj12Y2Ov4gmS8nJshQxuBM9BAevY/lwjg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix index 19282ddc82..67c5a0794e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome }: stdenv.mkDerivation rec { pname = "libxml++"; @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libxml2 glibmm ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzapojit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libzapojit/default.nix index d16f34039f..8acb5e858d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libzapojit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libzapojit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }: +{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome, gnome-online-accounts, gobject-introspection }: stdenv.mkDerivation rec { pname = "libzapojit"; @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib json-glib librest libsoup gnome-online-accounts ]; # zapojit-0.0.pc passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix index 741f05bea6..4d52b848ae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "lime"; - version = "4.5.1"; + version = "4.5.14"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1fsldk7gxagxkbkzksz6dz8a8dmix1lxfy8nvvp0m355pzgqj6lb"; + sha256 = "sha256-ixqJ37+ljAru3hZ512nosTak0G/m6/nnmv2p/s5sVLs="; }; buildInputs = [ bctoolbox soci belle-sip sqlite ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix index 2d037afbe2..4fc1573eea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = { - homepage = "https://github.com/drycpp/lmdbxx#readme"; + homepage = "https://github.com/hoytech/lmdbxx#readme"; description = "C++11 wrapper for the LMDB embedded B+ tree database library"; license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ fgaz ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mapnik/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mapnik/default.nix index d4f11c1d12..45d5e0a40e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mapnik/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mapnik/default.nix @@ -23,18 +23,42 @@ stdenv.mkDerivation rec { buildInputs = [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff - libwebp libxml2 proj python sqlite zlib + libwebp proj python sqlite zlib # optional inputs postgresql ]; + propagatedBuildInputs = [ libxml2 ]; + prefixKey = "PREFIX="; preConfigure = '' patchShebangs ./configure ''; + # NOTE: 2021-05-06: + # Add -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 for backwards compatibility + # with major versions 6 and 7 of proj which are otherwise not compatible + # with mapnik 3.1.0. Note that: + # + # 1. Starting with proj version 8, this workaround will no longer be + # supported by the upstream proj project. + # + # 2. Without the workaround, mapnik configures itself without proj support. + # + # 3. The master branch of mapnik (after 3.1.0) appears to add native support + # for the proj 6 api, so this workaround is not likely to be needed in + # subsequent mapnik releases. At that point, this block comment and the + # NIX_CFLAGS_COMPILE expression can be removed. + + NIX_CFLAGS_COMPILE = + if version != "3.1.0" && lib.versionAtLeast version "3.1.0" + then throw "The mapnik compatibility workaround for proj 6 may no longer be required. Remove workaround after checking." + else if lib.versionAtLeast (lib.getVersion proj) "8" + then throw ("mapnik currently requires a version of proj less than 8, but proj version is: " + (lib.getVersion proj)) + else "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"; + configureFlags = [ "BOOST_INCLUDES=${boost.dev}/include" "BOOST_LIBS=${boost.out}/lib" @@ -51,16 +75,19 @@ stdenv.mkDerivation rec { "JPEG_LIBS=${libjpeg.out}/lib" "PNG_INCLUDES=${libpng.dev}/include" "PNG_LIBS=${libpng.out}/lib" - "PROJ_INCLUDES=${proj}/include" - "PROJ_LIBS=${proj}/lib" + "PROJ_INCLUDES=${proj.dev}/include" + "PROJ_LIBS=${proj.out}/lib" "SQLITE_INCLUDES=${sqlite.dev}/include" "SQLITE_LIBS=${sqlite.out}/lib" "TIFF_INCLUDES=${libtiff.dev}/include" "TIFF_LIBS=${libtiff.out}/lib" "WEBP_INCLUDES=${libwebp}/include" "WEBP_LIBS=${libwebp}/lib" - "XML2_INCLUDES=${libxml2.dev}/include" - "XML2_LIBS=${libxml2.out}/lib" + "XMLPARSER=libxml2" + ]; + + buildFlags = [ + "JOBS=$(NIX_BUILD_CORES)" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/matio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/matio/default.nix index 0b8143b691..3b0e811097 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/matio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.20"; + name = "matio-1.5.21"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "sha256-XR9yofUav2qc0j6qgS+xe4YQlwWQlfSMdoxINcWqJZg="; + sha256 = "sha256-IYCRd+VYOefJTa2nRO5Vwd6n11fdqriWBXdtUBIvsGU="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/mauikit-filebrowsing/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mauikit-filebrowsing/default.nix new file mode 100644 index 0000000000..5cce0382c8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/mauikit-filebrowsing/default.nix @@ -0,0 +1,40 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, kconfig +, kio +, mauikit +}: + +mkDerivation rec { + pname = "mauikit-filebrowsing"; + version = "1.2.2"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "mauikit-filebrowsing"; + rev = "v${version}"; + sha256 = "1m56lil7w884wn8qycl7y55abvw2vanfy8c4g786200p6acsh3kl"; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kconfig + kio + mauikit + ]; + + meta = with lib; { + homepage = "https://invent.kde.org/maui/mauikit-filebrowsing"; + description = "MauiKit File Browsing utilities and controls"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/mauikit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mauikit/default.nix index 38e938080b..22155a7a52 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mauikit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mauikit/default.nix @@ -3,22 +3,23 @@ , fetchFromGitLab , cmake , extra-cmake-modules -, kio +, kconfig +, kcoreaddons +, ki18n , qtbase , qtquickcontrols2 -, syntax-highlighting }: mkDerivation rec { pname = "mauikit"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "mauikit"; rev = "v${version}"; - sha256 = "1wimbpbn9yqqdcjd59x83z0mw2fycjz09py2rwimfi8ldmvi5lgy"; + sha256 = "1jz0a65bbznjg7aaq19rdyp956wn6xc1x4xigfkhj6mwsvnb49av"; }; nativeBuildInputs = [ @@ -27,9 +28,10 @@ mkDerivation rec { ]; buildInputs = [ - kio + kconfig + kcoreaddons + ki18n qtquickcontrols2 - syntax-highlighting ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/md4c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/md4c/default.nix index a711ecb7c7..a29b521a2d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/md4c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/md4c/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "md4c"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "mity"; repo = pname; rev = "release-${version}"; - hash = "sha256-nfMXUP1wu3ifn1QVTO/+XcfFRsThG8PlmYRv+b8AYlQ="; + hash = "sha256-+LObAD5JB8Vb4Rt4hTo1Z4ispxzfFkkXA2sw6TKB7Yo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix index 3be50b5dbd..743080ee82 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -122,7 +122,7 @@ self = stdenv.mkDerivation { ]; buildInputs = with xorg; [ - expat llvmPackages.llvm libglvnd xorgproto + expat llvmPackages.libllvm libglvnd xorgproto libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr libffi libvdpau libelf libXvMC libpthreadstubs openssl /*or another sha1 provider*/ diff --git a/third_party/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix index af1c1c91a9..5a5257168e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { buildPhase = if nativeBuild then "make" else "true"; # https://github.com/microsoft/GSL/issues/806 - cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-Wno-catch-value" ]; + cmakeFlags = lib.optionals stdenv.cc.isGNU + [ "-DCMAKE_CXX_FLAGS=-Wno-catch-value" ]; installPhase = '' mkdir -p $out/include diff --git a/third_party/nixpkgs/pkgs/development/libraries/mm-common/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mm-common/default.nix index a43d99503a..7ce2675e30 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mm-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mm-common/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, gnome3 +, gnome , meson , python3 , ninja @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix index 49af2593e5..d2cbee14c3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix @@ -1,15 +1,13 @@ { stdenv, lib, fetchurl, perl, gfortran , openssh, hwloc, autoconf, automake, libtool -# device options are ch3 or ch4 -, device ? "ch4" -# backend option are libfabric or ucx -, ch4backend ? "libfabric" -, ucx, libfabric +# either libfabric or ucx work for ch4backend on linux. On darwin, neither of +# these libraries currently build so this argument is ignored on Darwin. +, ch4backend # Process manager to build , withPm ? "hydra:gforker" } : -assert (ch4backend == "ucx" || ch4backend == "libfabric"); +assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; @@ -45,8 +43,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ perl gfortran openssh hwloc ] - ++ lib.optional (ch4backend == "ucx") ucx - ++ lib.optional (ch4backend == "libfabric") libfabric; + ++ lib.optional (!stdenv.isDarwin) ch4backend; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix index 5e68ad80fc..36505b4a66 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj"; }; - configureFlags = [ "--enable-cxx" "--enable-fat" ]; + configureFlags = [ "--enable-cxx" ] + ++ lib.optionals stdenv.isLinux [ "--enable-fat" ]; meta = { inherit version; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mutest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mutest/default.nix index 9470b81258..f2d3a55955 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mutest/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mutest/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { homepage = "https://ebassi.github.io/mutest/mutest.md.html"; description = "A BDD testing framework for C, inspired by Mocha"; license = licenses.mit; - maintainers = with maintainers; [ jtojnar worldofpeace ]; + maintainers = with maintainers; [ jtojnar ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/mygui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mygui/default.nix index 8e63cb6812..740c1fec88 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mygui/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mygui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid, +{ lib, stdenv, fetchFromGitHub, libX11, cmake, ois, freetype, libuuid, boost, pkg-config, withOgre ? false, ogre ? null, libGL, libGLU ? null } : let @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w"; }; - nativeBuildInputs = [ cmake pkg-config unzip ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libX11 ois freetype libuuid boost ] ++ (if withOgre then [ ogre ] else [ libGL libGLU ]); diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/3.44.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/3.44.nix deleted file mode 100644 index b08b8b3ed2..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/nss/3.44.nix +++ /dev/null @@ -1,144 +0,0 @@ -{ lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages }: - -let - nssPEM = fetchurl { - url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; - sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; - }; - version = "3.44.4"; - underscoreVersion = builtins.replaceStrings ["."] ["_"] version; - -in stdenv.mkDerivation rec { - pname = "nss"; - inherit version; - - src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "7ec1a52e20fd9a23e1907eeba8f4f2ecd619dac5d20fa023ec5b4faa1843e847"; - }; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - nativeBuildInputs = [ perl ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - buildInputs = [ zlib sqlite ]; - - propagatedBuildInputs = [ nspr ]; - - prePatch = '' - xz -d < ${nssPEM} | patch -p1 - ''; - - patches = - [ - # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch - ./85_security_load-3.44.patch - ./ckpem.patch - ]; - - patchFlags = [ "-p0" ]; - - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" - ''; - - outputs = [ "out" "dev" "tools" ]; - - preConfigure = "cd nss"; - - makeFlags = let - # NSS's build systems expects aarch32 to be called arm; if we pass in armv6l/armv7l, it - # fails with a linker error - cpu = if stdenv.hostPlatform.isAarch32 then "arm" else stdenv.hostPlatform.parsed.cpu.name; - in [ - "NSPR_INCLUDE_DIR=${nspr.dev}/include" - "NSPR_LIB_DIR=${nspr.out}/lib" - "NSDISTMODE=copy" - "BUILD_OPT=1" - "SOURCE_PREFIX=\$(out)" - "NSS_ENABLE_ECC=1" - "USE_SYSTEM_ZLIB=1" - "NSS_USE_SYSTEM_SQLITE=1" - "NATIVE_CC=${buildPackages.stdenv.cc}/bin/cc" - ] ++ lib.optionals (!stdenv.isDarwin) [ - # Pass in CPU even if we're not cross compiling, because otherwise it tries to guess with - # uname, which can be wrong if e.g. we're compiling for aarch32 on aarch64 - "OS_TEST=${cpu}" - "CPU_ARCH=${cpu}" - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ - "CROSS_COMPILE=1" - "NSS_DISABLE_GTESTS=1" # don't want to build tests when cross-compiling - ] ++ lib.optional stdenv.is64bit "USE_64=1" - ++ lib.optional stdenv.isDarwin "CCC=clang++"; - - NIX_CFLAGS_COMPILE = "-Wno-error"; - - # TODO(@oxij): investigate this: `make -n check` works but `make - # check` fails with "no rule", same for "installcheck". - doCheck = false; - doInstallCheck = false; - - postInstall = '' - rm -rf $out/private - mv $out/public $out/include - mv $out/*.OBJ/* $out/ - rmdir $out/*.OBJ - - ln -s lib $out/lib64 - - # Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672 - # https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch?id=af1acce6c6d2c3adb17689261dfe2c2b6771ab8a - NSS_MAJOR_VERSION=`grep "NSS_VMAJOR" lib/nss/nss.h | awk '{print $3}'` - NSS_MINOR_VERSION=`grep "NSS_VMINOR" lib/nss/nss.h | awk '{print $3}'` - NSS_PATCH_VERSION=`grep "NSS_VPATCH" lib/nss/nss.h | awk '{print $3}'` - PREFIX="$out" - - mkdir -p $out/lib/pkgconfig - sed -e "s,%prefix%,$PREFIX," \ - -e "s,%exec_prefix%,$PREFIX," \ - -e "s,%libdir%,$PREFIX/lib64," \ - -e "s,%includedir%,$dev/include/nss," \ - -e "s,%NSS_VERSION%,$NSS_MAJOR_VERSION.$NSS_MINOR_VERSION.$NSS_PATCH_VERSION,g" \ - -e "s,%NSPR_VERSION%,4.16,g" \ - pkg/pkg-config/nss.pc.in > $out/lib/pkgconfig/nss.pc - chmod 0644 $out/lib/pkgconfig/nss.pc - - sed -e "s,@prefix@,$PREFIX," \ - -e "s,@MOD_MAJOR_VERSION@,$NSS_MAJOR_VERSION," \ - -e "s,@MOD_MINOR_VERSION@,$NSS_MINOR_VERSION," \ - -e "s,@MOD_PATCH_VERSION@,$NSS_PATCH_VERSION," \ - pkg/pkg-config/nss-config.in > $out/bin/nss-config - chmod 0755 $out/bin/nss-config - ''; - - postFixup = let - isCross = stdenv.hostPlatform != stdenv.buildPlatform; - nss = if isCross then buildPackages.nss.tools else "$out"; - in '' - for libname in freebl3 nssdbm3 softokn3 - do '' + - (if stdenv.isDarwin - then '' - libfile="$out/lib/lib$libname.dylib" - DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ - '' else '' - libfile="$out/lib/lib$libname.so" - LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ - '') + '' - ${nss}/bin/shlibsign -v -i "$libfile" - done - - moveToOutput bin "$tools" - moveToOutput bin/nss-config "$dev" - moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example - rm -f "$out"/lib/*.a - ''; - - meta = with lib; { - homepage = "https://developer.mozilla.org/en-US/docs/NSS"; - description = "A set of libraries for development of security-enabled client and server applications"; - license = licenses.mpl20; - platforms = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/85_security_load-3.44.patch b/third_party/nixpkgs/pkgs/development/libraries/nss/85_security_load-3.44.patch deleted file mode 100644 index 132d5a96b2..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/nss/85_security_load-3.44.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/cmd/shlibsign/shlibsign.c nss/cmd/shlibsign/shlibsign.c ---- nss/cmd/shlibsign/shlibsign.c 2017-01-04 15:24:24.000000000 +0100 -+++ nss/cmd/shlibsign/shlibsign.c 2017-01-24 14:43:31.030420852 +0100 -@@ -875,6 +875,8 @@ - goto cleanup; - } - lib = PR_LoadLibrary(libname); -+ if (!lib) -+ lib = PR_LoadLibrary(NIX_NSS_LIBDIR"libsoftokn3.so"); - assert(lib != NULL); - if (!lib) { - PR_fprintf(PR_STDERR, "loading softokn3 failed"); -diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/coreconf/config.mk nss/coreconf/config.mk ---- nss/coreconf/config.mk 2017-01-04 15:24:24.000000000 +0100 -+++ nss/coreconf/config.mk 2017-01-24 14:43:47.989432372 +0100 -@@ -202,3 +202,6 @@ - - # Hide old, deprecated, TLS cipher suite names when building NSS - DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES -+ -+# Nix specific stuff. -+DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\" -diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/pk11wrap/pk11load.c nss/lib/pk11wrap/pk11load.c ---- nss/lib/pk11wrap/pk11load.c 2017-01-04 15:24:24.000000000 +0100 -+++ nss/lib/pk11wrap/pk11load.c 2017-01-24 14:45:06.883485652 +0100 -@@ -440,6 +440,13 @@ - * unload the library if anything goes wrong from here on out... - */ - library = PR_LoadLibrary(mod->dllName); -+ if ((library == NULL) && -+ !rindex(mod->dllName, PR_GetDirectorySeparator())) { -+ library = PORT_LoadLibraryFromOrigin(my_shlib_name, -+ (PRFuncPtr) &softoken_LoadDSO, -+ mod->dllName); -+ } -+ - mod->library = (void *)library; - - if (library == NULL) { -diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/util/secload.c nss/lib/util/secload.c ---- nss/lib/util/secload.c 2017-01-04 15:24:24.000000000 +0100 -+++ nss/lib/util/secload.c 2017-01-24 14:43:31.030420852 +0100 -@@ -70,9 +70,14 @@ - - /* Remove the trailing filename from referencePath and add the new one */ - c = strrchr(referencePath, PR_GetDirectorySeparator()); -+ if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0] -+ * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */ -+ referencePath = NIX_NSS_LIBDIR; -+ c = (char*) &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */ -+ } - if (c) { - size_t referencePathSize = 1 + c - referencePath; -- fullName = (char*)PORT_Alloc(strlen(name) + referencePathSize + 1); -+ fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5); - if (fullName) { - memcpy(fullName, referencePath, referencePathSize); - strcpy(fullName + referencePathSize, name); -@@ -82,6 +87,11 @@ - #endif - libSpec.type = PR_LibSpec_Pathname; - libSpec.value.pathname = fullName; -+ if ((referencePathSize >= 4) && -+ (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) { -+ memcpy(fullName + referencePathSize -4, "lib", 3); -+ } -+ strcpy(fullName + referencePathSize, name); - dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL - #ifdef PR_LD_ALT_SEARCH_PATH - /* allow library's dependencies to be found in the same directory -@@ -89,6 +99,10 @@ - | PR_LD_ALT_SEARCH_PATH - #endif - ); -+ if (! dlh) { -+ strcpy(fullName + referencePathSize, name); -+ dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL); -+ } - PORT_Free(fullName); - } - } diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix index e6e2190a1a..962204268d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix @@ -18,7 +18,7 @@ let # It will rebuild itself using the version of this package (NSS) and if # an update is required do the required changes to the expression. # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.63"; + version = "3.64"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0892xbjcaw6g4rd2rs4qa37nbda248cjrgxa4faaw0licbpjyb8q"; + sha256 = "09hivz4qf3dw7m21lshw34l0yncinwn4ax5w3rpkm71f2wkm85yk"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix index 3cdeb93dc9..0e08083c4d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary;"; license = licenses.bsd3; - platforms = platforms.all; + platforms = platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/octomap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/octomap/default.nix new file mode 100644 index 0000000000..7e82842c0b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/octomap/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "octomap"; + version = "1.9.6"; + + src = fetchFromGitHub { + owner = "OctoMap"; + repo = pname; + rev = "v${version}"; + sha256 = "03v341dffa0pfzmf2431xb5nq50zq9zlhgl6k2aa3fsza5xmbb70"; + }; + sourceRoot = "source/octomap"; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "A probabilistic, flexible, and compact 3D mapping library for robotic systems"; + homepage = "https://octomap.github.io/"; + license = licenses.bsd3; + maintainers = with maintainers; [ lopsided98 ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix index 8bbde9796d..48c681973d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix @@ -32,7 +32,9 @@ let passthru = rec { - clang-unwrapped = addPatches "clang" llvmPkgs.clang-unwrapped; + libclang = addPatches "clang" llvmPkgs.libclang; + + clang-unwrapped = libclang.out; clang = llvmPkgs.clang.override { cc = clang-unwrapped; @@ -53,7 +55,7 @@ let library = let inherit (llvmPkgs) llvm; - inherit (if buildWithPatches then passthru else llvmPkgs) clang-unwrapped spirv-llvm-translator; + inherit (if buildWithPatches then passthru else llvmPkgs) libclang spirv-llvm-translator; in stdenv.mkDerivation rec { pname = "opencl-clang"; @@ -74,13 +76,20 @@ let ./opencl-headers-dir.patch ]; - nativeBuildInputs = [ cmake git ]; + # Uses linker flags that are not supported on Darwin. + postPatch = lib.optionalString stdenv.isDarwin '' + sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt + substituteInPlace CMakeLists.txt \ + --replace '-Wl,--no-undefined' "" + ''; - buildInputs = [ clang-unwrapped llvm spirv-llvm-translator ]; + nativeBuildInputs = [ cmake git llvm.dev ]; + + buildInputs = [ libclang llvm spirv-llvm-translator ]; cmakeFlags = [ "-DPREFERRED_LLVM_VERSION=${getVersion llvm}" - "-DOPENCL_HEADERS_DIR=${clang-unwrapped}/lib/clang/${getVersion clang-unwrapped}/include/" + "-DOPENCL_HEADERS_DIR=${libclang.lib}/lib/clang/${getVersion libclang}/include/" "-DLLVMSPIRV_INCLUDED_IN_LLVM=OFF" "-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator}" diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix index a65e978f98..33b1cd1875 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix @@ -22,7 +22,7 @@ , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 , enableVtk ? false, vtk -, enableFfmpeg ? false, ffmpeg_3 +, enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableTesseract ? false, tesseract, leptonica , enableTbb ? false, tbb @@ -188,7 +188,7 @@ stdenv.mkDerivation { ++ lib.optional enableTIFF libtiff ++ lib.optional enableWebP libwebp ++ lib.optionals enableEXR [ openexr ilmbase ] - ++ lib.optional enableFfmpeg ffmpeg_3 + ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index 15c8d46b61..58609a9186 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -45,7 +45,7 @@ , enableVtk ? false , vtk , enableFfmpeg ? true -, ffmpeg_3 +, ffmpeg , enableGStreamer ? true , gst_all_1 , enableTesseract ? false @@ -252,7 +252,7 @@ stdenv.mkDerivation { ++ lib.optional enableTIFF libtiff ++ lib.optional enableWebP libwebp ++ lib.optionals enableEXR [ openexr ilmbase ] - ++ lib.optional enableFfmpeg ffmpeg_3 + ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix index 2575f6bb45..005257780e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix @@ -6,7 +6,7 @@ , enablePNG ? true, libpng , enableTIFF ? true, libtiff , enableEXR ? (!stdenv.isDarwin), openexr, ilmbase -, enableFfmpeg ? false, ffmpeg_3 +, enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableEigen ? true, eigen , Cocoa, QTKit @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ++ lib.optional enablePNG libpng ++ lib.optional enableTIFF libtiff ++ lib.optionals enableEXR [ openexr ilmbase ] - ++ lib.optional enableFfmpeg ffmpeg_3 + ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen ++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix index 4e04de30d6..dc8004d8f4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, buildPackages , fetchFromGitHub , zlib , ilmbase diff --git a/third_party/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix index 1e3ee98964..47b2f63954 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }: +{ lib, stdenv, fetchFromGitHub, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }: stdenv.mkDerivation { pname = "openexrid-unstable"; @@ -25,7 +25,6 @@ stdenv.mkDerivation { -I${openfx.dev}/include/OpenFX ''; - nativeBuildInputs = [ unzip ]; buildInputs = [ re2 openfx zlib ilmbase libGLU libGL openexr ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openfx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openfx/default.nix index a26e97798a..201bf16ad6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openfx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openfx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unzip }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "openfx"; @@ -11,8 +11,6 @@ stdenv.mkDerivation { sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548"; }; - nativeBuildInputs = [ unzip ]; - outputs = [ "dev" "out" ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix index 39831a3baf..fe4704341e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, db, groff, libtool +{ lib, stdenv, fetchurl, openssl, db, groff, libtool, libsodium , withCyrusSasl ? true , cyrus_sasl }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ groff ]; - buildInputs = [ openssl cyrus_sasl db libtool ]; + buildInputs = [ openssl cyrus_sasl db libsodium libtool ]; # Disable install stripping as it breaks cross-compiling. # We strip binaries anyway in fixupPhase. @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { postBuild = '' make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/sha2 make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/pbkdf2 + make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/argon2 ''; doCheck = false; # needs a running LDAP server @@ -54,6 +55,9 @@ stdenv.mkDerivation rec { "sysconfdir=$(out)/etc" "localstatedir=$(out)/var" "moduledir=$(out)/lib/modules" + # The argon2 module hardcodes /usr/bin/install as the path for the + # `install` binary, which is overridden here. + "INSTALL=install" ]; # 1. Libraries left in the build location confuse `patchelf --shrink-rpath` @@ -76,6 +80,7 @@ stdenv.mkDerivation rec { postInstall = '' make $installFlags install -C contrib/slapd-modules/passwd/sha2 make $installFlags install -C contrib/slapd-modules/passwd/pbkdf2 + make $installFlags install-lib -C contrib/slapd-modules/passwd/argon2 chmod +x "$out"/lib/*.{so,dylib} ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openslide/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openslide/default.nix new file mode 100644 index 0000000000..71c2017f9e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/openslide/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook +, pkg-config, cairo, glib, gdk-pixbuf, libjpeg +, libpng, libtiff, libxml2, openjpeg, sqlite, zlib +}: + +stdenv.mkDerivation rec { + pname = "openslide"; + version = "3.4.1"; + + src = fetchFromGitHub { + owner = "openslide"; + repo = "openslide"; + rev = "v${version}"; + sha256 = "1g4hhjr4cbx754cwi9wl84k33bkg232w8ajic7aqhzm8x182hszp"; + }; + + buildInputs = [ cairo glib gdk-pixbuf libjpeg libpng libtiff libxml2 openjpeg sqlite zlib ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + meta = with lib; { + homepage = "https://openslide.org"; + description = "A C library that provides a simple interface to read whole-slide images."; + license = licenses.lgpl21; + platforms = platforms.unix; + maintainers = with maintainers; [ lromor ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix index 13cac47793..a336dd18fa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -125,8 +125,6 @@ let if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then rm "$out/lib/"*.a fi - - mkdir -p $bin '' + lib.optionalString (!stdenv.hostPlatform.isWindows) # Fix bin/c_rehash's perl interpreter line # @@ -140,9 +138,9 @@ let # "#!/usr/bin/env perl" '' substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl}/bin/perl "/usr/bin/env perl" - '' + - '' - mv $out/bin $bin/ + '' + '' + mkdir -p $bin + mv $out/bin $bin/bin mkdir $dev mv $out/include $dev/ diff --git a/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix index b5317ce9aa..655d664d8f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: +{ lib, stdenv, fetchFromGitHub, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: stdenv.mkDerivation rec { @@ -14,7 +14,6 @@ stdenv.mkDerivation rec outputs = [ "out" ]; - nativeBuildInputs = [ unzip ]; buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ]; setSourceRoot = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix index a083c06a33..b4e4878879 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix @@ -83,13 +83,13 @@ stdenv.mkDerivation rec { cmake autoPatchelfHook addOpenGLRunpath + unzip ]; buildInputs = [ git protobuf opencv - unzip python tbb shellcheck diff --git a/third_party/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix index c6efc901e8..df7ce6fd4b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix @@ -123,7 +123,7 @@ in stdenv.mkDerivation { ''; license = licenses.unfree; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ pesterhazy flokli ]; + maintainers = with maintainers; [ flokli ]; hydraPlatforms = []; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix b/third_party/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix index 9ba581e3a4..79bc2421dc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix @@ -1,4 +1,4 @@ -{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkg-config, lib, stdenv }: +{ cairo, fetchzip, glib, gnome, gtk3, gobject-introspection, pkg-config, lib, stdenv }: stdenv.mkDerivation rec { pname = "osm-gps-map"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib gobject-introspection - gnome3.gnome-common gtk3 gnome3.libsoup + gnome.gnome-common gtk3 gnome.libsoup ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix index 0369cedebf..f4dba00d35 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , pkg-config , cairo , harfbuzz @@ -10,7 +9,7 @@ , gobject-introspection , darwin , fribidi -, gnome3 +, gnome , gi-docgen , makeFontsConf , freefont_ttf @@ -22,23 +21,15 @@ stdenv.mkDerivation rec { pname = "pango"; - version = "1.48.3"; + version = "1.48.4"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ijbkcs6217ygzphlpi0vajxkccifdbsl0jdjpy8wz11h9f19sin"; + sha256 = "0ym3cvajy2asapj8xbhfpy05rak79afrhi32hiss0w900vxi72a1"; }; - patches = [ - # Install developer documentation. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/pango/commit/a2f35860115e8cd44f07d5158e2df059e8163a08.patch"; - sha256 = "hN7O4DBk4A+TmBl6DGx6RHni5qRBg6akdjv9o3iWKDQ="; - }) - ]; - nativeBuildInputs = [ meson ninja glib # for glib-mkenum @@ -88,8 +79,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pangomm/2.48.nix b/third_party/nixpkgs/pkgs/development/libraries/pangomm/2.48.nix new file mode 100644 index 0000000000..3c25d113d7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/pangomm/2.48.nix @@ -0,0 +1,65 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, meson +, ninja +, python3 +, pango +, glibmm_2_68 +, cairomm_1_16 +, gnome +, ApplicationServices +}: + +stdenv.mkDerivation rec { + pname = "pangomm"; + version= "2.48.0"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-ng7UdMM/jCACyp4rYcoNHz2OQJ4J6Z9NjBnur8z1W3g="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + python3 + ] ++ lib.optional stdenv.isDarwin [ + ApplicationServices + ]; + + propagatedBuildInputs = [ + pango + glibmm_2_68 + cairomm_1_16 + ]; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "${pname}_2_48"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "C++ interface to the Pango text rendering library"; + longDescription = '' + Pango is a library for laying out and rendering of text, with an + emphasis on internationalization. Pango can be used anywhere + that text layout is needed, though most of the work on Pango so + far has been done in the context of the GTK widget toolkit. + Pango forms the core of text and font handling for GTK. + ''; + homepage = "https://www.pango.org/"; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]); + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix index 3eb5f39c38..afb79c7eaf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, pango, glibmm, cairomm, gnome3 +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, pango, glibmm, cairomm, gnome , ApplicationServices }: stdenv.mkDerivation rec { @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physfs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physfs/default.nix index 3eb4077d98..faa338c94f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physfs/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, doxygen, darwin -, zlib }: +{ lib, stdenv, fetchurl, cmake, doxygen, zlib, Foundation, Carbon }: let generic = version: sha256: @@ -15,7 +14,7 @@ let nativeBuildInputs = [ cmake doxygen ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; + ++ lib.optionals stdenv.isDarwin [ Foundation Carbon ]; patchPhase = '' sed s,-Werror,, -i CMakeLists.txt diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix similarity index 69% rename from third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix rename to third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index 87e2ae9631..d6cbe7cc4d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -1,38 +1,44 @@ { lib , stdenv , fetchurl +, autoreconfHook , boost -, fastjet , gfortran , lhapdf -, python2 -, root +, ncurses +, python +, swig , yoda , zlib +, withPython ? false }: stdenv.mkDerivation rec { pname = "fastnlo_toolkit"; - version = "2.3.1pre-2402"; + version = "2.3.1pre-2411"; src = fetchurl { - url = "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz"; - sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl"; + urls = [ + "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz" + "https://sid.ethz.ch/debian/fastnlo/${pname}-${version}.tar.gz" + ]; + sha256 = "0fm9k732pmi3prbicj2yaq815nmcjll95fagjqzf542ng3swpqnb"; }; + nativeBuildInputs = lib.optional withPython autoreconfHook; + buildInputs = [ boost - fastjet gfortran gfortran.cc.lib lhapdf - python2 - root yoda - ]; + ] ++ lib.optional withPython python + ++ lib.optional (withPython && python.isPy3k) ncurses; + propagatedBuildInputs = [ zlib - ]; + ] ++ lib.optional withPython swig; preConfigure = '' substituteInPlace ./fastnlotoolkit/Makefile.in \ @@ -41,7 +47,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-yoda=${yoda}" - ]; + ] ++ lib.optional withPython "--enable-pyext"; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix index 48fc95e788..8a58cd638b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix @@ -2,14 +2,15 @@ stdenv.mkDerivation rec { pname = "pythia"; - version = "8.304"; + version = "8.305"; src = fetchurl { url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "18frx7xyvxnz57fxjncjyjzsk169h0jz6hxzjfpmwm3dzcc712fk"; + sha256 = "03rpy2bmx67217fh1spfn36x9xrk0igcj56byki77lgj0y5mz21a"; }; - buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ]; + nativeBuildInputs = [ rsync ]; + buildInputs = [ boost fastjet hepmc zlib lhapdf ]; preConfigure = '' patchShebangs ./configure @@ -26,11 +27,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "A program for the generation of high-energy physics events"; - license = lib.licenses.gpl2; - homepage = "http://home.thep.lu.se/~torbjorn/Pythia.html"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ veprbl ]; + license = licenses.gpl2Only; + homepage = "http://home.thep.lu.se/~torbjorn/Pythia.html"; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix index 3b9057ad31..c5a83f782f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }: +{ lib, stdenv, fetchurl, fetchpatch, python, root, makeWrapper, zlib, withRootSupport ? false }: stdenv.mkDerivation rec { pname = "yoda"; @@ -9,6 +9,24 @@ stdenv.mkDerivation rec { sha256 = "1x7xi6w7lb92x8202kbaxgqg1sly534wana4f38l3gpbzw9dwmcs"; }; + patches = [ + # fix a minor bug + # https://gitlab.com/hepcedar/yoda/-/merge_requests/38 + (fetchpatch { + name = "yoda-fix-fuzzy-compare-bin2d.patch"; + url = "https://gitlab.com/hepcedar/yoda/-/commit/a2999d78cb3d9ed874f367bad375dc39a1a11148.diff"; + sha256 = "sha256-BsaVm+4VtCvRoEuN4r6A4bj9XwgMe75UesKzN+b56Qw="; + }) + # fix a regression + # https://gitlab.com/hepcedar/yoda/-/merge_requests/40 + (fetchpatch { + name = "yoda-fix-for-yodagz.patch"; + url = "https://gitlab.com/hepcedar/yoda/-/commit/3338ba5a7466599ac6969e4ae462f133d6cf4fd8.diff"; + sha256 = "sha256-MZTOIt468bdPCS7UVfr5hQZUsVy3TpY/TjRrNySIL70="; + excludes = [ "ChangeLog" ]; + }) + ]; + nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; buildInputs = [ python ] ++ (with python.pkgs; [ numpy matplotlib ]) diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 133853e236..b3e740f39c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -42,7 +42,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.26"; + version = "0.3.27"; outputs = [ "out" @@ -60,7 +60,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-s9+70XXMN4K3yDVwIu+L15gL6rFlpRNVQpeekZQOEec="; + sha256 = "sha256-GfcMODQWtcahBvXnZ98/PKIm4pkqLaz09oOy7zQR4IA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/third_party/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix index 2d3a5239d7..ea02eb428d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -5,11 +5,11 @@ mkDerivation rec { pname = "plasma-wayland-protocols"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-xUkzg9EVFxw0NeqaIbOWaGBjKoRFRP+sj1SJBDalHTg="; + url = "mirror://kde/stable/${pname}/${pname}-v${version}.tar.xz"; + sha256 = "sha256-KHuQkD+afzlMdedcsYdCaGLq9kqS8b5+LvaOmf2Muqo="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pmdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pmdk/default.nix index 01392f232d..6e0b6ab672 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pmdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pmdk/default.nix @@ -1,19 +1,19 @@ { lib, stdenv, fetchFromGitHub -, autoconf, libndctl, pkg-config +, autoconf, libndctl, pkg-config, gnum4, pandoc }: stdenv.mkDerivation rec { pname = "pmdk"; - version = "1.7"; + version = "1.9.2"; src = fetchFromGitHub { owner = "pmem"; repo = "pmdk"; rev = "refs/tags/${version}"; - sha256 = "1833sq0f1msaqwn31dn1fp37a6d5zp995i9gkazanydmppi2qy0i"; + sha256 = "0awmkj6j9y2pbqqmp9ql00s7qa3mnpppa82dfy5324lindq0z8a1"; }; - nativeBuildInputs = [ autoconf pkg-config ]; + nativeBuildInputs = [ autoconf pkg-config gnum4 pandoc ]; buildInputs = [ libndctl ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix index 7e8e95ef1e..7f0ad5acdc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix @@ -116,6 +116,6 @@ stdenv.mkDerivation rec { description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix b/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix index fd2a8ab92c..5a41fb0c34 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix @@ -10,7 +10,7 @@ let mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "poppler-${suffix}-${version}"; version = "21.02.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! @@ -63,4 +63,17 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members; }; -} +} // lib.optionalAttrs stdenv.isDarwin { + patches = [ + # Fix build due to improperly used volatile in poppler-glib. + # https://gitlab.freedesktop.org/poppler/poppler/merge_requests/836 + (fetchpatch { + url = "https://gitlab.freedesktop.org/poppler/poppler/commit/47de887d7658cfd68df44b3acf710971054f957b.patch"; + sha256 = "uvYibBn2fOEqdotxK0Wpf8KhGYZXrpHdmS4jjlRNCj8="; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/poppler/poppler/commit/bdd110b45a38e8a4f80f522892e4c4a9e432abd5.patch"; + sha256 = "WDUYXX6v5zk7tusz7DGBP58yFzgEvoBlNSLbfk7+QTc="; + }) + ]; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/presage/default.nix b/third_party/nixpkgs/pkgs/development/libraries/presage/default.nix new file mode 100644 index 0000000000..df15e73f73 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/presage/default.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, dbus +, doxygen +, fontconfig +, gettext +, graphviz +, help2man +, pkg-config +, sqlite +, tinyxml +, cppunit +}: + +stdenv.mkDerivation rec { + pname = "presage"; + version = "0.9.1"; + + src = fetchurl { + url = "mirror://sourceforge/presage/presage/${version}/presage-${version}.tar.gz"; + sha256 = "0rm3b3zaf6bd7hia0lr1wyvi1rrvxkn7hg05r5r1saj0a3ingmay"; + }; + + patches = [ + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/community/presage/gcc6.patch"; + sha256 = "0243nx1ygggmsly7057vndb4pkjxg9rpay5gyqqrq9jjzjzh63dj"; + }) + ./fixed-cppunit-detection.patch + ]; + + nativeBuildInputs = [ + autoreconfHook + doxygen + fontconfig + gettext + graphviz + help2man + pkg-config + ]; + + preBuild = '' + export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf + ''; + + buildInputs = [ + dbus + sqlite + tinyxml + ]; + + checkInputs = [ + cppunit + ]; + + doCheck = true; + + checkTarget = "check"; + + meta = with lib; { + description = "An intelligent predictive text entry system"; + homepage = "https://presage.sourceforge.io/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/presage/fixed-cppunit-detection.patch b/third_party/nixpkgs/pkgs/development/libraries/presage/fixed-cppunit-detection.patch new file mode 100644 index 0000000000..27238d2956 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/presage/fixed-cppunit-detection.patch @@ -0,0 +1,46 @@ +From 5624aa156c551ab2b81bb86279844397ed690653 Mon Sep 17 00:00:00 2001 +From: Matteo Vescovi +Date: Sun, 21 Jan 2018 17:17:12 +0000 +Subject: [PATCH] Fixed cppunit detection. + +--- + configure.ac | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a02e9f1..1538a51 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -204,10 +204,16 @@ AM_CONDITIONAL([USE_SQLITE], [test "x$use_sqlite" = "xyes"]) + dnl ================== + dnl Checks for CppUnit + dnl ================== +-AM_PATH_CPPUNIT([1.9.6], +- [], +- [AC_MSG_WARN([CppUnit not found. Unit tests will not be built. CppUnit can be obtained from http://cppunit.sourceforge.net.])]) +-AM_CONDITIONAL([HAVE_CPPUNIT], [test "$CPPUNIT_LIBS"]) ++PKG_CHECK_MODULES([CPPUNIT], ++ [cppunit >= 1.9], ++ [have_cppunit=yes], ++ [AM_PATH_CPPUNIT([1.9], ++ [have_cppunit=yes], ++ [AC_MSG_WARN([CppUnit not found. Unit tests will not be built. CppUnit can be obtained from http://cppunit.sourceforge.net.])]) ++ ]) ++AC_SUBST([CPPUNIT_CFLAGS]) ++AC_SUBST([CPPUNIT_LIBS]) ++AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$have_cppunit" = "xyes"]) + + + dnl ============================ +@@ -592,7 +598,7 @@ then + else + build_demo_application="no" + fi +-if test "$CPPUNIT_LIBS" ++if test "x$have_cppunit" = "xyes" + then + build_unit_tests="yes" + else +-- +2.31.1 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.15.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.15.nix index 661a552882..e4783be6a3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.15.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.15.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.15.7"; - sha256 = "03fx96rwxfbmr47f1nrflvaq5kk5p3a9wms4688nbnmymyghyml0"; + version = "3.15.8"; + sha256 = "1q3k8axhq6g8fqczmd6kbgzpdplrrgygppym4x1l99lzhplx9rqv"; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.16.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.16.nix new file mode 100644 index 0000000000..df8d53b9f1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.16.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.16.0"; + sha256 = "0jc523ys6xh1fk3l52f5mfqxhb4g8aim1js7330v0fdc3fjr8ncf"; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/pslib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pslib/default.nix index ec2362009f..b3439b7ee9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pslib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, zlib, libpng, libjpeg, libungif, libtiff +{ lib, stdenv, fetchurl, cmake, pkg-config, zlib, libpng, libjpeg, giflib, libtiff }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ zlib libpng libjpeg libungif libtiff ]; + buildInputs = [ zlib libpng libjpeg giflib libtiff ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix index e53404557f..f815941737 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix @@ -14,10 +14,6 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; - # Without this patch cmake fails with a "No known features for CXX compiler" - # error on darwin - patches = lib.optional stdenv.isDarwin ./move-project.patch ; - # tells CMake to use this CA bundle file if it is accessible preConfigure = "export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qca-qt5/move-project.patch b/third_party/nixpkgs/pkgs/development/libraries/qca-qt5/move-project.patch deleted file mode 100644 index dcecb83d7d..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/qca-qt5/move-project.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2f2b5d0..971dee3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,10 +6,11 @@ if(NOT CMAKE_INSTALL_PREFIX) - unset(CMAKE_INSTALL_PREFIX CACHE) - endif(NOT CMAKE_INSTALL_PREFIX) - --project(qca) - - cmake_minimum_required(VERSION 3.4) - -+project(qca) -+ - set(QCA_LIB_MAJOR_VERSION "2") - set(QCA_LIB_MINOR_VERSION "2") - set(QCA_LIB_PATCH_VERSION "1") diff --git a/third_party/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix index f739c1bc27..e3bb938f5f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix @@ -62,7 +62,7 @@ mkDerivation rec { description = "QPlatformTheme for a better Qt application inclusion in GNOME"; homepage = "https://github.com/FedoraQt/QGnomePlatform"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = teams.gnome.members ++ (with maintainers; [ ]); platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix index a4ac41d81d..532a72c820 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -204,7 +204,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin ++ lib.optionals (stdenv.isFreeBSD || stdenv.isDarwin) [ "-I${glib.dev}/include/glib-2.0" "-I${glib.out}/lib/glib-2.0/include" ] - ++ lib.optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"); + ++ lib.optional stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"); NIX_LDFLAGS = lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix index 63e893ea69..fcb6297f51 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix @@ -98,6 +98,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) + (fetchpatch { + name = "qtwebkit-glib-2.68.patch"; + url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; + sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix index 3e3790ed1a..02b170e0eb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix @@ -111,6 +111,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) + (fetchpatch { + name = "qtwebkit-glib-2.68.patch"; + url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; + sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch ] ++ optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index f969254b59..9712914c9e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -135,6 +135,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) + (fetchpatch { + name = "qtwebkit-glib-2.68.patch"; + url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; + sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch ] ++ optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index e2ca47f45f..571c17dc4c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -15,7 +15,7 @@ , enableProprietaryCodecs ? true , gn , cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin -, ffmpeg_3 ? null +, ffmpeg ? null , lib, stdenv, fetchpatch , version ? null , qtCompatVersion @@ -140,9 +140,8 @@ qtModule { fi ''; - qmakeFlags = if stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64 - then [ "--" "-system-ffmpeg" ] ++ optional enableProprietaryCodecs "-proprietary-codecs" - else optional enableProprietaryCodecs "-- -proprietary-codecs"; + qmakeFlags = [ "--" "-system-ffmpeg" ] + ++ optional enableProprietaryCodecs "-proprietary-codecs"; propagatedBuildInputs = [ # Image formats @@ -158,8 +157,7 @@ qtModule { harfbuzz icu libevent - ] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ - ffmpeg_3 + ffmpeg ] ++ optionals (!stdenv.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix index 930ed9d67b..ebd6e887ec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix @@ -7,15 +7,14 @@ let inherit (lib) licenses maintainers platforms; in args: let - inherit (args) name; - version = args.version or srcs.${name}.version; - src = args.src or srcs.${name}.src; + pname = args.name; + version = args.version or srcs.${pname}.version; + src = args.src or srcs.${pname}.src; in mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - patches = args.patches or patches.${name} or []; + inherit pname version src; + patches = args.patches or patches.${pname} or []; nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix index 85468bd4f1..ebc7bc0819 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix @@ -31,7 +31,7 @@ mkDerivation { description = "Additional style plugins for Qt5, including BB10, GTK, Cleanlooks, Motif, Plastique"; homepage = "http://blog.qt.io/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/"; license = licenses.lgpl21; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/rarian/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rarian/default.nix index 522456cfa4..b8995e6a2c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rarian/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rarian/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}: +{lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome}: let pname = "rarian"; version = "0.8.1"; @@ -15,12 +15,6 @@ in stdenv.mkDerivation rec { ++ (with perlPackages; [ perl XMLParser ]); configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - meta = with lib; { description = "Documentation metadata library based on the proposed Freedesktop.org spec"; homepage = "https://rarian.freedesktop.org/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix index 2d8d005976..9b7a2e9101 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "re2"; - version = "20201001"; + version = "2021-04-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; - rev = "2020-10-01"; - sha256 = "0a5f7av1pk6p3jxc2w6prl00lyrplap97m68hnhw7jllnwljk0bx"; + rev = version; + sha256 = "1iia0883lssj7ckbsr0n7yb3gdw24c8wnl2q5hhzlml23h4ipbh3"; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/readline/8.0.nix b/third_party/nixpkgs/pkgs/development/libraries/readline/8.1.nix similarity index 85% rename from third_party/nixpkgs/pkgs/development/libraries/readline/8.0.nix rename to third_party/nixpkgs/pkgs/development/libraries/readline/8.1.nix index 9ea0277467..35835c1a14 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/readline/8.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/readline/8.1.nix @@ -1,13 +1,13 @@ -{ fetchurl, lib, stdenv, ncurses +{ fetchurl, stdenv, lib, ncurses }: stdenv.mkDerivation rec { pname = "readline"; - version = "8.0p${toString (builtins.length upstreamPatches)}"; + version = "8.1p${toString (builtins.length upstreamPatches)}"; src = fetchurl { url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz"; - sha256 = "0qg4924hf4hg0r0wbx2chswsr08734536fh5iagkd3a7f4czafg3"; + sha256 = "00ibp0n9crbwx15k9vvckq5wsipw98b1px8pd8i34chy2gpb9kpq"; }; outputs = [ "out" "dev" "man" "doc" "info" ]; @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { (let patch = nr: sha256: fetchurl { - url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline80-${nr}"; + url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline81-${nr}"; inherit sha256; }; in - import ./readline-8.0-patches.nix patch); + import ./readline-8.1-patches.nix patch); patches = [ ./link-against-ncurses.patch @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dtzWill ]; platforms = platforms.unix; - branch = "8.0"; + branch = "8.1"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/readline/readline-8.0-patches.nix b/third_party/nixpkgs/pkgs/development/libraries/readline/readline-8.0-patches.nix deleted file mode 100644 index 2fac6a413c..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/readline/readline-8.0-patches.nix +++ /dev/null @@ -1,8 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -(patch "001" "0sfh7wn0pr743xspnb1zndxndlv9rc0hcg14cbw5cmyg6f4ykrfq") -(patch "002" "1xy8mv8xm8hsfixwp3ci9kfx3dii3y92cq27wwd0jq75y6zzxc1n") -(patch "003" "1vza7sxjcsr2z295ij12nzgncdil1vb6as3mqy4m7svi1chv5pcl") -(patch "004" "0k1rfx9w32lglxg564yvp0mw6jg6883p8ac2f2lxxqpf80m3vami") -] diff --git a/third_party/nixpkgs/pkgs/development/libraries/readline/readline-8.1-patches.nix b/third_party/nixpkgs/pkgs/development/libraries/readline/readline-8.1-patches.nix new file mode 100644 index 0000000000..b8019fb335 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/readline/readline-8.1-patches.nix @@ -0,0 +1,4 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +] diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix index f55c72bd20..c3a63c637c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix @@ -25,6 +25,6 @@ mkDerivation rec { description = "Astrometric plate solving library"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hjones2199 ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix index 593bd87a98..c9db54fd59 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, glib, openssl, pkg-config, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, glib, openssl, pkg-config, autoreconfHook, SystemConfiguration }: stdenv.mkDerivation rec { pname = "sofia-sip"; @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-qMgZpLo/BHGJbJ0DDN8COHAhU3ujWgVK9oZOnnMwKas="; }; - buildInputs = [ glib openssl ]; + buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification"; homepage = "https://github.com/freeswitch/sofia-sip"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.lgpl2; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/spandsp/3.nix b/third_party/nixpkgs/pkgs/development/libraries/spandsp/3.nix index b3522afdf8..ceb53e0574 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spandsp/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spandsp/3.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "A portable and modular SIP User-Agent with audio and video support"; homepage = "https://github.com/freeswitch/spandsp"; - platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ ajs124 ]; + platforms = with lib.platforms; unix; + maintainers = with lib.maintainers; [ ajs124 misuzu ]; license = lib.licenses.gpl2; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix index b6ec4842e0..0f16a51916 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix @@ -2,6 +2,7 @@ , substituteAll , pkg-config , fetchurl +, fetchpatch , python3Packages , gettext , itstool @@ -51,6 +52,13 @@ in stdenv.mkDerivation rec { src = ./fix-paths.patch; utillinux = util-linux; }) + + # Fix build with Glib 2.68 + # https://github.com/brailcom/speechd/pull/462 + (fetchpatch { + url = "https://github.com/brailcom/speechd/commit/a2faab416e42cbdf3d73f98578a89eb7a235e25a.patch"; + sha256 = "8Q7tUdKKBBtgXZZnj59OcJOkrCNeBR9gkBjhKlpW0hQ="; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix index 0828f2f455..9063879b7e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, fuse, zlib }: +{ lib, stdenv, fetchurl, fuse, zlib +, withFuse ? true }: stdenv.mkDerivation { pname = "sqlar"; @@ -9,12 +10,21 @@ stdenv.mkDerivation { sha256 = "09pikkbp93gqypn3da9zi0dzc47jyypkwc9vnmfzhmw7kpyv8nm9"; }; - buildInputs = [ fuse zlib ]; + postPatch = '' + substituteInPlace Makefile \ + --replace 'gcc' '${stdenv.cc.targetPrefix}cc' + ''; - buildFlags = [ "sqlar" "sqlarfs" "CFLAGS=-Wno-error" ]; + buildInputs = [ zlib ] + ++ lib.optional withFuse fuse; + + buildFlags = [ "CFLAGS=-Wno-error" "sqlar" ] + ++ lib.optional withFuse "sqlarfs"; installPhase = '' - install -D -t $out/bin sqlar sqlarfs + install -D -t $out/bin sqlar + '' + lib.optionalString withFuse '' + install -D -t $out/bin sqlarfs ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix index d260c4211e..45bcda727e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix @@ -22,7 +22,7 @@ let inherit description homepage; downloadPage = http://sqlite.org/download.html; license = licenses.publicDomain; - maintainers = with maintainers; [ pesterhazy johnazoidberg ]; + maintainers = with maintainers; [ johnazoidberg ]; platforms = platforms.unix; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tachyon/darwin.patch b/third_party/nixpkgs/pkgs/development/libraries/tachyon/darwin.patch deleted file mode 100644 index dbede586f0..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/tachyon/darwin.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/unix/Make-arch b/unix/Make-arch -index 08afb85..822c4fc 100644 ---- a/unix/Make-arch -+++ b/unix/Make-arch -@@ -924,7 +924,7 @@ macosx-thr: - $(MAKE) all \ - "ARCH = macosx-thr" \ - "CC = cc" \ -- "CFLAGS = -Os -ffast-math -DBsd -DTHR -F/System/Library/Frameworks $(MISCFLAGS)" \ -+ "CFLAGS = -Os -ffast-math -DBsd -DTHR $(MISCFLAGS)" \ - "AR = ar" \ - "ARFLAGS = r" \ - "STRIP = strip" \ -@@ -946,7 +946,7 @@ macosx-x86-thr: - $(MAKE) all \ - "ARCH = macosx-x86-thr" \ - "CC = cc" \ -- "CFLAGS = -O2 -ffast-math -DBsd -DTHR -F/System/Library/Frameworks $(MISCFLAGS)" \ -+ "CFLAGS = -O2 -ffast-math -DBsd -DTHR $(MISCFLAGS)" \ - "AR = ar" \ - "ARFLAGS = r" \ - "STRIP = strip" \ -@@ -957,7 +957,7 @@ macosx-x86-thr-ogl: - $(MAKE) all \ - "ARCH = macosx-x86-thr-ogl" \ - "CC = cc" \ -- "CFLAGS = -O2 -ffast-math -DBsd -DTHR -I/usr/X11R6/include -F/System/Library/Frameworks $(MISCFLAGS) -DUSEOPENGL" \ -+ "CFLAGS = -O2 -ffast-math -DBsd -DTHR -I/usr/X11R6/include $(MISCFLAGS) -DUSEOPENGL" \ - "AR = ar" \ - "ARFLAGS = r" \ - "STRIP = strip" \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix index 47cebd62df..5994aeb0a5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix @@ -48,14 +48,18 @@ stdenv.mkDerivation rec { if stdenv.hostPlatform.system == "x686-freebsd" then "bsd" else throw "Don't know what arch to select for tachyon build"; makeFlags = [ arch ]; + patches = [ # Remove absolute paths in Make-config (and unset variables so they can be set in preBuild) ./no-absolute-paths.patch # Include new targets (like arm) ./make-archs.patch - ] ++ - # Ensure looks for nix-provided Carbon, not system frameworks - lib.optional stdenv.isDarwin ./darwin.patch; + ]; + postPatch = '' + # Ensure looks for nix-provided Carbon, not system frameworks + substituteInPlace unix/Make-arch \ + --replace '-F/System/Library/Frameworks' "" + ''; installPhase = '' cd ../compile/${arch} diff --git a/third_party/nixpkgs/pkgs/development/libraries/taglib-extras/default.nix b/third_party/nixpkgs/pkgs/development/libraries/taglib-extras/default.nix index 44e107693c..95afae065e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/taglib-extras/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/taglib-extras/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, cmake, taglib}: +{lib, stdenv, fetchurl, cmake, taglib, zlib}: stdenv.mkDerivation rec { name = "taglib-extras-1.0.1"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "0cln49ws9svvvals5fzxjxlzqm0fzjfymn7yfp4jfcjz655nnm7y"; }; buildInputs = [ taglib ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake zlib ]; # Workaround for upstream bug https://bugs.kde.org/show_bug.cgi?id=357181 preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/taglib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/taglib/default.nix index 3fcfaa1233..5f136a5e6b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/taglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/taglib/default.nix @@ -1,39 +1,21 @@ -{ lib, stdenv, fetchurl, cmake, fetchpatch +{ lib +, stdenv +, fetchFromGitHub +, cmake , zlib }: stdenv.mkDerivation rec { pname = "taglib"; - version = "1.11.1"; + version = "1.12"; - src = fetchurl { - url = "http://taglib.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn"; + src = fetchFromGitHub { + owner = "taglib"; + repo = "taglib"; + rev = "v${version}"; + sha256 = "sha256-omErajnYgxbflsbe6pS2KsexZcXisso0WGYnmIud7WA="; }; - patches = [ - (fetchpatch { - # https://github.com/taglib/taglib/issues/829 - name = "CVE-2017-12678.patch"; - url = "https://github.com/taglib/taglib/commit/eb9ded1206f18.patch"; - sha256 = "1bvpxsvmlpi3by7myzss9kkpdkv405612n8ff68mw1ambj8h1m90"; - }) - - (fetchpatch { - # https://github.com/taglib/taglib/pull/869 - name = "CVE-2018-11439.patch"; - url = "https://github.com/taglib/taglib/commit/272648ccfcccae30e002ccf34a22e075dd477278.patch"; - sha256 = "0p397qq4anvcm0p8xs68mxa8hg6dl07chg260lc6k2929m34xv72"; - }) - - (fetchpatch { - # many consumers of taglib have started vendoring taglib due to this bug - name = "fix_ogg_corruption.patch"; - url = "https://github.com/taglib/taglib/commit/9336c82da3a04552168f208cd7a5fa4646701ea4.patch"; - sha256 = "01wlwk4gmfxdg5hjj9jmrain7kia89z0zsdaf5gn3nibmy5bq70r"; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; @@ -51,7 +33,6 @@ stdenv.mkDerivation rec { Speex, WavPack, TrueAudio, WAV, AIFF, MP4 and ASF files. ''; license = with licenses; [ lgpl3 mpl11 ]; - inherit (cmake.meta) platforms; maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix index 2047b0d5bc..7aef5ba747 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix @@ -1,22 +1,44 @@ -{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }: +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, fixDarwinDylibNames +}: -with lib; stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "tbb"; - version = "2019_U9"; + version = "2020.3"; src = fetchFromGitHub { - owner = "01org"; - repo = "tbb"; - rev = version; - sha256 = "1a39nflw7b2n51jfp3fdprnkpgzaspzww1dckfvaigflfli9s8rj"; + owner = "oneapi-src"; + repo = "oneTBB"; + rev = "v${version}"; + sha256 = "prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU="; }; - nativeBuildInputs = optional stdenv.isDarwin fixDarwinDylibNames; + patches = [ + # Fixes build with Musl. + (fetchurl { + url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch"; + sha256 = "gUfXQ9OZQ82qD6brgauBCsKdjLvyHafMc18B+KxZoYs="; + }) - makeFlags = optional (compiler != null) "compiler=${compiler}" - ++ optional (stdver != null) "stdver=${stdver}"; + # Fixes build with Musl. + (fetchurl { + url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch"; + sha256 = "fhorfqO1hHKZ61uq+yTR7eQ8KYdyLwpM3K7WpwJpV74="; + }) + ]; - patches = lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames + ]; + + makeFlags = lib.optionals stdenv.cc.isClang [ + "compiler=clang" + ]; + + enableParallelBuilding = true; installPhase = '' runHook preInstall @@ -29,9 +51,24 @@ with lib; stdenv.mkDerivation rec { runHook postInstall ''; - enableParallelBuilding = true; + postInstall = let + pcTemplate = fetchurl { + url = "https://github.com/oneapi-src/oneTBB/raw/master/integration/pkg-config/tbb.pc.in"; + sha256 = "2pCad9txSpNbzac0vp/VY3x7HNySaYkbH3Rx8LK53pI="; + }; + in '' + # Generate pkg-config file based on upstream template. + # It should not be necessary with tbb after 2021.2. + mkdir -p "$out/lib/pkgconfig" + substitute "${pcTemplate}" "$out/lib/pkgconfig/tbb.pc" \ + --subst-var-by CMAKE_INSTALL_PREFIX "$out" \ + --subst-var-by CMAKE_INSTALL_LIBDIR "lib" \ + --subst-var-by CMAKE_INSTALL_INCLUDEDIR "include" \ + --subst-var-by TBB_VERSION "${version}" \ + --subst-var-by TBB_LIB_NAME "tbb" + ''; - meta = { + meta = with lib; { description = "Intel Thread Building Blocks C++ Library"; homepage = "http://threadingbuildingblocks.org/"; license = licenses.asl20; @@ -43,7 +80,7 @@ with lib; stdenv.mkDerivation rec { represents a higher-level, task-based parallelism that abstracts platform details and threading mechanisms for scalability and performance. ''; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice dizfer ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch b/third_party/nixpkgs/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch deleted file mode 100644 index 64056ecb14..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b577153a10c98f4e13405dc93ea2ab1a7b990e07 Mon Sep 17 00:00:00 2001 -From: David Huffman -Date: Wed, 6 Jan 2016 07:09:30 -0500 -Subject: [PATCH] hard-code glibc's definition of struct mallinfo - ---- - src/tbbmalloc/proxy.h | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/src/tbbmalloc/proxy.h b/src/tbbmalloc/proxy.h -index 781cadc..e1ea1ae 100644 ---- a/src/tbbmalloc/proxy.h -+++ b/src/tbbmalloc/proxy.h -@@ -32,6 +32,26 @@ - - #include - -+// The following definition was taken from /usr/include/malloc.h as provided by -+// the glibc-devel-2.19-17.4.x86_64 package on openSUSE Leap 42.1; it is -+// made available under the GNU Lesser General Public License v2.1 or later. -+// See . -+// -+// Copyright (C) 1996-2014 Free Software Foundation, Inc. -+struct mallinfo -+{ -+ int arena; /* non-mmapped space allocated from system */ -+ int ordblks; /* number of free chunks */ -+ int smblks; /* number of fastbin blocks */ -+ int hblks; /* number of mmapped regions */ -+ int hblkhd; /* space in mmapped regions */ -+ int usmblks; /* maximum total allocated space */ -+ int fsmblks; /* space available in freed fastbin blocks */ -+ int uordblks; /* total allocated space */ -+ int fordblks; /* total free space */ -+ int keepcost; /* top-most, releasable (via malloc_trim) space */ -+}; -+ - extern "C" { - void * scalable_malloc(size_t size); - void * scalable_calloc(size_t nobj, size_t size); --- -2.6.2 - diff --git a/third_party/nixpkgs/pkgs/development/libraries/template-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/template-glib/default.nix index 2c89e3f433..c0ee2c1d35 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/template-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/template-glib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: let version = "3.34.0"; pname = "template-glib"; @@ -21,8 +21,9 @@ stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tepl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tepl/default.nix index 84d50faf54..f561efb473 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tepl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tepl/default.nix @@ -3,7 +3,7 @@ , meson , ninja , amtk -, gnome3 +, gnome , gobject-introspection , gtk3 , gtksourceview4 @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "tepl"; - version = "5.0.1"; + version = "6.00.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sSdJZ2CfUkSEs4d1+p7LKWxtZhaqvQUvKGM5oomRKAQ="; + sha256 = "0qvs7s86gqyyrzi0r5fbrj8zczlgv8xhdjswgbgc1afwjnl9fqx8"; }; nativeBuildInputs = [ @@ -46,7 +46,10 @@ stdenv.mkDerivation rec { # correctly installed or GVfs metadata are not supported on this platform. In # the latter case, you should configure Tepl with --disable-gvfs-metadata. - passthru.updateScript = gnome3.updateScript { packageName = pname; }; + passthru.updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Tepl"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tk/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/tk/generic.nix index 57dc3dac2d..ecb3840b2d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tk/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tk/generic.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation { cd unix ''; + postPatch = '' + for file in $(find library/demos/. -type f ! -name "*.*"); do + substituteInPlace $file --replace "exec wish" "exec $out/bin/wish" + done + ''; + postInstall = '' ln -s $out/bin/wish* $out/bin/wish cp ../{unix,generic}/*.h $out/include diff --git a/third_party/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix index c93ec8dccf..08c989b799 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome }: stdenv.mkDerivation rec { pname = "totem-pl-parser"; @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix index 5b4c1d195e..c571e22384 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix @@ -20,7 +20,7 @@ , exempi , giflib , glib -, gnome3 +, gnome , gst_all_1 , icu , json-glib @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.0.4"; + version = "3.1.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-E877xx1S93RvPTfQQdjFvBM2pA/13ZK1Nw6GUMJqiY4="; + sha256 = "sha256-5NNhNRsVbyhipSRBX76/BTnHgc2HxmKWYvAmW0gDuLg="; }; nativeBuildInputs = [ @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix index ad2cf2acbd..0ee5e0fa56 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, fetchpatch , gettext , meson , ninja @@ -17,7 +18,7 @@ , sqlite , libxslt , libstemmer -, gnome3 +, gnome , icu , libuuid , libsoup @@ -27,15 +28,15 @@ , substituteAll }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { pname = "tracker"; - version = "3.0.3"; + version = "3.1.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-b1yEqzvh7aUgUBsq7XIhYWoM8VKRDFN3V7U4vAXv/KM="; + sha256 = "sha256-Q3bi6YRUBm9E96JC5FuZs7/kwDtn+rGauw7Vhsp0iuc="; }; patches = [ @@ -43,7 +44,18 @@ stdenv.mkDerivation (rec { src = ./fix-paths.patch; inherit asciidoc; }) - ] ++ lib.optional stdenv.isi686 ./i686-tracker-fix.patch; + + # Add missing build target dependencies to fix parallel building of docs. + # TODO: Upstream this. + ./fix-docs.patch + + # Fix 32bit datetime issue, use this upstream patch until 3.1.2 lands + # https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/401 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/tracker/merge_requests/401.patch"; + sha256 = "QEf+ciGkkCzanmtGO0aig6nAxd+NxjvuNi4RbNOwZEA="; + }) + ]; nativeBuildInputs = [ meson @@ -74,22 +86,23 @@ stdenv.mkDerivation (rec { libstemmer ]; - checkInputs = [ - python3.pkgs.pygobject3 + checkInputs = with python3.pkgs; [ + pygobject3 + tappy ]; mesonFlags = [ "-Ddocs=true" ]; - # https://gitlab.gnome.org/GNOME/tracker/-/issues/292#note_1075369 - doCheck = !stdenv.isi686; + doCheck = true; postPatch = '' patchShebangs utils/g-ir-merge/g-ir-merge patchShebangs utils/data-generators/cc/generate patchShebangs tests/functional-tests/test-runner.sh.in patchShebangs tests/functional-tests/*.py + patchShebangs examples/python/endpoint.py ''; preCheck = '' @@ -120,7 +133,7 @@ stdenv.mkDerivation (rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; @@ -134,8 +147,3 @@ stdenv.mkDerivation (rec { platforms = platforms.linux; }; } - // { - # TMP: fatal error: libtracker-sparql/tracker-sparql-enum-types.h: No such file or directory - enableParallelBuilding = false; - } -) diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/fix-docs.patch b/third_party/nixpkgs/pkgs/development/libraries/tracker/fix-docs.patch new file mode 100644 index 0000000000..a6ff84cda3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker/fix-docs.patch @@ -0,0 +1,28 @@ +diff --git a/docs/reference/libtracker-sparql/examples/meson.build b/docs/reference/libtracker-sparql/examples/meson.build +index 1cb1d9f3f..313c72345 100644 +--- a/docs/reference/libtracker-sparql/examples/meson.build ++++ b/docs/reference/libtracker-sparql/examples/meson.build +@@ -1,20 +1,20 @@ + executable( + 'readonly-example', + 'readonly-example.c', +- dependencies: tracker_sparql_dep, ++ dependencies: [tracker_common_dep, tracker_sparql_dep], + build_by_default: true + ) + + executable( + 'writeonly-example', + 'writeonly-example.c', +- dependencies: tracker_sparql_dep, ++ dependencies: [tracker_common_dep, tracker_sparql_dep], + build_by_default: true + ) + + executable( + 'writeonly-with-blank-nodes-example', + 'writeonly-with-blank-nodes-example.c', +- dependencies: tracker_sparql_dep, ++ dependencies: [tracker_common_dep, tracker_sparql_dep], + build_by_default: true + ) diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/i686-tracker-fix.patch b/third_party/nixpkgs/pkgs/development/libraries/tracker/i686-tracker-fix.patch deleted file mode 100644 index c3210fa3c0..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker/i686-tracker-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -u -r tracker-3.0.3_pristine/tests/libtracker-data/tracker-sparql-test.c tracker-3.0.3/tests/libtracker-data/tracker-sparql-test.c ---- tracker-3.0.3_pristine/tests/libtracker-data/tracker-sparql-test.c 2021-01-10 17:46:25.607677700 +0000 -+++ tracker-3.0.3/tests/libtracker-data/tracker-sparql-test.c 2021-04-07 01:44:49.863184812 +0000 -@@ -92,9 +92,7 @@ - { "construct/construct-where", "construct/data", FALSE }, - { "construct/construct-pattern", "construct/data", FALSE }, - { "construct/construct-with-modifiers", "construct/data", FALSE }, -- { "datetime/direct-1", "datetime/data-1", FALSE }, - { "datetime/delete-1", "datetime/data-3", FALSE }, -- { "datetime/insert-1", "datetime/data-4", FALSE }, - { "datetime/functions-localtime-1", "datetime/data-1", FALSE }, - { "datetime/functions-timezone-1", "datetime/data-2", FALSE }, - { "datetime/functions-timezone-2", "datetime/data-2", FALSE }, diff --git a/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix index fae8127687..872e7fbc4f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix @@ -2,17 +2,15 @@ , numactl, rdma-core, libbfd, libiberty, perl, zlib }: -let - version = "1.9.0"; - -in stdenv.mkDerivation { - name = "ucx-${version}"; +stdenv.mkDerivation rec { + pname = "ucx"; + version = "1.10.1"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "0i0ji5ivzxjqh3ys1m517ghw3am7cw1hvf40ma7hsq3wznsyx5s1"; + sha256 = "1jl7wrmcpf6lakpi1gvjcs18cy0mmwgsv5wdd80zyl41cpd8gm8d"; }; nativeBuildInputs = [ autoreconfHook doxygen ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix index d27adb2a06..2dac161bb4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix @@ -1,6 +1,8 @@ -{ lib, stdenv -, docbook_xsl +{ stdenv +, lib +, docbook-xsl-nons , fetchurl +, fetchpatch , glib , gobject-introspection , gtk-doc @@ -19,21 +21,23 @@ stdenv.mkDerivation rec { pname = "umockdev"; version = "0.15.4"; - outputs = [ "bin" "out" "dev" "doc" ]; + outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "09k8jwvsphd97hcagf0zaf0hwzlzq2r8jfgbmvj55k7ylrg8hjxg"; }; - mesonFlags = [ - "-Dgtk_doc=true" + patches = [ + # Fix build with Vala 0.52 + (fetchpatch { + url = "https://github.com/martinpitt/umockdev/commit/a236f0b55fbb6ff50a6429da9d404703d6637d94.patch"; + sha256 = "sZs9Ove1r7te/a9vmWUmFetLVhyzhHmx7ijhkK/2S5o="; + }) ]; - buildInputs = [ glib systemd libgudev ]; - nativeBuildInputs = [ - docbook_xsl + docbook-xsl-nons gobject-introspection gtk-doc meson @@ -42,20 +46,27 @@ stdenv.mkDerivation rec { vala ]; - checkInputs = [ python3 which usbutils ]; + buildInputs = [ + glib + systemd + libgudev + ]; - enableParallelBuilding = true; + checkInputs = [ + python3 + which + usbutils + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + ]; doCheck = true; - postInstall = '' - mkdir -p $doc/share/doc/umockdev/ - mv docs/reference $doc/share/doc/umockdev/ - ''; - meta = with lib; { description = "Mock hardware devices for creating unit tests"; - license = licenses.lgpl2; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ flokli ]; platforms = with platforms; linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/usrsctp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/usrsctp/default.nix new file mode 100644 index 0000000000..64b1debc0c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/usrsctp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "usrsctp"; + version = "0.9.5.0"; + + src = fetchFromGitHub { + owner = "sctplab"; + repo = "usrsctp"; + rev = version; + sha256 = "10ndzkip8blgkw572n3dicl6mgjaa7kygwn3vls80liq92vf1sa9"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://github.com/sctplab/usrsctp"; + description = "A portable SCTP userland stack"; + maintainers = with maintainers; [ misuzu ]; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix b/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix index d513e01b7a..7c463aa012 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, fetchFromGitHub -, gn, ninja, python, glib, pkg-config, icu +, gn, ninja, python, pythonPackages, glib, pkg-config, icu , xcbuild, darwin , fetchpatch }: @@ -55,6 +55,11 @@ stdenv.mkDerivation rec { doCheck = true; patches = [ + # Remove unrecognized clang debug flags + (fetchpatch { + url = "https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/663dbfc492fd2f8ba28d9af40fb3b1327e6aa56e/debian/patches/revert-Xclang-instcombine-lower-dbg-declare.patch"; + sha256 = "07qp4bjgbwbdrzqslvl2bgbzr3v97b9isbp0539x3lc8cy3h02g1"; + }) ./darwin.patch ./gcc_arm.patch # Fix building zlib with gcc on aarch64, from https://gist.github.com/Adenilson/d973b6fd96c7709d33ddf08cf1dcb149 ]; @@ -78,6 +83,13 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString stdenv.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace build/config/compiler/compiler.gni \ + --replace 'strip_absolute_paths_from_debug_symbols = true' \ + 'strip_absolute_paths_from_debug_symbols = false' + substituteInPlace build/config/compiler/BUILD.gn \ + --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \ + 'false' ''; gnFlags = [ @@ -85,6 +97,7 @@ stdenv.mkDerivation rec { "is_clang=${lib.boolToString stdenv.cc.isClang}" "use_sysroot=false" # "use_system_icu=true" + "clang_use_chrome_plugins=false" "is_component_build=false" "v8_use_external_startup_data=false" "v8_monolithic=true" @@ -93,16 +106,25 @@ stdenv.mkDerivation rec { "treat_warnings_as_errors=false" "v8_enable_i18n_support=true" "use_gold=false" - "use_system_xcode=true" + "init_stack_vars=false" # ''custom_toolchain="//build/toolchain/linux/unbundle:default"'' ''host_toolchain="//build/toolchain/linux/unbundle:default"'' ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"''; NIX_CFLAGS_COMPILE = "-O2"; + FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12"; - nativeBuildInputs = [ gn ninja pkg-config python ] - ++ lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; + nativeBuildInputs = [ + gn + ninja + pkg-config + python + ] ++ lib.optionals stdenv.isDarwin [ + xcbuild + darwin.DarwinTools + pythonPackages.setuptools + ]; buildInputs = [ glib icu ]; ninjaFlags = [ ":d8" "v8_monolith" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vte/2.90.nix b/third_party/nixpkgs/pkgs/development/libraries/vte/2.90.nix index 4a9e4d8a66..55ef86c88a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vte/2.90.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vte/2.90.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { the system's terminfo database. ''; license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono lethalman ]; + maintainers = with maintainers; [ astsmtl antono ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix index a17b164445..c3631cccbe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix @@ -6,11 +6,12 @@ , pkg-config , meson , ninja -, gnome3 +, gnome , glib , gtk3 , gobject-introspection , vala +, python3 , libxml2 , gnutls , gperf @@ -24,18 +25,25 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.62.2"; + version = "0.64.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-sDALvPDALfWBKhCjy45P/3I7q5LAjJegqQwWfPVDr/A="; + sha256 = "sha256-EvtBqf+OA8XxcRtGVgkQpLmzECrsPp52Cc7vTfqYqio="; }; - passthru = { - updateScript = gnome3.updateScript { packageName = pname; }; - }; + patches = [ + # VTE needs a small patch to work with musl: + # https://gitlab.gnome.org/GNOME/vte/issues/72 + # Taken from https://git.alpinelinux.org/aports/tree/community/vte3 + (fetchpatch { + name = "0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"; + url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd"; + sha256 = "FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU="; + }) + ]; nativeBuildInputs = [ gettext @@ -46,6 +54,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala + python3 ]; buildInputs = [ @@ -64,22 +73,20 @@ stdenv.mkDerivation rec { pango ]; - patches = - # VTE needs a small patch to work with musl: - # https://gitlab.gnome.org/GNOME/vte/issues/72 - lib.optional - stdenv.hostPlatform.isMusl - (fetchpatch { - name = "0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"; - url = "https://gitlab.gnome.org/GNOME/vte/uploads/c334f767f5d605e0f30ecaa2a0e4d226/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"; - sha256 = "1ii9db9i5l3fy2alxz7bjfsgjs3lappnlx339dvxbi2141zknf5r"; - }); - postPatch = '' patchShebangs perf/* patchShebangs src/box_drawing_generate.sh + patchShebangs src/parser-seq.py + patchShebangs src/modes.py ''; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + meta = with lib; { homepage = "https://www.gnome.org/"; description = "A library implementing a terminal emulator widget for GTK"; @@ -91,8 +98,8 @@ stdenv.mkDerivation rec { character set conversion, as well as emulating any terminal known to the system's terminfo database. ''; - license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono lethalman ] ++ teams.gnome.members; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ astsmtl antono ] ++ teams.gnome.members; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix index 07671ddebd..a06d75e53d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix @@ -5,7 +5,7 @@ , meson , pkg-config , ninja -, wayland +, wayland-scanner , expat , libxml2 , withLibraries ? stdenv.isLinux @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { pkg-config ninja ] ++ lib.optionals isCross [ - wayland # For wayland-scanner during the build + wayland-scanner ] ++ lib.optionals withDocumentation [ (graphviz-nox.override { pango = null; }) # To avoid an infinite recursion doxygen @@ -85,6 +85,18 @@ stdenv.mkDerivation rec { docbook_xml_dtd_42 ]; + postFixup = '' + # The pkg-config file is required for cross-compilation: + mkdir -p $bin/lib/pkgconfig/ + cat < $bin/lib/pkgconfig/wayland-scanner.pc + wayland_scanner=$bin/bin/wayland-scanner + + Name: Wayland Scanner + Description: Wayland scanner + Version: ${version} + EOF + ''; + meta = with lib; { description = "Core Wayland window system code and protocol"; longDescription = '' @@ -99,6 +111,8 @@ stdenv.mkDerivation rec { license = licenses.mit; # Expat version platforms = if withLibraries then platforms.linux else platforms.unix; maintainers = with maintainers; [ primeos codyopel qyliss ]; + # big sur doesn't support gcc stdenv and wayland doesn't build with clang + broken = stdenv.isDarwin; }; passthru.version = version; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix index 23258aff3e..8a2b05aa4d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix @@ -1,19 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config -, wayland -}: +{ lib, stdenv, fetchurl, wayland-scanner }: stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.20"; + version = "1.21"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1rsdgvkkvxs3cjhpl6agvbkm53vm7k8rg127j9y2vn33m2hvg0lp"; + sha256 = "1rfdlkzz67qsb955zqb8jbw3m22pl6ppvrvfq8bqiqcb5n24b6dr"; }; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ wayland ]; + nativeBuildInputs = [ wayland-scanner ]; meta = { description = "Wayland protocol extensions"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 84a9e2a1db..f37ba500a2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -53,15 +53,14 @@ , xdg-dbus-proxy , substituteAll , glib +, addOpenGLRunpath }: assert enableGeoLocation -> geoclue2 != null; -with lib; - stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.32.0"; + version = "2.32.1"; outputs = [ "out" "dev" ]; @@ -69,13 +68,14 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1w3b0w8izp0i070grhv19j631sdcd0mcqnjnax13k8mdx7dg8zcx"; + sha256 = "05v9hgpkc6mi2klrd8nqql1n8xzq8rgdz3hvyy369xkhgwqifq8k"; }; - patches = optionals stdenv.isLinux [ + patches = lib.optionals stdenv.isLinux [ (substituteAll { src = ./fix-bubblewrap-paths.patch; inherit (builtins) storeDir; + inherit (addOpenGLRunpath) driverLink; }) ./libglvnd-headers.patch ]; @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { # pick up the wrong gettext. TODO: Find a better solution for # this, maybe make cmake not look up executables in # CMAKE_PREFIX_PATH. - cmakeFlags+=" -DCMAKE_IGNORE_PATH=${getBin gettext}/bin" + cmakeFlags+=" -DCMAKE_IGNORE_PATH=${lib.getBin gettext}/bin" ''; nativeBuildInputs = [ @@ -118,7 +118,9 @@ stdenv.mkDerivation rec { libgcrypt libidn libintl + ] ++ lib.optionals stdenv.isLinux [ libmanette + ] ++ [ libnotify libpthreadstubs libsecret @@ -138,16 +140,16 @@ stdenv.mkDerivation rec { libXdmcp libXt libXtst - ]) ++ optionals stdenv.isDarwin [ + ]) ++ lib.optionals stdenv.isDarwin [ libedit readline - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ bubblewrap libseccomp systemd wayland xdg-dbus-proxy - ] ++ optional enableGeoLocation geoclue2; + ] ++ lib.optional enableGeoLocation geoclue2; propagatedBuildInputs = [ gtk3 @@ -159,27 +161,34 @@ stdenv.mkDerivation rec { "-DPORT=GTK" "-DUSE_LIBHYPHEN=OFF" "-DUSE_WPE_RENDERER=OFF" - ] ++ optionals stdenv.isDarwin [ - "-DENABLE_GRAPHICS_CONTEXT_3D=OFF" + ] ++ lib.optionals stdenv.isDarwin [ + "-DENABLE_GAMEPAD=OFF" "-DENABLE_GTKDOC=OFF" "-DENABLE_MINIBROWSER=OFF" - "-DENABLE_OPENGL=OFF" "-DENABLE_QUARTZ_TARGET=ON" "-DENABLE_VIDEO=ON" "-DENABLE_WEBGL=OFF" "-DENABLE_WEB_AUDIO=OFF" "-DENABLE_X11_TARGET=OFF" - "-DUSE_ACCELERATE=0" + "-DUSE_APPLE_ICU=OFF" + "-DUSE_OPENGL_OR_ES=OFF" "-DUSE_SYSTEM_MALLOC=ON" - ] ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; + ] ++ lib.optionals (!stdenv.isLinux) [ + "-DUSE_SYSTEMD=OFF" + ] ++ lib.optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; postPatch = '' patchShebangs . + '' + lib.optionalString stdenv.isDarwin '' + # It needs malloc_good_size. + sed 22i'#include ' -i Source/WTF/wtf/FastMalloc.h + # needs CCCryptorStatus. + sed 43i'#include ' -i Source/WTF/wtf/RandomDevice.cpp ''; requiredSystemFeatures = [ "big-parallel" ]; - meta = { + meta = with lib; { description = "Web content rendering engine, GTK port"; homepage = "https://webkitgtk.org/"; license = licenses.bsd2; diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch index 03a6b6903a..d502958f4f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch @@ -1,16 +1,7 @@ diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp --- old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-09 04:47:07.000000000 -0400 +++ webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-20 21:14:10.537921173 -0400 -@@ -585,7 +585,7 @@ - { SCMP_SYS(keyctl), nullptr }, - { SCMP_SYS(request_key), nullptr }, - -- // Scary VM/NUMA ops -+ // Scary VM/NUMA ops - { SCMP_SYS(move_pages), nullptr }, - { SCMP_SYS(mbind), nullptr }, - { SCMP_SYS(get_mempolicy), nullptr }, -@@ -724,6 +724,11 @@ +@@ -724,6 +724,12 @@ "--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64", "--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR, @@ -18,7 +9,8 @@ diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLa + // Nix Directories + "--ro-bind", "@storeDir@", "@storeDir@", + "--ro-bind", "/run/current-system", "/run/current-system", -+ "--ro-bind", "/run/opengl-driver", "/run/opengl-driver", ++ "--ro-bind-try", "@driverLink@/lib", "@driverLink@/lib", ++ "--ro-bind-try", "@driverLink@/share", "@driverLink@/share", }; // We would have to parse ld config files for more info. bindPathVar(sandboxArgs, "LD_LIBRARY_PATH"); diff --git a/third_party/nixpkgs/pkgs/development/libraries/wiiuse/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wiiuse/default.nix index 738c6a4300..d5d34fb618 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wiiuse/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wiiuse/default.nix @@ -2,8 +2,10 @@ , stdenv , fetchFromGitHub , cmake -, pkg-config , bluez +, libobjc +, Foundation +, IOBluetooth }: stdenv.mkDerivation rec { @@ -19,15 +21,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ (lib.getDev bluez) ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ bluez ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc Foundation IOBluetooth ]; - cmakeFlags = [ "-DBUILD_EXAMPLE_SDL=NO" ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ bluez ]; + + cmakeFlags = [ "-DBUILD_EXAMPLE_SDL=OFF" ]; meta = with lib; { description = "Feature complete cross-platform Wii Remote access library"; - license = licenses.gpl3; + license = licenses.gpl3Plus; homepage = "https://github.com/wiiuse/wiiuse"; maintainers = with maintainers; [ shamilton ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix index 469da2523d..b6064c42b5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix @@ -14,7 +14,7 @@ let mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; - shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; optLz4 = shouldUsePkg lz4; optSnappy = shouldUsePkg snappy; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wlroots/0.12.nix b/third_party/nixpkgs/pkgs/development/libraries/wlroots/0.12.nix index 66d4fab2bf..c21205beab 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wlroots/0.12.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wlroots/0.12.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ]; + CFLAGS = "-Wno-error=deprecated-declarations"; + postFixup = '' # Install ALL example programs to $examples: # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle diff --git a/third_party/nixpkgs/pkgs/development/libraries/wt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wt/default.nix index 8887c4410f..cb3ceeae2f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wt/default.nix @@ -21,7 +21,7 @@ let buildInputs = [ boost doxygen qt48Full libharu pango fcgi firebird libmysqlclient postgresql graphicsmagick glew - openssl pcre + openssl pcre harfbuzz ]; cmakeFlags = [ @@ -32,8 +32,6 @@ let "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" "-DGM_PREFIX=${graphicsmagick}" ] - ++ lib.optional (harfbuzz != null) - "-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include" ++ lib.optional (libmysqlclient != null) "-DMYSQL_PREFIX=${libmysqlclient}"; @@ -52,7 +50,7 @@ in { }; wt4 = generic { - version = "4.2.0"; - sha256 = "0zrrdjz0sa8hrmybjp4aap1lcqcqvsicd7dj49zj1m5k8gnfpm4v"; + version = "4.5.0"; + sha256 = "16svzdma2mc2ggnpy5z7m1ggzhd5nrccmmj8xnc7bd1dd3486xwv"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index be96001c46..93a308a658 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -5,7 +5,7 @@ , libxml2 , xdg-desktop-portal , gtk3 -, gnome3 +, gnome , glib , wrapGAppsHook , gsettings-desktop-schemas @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gsettings-desktop-schemas + gsettings-desktop-schemas # settings exposed by settings portal gtk3 - gnome3.gnome-desktop - gnome3.gnome-settings-daemon # schemas needed for settings api (fonts, etc) + gnome.gnome-desktop + gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s) ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index 59816a4ef6..3739284d70 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, makeWrapper , meson, ninja, pkg-config, wayland-protocols -, pipewire, wayland, systemd, libdrm, iniparser, scdoc, grim }: +, pipewire, wayland, systemd, libdrm, iniparser, scdoc, grim, slurp }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-wlr"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; postInstall = '' - wrapProgram $out/libexec/xdg-desktop-portal-wlr --prefix PATH ":" ${lib.makeBinPath [ grim ]} + wrapProgram $out/libexec/xdg-desktop-portal-wlr --prefix PATH ":" ${lib.makeBinPath [ grim slurp ]} ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix index 973e7dc028..26872565de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix @@ -1,6 +1,14 @@ -{ config, stdenv, lib, fetchgit, cmake -, cudaSupport ? config.cudaSupport or false, cudatoolkit -, ncclSupport ? false, nccl +{ config +, stdenv +, lib +, fetchFromGitHub +, cmake +, gtest +, doCheck ? true +, cudaSupport ? config.cudaSupport or false +, cudatoolkit +, ncclSupport ? false +, nccl , llvmPackages }: @@ -8,37 +16,43 @@ assert ncclSupport -> cudaSupport; stdenv.mkDerivation rec { pname = "xgboost"; - version = "0.90"; + version = "1.4.1"; - # needs submodules - src = fetchgit { - url = "https://github.com/dmlc/xgboost"; - rev = "refs/tags/v${version}"; - sha256 = "1zs15k9crkiq7bnr4gqq53mkn3w8z9dq4nwlavmfcr5xr5gw2pw4"; + src = fetchFromGitHub { + owner = "dmlc"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "12b1417dg8jqyxd72kg5a3xhg5h11vz0k7bkv72mzrv83jvgn5ci"; }; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp; - buildInputs = lib.optional cudaSupport cudatoolkit + buildInputs = [ gtest ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional ncclSupport nccl; - cmakeFlags = lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ] - ++ lib.optional ncclSupport "-DUSE_NCCL=ON"; + cmakeFlags = lib.optionals doCheck [ "-DGOOGLE_TEST=ON" ] + ++ lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ] + ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ]; + + inherit doCheck; installPhase = let libname = "libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}"; in '' + runHook preInstall mkdir -p $out cp -r ../include $out install -Dm755 ../lib/${libname} $out/lib/${libname} install -Dm755 ../xgboost $out/bin/xgboost + runHook postInstall ''; meta = with lib; { description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/xine-lib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xine-lib/default.nix index d84023bf9e..8915299a73 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xine-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xine-lib/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , aalib , alsaLib , ffmpeg @@ -16,6 +15,7 @@ , libtheora , libv4l , libvorbis +, ncurses , perl , pkg-config , speex @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { libtheora libv4l libvorbis + ncurses perl speex vcdimager @@ -64,18 +65,10 @@ stdenv.mkDerivation rec { libxcb ]); - patches = [ - # splitting path plugin - (fetchpatch { - name = "0001-fix-XINE_PLUGIN_PATH-splitting.patch"; - url = "https://sourceforge.net/p/xine/mailman/attachment/32394053-5e27-6558-f0c9-49e0da0bc3cc%40gmx.de/1/"; - sha256 = "sha256-LJedxrD8JWITDo9pnS9BCmy7wiPTyJyoQ1puX49tOls="; - }) - ]; + enableParallelBuilding = true; NIX_LDFLAGS = "-lxcb-shm"; - enableParallelBuilding = true; meta = with lib; { homepage = "http://www.xinehq.de/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix index 039ecc610f..de1953622e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "zeitgeist"; - version = "1.0.2"; + version = "1.0.3"; outputs = [ "out" "lib" "dev" "man" ] ++ lib.optional pythonSupport "py"; @@ -29,14 +29,14 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0ig3d3j1n0ghaxsgfww6g2hhcdwx8cljwwfmp9jk1nrvkxd6rnmv"; + sha256 = "0y6fyzxl5np4yskcxibd0p03h619w9ir907nhf40h02y0pk1kgkp"; }; patches = [ - # Fix build with gettext 0.20 + # Fix build with Vala 0.52 (fetchpatch { - url = "https://gitlab.freedesktop.org/zeitgeist/zeitgeist/commit/b5c00e80189fd59a059a95c4e276728a2492cb89.patch"; - sha256 = "1r7f7j3l2p6xlzxajihgx8bzbc2sxcb9spc9pi26rz9bwmngdyq7"; + url = "https://gitlab.freedesktop.org/zeitgeist/zeitgeist/commit/64ac3a6f94cd299e5e14945dc31b48f009dec152.patch"; + sha256 = "Dw1kNE3JoFdmgcQ0eFoFLYvmxlPjXNj56Jkn2meINz4="; }) ]; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A service which logs the users’s activities and events"; homepage = "https://zeitgeist.freedesktop.org/"; - maintainers = with maintainers; [ lethalman worldofpeace ]; + maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/README.txt b/third_party/nixpkgs/pkgs/development/lisp-modules/README.txt index 08452d979a..46d7208bcd 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/README.txt +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/README.txt @@ -1,6 +1,6 @@ Want to add a package? There are 3 simple steps! 1. Add the needed system names to quicklisp-to-nix-systems.txt. -2. cd ; nix-shell --run 'quicklisp-to-nix .' +2. cd ; nix-shell --pure --run 'quicklisp-to-nix .' You might want to specify also the --cacheSystemInfoDir and --cacheFaslDir parameters to preserve some data between runs. For example, it is very useful when you add new packages with native dependencies and fail to diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix index 927254f52a..82a86404ca 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix @@ -24,8 +24,8 @@ let lispPackages = rec { quicklispdist = pkgs.fetchurl { # Will usually be replaced with a fresh version anyway, but needs to be # a valid distinfo.txt - url = "https://beta.quicklisp.org/dist/quicklisp/2021-02-28/distinfo.txt"; - sha256 = "sha256:1apc0s07fmm386rj866dbrhrkq3lrbgbd79kwcyp91ix7sza8z3z"; + url = "https://beta.quicklisp.org/dist/quicklisp/2021-04-11/distinfo.txt"; + sha256 = "sha256:1z7a7m9cm7iv4m9ajvyqphsw30s3qwb0l8g8ayfmkvmvhlj79g86"; }; buildPhase = "true; "; postInstall = '' @@ -124,7 +124,7 @@ let lispPackages = rec { }; nyxt = pkgs.lispPackages.buildLispPackage rec { baseName = "nyxt"; - version = "2021-03-27"; + version = "2021-05-06"; description = "Browser"; @@ -132,6 +132,14 @@ let lispPackages = rec { overrides = x: { postInstall = '' echo "Building nyxt binary" + ( + source "$out/lib/common-lisp-settings"/*-shell-config.sh + cd "$out/lib/common-lisp"/*/ + makeFlags="''${makeFlags:-}" + make LISP=common-lisp.sh NYXT_INTERNAL_QUICKLISP=false PREFIX="$out" $makeFlags all + make LISP=common-lisp.sh NYXT_INTERNAL_QUICKLISP=false PREFIX="$out" $makeFlags install + cp nyxt "$out/bin/nyxt" + ) NIX_LISP_PRELAUNCH_HOOK=' nix_lisp_build_system nyxt/gtk-application \ "(asdf/system:component-entry-point (asdf:find-system :nyxt/gtk-application))" \ @@ -181,13 +189,15 @@ let lispPackages = rec { fset cl-cffi-gtk cl-webkit2 + cl-gobject-introspection ]; src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nyxt"; - rev = "8ef171fd1eb62d168defe4a2d7115393230314d1"; - sha256 = "sha256:1dz55mdmj68kmllih7ab70nmp0mwzqp9lh3im7kcjfmc1r64irdv"; - # date = 2021-03-27T09:10:00+00:00; + rev = "940a5f9a19770771cf29f8fa7505e99c3a242b67"; + sha256 = "sha256:0d5mawka26gwi9nb45x1n33vgskwyn46jrvfz7nzmm2jfaq4ipn6"; + # Version 2 pre-release 7 + # date = "2021-05-06T11:30:27Z"; }; packageName = "nyxt"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix index 4fb5488b7a..c8855a7f24 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "_3bmd-ext-code-blocks"; - version = "3bmd-20201220-git"; + version = "3bmd-20210411-git"; description = "extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma"; deps = [ args."_3bmd" args."alexandria" args."colorize" args."esrap" args."html-encode" args."split-sequence" args."trivial-with-current-source-form" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz"; - sha256 = "0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71"; + url = "http://beta.quicklisp.org/archive/3bmd/2021-04-11/3bmd-20210411-git.tgz"; + sha256 = "1gwl3r8cffr8yldi0x7zdzbmngqhli2d19wsky5cf8h80m30k4vp"; }; packageName = "3bmd-ext-code-blocks"; @@ -20,9 +20,9 @@ rec { } /* (SYSTEM 3bmd-ext-code-blocks DESCRIPTION extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma - SHA256 0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71 URL - http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz MD5 - 67b6e5fa51d18817e7110e4fef6517ac NAME 3bmd-ext-code-blocks FILENAME + SHA256 1gwl3r8cffr8yldi0x7zdzbmngqhli2d19wsky5cf8h80m30k4vp URL + http://beta.quicklisp.org/archive/3bmd/2021-04-11/3bmd-20210411-git.tgz MD5 + 09f9290aa1708aeb469fb5154ab1a397 NAME 3bmd-ext-code-blocks FILENAME _3bmd-ext-code-blocks DEPS ((NAME 3bmd FILENAME _3bmd) (NAME alexandria FILENAME alexandria) (NAME colorize FILENAME colorize) (NAME esrap FILENAME esrap) @@ -33,7 +33,7 @@ rec { DEPENDENCIES (3bmd alexandria colorize esrap html-encode split-sequence trivial-with-current-source-form) - VERSION 3bmd-20201220-git SIBLINGS + VERSION 3bmd-20210411-git SIBLINGS (3bmd-ext-definition-lists 3bmd-ext-math 3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube 3bmd) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix index 8d8299a703..630316bc85 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "_3bmd"; - version = "20201220-git"; + version = "20210411-git"; description = "markdown processor in CL using esrap parser."; deps = [ args."alexandria" args."esrap" args."split-sequence" args."trivial-with-current-source-form" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz"; - sha256 = "0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71"; + url = "http://beta.quicklisp.org/archive/3bmd/2021-04-11/3bmd-20210411-git.tgz"; + sha256 = "1gwl3r8cffr8yldi0x7zdzbmngqhli2d19wsky5cf8h80m30k4vp"; }; packageName = "3bmd"; @@ -19,16 +19,16 @@ rec { overrides = x: x; } /* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256 - 0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71 URL - http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz MD5 - 67b6e5fa51d18817e7110e4fef6517ac NAME 3bmd FILENAME _3bmd DEPS + 1gwl3r8cffr8yldi0x7zdzbmngqhli2d19wsky5cf8h80m30k4vp URL + http://beta.quicklisp.org/archive/3bmd/2021-04-11/3bmd-20210411-git.tgz MD5 + 09f9290aa1708aeb469fb5154ab1a397 NAME 3bmd FILENAME _3bmd DEPS ((NAME alexandria FILENAME alexandria) (NAME esrap FILENAME esrap) (NAME split-sequence FILENAME split-sequence) (NAME trivial-with-current-source-form FILENAME trivial-with-current-source-form)) DEPENDENCIES (alexandria esrap split-sequence trivial-with-current-source-form) VERSION - 20201220-git SIBLINGS + 20210411-git SIBLINGS (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-math 3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/agutil.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/agutil.nix new file mode 100644 index 0000000000..c159b20641 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/agutil.nix @@ -0,0 +1,42 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "agutil"; + version = "20200325-git"; + + description = "A collection of utility functions not found in other utility libraries."; + + deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/agutil/2020-03-25/agutil-20200325-git.tgz"; + sha256 = "0jfbb2x3f8sm507r63qwrzx44lyyj98i36yyyaf4kpyqfir35z2k"; + }; + + packageName = "agutil"; + + asdFilesToKeep = ["agutil.asd"]; + overrides = x: x; +} +/* (SYSTEM agutil DESCRIPTION + A collection of utility functions not found in other utility libraries. + SHA256 0jfbb2x3f8sm507r63qwrzx44lyyj98i36yyyaf4kpyqfir35z2k URL + http://beta.quicklisp.org/archive/agutil/2020-03-25/agutil-20200325-git.tgz + MD5 89e47bd15c0f9930a5025d04b9706b60 NAME agutil FILENAME agutil DEPS + ((NAME alexandria FILENAME alexandria) + (NAME closer-mop FILENAME closer-mop) + (NAME introspect-environment FILENAME introspect-environment) + (NAME iterate FILENAME iterate) + (NAME lisp-namespace FILENAME lisp-namespace) + (NAME trivia FILENAME trivia) + (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) + (NAME trivia.level0 FILENAME trivia_dot_level0) + (NAME trivia.level1 FILENAME trivia_dot_level1) + (NAME trivia.level2 FILENAME trivia_dot_level2) + (NAME trivia.trivial FILENAME trivia_dot_trivial) + (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) + DEPENDENCIES + (alexandria closer-mop introspect-environment iterate lisp-namespace trivia + trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 + trivia.trivial trivial-cltl2 type-i) + VERSION 20200325-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index f58416bffe..324831796e 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "alexandria"; - version = "20200925-git"; + version = "20210411-git"; description = "Alexandria is a collection of portable public domain utilities."; deps = [ ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz"; - sha256 = "1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl"; + url = "http://beta.quicklisp.org/archive/alexandria/2021-04-11/alexandria-20210411-git.tgz"; + sha256 = "0bd4axr1z1q6khvpyf5xvgybdajs1dc7my6g0rdzhhxbibfcf3yh"; }; packageName = "alexandria"; @@ -20,8 +20,8 @@ rec { } /* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 - 1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl URL - http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz - MD5 59c8237a854de6f4f93328cd5747cd14 NAME alexandria FILENAME alexandria - DEPS NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS (alexandria-tests) + 0bd4axr1z1q6khvpyf5xvgybdajs1dc7my6g0rdzhhxbibfcf3yh URL + http://beta.quicklisp.org/archive/alexandria/2021-04-11/alexandria-20210411-git.tgz + MD5 415c43451862b490577b20ee4fb8e8d7 NAME alexandria FILENAME alexandria + DEPS NIL DEPENDENCIES NIL VERSION 20210411-git SIBLINGS (alexandria-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/arrows.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/arrows.nix new file mode 100644 index 0000000000..13076ff26e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/arrows.nix @@ -0,0 +1,31 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "arrows"; + version = "20181018-git"; + + parasites = [ "arrows/test" ]; + + description = "Implements -> and ->> from Clojure, as well as several expansions on the +idea."; + + deps = [ args."hu_dot_dwim_dot_stefil" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/arrows/2018-10-18/arrows-20181018-git.tgz"; + sha256 = "1b13pnn71z1dv1cwysh6p5jfgjsp3q8ivsdxfspl1hg1nh9mqa7r"; + }; + + packageName = "arrows"; + + asdFilesToKeep = ["arrows.asd"]; + overrides = x: x; +} +/* (SYSTEM arrows DESCRIPTION + Implements -> and ->> from Clojure, as well as several expansions on the +idea. + SHA256 1b13pnn71z1dv1cwysh6p5jfgjsp3q8ivsdxfspl1hg1nh9mqa7r URL + http://beta.quicklisp.org/archive/arrows/2018-10-18/arrows-20181018-git.tgz + MD5 c60b5d79680de19baad018a0fe87bc48 NAME arrows FILENAME arrows DEPS + ((NAME hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil)) DEPENDENCIES + (hu.dwim.stefil) VERSION 20181018-git SIBLINGS NIL PARASITES (arrows/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix index f65c68e0d7..b33f95934f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "cffi-grovel"; - version = "cffi_0.23.0"; + version = "cffi_0.24.1"; description = "The CFFI Groveller"; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; - sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; + url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz"; + sha256 = "1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh"; }; packageName = "cffi-grovel"; @@ -19,13 +19,13 @@ rec { overrides = x: x; } /* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 - 1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck URL - http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz MD5 - a43e3c440fc4f20494e6d2347887c963 NAME cffi-grovel FILENAME cffi-grovel DEPS + 1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh URL + http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz MD5 + c3df5c460e00e5af8b8bd2cd03a4b5cc NAME cffi-grovel FILENAME cffi-grovel DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cffi cffi-toolchain trivial-features) - VERSION cffi_0.23.0 SIBLINGS + VERSION cffi_0.24.1 SIBLINGS (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix index af7c96639d..b326d625f4 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "cffi-toolchain"; - version = "cffi_0.23.0"; + version = "cffi_0.24.1"; description = "The CFFI toolchain"; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; - sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; + url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz"; + sha256 = "1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh"; }; packageName = "cffi-toolchain"; @@ -19,14 +19,14 @@ rec { overrides = x: x; } /* (SYSTEM cffi-toolchain DESCRIPTION The CFFI toolchain SHA256 - 1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck URL - http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz MD5 - a43e3c440fc4f20494e6d2347887c963 NAME cffi-toolchain FILENAME + 1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh URL + http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz MD5 + c3df5c460e00e5af8b8bd2cd03a4b5cc NAME cffi-toolchain FILENAME cffi-toolchain DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.23.0 + DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.24.1 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-uffi-compat cffi) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix index ec45275045..822b7a8116 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "cffi-uffi-compat"; - version = "cffi_0.23.0"; + version = "cffi_0.24.1"; description = "UFFI Compatibility Layer for CFFI"; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; - sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; + url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz"; + sha256 = "1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh"; }; packageName = "cffi-uffi-compat"; @@ -19,14 +19,14 @@ rec { overrides = x: x; } /* (SYSTEM cffi-uffi-compat DESCRIPTION UFFI Compatibility Layer for CFFI - SHA256 1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck URL - http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz MD5 - a43e3c440fc4f20494e6d2347887c963 NAME cffi-uffi-compat FILENAME + SHA256 1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh URL + http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz MD5 + c3df5c460e00e5af8b8bd2cd03a4b5cc NAME cffi-uffi-compat FILENAME cffi-uffi-compat DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.23.0 + DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.24.1 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix index 103f233fa4..0738ea5909 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "cffi"; - version = "cffi_0.23.0"; + version = "cffi_0.24.1"; parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; - sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; + url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz"; + sha256 = "1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh"; }; packageName = "cffi"; @@ -21,15 +21,15 @@ rec { overrides = x: x; } /* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 - 1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck URL - http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz MD5 - a43e3c440fc4f20494e6d2347887c963 NAME cffi FILENAME cffi DEPS + 1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh URL + http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz MD5 + c3df5c460e00e5af8b8bd2cd03a4b5cc NAME cffi FILENAME cffi DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-json FILENAME cl-json) (NAME cl-ppcre FILENAME cl-ppcre) (NAME trivial-features FILENAME trivial-features) (NAME uiop FILENAME uiop)) DEPENDENCIES (alexandria babel cl-json cl-ppcre trivial-features uiop) - VERSION cffi_0.23.0 SIBLINGS + VERSION cffi_0.24.1 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat) PARASITES (cffi/c2ffi cffi/c2ffi-generator)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix index b6940af598..8e32a0b1ab 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "chanl"; - version = "20210124-git"; + version = "20210411-git"; parasites = [ "chanl/examples" "chanl/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/chanl/2021-01-24/chanl-20210124-git.tgz"; - sha256 = "1lb0k5nh51f8hskpm1pma5ds4lk1zpbk9czpw9bk8hdykr178mzc"; + url = "http://beta.quicklisp.org/archive/chanl/2021-04-11/chanl-20210411-git.tgz"; + sha256 = "1c1yiw616q5hv6vzyg1y4kg68v94p37s5jrq387rwadfnnf46rgi"; }; packageName = "chanl"; @@ -22,11 +22,11 @@ rec { } /* (SYSTEM chanl DESCRIPTION Communicating Sequential Process support for Common Lisp SHA256 - 1lb0k5nh51f8hskpm1pma5ds4lk1zpbk9czpw9bk8hdykr178mzc URL - http://beta.quicklisp.org/archive/chanl/2021-01-24/chanl-20210124-git.tgz - MD5 2f9e2d16caa2febff4f5beb6226b7ccf NAME chanl FILENAME chanl DEPS + 1c1yiw616q5hv6vzyg1y4kg68v94p37s5jrq387rwadfnnf46rgi URL + http://beta.quicklisp.org/archive/chanl/2021-04-11/chanl-20210411-git.tgz + MD5 efaa5705b5feaa718290d25a95e2a684 NAME chanl FILENAME chanl DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria bordeaux-threads fiveam) VERSION 20210124-git + DEPENDENCIES (alexandria bordeaux-threads fiveam) VERSION 20210411-git SIBLINGS NIL PARASITES (chanl/examples chanl/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix index eb96739937..99ff56f9b1 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "cl-change-case"; - version = "20210228-git"; + version = "20210411-git"; parasites = [ "cl-change-case/test" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."fiveam" args."flexi-streams" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-change-case/2021-02-28/cl-change-case-20210228-git.tgz"; - sha256 = "15x8zxwa3pxs02fh0qxmbvz6vi59x6ha09p5hs4rgd6axs0k4pmi"; + url = "http://beta.quicklisp.org/archive/cl-change-case/2021-04-11/cl-change-case-20210411-git.tgz"; + sha256 = "14s26b907h1nsnwdqbj6j4c9bvc4rc2l8ry2q1j7ibjfzqvhp4mj"; }; packageName = "cl-change-case"; @@ -22,13 +22,13 @@ rec { } /* (SYSTEM cl-change-case DESCRIPTION Convert strings between camelCase, param-case, PascalCase and more SHA256 - 15x8zxwa3pxs02fh0qxmbvz6vi59x6ha09p5hs4rgd6axs0k4pmi URL - http://beta.quicklisp.org/archive/cl-change-case/2021-02-28/cl-change-case-20210228-git.tgz - MD5 8fec07f0634a739134dc4fcec807fe16 NAME cl-change-case FILENAME + 14s26b907h1nsnwdqbj6j4c9bvc4rc2l8ry2q1j7ibjfzqvhp4mj URL + http://beta.quicklisp.org/archive/cl-change-case/2021-04-11/cl-change-case-20210411-git.tgz + MD5 df72a3d71a6c65e149704688aec859b9 NAME cl-change-case FILENAME cl-change-case DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-ppcre-unicode FILENAME cl-ppcre-unicode) (NAME cl-unicode FILENAME cl-unicode) (NAME fiveam FILENAME fiveam) (NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (cl-ppcre cl-ppcre-unicode cl-unicode fiveam flexi-streams) - VERSION 20210228-git SIBLINGS NIL PARASITES (cl-change-case/test)) */ + VERSION 20210411-git SIBLINGS NIL PARASITES (cl-change-case/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix index 5a8bea30a5..5fac77896b 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "cl-colors2"; - version = "20200218-git"; + version = "20210411-git"; parasites = [ "cl-colors2/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."cl-ppcre" args."clunit2" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz"; - sha256 = "0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29"; + url = "http://beta.quicklisp.org/archive/cl-colors2/2021-04-11/cl-colors2-20210411-git.tgz"; + sha256 = "14kdi214x8rxil27wfbx0csgi7g8dg5wsifpsrdrqph0p7ps8snk"; }; packageName = "cl-colors2"; @@ -21,11 +21,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-colors2 DESCRIPTION Simple color library for Common Lisp SHA256 - 0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29 URL - http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz - MD5 054283564f17af46a09e259ff509b656 NAME cl-colors2 FILENAME cl-colors2 + 14kdi214x8rxil27wfbx0csgi7g8dg5wsifpsrdrqph0p7ps8snk URL + http://beta.quicklisp.org/archive/cl-colors2/2021-04-11/cl-colors2-20210411-git.tgz + MD5 e6b54e76e7d1cfcff45955dbd4752f1d NAME cl-colors2 FILENAME cl-colors2 DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) (NAME clunit2 FILENAME clunit2)) - DEPENDENCIES (alexandria cl-ppcre clunit2) VERSION 20200218-git SIBLINGS + DEPENDENCIES (alexandria cl-ppcre clunit2) VERSION 20210411-git SIBLINGS NIL PARASITES (cl-colors2/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-environments.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-environments.nix new file mode 100644 index 0000000000..803d138b2e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-environments.nix @@ -0,0 +1,44 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "cl-environments"; + version = "20210411-git"; + + parasites = [ "cl-environments/test" ]; + + description = "Implements the CLTL2 environment access functionality + for implementations which do not provide the + functionality to the programmer."; + + deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."closer-mop" args."collectors" args."iterate" args."optima" args."prove" args."prove-asdf" args."symbol-munger" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/cl-environments/2021-04-11/cl-environments-20210411-git.tgz"; + sha256 = "1xs1wwf6fmzq5zxmv5d9f2mfmhc7j2w03519ky6id5md75j68lhk"; + }; + + packageName = "cl-environments"; + + asdFilesToKeep = ["cl-environments.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-environments DESCRIPTION + Implements the CLTL2 environment access functionality + for implementations which do not provide the + functionality to the programmer. + SHA256 1xs1wwf6fmzq5zxmv5d9f2mfmhc7j2w03519ky6id5md75j68lhk URL + http://beta.quicklisp.org/archive/cl-environments/2021-04-11/cl-environments-20210411-git.tgz + MD5 87b7c0186d37d30d24df11d021ab4fba NAME cl-environments FILENAME + cl-environments DEPS + ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) + (NAME cl-ansi-text FILENAME cl-ansi-text) + (NAME cl-colors FILENAME cl-colors) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME closer-mop FILENAME closer-mop) + (NAME collectors FILENAME collectors) (NAME iterate FILENAME iterate) + (NAME optima FILENAME optima) (NAME prove FILENAME prove) + (NAME prove-asdf FILENAME prove-asdf) + (NAME symbol-munger FILENAME symbol-munger)) + DEPENDENCIES + (alexandria anaphora cl-ansi-text cl-colors cl-ppcre closer-mop collectors + iterate optima prove prove-asdf symbol-munger) + VERSION 20210411-git SIBLINGS NIL PARASITES (cl-environments/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-gobject-introspection.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-gobject-introspection.nix new file mode 100644 index 0000000000..15b16ef84c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-gobject-introspection.nix @@ -0,0 +1,32 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "cl-gobject-introspection"; + version = "20210124-git"; + + description = "Binding to GObjectIntrospection"; + + deps = [ args."alexandria" args."babel" args."cffi" args."iterate" args."trivial-features" args."trivial-garbage" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/cl-gobject-introspection/2021-01-24/cl-gobject-introspection-20210124-git.tgz"; + sha256 = "1hrc451d9xdp3pfmwalw32r3iqfvw6ccy665kl5560lihwmk59w0"; + }; + + packageName = "cl-gobject-introspection"; + + asdFilesToKeep = ["cl-gobject-introspection.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-gobject-introspection DESCRIPTION Binding to GObjectIntrospection + SHA256 1hrc451d9xdp3pfmwalw32r3iqfvw6ccy665kl5560lihwmk59w0 URL + http://beta.quicklisp.org/archive/cl-gobject-introspection/2021-01-24/cl-gobject-introspection-20210124-git.tgz + MD5 ad760b820c86142c0a1309af29541680 NAME cl-gobject-introspection FILENAME + cl-gobject-introspection DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) (NAME iterate FILENAME iterate) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage)) + DEPENDENCIES + (alexandria babel cffi iterate trivial-features trivial-garbage) VERSION + 20210124-git SIBLINGS (cl-gobject-introspection-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 95f5d03738..5e78f8e98c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "cl-postgres"; - version = "postmodern-20210124-git"; + version = "postmodern-20210411-git"; parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-ppcre" args."fiveam" args."ironclad" args."md5" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz"; - sha256 = "1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc"; + url = "http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz"; + sha256 = "0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw"; }; packageName = "cl-postgres"; @@ -21,9 +21,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL - SHA256 1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc URL - http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz - MD5 05c2c5f4d2354a5fa69a32b7b96f8ff8 NAME cl-postgres FILENAME cl-postgres + SHA256 0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw URL + http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz + MD5 8a75a05ba9e371f672f2620d40724cb2 NAME cl-postgres FILENAME cl-postgres DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -36,5 +36,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-base64 cl-ppcre fiveam ironclad md5 simple-date simple-date/postgres-glue split-sequence uax-15 usocket) - VERSION postmodern-20210124-git SIBLINGS (postmodern s-sql simple-date) + VERSION postmodern-20210411-git SIBLINGS (postmodern s-sql simple-date) PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix index 82beff7057..0284b2dfd2 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "cl-typesetting"; - version = "20210228-git"; + version = "20210411-git"; description = "Common Lisp Typesetting system"; deps = [ args."cl-pdf" args."iterate" args."zpb-ttf" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-typesetting/2021-02-28/cl-typesetting-20210228-git.tgz"; - sha256 = "13rmzyzp0glq35jq3qdlmrsdssa6csqp5g455li4wi7kq8clrwnp"; + url = "http://beta.quicklisp.org/archive/cl-typesetting/2021-04-11/cl-typesetting-20210411-git.tgz"; + sha256 = "1102n049hhg0kqnfvdfcisjq5l9yfvbw090nq0q8vd2bc688ng41"; }; packageName = "cl-typesetting"; @@ -19,11 +19,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-typesetting DESCRIPTION Common Lisp Typesetting system SHA256 - 13rmzyzp0glq35jq3qdlmrsdssa6csqp5g455li4wi7kq8clrwnp URL - http://beta.quicklisp.org/archive/cl-typesetting/2021-02-28/cl-typesetting-20210228-git.tgz - MD5 949e7de37838d63f4c6b6e7dd88befeb NAME cl-typesetting FILENAME + 1102n049hhg0kqnfvdfcisjq5l9yfvbw090nq0q8vd2bc688ng41 URL + http://beta.quicklisp.org/archive/cl-typesetting/2021-04-11/cl-typesetting-20210411-git.tgz + MD5 f3fc7a47efb99cf849cb5eeede96dbaf NAME cl-typesetting FILENAME cl-typesetting DEPS ((NAME cl-pdf FILENAME cl-pdf) (NAME iterate FILENAME iterate) (NAME zpb-ttf FILENAME zpb-ttf)) - DEPENDENCIES (cl-pdf iterate zpb-ttf) VERSION 20210228-git SIBLINGS + DEPENDENCIES (cl-pdf iterate zpb-ttf) VERSION 20210411-git SIBLINGS (xml-render cl-pdf-doc) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix index 56275d7274..84005b13b2 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "cl-webkit2"; - version = "cl-webkit-20210228-git"; + version = "cl-webkit-20210411-git"; description = "An FFI binding to WebKit2GTK+"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-webkit/2021-02-28/cl-webkit-20210228-git.tgz"; - sha256 = "1r6i64g37palar4hij6c5m240xbn2dwzwaashv015nhjwmra1ms1"; + url = "http://beta.quicklisp.org/archive/cl-webkit/2021-04-11/cl-webkit-20210411-git.tgz"; + sha256 = "10cky5v67s9mx2j96k0z01qbqfyc8w6a8byaamm7al5qkw997brh"; }; packageName = "cl-webkit2"; @@ -19,9 +19,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-webkit2 DESCRIPTION An FFI binding to WebKit2GTK+ SHA256 - 1r6i64g37palar4hij6c5m240xbn2dwzwaashv015nhjwmra1ms1 URL - http://beta.quicklisp.org/archive/cl-webkit/2021-02-28/cl-webkit-20210228-git.tgz - MD5 49f38c18ac292122628356762270e5ff NAME cl-webkit2 FILENAME cl-webkit2 + 10cky5v67s9mx2j96k0z01qbqfyc8w6a8byaamm7al5qkw997brh URL + http://beta.quicklisp.org/archive/cl-webkit/2021-04-11/cl-webkit-20210411-git.tgz + MD5 01b52f031fd8742ac9d422e4fcd2a225 NAME cl-webkit2 FILENAME cl-webkit2 DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -41,4 +41,4 @@ rec { cl-cffi-gtk-gdk cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gio cl-cffi-gtk-glib cl-cffi-gtk-gobject cl-cffi-gtk-pango closer-mop iterate trivial-features trivial-garbage) - VERSION cl-webkit-20210228-git SIBLINGS NIL PARASITES NIL) */ + VERSION cl-webkit-20210411-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index 6811c62ad2..55eb893494 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "cl_plus_ssl"; - version = "cl+ssl-20210228-git"; + version = "cl+ssl-20210411-git"; description = "Common Lisp interface to OpenSSL."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" args."usocket" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl+ssl/2021-02-28/cl+ssl-20210228-git.tgz"; - sha256 = "1njppcg5fm8l0lhf7nf8nfyaz9vsr922y0vfxqdp9hp7qfid8yll"; + url = "http://beta.quicklisp.org/archive/cl+ssl/2021-04-11/cl+ssl-20210411-git.tgz"; + sha256 = "1rc13lc5wwzlkn7yhl3bwl6cmxxldmbfnz52nz5b83v4wlw2zbcw"; }; packageName = "cl+ssl"; @@ -19,9 +19,9 @@ rec { overrides = x: x; } /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 - 1njppcg5fm8l0lhf7nf8nfyaz9vsr922y0vfxqdp9hp7qfid8yll URL - http://beta.quicklisp.org/archive/cl+ssl/2021-02-28/cl+ssl-20210228-git.tgz - MD5 01b61fd8ee6ad8d3c1c695ba56d510b6 NAME cl+ssl FILENAME cl_plus_ssl DEPS + 1rc13lc5wwzlkn7yhl3bwl6cmxxldmbfnz52nz5b83v4wlw2zbcw URL + http://beta.quicklisp.org/archive/cl+ssl/2021-04-11/cl+ssl-20210411-git.tgz + MD5 9ef5b60ac4c8ad4f435a3ef6234897d0 NAME cl+ssl FILENAME cl_plus_ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams) @@ -33,4 +33,4 @@ rec { DEPENDENCIES (alexandria babel bordeaux-threads cffi flexi-streams split-sequence trivial-features trivial-garbage trivial-gray-streams uiop usocket) - VERSION cl+ssl-20210228-git SIBLINGS (cl+ssl.test) PARASITES NIL) */ + VERSION cl+ssl-20210411-git SIBLINGS (cl+ssl.test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix index ff3679a263..3c18fd9119 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "clack-handler-hunchentoot"; - version = "clack-20191007-git"; + version = "clack-20210411-git"; description = "Clack handler for Hunchentoot."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; - sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; + url = "http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz"; + sha256 = "0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf"; }; packageName = "clack-handler-hunchentoot"; @@ -19,9 +19,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-handler-hunchentoot DESCRIPTION Clack handler for Hunchentoot. - SHA256 004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL - http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz - MD5 25741855fa1e989d373ac06ddfabf351 NAME clack-handler-hunchentoot + SHA256 0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf URL + http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz + MD5 c47deb6287b72fc9033055914787f3a5 NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -43,7 +43,7 @@ rec { cl-ppcre clack-socket flexi-streams hunchentoot md5 rfc2388 split-sequence trivial-backtrace trivial-features trivial-garbage trivial-gray-streams usocket) - VERSION clack-20191007-git SIBLINGS + VERSION clack-20210411-git SIBLINGS (clack-handler-fcgi clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix index e597bb66d6..2fe47652eb 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "clack-socket"; - version = "clack-20191007-git"; + version = "clack-20210411-git"; description = "System lacks description"; deps = [ ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; - sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; + url = "http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz"; + sha256 = "0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf"; }; packageName = "clack-socket"; @@ -19,10 +19,10 @@ rec { overrides = x: x; } /* (SYSTEM clack-socket DESCRIPTION System lacks description SHA256 - 004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL - http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz - MD5 25741855fa1e989d373ac06ddfabf351 NAME clack-socket FILENAME - clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20191007-git SIBLINGS + 0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf URL + http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz + MD5 c47deb6287b72fc9033055914787f3a5 NAME clack-socket FILENAME + clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20210411-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix index d014ccc211..ab2794fbdd 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "clack-test"; - version = "clack-20191007-git"; + version = "clack-20210411-git"; description = "Testing Clack Applications."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; - sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; + url = "http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz"; + sha256 = "0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf"; }; packageName = "clack-test"; @@ -19,9 +19,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256 - 004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL - http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz - MD5 25741855fa1e989d373ac06ddfabf351 NAME clack-test FILENAME clack-test + 0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf URL + http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz + MD5 c47deb6287b72fc9033055914787f3a5 NAME clack-test FILENAME clack-test DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -68,7 +68,7 @@ rec { proc-parse quri rfc2388 rove smart-buffer split-sequence static-vectors trivial-backtrace trivial-features trivial-garbage trivial-gray-streams trivial-mimes trivial-types usocket xsubseq) - VERSION clack-20191007-git SIBLINGS + VERSION clack-20210411-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index 6d90a5ef1f..f93b8e1c9d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "clack-v1-compat"; - version = "clack-20191007-git"; + version = "clack-20210411-git"; description = "System lacks description"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."marshal" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; - sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; + url = "http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz"; + sha256 = "0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf"; }; packageName = "clack-v1-compat"; @@ -19,9 +19,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-v1-compat DESCRIPTION System lacks description SHA256 - 004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL - http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz - MD5 25741855fa1e989d373ac06ddfabf351 NAME clack-v1-compat FILENAME + 0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf URL + http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz + MD5 c47deb6287b72fc9033055914787f3a5 NAME clack-v1-compat FILENAME clack-v1-compat DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -73,7 +73,7 @@ rec { split-sequence static-vectors trivial-backtrace trivial-features trivial-garbage trivial-gray-streams trivial-mimes trivial-types uiop usocket xsubseq) - VERSION clack-20191007-git SIBLINGS + VERSION clack-20210411-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix index 78ffa543ec..95447ca8ad 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "clack"; - version = "20191007-git"; + version = "20210411-git"; description = "Web application environment for Common Lisp"; - deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."uiop" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."split-sequence" args."uiop" args."usocket" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; - sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; + url = "http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz"; + sha256 = "0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf"; }; packageName = "clack"; @@ -19,19 +19,21 @@ rec { overrides = x: x; } /* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 - 004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL - http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz - MD5 25741855fa1e989d373ac06ddfabf351 NAME clack FILENAME clack DEPS + 0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf URL + http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz + MD5 c47deb6287b72fc9033055914787f3a5 NAME clack FILENAME clack DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME ironclad FILENAME ironclad) (NAME lack FILENAME lack) (NAME lack-component FILENAME lack-component) (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace) - (NAME lack-util FILENAME lack-util) (NAME uiop FILENAME uiop)) + (NAME lack-util FILENAME lack-util) + (NAME split-sequence FILENAME split-sequence) (NAME uiop FILENAME uiop) + (NAME usocket FILENAME usocket)) DEPENDENCIES (alexandria bordeaux-threads ironclad lack lack-component - lack-middleware-backtrace lack-util uiop) - VERSION 20191007-git SIBLINGS + lack-middleware-backtrace lack-util split-sequence uiop usocket) + VERSION 20210411-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index ff8e7cc953..876681846c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "closer-mop"; - version = "20210228-git"; + version = "20210411-git"; description = "Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations."; deps = [ ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/closer-mop/2021-02-28/closer-mop-20210228-git.tgz"; - sha256 = "0x3rp2v84zzw5mhcxrgbq2kcb9gs4jn1l9rh4ylsnih89l9lqc6i"; + url = "http://beta.quicklisp.org/archive/closer-mop/2021-04-11/closer-mop-20210411-git.tgz"; + sha256 = "0pynql962m2z7wqnmd51a2xm3wsqvgfxcq9maw2br0zs0icys236"; }; packageName = "closer-mop"; @@ -20,7 +20,7 @@ rec { } /* (SYSTEM closer-mop DESCRIPTION Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations. - SHA256 0x3rp2v84zzw5mhcxrgbq2kcb9gs4jn1l9rh4ylsnih89l9lqc6i URL - http://beta.quicklisp.org/archive/closer-mop/2021-02-28/closer-mop-20210228-git.tgz - MD5 49c0004ff21157bc99f227cecf7b6025 NAME closer-mop FILENAME closer-mop - DEPS NIL DEPENDENCIES NIL VERSION 20210228-git SIBLINGS NIL PARASITES NIL) */ + SHA256 0pynql962m2z7wqnmd51a2xm3wsqvgfxcq9maw2br0zs0icys236 URL + http://beta.quicklisp.org/archive/closer-mop/2021-04-11/closer-mop-20210411-git.tgz + MD5 05b05d98ad294f8bd6f9779d04cc848a NAME closer-mop FILENAME closer-mop + DEPS NIL DEPENDENCIES NIL VERSION 20210411-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index b7b7cf0ead..b035477eda 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "dexador"; - version = "20210228-git"; + version = "20210411-git"; description = "Yet another HTTP client for Common Lisp"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/dexador/2021-02-28/dexador-20210228-git.tgz"; - sha256 = "0glzvi7nbr58izpwr8xzxvlcc78zmgwqaik374rmcy6w89q5ksw7"; + url = "http://beta.quicklisp.org/archive/dexador/2021-04-11/dexador-20210411-git.tgz"; + sha256 = "1px4llzb6x930cq3dmrkzidydqqc8rd2y4s3nlwpsrv4874cxwx1"; }; packageName = "dexador"; @@ -19,9 +19,9 @@ rec { overrides = x: x; } /* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 - 0glzvi7nbr58izpwr8xzxvlcc78zmgwqaik374rmcy6w89q5ksw7 URL - http://beta.quicklisp.org/archive/dexador/2021-02-28/dexador-20210228-git.tgz - MD5 e3b69c8ceb78d99351e574c40dfd0e12 NAME dexador FILENAME dexador DEPS + 1px4llzb6x930cq3dmrkzidydqqc8rd2y4s3nlwpsrv4874cxwx1 URL + http://beta.quicklisp.org/archive/dexador/2021-04-11/dexador-20210411-git.tgz + MD5 10d59691af3e25e590a2dfff29c91292 NAME dexador FILENAME dexador DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -48,4 +48,4 @@ rec { fast-http fast-io flexi-streams local-time proc-parse quri smart-buffer split-sequence static-vectors trivial-features trivial-garbage trivial-gray-streams trivial-mimes usocket xsubseq) - VERSION 20210228-git SIBLINGS (dexador-test) PARASITES NIL) */ + VERSION 20210411-git SIBLINGS (dexador-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/file-attributes.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/file-attributes.nix index c6bb4c1baa..6af2f0f24f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/file-attributes.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/file-attributes.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "file-attributes"; - version = "20200925-git"; + version = "20210411-git"; description = "Access to file attributes (uid, gid, atime, mtime, mod)"; deps = [ args."alexandria" args."babel" args."cffi" args."documentation-utils" args."trivial-features" args."trivial-indent" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/file-attributes/2020-09-25/file-attributes-20200925-git.tgz"; - sha256 = "0wq3gs36zwl8dzknj3c794l60vg1zpf0siwhd7ad9pn81v3mdan7"; + url = "http://beta.quicklisp.org/archive/file-attributes/2021-04-11/file-attributes-20210411-git.tgz"; + sha256 = "0zsqimyzfivr08d6pdg6xxw6cj7q9pjh2wi9c460nh85z7a51yc9"; }; packageName = "file-attributes"; @@ -20,9 +20,9 @@ rec { } /* (SYSTEM file-attributes DESCRIPTION Access to file attributes (uid, gid, atime, mtime, mod) SHA256 - 0wq3gs36zwl8dzknj3c794l60vg1zpf0siwhd7ad9pn81v3mdan7 URL - http://beta.quicklisp.org/archive/file-attributes/2020-09-25/file-attributes-20200925-git.tgz - MD5 368468453cf57ecc29fa75f2a030a738 NAME file-attributes FILENAME + 0zsqimyzfivr08d6pdg6xxw6cj7q9pjh2wi9c460nh85z7a51yc9 URL + http://beta.quicklisp.org/archive/file-attributes/2021-04-11/file-attributes-20210411-git.tgz + MD5 75e0f0e2c280c97fe496545e7105fa01 NAME file-attributes FILENAME file-attributes DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) @@ -31,4 +31,4 @@ rec { (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (alexandria babel cffi documentation-utils trivial-features trivial-indent) - VERSION 20200925-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20210411-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl.nix new file mode 100644 index 0000000000..04750febab --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl.nix @@ -0,0 +1,56 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "generic-cl"; + version = "20201220-git"; + + parasites = [ "generic-cl/test" ]; + + description = "Standard Common Lisp functions implemented using generic functions."; + + deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-ansi-text" args."cl-colors" args."cl-custom-hash-table" args."cl-environments" args."cl-ppcre" args."closer-mop" args."collectors" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."prove" args."prove-asdf" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/generic-cl/2020-12-20/generic-cl-20201220-git.tgz"; + sha256 = "02awl64bfykkasv3z9xpiiwq3v9vgcacqagbwvigqdk15hqrknyl"; + }; + + packageName = "generic-cl"; + + asdFilesToKeep = ["generic-cl.asd"]; + overrides = x: x; +} +/* (SYSTEM generic-cl DESCRIPTION + Standard Common Lisp functions implemented using generic functions. SHA256 + 02awl64bfykkasv3z9xpiiwq3v9vgcacqagbwvigqdk15hqrknyl URL + http://beta.quicklisp.org/archive/generic-cl/2020-12-20/generic-cl-20201220-git.tgz + MD5 76aa19981d3addb9a741fd4705d5d3ff NAME generic-cl FILENAME generic-cl + DEPS + ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) + (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) + (NAME cl-ansi-text FILENAME cl-ansi-text) + (NAME cl-colors FILENAME cl-colors) + (NAME cl-custom-hash-table FILENAME cl-custom-hash-table) + (NAME cl-environments FILENAME cl-environments) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME closer-mop FILENAME closer-mop) + (NAME collectors FILENAME collectors) + (NAME introspect-environment FILENAME introspect-environment) + (NAME iterate FILENAME iterate) + (NAME lisp-namespace FILENAME lisp-namespace) + (NAME optima FILENAME optima) (NAME prove FILENAME prove) + (NAME prove-asdf FILENAME prove-asdf) + (NAME static-dispatch FILENAME static-dispatch) + (NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia) + (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) + (NAME trivia.level0 FILENAME trivia_dot_level0) + (NAME trivia.level1 FILENAME trivia_dot_level1) + (NAME trivia.level2 FILENAME trivia_dot_level2) + (NAME trivia.trivial FILENAME trivia_dot_trivial) + (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) + DEPENDENCIES + (agutil alexandria anaphora arrows cl-ansi-text cl-colors + cl-custom-hash-table cl-environments cl-ppcre closer-mop collectors + introspect-environment iterate lisp-namespace optima prove prove-asdf + static-dispatch symbol-munger trivia trivia.balland2006 trivia.level0 + trivia.level1 trivia.level2 trivia.trivial trivial-cltl2 type-i) + VERSION 20201220-git SIBLINGS (generic-cl.util) PARASITES (generic-cl/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index c511435ac9..b6f602387e 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "ironclad"; - version = "v0.54"; + version = "v0.55"; parasites = [ "ironclad/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."rt" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/ironclad/2021-01-24/ironclad-v0.54.tgz"; - sha256 = "01mpsnjx8cgn3wx2n0dkv8v83z93da9zrxncn58ghbpyq3z1i4w2"; + url = "http://beta.quicklisp.org/archive/ironclad/2021-04-11/ironclad-v0.55.tgz"; + sha256 = "0vdqaad9i3dkz6z2y1iqmh6m77kc9jy49xh9bysgywl0gfdyhnq6"; }; packageName = "ironclad"; @@ -22,10 +22,10 @@ rec { } /* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 - 01mpsnjx8cgn3wx2n0dkv8v83z93da9zrxncn58ghbpyq3z1i4w2 URL - http://beta.quicklisp.org/archive/ironclad/2021-01-24/ironclad-v0.54.tgz - MD5 f99610509e4603aac66d9aa03ede2770 NAME ironclad FILENAME ironclad DEPS + 0vdqaad9i3dkz6z2y1iqmh6m77kc9jy49xh9bysgywl0gfdyhnq6 URL + http://beta.quicklisp.org/archive/ironclad/2021-04-11/ironclad-v0.55.tgz + MD5 c3c4a88e71ef37c9604662071069afcc NAME ironclad FILENAME ironclad DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME rt FILENAME rt)) - DEPENDENCIES (alexandria bordeaux-threads rt) VERSION v0.54 SIBLINGS + DEPENDENCIES (alexandria bordeaux-threads rt) VERSION v0.55 SIBLINGS (ironclad-text) PARASITES (ironclad/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix index e9e5ed5f1d..e935d2b3d9 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "marshal"; - version = "cl-20201016-git"; + version = "cl-20210411-git"; description = "marshal: Simple (de)serialization of Lisp datastructures."; deps = [ ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz"; - sha256 = "03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz"; + url = "http://beta.quicklisp.org/archive/cl-marshal/2021-04-11/cl-marshal-20210411-git.tgz"; + sha256 = "0wi4csgl5qxgl0si5mcg19xx4qlmw125qn0w1i2f3dvvrzp20qrp"; }; packageName = "marshal"; @@ -20,8 +20,8 @@ rec { } /* (SYSTEM marshal DESCRIPTION marshal: Simple (de)serialization of Lisp datastructures. SHA256 - 03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz URL - http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz - MD5 243a2c3a5f1243ffb1639bca32a0aff0 NAME marshal FILENAME marshal DEPS NIL - DEPENDENCIES NIL VERSION cl-20201016-git SIBLINGS (marshal-tests) PARASITES + 0wi4csgl5qxgl0si5mcg19xx4qlmw125qn0w1i2f3dvvrzp20qrp URL + http://beta.quicklisp.org/archive/cl-marshal/2021-04-11/cl-marshal-20210411-git.tgz + MD5 2463314a6bcd1a18bea2690deb6bce55 NAME marshal FILENAME marshal DEPS NIL + DEPENDENCIES NIL VERSION cl-20210411-git SIBLINGS (marshal-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix index 53896192b5..c22acbce4f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "mgl-pax"; - version = "20210228-git"; + version = "20210411-git"; parasites = [ "mgl-pax/test" ]; @@ -12,8 +12,8 @@ rec { deps = [ args."_3bmd" args."_3bmd-ext-code-blocks" args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."colorize" args."esrap" args."html-encode" args."ironclad" args."named-readtables" args."pythonic-string-reader" args."split-sequence" args."swank" args."trivial-features" args."trivial-with-current-source-form" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/mgl-pax/2021-02-28/mgl-pax-20210228-git.tgz"; - sha256 = "1dyhbnd69lb6ih89pvg8nn6pwsg25v5xjsfk1i5l1fdib14612cw"; + url = "http://beta.quicklisp.org/archive/mgl-pax/2021-04-11/mgl-pax-20210411-git.tgz"; + sha256 = "0dq5jkb6li0s1gqj6hfhifs6cd4kypavv2kjqg5zgs6zfs82sxh3"; }; packageName = "mgl-pax"; @@ -23,9 +23,9 @@ rec { } /* (SYSTEM mgl-pax DESCRIPTION Exploratory programming tool and documentation generator. - SHA256 1dyhbnd69lb6ih89pvg8nn6pwsg25v5xjsfk1i5l1fdib14612cw URL - http://beta.quicklisp.org/archive/mgl-pax/2021-02-28/mgl-pax-20210228-git.tgz - MD5 a256ce4ee76d669d233ee09830ef7968 NAME mgl-pax FILENAME mgl-pax DEPS + SHA256 0dq5jkb6li0s1gqj6hfhifs6cd4kypavv2kjqg5zgs6zfs82sxh3 URL + http://beta.quicklisp.org/archive/mgl-pax/2021-04-11/mgl-pax-20210411-git.tgz + MD5 44cf1bd71e6c40c256a43a87efa2c2a1 NAME mgl-pax FILENAME mgl-pax DEPS ((NAME 3bmd FILENAME _3bmd) (NAME 3bmd-ext-code-blocks FILENAME _3bmd-ext-code-blocks) (NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) @@ -44,4 +44,4 @@ rec { colorize esrap html-encode ironclad named-readtables pythonic-string-reader split-sequence swank trivial-features trivial-with-current-source-form) - VERSION 20210228-git SIBLINGS NIL PARASITES (mgl-pax/test)) */ + VERSION 20210411-git SIBLINGS NIL PARASITES (mgl-pax/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index ef0817fbe7..fa7d1e047d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "plump"; - version = "20210124-git"; + version = "20210411-git"; description = "An XML / XHTML / HTML parser that aims to be as lenient as possible."; deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/plump/2021-01-24/plump-20210124-git.tgz"; - sha256 = "0br64xiz4mgmmsvkfmi43k2q16rmc6hbqf976x8cdafs3h266jdm"; + url = "http://beta.quicklisp.org/archive/plump/2021-04-11/plump-20210411-git.tgz"; + sha256 = "05zs9blznfhapz5yiy08968hw64rzdgqgvfgc9r9da45b45pl6dp"; }; packageName = "plump"; @@ -20,11 +20,11 @@ rec { } /* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 - 0br64xiz4mgmmsvkfmi43k2q16rmc6hbqf976x8cdafs3h266jdm URL - http://beta.quicklisp.org/archive/plump/2021-01-24/plump-20210124-git.tgz - MD5 44a5d371dd1c3d4afc6b8801926b059a NAME plump FILENAME plump DEPS + 05zs9blznfhapz5yiy08968hw64rzdgqgvfgc9r9da45b45pl6dp URL + http://beta.quicklisp.org/archive/plump/2021-04-11/plump-20210411-git.tgz + MD5 055e30ed07ae793426a48b55c947f9bb NAME plump FILENAME plump DEPS ((NAME array-utils FILENAME array-utils) (NAME documentation-utils FILENAME documentation-utils) (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION - 20210124-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ + 20210411-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix index f530d71eb6..245cb109a3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "postmodern"; - version = "20210124-git"; + version = "20210411-git"; parasites = [ "postmodern/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_plus_local-time" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."flexi-streams" args."global-vars" args."ironclad" args."local-time" args."md5" args."s-sql" args."s-sql_slash_tests" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz"; - sha256 = "1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc"; + url = "http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz"; + sha256 = "0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw"; }; packageName = "postmodern"; @@ -21,9 +21,9 @@ rec { overrides = x: x; } /* (SYSTEM postmodern DESCRIPTION PostgreSQL programming API SHA256 - 1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc URL - http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz - MD5 05c2c5f4d2354a5fa69a32b7b96f8ff8 NAME postmodern FILENAME postmodern + 0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw URL + http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz + MD5 8a75a05ba9e371f672f2620d40724cb2 NAME postmodern FILENAME postmodern DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -46,5 +46,5 @@ rec { cl-postgres/tests cl-ppcre cl-unicode closer-mop fiveam flexi-streams global-vars ironclad local-time md5 s-sql s-sql/tests simple-date simple-date/postgres-glue split-sequence uax-15 usocket) - VERSION 20210124-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES + VERSION 20210411-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES (postmodern/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix index 12ea17a349..48d98ca239 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "quri"; - version = "20210228-git"; + version = "20210411-git"; description = "Yet another URI library for Common Lisp"; deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/quri/2021-02-28/quri-20210228-git.tgz"; - sha256 = "03hq6x715kv37c089b73f6j8b0f4ywhxr37wbw9any2jcgrswx0g"; + url = "http://beta.quicklisp.org/archive/quri/2021-04-11/quri-20210411-git.tgz"; + sha256 = "1j4al77bl8awj7755g8zvgvfskdh6gcl3gygbz2fi6lrrk9125d7"; }; packageName = "quri"; @@ -19,13 +19,13 @@ rec { overrides = x: x; } /* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256 - 03hq6x715kv37c089b73f6j8b0f4ywhxr37wbw9any2jcgrswx0g URL - http://beta.quicklisp.org/archive/quri/2021-02-28/quri-20210228-git.tgz MD5 - 67eac028850cc2539c076d31b049f7bd NAME quri FILENAME quri DEPS + 1j4al77bl8awj7755g8zvgvfskdh6gcl3gygbz2fi6lrrk9125d7 URL + http://beta.quicklisp.org/archive/quri/2021-04-11/quri-20210411-git.tgz MD5 + 2727c706f51bef480171c59f6134bba5 NAME quri FILENAME quri DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-utilities FILENAME cl-utilities) (NAME split-sequence FILENAME split-sequence) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cl-utilities split-sequence trivial-features) VERSION - 20210228-git SIBLINGS (quri-test) PARASITES NIL) */ + 20210411-git SIBLINGS (quri-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix index d6ac95810a..d91ab87d82 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "s-sql"; - version = "postmodern-20210124-git"; + version = "postmodern-20210411-git"; parasites = [ "s-sql/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."global-vars" args."ironclad" args."md5" args."postmodern" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz"; - sha256 = "1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc"; + url = "http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz"; + sha256 = "0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw"; }; packageName = "s-sql"; @@ -21,9 +21,9 @@ rec { overrides = x: x; } /* (SYSTEM s-sql DESCRIPTION Lispy DSL for SQL SHA256 - 1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc URL - http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz - MD5 05c2c5f4d2354a5fa69a32b7b96f8ff8 NAME s-sql FILENAME s-sql DEPS + 0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw URL + http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz + MD5 8a75a05ba9e371f672f2620d40724cb2 NAME s-sql FILENAME s-sql DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-base64 FILENAME cl-base64) @@ -39,5 +39,5 @@ rec { (alexandria bordeaux-threads cl-base64 cl-postgres cl-postgres/tests cl-ppcre cl-unicode closer-mop fiveam global-vars ironclad md5 postmodern split-sequence uax-15 usocket) - VERSION postmodern-20210124-git SIBLINGS + VERSION postmodern-20210411-git SIBLINGS (cl-postgres postmodern simple-date) PARASITES (s-sql/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix index cab4e8c149..e97a639814 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "serapeum"; - version = "20210228-git"; + version = "20210411-git"; description = "Utilities beyond Alexandria."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."global-vars" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."parse-declarations-1_dot_0" args."parse-number" args."split-sequence" args."string-case" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."trivial-features" args."trivial-file-size" args."trivial-garbage" args."trivial-macroexpand-all" args."type-i" args."uiop" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/serapeum/2021-02-28/serapeum-20210228-git.tgz"; - sha256 = "1dici8bmvrx5h74disrlvwns8f8jl746i4cyzyclswhv208x2m3x"; + url = "http://beta.quicklisp.org/archive/serapeum/2021-04-11/serapeum-20210411-git.tgz"; + sha256 = "1zz0sjp2dwy7qg7a3h1asvflkl9z2ajwk9zqfqylm0mhl0mv2c01"; }; packageName = "serapeum"; @@ -19,9 +19,9 @@ rec { overrides = x: x; } /* (SYSTEM serapeum DESCRIPTION Utilities beyond Alexandria. SHA256 - 1dici8bmvrx5h74disrlvwns8f8jl746i4cyzyclswhv208x2m3x URL - http://beta.quicklisp.org/archive/serapeum/2021-02-28/serapeum-20210228-git.tgz - MD5 25502093ea13851021422000686a54b7 NAME serapeum FILENAME serapeum DEPS + 1zz0sjp2dwy7qg7a3h1asvflkl9z2ajwk9zqfqylm0mhl0mv2c01 URL + http://beta.quicklisp.org/archive/serapeum/2021-04-11/serapeum-20210411-git.tgz + MD5 091a7c572d48164ba8499bb44a37a85f NAME serapeum FILENAME serapeum DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME closer-mop FILENAME closer-mop) @@ -60,4 +60,4 @@ rec { trivia.level2 trivia.quasiquote trivia.trivial trivial-cltl2 trivial-features trivial-file-size trivial-garbage trivial-macroexpand-all type-i uiop) - VERSION 20210228-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20210411-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index d861d72ccc..efe7f6a9ee 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "simple-date"; - version = "postmodern-20210124-git"; + version = "postmodern-20210411-git"; parasites = [ "simple-date/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."fiveam" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz"; - sha256 = "1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc"; + url = "http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz"; + sha256 = "0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw"; }; packageName = "simple-date"; @@ -22,9 +22,9 @@ rec { } /* (SYSTEM simple-date DESCRIPTION Simple date library that can be used with postmodern SHA256 - 1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc URL - http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz - MD5 05c2c5f4d2354a5fa69a32b7b96f8ff8 NAME simple-date FILENAME simple-date + 0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw URL + http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz + MD5 8a75a05ba9e371f672f2620d40724cb2 NAME simple-date FILENAME simple-date DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) VERSION - postmodern-20210124-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES + postmodern-20210411-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES (simple-date/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-dispatch.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-dispatch.nix new file mode 100644 index 0000000000..040bf87d30 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-dispatch.nix @@ -0,0 +1,55 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "static-dispatch"; + version = "20210411-git"; + + parasites = [ "static-dispatch/test" ]; + + description = "Static generic function dispatch for Common Lisp."; + + deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-ansi-text" args."cl-colors" args."cl-environments" args."cl-interpol" args."closer-mop" args."collectors" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."prove" args."prove-asdf" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/static-dispatch/2021-04-11/static-dispatch-20210411-git.tgz"; + sha256 = "0dqkapripvb5qrhpim1b5y2ymn99s2zcwf38vmqyiqk3n3hvjjh1"; + }; + + packageName = "static-dispatch"; + + asdFilesToKeep = ["static-dispatch.asd"]; + overrides = x: x; +} +/* (SYSTEM static-dispatch DESCRIPTION + Static generic function dispatch for Common Lisp. SHA256 + 0dqkapripvb5qrhpim1b5y2ymn99s2zcwf38vmqyiqk3n3hvjjh1 URL + http://beta.quicklisp.org/archive/static-dispatch/2021-04-11/static-dispatch-20210411-git.tgz + MD5 7af665c6a3a1aa3315fe0a651ca559de NAME static-dispatch FILENAME + static-dispatch DEPS + ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) + (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) + (NAME cl-ansi-text FILENAME cl-ansi-text) + (NAME cl-colors FILENAME cl-colors) + (NAME cl-environments FILENAME cl-environments) + (NAME cl-interpol FILENAME cl-interpol) + (NAME closer-mop FILENAME closer-mop) + (NAME collectors FILENAME collectors) + (NAME introspect-environment FILENAME introspect-environment) + (NAME iterate FILENAME iterate) + (NAME lisp-namespace FILENAME lisp-namespace) + (NAME optima FILENAME optima) (NAME prove FILENAME prove) + (NAME prove-asdf FILENAME prove-asdf) + (NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia) + (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) + (NAME trivia.level0 FILENAME trivia_dot_level0) + (NAME trivia.level1 FILENAME trivia_dot_level1) + (NAME trivia.level2 FILENAME trivia_dot_level2) + (NAME trivia.trivial FILENAME trivia_dot_trivial) + (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) + DEPENDENCIES + (agutil alexandria anaphora arrows cl-ansi-text cl-colors cl-environments + cl-interpol closer-mop collectors introspect-environment iterate + lisp-namespace optima prove prove-asdf symbol-munger trivia + trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 + trivia.trivial trivial-cltl2 type-i) + VERSION 20210411-git SIBLINGS NIL PARASITES (static-dispatch/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix index b352c476e0..11ddf729c3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "str"; - version = "cl-20210124-git"; + version = "cl-20210411-git"; description = "Modern, consistent and terse Common Lisp string manipulation library."; deps = [ args."cl-change-case" args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-str/2021-01-24/cl-str-20210124-git.tgz"; - sha256 = "07y24mx8gmhwz6px63llgsz15aqicqa4m8gd5zwxy708xggv73jc"; + url = "http://beta.quicklisp.org/archive/cl-str/2021-04-11/cl-str-20210411-git.tgz"; + sha256 = "0xyazb3j4j0wsq443fpavv4hxnizkcvhkgz709lnp7cxygpdnl7m"; }; packageName = "str"; @@ -20,9 +20,9 @@ rec { } /* (SYSTEM str DESCRIPTION Modern, consistent and terse Common Lisp string manipulation library. - SHA256 07y24mx8gmhwz6px63llgsz15aqicqa4m8gd5zwxy708xggv73jc URL - http://beta.quicklisp.org/archive/cl-str/2021-01-24/cl-str-20210124-git.tgz - MD5 afd5d3e1078bef872b0507215855397e NAME str FILENAME str DEPS + SHA256 0xyazb3j4j0wsq443fpavv4hxnizkcvhkgz709lnp7cxygpdnl7m URL + http://beta.quicklisp.org/archive/cl-str/2021-04-11/cl-str-20210411-git.tgz + MD5 6c6b4de0886d448155a5cca0dd38a189 NAME str FILENAME str DEPS ((NAME cl-change-case FILENAME cl-change-case) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-ppcre-unicode FILENAME cl-ppcre-unicode) @@ -30,4 +30,4 @@ rec { (NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (cl-change-case cl-ppcre cl-ppcre-unicode cl-unicode flexi-streams) VERSION - cl-20210124-git SIBLINGS (str.test) PARASITES NIL) */ + cl-20210411-git SIBLINGS (str.test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index f59a9d34e3..13b025ea5b 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "stumpwm"; - version = "20210228-git"; + version = "20210411-git"; description = "A tiling, keyboard driven window manager"; deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/stumpwm/2021-02-28/stumpwm-20210228-git.tgz"; - sha256 = "0vfhn90vfyhlbjkfkzx0i7i6qh79p9q4c4hhsym80niz508xw5v8"; + url = "http://beta.quicklisp.org/archive/stumpwm/2021-04-11/stumpwm-20210411-git.tgz"; + sha256 = "0rrhmryfgbjrl04ww107pvm4lzm620xp7a5kwhqbh5d7hpbdk49j"; }; packageName = "stumpwm"; @@ -19,10 +19,10 @@ rec { overrides = x: x; } /* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 - 0vfhn90vfyhlbjkfkzx0i7i6qh79p9q4c4hhsym80niz508xw5v8 URL - http://beta.quicklisp.org/archive/stumpwm/2021-02-28/stumpwm-20210228-git.tgz - MD5 0506bcd0951463ea45cebfdb5ce76511 NAME stumpwm FILENAME stumpwm DEPS + 0rrhmryfgbjrl04ww107pvm4lzm620xp7a5kwhqbh5d7hpbdk49j URL + http://beta.quicklisp.org/archive/stumpwm/2021-04-11/stumpwm-20210411-git.tgz + MD5 4497670e2aac3038ed5fb87121ff1b7a NAME stumpwm FILENAME stumpwm DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) (NAME clx FILENAME clx)) - DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20210228-git SIBLINGS + DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20210411-git SIBLINGS (stumpwm-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix index b8c330cc2f..7f1077ed0c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "trivia"; - version = "20210228-git"; + version = "20210411-git"; description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase"; deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; - sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; + url = "http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz"; + sha256 = "1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8"; }; packageName = "trivia"; @@ -20,9 +20,9 @@ rec { } /* (SYSTEM trivia DESCRIPTION NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase - SHA256 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL - http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz - MD5 b374212a63c1e3b7e5c0e26348516106 NAME trivia FILENAME trivia DEPS + SHA256 1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8 URL + http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz + MD5 3fde6243390481d089cda082573876f6 NAME trivia FILENAME trivia DEPS ((NAME alexandria FILENAME alexandria) (NAME closer-mop FILENAME closer-mop) (NAME introspect-environment FILENAME introspect-environment) @@ -38,7 +38,7 @@ rec { (alexandria closer-mop introspect-environment iterate lisp-namespace trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 trivia.trivial trivial-cltl2 type-i) - VERSION 20210228-git SIBLINGS + VERSION 20210411-git SIBLINGS (trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix index 801781dd5a..ce47f1d3df 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "trivia_dot_balland2006"; - version = "trivia-20210228-git"; + version = "trivia-20210411-git"; description = "Optimizer for Trivia based on (Balland 2006)"; deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; - sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; + url = "http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz"; + sha256 = "1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8"; }; packageName = "trivia.balland2006"; @@ -20,9 +20,9 @@ rec { } /* (SYSTEM trivia.balland2006 DESCRIPTION Optimizer for Trivia based on (Balland 2006) SHA256 - 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL - http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz - MD5 b374212a63c1e3b7e5c0e26348516106 NAME trivia.balland2006 FILENAME + 1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8 URL + http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz + MD5 3fde6243390481d089cda082573876f6 NAME trivia.balland2006 FILENAME trivia_dot_balland2006 DEPS ((NAME alexandria FILENAME alexandria) (NAME closer-mop FILENAME closer-mop) @@ -38,7 +38,7 @@ rec { (alexandria closer-mop introspect-environment iterate lisp-namespace trivia.level0 trivia.level1 trivia.level2 trivia.trivial trivial-cltl2 type-i) - VERSION trivia-20210228-git SIBLINGS + VERSION trivia-20210411-git SIBLINGS (trivia trivia.benchmark trivia.cffi trivia.level0 trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix index 327ac0cdf1..cfa992935f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "trivia_dot_level0"; - version = "trivia-20210228-git"; + version = "trivia-20210411-git"; description = "Bootstrapping Pattern Matching Library for implementing Trivia"; deps = [ args."alexandria" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; - sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; + url = "http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz"; + sha256 = "1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8"; }; packageName = "trivia.level0"; @@ -20,11 +20,11 @@ rec { } /* (SYSTEM trivia.level0 DESCRIPTION Bootstrapping Pattern Matching Library for implementing Trivia SHA256 - 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL - http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz - MD5 b374212a63c1e3b7e5c0e26348516106 NAME trivia.level0 FILENAME + 1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8 URL + http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz + MD5 3fde6243390481d089cda082573876f6 NAME trivia.level0 FILENAME trivia_dot_level0 DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES - (alexandria) VERSION trivia-20210228-git SIBLINGS + (alexandria) VERSION trivia-20210411-git SIBLINGS (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix index eecb4c17ea..5cadfcf572 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "trivia_dot_level1"; - version = "trivia-20210228-git"; + version = "trivia-20210411-git"; description = "Core patterns of Trivia"; deps = [ args."alexandria" args."trivia_dot_level0" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; - sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; + url = "http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz"; + sha256 = "1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8"; }; packageName = "trivia.level1"; @@ -19,13 +19,13 @@ rec { overrides = x: x; } /* (SYSTEM trivia.level1 DESCRIPTION Core patterns of Trivia SHA256 - 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL - http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz - MD5 b374212a63c1e3b7e5c0e26348516106 NAME trivia.level1 FILENAME + 1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8 URL + http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz + MD5 3fde6243390481d089cda082573876f6 NAME trivia.level1 FILENAME trivia_dot_level1 DEPS ((NAME alexandria FILENAME alexandria) (NAME trivia.level0 FILENAME trivia_dot_level0)) - DEPENDENCIES (alexandria trivia.level0) VERSION trivia-20210228-git + DEPENDENCIES (alexandria trivia.level0) VERSION trivia-20210411-git SIBLINGS (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix index ec0d99e06b..9e8ceca1ee 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "trivia_dot_level2"; - version = "trivia-20210228-git"; + version = "trivia-20210411-git"; description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase"; deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivial-cltl2" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; - sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; + url = "http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz"; + sha256 = "1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8"; }; packageName = "trivia.level2"; @@ -20,9 +20,9 @@ rec { } /* (SYSTEM trivia.level2 DESCRIPTION NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase - SHA256 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL - http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz - MD5 b374212a63c1e3b7e5c0e26348516106 NAME trivia.level2 FILENAME + SHA256 1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8 URL + http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz + MD5 3fde6243390481d089cda082573876f6 NAME trivia.level2 FILENAME trivia_dot_level2 DEPS ((NAME alexandria FILENAME alexandria) (NAME closer-mop FILENAME closer-mop) @@ -33,7 +33,7 @@ rec { DEPENDENCIES (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1 trivial-cltl2) - VERSION trivia-20210228-git SIBLINGS + VERSION trivia-20210411-git SIBLINGS (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 trivia.level1 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix index 420e4ae305..bf6b1fb354 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "trivia_dot_quasiquote"; - version = "trivia-20210228-git"; + version = "trivia-20210411-git"; description = "fare-quasiquote extension for trivia"; deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; - sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; + url = "http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz"; + sha256 = "1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8"; }; packageName = "trivia.quasiquote"; @@ -19,9 +19,9 @@ rec { overrides = x: x; } /* (SYSTEM trivia.quasiquote DESCRIPTION fare-quasiquote extension for trivia - SHA256 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL - http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz - MD5 b374212a63c1e3b7e5c0e26348516106 NAME trivia.quasiquote FILENAME + SHA256 1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8 URL + http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz + MD5 3fde6243390481d089cda082573876f6 NAME trivia.quasiquote FILENAME trivia_dot_quasiquote DEPS ((NAME alexandria FILENAME alexandria) (NAME closer-mop FILENAME closer-mop) @@ -39,7 +39,7 @@ rec { (alexandria closer-mop fare-quasiquote fare-quasiquote-readtable fare-utils lisp-namespace named-readtables trivia.level0 trivia.level1 trivia.level2 trivia.trivial trivial-cltl2) - VERSION trivia-20210228-git SIBLINGS + VERSION trivia-20210411-git SIBLINGS (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 trivia.level1 trivia.level2 trivia.ppcre trivia.test trivia.trivial) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix index 1173a24c8c..3fe1ddbd06 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "trivia_dot_trivial"; - version = "trivia-20210228-git"; + version = "trivia-20210411-git"; description = "Base level system of Trivia with a trivial optimizer. Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system, @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivial-cltl2" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; - sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; + url = "http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz"; + sha256 = "1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8"; }; packageName = "trivia.trivial"; @@ -24,9 +24,9 @@ rec { Base level system of Trivia with a trivial optimizer. Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system, in order to avoid the circular dependency. - SHA256 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL - http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz - MD5 b374212a63c1e3b7e5c0e26348516106 NAME trivia.trivial FILENAME + SHA256 1dy35yhjhzcqsq5rwsan1f9x2ss8wcw55n2jzzgymj1vqvzp5mn8 URL + http://beta.quicklisp.org/archive/trivia/2021-04-11/trivia-20210411-git.tgz + MD5 3fde6243390481d089cda082573876f6 NAME trivia.trivial FILENAME trivia_dot_trivial DEPS ((NAME alexandria FILENAME alexandria) (NAME closer-mop FILENAME closer-mop) @@ -38,7 +38,7 @@ rec { DEPENDENCIES (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1 trivia.level2 trivial-cltl2) - VERSION trivia-20210228-git SIBLINGS + VERSION trivia-20210411-git SIBLINGS (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-arguments.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-arguments.nix new file mode 100644 index 0000000000..9444b0b690 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-arguments.nix @@ -0,0 +1,27 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "trivial-arguments"; + version = "20200925-git"; + + description = "A simple library to retrieve the lambda-list of a function."; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/trivial-arguments/2020-09-25/trivial-arguments-20200925-git.tgz"; + sha256 = "079xm6f1vmsng7dzgb2x3m7k46jfw19wskwf1l5cid5nm267d295"; + }; + + packageName = "trivial-arguments"; + + asdFilesToKeep = ["trivial-arguments.asd"]; + overrides = x: x; +} +/* (SYSTEM trivial-arguments DESCRIPTION + A simple library to retrieve the lambda-list of a function. SHA256 + 079xm6f1vmsng7dzgb2x3m7k46jfw19wskwf1l5cid5nm267d295 URL + http://beta.quicklisp.org/archive/trivial-arguments/2020-09-25/trivial-arguments-20200925-git.tgz + MD5 3d7b76a729b272019c8827e40bfb6db8 NAME trivial-arguments FILENAME + trivial-arguments DEPS NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS + NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix index 272361dadc..e762613bf0 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -2,15 +2,15 @@ args @ { fetchurl, ... }: rec { baseName = "trivial-features"; - version = "20210228-git"; + version = "20210411-git"; description = "Ensures consistent *FEATURES* across multiple CLs."; deps = [ ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-features/2021-02-28/trivial-features-20210228-git.tgz"; - sha256 = "1najk88r8nlpbxm8mjfj8b22f9chr9h2hxg9wqz87kkmhg4rfwwj"; + url = "http://beta.quicklisp.org/archive/trivial-features/2021-04-11/trivial-features-20210411-git.tgz"; + sha256 = "0z6nzql8z7bz8kzd08mh36h0r54vqx7pwigy8r617jhvb0r0n0n4"; }; packageName = "trivial-features"; @@ -20,8 +20,8 @@ rec { } /* (SYSTEM trivial-features DESCRIPTION Ensures consistent *FEATURES* across multiple CLs. SHA256 - 1najk88r8nlpbxm8mjfj8b22f9chr9h2hxg9wqz87kkmhg4rfwwj URL - http://beta.quicklisp.org/archive/trivial-features/2021-02-28/trivial-features-20210228-git.tgz - MD5 6d628c0c941346773751a684213a52d7 NAME trivial-features FILENAME - trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20210228-git SIBLINGS + 0z6nzql8z7bz8kzd08mh36h0r54vqx7pwigy8r617jhvb0r0n0n4 URL + http://beta.quicklisp.org/archive/trivial-features/2021-04-11/trivial-features-20210411-git.tgz + MD5 5ec554fff48d38af5023604a1ae42d3a NAME trivial-features FILENAME + trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20210411-git SIBLINGS (trivial-features-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix index bbaf2de554..1e9decab32 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix @@ -2,7 +2,7 @@ args @ { fetchurl, ... }: rec { baseName = "utilities_dot_print-items"; - version = "20190813-git"; + version = "20210411-git"; parasites = [ "utilities.print-items/test" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = "http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz"; - sha256 = "12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2"; + url = "http://beta.quicklisp.org/archive/utilities.print-items/2021-04-11/utilities.print-items-20210411-git.tgz"; + sha256 = "0da2m4b993w31wph2ybdmdd6rycadrp44ccjdba5pygpkf3x00gx"; }; packageName = "utilities.print-items"; @@ -22,10 +22,10 @@ rec { } /* (SYSTEM utilities.print-items DESCRIPTION A protocol for flexible and composable printing. SHA256 - 12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2 URL - http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz - MD5 0f26580bb5d3587ed1815f70976b2a0a NAME utilities.print-items FILENAME + 0da2m4b993w31wph2ybdmdd6rycadrp44ccjdba5pygpkf3x00gx URL + http://beta.quicklisp.org/archive/utilities.print-items/2021-04-11/utilities.print-items-20210411-git.tgz + MD5 35be0e5ee4c957699082fb6ae8f14ef2 NAME utilities.print-items FILENAME utilities_dot_print-items DEPS ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria fiveam) VERSION 20190813-git SIBLINGS NIL + DEPENDENCIES (alexandria fiveam) VERSION 20210411-git SIBLINGS NIL PARASITES (utilities.print-items/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 628001000e..dbc57cb8d1 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -276,4 +276,7 @@ $out/lib/common-lisp/query-fs" (extraLispDeps (with quicklisp-to-nix-packages; [cl-syslog])); md5 = ifLispNotIn ["sbcl" "ccl" "gcl"] (extraLispDeps (with quicklisp-to-nix-packages; [flexi-streams])); + cl-gobject-introspection = addNativeLibs (with pkgs; [glib gobject-introspection]); + generic-cl = x: { parasites = []; }; + static-dispatch = x: { parasites = []; }; } diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 27eb3c90ed..6cbd7f4115 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -41,6 +41,7 @@ cl-emb cl-fad cl-fuse cl-fuse-meta-fs +cl-gobject-introspection cl-hooks cl-html-diff cl-html5-parser @@ -122,6 +123,7 @@ fiveam flexi-streams form-fiddle fset +generic-cl gettext http-body hu.dwim.asdf @@ -188,6 +190,7 @@ swank swap-bytes symbol-munger trivia +trivial-arguments trivial-backtrace trivial-clipboard trivial-features diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 1e0952aaba..ed8e87162c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -289,6 +289,80 @@ let quicklisp-to-nix-packages = rec { })); + "trivia_dot_quasiquote" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivia_dot_quasiquote" or (x: {})) + (import ./quicklisp-to-nix-output/trivia_dot_quasiquote.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; + "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; + "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + })); + + + "fare-quasiquote-readtable" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fare-quasiquote-readtable" or (x: {})) + (import ./quicklisp-to-nix-output/fare-quasiquote-readtable.nix { + inherit fetchurl; + "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; + "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + })); + + + "fare-quasiquote-optima" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fare-quasiquote-optima" or (x: {})) + (import ./quicklisp-to-nix-output/fare-quasiquote-optima.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; + "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; + "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + })); + + + "fare-quasiquote-extras" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fare-quasiquote-extras" or (x: {})) + (import ./quicklisp-to-nix-output/fare-quasiquote-extras.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; + "fare-quasiquote-optima" = quicklisp-to-nix-packages."fare-quasiquote-optima"; + "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; + "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + })); + + "type-i" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."type-i" or (x: {})) @@ -329,26 +403,6 @@ let quicklisp-to-nix-packages = rec { })); - "trivia_dot_quasiquote" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."trivia_dot_quasiquote" or (x: {})) - (import ./quicklisp-to-nix-output/trivia_dot_quasiquote.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "closer-mop" = quicklisp-to-nix-packages."closer-mop"; - "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; - "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; - "fare-utils" = quicklisp-to-nix-packages."fare-utils"; - "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; - "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; - "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; - "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; - "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; - })); - - "trivia_dot_level2" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivia_dot_level2" or (x: {})) @@ -401,6 +455,39 @@ let quicklisp-to-nix-packages = rec { })); + "static-dispatch" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."static-dispatch" or (x: {})) + (import ./quicklisp-to-nix-output/static-dispatch.nix { + inherit fetchurl; + "agutil" = quicklisp-to-nix-packages."agutil"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "arrows" = quicklisp-to-nix-packages."arrows"; + "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "cl-environments" = quicklisp-to-nix-packages."cl-environments"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "introspect-environment" = quicklisp-to-nix-packages."introspect-environment"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "optima" = quicklisp-to-nix-packages."optima"; + "prove" = quicklisp-to-nix-packages."prove"; + "prove-asdf" = quicklisp-to-nix-packages."prove-asdf"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivia" = quicklisp-to-nix-packages."trivia"; + "trivia_dot_balland2006" = quicklisp-to-nix-packages."trivia_dot_balland2006"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + "type-i" = quicklisp-to-nix-packages."type-i"; + })); + + "introspect-environment" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."introspect-environment" or (x: {})) @@ -409,57 +496,53 @@ let quicklisp-to-nix-packages = rec { })); - "fare-quasiquote-readtable" = buildLispPackage + "cl-environments" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."fare-quasiquote-readtable" or (x: {})) - (import ./quicklisp-to-nix-output/fare-quasiquote-readtable.nix { + (qlOverrides."cl-environments" or (x: {})) + (import ./quicklisp-to-nix-output/cl-environments.nix { inherit fetchurl; - "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; - "fare-utils" = quicklisp-to-nix-packages."fare-utils"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "optima" = quicklisp-to-nix-packages."optima"; + "prove" = quicklisp-to-nix-packages."prove"; + "prove-asdf" = quicklisp-to-nix-packages."prove-asdf"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; })); - "fare-quasiquote-optima" = buildLispPackage + "arrows" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."fare-quasiquote-optima" or (x: {})) - (import ./quicklisp-to-nix-output/fare-quasiquote-optima.nix { + (qlOverrides."arrows" or (x: {})) + (import ./quicklisp-to-nix-output/arrows.nix { inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "closer-mop" = quicklisp-to-nix-packages."closer-mop"; - "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; - "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; - "fare-utils" = quicklisp-to-nix-packages."fare-utils"; - "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; - "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; - "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; - "trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote"; - "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; - "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + "hu_dot_dwim_dot_stefil" = quicklisp-to-nix-packages."hu_dot_dwim_dot_stefil"; })); - "fare-quasiquote-extras" = buildLispPackage + "agutil" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."fare-quasiquote-extras" or (x: {})) - (import ./quicklisp-to-nix-output/fare-quasiquote-extras.nix { + (qlOverrides."agutil" or (x: {})) + (import ./quicklisp-to-nix-output/agutil.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "closer-mop" = quicklisp-to-nix-packages."closer-mop"; - "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; - "fare-quasiquote-optima" = quicklisp-to-nix-packages."fare-quasiquote-optima"; - "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; - "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + "introspect-environment" = quicklisp-to-nix-packages."introspect-environment"; + "iterate" = quicklisp-to-nix-packages."iterate"; "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "trivia" = quicklisp-to-nix-packages."trivia"; + "trivia_dot_balland2006" = quicklisp-to-nix-packages."trivia_dot_balland2006"; "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; - "trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote"; "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + "type-i" = quicklisp-to-nix-packages."type-i"; })); @@ -1556,6 +1639,14 @@ let quicklisp-to-nix-packages = rec { })); + "trivial-arguments" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-arguments" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-arguments.nix { + inherit fetchurl; + })); + + "trivia" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivia" or (x: {})) @@ -2414,6 +2505,41 @@ let quicklisp-to-nix-packages = rec { })); + "generic-cl" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."generic-cl" or (x: {})) + (import ./quicklisp-to-nix-output/generic-cl.nix { + inherit fetchurl; + "agutil" = quicklisp-to-nix-packages."agutil"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "arrows" = quicklisp-to-nix-packages."arrows"; + "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "cl-custom-hash-table" = quicklisp-to-nix-packages."cl-custom-hash-table"; + "cl-environments" = quicklisp-to-nix-packages."cl-environments"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "introspect-environment" = quicklisp-to-nix-packages."introspect-environment"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "optima" = quicklisp-to-nix-packages."optima"; + "prove" = quicklisp-to-nix-packages."prove"; + "prove-asdf" = quicklisp-to-nix-packages."prove-asdf"; + "static-dispatch" = quicklisp-to-nix-packages."static-dispatch"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivia" = quicklisp-to-nix-packages."trivia"; + "trivia_dot_balland2006" = quicklisp-to-nix-packages."trivia_dot_balland2006"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + "type-i" = quicklisp-to-nix-packages."type-i"; + })); + + "fset" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."fset" or (x: {})) @@ -3520,6 +3646,20 @@ let quicklisp-to-nix-packages = rec { })); + "cl-gobject-introspection" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-gobject-introspection" or (x: {})) + (import ./quicklisp-to-nix-output/cl-gobject-introspection.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + })); + + "cl-fuse-meta-fs" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-fuse-meta-fs" or (x: {})) @@ -3879,7 +4019,9 @@ let quicklisp-to-nix-packages = rec { "lack-component" = quicklisp-to-nix-packages."lack-component"; "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; "lack-util" = quicklisp-to-nix-packages."lack-util"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "uiop" = quicklisp-to-nix-packages."uiop"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/shell.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/shell.nix index a8ed246e6f..bd6eea65f6 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/shell.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/shell.nix @@ -11,6 +11,6 @@ self = rec { lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info ]; CPATH = "${libfixposix}/include"; - LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk-pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib:${webkitgtk}/lib"; + LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk-pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib:${webkitgtk}/lib:${gobject-introspection}/lib"; }; in stdenv.mkDerivation self diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix index 7f49430c15..17bedd5e7d 100644 --- a/third_party/nixpkgs/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix @@ -6,9 +6,8 @@ mkDerivation { version = "0.16.1.0"; src = fetchgit { url = "https://github.com/hercules-ci/optparse-applicative.git"; - sha256 = "0v0r11jaav95im82if976256kncp0ji7nfdrlpbgmwxnkj1hxl48"; - rev = "f9d1242f9889d2e09ff852db9dc2d231d9a3e8d8"; - fetchSubmodules = true; + sha256 = "05vchaw2rf46hh2128qjpky686iy5hff964mbdhcyiz612jjflyp"; + rev = "9e2968c09a7c5b29d04578dc68d81ce5aec0591e"; }; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat diff --git a/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/binary.nix b/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/binary.nix new file mode 100644 index 0000000000..690ed3e45e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/binary.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchurl, unzip, autoPatchelfHook }: + +with lib; + +let + archPostfix = optionalString (stdenv.is64bit && !stdenv.isDarwin) "_64"; +in stdenv.mkDerivation rec { + pname = "msp-debug-stack-bin"; + version = "3.15.1.1"; + src = fetchurl { + url = "http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPDS/3_15_1_001/export/MSP430_DLL_Developer_Package_Rev_3_15_1_1.zip"; + sha256 = "1m1ssrwbhqvqwbp3m4hnjyxnz3f9d4acz9vl1av3fbnhvxr0d2hb"; + }; + sourceRoot = "."; + + libname = + if stdenv.hostPlatform.isWindows then "MSP430${archPostfix}.dll" + else "libmsp430${archPostfix}${stdenv.hostPlatform.extensions.sharedLibrary}"; + + nativeBuildInputs = [ unzip autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc ]; + + installPhase = '' + install -Dm0755 $libname $out/lib/''${libname//_64/} + install -Dm0644 -t $out/include Inc/*.h + ''; + + meta = { + description = "Unfree binary release of the TI MSP430 FET debug driver"; + homepage = https://www.ti.com/tool/MSPDS; + license = licenses.unfree; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ aerialx ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/bsl430.patch b/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/bsl430.patch new file mode 100644 index 0000000000..6c57fb040e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/bsl430.patch @@ -0,0 +1,51 @@ +diff -ruN a/Makefile b/Makefile +--- a/Makefile 2020-06-03 16:10:18.000000000 -0700 ++++ b/Makefile 2020-07-21 18:03:12.464121056 -0700 +@@ -42,7 +42,7 @@ + + PLATFORM := $(shell uname -s) + ifeq ($(PLATFORM),Linux) +- CXX:= g++ ++ CXX?= g++ + + STATICOUTPUT := linux64 + +@@ -68,7 +68,7 @@ + + HIDOBJ := $(LIBTHIRD)/hid-libusb.o + else +- CXX:= clang++ ++ CXX?= clang++ + + OUTPUT := libmsp430.dylib + STATICOUTPUT := mac64 +@@ -134,7 +134,7 @@ + $(CXX) -c -o $@ $< $(USE_PCH) $(CXXFLAGS) $(INCLUDES) $(DEFINES) + + $(BSLLIB): +- $(MAKE) -C ./ThirdParty/BSL430_DLL ++ $(MAKE) -C ./ThirdParty/BSL430_DLL OUTPUT=../../$(BSLLIB) + + install: + cp $(OUTPUT) /usr/local/lib/ +diff -ruN a/ThirdParty/BSL430_DLL/Makefile b/ThirdParty/BSL430_DLL/Makefile +--- a/ThirdParty/BSL430_DLL/Makefile 2019-11-18 13:16:00.000000000 -0800 ++++ b/ThirdParty/BSL430_DLL/Makefile 2020-07-21 18:02:55.987782494 -0700 +@@ -36,7 +36,7 @@ + + PLATFORM := $(shell uname -s) + ifeq ($(PLATFORM),Linux) +- CXX:= g++ ++ CXX?= g++ + + ifdef BIT32 + CXXFLAGS += -m32 +@@ -47,7 +47,7 @@ + INCLUDES += -I$(BOOST_DIR) + endif + else +- CXX:= clang++ ++ CXX?= clang++ + + ifdef BOOST_DIR + INCLUDES += -I$(BOOST_DIR)/include diff --git a/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/default.nix b/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/default.nix new file mode 100644 index 0000000000..2481b50bfb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchurl, unzip +, boost, pugixml +, hidapi +, libusb1 ? null +}: + +with lib; +assert stdenv.isLinux -> libusb1 != null; + +let + hidapiDriver = optionalString stdenv.isLinux "-libusb"; + +in stdenv.mkDerivation { + pname = "msp-debug-stack"; + version = "3.15.1.1"; + + src = fetchurl { + url = "http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPDS/3_15_1_001/export/MSPDebugStack_OS_Package_3_15_1_1.zip"; + sha256 = "1j5sljqwc20zrb50mrji4mnmw5i680qc7n0lb0pakrrxqjc9m9g3"; + }; + sourceRoot = "."; + + enableParallelBuilding = true; + libName = "libmsp430${stdenv.hostPlatform.extensions.sharedLibrary}"; + makeFlags = [ "OUTPUT=$(libName)" "HIDOBJ=" ]; + NIX_LDFLAGS = [ "-lpugixml" "-lhidapi${hidapiDriver}" ]; + NIX_CFLAGS_COMPILE = [ "-I${hidapi}/include/hidapi" ]; + + patches = [ ./bsl430.patch ]; + + preBuild = '' + rm ThirdParty/src/pugixml.cpp + rm ThirdParty/include/pugi{config,xml}.hpp + '' + optionalString stdenv.isDarwin '' + makeFlagsArray+=(OUTNAME="-install_name ") + ''; + + installPhase = '' + install -Dm0755 -t $out/lib $libName + install -Dm0644 -t $out/include DLL430_v3/include/*.h + ''; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ boost hidapi pugixml ] + ++ optional stdenv.isLinux libusb1; + + meta = { + description = "TI MSP430 FET debug driver"; + homepage = https://www.ti.com/tool/MSPDS; + license = licenses.bsd3; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ aerialx ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/misc/umr/default.nix b/third_party/nixpkgs/pkgs/development/misc/umr/default.nix index 158cef2eed..3dba51022d 100644 --- a/third_party/nixpkgs/pkgs/development/misc/umr/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/umr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "IwTkHEuJ82hngPjFVIihU2rSolLBqHxQTNsP8puYPaY="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config llvmPackages.llvm.dev ]; buildInputs = [ bash-completion diff --git a/third_party/nixpkgs/pkgs/development/misc/yelp-tools/default.nix b/third_party/nixpkgs/pkgs/development/misc/yelp-tools/default.nix index bf348d6804..fc3be7421a 100644 --- a/third_party/nixpkgs/pkgs/development/misc/yelp-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/yelp-tools/default.nix @@ -4,34 +4,50 @@ , libxml2 , libxslt , itstool -, gnome3 +, gnome , pkg-config +, meson +, ninja +, python3 }: -stdenv.mkDerivation rec { +python3.pkgs.buildPythonApplication rec { pname = "yelp-tools"; - version = "3.38.0"; + version = "40.0"; + + format = "other"; src = fetchurl { - url = "mirror://gnome/sources/yelp-tools/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30"; + url = "mirror://gnome/sources/yelp-tools/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1bkanqp3qwmirv06mi99qv2acr5ba5rlhy9zlh0fyrfxygraqjv6"; }; nativeBuildInputs = [ pkg-config + meson + ninja + ]; + + propagatedBuildInputs = [ + libxml2 # xmllint required by yelp-check. + libxslt # xsltproc required by yelp-build and yelp-check. ]; buildInputs = [ - libxml2 - libxslt - itstool - gnome3.yelp-xsl + itstool # build script checks for its presence but I am not sure if anything uses it + gnome.yelp-xsl ]; + pythonPath = [ + python3.pkgs.lxml + ]; + + strictDeps = false; # TODO: Meson cannot find xmllint oherwise. Maybe add it to machine file? + doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix index 95f6a3bdbb..45cccf22c7 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix @@ -115,7 +115,7 @@ let in pkgs.mkShell rec { name = "androidenv-demo"; - buildInputs = [ androidSdk platformTools jdk pkgs.android-studio ]; + packages = [ androidSdk platformTools jdk pkgs.android-studio ]; LANG = "C.UTF-8"; LC_ALL = "C.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/default.nix b/third_party/nixpkgs/pkgs/development/node-packages/default.nix index ff9b4747e6..22c06e96af 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/default.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/default.nix @@ -1,4 +1,4 @@ -{ pkgs, nodejs, stdenv }: +{ pkgs, nodejs, stdenv, fetchFromGitHub }: let since = (version: pkgs.lib.versionAtLeast nodejs.version version); @@ -60,8 +60,9 @@ let }; }); - bitwarden-cli = pkgs.lib.overrideDerivation super."@bitwarden/cli" (drv: { + bitwarden-cli = super."@bitwarden/cli".override (drv: { name = "bitwarden-cli-${drv.version}"; + meta.mainProgram = "bw"; }); fast-cli = super."fast-cli-1.x".override { @@ -208,6 +209,26 @@ let ''; }; + netlify-cli = + let + esbuild = pkgs.esbuild.overrideAttrs (old: rec { + version = "0.11.14"; + + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + sha256 = "sha256-N7WNam0zF1t++nLVhuxXSDGV/JaFtlFhufp+etinvmM="; + }; + + }); + in + super.netlify-cli.override { + preRebuild = '' + export ESBUILD_BINARY_PATH="${esbuild}/bin/esbuild" + ''; + }; + ssb-server = super.ssb-server.override { buildInputs = [ pkgs.automake pkgs.autoconf self.node-gyp-build ]; meta.broken = since "10"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix index 2f85221e53..de6ade6151 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix @@ -1,4 +1,4 @@ -{ lib, menhir, easy-format, fetchurl, buildDunePackage, which, re }: +{ lib, menhir, easy-format, fetchurl, buildDunePackage, which, re, nixosTests }: buildDunePackage rec { pname = "atd"; @@ -18,6 +18,10 @@ buildDunePackage rec { doCheck = true; + passthru.tests = { + smoke-test = nixosTests.atd; + }; + meta = with lib; { homepage = "https://github.com/mjambon/atd"; description = "Syntax for cross-language type definitions"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix index 49d614cda8..14f99bb6f8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix @@ -8,14 +8,14 @@ buildDunePackage rec { pname = "awa"; - version = "0.0.1"; + version = "0.0.3"; minimumOCamlVersion = "4.07"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-v${version}.tbz"; - sha256 = "c1d604645517b191184a5800f5c48a6a9a3e5a2fce4a0e2ecfeee74586301400"; + sha256 = "5a7927363ffe672cccf12d5425386e84f6f553a17ffec2b01ae5dc28180c831a"; }; nativeBuildInputs = [ ppx_sexp_conv ppx_cstruct ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix index 94f254a2ed..c1cb7de2d1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { substituteInPlace oasis/elf-loader --replace bitstring.ppx ppx_bitstring ''; - configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ]; + configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm.dev}/bin/llvm-config" ]; meta = with lib; { description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs-nss/default.nix new file mode 100644 index 0000000000..5e6691a9fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs-nss/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildDunePackage +, fetchurl +, rresult +, mirage-crypto +, mirage-clock +, x509 +, logs +, fmt +, hex +, bos +, astring +, cmdliner +, alcotest +}: + +buildDunePackage rec { + pname = "ca-certs-nss"; + version = "3.64.0.1"; + + minimumOCamlVersion = "4.07"; + + src = fetchurl { + url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-v${version}.tbz"; + sha256 = "909c64076491647471f785527bfdd9a886a34504edabf88542b43f27b86067f9"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ + rresult + mirage-crypto + mirage-clock + x509 + ]; + + buildInputs = [ + logs + fmt + hex + bos + astring + cmdliner + ]; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = with lib; { + license = licenses.isc; + description = "X.509 trust anchors extracted from Mozilla's NSS"; + maintainers = [ maintainers.sternenseemann ]; + homepage = "https://github.com/mirage/ca-certs-nss"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix index dacc181f75..acf869dbd2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix @@ -1,24 +1,28 @@ { lib, buildDunePackage, fetchurl , bos, fpath, rresult, ptime, mirage-crypto, x509, astring, logs +, cacert, alcotest }: buildDunePackage rec { pname = "ca-certs"; - version = "0.2.0"; + version = "0.2.1"; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-v${version}.tbz"; - sha256 = "15jfb5zvahs90jsfs7ridqihlka5198z2xrvplj8ddchxfmpx868"; + sha256 = "d43109496a5129feff967d557c556af96f8b10456896a405c43b7cf0c35d0af3"; }; useDune2 = true; propagatedBuildInputs = [ bos fpath rresult ptime mirage-crypto x509 astring logs ]; - # tests need access to network and systemwide ca cert chain - doCheck = false; + doCheck = true; + checkInputs = [ + cacert # for /etc/ssl/certs/ca-bundle.crt + alcotest + ]; meta = with lib; { description = "Detect root CA certificates from the operating system"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.0.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.0.nix deleted file mode 100644 index 26735b1c5d..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.0.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: - -let - pname = "camlimages"; - version = "4.0.1"; -in - -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://bitbucket.org/camlspotter/camlimages/get/v4.0.1.tar.gz"; - sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4"; - }; - - buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ]; - - propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; - - createFindlibDestdir = true; - - preConfigure = '' - rm ./configure - ''; - - buildPhase = '' - omake - ''; - - installPhase = '' - omake install - ''; - - meta = with lib; { - branch = "4.0"; - homepage = "https://bitbucket.org/camlspotter/camlimages"; - description = "OCaml image processing library"; - license = licenses.lgpl2; - maintainers = [ maintainers.vbgl ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.1.2.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.1.2.nix new file mode 100644 index 0000000000..dba303afdf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.1.2.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitLab, fetchpatch, omake, ocaml, findlib +, graphicsmagick, ghostscript +, freetype, giflib, libjpeg, libpng, libtiff, libXpm +}: + +stdenv.mkDerivation rec { + pname = "camlimages"; + version = "4.1.2"; + + src = fetchFromGitLab { + owner = "camlspotter"; + repo = "camlimages"; + rev = "98661d507e12ce91a51295a50f244cb8265b4439"; # no tag + sha256 = "0kpxj8wm2m17wjq217jzjpfgv1d7sp4w1yd1gi8ipn5rj4sid2j8"; + }; + + buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ]; + propagatedBuildInputs = [ libtiff libjpeg libpng giflib freetype libXpm ]; + + createFindlibDestdir = true; + + buildPhase = '' + omake + ''; + + installPhase = '' + omake install + ''; + + meta = with lib; { + branch = "4.1"; + homepage = "https://gitlab.com/camlspotter/camlimages"; + description = "OCaml image processing library"; + license = licenses.lgpl2; + maintainers = [ maintainers.vbgl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix index 31b864e29d..c10537d5d5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix @@ -7,19 +7,19 @@ buildDunePackage rec { pname = "carton"; - version = "0.4.0"; + version = "0.4.1"; useDune2 = true; minimumOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz"; - sha256 = "777f9692b83cd63570c17527a32c5045818ab9242d923cbbde72fc23d0da0140"; + sha256 = "d16aad5560d9ab1e3b4d93d2e8fdea638c216ff47338fb630a8aefd22b452665"; }; # remove changelogs for mimic and the git* packages postPatch = '' - rm CHANGES.md CHANGES.mimic.md + rm CHANGES.md ''; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix index 8100998104..527afec33e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix @@ -1,23 +1,46 @@ -{ lib, fetchurl, buildDunePackage, dune-configurator +{ lib, fetchurl, buildDunePackage, dune-configurator, pkg-config , bigarray-compat, optint -, fmt, rresult -, alcotest +, fmt, rresult, bos, fpath, astring, alcotest +, withFreestanding ? false +, ocaml-freestanding }: buildDunePackage rec { - version = "0.2.1"; + version = "0.3.1"; pname = "checkseum"; useDune2 = true; + minimumOCamlVersion = "4.07"; + src = fetchurl { url = "https://github.com/mirage/checkseum/releases/download/v${version}/checkseum-v${version}.tbz"; - sha256 = "1swb44c64pcs4dh9ka9lig6d398qwwkd3kkiajicww6qk7jbh3n5"; + sha256 = "b9e4d054e17618b1faed8c0eb15afe0614b2f093e58b59a180bda4500a5d2da1"; }; - buildInputs = [ dune-configurator fmt rresult ]; - propagatedBuildInputs = [ bigarray-compat optint ]; - checkInputs = lib.optionals doCheck [ alcotest ]; + patches = [ + ./makefile-no-opam.patch + ]; + + nativeBuildInputs = [ + dune-configurator + pkg-config + ]; + propagatedBuildInputs = [ + bigarray-compat + optint + ] ++ lib.optionals withFreestanding [ + ocaml-freestanding + ]; + + checkInputs = [ + alcotest + bos + astring + fmt + fpath + rresult + ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/makefile-no-opam.patch b/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/makefile-no-opam.patch new file mode 100644 index 0000000000..49fb41b2e0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/makefile-no-opam.patch @@ -0,0 +1,12 @@ +diff --git a/freestanding/Makefile b/freestanding/Makefile +index d535050..bb286bd 100644 +--- a/freestanding/Makefile ++++ b/freestanding/Makefile +@@ -1,4 +1,6 @@ +-PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig ++ifneq (, $(shell command -v opam)) ++PKG_CONFIG_PATH ?= $(shell opam var prefix)/lib/pkgconfig ++endif + + EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?) + diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix index 21e22533f1..060d2c6fb6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix @@ -1,22 +1,60 @@ -{ lib, buildDunePackage, async, cohttp, conduit-async, uri, ppx_sexp_conv -, logs, magic-mime }: +{ lib +, buildDunePackage +, ppx_sexp_conv +, base +, async +, async_kernel +, async_unix +, cohttp +, conduit-async +, uri +, uri-sexp +, logs +, fmt +, sexplib0 +, ipaddr +, magic-mime +, ounit +, mirage-crypto +, core +}: -if !lib.versionAtLeast cohttp.version "0.99" then - cohttp -else if !lib.versionAtLeast async.version "0.13" then - throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)" -else +buildDunePackage { + pname = "cohttp-async"; - buildDunePackage { - pname = "cohttp-async"; - useDune2 = true; - inherit (cohttp) version src; + inherit (cohttp) + version + src + minimumOCamlVersion + useDune2 + ; - buildInputs = [ ppx_sexp_conv ]; + buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ]; + propagatedBuildInputs = [ + cohttp + conduit-async + async_kernel + async_unix + async + base + magic-mime + logs + fmt + sexplib0 + uri + uri-sexp + ipaddr + ]; - meta = cohttp.meta // { - description = "CoHTTP implementation for the Async concurrency library"; - }; - } + doCheck = true; + checkInputs = [ + ounit + mirage-crypto + core + ]; + + meta = cohttp.meta // { + description = "CoHTTP implementation for the Async concurrency library"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix index 1cbc43bc28..c1dc973d0e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,25 +1,24 @@ { lib, fetchurl, buildDunePackage -, ppx_fields_conv, ppx_sexp_conv, stdlib-shims -, base64, fieldslib, jsonm, re, stringext, uri-sexp +, ppx_sexp_conv, base64, jsonm, re, stringext, uri-sexp , ocaml, fmt, alcotest }: buildDunePackage rec { pname = "cohttp"; - version = "2.5.5"; + version = "4.0.0"; useDune2 = true; - minimumOCamlVersion = "4.04.1"; + minimumOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz"; - sha256 = "0ywmql4lp6ps2gd064ixbjzsdnnn5vk3pipm005sswl553qqwaim"; + sha256 = "bd7aa4cd2c82744990ed7c49e3ee7a40324c64cb3d8509804809155e2bacd1d2"; }; - buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ]; + buildInputs = [ jsonm ppx_sexp_conv ]; - propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ]; + propagatedBuildInputs = [ base64 re stringext uri-sexp ]; doCheck = lib.versionAtLeast ocaml.version "4.05"; checkInputs = [ fmt alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index 845df2a3f5..57885b0e65 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -1,19 +1,28 @@ { lib, buildDunePackage, cohttp-lwt -, conduit-lwt-unix, ppx_sexp_conv -, cmdliner, fmt, magic-mime +, conduit-lwt-unix, conduit-lwt, ppx_sexp_conv +, cmdliner, fmt, logs, magic-mime +, ounit +, cacert }: -if !lib.versionAtLeast cohttp-lwt.version "0.99" -then cohttp-lwt -else - buildDunePackage { pname = "cohttp-lwt-unix"; - inherit (cohttp-lwt) version src meta; + inherit (cohttp-lwt) version src; useDune2 = true; buildInputs = [ cmdliner ppx_sexp_conv ]; - propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ]; + propagatedBuildInputs = [ + cohttp-lwt conduit-lwt conduit-lwt-unix fmt logs magic-mime + ]; + + # TODO(@sternenseemann): fail for unknown reason + # https://github.com/mirage/ocaml-cohttp/issues/675#issuecomment-830692742 + doCheck = false; + checkInputs = [ ounit cacert ]; + + meta = cohttp-lwt.meta // { + description = "CoHTTP implementation for Unix and Windows using Lwt"; + }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix index 36831d9461..158aa3b27b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -1,16 +1,21 @@ -{ lib, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs }: - -if !lib.versionAtLeast cohttp.version "0.99" -then cohttp -else if !lib.versionAtLeast ppx_sexp_conv.version "0.13" -then throw "cohttp-lwt is not available for ppx_sexp_conv version ${ppx_sexp_conv.version}" -else +{ lib, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs, sexplib0 }: buildDunePackage { pname = "cohttp-lwt"; - inherit (cohttp) version src useDune2 meta; + inherit (cohttp) + version + src + useDune2 + minimumOCamlVersion + ; - buildInputs = [ uri ppx_sexp_conv ]; + buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ cohttp ocaml_lwt logs ]; + propagatedBuildInputs = [ + cohttp ocaml_lwt logs sexplib0 uri + ]; + + meta = cohttp.meta // { + description = "CoHTTP implementation using the Lwt concurrency library"; + }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/mirage.nix index e7b172349c..d2d3e94564 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/mirage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/mirage.nix @@ -2,6 +2,7 @@ , mirage-flow, mirage-channel, mirage-kv , conduit, conduit-mirage, lwt , astring, magic-mime +, ppx_sexp_conv }: buildDunePackage { @@ -9,6 +10,8 @@ buildDunePackage { inherit (cohttp) version src minimumOCamlVersion useDune2; + nativeBuildInputs = [ ppx_sexp_conv ]; + propagatedBuildInputs = [ mirage-flow mirage-channel conduit conduit-mirage mirage-kv lwt cohttp cohttp-lwt astring magic-mime diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix index c15ad0520f..e78cb2bc51 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix @@ -1,17 +1,17 @@ -{ lib, buildDunePackage, async, async_ssl, ppx_sexp_conv, conduit }: - -if !lib.versionAtLeast conduit.version "1.0" -then conduit -else +{ lib, buildDunePackage, async, async_ssl, ppx_sexp_conv, ppx_here, uri, conduit }: buildDunePackage { pname = "conduit-async"; - useDune2 = true; - inherit (conduit) version src; + inherit (conduit) + version + src + minimumOCamlVersion + useDune2 + ; - buildInputs = [ ppx_sexp_conv ]; + buildInputs = [ ppx_sexp_conv ppx_here ]; - propagatedBuildInputs = [ async async_ssl conduit ]; + propagatedBuildInputs = [ async async_ssl conduit uri ]; meta = conduit.meta // { description = "A network connection establishment library for Async"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix index 8c9b757f87..96f5bf43d2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix @@ -5,18 +5,18 @@ buildDunePackage rec { pname = "conduit"; - version = "2.2.2"; + version = "4.0.0"; useDune2 = true; - minimumOCamlVersion = "4.07"; + minimumOCamlVersion = "4.03"; src = fetchurl { - url = "https://github.com/mirage/ocaml-conduit/releases/download/v2.2.2/conduit-v2.2.2.tbz"; - sha256 = "1zb83w2pq9c8xrappfxa6y5q93772f5dj22x78camsm77a2c2z55"; + url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-v${version}.tbz"; + sha256 = "74b29d72bf47adc5d5c4cae6130ad5a2a4923118b9c571331bd1cb3c56decd2a"; }; buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ]; + propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri logs ]; meta = { description = "A network connection establishment library"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index ab6449b50a..ce6016012d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -1,18 +1,31 @@ { buildDunePackage -, conduit-lwt, ppx_sexp_conv, ocaml_lwt, uri, ipaddr, ipaddr-sexp -, lwt_ssl, tls +, conduit-lwt, ppx_sexp_conv, ocaml_lwt, uri, ipaddr, ipaddr-sexp, ca-certs, logs +, lwt_ssl, tls, lwt_log, ssl }: buildDunePackage { pname = "conduit-lwt-unix"; - inherit (conduit-lwt) version src minimumOCamlVersion; - - useDune2 = true; + inherit (conduit-lwt) version src minimumOCamlVersion useDune2; buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = - [ conduit-lwt ocaml_lwt uri ipaddr ipaddr-sexp tls lwt_ssl ]; + propagatedBuildInputs = [ + conduit-lwt + ocaml_lwt + uri + ipaddr + ipaddr-sexp + tls + ca-certs + logs + lwt_ssl + ]; + + doCheck = true; + checkInputs = [ + lwt_log + ssl + ]; meta = conduit-lwt.meta // { description = "A network connection establishment library for Lwt_unix"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix index 6100908f78..d1f636be93 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix @@ -1,7 +1,8 @@ { buildDunePackage, conduit-lwt -, ppx_sexp_conv, sexplib, cstruct, mirage-stack, mirage-flow +, ppx_sexp_conv, sexplib, uri, cstruct, mirage-stack, mirage-flow , mirage-flow-combinators, mirage-random, mirage-time, mirage-clock , dns-client, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp +, tcpip, ca-certs-nss }: buildDunePackage { @@ -12,10 +13,10 @@ buildDunePackage { nativeBuildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ - sexplib cstruct mirage-stack mirage-clock mirage-flow + sexplib uri cstruct mirage-stack mirage-clock mirage-flow mirage-flow-combinators mirage-random mirage-time dns-client conduit-lwt vchan xenstore tls tls-mirage - ipaddr ipaddr-sexp + ipaddr ipaddr-sexp tcpip ca-certs-nss ]; meta = conduit-lwt.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix index c3847acb95..b0df520615 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix @@ -5,7 +5,7 @@ }: buildDunePackage rec { - version = "3.0.1"; + version = "3.4"; pname = "containers"; useDune2 = true; @@ -14,7 +14,7 @@ buildDunePackage rec { owner = "c-cube"; repo = "ocaml-containers"; rev = "v${version}"; - sha256 = "1m19cfcwks3xcj16nqldfb49dg0vdc7by1q1j8bpac3z2mjvks0l"; + sha256 = "0ixpy81p6rc3lq71djfndb2sg2hfj20j1jbzzrrmgqsysqdjsgzz"; }; buildInputs = [ dune-configurator ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix index 1c48b509c4..20197e207a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, buildDunePackage, fetchurl, ocaml -, result, alcotest, cohttp-lwt-unix, odoc, curl }: +, result, alcotest, cohttp-lwt-unix, odoc, curl, cacert +}: buildDunePackage rec { pname = "curly"; @@ -15,8 +16,9 @@ buildDunePackage rec { }; propagatedBuildInputs = [ result ]; - checkInputs = [ alcotest cohttp-lwt-unix ]; + checkInputs = [ alcotest cohttp-lwt-unix cacert ]; # test dependencies are only available for >= 4.08 + # https://github.com/mirage/ca-certs/issues/16 doCheck = lib.versionAtLeast ocaml.version "4.08" # Some test fails in macOS sandbox # > Fatal error: exception Unix.Unix_error(Unix.EPERM, "bind", "") diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix index d2cba68d73..505ffe3c42 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix @@ -4,7 +4,7 @@ }: buildDunePackage rec { - version = "1.3.0"; + version = "1.4.0"; pname = "decompress"; minimumOCamlVersion = "4.07"; @@ -13,7 +13,7 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz"; - sha256 = "de149896939be13fedec46a4581121d5ab74850a2241d08e6aa8ae4bb18c52c4"; + sha256 = "d1669e07446d73dd5e16f020d4a1682abcbb1b7a1e3bf19b805429636c26a19b"; }; buildInputs = [ cmdliner ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/certify.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/certify.nix index 1835114d70..31b39d1822 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/certify.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/certify.nix @@ -1,6 +1,6 @@ { buildDunePackage, dns, dns-tsig, dns-mirage, randomconv, x509 , mirage-random, mirage-time, mirage-clock, mirage-stack -, logs, mirage-crypto-pk, mirage-crypto-rng, tls, lwt +, logs, mirage-crypto-pk, mirage-crypto-rng, mirage-crypto-ec, lwt }: buildDunePackage { @@ -21,7 +21,7 @@ buildDunePackage { logs mirage-crypto-pk mirage-crypto-rng - tls + mirage-crypto-ec lwt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix index 4f0b95da6c..8a5115f10f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix @@ -4,14 +4,14 @@ buildDunePackage rec { pname = "dns"; - version = "4.6.3"; + version = "5.0.1"; useDune2 = true; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz"; - sha256 = "0g7xw43jm5hv0w9lsnhhi0w3243mxl615cdsvz29yh39fcqvqsdy"; + sha256 = "72c0a1a91c8e409bd448c8e0ea28d16d13177c326aea403ee1c30ddcb5969adc"; }; propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix index c86b7cba01..47b002fd73 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eigen/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { minimumOCamlVersion = "4.02"; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; propagatedBuildInputs = [ ctypes ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/cohttp-mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/cohttp-mirage.nix deleted file mode 100644 index d308840064..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/cohttp-mirage.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildDunePackage -, git, mimic, cohttp-mirage, cohttp, cohttp-lwt -, fmt, lwt, result, rresult, uri -}: - -buildDunePackage { - pname = "git-cohttp-mirage"; - - inherit (git) version src minimumOCamlVersion useDune2; - - propagatedBuildInputs = [ - git mimic cohttp-mirage cohttp cohttp-lwt fmt lwt result rresult uri - ]; - - meta = git.meta // { - description = "A package to use HTTP-based ocaml-git with MirageOS backend"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix index b8d73178d0..954e4956c8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix @@ -1,30 +1,35 @@ { stdenv, lib, fetchurl, buildDunePackage , alcotest, mtime, mirage-crypto-rng, tls, git-binary , angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum -, fpath, ke, logs, lwt, ocamlgraph, uri, rresult, base64 +, fpath, ke, logs, lwt, ocamlgraph, uri, rresult, base64, hxd , result, bigstringaf, optint, mirage-flow, domain-name, emile , mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt }: buildDunePackage rec { pname = "git"; - version = "3.3.3"; + version = "3.4.0"; minimumOCamlVersion = "4.08"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - sha256 = "0j8pw9w74bfhrjsqr8zm8g7h1az94z9vg7qgc6z6649zm9yjiax3"; + sha256 = "6eef1240c7c85a8e495b82ef863c509ad41d75e0c45cf73c34ed1bdafd03413f"; }; + # remove changelog for the carton package + postPatch = '' + rm CHANGES.carton.md + ''; + buildInputs = [ base64 ]; propagatedBuildInputs = [ angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow - domain-name emile mimic carton carton-lwt carton-git ipaddr psq + domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd ]; checkInputs = [ alcotest alcotest-lwt mtime mirage-crypto-rng tls git-binary crowbar diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/paf.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/paf.nix new file mode 100644 index 0000000000..cf0272ddf3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/paf.nix @@ -0,0 +1,49 @@ +{ lib, buildDunePackage +, git +, mimic +, paf +, ca-certs-nss +, cohttp +, cohttp-lwt +, fmt +, ipaddr +, logs +, lwt +, mirage-clock +, mirage-stack +, mirage-time +, result +, rresult +, tls +, uri +}: + +buildDunePackage { + pname = "git-paf"; + + inherit (git) version src minimumOCamlVersion useDune2; + + propagatedBuildInputs = [ + git + mimic + paf + ca-certs-nss + cohttp + cohttp-lwt + fmt + lwt + result + rresult + ipaddr + logs + mirage-clock + mirage-stack + mirage-time + tls + uri + ]; + + meta = git.meta // { + description = "A package to use HTTP-based ocaml-git with MirageOS backend"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix index f4cea47288..3e5f464cea 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix @@ -6,7 +6,8 @@ , tcpip, awa-mirage, mirage-flow , alcotest, alcotest-lwt, base64, cstruct , ke, mirage-crypto-rng, ocurl, git-binary -, ptime +, ptime, mimic, ca-certs-nss, tls, tls-mirage +, cacert }: buildDunePackage { @@ -24,10 +25,14 @@ buildDunePackage { fmt bos fpath uri digestif logs lwt astring cohttp-lwt-unix decompress domain-name ipaddr mtime mirage-flow + cstruct ptime mimic ca-certs-nss + tls tls-mirage ]; checkInputs = [ - alcotest alcotest-lwt base64 cstruct ke - mirage-crypto-rng ocurl git-binary ptime + alcotest alcotest-lwt base64 ke + mirage-crypto-rng git-binary + cohttp-lwt-unix + cacert # sets up NIX_SSL_CERT_FILE ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix index 761e9bf561..76383099a4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix @@ -1,6 +1,6 @@ { buildDunePackage , irmin, irmin-unix, irmin-git, ppx_irmin, lwt, mtime -, alcotest, alcotest-lwt +, alcotest, alcotest-lwt, cacert }: buildDunePackage { @@ -18,7 +18,7 @@ buildDunePackage { doCheck = true; checkInputs = [ - alcotest alcotest-lwt + alcotest alcotest-lwt cacert ]; meta = ppx_irmin.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix index a6c1e8af8f..d477c93292 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix @@ -1,7 +1,7 @@ { lib, buildDunePackage , git, irmin, irmin-test, ppx_irmin, git-cohttp-unix, git-unix , digestif, cstruct, fmt, astring, fpath, logs, lwt, uri -, mtime, alcotest +, mtime, alcotest, cacert }: buildDunePackage { @@ -26,7 +26,7 @@ buildDunePackage { uri ]; - checkInputs = [ mtime alcotest git-cohttp-unix git-unix irmin-test ]; + checkInputs = [ mtime alcotest git-cohttp-unix git-unix irmin-test cacert ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix index ca205cac4e..03c8f1eca2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, cohttp-lwt, graphql-cohttp, graphql-lwt, irmin -, alcotest, alcotest-lwt, logs, yojson, cohttp-lwt-unix +, alcotest, alcotest-lwt, logs, yojson, cohttp-lwt-unix, cacert }: buildDunePackage rec { @@ -19,6 +19,7 @@ buildDunePackage rec { logs cohttp-lwt-unix yojson + cacert ]; meta = irmin.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix index b50e0b8734..7bfae99820 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix @@ -1,5 +1,6 @@ { lib, buildDunePackage, cohttp-lwt, irmin, webmachine , checkseum, git-unix, irmin-git, irmin-test, digestif, git-cohttp-unix +, cacert }: buildDunePackage rec { @@ -12,7 +13,9 @@ buildDunePackage rec { propagatedBuildInputs = [ cohttp-lwt irmin webmachine ]; - checkInputs = [ digestif checkseum git-cohttp-unix git-unix irmin-git irmin-test ]; + checkInputs = [ + digestif checkseum git-cohttp-unix git-unix irmin-git irmin-test cacert + ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-git.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-git.nix index dfa84ff233..e33b766bd4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-git.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-git.nix @@ -1,6 +1,6 @@ { buildDunePackage, irmin-mirage, irmin-git , mirage-kv, cohttp, conduit-lwt, conduit-mirage -, git-cohttp-mirage, fmt, git, lwt, mirage-clock, uri +, git-paf, fmt, git, lwt, mirage-clock, uri }: buildDunePackage { @@ -15,7 +15,7 @@ buildDunePackage { cohttp conduit-lwt conduit-mirage - git-cohttp-mirage + git-paf fmt git lwt diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix index 7c59e1eaef..c7eed70d9d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ppx_irmin"; - version = "2.5.3"; + version = "2.6.0"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "2c8ef24cc57379c3a138f121fea350ee7b6077abc22a4fdc6a47d0c81585f3f6"; + sha256 = "1db134221e82c424260a0e206b640fcb82902be35eea4137af2bcd9c98d3ac0f"; }; minimumOCamlVersion = "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix index a3dfb5d508..89cf36979b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix @@ -1,7 +1,7 @@ { lib, buildDunePackage , checkseum, cmdliner, git-unix, git-cohttp-unix, yaml, fpath , irmin, irmin-fs, irmin-git, irmin-graphql, irmin-http -, irmin-pack, irmin-watcher, irmin-test +, irmin-pack, irmin-watcher, irmin-test, cacert }: buildDunePackage rec { @@ -18,7 +18,9 @@ buildDunePackage rec { irmin-pack irmin-watcher git-cohttp-unix ]; - checkInputs = lib.optional doCheck irmin-test; + checkInputs = [ + irmin-test cacert + ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix index b3c0d4f894..0a70bf3024 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -31,11 +31,11 @@ buildDunePackage rec { pname = "letsencrypt"; - version = "0.2.4"; + version = "0.2.5"; src = fetchurl { url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz"; - sha256 = "91c79828a50243804da29c17563c54d2d528a79207e5b874dce6a3e7fedf7567"; + sha256 = "6e3bbb5f593823d49e83e698c06cf9ed48818695ec8318507b311ae74731e607"; }; minimumOCamlVersion = "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix index 34fe75a294..f984a28869 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix @@ -1,16 +1,16 @@ -{ stdenv, lib, fetchpatch, python, cmake, llvm, ocaml, findlib, ctypes }: +{ stdenv, lib, fetchpatch, python, cmake, libllvm, ocaml, findlib, ctypes }: -let version = lib.getVersion llvm; in +let version = lib.getVersion libllvm; in stdenv.mkDerivation { pname = "ocaml-llvm"; inherit version; - inherit (llvm) src; + inherit (libllvm) src; nativeBuildInputs = [ cmake ]; buildInputs = [ python ocaml findlib ctypes ]; - propagatedBuildInputs = [ llvm ]; + propagatedBuildInputs = [ libllvm ]; patches = [ (fetchpatch { url = "https://raw.githubusercontent.com/ocaml/opam-repository/2bdc193f5a9305ea93bf0f0dfc1fbc327c8b9306/packages/llvm/llvm.7.0.0/files/fix-shared.patch"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DLLVM_OCAML_OUT_OF_TREE=TRUE" "-DLLVM_OCAML_INSTALL_PATH=${placeholder "out"}/ocaml" - "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${lib.getLib llvm}/lib" + "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${lib.getLib libllvm}/lib" ]; buildFlags = [ "ocaml_all" ]; @@ -34,11 +34,11 @@ stdenv.mkDerivation { ''; passthru = { - inherit llvm; + inherit libllvm; }; meta = { - inherit (llvm.meta) license homepage; + inherit (libllvm.meta) license homepage; platforms = ocaml.meta.platforms or []; description = "OCaml bindings distributed with LLVM"; maintainers = with lib.maintainers; [ vbgl ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix index 6ad5ce5d48..41fdbc4eed 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { pname = "luv"; - version = "0.5.7"; + version = "0.5.8"; useDune2 = true; src = fetchurl { url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz"; - sha256 = "0wjnw5riydnzsk1xdzljlpzdnjwpa0j597y6x6ma4990mqj54260"; + sha256 = "1y3g7jvb72frckjl92zyn7hzmzjy1fy4a48992jdk80vphsdzgmk"; }; postConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix index 3ddae57e9e..ea16364270 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix @@ -1,27 +1,23 @@ { lib, buildDunePackage, fetchurl -, fmt, mirage-flow, result, rresult, cstruct, logs, ke +, fmt, mirage-flow, result, rresult, cstruct, logs, ke, lwt , alcotest, alcotest-lwt, bigstringaf, bigarray-compat }: buildDunePackage rec { pname = "mimic"; - version = "0.0.2"; + version = "0.0.3"; minimumOCamlVersion = "4.08"; useDune2 = true; src = fetchurl { - url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz"; - sha256 = "3ad5af3caa1120ecfdf022de41ba5be8edfbf50270fc99238b82d3d2d6e7c317"; + url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz"; + sha256 = "e4743cd2e4f8242eb1ce9d8086fd2affba0eb6a62131309ffa279108bd3dbbcb"; }; - # don't install changelogs for other packages - postPatch = '' - rm -f CHANGES.md CHANGES.carton.md - ''; - propagatedBuildInputs = [ fmt + lwt mirage-flow result rresult 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 50121ad628..aaa51aa276 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "mirage-runtime"; - version = "3.10.1"; + version = "3.10.3"; useDune2 = true; @@ -11,7 +11,7 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz"; - sha256 = "1glmsz2znhfkk4w6d6nsr7q5jqvivhmi8zwagzw2d8pah0c8bhm4"; + sha256 = "7c8059ef9e330eaef1ed51c0d89afe17900310f8083a426cd8099602222c2281"; }; propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix index 7f8ded5feb..2227f6e033 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix @@ -1,12 +1,12 @@ { lib, buildDunePackage, fetchurl }: buildDunePackage rec { - minimumOCamlVersion = "4.03"; - version = "0.0.4"; + minimumOCamlVersion = "4.07"; + version = "0.1.0"; pname = "optint"; src = fetchurl { url = "https://github.com/mirage/optint/releases/download/v${version}/optint-v${version}.tbz"; - sha256 = "1a7gabxqmfvii8qnxq1clx43md2h9glskxhac8y8r0rhzblx3s1a"; + sha256 = "27847660223c16cc7eaf8fcd9d5589a0b802114330a2529578f8007d3b01185d"; }; useDune2 = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix index 0c91051e24..375ba1c125 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix @@ -5,6 +5,7 @@ , mirage-stack , mirage-time , httpaf +, h2 , tls-mirage , mimic , cohttp-lwt @@ -31,11 +32,11 @@ buildDunePackage rec { pname = "paf"; - version = "0.0.1"; + version = "0.0.3"; src = fetchurl { url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz"; - sha256 = "7a794c21ce458bda302553b0f5ac128c067579fbb3b7b8fba9b410446c43e790"; + sha256 = "a0bbb84b19e1f0255337fc4d7017f3ea3611b241746e391b11c1d8b1f5f30a2b"; }; useDune2 = true; @@ -45,6 +46,7 @@ buildDunePackage rec { mirage-stack mirage-time httpaf + h2 tls-mirage mimic cohttp-lwt 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 2ee01ed821..dadeb5a98e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix @@ -1,17 +1,17 @@ { lib, fetchurl, buildDunePackage, ppx_sexp_conv, ppx_cstruct, cstruct , cstruct-sexp, sexplib, mirage-crypto, mirage-crypto-pk, mirage-crypto-rng -, x509, domain-name, fmt, cstruct-unix, ounit2, ocaml_lwt, ptime -, hacl_x25519, fiat-p256, hkdf, logs, alcotest }: +, x509, domain-name, fmt, cstruct-unix, ounit2, ocaml_lwt, ptime, rresult +, mirage-crypto-ec, hkdf, logs, alcotest }: buildDunePackage rec { minimumOCamlVersion = "4.08"; - version = "0.12.8"; + version = "0.13.1"; pname = "tls"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; - sha256 = "0sgppvfnamfnsglw1cl801i1xqkxbs33g40kwmmqj2vqjcarm26a"; + sha256 = "ca95fa59a82f7d38b0b495fc0cd1ff54e7728492a292895d0067c1ba9de81b7b"; }; useDune2 = true; @@ -21,8 +21,8 @@ buildDunePackage rec { propagatedBuildInputs = [ ppx_sexp_conv ppx_cstruct cstruct cstruct-sexp sexplib mirage-crypto mirage-crypto-pk mirage-crypto-rng - x509 domain-name fmt ocaml_lwt ptime hacl_x25519 fiat-p256 - hkdf logs ]; + x509 domain-name fmt ocaml_lwt ptime mirage-crypto-ec + hkdf logs rresult ]; meta = with lib; { homepage = "https://github.com/mirleft/ocaml-tls"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/mirage.nix index ad81c03c35..18d0f08357 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/mirage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/mirage.nix @@ -1,6 +1,6 @@ { buildDunePackage, tls , x509, lwt, fmt, mirage-flow, mirage-kv, mirage-clock, ptime -, mirage-crypto, mirage-crypto-pk, hacl_x25519, fiat-p256 +, mirage-crypto, mirage-crypto-pk, mirage-crypto-ec }: buildDunePackage { @@ -19,8 +19,7 @@ buildDunePackage { ptime mirage-crypto mirage-crypto-pk - hacl_x25519 - fiat-p256 + mirage-crypto-ec ]; meta = tls.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix index 637105361f..0ce57b0716 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix @@ -8,11 +8,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; pname = "x509"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz"; - sha256 = "04g59j8sn8am0z0a94h8cyvr6cqzd5gkn2lj6g51nb5dkwajj19h"; + sha256 = "4577c2a616bda45cc777869fc44e272397d63a029135a993df8937bcfd6f6c49"; }; useDune2 = true; diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/TextBibTeX-use-lib-on-aarch64.patch b/third_party/nixpkgs/pkgs/development/perl-modules/TextBibTeX-use-lib-on-aarch64.patch new file mode 100644 index 0000000000..42fa372868 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/perl-modules/TextBibTeX-use-lib-on-aarch64.patch @@ -0,0 +1,11 @@ +--- a/Build.PL ++++ b/Build.PL +@@ -88,7 +88,7 @@ if ( $^O =~ /mswin32/i ) { + } + } + else { +- if ( $Config{archname} =~ /^x86_64|^ppc64|^s390x|^aarch64|^riscv64/ ) { ++ if ( $Config{archname} =~ /^x86_64|^ppc64|^s390x|^riscv64/ ) { + $libdir =~ s/\bbin\b/lib64/; + if ( !-d $libdir ) { + my $test = $libdir; diff --git a/third_party/nixpkgs/pkgs/development/pharo/vm/build-vm-legacy.nix b/third_party/nixpkgs/pkgs/development/pharo/vm/build-vm-legacy.nix index bd5d1e9160..c00c92a6c3 100644 --- a/third_party/nixpkgs/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/third_party/nixpkgs/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -13,6 +13,7 @@ , alsaLib , cairo , libuuid +, libnsl , makeWrapper , ... }: @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip cmake gcc makeWrapper ]; buildInputs = [ bash glibc openssl libGLU libGL freetype - xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; + xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libnsl ]; LD_LIBRARY_PATH = lib.makeLibraryPath [ cairo libGLU libGL freetype openssl libuuid alsaLib diff --git a/third_party/nixpkgs/pkgs/development/pharo/vm/vms.nix b/third_party/nixpkgs/pkgs/development/pharo/vm/vms.nix index 77bc5b0682..a8e3236a3a 100644 --- a/third_party/nixpkgs/pkgs/development/pharo/vm/vms.nix +++ b/third_party/nixpkgs/pkgs/development/pharo/vm/vms.nix @@ -19,6 +19,7 @@ , fetchFromGitHub , makeWrapper , runtimeShell +, libnsl } @args: let diff --git a/third_party/nixpkgs/pkgs/development/php-packages/apcu_bc/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/apcu_bc/default.nix index 132a25a2df..a9c34a8d77 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/apcu_bc/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/apcu_bc/default.nix @@ -15,4 +15,5 @@ buildPecl { ''; meta.maintainers = lib.teams.php.members; + meta.broken = lib.versionAtLeast php.version "8"; } diff --git a/third_party/nixpkgs/pkgs/development/php-packages/deployer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/deployer/default.nix new file mode 100644 index 0000000000..2e24a98b0b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/php-packages/deployer/default.nix @@ -0,0 +1,28 @@ +{ mkDerivation, fetchurl, makeWrapper, lib, php }: + +mkDerivation rec { + pname = "deployer"; + version = "6.8.0"; + + src = fetchurl { + url = "https://deployer.org/releases/v${version}/${pname}.phar"; + sha256 = "09mxwfa7yszsiljbkxpsd4sghqngl08cn18v4g1fbsxp3ib3kxi5"; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/deployer/deployer.phar + makeWrapper ${php}/bin/php $out/bin/dep --add-flags "$out/libexec/deployer/deployer.phar" + ''; + + meta = with lib; { + description = "A deployment tool for PHP"; + license = licenses.mit; + homepage = "https://deployer.org/"; + maintainers = with maintainers; teams.php.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix index da114a4d34..caf3b515aa 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, lib, php, makeWrapper }: let pname = "phpcbf"; - version = "3.5.8"; + version = "3.6.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; - sha256 = "15ci30yvw3p9zlmzsk9s4mxzb3wax3gl9p55slhf1bzwn1xxwyb0"; + sha256 = "04wb1imm4934mpy2hxcmqh4cn7md1vwmfii39p6mby809325b5z1"; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpcs/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpcs/default.nix index d2053dbe9c..87433066ea 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpcs/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpcs/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpcs"; - version = "3.5.8"; + version = "3.6.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; - sha256 = "037mdnpbgd9xaj556pf14h02a4a6f5zzdg58p2z1sivxcygf8aka"; + sha256 = "0sdi78hrwd3r5p1b38qmp89m41kfszh2qn4n5zhq2dmhsjdhjziz"; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix index 514706dc17..c12eb6b458 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "psysh"; - version = "0.10.4"; + version = "0.10.8"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; - sha256 = "005xh5rz12bsy9yvzzr69zpr0p7v4sh6cafhpinpfrvbwfq068f1"; + sha256 = "sha256-6opSBKR5eI5HlaJy4A94JrxYfUtCCNVlyntmLZbWfOE="; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Babel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Babel/default.nix index 1074d2eef4..183478396e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Babel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Babel/default.nix @@ -1,38 +1,17 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, pytz, pytest, freezegun, glibcLocales }: +{ stdenv, lib, buildPythonPackage, fetchPypi, pytz, pytestCheckHook, freezegun }: buildPythonPackage rec { pname = "Babel"; - version = "2.7.0"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "e86135ae101e31e2c8ec20a4e0c5220f4eed12487d5cf3f78be7e98d3a57fc28"; + sha256 = "018yg7g2pa6vjixx1nx41cfispgfi0azzp0a1chlycbj8jsil0ys"; }; - patches = [ - # The following 2 patches fix the test suite failing on nix < 2.3 with - # Python < 3 because those nix versions do not run in a pseudoterminal, - # which makes Python 2 not set the default encoding to UTF-8, and the - # Babel code crashes when printing a warning in that case. - # See #75676 and https://github.com/python-babel/babel/pull/691. - # It is important to fix this because otherwise Babel is not buildable - # with older nix versions (e.g. on machines used as --builders). - # TODO: Remove at release > 2.8.0. - (fetchpatch { - name = "Babel-Introduce-invariant-that-invalid_pofile-takes-unicode-line.patch"; - url = "https://github.com/python-babel/babel/commit/f4f6653e6aa053724d2c6dc0ee71dcb928013352.patch"; - sha256 = "1kyknwn9blspcf9yxmgdiaxdii1dnkblyhcflqwhxyl1mss1dxv5"; - }) - (fetchpatch { - name = "Babel-Fix-unicode-printing-error-on-Python-2-without-TTY.patch"; - url = "https://github.com/python-babel/babel/commit/da7f31143847659b6b74d802618b03438aceb350.patch"; - sha256 = "09yny8614knr8ngrrddmqzkxk70am135rccv2ncc6dji4xbqbfln"; - }) - ]; - propagatedBuildInputs = [ pytz ]; - checkInputs = [ pytest freezegun ]; + checkInputs = [ pytestCheckHook freezegun ]; doCheck = !stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Markups/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Markups/default.nix index 012f31c266..d997b120d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Markups/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Markups/default.nix @@ -5,6 +5,7 @@ , markdown , docutils , pygments +, pyyaml }: buildPythonPackage rec { @@ -16,7 +17,7 @@ buildPythonPackage rec { sha256 = "e309d79dde0935576ce1def6752f2127a12e2c2ea2ae8b0c69f99ff8bc12181d"; }; - checkInputs = [ markdown docutils pygments ]; + checkInputs = [ markdown docutils pygments pyyaml ]; propagatedBuildInputs = [ python-markdown-math ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix index d8c49c99eb..17a6e4d6a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix @@ -1,79 +1,112 @@ { lib -, stdenv +, aiohttp +, Babel +, blinker , buildPythonPackage -, isPy3k -, fetchPypi -, doit -, glibcLocales -, pytest -, pytestcov -, mock -, pygments -, pillow , dateutil , docutils -, Mako -, unidecode -, lxml -, Yapsy -, PyRSS2Gen -, Logbook -, blinker -, natsort -, requests -, piexif -, markdown -, phpserialize -, jinja2 -, Babel +, doit +, fetchPypi , freezegun -, toml +, ghp-import +, hsluv +, html5lib +, ipykernel +, jinja2 +, lxml +, Mako +, markdown +, micawber +, mock +, natsort , notebook +, phpserialize +, piexif +, pillow +, pygal +, pygments +, pyphen +, PyRSS2Gen +, pytestCheckHook +, pythonOlder +, requests , ruamel_yaml -, aiohttp +, stdenv +, toml +, typogrify +, unidecode , watchdog +, Yapsy }: buildPythonPackage rec { pname = "Nikola"; version = "8.1.3"; - - # Nix contains only Python 3 supported version of doit, which is a dependency - # of Nikola. Python 2 support would require older doit 0.29.0 (which on the - # other hand doesn't support Python 3.3). So, just disable Python 2. - disabled = !isPy3k; - - checkInputs = [ pytest pytestcov mock glibcLocales freezegun ]; - - propagatedBuildInputs = [ - # requirements.txt - doit pygments pillow dateutil docutils Mako markdown unidecode - lxml Yapsy PyRSS2Gen Logbook blinker natsort requests piexif Babel - # requirements-extras.txt - phpserialize jinja2 toml notebook ruamel_yaml aiohttp watchdog - ]; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; sha256 = "05eac356bb4273cdd05d2dd6ad676226133496c457af91987c3f0d40e2fe57ef"; }; - patchPhase = '' - # upstream added bound so that requires.io doesn't send mails about update - # nikola should work with markdown 3.0: https://github.com/getnikola/nikola/pull/3175#issue-220147596 - sed -i 's/Markdown>.*/Markdown/' requirements.txt + propagatedBuildInputs = [ + aiohttp + Babel + blinker + dateutil + docutils + doit + ghp-import + hsluv + html5lib + ipykernel + jinja2 + lxml + Mako + markdown + micawber + natsort + notebook + phpserialize + piexif + pillow + pygal + pygments + pyphen + PyRSS2Gen + requests + ruamel_yaml + toml + typogrify + unidecode + watchdog + Yapsy + ]; + + checkInputs = [ + freezegun + mock + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov nikola --cov-report term-missing" "" ''; - checkPhase = '' - LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" py.test . - ''; + disabledTests = [ + # AssertionError + "test_compiling_markdown" + ]; - meta = { + pythonImportsCheck = [ "nikola" ]; + + meta = with lib; { + description = "Static website and blog generator"; homepage = "https://getnikola.com/"; - description = "A modular, fast, simple, static website and blog generator"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ jluttine ]; - # all tests fail + license = licenses.mit; + maintainers = with maintainers; [ jluttine ]; + # All tests fail broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix index cfbf3be1c4..aee4789f93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "PyRMVtransport"; - version = "0.3.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "cgtobi"; repo = pname; rev = "v${version}"; - sha256 = "1savzndg8l7rrc5dgzgsrdz9hnnjfv6qs5drznqmdw4f2rq84ypa"; + sha256 = "0m74m3dhxmbv10hsvs7cpshzs3pg66va5lyq94i5j1nxrl9i7spb"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix index 01a299c89f..ccacef6df5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix @@ -11,20 +11,20 @@ buildPythonPackage rec { pname = "accuweather"; - version = "0.1.1"; + version = "0.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-fjOwa13hxY8/gCM6TCAFWVmEY1oZyqKyc6o3OSsxHpY="; + sha256 = "sha256-Swe8vegRcyaeG4n/8aeGFLrXkwcLM/Al53yD6oD/0GA="; }; postPatch = '' substituteInPlace setup.py \ --replace "pytest-runner" "" - substituteInPlace pytest.ini \ + substituteInPlace setup.cfg \ --replace "--cov --cov-report term-missing" "" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 5d0ee6f7c4..c7fc8b0b57 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.8.0"; + version = "3.13.1"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-AjUpxdY/5IoWMBtufP3OVnMpUwpxgpCNWoydH1w+t+Y="; + sha256 = "sha256-SUK2EpOHCFWm4zV+yRtzz81B0GMcwRsVnTOh2msSsSk="; }; nativeBuildInputs = [ setuptools-scm ]; 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 index 5377785ff2..6cbbe7c5d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "adb-shell"; - version = "0.3.1"; + version = "0.3.2"; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "adb_shell"; rev = "v${version}"; - sha256 = "sha256-b+9ySme44TdIlVnF8AHBBGd8pkoeYG99wmDK/nyAreo="; + sha256 = "sha256-+K4fV8dlRpOZC5B7cvkfPRVK/2OBkH9qOmAnOwsm7kQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix index af98bbded8..752c905ee8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage -, agate, openpyxl, xlrd, nose +, agate, openpyxl, xlrd, pytestCheckHook }: buildPythonPackage rec { @@ -13,11 +13,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ agate openpyxl xlrd ]; - checkInputs = [ nose ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - nosetests - ''; + disabledTests = [ + # See https://github.com/wireservice/agate-excel/issues/45 + "test_ambiguous_date" + ]; meta = with lib; { description = "Adds read support for excel files to agate"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/compat-pamqp-3.patch b/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/compat-pamqp-3.patch new file mode 100644 index 0000000000..0d319eb2a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/compat-pamqp-3.patch @@ -0,0 +1,498 @@ +From 17b5be250cb5ecf95cf4f77c8c930450d876efa6 Mon Sep 17 00:00:00 2001 +From: dzen +Date: Thu, 12 Mar 2020 08:32:29 +0100 +Subject: [PATCH 1/3] Moves to pamqp 3.0 + +--- + aioamqp/channel.py | 114 +++++++++++++++++++------------------- + aioamqp/frame.py | 1 - + aioamqp/protocol.py | 22 ++++---- + aioamqp/tests/testcase.py | 2 +- + 4 files changed, 69 insertions(+), 70 deletions(-) + +diff --git a/aioamqp/channel.py b/aioamqp/channel.py +index 7f0f402..ea164c4 100644 +--- a/aioamqp/channel.py ++++ b/aioamqp/channel.py +@@ -9,7 +9,7 @@ + from itertools import count + import warnings + +-import pamqp.specification ++import pamqp.commands + + from . import frame as amqp_frame + from . import exceptions +@@ -78,35 +78,35 @@ def connection_closed(self, server_code=None, server_reason=None, exception=None + + async def dispatch_frame(self, frame): + methods = { +- pamqp.specification.Channel.OpenOk.name: self.open_ok, +- pamqp.specification.Channel.FlowOk.name: self.flow_ok, +- pamqp.specification.Channel.CloseOk.name: self.close_ok, +- pamqp.specification.Channel.Close.name: self.server_channel_close, +- +- pamqp.specification.Exchange.DeclareOk.name: self.exchange_declare_ok, +- pamqp.specification.Exchange.BindOk.name: self.exchange_bind_ok, +- pamqp.specification.Exchange.UnbindOk.name: self.exchange_unbind_ok, +- pamqp.specification.Exchange.DeleteOk.name: self.exchange_delete_ok, +- +- pamqp.specification.Queue.DeclareOk.name: self.queue_declare_ok, +- pamqp.specification.Queue.DeleteOk.name: self.queue_delete_ok, +- pamqp.specification.Queue.BindOk.name: self.queue_bind_ok, +- pamqp.specification.Queue.UnbindOk.name: self.queue_unbind_ok, +- pamqp.specification.Queue.PurgeOk.name: self.queue_purge_ok, +- +- pamqp.specification.Basic.QosOk.name: self.basic_qos_ok, +- pamqp.specification.Basic.ConsumeOk.name: self.basic_consume_ok, +- pamqp.specification.Basic.CancelOk.name: self.basic_cancel_ok, +- pamqp.specification.Basic.GetOk.name: self.basic_get_ok, +- pamqp.specification.Basic.GetEmpty.name: self.basic_get_empty, +- pamqp.specification.Basic.Deliver.name: self.basic_deliver, +- pamqp.specification.Basic.Cancel.name: self.server_basic_cancel, +- pamqp.specification.Basic.Ack.name: self.basic_server_ack, +- pamqp.specification.Basic.Nack.name: self.basic_server_nack, +- pamqp.specification.Basic.RecoverOk.name: self.basic_recover_ok, +- pamqp.specification.Basic.Return.name: self.basic_return, +- +- pamqp.specification.Confirm.SelectOk.name: self.confirm_select_ok, ++ pamqp.commands.Channel.OpenOk.name: self.open_ok, ++ pamqp.commands.Channel.FlowOk.name: self.flow_ok, ++ pamqp.commands.Channel.CloseOk.name: self.close_ok, ++ pamqp.commands.Channel.Close.name: self.server_channel_close, ++ ++ pamqp.commands.Exchange.DeclareOk.name: self.exchange_declare_ok, ++ pamqp.commands.Exchange.BindOk.name: self.exchange_bind_ok, ++ pamqp.commands.Exchange.UnbindOk.name: self.exchange_unbind_ok, ++ pamqp.commands.Exchange.DeleteOk.name: self.exchange_delete_ok, ++ ++ pamqp.commands.Queue.DeclareOk.name: self.queue_declare_ok, ++ pamqp.commands.Queue.DeleteOk.name: self.queue_delete_ok, ++ pamqp.commands.Queue.BindOk.name: self.queue_bind_ok, ++ pamqp.commands.Queue.UnbindOk.name: self.queue_unbind_ok, ++ pamqp.commands.Queue.PurgeOk.name: self.queue_purge_ok, ++ ++ pamqp.commands.Basic.QosOk.name: self.basic_qos_ok, ++ pamqp.commands.Basic.ConsumeOk.name: self.basic_consume_ok, ++ pamqp.commands.Basic.CancelOk.name: self.basic_cancel_ok, ++ pamqp.commands.Basic.GetOk.name: self.basic_get_ok, ++ pamqp.commands.Basic.GetEmpty.name: self.basic_get_empty, ++ pamqp.commands.Basic.Deliver.name: self.basic_deliver, ++ pamqp.commands.Basic.Cancel.name: self.server_basic_cancel, ++ pamqp.commands.Basic.Ack.name: self.basic_server_ack, ++ pamqp.commands.Basic.Nack.name: self.basic_server_nack, ++ pamqp.commands.Basic.RecoverOk.name: self.basic_recover_ok, ++ pamqp.commands.Basic.Return.name: self.basic_return, ++ ++ pamqp.commands.Confirm.SelectOk.name: self.confirm_select_ok, + } + + if frame.name not in methods: +@@ -144,7 +144,7 @@ async def _write_frame_awaiting_response(self, waiter_id, channel_id, request, + + async def open(self): + """Open the channel on the server.""" +- request = pamqp.specification.Channel.Open() ++ request = pamqp.commands.Channel.Open() + return (await self._write_frame_awaiting_response( + 'open', self.channel_id, request, no_wait=False, check_open=False)) + +@@ -159,7 +159,7 @@ async def close(self, reply_code=0, reply_text="Normal Shutdown"): + if not self.is_open: + raise exceptions.ChannelClosed("channel already closed or closing") + self.close_event.set() +- request = pamqp.specification.Channel.Close(reply_code, reply_text, class_id=0, method_id=0) ++ request = pamqp.commands.Channel.Close(reply_code, reply_text, class_id=0, method_id=0) + return (await self._write_frame_awaiting_response( + 'close', self.channel_id, request, no_wait=False, check_open=False)) + +@@ -169,7 +169,7 @@ async def close_ok(self, frame): + self.protocol.release_channel_id(self.channel_id) + + async def _send_channel_close_ok(self): +- request = pamqp.specification.Channel.CloseOk() ++ request = pamqp.commands.Channel.CloseOk() + await self._write_frame(self.channel_id, request) + + async def server_channel_close(self, frame): +@@ -183,7 +183,7 @@ async def server_channel_close(self, frame): + self.connection_closed(results['reply_code'], results['reply_text']) + + async def flow(self, active): +- request = pamqp.specification.Channel.Flow(active) ++ request = pamqp.commands.Channel.Flow(active) + return (await self._write_frame_awaiting_response( + 'flow', self.channel_id, request, no_wait=False, + check_open=False)) +@@ -201,7 +201,7 @@ async def flow_ok(self, frame): + + async def exchange_declare(self, exchange_name, type_name, passive=False, durable=False, + auto_delete=False, no_wait=False, arguments=None): +- request = pamqp.specification.Exchange.Declare( ++ request = pamqp.commands.Exchange.Declare( + exchange=exchange_name, + exchange_type=type_name, + passive=passive, +@@ -222,7 +222,7 @@ async def exchange_declare_ok(self, frame): + return future + + async def exchange_delete(self, exchange_name, if_unused=False, no_wait=False): +- request = pamqp.specification.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait) ++ request = pamqp.commands.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait) + return await self._write_frame_awaiting_response( + 'exchange_delete', self.channel_id, request, no_wait) + +@@ -235,7 +235,7 @@ async def exchange_bind(self, exchange_destination, exchange_source, routing_key + no_wait=False, arguments=None): + if arguments is None: + arguments = {} +- request = pamqp.specification.Exchange.Bind( ++ request = pamqp.commands.Exchange.Bind( + destination=exchange_destination, + source=exchange_source, + routing_key=routing_key, +@@ -255,7 +255,7 @@ async def exchange_unbind(self, exchange_destination, exchange_source, routing_k + if arguments is None: + arguments = {} + +- request = pamqp.specification.Exchange.Unbind( ++ request = pamqp.commands.Exchange.Unbind( + destination=exchange_destination, + source=exchange_source, + routing_key=routing_key, +@@ -297,7 +297,7 @@ async def queue_declare(self, queue_name=None, passive=False, durable=False, + + if not queue_name: + queue_name = 'aioamqp.gen-' + str(uuid.uuid4()) +- request = pamqp.specification.Queue.Declare( ++ request = pamqp.commands.Queue.Declare( + queue=queue_name, + passive=passive, + durable=durable, +@@ -327,7 +327,7 @@ async def queue_delete(self, queue_name, if_unused=False, if_empty=False, no_wai + if_empty: bool, the queue is deleted if it has no messages. Raise if not. + no_wait: bool, if set, the server will not respond to the method + """ +- request = pamqp.specification.Queue.Delete( ++ request = pamqp.commands.Queue.Delete( + queue=queue_name, + if_unused=if_unused, + if_empty=if_empty, +@@ -346,7 +346,7 @@ async def queue_bind(self, queue_name, exchange_name, routing_key, no_wait=False + if arguments is None: + arguments = {} + +- request = pamqp.specification.Queue.Bind( ++ request = pamqp.commands.Queue.Bind( + queue=queue_name, + exchange=exchange_name, + routing_key=routing_key, +@@ -367,7 +367,7 @@ async def queue_unbind(self, queue_name, exchange_name, routing_key, arguments=N + if arguments is None: + arguments = {} + +- request = pamqp.specification.Queue.Unbind( ++ request = pamqp.commands.Queue.Unbind( + queue=queue_name, + exchange=exchange_name, + routing_key=routing_key, +@@ -383,7 +383,7 @@ async def queue_unbind_ok(self, frame): + logger.debug("Queue unbound") + + async def queue_purge(self, queue_name, no_wait=False): +- request = pamqp.specification.Queue.Purge( ++ request = pamqp.commands.Queue.Purge( + queue=queue_name, nowait=no_wait + ) + return (await self._write_frame_awaiting_response( +@@ -406,7 +406,7 @@ async def basic_publish(self, payload, exchange_name, routing_key, + if properties is None: + properties = {} + +- method_request = pamqp.specification.Basic.Publish( ++ method_request = pamqp.commands.Basic.Publish( + exchange=exchange_name, + routing_key=routing_key, + mandatory=mandatory, +@@ -417,7 +417,7 @@ async def basic_publish(self, payload, exchange_name, routing_key, + + header_request = pamqp.header.ContentHeader( + body_size=len(payload), +- properties=pamqp.specification.Basic.Properties(**properties) ++ properties=pamqp.commands.Basic.Properties(**properties) + ) + await self._write_frame(self.channel_id, header_request, drain=False) + +@@ -446,7 +446,7 @@ async def basic_qos(self, prefetch_size=0, prefetch_count=0, connection_global=F + settings should apply per-consumer channel; and global=true to mean + that the QoS settings should apply per-channel. + """ +- request = pamqp.specification.Basic.Qos( ++ request = pamqp.commands.Basic.Qos( + prefetch_size, prefetch_count, connection_global + ) + return (await self._write_frame_awaiting_response( +@@ -490,7 +490,7 @@ async def basic_consume(self, callback, queue_name='', consumer_tag='', no_local + if arguments is None: + arguments = {} + +- request = pamqp.specification.Basic.Consume( ++ request = pamqp.commands.Basic.Consume( + queue=queue_name, + consumer_tag=consumer_tag, + no_local=no_local, +@@ -561,7 +561,7 @@ async def server_basic_cancel(self, frame): + callback, error) + + async def basic_cancel(self, consumer_tag, no_wait=False): +- request = pamqp.specification.Basic.Cancel(consumer_tag, no_wait) ++ request = pamqp.commands.Basic.Cancel(consumer_tag, no_wait) + return (await self._write_frame_awaiting_response( + 'basic_cancel', self.channel_id, request, no_wait=no_wait) + ) +@@ -575,7 +575,7 @@ async def basic_cancel_ok(self, frame): + logger.debug("Cancel ok") + + async def basic_get(self, queue_name='', no_ack=False): +- request = pamqp.specification.Basic.Get(queue=queue_name, no_ack=no_ack) ++ request = pamqp.commands.Basic.Get(queue=queue_name, no_ack=no_ack) + return (await self._write_frame_awaiting_response( + 'basic_get', self.channel_id, request, no_wait=False) + ) +@@ -606,11 +606,11 @@ async def basic_get_empty(self, frame): + future.set_exception(exceptions.EmptyQueue) + + async def basic_client_ack(self, delivery_tag, multiple=False): +- request = pamqp.specification.Basic.Ack(delivery_tag, multiple) ++ request = pamqp.commands.Basic.Ack(delivery_tag, multiple) + await self._write_frame(self.channel_id, request) + + async def basic_client_nack(self, delivery_tag, multiple=False, requeue=True): +- request = pamqp.specification.Basic.Nack(delivery_tag, multiple, requeue) ++ request = pamqp.commands.Basic.Nack(delivery_tag, multiple, requeue) + await self._write_frame(self.channel_id, request) + + async def basic_server_ack(self, frame): +@@ -620,15 +620,15 @@ async def basic_server_ack(self, frame): + fut.set_result(True) + + async def basic_reject(self, delivery_tag, requeue=False): +- request = pamqp.specification.Basic.Reject(delivery_tag, requeue) ++ request = pamqp.commands.Basic.Reject(delivery_tag, requeue) + await self._write_frame(self.channel_id, request) + + async def basic_recover_async(self, requeue=True): +- request = pamqp.specification.Basic.RecoverAsync(requeue) ++ request = pamqp.commands.Basic.RecoverAsync(requeue) + await self._write_frame(self.channel_id, request) + + async def basic_recover(self, requeue=True): +- request = pamqp.specification.Basic.Recover(requeue) ++ request = pamqp.commands.Basic.Recover(requeue) + return (await self._write_frame_awaiting_response( + 'basic_recover', self.channel_id, request, no_wait=False) + ) +@@ -681,7 +681,7 @@ async def publish(self, payload, exchange_name, routing_key, properties=None, ma + delivery_tag = next(self.delivery_tag_iter) # pylint: disable=stop-iteration-return + fut = self._set_waiter('basic_server_ack_{}'.format(delivery_tag)) + +- method_request = pamqp.specification.Basic.Publish( ++ method_request = pamqp.commands.Basic.Publish( + exchange=exchange_name, + routing_key=routing_key, + mandatory=mandatory, +@@ -689,7 +689,7 @@ async def publish(self, payload, exchange_name, routing_key, properties=None, ma + ) + await self._write_frame(self.channel_id, method_request, drain=False) + +- properties = pamqp.specification.Basic.Properties(**properties) ++ properties = pamqp.commands.Basic.Properties(**properties) + header_request = pamqp.header.ContentHeader( + body_size=len(payload), properties=properties + ) +@@ -710,7 +710,7 @@ async def publish(self, payload, exchange_name, routing_key, properties=None, ma + async def confirm_select(self, *, no_wait=False): + if self.publisher_confirms: + raise ValueError('publisher confirms already enabled') +- request = pamqp.specification.Confirm.Select(nowait=no_wait) ++ request = pamqp.commands.Confirm.Select(nowait=no_wait) + + return (await self._write_frame_awaiting_response( + 'confirm_select', self.channel_id, request, no_wait) +diff --git a/aioamqp/frame.py b/aioamqp/frame.py +index d70cfd7..af27ab5 100644 +--- a/aioamqp/frame.py ++++ b/aioamqp/frame.py +@@ -42,7 +42,6 @@ + import socket + + import pamqp.encode +-import pamqp.specification + import pamqp.frame + + from . import exceptions +diff --git a/aioamqp/protocol.py b/aioamqp/protocol.py +index e111dea..f0b928d 100644 +--- a/aioamqp/protocol.py ++++ b/aioamqp/protocol.py +@@ -5,9 +5,9 @@ + import asyncio + import logging + ++import pamqp.commands + import pamqp.frame + import pamqp.heartbeat +-import pamqp.specification + + from . import channel as amqp_channel + from . import constants as amqp_constants +@@ -159,7 +159,7 @@ async def close(self, no_wait=False, timeout=None): + """Close connection (and all channels)""" + await self.ensure_open() + self.state = CLOSING +- request = pamqp.specification.Connection.Close( ++ request = pamqp.commands.Connection.Close( + reply_code=0, + reply_text='', + class_id=0, +@@ -254,11 +254,11 @@ async def dispatch_frame(self, frame_channel=None, frame=None): + """Dispatch the received frame to the corresponding handler""" + + method_dispatch = { +- pamqp.specification.Connection.Close.name: self.server_close, +- pamqp.specification.Connection.CloseOk.name: self.close_ok, +- pamqp.specification.Connection.Tune.name: self.tune, +- pamqp.specification.Connection.Start.name: self.start, +- pamqp.specification.Connection.OpenOk.name: self.open_ok, ++ pamqp.commands.Connection.Close.name: self.server_close, ++ pamqp.commands.Connection.CloseOk.name: self.close_ok, ++ pamqp.commands.Connection.Tune.name: self.tune, ++ pamqp.commands.Connection.Start.name: self.start, ++ pamqp.commands.Connection.OpenOk.name: self.open_ok, + } + if frame_channel is None and frame is None: + frame_channel, frame = await self.get_frame() +@@ -395,7 +395,7 @@ async def start_ok(self, client_properties, mechanism, auth, locale): + def credentials(): + return '\0{LOGIN}\0{PASSWORD}'.format(**auth) + +- request = pamqp.specification.Connection.StartOk( ++ request = pamqp.commands.Connection.StartOk( + client_properties=client_properties, + mechanism=mechanism, + locale=locale, +@@ -417,7 +417,7 @@ async def server_close(self, frame): + self._stream_writer.close() + + async def _close_ok(self): +- request = pamqp.specification.Connection.CloseOk() ++ request = pamqp.commands.Connection.CloseOk() + await self._write_frame(0, request) + + async def tune(self, frame): +@@ -426,7 +426,7 @@ async def tune(self, frame): + self.server_heartbeat = frame.heartbeat + + async def tune_ok(self, channel_max, frame_max, heartbeat): +- request = pamqp.specification.Connection.TuneOk( ++ request = pamqp.commands.Connection.TuneOk( + channel_max, frame_max, heartbeat + ) + await self._write_frame(0, request) +@@ -436,7 +436,7 @@ async def secure_ok(self, login_response): + + async def open(self, virtual_host, capabilities='', insist=False): + """Open connection to virtual host.""" +- request = pamqp.specification.Connection.Open( ++ request = pamqp.commands.Connection.Open( + virtual_host, capabilities, insist + ) + await self._write_frame(0, request) +diff --git a/aioamqp/tests/testcase.py b/aioamqp/tests/testcase.py +index 120104b..d6d702b 100644 +--- a/aioamqp/tests/testcase.py ++++ b/aioamqp/tests/testcase.py +@@ -147,7 +147,7 @@ def server_version(self, amqp=None): + if amqp is None: + amqp = self.amqp + +- server_version = tuple(int(x) for x in amqp.server_properties['version'].decode().split('.')) ++ server_version = tuple(int(x) for x in amqp.server_properties['version'].split('.')) + return server_version + + async def check_exchange_exists(self, exchange_name): + +From c900f6d5e8ef273000d221d0e46ab81ed4aed2a2 Mon Sep 17 00:00:00 2001 +From: dzen +Date: Wed, 25 Mar 2020 11:02:04 +0100 +Subject: [PATCH 2/3] fix pamqp version for tests on travis + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index a740243..2277b28 100644 +--- a/setup.py ++++ b/setup.py +@@ -25,7 +25,7 @@ + 'aioamqp', + ], + install_requires=[ +- 'pamqp>=2.2.0,<3', ++ 'pamqp>=3.0.0', # TODO(bcalvez): for tests purpose, until 3.0 is released + ], + classifiers=[ + "Development Status :: 4 - Beta", + +From 836340e8d881a93b0111b9aed6f2bb2926f38de6 Mon Sep 17 00:00:00 2001 +From: dzen +Date: Wed, 25 Mar 2020 11:37:45 +0100 +Subject: [PATCH 3/3] pamqp 3.0 is no more compatible with 3.5 + +--- + .travis.yml | 1 - + setup.cfg | 2 +- + setup.py | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/.travis.yml b/.travis.yml +index 1069e7c..46d6fea 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -1,7 +1,6 @@ + language: python + dist: bionic + python: +-- 3.5 + - 3.6 + - 3.7-dev + - 3.8 +diff --git a/setup.cfg b/setup.cfg +index 0ab7d0b..d0ba16e 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -1,2 +1,2 @@ + [bdist_wheel] +-python-tag = py35.py36.py37.py38 ++python-tag = py36.py37.py38 +diff --git a/setup.py b/setup.py +index 2277b28..c413078 100644 +--- a/setup.py ++++ b/setup.py +@@ -27,6 +27,7 @@ + install_requires=[ + 'pamqp==3.0.0a6', # TODO(bcalvez): for tests purpose, until 3.0 is released + ], ++ python_requires=">=3.6", + classifiers=[ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", +@@ -34,7 +35,6 @@ + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3", +- "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix index 5be5b6a1dd..a2882ce128 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix @@ -20,6 +20,8 @@ buildPythonPackage rec { sha256 = "1gpfsrc2vi6w33c9zsycd2qn589pr7a222rb41r85m915283zy48"; }; + patches = [ ./compat-pamqp-3.patch ]; + propagatedBuildInputs = [ pamqp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioasuswrt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioasuswrt/default.nix index edd2796eca..a6bd79e80e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioasuswrt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioasuswrt/default.nix @@ -9,18 +9,16 @@ buildPythonPackage rec { pname = "aioasuswrt"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "kennedyshead"; repo = pname; - rev = "V${version}"; - sha256 = "1h1qwc7szgrcwiz4q6x4mlf26is20lj1ds5rcb9i611j26656v6d"; + rev = version; + sha256 = "101d76zarvilzfmcy8n3bjqzyars8hsjzr0zc80d4rngv4vhrki1"; }; postPatch = '' - substituteInPlace setup.py \ - --replace "cryptography==3.3.2" "cryptography" substituteInPlace setup.cfg \ --replace "--cov-report html" "" \ --replace "--cov-report term-missing" "" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix index f75a0d6bb6..1ebf66a259 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,18 +10,18 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "1.2.2"; + version = "1.3.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "37c23166603a3bd134e5f6fc22dbbf8c274d4d24c71418fba292ed2cd7a0bf43"; + sha256 = "17pcdi69bwdfw2wv3a0fhira5gimw88sp2wf47yqz50z1ckhv2c1"; }; # relax version constraints: aiobotocore works with newer botocore versions # the pinning used to match some `extras_require` we're not using. - preConfigure = '' - substituteInPlace setup.py --replace 'botocore>=1.17.44,<1.17.45' 'botocore' + postPatch = '' + substituteInPlace setup.py --replace 'botocore>=1.20.49,<1.20.50' 'botocore' ''; propagatedBuildInputs = [ wrapt aiohttp aioitertools botocore ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiobotocore" ]; meta = with lib; { - description = "Async client for amazon services using botocore and aiohttp/asyncio."; + description = "Python client for amazon services"; license = licenses.asl20; homepage = "https://github.com/aio-libs/aiobotocore"; maintainers = with maintainers; [ teh ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix index 8a7f72f8b8..942482ba5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix @@ -1,6 +1,6 @@ { lib -, async-dns , buildPythonPackage +, dnspython , fetchFromGitHub , ifaddr , pyroute2 @@ -11,18 +11,18 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.3.4"; + version = "1.4.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TmWl5d5HwyqWPUjwtEvc5FzVfxV/K1pekljcMkGN0Ag="; + sha256 = "sha256-t0bs3n0eLUR22i1lZkepCffjiUFzvXBdP7Xq49KXeS4="; }; propagatedBuildInputs = [ - async-dns + dnspython pyroute2 ifaddr ]; @@ -36,10 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - preBuild = '' - export HOME=$TMPDIR - ''; - disabledTests = [ # Tests require access to /etc/resolv.conf "test_async_discover_hosts" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index 7525e4dcca..686163f357 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "2.6.6"; + version = "2.7.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-LdBUtU5rNoixh7DPIFkHxLMvBeI6MZH57sO0IjuOQAw="; + sha256 = "sha256-PCoSJnt8EptVq5u0+NgEBwY6zLkD87XqVRBDdqBziM8="; }; propagatedBuildInputs = [ attrs protobuf zeroconf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix index 7b0bfe8068..4e75f56a8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -1,16 +1,16 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder, aiohttp, attrs }: +{ lib, fetchPypi, buildPythonPackage, pythonOlder, aiohttp, python-socks, attrs }: buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.3.9"; + version = "0.6.0"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - sha256 = "1mn2ng66951mri49f99zh3660j83kvqhr6dpx90s9fkjwk83hmjy"; + sha256 = "04w010bvi719ifpc3sshav95k10hf9nq8czn9yglkj206yxcypdr"; }; - propagatedBuildInputs = [ aiohttp attrs ]; + propagatedBuildInputs = [ aiohttp attrs python-socks ]; # Checks needs internet access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix index b495bf4df4..65baaec371 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix @@ -1,19 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, aiohttp }: +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +}: buildPythonPackage rec { pname = "aiohue"; - version = "2.2.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "35696d04d6eb0328b7031ea3c0a3cfe5d83dfcf62f920522e4767d165c6bc529"; + sha256 = "1qxvqqsflcn263yg7r8vvfc2c2fl3rh4dkzwzh926ijnbc2sk4nm"; }; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; + + pythonImportsCheck = [ + "aiohue" + "aiohue.discovery" + ]; + + # Project has no tests + doCheck = false; meta = with lib; { - description = "asyncio package to talk to Philips Hue"; - homepage = "https://github.com/balloob/aiohue"; - license = licenses.asl20; + description = "Python package to talk to Philips Hue"; + homepage = "https://github.com/home-assistant-libs/aiohue"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix index 803f642406..3432931f93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix @@ -4,6 +4,7 @@ , pymysql , pytest , isPy27 +, fetchpatch }: buildPythonPackage rec { @@ -18,6 +19,14 @@ buildPythonPackage rec { sha256 = "1qvy3phbsxp55161dnppjfx2m1kn82v0irc3xzqw0adfd81vaiad"; }; + patches = [ + (fetchpatch { + # vendor functions previously provided by pymysql.util + url = "https://github.com/aio-libs/aiomysql/pull/554/commits/919b997a9de7f53d721af76762fba425e306531e.patch"; + sha256 = "V1VYyqr6RwTXoVoGVyMuJst6uqTuuHbpMOpLoVZO1XA="; + }) + ]; + propagatedBuildInputs = [ pymysql ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiopg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiopg/default.nix new file mode 100644 index 0000000000..cb9cd327e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiopg/default.nix @@ -0,0 +1,42 @@ +{ lib +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, psycopg2 +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiopg"; + version = "1.2.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = pname; + rev = "v${version}"; + sha256 = "0c6s2p1fjbdk1ygpl6a1s1rbnsk8gw9kj99pf98nxhb9j3iahas4"; + }; + + propagatedBuildInputs = [ + async-timeout + psycopg2 + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "psycopg2-binary" "psycopg2" + ''; + + # Tests requires a PostgreSQL Docker instance + doCheck = false; + + pythonImportsCheck = [ "aiopg" ]; + + meta = with lib; { + description = "Python library for accessing a PostgreSQL database"; + homepage = "https://aiopg.readthedocs.io/"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix new file mode 100644 index 0000000000..489ca5d6f6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix @@ -0,0 +1,66 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytest-asyncio +, pytest-timeout +, pytestCheckHook +, pythonOlder +, pytz +}: + +buildPythonPackage rec { + pname = "aiopvpc"; + version = "2.0.2"; + disabled = pythonOlder "3.7"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "azogue"; + repo = pname; + rev = "v${version}"; + sha256 = "1ajs4kbdlfn4h7f3d6lwkp4yl1rl7zyvj997nhsz93jjwxbajkpv"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + pytz + async-timeout + ]; + + checkInputs = [ + pytest-asyncio + pytest-timeout + pytestCheckHook + ]; + + patches = [ + # Switch to poetry-core, https://github.com/azogue/aiopvpc/pull/10 + (fetchpatch { + name = "use-peotry-core.patch"; + url = "https://github.com/azogue/aiopvpc/commit/4bc2740ffd485a60acf579b4f3eb5ee6a353245c.patch"; + sha256 = "0ynj7pqq3akdvdrvqcwnnslay3mn1q92qhk8fg95ppflzscixli6"; + }) + ]; + + postPatch = '' + substituteInPlace pytest.ini --replace \ + " --cov --cov-report term --cov-report html" "" + ''; + + pythonImportsCheck = [ "aiopvpc" ]; + + meta = with lib; { + description = "Python module to download Spanish electricity hourly prices (PVPC)"; + homepage = "https://github.com/azogue/aiopvpc"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix index aa5e227ca6..05b4794a82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-vlIon+VAHeJiaSIVMEKEpwQC4gXA52vxfEkiQMC9yiw="; + sha256 = "sha256-c4EFR7rcYdrCdM0AfmX/d7cP4woh6P1iAjeSQV9ieKM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioymaps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioymaps/default.nix new file mode 100644 index 0000000000..4a6d806dee --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioymaps/default.nix @@ -0,0 +1,33 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioymaps"; + version = "1.1.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rvgf4flvnpjj0sm14xlnfmmnlmkz6xq5h5mfb14amkfy76za3jm"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "aioymaps" ]; + + meta = with lib; { + description = "Python package fetch data from Yandex maps"; + homepage = "https://github.com/devbis/aioymaps"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix new file mode 100644 index 0000000000..8ab0e7a7c0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, docopt +, fetchFromGitHub +, hypothesis +, passlib +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pyyaml +, transitions +, websockets +}: + +buildPythonPackage rec { + pname = "amqtt"; + version = "0.10.0-alpha.3"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Yakifo"; + repo = pname; + rev = "v${version}"; + sha256 = "0wz85ykjgi2174qcdgpakmc4m0p96v62az7pvc9hyallq1v1k4n6"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + docopt + passlib + pyyaml + transitions + websockets + ]; + + checkInputs = [ + hypothesis + pytest-asyncio + pytestCheckHook + ]; + + disabledTestPaths = [ + # Test are not ported from hbmqtt yet + "tests/test_cli.py" + "tests/test_client.py" + ]; + + disabledTests = [ + # Requires network access + "test_connect_tcp" + ]; + + pythonImportsCheck = [ "amqtt" ]; + + meta = with lib; { + description = "Python MQTT client and broker implementation"; + homepage = "https://amqtt.readthedocs.io/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix index 98ab09fd8e..02edcea42e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.58"; + version = "0.0.59"; # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - sha256 = "sha256-/5sYiYRFa8XJJ4QSxLzJBHaKfAKsGETiVDHerNQ79U8="; + sha256 = "sha256-QuKWOo+QMBpVJglwvaSMbKKYMN/MW31E7BgIMchESG8="; }; propagatedBuildInputs = [ adb-shell pure-python-adb ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix index f28668a891..9cc3fb8277 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix @@ -1,22 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi -, dateutil, mock, isPy3k }: +{ lib +, buildPythonPackage +, dateutil +, fetchPypi +, isPy3k +, mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "aniso8601"; version = "9.0.1"; - meta = with lib; { - description = "Parses ISO 8601 strings."; - homepage = "https://bitbucket.org/nielsenb/aniso8601"; - license = licenses.bsd3; - }; - - propagatedBuildInputs = [ dateutil ]; - - checkInputs = lib.optional (!isPy3k) mock; - src = fetchPypi { inherit pname version; - sha256 = "72e3117667eedf66951bb2d93f4296a56b94b078a8a95905a052611fb3f1b973"; + sha256 = "sha256-cuMRdmfu32aVG7LZP0KWpWuUsHioqVkFoFJhH7PxuXM="; + }; + + propagatedBuildInputs = [ + dateutil + ]; + + checkInputs = [ + pytestCheckHook + ] ++ lib.optional (!isPy3k) mock; + + pythonImportsCheck = [ "aniso8601" ]; + + meta = with lib; { + description = "Python Parser for ISO 8601 strings"; + homepage = "https://bitbucket.org/nielsenb/aniso8601"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix index 8388cd33e0..eec3b5cc81 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix @@ -1,73 +1,90 @@ { lib -, stdenv -, fetchPypi , buildPythonPackage , isPy27 -, ansible -, pyyaml -, ruamel-yaml -, rich -, pytestCheckHook -, pytest-xdist -, git -, wcmatch +, fetchPypi +, setuptools-scm +, ansible-base , enrich -, python +, flaky +, pyyaml +, rich +, ruamel-yaml +, tenacity +, wcmatch +, yamllint +, pytest-xdist +, pytestCheckHook }: buildPythonPackage rec { pname = "ansible-lint"; - version = "5.0.2"; + version = "5.0.8"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vgt/KqNozTPaON/I19SybBZuo7bbl3Duq5dTBTMlj44="; + sha256 = "sha256-tnuWKEB66bwVuwu3H3mHG99ZP+/msGhMDMRL5fyQgD8="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + ansible-base + enrich + flaky + pyyaml + rich + ruamel-yaml + tenacity + wcmatch + yamllint + ]; + + checkInputs = [ + pytest-xdist + pytestCheckHook + ]; + + pytestFlagsArray = [ + "--numprocesses" "auto" + ]; + postPatch = '' + # Both patches are addressed in https://github.com/ansible-community/ansible-lint/pull/1549 + # and should be removed once merged upstream + + # fixes test_get_yaml_files_umlaut and test_run_inside_role_dir substituteInPlace src/ansiblelint/file_utils.py \ - --replace 'raise RuntimeError("Unable to determine file type for %s" % pathex)' 'return "playbook"' + --replace 'os.path.join(root, name)' 'os.path.normpath(os.path.join(root, name))' + # fixes test_custom_kinds + substituteInPlace src/ansiblelint/file_utils.py \ + --replace "if name.endswith('.yaml') or name.endswith('.yml')" "" ''; - buildInputs = [ python ]; - - propagatedBuildInputs = [ ansible enrich pyyaml rich ruamel-yaml wcmatch ]; - - checkInputs = [ pytestCheckHook pytest-xdist git ]; - preCheck = '' # ansible wants to write to $HOME and crashes if it can't export HOME=$(mktemp -d) - export PATH=$PATH:${lib.makeBinPath [ ansible ]} + export PATH=$PATH:${lib.makeBinPath [ ansible-base ]} # create a working ansible-lint executable export PATH=$PATH:$PWD/src/ansiblelint ln -rs src/ansiblelint/__main__.py src/ansiblelint/ansible-lint patchShebangs src/ansiblelint/__main__.py + + # create symlink like in the git repo so test_included_tasks does not fail + ln -s ../roles examples/playbooks/roles ''; disabledTests = [ # requires network "test_prerun_reqs_v1" "test_prerun_reqs_v2" - # Assertion error with negative numbers; maybe requieres an ansible update? - "test_negative" - "test_example" - "test_playbook" - "test_included_tasks" - "test_long_line" - - "test_get_yaml_files_umlaut" - "test_run_inside_role_dir" - "test_role_handler_positive" ]; - # fails to run tests due to issues with temporary directory - doCheck = !stdenv.isDarwin; - - makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible ]}" ]; + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible-base ]}" ]; meta = with lib; { homepage = "https://github.com/ansible-community/ansible-lint"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/base.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/base.nix new file mode 100644 index 0000000000..f3470f80b5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/base.nix @@ -0,0 +1,78 @@ +{ lib +, buildPythonPackage +, fetchPypi +, installShellFiles +, ansible-collections +, cryptography +, jinja2 +, junit-xml +, lxml +, ncclient +, packaging +, paramiko +, pexpect +, psutil +, pycrypto +, pyyaml +, requests +, scp +, windowsSupport ? false, pywinrm +, xmltodict +}: + +buildPythonPackage rec { + pname = "ansible-base"; + version = "2.10.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0l91bwbavjnaqsnb4c6f17xl7r0cvglz3rxqfs63aagw10z5sqq4"; + }; + + # ansible_connection is already wrapped, so don't pass it through + # the python interpreter again, as it would break execution of + # connection plugins. + postPatch = '' + substituteInPlace lib/ansible/executor/task_executor.py \ + --replace "[python," "[" + ''; + + nativeBuildInputs = [ + installShellFiles + ]; + + propagatedBuildInputs = [ + # depend on ansible-collections instead of the other way around + ansible-collections + # from requirements.txt + cryptography + jinja2 + packaging + pyyaml + # optional dependencies + junit-xml + lxml + ncclient + paramiko + pexpect + psutil + pycrypto + requests + scp + xmltodict + ] ++ lib.optional windowsSupport pywinrm; + + postInstall = '' + installManPage docs/man/man1/*.1 + ''; + + # internal import errors, missing dependencies + doCheck = false; + + meta = with lib; { + description = "Radically simple IT automation"; + homepage = "https://www.ansible.com"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/collections.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/collections.nix new file mode 100644 index 0000000000..9547b9a091 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/collections.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ansible-base +, jsonschema +, jxmlease +, ncclient +, netaddr +, paramiko +, pynetbox +, scp +, textfsm +, ttp +, xmltodict +, withJunos ? false +, withNetbox ? false +}: + +buildPythonPackage rec { + pname = "ansible"; + version = "3.4.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "096rbgz730njk0pg8qnc27mmz110wqrw354ca9gasb7rqg0f4d6a"; + }; + + postPatch = '' + # make ansible-base depend on ansible-collection, not the other way around + sed -i '/ansible-base/d' setup.py + ''; + + propagatedBuildInputs = lib.unique ([ + # Support ansible collections by default, make all others optional + # ansible.netcommon + jxmlease + ncclient + netaddr + paramiko + xmltodict + # ansible.posix + # ansible.utils + jsonschema + textfsm + ttp + xmltodict + # ansible.windows + + # lots of collections with dedicated requirements.txt and pyproject.toml files, + # add the dependencies for the collections you need conditionally and install + # ansible using overrides to enable the collections you need. + ] ++ lib.optionals (withJunos) [ + # ansible_collections/junipernetworks/junos/requirements.txt + jxmlease + ncclient + paramiko + scp + xmltodict + ] ++ lib.optionals (withNetbox) [ + # ansible_collections/netbox/netbox/pyproject.toml + pynetbox + ]); + + # don't try and fail to strip 48000+ non strippable files, it takes >5 minutes! + dontStrip = true; + + # difficult to test + doCheck = false; + + meta = with lib; { + description = "Radically simple IT automation"; + homepage = "http://www.ansible.com"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix similarity index 92% rename from third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix index 245375c26b..2779feffee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.12"; + version = "2.9.21"; src = fetchFromGitHub { owner = "ansible"; repo = "ansible"; rev = "v${version}"; - sha256 = "0c794k0cyl54807sh9in0l942ah6g6wlz5kf3qvy5lhd581zlgyb"; + sha256 = "1pfiwq2wfw11vmxdq2yhk86hm5jljlrnphlzfjr01kwzfikkdp5m"; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anytree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anytree/default.nix index c11833ba57..fa92bc4489 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anytree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anytree/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Powerful and Lightweight Python Tree Data Structure"; homepage = "https://github.com/c0fec0de/anytree"; license = licenses.asl20; - maintainers = [ maintainers.worldofpeace ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix index 13fb71d7f2..1262bb3338 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , pyyaml , prance , marshmallow @@ -11,16 +12,20 @@ buildPythonPackage rec { pname = "apispec"; - version = "4.3.0"; + version = "4.4.1"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5ec0fe72f1422a1198973fcbb48d0eb5c7390f4b0fbe55474fce999ad6826a9b"; + sha256 = "sha256-qt7UrkUXUsWLcOV5kj2Nt9rwtx9i3vjI/noqUr18BqI="; }; - checkInputs = [ + propagatedBuildInputs = [ pyyaml prance + ]; + + checkInputs = [ openapi-spec-validator marshmallow mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aplpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aplpy/default.nix index e253c610c2..682ef6e17f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aplpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aplpy/default.nix @@ -27,13 +27,26 @@ buildPythonPackage rec { sha256 = "239f3d83635ca4251536aeb577df7c60df77fc4d658097b92094719739aec3f3"; }; - patches = [ (fetchpatch { - # Can be removed in next release after 2.0.3 + patches = [ + # Fixes compatibility with astropy-helpers. This patch has been merged into + # the master branch as of May 2020, and should be part of the next + # upstream release (v2.0.3 was tagged in Feb. 2019). + (fetchpatch { url = "https://github.com/aplpy/aplpy/pull/448.patch"; sha256 = "1pnzh7ykjc8hwahzbzyryrzv5a8fddgd1bmzbhagkrn6lmvhhpvq"; excludes = [ "tox.ini" "azure-pipelines.yml" ".circleci/config.yml" "MANIFEST.in" ".gitignore" "setup.cfg" "appveyor.yml" "readthedocs.yml" "CHANGES.rst" ".gitmodules" ".travis.yml" "astropy_helpers" ]; }) + # Fix for matplotlib >= 3.4 (https://github.com/aplpy/aplpy/pull/466) + # Note: because of a security thing, github will refuse to serve this patch from the + # "normal" location + # (https://github.com/aplpy/aplpy/commit/56c1cc694fdea69e7da8506d3212c4495adb0ca5.patch) + # due to the fact that it contains the PDF magic bytes, but it will serve it from + # this githubusercontent domain. + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/aplpy/aplpy/pull/466/commit/56c1cc694fdea69e7da8506d3212c4495adb0ca5.patch"; + sha256 = "0jna2n1cgfzr0a27m5z94wwph7qg25hs7lycrdb2dp3943rb35g4"; + }) ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix index fad9e7d03f..61cfed3dbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "apprise"; - version = "0.9.1"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FW5gt35yoXVr2+hiGBDJ/5jFFfIpn2Z9sDN8acoO4FI="; + sha256 = "sha256-yKzpyJHUIkVYVwrL6oCPMd+QSVML2czWmQHCemXWAMQ="; }; nativeBuildInputs = [ Babel installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astroid/1.6.nix b/third_party/nixpkgs/pkgs/development/python-modules/astroid/1.6.nix index 2c763e214e..47c7e8f6eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astroid/1.6.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astroid/1.6.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { homepage = "https://github.com/PyCQA/astroid"; license = licenses.lgpl2; platforms = platforms.all; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix index 77ac408076..d6fda529d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/PyCQA/astroid"; license = licenses.lgpl21Plus; platforms = platforms.all; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix index e82faba975..80ef403b2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix @@ -3,25 +3,42 @@ , fetchPypi , numpy , astropy -, astropy-helpers +, astropy-extension-helpers +, setuptools-scm +, pytestCheckHook +, pytest-doctestplus +, hypothesis }: buildPythonPackage rec { pname = "astropy-healpix"; version = "0.6"; - doCheck = false; # tests require pytest-astropy - src = fetchPypi { - inherit pname version; + inherit version; + pname = lib.replaceStrings ["-"] ["_"] pname; sha256 = "409a6621c383641456c074f0f0350a24a4a58e910eaeef14e9bbce3e00ad6690"; }; - propagatedBuildInputs = [ numpy astropy astropy-helpers ]; + nativeBuildInputs = [ + astropy-extension-helpers + setuptools-scm + ]; - # Disable automatic update of the astropy-helper module - postPatch = '' - substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" + propagatedBuildInputs = [ + numpy + astropy + ]; + + checkInputs = [ + pytestCheckHook + pytest-doctestplus + hypothesis + ]; + + # tests must be run in the build directory + preCheck = '' + cd build/lib* ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix index 2fa186a07d..cc0e0513ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.16.2"; + version = "0.17.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "0raq3jgh2aqllycvvi0x2j5f602vv8ggmyd3879jzqbz2znngsgb"; + sha256 = "sha256-k71fpwL999Qz/vOsmpxykMVKgASzHis/exY/8aDoAkg="; }; propagatedBuildInputs = [ 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 9271adeb61..f6d59c633c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework"; homepage = "https://asyncssh.readthedocs.io/en/latest"; license = licenses.epl20; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix new file mode 100644 index 0000000000..63e096bdc0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, typing-extensions +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "asyncstdlib"; + version = "3.9.1"; + disabled = pythonOlder "3.7"; + format = "flit"; + + src = fetchFromGitHub { + owner = "maxfischer2781"; + repo = pname; + rev = "v${version}"; + sha256 = "13ranr7zi61w52vfrxwkf32bbhk88j0r5c5z2x2h5vw268001lk2"; + }; + + propagatedBuildInputs = [ + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "asyncstdlib" ]; + + meta = with lib; { + description = "Python library that extends the Python asyncio standard library"; + homepage = "https://asyncstdlib.readthedocs.io/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} 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 617d5562b4..31d615f531 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 @@ -1,30 +1,28 @@ { lib , buildPythonPackage -, fetchPypi -, isPy3k -, certifi -, chardet +, fetchFromGitHub , deprecated -, idna , oauthlib , requests , requests_oauthlib , six -, urllib3 -, pytestrunner -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "atlassian-python-api"; version = "3.8.0"; - src = fetchPypi { - inherit pname version; - sha256 = "7ef384a91a790c807336e2bd6b7554284691aadd6d7413d199baf752dd84c53e"; + src = fetchFromGitHub { + owner = "atlassian-api"; + repo = pname; + rev = version; + sha256 = "sha256-J0/CtfBtOdWReKQS/VvOL/3r+j4zJfnv/ICIXepKUvc="; }; - checkInputs = [ pytestrunner pytest ]; + checkInputs = [ + pytestCheckHook + ]; propagatedBuildInputs = [ deprecated oauthlib requests requests_oauthlib six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix index 19015a5729..52def3d6ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix @@ -1,34 +1,78 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, - six, txaio, twisted, zope_interface, cffi, - mock, pytest, cryptography, pynacl +{ lib +, argon2_cffi +, attrs +, buildPythonPackage +, cbor +, cbor2 +, cffi +, cryptography +, fetchPypi +, flatbuffers +, mock +, msgpack +, passlib +, pynacl +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, twisted +, py-ubjson +, txaio +, ujson +, zope_interface }: + buildPythonPackage rec { pname = "autobahn"; version = "21.3.1"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "e126c1f583e872fb59e79d36977cfa1f2d0a8a79f90ae31f406faae7664b8e03"; + sha256 = "00wf9dkfgakg80gy62prg650lb8zz9y9fdlxwxcznwp8hgsw29p1"; }; - propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ]; + propagatedBuildInputs = [ + argon2_cffi + cbor + cbor2 + cffi + cryptography + flatbuffers + msgpack + passlib + py-ubjson + pynacl + twisted + txaio + ujson + zope_interface + ]; - checkInputs = [ mock pytest ]; - checkPhase = '' - runHook preCheck - USE_TWISTED=true py.test $out - runHook postCheck + checkInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest>=2.8.6,<3.3.0" "pytest" ''; - # Tests do no seem to be compatible yet with pytest 5.1 - # https://github.com/crossbario/autobahn-python/issues/1235 - doCheck = false; + preCheck = '' + # Run asyncio tests (requires twisted) + export USE_ASYNCIO=1 + ''; + + pytestFlagsArray = [ "--pyargs autobahn" ]; + + pythonImportsCheck = [ "autobahn" ]; meta = with lib; { - description = "WebSocket and WAMP in Python for Twisted and asyncio."; - homepage = "https://crossbar.io/autobahn"; - license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; + description = "WebSocket and WAMP in Python for Twisted and asyncio"; + homepage = "https://crossbar.io/autobahn"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autopep8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autopep8/default.nix index 491663b56c..737989ac31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autopep8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autopep8/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.5.6"; + version = "1.5.7"; src = fetchPypi { inherit pname version; - sha256 = "5454e6e9a3d02aae38f866eec0d9a7de4ab9f93c10a273fb0340f3d6d09f7514"; + sha256 = "276ced7e9e3cb22e5d7c14748384a5cf5d9002257c0ed50c0e075b68011bb6d0"; }; propagatedBuildInputs = [ pycodestyle toml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix index 2acec8ccc6..4057758155 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.2.2"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "89f126a072d3a6eee091e1afeed87e0b2ed3c34ed31a1814062174de3cab8d9b"; + sha256 = "7d727542927a926f488fa62d04e2c5728c72660f17f822e627f349285f295063"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix new file mode 100644 index 0000000000..73679eca1e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi, cmake, perl, stdenv, gcc10, darwin }: + +buildPythonPackage rec { + pname = "awscrt"; + version = "0.11.13"; + + buildInputs = lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]); + + # Required to suppress -Werror + # https://github.com/NixOS/nixpkgs/issues/39687 + hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; + + nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isAarch64 ([ gcc10 perl ]); + + dontUseCmakeConfigure = true; + + # Unable to import test module + # https://github.com/awslabs/aws-crt-python/issues/281 + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-G/bf2AzWp8AHL4of0zfX3jIYyTtmTLBIC2ZKiMi19c0="; + }; + + meta = with lib; { + homepage = "https://github.com/awslabs/aws-crt-python"; + description = "Python bindings for the AWS Common Runtime"; + license = licenses.asl20; + maintainers = with maintainers; [ davegallant ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-common/default.nix index f77c938b1d..2312df1caf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-common/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "1.1.26"; + version = "1.1.27"; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b2866238aea5d7492cfb0282fc8b8d5f6d06fb433872345864d45753c10b6e4f"; + sha256 = "9f3f5d991023acbd93050cf53c4e863c6973ded7e236c69e99c8ff5c7bad41ef"; }; propagatedBuildInputs = [ 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 2bcb4d4264..a63f33d742 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.12.0"; + version = "1.13.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "adf2b1c6ef150a92295b4b405f982a9d2c55c4846728cb14760ca592acbb09ec"; + sha256 = "624b46db407dbed9e03134ab65214efab5b5315949a1fbd6cd592c46fb272588"; }; propagatedBuildInputs = [ @@ -45,6 +45,8 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/" ]; # disable tests which touch network disabledTests = [ "aiohttp" "multipart_send" "response" "request" "timeout" ]; + # requires testing modules which aren't published, and likely to create cyclic dependencies + disabledTestPaths = [ "tests/test_connection_string_parsing.py" ]; meta = with lib; { description = "Microsoft Azure Core Library for Python"; 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 f2c57d7662..b201b39d52 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.51"; + version = "0.0.52"; src = fetchPypi { inherit pname version; - sha256 = "b871ebb3bcfd292e8a062dbbaacbc132793d98f1b60f549a8c3b672619603fc1"; + sha256 = "4198ddb32614d16d4502b43d5c9739f81432b7e0e4d75d30e05149fe6007fea2"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix index 3d8e4df565..e33f89c5a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.1.0"; + version = "4.1.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c4f29b2d9b717dad7919048f0a458dd84f83637c3d5c8f5a7e64634b22086719"; + sha256 = "c3bd28ccf6c837b58b58fc61275dace5348a823660c3ca21166a88aa2a8377a4"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index 4432595a12..8ca4df197b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "2.0.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "3ad7e2c3d20dd0141f9e2c0ae923121f7cbe7333bb314850e6f8b606636e3589"; + sha256 = "54fade87af54904c8ac9785efccebc537c58a3c1f8726e929e473698f06ebbfc"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index dfadfbbc10..ca662f6b14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cdn"; - version = "10.0.0"; + version = "11.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f1216f505126483c568be511a3e0e654f886f13730dae5368609ff0573528cf2"; + sha256 = "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907"; }; propagatedBuildInputs = [ 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 2bfa56dc81..c03855f816 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 @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "19.0.0"; + version = "20.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "65afe759c6ee87dd89d65d59c8da4b2c04d197c07c1fbfdc56ef1aea468e4525"; + sha256 = "7920bea2e11d78fa616992813aea470a8fb50eab2e646e032e138f93d53b70e8"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 8433025bbc..76d5c11cb6 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 @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "15.0.0"; + version = "15.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e205aada94bb630e1ba5ee57751849456e1535aec3f2173edf2cbf596b99c0d9"; + sha256 = "51c64e01e614c9b88723b86b36b48f8417171610a098bf4690e39e71cefc32d9"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 22823bfdd5..46890f7ab5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "6.1.0"; + version = "6.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7eb28eae4354e0a68e098de314b380d92f6482f53b2947dc8a36913195bdfde0"; + sha256 = "116b5bf9433ad89078c743b617c5b1c51f9ce1a1f128fb2e4bbafb5efb2d2c74"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix index 317019844c..7c76daf619 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix @@ -1,21 +1,23 @@ { lib, buildPythonPackage, fetchPypi , msrestazure , azure-common +, azure-mgmt-core }: buildPythonPackage rec { pname = "azure-mgmt-databoxedge"; - version = "0.2.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "g8BtUpIGOse8Jrws48gQ/o7sgymlgX0XIxl1ThHS3XA="; + sha256 = "04090062bc1e8f00c2f45315a3bceb0fb3b3479ec1474d71b88342e13499b087"; }; propagatedBuildInputs = [ msrestazure azure-common + azure-mgmt-core ]; # no tests in pypi tarball diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix index f8f0818598..f7d2b7b9db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -7,22 +7,24 @@ , msrestazure , azure-common , azure-mgmt-nspkg +, azure-mgmt-core }: buildPythonPackage rec { pname = "azure-mgmt-datamigration"; - version = "4.1.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4"; + sha256 = "70373dbeb35a7768a47341bb3b570c559197bc1ba36fc8f8bf15139e4c8bad70"; }; 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-dns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix index 37511456fe..7daca78085 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -6,24 +6,24 @@ , msrest , msrestazure , azure-common -, azure-mgmt-nspkg +, azure-mgmt-core }: buildPythonPackage rec { pname = "azure-mgmt-dns"; - version = "3.0.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0zxkcczf01b64qfwj98jqdvnwqahygcyccf37rcxpdcfgpkg9kbf"; + sha256 = "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8"; }; propagatedBuildInputs = [ msrest msrestazure azure-common - azure-mgmt-nspkg + azure-mgmt-core ]; # this is still needed for when the version is overrided diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix index c4453e8c0c..9b9a84bbe2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-hanaonazure"; - version = "0.15.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f5699cd2f6ad09555c3f1a75c8703e12db76bbbb7ec8b621dcb948d4fc9829a5"; + sha256 = "f2f8342fbfded8be4165fb0d6f010b68df074886811db3e2c9a50b360ee2dd3a"; }; 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 10c4604ec1..c7aa05d25b 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 = "8.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d"; + sha256 = "2890c489289b8a0bf833852014f2f494eb96873834896910ddfa58cfa97b90da"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index c5adc61ea2..fb82c33ba9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "2.0.0"; pname = "azure-mgmt-kusto"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "fa3ede0ebd6489bbf993f420bcb5fc63d9fad2a1e945c3c49b26fa012bb3534e"; + sha256 = "81601479e2b6da3e69654462674ef1474218c4415ef25c1d9892939721732153"; extension = "zip"; }; 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 9eb1d2afc1..f14aa34c32 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 @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "azure-mgmt-loganalytics"; - version = "8.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3e7a93186594c328a6f34f0e0d9209a05021228baa85aa4c1c4ffdbf8005a45f"; + sha256 = "c0b702753c0774a25bcb49b967573b0ec2bef5262c24bc371c219a750ba3c4fd"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix index 4d059480c4..140f08e13f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix @@ -1,21 +1,27 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "1.0.0"; + version = "6.0.0"; pname = "azure-mgmt-managedservices"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "06ddfqriqlvwjsjhqka9r5vhshardyj9c10xgjissfkpqsgkkn7y"; + sha256 = "ec0cb3858bcf8edf5eee0eddee81560424eb84352e0df082ddc94eb99badfd5e"; extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; # no tests included doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-maps/default.nix index c0f418ed72..69ed75dda3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-maps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-maps/default.nix @@ -6,24 +6,24 @@ , msrest , msrestazure , azure-common -, azure-mgmt-nspkg +, azure-mgmt-core }: buildPythonPackage rec { pname = "azure-mgmt-maps"; - version = "0.1.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c120e210bb61768da29de24d28b82f8d42ae24e52396eb6569b499709e22f006"; + sha256 = "dafbe23bdbe9c01f88ce91c5b8587eefc73ac2d637ebcdc59ded6d332932e3ab"; }; propagatedBuildInputs = [ msrest msrestazure azure-common - azure-mgmt-nspkg + azure-mgmt-core ]; pythonNamespaces = [ "azure.mgmt" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix index 98855730ba..c6ed92e042 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix @@ -1,21 +1,27 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "0.1.0"; + version = "1.0.0"; pname = "azure-mgmt-privatedns"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "08wdvfkk8jh90m3l4nz7knd5vikgfvsx70lk7mkhcvl0xj6gv76j"; + sha256 = "b60f16e43f7b291582c5f57bae1b083096d8303e9d9958e2c29227a55cc27c45"; extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; # no tests included doCheck = false; 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 5cbbee77ae..447b377715 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 @@ -8,14 +8,14 @@ buildPythonPackage rec { - version = "16.0.0"; + version = "16.1.0"; pname = "azure-mgmt-resource"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0bdbdc9c1ed2ef975d8dff45f358d1e06dc6761eace5b6817f13993447e48a68"; + sha256 = "b814ee27b37f030fe69461ef6f514661340dc8b1f28736362541e1c0d31d90ae"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix new file mode 100644 index 0000000000..b79c73ab02 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, isPy3k +, msrest +, msrestazure +, azure-common +, azure-mgmt-core +}: + +buildPythonPackage rec { + pname = "azure-mgmt-servicefabricmanagedclusters"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "sha256-EJyjolHrt92zWg+IKWFKTapwZaFrwTtSyEIu5/mZXOg="; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-core + ]; + + pythonNamespaces = [ "azure.mgmt" ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Service Fabric Cluster Management Client Library"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 6f14ce174c..6789a7512a 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 @@ -8,14 +8,14 @@ }: buildPythonPackage rec { - version = "17.0.0"; + version = "17.1.0"; pname = "azure-mgmt-storage"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c0e3fd99028d98c80dddabe1c22dfeb3d694e5c1393c6de80766eb240739e4bc"; + sha256 = "01acb8e988c8082174fa952e1638d700146185644fbe4b126e65843e63d44600"; }; propagatedBuildInputs = [ 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 1b26495e9b..a09677ab8e 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 @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-mgmt-synapse"; - version = "1.0.0"; + version = "2.0.0"; disabled = pythonOlder "3"; src = fetchPypi { inherit pname version; - sha256 = "d5514dfef93294a2d9b8ff6fdb353b3102abd5750f147d904e6012f24113ff9c"; + sha256 = "bec6bdfaeb55b4fdd159f2055e8875bf50a720bb0fce80a816e92a2359b898c8"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix index d885166daa..899c952b35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.1.0"; + version = "7.1.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c5b3681ce4d7a44c223ddddfdec4c8d2eadede3b11b598ac09c4dbf4b729e89b"; + sha256 = "58797defe666dd17ae11a8895395e7e844f11d2076ba4a9ce63682ac02f665d9"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix index 743f0abd92..283a314666 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-servicefabric"; - version = "7.2.0.46"; + version = "8.0.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c15fd5e8fe33a12295435f16e007edcfd8f660547795742f9b74ef8fb3a431ba"; + sha256 = "f414cc114e28a358a7f39772205f3f15d7fc1aa30a08d106b0b80623f4303f1d"; }; propagatedBuildInputs = [ 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 bbcf84ef6a..fe36536dfe 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.8.0"; + version = "12.8.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "36b85a3423379d4a93f663022487cf53aa3043a355f8414321dde878c00cb577"; + sha256 = "eb37b50ddfb6e558b29f6c8c03b0666514e55d6170bf4624e7261a3af93c6401"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix index fc98e4207e..a1322c03c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.4.1"; + version = "12.4.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7503d05882970abc977529ff5a4b81e79f62fd51b238fe306f72e13f57a522ca"; + sha256 = "6c458d1e3db38fdd502d8f77107c81e6859654f02c0e7f2a98214289d9e0dde2"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage/default.nix index 258a5ebabb..8afb9b751e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage/default.nix @@ -3,6 +3,7 @@ , fetchPypi , python , azure-common +, cryptography , futures ? null , dateutil , requests @@ -18,7 +19,7 @@ buildPythonPackage rec { sha256 = "0pyasfxkin6j8j00qmky7d9cvpxgis4fi9bscgclj6yrpvf14qpv"; }; - propagatedBuildInputs = [ azure-common dateutil requests ] + propagatedBuildInputs = [ azure-common cryptography dateutil requests ] ++ pkgs.lib.optionals (!isPy3k) [ futures ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 76ad616360..f17c3e5f6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a13124dc9405277f697f6452728d7dcf4c50601ee76055fd42f12b51494d6579"; + sha256 = "ec113d37386b8787862baaf9da0318364a008004a377d20fdfca31cfe8d16210"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix index b4a3e7acae..47ed0fe5fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix @@ -1,17 +1,48 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, isPy27, pytestCheckHook -, requests, arrow, logfury, tqdm }: +{ lib +, arrow +, buildPythonPackage +, fetchPypi +, importlib-metadata +, isPy27 +, logfury +, pytestCheckHook +, pytest-lazy-fixture +, pytest-mock +, pythonOlder +, requests +, setuptools-scm +, tqdm +}: buildPythonPackage rec { pname = "b2sdk"; - version = "1.6.0"; - + version = "1.7.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-6fjreuMUC056ljddfAidfBbJkvEDndB/dIkx1bF7efs="; + sha256 = "sha256-8X5XLh9SxZI1P7/2ZjOy8ipcEzTcriJfGI7KlMXncv4="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + arrow + logfury + requests + tqdm + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ + pytestCheckHook + pytest-lazy-fixture + pytest-mock + ]; + postPatch = '' substituteInPlace setup.py \ --replace 'setuptools_scm<6.0' 'setuptools_scm' @@ -19,16 +50,16 @@ buildPythonPackage rec { --replace 'arrow>=0.8.0,<1.0.0' 'arrow' ''; + disabledTests = [ + # Test requires an API key + "test_raw_api" + "test_files_headers" + ]; + pythonImportsCheck = [ "b2sdk" ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ requests arrow logfury tqdm ]; - - # requires unpackaged dependencies like liccheck - doCheck = false; - meta = with lib; { - description = "Client library and utilities for access to B2 Cloud Storage (backblaze)."; + description = "Client library and utilities for access to B2 Cloud Storage (backblaze)"; homepage = "https://github.com/Backblaze/b2-sdk-python"; license = licenses.mit; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix new file mode 100644 index 0000000000..a9bc0b5595 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, pythonOlder +, importlib-resources +, hypothesis +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "backports-zoneinfo"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "pganssle"; + repo = "zoneinfo"; + rev = version; + sha256 = "sha256-00xdDOVdDanfsjQTd3yjMN2RFGel4cWRrAA3CvSnl24="; + }; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ + importlib-resources + ]; + + pythonImportsCheck = [ "backports.zoneinfo" ]; + + checkInputs = [ + hypothesis + pytestCheckHook + ]; + + # unfortunately /etc/zoneinfo doesn't exist in sandbox, and many tests fail + doCheck = false; + + meta = with lib; { + description = "Backport of the standard library module zoneinfo"; + homepage = "https://github.com/pganssle/zoneinfo"; + license = licenses.asl20; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix index 8706a31d57..336c6b2e51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix @@ -8,7 +8,7 @@ , numpy , pillow , scipy -, scikitlearn +, scikit-learn , scikitimage , threadpoolctl }: @@ -28,7 +28,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - future numpy pillow scipy scikitlearn scikitimage threadpoolctl + future numpy pillow scipy scikit-learn scikitimage threadpoolctl ]; checkInputs = [ pytestCheckHook unittest2 ]; 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 c41181ca7b..1e896d8267 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 @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , python -, scikitlearn +, scikit-learn , scipy , pytest , isPy27 @@ -21,7 +21,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - scikitlearn + scikit-learn scipy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/behave/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/behave/default.nix index 43c74fc957..1198f034d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/behave/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/behave/default.nix @@ -17,6 +17,12 @@ buildPythonApplication rec { }; checkInputs = [ pytestCheckHook mock pathpy pyhamcrest pytest-html ]; + + # upstream tests are failing, so instead we only check if we can import it + doCheck = false; + + pythonImportsCheck = [ "behave" ]; + buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ colorama cucumber-tag-expressions parse parse-type six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blist/default.nix index d4dcb54c5c..af129f4aa5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blist/default.nix @@ -22,6 +22,12 @@ buildPythonPackage rec { url = "https://github.com/DanielStutzbach/blist/commit/2dc1ec28ed68611fcec9ac1c68070c782d6b4b4e.patch"; sha256 = "0ma0z6ga80w3wzh3sidwd8ckfbgx4j1y7cc29q6j9ddrvxpf276y"; }) + + # Fixes compatibility for Python 3.9 https://github.com/DanielStutzbach/blist/pull/91 + (fetchpatch { + url = "https://github.com/DanielStutzbach/blist/pull/91/commits/e63514f805e42dc6a5708e629e4153d91bc90bff.patch"; + sha256 = "1prx8znk7008v4ky7q2lx0pi6hzqd4kxgfdwbsr4zylwbrdqvsga"; + }) ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix new file mode 100644 index 0000000000..e75e474bda --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchFromGitHub +, setuptools-scm +, substituteAll +, cmake +, boost +, gmp +, pybind11 +, pythonOlder +}: + +buildPythonPackage rec { + pname = "blspy"; + version = "1.0.2"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-N1mk83uZrzSty2DyXfKiVp85z/jmztiUSRXKfNBRJV4="; + }; + + patches = [ + # prevent CMake from trying to get libraries on the Internet + (substituteAll { + src = ./dont_fetch_dependencies.patch; + pybind11_src = pybind11.src; + relic_src = fetchFromGitHub { + owner = "relic-toolkit"; + repo = "relic"; + rev = "1885ae3b681c423c72b65ce1fe70910142cf941c"; # pinned by blspy + hash = "sha256-tsSZTcssl8t7Nqdex4BesgQ+ACPgTdtHnJFvS9josN0="; + }; + }) + ]; + + nativeBuildInputs = [ cmake setuptools-scm ]; + + buildInputs = [ boost gmp.static pybind11 ]; + + pythonImportsCheck = [ + "blspy" + ]; + + # Note: upstream testsuite is just a single test.py script outside of any framework + doCheck = false; + + # CMake needs to be run by setuptools rather than by its hook + dontConfigure = true; + + meta = with lib; { + description = "BLS signatures with aggregation"; + homepage = "https://github.com/Chia-Network/bls-signatures/"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch b/third_party/nixpkgs/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch new file mode 100644 index 0000000000..f9c41d9420 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch @@ -0,0 +1,38 @@ +diff --git a/python-bindings/CMakeLists.txt b/python-bindings/CMakeLists.txt +index 255e3bb..5f99c3a 100644 +--- a/python-bindings/CMakeLists.txt ++++ b/python-bindings/CMakeLists.txt +@@ -6,8 +6,7 @@ include(FetchContent) + + FetchContent_Declare( + pybind11 +- GIT_REPOSITORY https://github.com/pybind/pybind11.git +- GIT_TAG v2.6.2 ++ SOURCE_DIR @pybind11_src@ + ) + FetchContent_MakeAvailable(pybind11 relic) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index faecc61..3272116 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -4,18 +4,9 @@ set (CMAKE_CXX_STANDARD 17) + # CMake 3.14+ + include(FetchContent) + +-if (DEFINED ENV{RELIC_MAIN}) +- set(RELIC_GIT_TAG "origin/main") +-else () +- set(RELIC_GIT_TAG "1885ae3b681c423c72b65ce1fe70910142cf941c") +-endif () +- +-message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}") +- + FetchContent_Declare( + relic +- GIT_REPOSITORY https://github.com/relic-toolkit/relic.git +- GIT_TAG ${RELIC_GIT_TAG} ++ SOURCE_DIR @relic_src@ + ) + FetchContent_MakeAvailable(relic) + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bpython/default.nix index 55e6654553..64fe3c455e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bpython/default.nix @@ -3,12 +3,15 @@ , fetchPypi , curtsies , greenlet -, mock +, jedi , pygments +, pyxdg , requests , substituteAll , urwid -, which }: +, watchdog +, which +}: buildPythonPackage rec { pname = "bpython"; @@ -24,17 +27,22 @@ buildPythonPackage rec { which = "${which}/bin/which"; })]; - propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ]; + propagatedBuildInputs = [ + curtsies + greenlet + pygments + pyxdg + requests + urwid + ]; postInstall = '' substituteInPlace "$out/share/applications/org.bpython-interpreter.bpython.desktop" \ --replace "Exec=/usr/bin/bpython" "Exec=$out/bin/bpython" ''; - checkInputs = [ mock ]; - - # tests fail: https://github.com/bpython/bpython/issues/712 - doCheck = false; + checkInputs = [ jedi watchdog ]; + pythonImportsCheck = [ "bpython" ]; meta = with lib; { description = "A fancy curses interface to the Python interactive interpreter"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix index 21d0b6d9f3..dcd6caaffa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "breezy"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1eff207403f48898fa3b3ffa7a4275197c6c58fec105ef267caf1f5fd5a6c7be"; + sha256 = "sha256-lwKPk+UxKAhfIgUb1xPLJ/za53VdHenmBrr85RTpEps="; }; propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix index 9f41ed5756..2f4552ca3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix @@ -5,29 +5,29 @@ , pytest-asyncio , pytest-error-for-skips , pytest-runner -, pytest-tornasync -, pytest-trio , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "brother"; - version = "1.0.0"; + version = "1.0.2"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-0NfqPlQiOkNhR+H55E9LE4dGa9R8vcSyPNbbIeiRJV8="; + sha256 = "sha256-xs/GIsJUuKKbDotV1BeT/ng86UVkNsH48uHR4i3vqow="; }; + nativeBuildInputs = [ + pytest-runner + ]; + postPatch = '' - substituteInPlace pytest.ini \ + substituteInPlace setup.cfg \ --replace "--cov --cov-report term-missing " "" - substituteInPlace requirements-test.txt \ - --replace "pytest-cov" "" ''; propagatedBuildInputs = [ @@ -37,9 +37,6 @@ buildPythonPackage rec { checkInputs = [ pytest-asyncio pytest-error-for-skips - pytest-runner - pytest-tornasync - pytest-trio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix index 52a43d0d11..043a1cd3e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1b9m9l8bz2slkrq0l5z8zd8pd0js5w4k7dam8bdp00kv3aln4si9"; + sha256 = "0vh2v1qs65kwcj1x8r1wj2g456kflspyz7mjara9ph9qs7j97y74"; }; propagatedBuildInputs = [ @@ -101,7 +101,7 @@ let meta = with lib; { homepage = "https://buildbot.net/"; description = "An open-source continuous integration framework for automating software build, test, and release processes"; - maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; + maintainers = with maintainers; [ ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix index 4c17eb2b6e..b00a2ece56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0bv1qq4cf24cklxfqfnkhjb6w4xqcp3afdcan75n6v7mnwqxyyvr"; + sha256 = "13bcshfas3r7hl205il9fzdjfhd18jf0lxrr5wd8r6qzdrl6i1y6"; }; postPatch = '' @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Packaging Helper"; - maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; + maintainers = with maintainers; [ ryansydnor lopsided98 ]; license = licenses.gpl2; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix index 042bddc1d1..62f32a00fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1a40fbmbf4gb0hgpr40yr9fb17ynxwi6vj8hvv3mm1fm9nqiggm1"; + sha256 = "1qb82s72mrm39123kwkypa2nhdsks6v9nkpw4vvscnq4p9xbzw2c"; }; # Remove unneccessary circular dependency on buildbot @@ -23,7 +23,7 @@ meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot UI"; - maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; + maintainers = with maintainers; [ ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1fcm4h489sb5a1hk82y1a8575s4k6qd82qkfbm2q5gd14bdvysb0"; + sha256 = "0kwzj28dmhkcr44nf39s82xjc9y5p27w4ywxfpm55cim3hwxbcb1"; }; buildInputs = [ buildbot-pkg ]; @@ -45,7 +45,7 @@ meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Console View Plugin"; - maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; + maintainers = with maintainers; [ ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1qw9g2maixlcm5l1kpmc721b2p4b7adw5rsimlqcjz96mjya7acj"; + sha256 = "0vvp6z0d0qf5i5kykzph28hr3g9wgzrmmbbzdnm94yk4wsqq7w86"; }; buildInputs = [ buildbot-pkg ]; @@ -67,7 +67,7 @@ meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Waterfall View Plugin"; - maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; + maintainers = with maintainers; [ ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1q0fm2h4alcck6g8fwwd42jsmkw3gdy9xmw1p78xnvk5dgs6cf9c"; + sha256 = "0y839swv9vdkwi4i1hjiyrjbj1bs74sbkpr5f58ivkjlf5alb56b"; }; buildInputs = [ buildbot-pkg ]; @@ -89,7 +89,7 @@ meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Grid View Plugin"; - maintainers = with maintainers; [ nand0p lopsided98 ]; + maintainers = with maintainers; [ lopsided98 ]; license = licenses.gpl2; }; }; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0n8q607rl1qs012gpkxpq1n7ny8306n4vr3hjlz96pm60a7j7904"; + sha256 = "1zsh1bvrl3byx0ycz5jnhijzifxglm8w7kcxp79k7frw7i02fpvy"; }; buildInputs = [ buildbot-pkg ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix index 242849e2c7..4313d16d0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, buildbot, setuptoolsTrial, mock, twisted, - future, coreutils }: + future, coreutils, nixosTests }: buildPythonPackage (rec { pname = "buildbot-worker"; @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "0n5p9x9gz276nv1m8vn3d74jfbd35gff332cjxxqvabk06iqcjp6"; + sha256 = "0q16vgvlhiybq5rhva9kcj5v2mhfpdb5czm2vng4rrfqqiqq918m"; }; propagatedBuildInputs = [ twisted future ]; @@ -19,10 +19,14 @@ buildPythonPackage (rec { --replace /usr/bin/tail "${coreutils}/bin/tail" ''; + passthru.tests = { + smoke-test = nixosTests.buildbot; + }; + meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Worker Daemon"; - maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; + maintainers = with maintainers; [ ryansydnor lopsided98 ]; license = licenses.gpl2; }; }) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix index 87eafc2655..d395313716 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix @@ -1,29 +1,21 @@ -{ buildPythonPackage, lib, fetchPypi, fetchpatch +{ buildPythonPackage, lib, fetchPypi , pytestCheckHook, filelock, mock, pep8 , cython , six, pyshp, shapely, geos, numpy , gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona -, proj +, proj, flufl_lock }: buildPythonPackage rec { pname = "cartopy"; - version = "0.18.0"; + version = "0.19.0.post1"; src = fetchPypi { inherit version; pname = "Cartopy"; - sha256 = "0d24fk0cbp29gmkysrwq05vry13swmwi3vx3cpcy04c0ixz33ykz"; + sha256 = "0xnm8z3as3hriivdfd26s6vn5b63gb46x6vxw6gh1mwfm5rlg2sb"; }; - patches = [ - # Fix numpy-1.20 compatibility. Will be part of 0.19. - (fetchpatch { - url = "https://github.com/SciTools/cartopy/commit/e663bbbef07989a5f8484a8f36ea9c07e61d14ce.patch"; - sha256 = "061kbjgzkc3apaz6sxy00pkgy3n9dxcgps5wzj4rglb5iy86n2kq"; - }) - ]; - buildInputs = [ geos proj ]; @@ -36,7 +28,7 @@ buildPythonPackage rec { gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib ]; - checkInputs = [ pytestCheckHook filelock mock pep8 ]; + checkInputs = [ pytestCheckHook filelock mock pep8 flufl_lock ]; pytestFlagsArray = [ "--pyargs" "cartopy" @@ -46,6 +38,7 @@ buildPythonPackage rec { disabledTests = [ "test_nightshade_image" "background_img" + "test_gridliner_labels_bbox_style" ]; nativeBuildInputs = [ @@ -56,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Process geospatial data to create maps and perform analyses"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; homepage = "https://scitools.org.uk/cartopy/docs/latest/"; maintainers = with maintainers; [ mredaelli ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix index 1647930222..e5b1a4c4fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix @@ -1,4 +1,8 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pythonOlder +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder , cython , eventlet , futures ? null @@ -21,14 +25,14 @@ buildPythonPackage rec { pname = "cassandra-driver"; - version = "3.24.0"; + version = "3.25.0"; # pypi tarball doesn't include tests src = fetchFromGitHub { owner = "datastax"; repo = "python-driver"; rev = version; - sha256 = "1rr69hly5q810xpn8rkzxwzlq55wxxp7kwki9vfri3gh674d2wip"; + sha256 = "1dn7iiavsrhh6i9hcyw0mk8j95r5ym0gbrvdca998hx2rnz5ark6"; }; nativeBuildInputs = [ cython ]; @@ -66,8 +70,10 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/unit" + ]; + disabledTestPaths = [ # requires puresasl - "--ignore=tests/unit/advanced/test_auth.py" + "tests/unit/advanced/test_auth.py" ]; disabledTests = [ # doesn't seem to be intended to be run directly diff --git a/third_party/nixpkgs/pkgs/development/python-modules/castepxbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/castepxbin/default.nix new file mode 100644 index 0000000000..3c44666486 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/castepxbin/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, pymatgen +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "castepxbin"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "zhubonan"; + repo = "castepxbin"; + rev = "v${version}"; + sha256 = "16wnd1mwhl204d1s3har2fhyhyjg86sypg00bj812dxk8zixxszf"; + }; + + propagatedBuildInputs = [ + numpy + scipy + pymatgen + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "A collection of readers for CASTEP binary outputs"; + homepage = "https://github.com/zhubonan/castepxbin"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix index d07b7f29dc..fbbaf92f4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix @@ -2,23 +2,20 @@ , buildPythonPackage , fetchPypi , pythonOlder -, importlib-metadata , pytestCheckHook }: buildPythonPackage rec { pname = "catalogue"; - version = "2.0.1"; + version = "2.0.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0d01077dbfca7aa53f3ef4adecccce636bce4f82e5b52237703ab2f56478e56e"; + hash = "sha256-ntNF0ShVrzFfFxVYNhKya4YhorCi4775dNxdcS95g6o="; }; - propagatedBuildInputs = [ importlib-metadata ]; - checkInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix index 7b4f7064b1..12e541d900 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-J514zgmIcHpwySChFBXGKR4552wS9z5x8Berk/irHSU="; + sha256 = "sha256-Z5ZIA0ib+N7La6Z0Taf6DovCF6fXnEDppPQt6Vgwl0c="; }; sourceRoot = "source/${pname}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix index afd9cfdc29..92899ed85e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }: +{ lib, stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytestCheckHook }: if isPyPy then null else buildPythonPackage rec { pname = "cffi"; @@ -11,8 +11,9 @@ if isPyPy then null else buildPythonPackage rec { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ libffi pycparser ]; - checkInputs = [ pytest ]; + buildInputs = [ libffi ]; + + propagatedBuildInputs = [ pycparser ]; # On Darwin, the cffi tests want to hit libm a lot, and look for it in a global # impure search path. It's obnoxious how much repetition there is, and how difficult @@ -33,9 +34,8 @@ if isPyPy then null else buildPythonPackage rec { "-Wno-unused-command-line-argument -Wno-unreachable-code"; doCheck = !stdenv.hostPlatform.isMusl && !stdenv.isDarwin; # TODO: Investigate - checkPhase = '' - py.test -k "not test_char_pointer_conversion" - ''; + + checkInputs = [ pytestCheckHook ]; meta = with lib; { maintainers = with maintainers; [ domenkozar lnl7 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix index e99f321df3..70aa31a0d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix @@ -7,6 +7,7 @@ , click , enum-compat , hypothesis +, inquirer , jmespath , mock , mypy-extensions @@ -35,6 +36,7 @@ buildPythonPackage rec { botocore click enum-compat + inquirer jmespath mypy-extensions pip diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chiabip158/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chiabip158/default.nix new file mode 100644 index 0000000000..f2c3095936 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/chiabip158/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cmake +, pybind11 +, pythonOlder +, pytestCheckHook +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "chiabip158"; + version = "1.0"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-dG6A4n30uPswQWY/Wmi75HK4ZMCDNr9Lt05FRWEPYV8="; + }; + + nativeBuildInputs = [ cmake setuptools-scm ]; + + buildInputs = [ pybind11 ]; + + checkInputs = [ + pytestCheckHook + ]; + + # CMake needs to be run by setuptools rather than by its hook + dontConfigure = true; + + meta = with lib; { + description = "Chia's implementation of BIP 158"; + homepage = "https://www.chia.net/"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix new file mode 100644 index 0000000000..1faf5a94f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix @@ -0,0 +1,48 @@ +{ lib +, substituteAll +, buildPythonPackage +, fetchPypi +, cmake +, cxxopts +, ghc_filesystem +, pybind11 +, pythonOlder +, psutil +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "chiapos"; + version = "1.0.1"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-kJx57EtwPBrGMpjnSzeYYhWqc/g1N1Bg8slW5oZKjg8="; + }; + + patches = [ + # prevent CMake from trying to get libraries on the Internet + (substituteAll { + src = ./dont_fetch_dependencies.patch; + inherit cxxopts ghc_filesystem; + pybind11_src = pybind11.src; + }) + ]; + + nativeBuildInputs = [ cmake setuptools-scm ]; + + buildInputs = [ pybind11 ]; + + checkInputs = [ psutil ]; + + # CMake needs to be run by setuptools rather than by its hook + dontConfigure = true; + + meta = with lib; { + description = "Chia proof of space library"; + homepage = "https://www.chia.net/"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch b/third_party/nixpkgs/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch new file mode 100644 index 0000000000..ca18fd292c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9b4a2f5..86f849c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,22 +18,19 @@ include(FetchContent) + + FetchContent_Declare( + pybind11-src +- GIT_REPOSITORY https://github.com/pybind/pybind11.git +- GIT_TAG v2.6.2 ++ SOURCE_DIR @pybind11_src@ + ) + FetchContent_MakeAvailable(pybind11-src) + + FetchContent_Declare( + cxxopts +- GIT_REPOSITORY https://github.com/jarro2783/cxxopts.git +- GIT_TAG v2.2.1 ++ SOURCE_DIR @cxxopts@ + ) + FetchContent_MakeAvailable(cxxopts) + + FetchContent_Declare( + gulrak +- GIT_REPOSITORY https://github.com/gulrak/filesystem.git +- GIT_TAG v1.5.4 ++ SOURCE_DIR @ghc_filesystem@ + ) + FetchContent_MakeAvailable(gulrak) + + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix new file mode 100644 index 0000000000..deb7d21adc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, setuptools-scm +, substituteAll +, cmake +, boost +, gmp +, pybind11 +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "chiavdf"; + version = "1.0.1"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-z0od/VrH580+9641lKNI7jbVMlJZKCWnoT+GljnFxmU="; + }; + + patches = [ + # prevent CMake from trying to get libraries on the Internet + (substituteAll { + src = ./dont_fetch_dependencies.patch; + pybind11_src = pybind11.src; + }) + ]; + + # x86 instructions are needed for this component + BUILD_VDF_CLIENT = lib.optionalString (!stdenv.isx86_64) "N"; + + nativeBuildInputs = [ cmake setuptools-scm ]; + + buildInputs = [ boost gmp pybind11 ]; + + checkInputs = [ + pytestCheckHook + ]; + + # CMake needs to be run by setuptools rather than by its hook + dontConfigure = true; + + meta = with lib; { + description = "Chia verifiable delay function utilities"; + homepage = "https://www.chia.net/"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch b/third_party/nixpkgs/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch new file mode 100644 index 0000000000..9b49db81fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch @@ -0,0 +1,14 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c975128..a9f6910 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -31,8 +31,7 @@ include(FetchContent) + + FetchContent_Declare( + pybind11-src +- GIT_REPOSITORY https://github.com/pybind/pybind11.git +- GIT_TAG v2.6.2 ++ SOURCE_DIR @pybind11_src@ + ) + FetchContent_MakeAvailable(pybind11-src) + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix new file mode 100644 index 0000000000..54e2fa1954 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix @@ -0,0 +1,98 @@ +{ stdenv +, lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, matplotlib +, networkx +, numpy +, pandas +, requests +, scipy +, sortedcontainers +, sympy +, tqdm +, typing-extensions + # Contrib requirements +, withContribRequires ? false +, autoray ? null +, opt-einsum +, ply +, pylatex ? null +, pyquil ? null +, quimb ? null + # test inputs +, pytestCheckHook +, freezegun +, pytest-asyncio +}: +buildPythonPackage rec { + pname = "cirq-core"; + version = "0.11.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "quantumlib"; + repo = "cirq"; + rev = "v${version}"; + hash = "sha256-JaKTGnkYhzIFb35SGaho8DRupoT0JFYKA5+rJEq4oXw="; + }; + + sourceRoot = "source/${pname}"; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "matplotlib~=3.0" "matplotlib" \ + --replace "networkx~=2.4" "networkx" \ + --replace "numpy~=1.16" "numpy" \ + --replace "requests~=2.18" "requests" + ''; + + propagatedBuildInputs = [ + matplotlib + networkx + numpy + pandas + requests + scipy + sortedcontainers + sympy + tqdm + typing-extensions + ] ++ lib.optionals withContribRequires [ + autoray + opt-einsum + ply + pylatex + pyquil + quimb + ]; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + freezegun + ]; + + pytestFlagsArray = lib.optionals (!withContribRequires) [ + # requires external (unpackaged) libraries, so untested. + "--ignore=cirq/contrib/" + ]; + disabledTests = [ + "test_metadata_search_path" # tries to import flynt, which isn't in Nixpkgs + "test_benchmark_2q_xeb_fidelities" # fails due pandas MultiIndex. Maybe issue with pandas version in nix? + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ + # Seem to fail due to math issues on aarch64? + "expectation_from_wavefunction" + "test_single_qubit_op_to_framed_phase_form_output_on_example_case" + ]; + + meta = with lib; { + description = "A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits."; + homepage = "https://github.com/quantumlib/cirq"; + changelog = "https://github.com/quantumlib/Cirq/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix new file mode 100644 index 0000000000..8692aef4b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, pythonOlder +, cirq-core +, google-api-core +, protobuf +# test inputs +, pytestCheckHook +, freezegun +}: + +buildPythonPackage rec { + pname = "cirq-google"; + inherit (cirq-core) version src meta; + + sourceRoot = "source/${pname}"; + + postPatch = '' + substituteInPlace requirements.txt --replace "protobuf~=3.13.0" "protobuf" + ''; + + propagatedBuildInputs = [ + cirq-core + google-api-core + protobuf + ]; + + checkInputs = [ pytestCheckHook freezegun ]; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix index f0b576299b..f8afdcbbb0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix @@ -1,114 +1,28 @@ -{ stdenv -, lib +{ lib , buildPythonPackage -, pythonOlder -, fetchFromGitHub -, google-api-core -, matplotlib -, networkx -, numpy -, pandas -, protobuf -, requests -, scipy -, sortedcontainers -, sympy -, tqdm -, typing-extensions +, cirq-core +, cirq-google # test inputs -, freezegun , pytestCheckHook -, pytest-asyncio -, pytest-benchmark -, ply -, pydot -, pyyaml -, pygraphviz }: buildPythonPackage rec { pname = "cirq"; - version = "0.10.0"; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "quantumlib"; - repo = "cirq"; - rev = "v${version}"; - sha256 = "0xinml44n2lfl0q2lb2apmn69gsszlwim83082f66vyk0gpwd4lr"; - }; - - postPatch = '' - substituteInPlace requirements.txt \ - --replace "matplotlib~=3.0" "matplotlib" \ - --replace "networkx~=2.4" "networkx" \ - --replace "numpy~=1.16" "numpy" \ - --replace "protobuf~=3.13.0" "protobuf" - ''; + inherit (cirq-core) version src meta; propagatedBuildInputs = [ - google-api-core - matplotlib - networkx - numpy - pandas - protobuf - requests - scipy - sortedcontainers - sympy - tqdm - typing-extensions + cirq-core + cirq-google ]; # pythonImportsCheck = [ "cirq" "cirq.Circuit" ]; # cirq's importlib hook doesn't work here - checkInputs = [ - pytestCheckHook - freezegun - pytest-asyncio - pytest-benchmark - ply - pydot - pyyaml - pygraphviz + checkInputs = [ pytestCheckHook ]; + + # Don't run submodule or development tool tests + disabledTestPaths = [ + "cirq-google" + "cirq-core" + "dev_tools" ]; - pytestFlagsArray = [ - "--ignore=dev_tools" # Only needed when developing new code, which is out-of-scope - "--ignore=cirq/contrib/" # requires external (unpackaged) python packages, so untested. - "--benchmark-disable" # Don't need to run benchmarks when packaging. - ]; - disabledTests = lib.optionals stdenv.isAarch64 [ - # Seem to fail due to math issues on aarch64? - "expectation_from_wavefunction" - "test_single_qubit_op_to_framed_phase_form_output_on_example_case" - ] ++ [ - # slow tests, for quicker building - "test_anneal_search_method_calls" - "test_density_matrix_from_state_tomography_is_correct" - "test_example_runs_qubit_characterizations" - "test_example_runs_hello_line_perf" - "test_example_runs_bc_mean_field_perf" - "test_main_loop" - "test_clifford_circuit_2" - "test_decompose_specific_matrices" - "test_two_qubit_randomized_benchmarking" - "test_kak_decomposition_perf" - "test_example_runs_simon" - "test_decompose_random_unitary" - "test_decompose_size_special_unitary" - "test_api_retry_5xx_errors" - "test_xeb_fidelity" - "test_example_runs_phase_estimator_perf" - "test_cross_entropy_benchmarking" - ]; - - meta = with lib; { - description = "A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits."; - homepage = "https://github.com/quantumlib/cirq"; - changelog = "https://github.com/quantumlib/Cirq/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ drewrisinger ]; - }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-driver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-driver/default.nix index a1addcfc97..9a4c0f0f92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-driver/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , setuptools , pytz , tzlocal @@ -10,15 +10,20 @@ , freezegun , mock , nose +, pytestCheckHook +, pytest-xdist }: buildPythonPackage rec { pname = "clickhouse-driver"; version = "0.2.0"; - src = fetchPypi { - inherit pname version; - sha256 = "62d37f93872d5a13eb6b0d52bab2b593ed0e14cf9200949aa2d02f9801064c0f"; + # pypi source doesn't contain tests + src = fetchFromGitHub { + owner = "mymarilyn"; + repo = "clickhouse-driver"; + rev = "96b7ba448c63ca2670cc9aa70d4a0e08826fb650"; + sha256 = "sha256-HFKUxJOlBCVlu7Ia8heGpwX6+HdKuwSy92s3v+GKGwE="; }; propagatedBuildInputs = [ @@ -34,9 +39,30 @@ buildPythonPackage rec { freezegun mock nose + pytest-xdist + pytestCheckHook ]; - doCheck = true; + postPatch = '' + substituteInPlace setup.py \ + --replace "lz4<=3.0.1" "lz4<=4" + ''; + + # remove source to prevent pytest testing source instead of the build artifacts + # (the source doesn't contain the extension modules) + preCheck = '' + rm -rf clickhouse_driver + ''; + + # some test in test_buffered_reader.py doesn't seem to return + disabledTestPaths = [ "tests/test_buffered_reader.py" ]; + + pytestFlagsArray = [ "-n" "$NIX_BUILD_CORES" ]; + + # most tests require `clickhouse` + # TODO: enable tests after `clickhouse` unbroken + doCheck = false; + pythonImportsCheck = [ "clickhouse_driver" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix new file mode 100644 index 0000000000..4e5f69f8cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix @@ -0,0 +1,47 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, rustPlatform +, pythonOlder +, openssl +, perl +}: + +buildPythonPackage rec { + pname = "clvm_rs"; + version = "0.1.7"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Chia-Network"; + repo = "clvm_rs"; + rev = version; + sha256 = "sha256-ves23q1uQ3lexwK9l1xGRss05jYObJDi/aY9Yvp4aPU="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-3kPzM2EX61ZvU6VKXY1OG/ic+9FU3Et4RuKp+3QYzSo="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ + perl # used by openssl-sys to configure + ] ++ (with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]); + + buildInputs = [ openssl ]; + + pythonImportsCheck = [ "clvm_rs" ]; + + meta = with lib; { + homepage = "https://chialisp.com/"; + description = "Rust implementation of clvm"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools/default.nix new file mode 100644 index 0000000000..365f21e8c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, clvm +, setuptools-scm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "clvm_tools"; + version = "0.4.3"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Chia-Network"; + repo = "clvm_tools"; + rev = version; + sha256 = "sha256-bWz3YCrakob/kROq+LOA+yD1wtIbInVrmDqtg4/cV4g="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + clvm + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "clvm_tools" + ]; + + disabledTests = [ + "test_cmd_unknown-1_txt" + ]; + + # give a hint to setuptools_scm on package version + SETUPTOOLS_SCM_PRETEND_VERSION="v${version}"; + + meta = with lib; { + description = "Tools for clvm development"; + homepage = "https://www.chialisp.com/"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clvm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clvm/default.nix new file mode 100644 index 0000000000..f7168832fa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/clvm/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, blspy +, setuptools-scm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "clvm"; + version = "0.9.6"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Chia-Network"; + repo = "clvm"; + rev = version; + sha256 = "sha256-XBQEilDFhx0kT9bEMD4jX+SDk3cAC1BUCWhbtpgrLcA="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + # give a hint to setuptools_scm on package version + SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; + + propagatedBuildInputs = [ + blspy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # all tests in this file have a circular dependency on clvm-tools + "tests/cmds_test.py" + ]; + + pythonImportsCheck = [ + "clvm" + ]; + + meta = with lib; { + description = "Chia Lisp virtual machine"; + homepage = "https://www.chia.net/"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix index 5baa28e4bd..6347c8552b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix @@ -6,7 +6,7 @@ , biopython , numpy , scipy -, scikitlearn +, scikit-learn , pandas , matplotlib , reportlab @@ -42,7 +42,7 @@ buildPythonPackage rec { biopython numpy scipy - scikitlearn + scikit-learn pandas matplotlib reportlab diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colored-traceback/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colored-traceback/default.nix new file mode 100644 index 0000000000..35d1d5a896 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/colored-traceback/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pygments +}: + +buildPythonPackage rec { + pname = "colored-traceback"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-bafOKx2oafa7VMkntBW5VyfEu22ahMRhXqd9mHKRGwU="; + }; + + buildInputs = [ pygments ]; + + # No setuptools tests for the package. + doCheck = false; + + pythonImportsCheck = [ "colored_traceback" ]; + + meta = with lib; { + homepage = "https://github.com/staticshock/colored-traceback.py"; + description = "Automatically color Python's uncaught exception tracebacks"; + license = licenses.isc; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/concurrent-log-handler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/concurrent-log-handler/default.nix new file mode 100644 index 0000000000..5880cdf961 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/concurrent-log-handler/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, portalocker +}: + +buildPythonPackage rec { + pname = "concurrent-log-handler"; + version = "0.9.19"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-sS95q+0/lBIcJc6cJM21fYiSguxv9h9VNasgaNw31Ak="; + }; + + propagatedBuildInputs = [ + portalocker + ]; + + pythonImportsCheck = [ + "concurrent_log_handler" + ]; + + doCheck = false; # upstream has no tests + + meta = with lib; { + description = "Python logging handler that allows multiple processes to safely write to the same log file concurrently"; + homepage = "https://www.chia.net/"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix index 25925f5606..0429ee7a50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix @@ -1,89 +1,60 @@ -{ buildPythonPackage -, fetchFromGitHub -, isPy3k -, glibcLocales -, lib -, pythonOlder - +{ lib , aiohttp -, aiohttp-swagger , aiohttp-jinja2 +, aiohttp-remotes +, aiohttp-swagger +, buildPythonPackage , clickclick , decorator -, flake8 +, fetchFromGitHub , flask -, gevent , inflection , jsonschema -, mock , openapi-spec-validator -, pathlib -, pytest , pytest-aiohttp -, pytestcov +, pytestCheckHook +, pythonOlder , pyyaml , requests -, six , swagger-ui-bundle , testfixtures -, typing ? null -, ujson }: buildPythonPackage rec { pname = "connexion"; - version = "2.4.0"; + version = "2.7.0"; + disabled = pythonOlder "3.6"; - # we're fetching from GitHub because tests weren't distributed on PyPi src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = version; - sha256 = "1b9q027wrks0afl7l3a1wxymz3aick26b9fq2m07pc5wb9np0vvg"; + sha256 = "15iflq5403diwda6n6qrpq67wkdcvl3vs0gsg0fapxqnq3a2m7jj"; }; - checkInputs = [ - decorator - mock - pytest - pytestcov - testfixtures - flask - swagger-ui-bundle - ] - ++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson pytest-aiohttp ] - ++ lib.optional (pythonOlder "3.7") glibcLocales - ; propagatedBuildInputs = [ + aiohttp + aiohttp-jinja2 + aiohttp-swagger clickclick + flask + inflection jsonschema + openapi-spec-validator pyyaml requests - six - inflection - openapi-spec-validator swagger-ui-bundle - flask - ] - ++ lib.optional (pythonOlder "3.4") pathlib - ++ lib.optional (pythonOlder "3.6") typing - ++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson ] - ; + ]; - preConfigure = lib.optional (pythonOlder "3.7") '' - export LANG=en_US.UTF-8 - ''; + checkInputs = [ + aiohttp-remotes + decorator + pytest-aiohttp + pytestCheckHook + testfixtures + ]; - postPatch = '' - substituteInPlace setup.py --replace "'aiohttp>=2.3.10,<3.5.2'" "'aiohttp>=2.3.10'" - ''; - - checkPhase = if isPy3k then '' - pytest -k "not test_app_get_root_path and \ - not test_verify_oauth_scopes_remote and \ - not test_verify_oauth_scopes_local and \ - not test_run_with_aiohttp_not_installed"'' - else "pytest --ignore=tests/aiohttp"; + pythonImportsCheck = [ "connexion" ]; meta = with lib; { description = "Swagger/OpenAPI First framework on top of Flask"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix index c5ee4d8617..b2a13cdbb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "cookiecutter"; - version = "1.7.2"; + version = "1.7.3"; # not sure why this is broken disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "efb6b2d4780feda8908a873e38f0e61778c23f6a2ea58215723bcceb5b515dac"; + sha256 = "sha256-a5pNcoguJDvgd6c5fQ8fdv5mzz35HzEV27UzDiFPpFc="; }; checkInputs = [ pytest pytestcov pytest-mock freezegun ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coqpit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coqpit/default.nix new file mode 100644 index 0000000000..c4df114e24 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/coqpit/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "coqpit"; + version = "0.0.6.6"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "coqui-ai"; + repo = pname; + rev = "v${version}"; + sha256 = "0wb5wf84i5h4ycm732kn4316v7schhm91s2rrklfw9sny5dqmdnh"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "coqpit" + "coqpit.coqpit" + ]; + + meta = with lib; { + description = "Simple but maybe too simple config management through python data classes"; + longDescription = '' + Simple, light-weight and no dependency config handling through python data classes with to/from JSON serialization/deserialization. + ''; + homepage = "https://github.com/coqui-ai/coqpit"; + license = licenses.mit; + maintainers = with maintainers; [ hexa mic92 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix index 9be85ff4b3..07b9652e77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix @@ -29,6 +29,9 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + "RequestsCaBundleTest" + ]; disabledTestPaths = lib.optionals stdenv.isDarwin [ "src/crate/client/test_http.py" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix index cf388409c5..27f3f29111 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 +, pythonOlder , attrs , isodate , dateutil @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "csvw"; - version = "1.10.2"; - disabled = isPy27; + version = "1.11.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "cldf"; repo = "csvw"; rev = "v${version}"; - sha256 = "0z0qxlsfxwz1qapxb4d0mz3wkj99d7zi9yrg1cbd2xp7giagb6d4"; + sha256 = "1393xwqawaxsflbq62vks92vv4zch8p6dd1mdvdi7j4vvf0zljkg"; }; patchPhase = '' @@ -42,6 +42,12 @@ buildPythonPackage rec { pytest-mock ]; + disabledTests = [ + # this test is flaky on darwin because it depends on the resolution of filesystem mtimes + # https://github.com/cldf/csvw/blob/45584ad63ff3002a9b3a8073607c1847c5cbac58/tests/test_db.py#L257 + "test_write_file_exists" + ]; + meta = with lib; { description = "CSV on the Web"; homepage = "https://github.com/cldf/csvw"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/curtsies/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/curtsies/default.nix index dc32bcdf74..7b34884e26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/curtsies/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/curtsies/default.nix @@ -1,22 +1,14 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing ? null}: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, blessings, mock, nose, pyte, cwcwidth, typing ? null}: buildPythonPackage rec { pname = "curtsies"; - version = "0.3.0"; + version = "0.3.5"; src = fetchPypi { inherit pname version; - sha256 = "89c802ec051d01dec6fc983e9856a3706e4ea8265d2940b1f6d504a9e26ed3a9"; + sha256 = "1g8dwafx4vx06isjkn28r3cwb0hw1bv67lgygaz34yk66lrzz1x5"; }; - patches = [ - # Fix dependency on typing. Remove with the next release - (fetchpatch { - url = "https://github.com/bpython/curtsies/commit/217b4f83e954837f8adc4c549c1f2f9f2bb272a7.patch"; - sha256 = "1d3zwx9c7i0drb4nvydalm9mr83jrvdm75ffgisri89h337hiffs"; - }) - ]; - - propagatedBuildInputs = [ blessings wcwidth ] + propagatedBuildInputs = [ blessings cwcwidth ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; checkInputs = [ mock pyte nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix index 1d060c41bb..359ee96f60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix @@ -9,7 +9,7 @@ , osqp , scipy , scs -, useOpenmp ? true +, useOpenmp ? (!stdenv.isDarwin) # Check inputs , pytestCheckHook }: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix new file mode 100644 index 0000000000..a17a8a936a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchPypi, cython, pytestCheckHook }: + +buildPythonPackage rec { + pname = "cwcwidth"; + version = "0.1.4"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "1azrphpkcyggg38xvkfb9dpc4xmmm90p02kf8dkqd4d6j5w96aj8"; + }; + + nativeBuildInputs = [ cython ]; + + checkInputs = [ pytestCheckHook ]; + # Hack needed to make pytest + cython work + # https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298 + preCheck = '' + export HOME=$(mktemp -d) + cp -r $TMP/$sourceRoot/tests $HOME + pushd $HOME + ''; + postCheck = "popd"; + + pythonImportsCheck = [ "cwcwidth" ]; + + meta = with lib; { + description = "Python bindings for wc(s)width"; + homepage = "https://github.com/sebastinas/cwcwidth"; + changelog = "https://github.com/sebastinas/cwcwidth/blob/main/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ eduardosm ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cxxfilt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cxxfilt/default.nix index 580d698d8d..1cc5ad19bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cxxfilt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cxxfilt/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , gcc-unwrapped @@ -12,9 +13,11 @@ buildPythonPackage rec { sha256 = "ef6810e76d16c95c11b96371e2d8eefd1d270ec03f9bcd07590e8dcc2c69e92b"; }; - postPatch = '' + postPatch = let + libstdcpp = "${lib.getLib gcc-unwrapped}/lib/libstdc++${stdenv.hostPlatform.extensions.sharedLibrary}"; + in '' substituteInPlace cxxfilt/__init__.py \ - --replace "find_any_library('stdc++', 'c++')" '"${lib.getLib gcc-unwrapped}/lib/libstdc++.so"' + --replace "find_any_library('stdc++', 'c++')" '"${libstdcpp}"' ''; # no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix index ca25e05bb1..9072a691c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix @@ -7,8 +7,8 @@ , multipledispatch , setuptools-scm , scipy -, scikitlearn -, pytest +, scikit-learn +, pytestCheckHook }: buildPythonPackage rec { @@ -21,12 +21,8 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ]; - - checkPhase = '' - py.test dask_glm - ''; + checkInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikit-learn ]; meta = with lib; { homepage = "https://github.com/dask/dask-glm/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-image/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-image/default.nix index a38350f0f6..e3ab607dca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-image/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-image/default.nix @@ -2,41 +2,32 @@ , buildPythonPackage , fetchPypi , dask -, numpy, toolz # dask[array] , scipy , pims -, pytest -, pytest-flake8 , scikitimage +, pytestCheckHook }: buildPythonPackage rec { - version = "0.5.0"; + version = "0.6.0"; pname = "dask-image"; src = fetchPypi { inherit pname version; - sha256 = "0bf7ea8dcd9d795505b498bd632394720c048f50761e23c574d9a6bacfb27cbb"; + sha256 = "1zzxrvbm52xn7azkn74pjinlk0jkpdcyl3r5vxxy5lmjnmzlrrpy"; }; - nativeBuildInputs = [ pytest-flake8 ]; - propagatedBuildInputs = [ dask numpy toolz scipy pims ]; + propagatedBuildInputs = [ dask scipy pims ]; + + prePatch = '' + substituteInPlace setup.cfg --replace "--flake8" "" + ''; + checkInputs = [ - pytest + pytestCheckHook scikitimage ]; - # ignore errors from newer versions of flake8 - prePatch = '' - substituteInPlace setup.cfg \ - --replace "docs/conf.py,versioneer.py" \ - "docs/conf.py,versioneer.py,dask_image/ndfilters/_utils.py" - ''; - - # scikit.external is not exported - checkPhase = '' - pytest --ignore=tests/test_dask_image/ - ''; pythonImportsCheck = [ "dask_image" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix index 517056866b..ff1b145ee8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix @@ -6,7 +6,7 @@ , numpy, toolz # dask[array] , numba , pandas -, scikitlearn +, scikit-learn , scipy , dask-glm , six @@ -26,6 +26,10 @@ buildPythonPackage rec { sha256 = "8fc4ac3ec1915e382fb8cae9ff1ec9b5ac1bee0b6f4c6975d6e6cb7191a4a815"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ dask dask-glm @@ -35,11 +39,10 @@ buildPythonPackage rec { numpy packaging pandas - scikitlearn + scikit-learn scipy six toolz - setuptools-scm ]; # has non-standard build from source, and pypi doesn't include tests 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 1c6d37681a..55ba3ad6ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , bokeh , buildPythonPackage , fetchpatch @@ -77,9 +78,7 @@ buildPythonPackage rec { "-m 'not network'" ]; - disabledTests = [ - "test_annotation_pack_unpack" - "test_annotations_blockwise_unpack" + disabledTests = lib.optionals stdenv.isDarwin [ # this test requires features of python3Packages.psutil that are # blocked in sandboxed-builds "test_auto_blocksize_csv" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix index f5a7c52ef8..3a1da0697c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix @@ -4,7 +4,8 @@ , sqlalchemy , aiocontextvars , isPy27 -, pytest +, pytestCheckHook +, pymysql , asyncpg , aiomysql , aiosqlite @@ -12,33 +13,37 @@ buildPythonPackage rec { pname = "databases"; - version = "0.2.6"; + version = "0.4.3"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "0cdb4vln4zdmqbbcj7711b81b2l64jg1miihqcg8gpi35v404h2q"; + sha256 = "0aq88k7d9036cy6qvlfv9p2dxd6p6fic3j0az43gn6k1ardhdsgf"; }; propagatedBuildInputs = [ - sqlalchemy aiocontextvars + sqlalchemy ]; checkInputs = [ - pytest - asyncpg aiomysql aiosqlite + asyncpg + pymysql + pytestCheckHook ]; - # big chunk to tests depend on existing posgresql and mysql databases - # some tests are better than no tests - checkPhase = '' - pytest --ignore=tests/test_integration.py --ignore=tests/test_databases.py - ''; + disabledTestPaths = [ + # ModuleNotFoundError: No module named 'aiopg' + "tests/test_connection_options.py" + # circular dependency on starlette + "tests/test_integration.py" + # TEST_DATABASE_URLS is not set. + "tests/test_databases.py" + ]; meta = with lib; { description = "Async database support for Python"; 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 c5271e473e..60eb0df1d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { checkInputs = [ docutils pytestCheckHook ]; LLVM = llvm; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isystem ${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; pytestFlagsArray = let # ini file (not included in tarball) required to change python_files setting, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dawg-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dawg-python/default.nix new file mode 100644 index 0000000000..ba9c298a2e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dawg-python/default.nix @@ -0,0 +1,24 @@ +{ lib +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "dawg-python"; + version = "0.7.2"; + + src = fetchPypi { + inherit version; + pname = "DAWG-Python"; + hash = "sha256-Sl4yhuYmHMoC8gXP1VFqerEBkPowxRwo00WAj1leNCE="; + }; + + pythonImportsCheck = [ "dawg_python" ]; + + meta = with lib; { + description = "Pure Python reader for DAWGs created by dawgdic C++ library or DAWG Python extension"; + homepage = "https://github.com/pytries/DAWG-Python"; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} 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 beb5ba9c46..37717f76f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Microsoft"; repo = pname; rev = "v${version}"; - sha256 = "1dgjbbhy228w2zbfq5pf0hkai7742zw8mmybnzjdc9l6pw7360rq"; + hash = "sha256-YGzc9mMIzPTmUgIXuZROLdYKjUm69x9SR+JtYRVpn24="; }; patches = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { inherit gdb; }) + # Use nixpkgs version instead of versioneer (substituteAll { src = ./hardcode-version.patch; inherit version; @@ -87,6 +88,8 @@ buildPythonPackage rec { "gevent" ]; + pythonImportsCheck = [ "debugpy" ]; + meta = with lib; { description = "An implementation of the Debug Adapter Protocol for Python"; homepage = "https://github.com/microsoft/debugpy"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch index 751351e03c..f74b53a831 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch @@ -1,8 +1,8 @@ diff --git a/tests/debug/session.py b/tests/debug/session.py -index 2b39106..6d45a10 100644 +index 101492f..4ee7cfb 100644 --- a/tests/debug/session.py +++ b/tests/debug/session.py -@@ -625,6 +625,7 @@ class Session(object): +@@ -630,6 +630,7 @@ class Session(object): if "PYTHONPATH" in self.config.env: # If specified, launcher will use it in lieu of PYTHONPATH it inherited # from the adapter when spawning debuggee, so we need to adjust again. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debut/default.nix deleted file mode 100644 index 02eece2fc2..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/debut/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, chardet -, attrs -, pytestCheckHook -}: -buildPythonPackage rec { - pname = "debut"; - version = "0.9.9"; - - src = fetchPypi { - inherit pname version; - sha256 = "a3a71e475295f4cf4292440c9c7303ebca0309d395536d2a7f86a5f4d7465dc1"; - }; - - dontConfigure = true; - - propagatedBuildInputs = [ - chardet - attrs - ]; - - checkInputs = [ - pytestCheckHook - ]; - - pythonImportsCheck = [ - "debut" - ]; - - meta = with lib; { - description = "Python library to parse Debian deb822-style control and copyright files "; - homepage = "https://github.com/nexB/debut"; - license = with licenses; [ asl20 bsd3 mit ]; - maintainers = teams.determinatesystems.members; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/decopatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/decopatch/default.nix new file mode 100644 index 0000000000..7fa3c6465d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/decopatch/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, makefun +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "decopatch"; + version = "1.4.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0i6i811s2j1z0cl6y177dwsbfxib8dvb5c2jpgklvc2xy4ahhsy6"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ makefun ]; + + postPatch = '' + substituteInPlace setup.py --replace "'pytest-runner', " "" + ''; + + # Tests would introduce multiple cirucular dependencies + # Affected: makefun, pytest-cases + doCheck = false; + + pythonImportsCheck = [ "decopatch" ]; + + meta = with lib; { + description = "Python helper for decorators"; + homepage = "https://github.com/smarie/python-decopatch"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deltachat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deltachat/default.nix new file mode 100644 index 0000000000..ffa9b8d7d6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/deltachat/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchpatch +, setuptools-scm +, libdeltachat +, cffi +, IMAPClient +, pluggy +, requests +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "deltachat"; + inherit (libdeltachat) version src; + sourceRoot = "${src.name}/python"; + + disabled = isPy27; + + nativeBuildInputs = [ + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + buildInputs = [ + libdeltachat + ]; + + propagatedBuildInputs = [ + cffi + IMAPClient + pluggy + requests + setuptools + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "deltachat" + "deltachat.account" + "deltachat.contact" + "deltachat.chat" + "deltachat.message" + ]; + + meta = with lib; { + description = "Python bindings for the Delta Chat Core library"; + homepage = "https://github.com/deltachat/deltachat-core-rust/tree/master/python"; + changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${version}/python/CHANGELOG"; + license = licenses.mpl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dendropy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dendropy/default.nix index 05737ecf9a..be1b705dc0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dendropy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dendropy/default.nix @@ -1,38 +1,40 @@ { lib -, pkgs , buildPythonPackage , fetchFromGitHub -, pytest +, pytestCheckHook }: buildPythonPackage rec { - pname = "DendroPy"; - version = "4.4.0"; + pname = "dendropy"; + version = "4.5.1"; - # tests are incorrectly packaged in pypi version src = fetchFromGitHub { owner = "jeetsukumaran"; repo = pname; rev = "v${version}"; - sha256 = "097hfyv2kaf4x92i4rjx0paw2cncxap48qivv8zxng4z7nhid0x9"; + sha256 = "sha256-FP0+fJkkFtSysPxoHXjyMgF8pPin7aRyzmHe9bH8LlM="; }; - preCheck = '' - # Needed for unicode python tests - export LC_ALL="en_US.UTF-8" - cd tests # to find the 'support' module - ''; + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytest pkgs.glibcLocales ]; + disabledTests = [ + # FileNotFoundError: [Errno 2] No such file or directory: 'paup' + "test_basic_split_count_with_incorrect_rootings_raises_error" + "test_basic_split_count_with_incorrect_weight_treatment_raises_error" + "test_basic_split_counting_under_different_rootings" + "test_group1" + # AssertionError: 6 != 5 + "test_by_num_lineages" + ]; - checkPhase = '' - pytest -k 'not test_dataio_nexml_reader_tree_list and not test_pscores_with' - ''; + pythonImportsCheck = [ "dendropy" ]; - meta = { + meta = with lib; { + description = "Python library for phylogenetic computing"; homepage = "https://dendropy.org/"; - description = "A Python library for phylogenetic computing"; - maintainers = with lib.maintainers; [ unode ]; - license = lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ unode ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/denonavr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/denonavr/default.nix index b02e1e498b..e4e36a196f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/denonavr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/denonavr/default.nix @@ -1,33 +1,51 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27, requests, netifaces -, pytestCheckHook, testtools, requests-mock }: +{ lib +, asyncstdlib +, attrs +, buildPythonPackage +, defusedxml +, fetchFromGitHub +, httpx +, netifaces +, pytest-asyncio +, pytestCheckHook +, pytest-httpx +, pytest-timeout +, pythonOlder +}: buildPythonPackage rec { pname = "denonavr"; - version = "0.9.10"; - disabled = isPy27; + version = "0.10.8"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "scarface-4711"; - repo = "denonavr"; + repo = pname; rev = version; - sha256 = "sha256-3ap8F3ayBTpaR98md+gT0+hkIWlFBNxStTGWT5AL//A="; + sha256 = "02q76mbmg2rkm4shy2apwbw9pvicy9j5v4zgpjwzxif9yf7m8aqk"; }; propagatedBuildInputs = [ - requests + asyncstdlib + attrs + defusedxml + httpx netifaces ]; checkInputs = [ + pytest-asyncio pytestCheckHook - testtools - requests-mock + pytest-httpx + pytest-timeout ]; + pythonImportsCheck = [ "denonavr" ]; + meta = with lib; { + description = "Automation Library for Denon AVR receivers"; homepage = "https://github.com/scarface-4711/denonavr"; - description = "Automation Library for Denon AVR receivers."; - license = licenses.mit; + license = with licenses; [ mit ]; maintainers = with maintainers; [ colemickens ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix index 9c977ecc5f..8958566070 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix @@ -1,27 +1,53 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }: - -let - testPath = - if isPy3k - then "test_*_py3.py" - else "test_*_py2_py3.py"; -in +{ lib +, aiohttp +, buildPythonPackage +, fastapi +, fetchFromGitHub +, flask +, httpx +, mypy-boto3-s3 +, numpy +, scipy +, pydantic +, pytestCheckHook +, pyyaml +, six +}: buildPythonPackage rec { pname = "dependency-injector"; - version = "4.31.1"; + version = "4.32.2"; - src = fetchPypi { - inherit pname version; - sha256 = "b6b28b9571f44d575367c6005ba8aaa9fd2b70310e1c15410925d6f1ee2769ad"; + src = fetchFromGitHub { + owner = "ets-labs"; + repo = "python-dependency-injector"; + rev = version; + sha256 = "1gkkka0hl2hl4axf3gfm58mzv92bg0frr5jikw8g32hd4q4aagcg"; }; - propagatedBuildInputs = [ six ]; - checkInputs = [ unittest2 pyyaml flask ]; + propagatedBuildInputs = [ + six + ]; - checkPhase = '' - unit2 discover -s tests/unit -p "${testPath}" - ''; + checkInputs = [ + aiohttp + fastapi + flask + httpx + mypy-boto3-s3 + numpy + pydantic + scipy + pytestCheckHook + pyyaml + ]; + + disabledTestPaths = [ + # There is no unique identifier to disable the one failing test + "tests/unit/ext/test_aiohttp_py35.py" + ]; + + pythonImportsCheck = [ "dependency_injector" ]; meta = with lib; { description = "Dependency injection microframework for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dftfit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dftfit/default.nix index 73791bdaa9..778b8c3d98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dftfit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dftfit/default.nix @@ -8,7 +8,7 @@ , pandas , scipy , numpy -, scikitlearn +, scikit-learn , lammps-cython , pymatgen-lammps , pytestrunner @@ -34,7 +34,7 @@ buildPythonPackage rec { pandas scipy numpy - scikitlearn + scikit-learn lammps-cython pymatgen-lammps ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix index d4f742d97f..3fb5e7ae55 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix @@ -5,25 +5,23 @@ , libopus , pynacl , pythonOlder -, websockets , withVoice ? true }: buildPythonPackage rec { pname = "discord.py"; - version = "1.7.1"; + version = "1.7.2"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Rapptz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dpASIqe6rJEyiWJyPbQhq9M54lX1ilfp4UuGnbJcFLo="; + sha256 = "sha256-NY1/RKp8w9gAqGYXnCNhNZqR/inGMvUvxjJ1MMs62B8="; }; propagatedBuildInputs = [ aiohttp - websockets ] ++ lib.optionalString withVoice [ libopus pynacl diff --git a/third_party/nixpkgs/pkgs/development/python-modules/distro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distro/default.nix index 16d26e741a..885538de65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distro/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { homepage = "https://github.com/nir0s/distro"; description = "Linux Distribution - a Linux OS platform information API."; license = licenses.asl20; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-pipeline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-pipeline/default.nix deleted file mode 100644 index 92aefe4a40..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-pipeline/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k -, django, futures ? null, mock ? null, jinja2, jsmin, slimit }: - -buildPythonPackage rec { - pname = "django-pipeline"; - version = "1.6.14"; - - # no tests on PyPI - src = fetchFromGitHub { - owner = "jazzband"; - repo = pname; - rev = version; - sha256 = "1xf732bd17mgha75jfhlnms46ib2pffhpfa0ca7bmng9jhbvsl9j"; - }; - - postPatch = '' - substituteInPlace tests/tests/test_compiler.py \ - --replace "/usr/bin/env" "" - ''; - - propagatedBuildInputs = [ django ] ++ lib.optional (!isPy3k) futures; - - checkInputs = [ jinja2 jsmin slimit ] ++ lib.optional (!isPy3k) mock; - - checkPhase = '' - export PYTHONPATH=.:$PYTHONPATH - export DJANGO_SETTINGS_MODULE=tests.settings - ${django}/bin/django-admin.py test tests - ''; - - meta = with lib; { - description = "Pipeline is an asset packaging library for Django"; - homepage = "https://github.com/cyberdelia/django-pipeline"; - license = licenses.mit; - broken = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/2.nix index 991c353df1..e0d3cd12f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.20"; + version = "2.2.22"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0r3a6gbhwngxl172yy6n0sq5knibl2vxc0wbk1g8licfbzfgjs95"; + sha256 = "db2214db1c99017cbd971e58824e6f424375154fe358afc30e976f5b99fc6060"; }; patches = lib.optional withGdal diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix index 62ca390eac..321582946b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.2"; + version = "3.2.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "179qdxa438fnycnnf1j5z6359h1kbp2q7djf01v5jrr26xjgkw11"; + sha256 = "0a1d195ad65c52bf275b8277b3d49680bd1137a5f55039a806f25f6b9752ce3d"; }; patches = lib.optional withGdal 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 30f280a502..5ff02c0433 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dnspython/1.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dnspython/1.nix @@ -1,4 +1,8 @@ -{ buildPythonPackage, fetchPypi, lib, pythonOlder }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "dnspython"; @@ -12,11 +16,11 @@ buildPythonPackage rec { # needs networking for some tests doCheck = false; + pythonImportsCheck = [ "dns" ]; - meta = { - description = "A DNS toolkit for Python 3.x"; + meta = with lib; { + description = "A DNS toolkit for Python"; homepage = "http://www.dnspython.org"; - # BSD-like, check https://www.dnspython.org/LICENSE for details - license = lib.licenses.free; + license = with licenses; [ isc ]; }; } 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 afb85fb61f..56e69aac04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix @@ -1,4 +1,8 @@ -{ buildPythonPackage, fetchPypi, lib, pythonOlder }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "dnspython"; @@ -13,11 +17,11 @@ buildPythonPackage rec { # needs networking for some tests doCheck = false; + pythonImportsCheck = [ "dns" ]; - meta = { - description = "A DNS toolkit for Python 3.x"; + meta = with lib; { + description = "A DNS toolkit for Python"; homepage = "http://www.dnspython.org"; - # BSD-like, check https://www.dnspython.org/LICENSE for details - license = lib.licenses.free; + license = with licenses; [ isc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix index 4981440c7c..808c2916dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix @@ -10,7 +10,7 @@ , gsettings-desktop-schemas , fetchurl , dbus -, xvfb_run +, xvfb-run , wrapGAppsHook # , fetchPypi }: @@ -33,7 +33,7 @@ buildPythonPackage { ./nix-support.patch ]; - nativeBuildInputs = [ gobject-introspection dbus xvfb_run wrapGAppsHook ]; # for setup hooks + nativeBuildInputs = [ gobject-introspection dbus xvfb-run wrapGAppsHook ]; # for setup hooks propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ]; strictDeps = false; # issue 56943 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dotmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dotmap/default.nix new file mode 100644 index 0000000000..cb5f032a6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dotmap/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "dotmap"; + version = "1.3.23"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hy88kzzb7zhxfr7iyvl6rhmvz02538pbna7zypaard4a88bbbka"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "dotmap/test.py" ]; + + pythonImportsCheck = [ "dotmap" ]; + + meta = with lib; { + description = "Python for dot-access dictionaries"; + homepage = "https://github.com/drgrib/dotmap"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix index d265838526..db0212e456 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "drf-nested-routers"; - version = "0.92.5"; + version = "0.93.3"; src = fetchFromGitHub { owner = "alanjds"; repo = "drf-nested-routers"; rev = "v${version}"; - sha256 = "1l1jza8xz6xcm3gwxh1k6pc8fs95cq3v751gxj497y1a83d26j8i"; + sha256 = "1gmw6gwiqzfysx8qn7aan7xgkizxy64db94z30pm3bvn6jxv08si"; }; propagatedBuildInputs = [ django djangorestframework setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix index 7ec3b8d1c1..775050acb0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix @@ -4,12 +4,15 @@ , httpx , poetry-core , pythonOlder +, pytest-asyncio +, pytest-httpx +, pytestCheckHook , yarl }: buildPythonPackage rec { pname = "elmax"; - version = "0.1.1"; + version = "0.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-elmax"; rev = version; - sha256 = "sha256-vDISJ/CVOjpM+GPF2TCm3/AMFTWTM0b/+ZPCpAEvNvY="; + sha256 = "sha256-Aq/OHxOmtUUmBNlFPu892C8AkTX+Ee0oca7D79InPXQ="; }; nativeBuildInputs = [ poetry-core ]; @@ -27,8 +30,12 @@ buildPythonPackage rec { yarl ]; - # Project has no tests - doCheck = false; + checkInputs = [ + pytest-asyncio + pytest-httpx + pytestCheckHook + ]; + pythonImportsCheck = [ "elmax" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enaml/default.nix index 1102443884..8896c5c706 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/enaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/enaml/default.nix @@ -5,7 +5,7 @@ , ply , kiwisolver , qtpy -, sip +, sip_4 , cppy , bytecode }: @@ -44,7 +44,7 @@ buildPythonPackage rec { ply kiwisolver qtpy - sip + sip_4 cppy bytecode ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eve/default.nix index 32f531e4ff..89db1ccad2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eve/default.nix @@ -27,6 +27,11 @@ buildPythonPackage rec { setuptools ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "events>=0.3,<0.4" "events>=0.3,<0.5" + ''; + pythonImportsCheck = [ "eve" ]; # tests call a running mongodb instance diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix index 0cccedd54a..bf9ae2284f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix @@ -3,8 +3,8 @@ lxml, tzlocal, python-dateutil, pygments, requests-kerberos, defusedxml, cached-property, isodate, requests_ntlm, dnspython, psutil, requests-mock, pyyaml, - oauthlib, requests_oauthlib, - flake8, + oauthlib, requests_oauthlib, tzdata, + flake8, backports-zoneinfo }: buildPythonPackage rec { @@ -24,9 +24,11 @@ buildPythonPackage rec { flake8 ]; propagatedBuildInputs = [ - lxml tzlocal python-dateutil pygments requests-kerberos + lxml tzlocal tzdata python-dateutil pygments requests-kerberos defusedxml cached-property isodate requests_ntlm dnspython oauthlib requests_oauthlib + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix index b66c8a2812..57a4af2fc0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { description = "Distributed Python deployment and communication"; license = licenses.mit; homepage = "https://execnet.readthedocs.io/"; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix index dadfc41c68..0f1c7ec6bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix @@ -17,19 +17,19 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.63.0"; + version = "0.65.0"; format = "flit"; src = fetchFromGitHub { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "0l3imrcs42pqf9d6k8c1q15k5sqcnapl5zk71xl52mrxhz49lgpi"; + sha256 = "sha256-DPfijCGORF3ThZblqaYTKN0H8+wlhtdIS8lfKfJl/bY="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "starlette ==0.13.6" "starlette" + --replace "starlette ==" "starlette >=" ''; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastpair/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastpair/default.nix index 9a3f8c53b1..eaf1a78520 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastpair/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastpair/default.nix @@ -1,35 +1,28 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }: +{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy, pytestCheckHook }: buildPythonPackage { pname = "fastpair"; - version = "2016-07-05"; + version = "2021-05-19"; src = fetchFromGitHub { owner = "carsonfarmer"; repo = "fastpair"; - rev = "92364962f6b695661f35a117bf11f96584128a8d"; - sha256 = "1pv9sxycxdk567s5gs947rhlqngrb9nn9yh4dhdvg1ix1i8dca71"; + rev = "d3170fd7e4d6e95312e7e1cb02e84077a3f06379"; + sha256 = "1l8zgr8awg27lhlkpa2dsvghrb7b12jl1bkgpzg5q7pg8nizl9mx"; }; nativeBuildInputs = [ pytestrunner ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest pytestCheckHook ]; propagatedBuildInputs = [ scipy ]; - # Does not support pytest 4 https://github.com/carsonfarmer/fastpair/issues/14 - doCheck = false; - - checkPhase = '' - pytest fastpair - ''; - meta = with lib; { homepage = "https://github.com/carsonfarmer/fastpair"; description = "Data-structure for the dynamic closest-pair problem"; license = licenses.mit; - maintainers = with maintainers; [ cmcdragonkai ]; + maintainers = with maintainers; [ cmcdragonkai rakesh4g ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix index 6e98f6e80a..f39393ecff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -1,11 +1,11 @@ { lib , buildPythonPackage , fetchPypi -, nose , apispec , colorama , click , email_validator +, fetchpatch , flask , flask-babel , flask_login @@ -20,21 +20,28 @@ , python-dateutil , prison , pyjwt +, pyyaml , sqlalchemy-utils }: buildPythonPackage rec { pname = "flask-appbuilder"; - version = "3.1.1"; + version = "3.3.0"; src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - sha256 = "076b020b0ba125339a2e710e74eab52648cde2b18599f7cb0fa1eada9bbb648c"; + sha256 = "00dsfv1apl6483wy20aj91f9h5ak2casbx5vcajv2nd3i7c7v8gx"; }; - checkInputs = [ - nose + patches = [ + # https://github.com/dpgaspar/Flask-AppBuilder/pull/1610 + (fetchpatch { + name = "flask_jwt_extended-and-pyjwt-patch"; + url = "https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch"; + sha256 = "sha256-ZpY8+2Hoz3z01GVtw2OIbQcsmAwa7iwilFWzgcGhY1w="; + includes = [ "flask_appbuilder/security/manager.py" "setup.py" ]; + }) ]; propagatedBuildInputs = [ @@ -56,22 +63,23 @@ buildPythonPackage rec { python-dateutil prison pyjwt + pyyaml sqlalchemy-utils ]; postPatch = '' substituteInPlace setup.py \ - --replace "apispec[yaml]>=3.3, <4" "apispec" \ - --replace "Flask-Login>=0.3, <0.5" "Flask-Login" \ - --replace "Flask-Babel>=1, <2" "Flask-Babel" \ - --replace "marshmallow-sqlalchemy>=0.22.0, <0.24.0" "marshmallow-sqlalchemy" \ - --replace "prison>=0.1.3, <1.0.0" "prison" + --replace "apispec[yaml]>=3.3, <4" "apispec[yaml] >=3.3, <5" \ + --replace "Flask-Login>=0.3, <0.5" "Flask-Login >=0.3, <0.6" \ + --replace "Flask-Babel>=1, <2" "Flask-Babel >=1, <3" \ + --replace "marshmallow-sqlalchemy>=0.22.0, <0.24.0" "marshmallow-sqlalchemy >=0.22.0, <0.25.0" ''; - - # majority of tests require network access or mongo + # Majority of tests require network access or mongo doCheck = false; + pythonImportsCheck = [ "flask_appbuilder" ]; + meta = with lib; { description = "Simple and rapid application development framework, built on top of Flask"; homepage = "https://github.com/dpgaspar/flask-appbuilder/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fpyutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fpyutils/default.nix new file mode 100644 index 0000000000..0120391aee --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/fpyutils/default.nix @@ -0,0 +1,46 @@ +{ lib +, atomicwrites +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "fpyutils"; + version = "2.0.0"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "frnmst"; + repo = pname; + rev = version; + sha256 = "1n15fvd6191ixxsza49fdd8j43hs0agagg8k9v6rc7by1ffqnl2b"; + }; + + propagatedBuildInputs = [ + atomicwrites + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "fpyutils/tests/*.py" ]; + + disabledTests = [ + # Don't run test which requires bash + "test_execute_command_live_output" + ]; + + pythonImportsCheck = [ "fpyutils" ]; + + meta = with lib; { + description = "Collection of useful non-standard Python functions"; + homepage = "https://github.com/frnmst/fpyutils"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix index 8e54cb6897..ad157fbda4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.4.2"; + version = "1.5.0"; # no tests on PyPI src = fetchFromGitHub { owner = "kbr"; repo = pname; rev = version; - sha256 = "02w1hwbfwbh5xlq433myzv6ms7jqxg8kn3d6znq4ic22zprzf5r2"; + sha256 = "sha256-Iw7R+39rpoCTrRD74kBihF7AMcJWxy2xdPhKLznWdlo="; }; disabled = pythonOlder "3.6"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix index be6321f86c..b6b6f42b3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix @@ -5,7 +5,7 @@ , six , scipy , smart_open -, scikitlearn, testfixtures, unittest2 +, scikit-learn, testfixtures, unittest2 , isPy3k }: @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ smart_open numpy six scipy ]; - checkInputs = [ scikitlearn testfixtures unittest2 ]; + checkInputs = [ scikit-learn testfixtures unittest2 ]; # Two tests fail. # diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glcontext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glcontext/default.nix new file mode 100644 index 0000000000..c5a06fb649 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/glcontext/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, libGL +, libX11 +, pytestCheckHook +, psutil +}: + +buildPythonPackage rec { + pname = "glcontext"; + version = "2.3.3"; + + src = fetchFromGitHub { + owner = "moderngl"; + repo = pname; + rev = version; + sha256 = "16kwrfjijn9bnb48rk17wapmhxq6g9s59zczh65imyncb9k82wkc"; + }; + + disabled = !isPy3k; + + buildInputs = [ libGL libX11 ]; + + postPatch = '' + substituteInPlace glcontext/x11.cpp \ + --replace '"libGL.so"' '"${libGL}/lib/libGL.so"' \ + --replace '"libX11.so"' '"${libX11}/lib/libX11.so"' + substituteInPlace glcontext/egl.cpp \ + --replace '"libGL.so"' '"${libGL}/lib/libGL.so"' \ + --replace '"libEGL.so"' '"${libGL}/lib/libEGL.so"' + ''; + + # Tests fail because they try to open display. See + # https://github.com/NixOS/nixpkgs/pull/121439 + # for details. + doCheck = false; + + pythonImportsCheck = [ "glcontext" ]; + + meta = with lib; { + homepage = "https://github.com/moderngl/glcontext"; + description = "OpenGL implementation for ModernGL"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ friedelino ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix index 0c2d74a90e..d251ec75ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix @@ -28,6 +28,11 @@ buildPythonPackage rec { responses ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pyjwt[crypto]>=1.5.3,<2.0.0" "pyjwt[crypto] >=1.5.3, <3.0.0" + ''; + pythonImportsCheck = [ "globus_sdk" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix index 9a0b1b09db..f14245865f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix @@ -2,10 +2,10 @@ , buildPythonPackage , fetchFromGitHub , numpy -, python , scikitimage , openjpeg , procps +, pytestCheckHook , contextlib2 , mock , importlib-resources @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "glymur"; - version = "0.8.18"; + version = "0.9.3"; src = fetchFromGitHub { owner = "quintusdias"; repo = pname; rev = "v${version}"; - sha256 = "1zbghzw1q4fljb019lsrhka9xrnn4425qnxrjbmbv7dssgkkywd7"; + sha256 = "1xlpax56qg5qqh0s19xidgvv2483sc684zj7rh6zw1m1z9m37drr"; }; propagatedBuildInputs = [ @@ -30,16 +30,21 @@ buildPythonPackage rec { checkInputs = [ scikitimage procps + pytestCheckHook ]; postConfigure = '' substituteInPlace glymur/config.py \ - --replace "path = read_config_file(libname)" "path = '${openjpeg}/lib' + libname + ${if stdenv.isDarwin then "'.dylib'" else "'.so'"}" + --replace "path = read_config_file(libname)" "path = '${openjpeg}/lib/lib' + libname + ${if stdenv.isDarwin then "'.dylib'" else "'.so'"}" ''; - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; + disabledTestPaths = [ + # this test involves glymur's different ways of finding the openjpeg path on + # fsh systems by reading an .rc file and such, and is obviated by the patch + # in postConfigure + "tests/test_config.py" + ]; + meta = with lib; { description = "Tools for accessing JPEG2000 files"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpapi/default.nix index 6ed9f48dd6..6c2454dbbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gpapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gpapi/default.nix @@ -1,7 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder -, requests +{ buildPythonPackage +, cryptography +, fetchPypi +, lib +, pythonOlder , protobuf , pycryptodome +, requests }: buildPythonPackage rec { @@ -14,11 +18,17 @@ buildPythonPackage rec { sha256 = "0ampvsv97r3hy1cakif4kmyk1ynf3scbvh4fbk02x7xrxn4kl38w"; }; - propagatedBuildInputs = [ requests protobuf pycryptodome ]; + # package doesn't contain unit tests + # scripts in ./test require networking + doCheck = false; + + pythonImportsCheck = [ "gpapi.googleplay" ]; + + propagatedBuildInputs = [ cryptography protobuf pycryptodome requests ]; meta = with lib; { homepage = "https://github.com/NoMore201/googleplay-api"; - license = licenses.gpl3; + license = licenses.gpl3Only; description = "Google Play Unofficial Python API"; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix index d2d6a78436..08125bfc71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix @@ -28,6 +28,12 @@ buildPythonPackage rec { ./update-django-tagging.patch ]; + postPatch = '' + # https://github.com/graphite-project/graphite-web/pull/2701 + substituteInPlace setup.py \ + --replace "'scandir'" "'scandir; python_version < \"3.5\"'" + ''; + propagatedBuildInputs = [ django memcached diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix index b4e8803784..758f988a23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix @@ -8,7 +8,7 @@ , matplotlib , networkx , numpy -, scikitlearn +, scikit-learn , scipy , seaborn }: @@ -31,7 +31,7 @@ buildPythonPackage rec { matplotlib networkx numpy - scikitlearn + scikit-learn scipy seaborn ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix index 59da8f173d..573f5a68ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix @@ -1,6 +1,15 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pytestCheckHook, pyhamcrest, pytestrunner -, six, isodate, tornado, aenum, radish-bdd, mock +{ lib +, buildPythonPackage +, fetchFromGitHub +, aenum +, importlib-metadata +, isodate +, six +, tornado +, pytestCheckHook +, mock +, pyhamcrest +, radish-bdd }: buildPythonPackage rec { @@ -22,13 +31,28 @@ buildPythonPackage rec { --replace 'PyHamcrest>=1.9.0,<2.0.0' 'PyHamcrest' \ --replace 'radish-bdd==0.8.6' 'radish-bdd' \ --replace 'mock>=3.0.5,<4.0.0' 'mock' \ - --replace 'pytest>=4.6.4,<5.0.0' 'pytest' + --replace 'pytest>=4.6.4,<5.0.0' 'pytest' \ + --replace 'importlib-metadata<3.0.0' 'importlib-metadata' \ + --replace 'pytest-runner==5.2' ' ' ''; - nativeBuildInputs = [ pytestrunner ]; # simply to placate requirements - propagatedBuildInputs = [ six isodate tornado aenum ]; + # setup-requires requirements + nativeBuildInputs = [ + importlib-metadata + ]; + propagatedBuildInputs = [ + aenum + isodate + six + tornado + ]; - checkInputs = [ pytestCheckHook pyhamcrest radish-bdd mock ]; + checkInputs = [ + pytestCheckHook + mock + pyhamcrest + radish-bdd + ]; # disable custom pytest report generation preCheck = '' @@ -36,12 +60,14 @@ buildPythonPackage rec { ''; # many tests expect a running tinkerpop server + disabledTestPaths = [ + "tests/driver/test_client.py" + "tests/driver/test_driver_remote_connection.py" + "tests/driver/test_driver_remote_connection_threaded.py" + "tests/process/test_dsl.py" + "tests/structure/io/test_functionalityio.py" + ]; pytestFlagsArray = [ - "--ignore=tests/driver/test_client.py" - "--ignore=tests/driver/test_driver_remote_connection.py" - "--ignore=tests/driver/test_driver_remote_connection_threaded.py" - "--ignore=tests/process/test_dsl.py" - "--ignore=tests/structure/io/test_functionalityio.py" # disabledTests doesn't quite allow us to be precise enough for this "-k 'not (TestFunctionalGraphSONIO and (test_timestamp or test_datetime or test_uuid))'" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix index ea89f7214c..a391d993cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gst-python"; - version = "1.18.0"; + version = "1.18.4"; format = "other"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchurl { url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz"; - sha256 = "0ifx2s2j24sj2w5jm7cxyg1kinnhbxiz4x0qp3gnsjlwbawfigvn"; + sha256 = "13h9qzfz8s1gyj2ar9q2gf5346sgdv6jv8hj7aw0hpl2gs5f0s6b"; }; # Python 2.x is not supported. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix index bb31baa788..15a1ddbf06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix @@ -46,11 +46,11 @@ buildPythonPackage rec { To run gtimelog successfully on a system that does not have full GNOME 3 installed, the following NixOS options should be set: - programs.dconf.enable = true; - - services.gnome3.gnome-keyring.enable = true; + - services.gnome.gnome-keyring.enable = true; In addition, the following packages should be added to the environment: - - gnome3.adwaita-icon-theme - - gnome3.dconf + - gnome.adwaita-icon-theme + - gnome.dconf ''; homepage = "https://gtimelog.org/"; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ha-philipsjs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ha-philipsjs/default.nix new file mode 100644 index 0000000000..c6de997a1d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ha-philipsjs/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, httpx +, pytest-aiohttp +, pytest-mock +, pytestCheckHook +, pythonOlder +, respx +}: + +buildPythonPackage rec { + pname = "ha-philipsjs"; + version = "2.7.4"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "danielperna84"; + repo = pname; + rev = version; + sha256 = "08fjdb1q02dwxq8s15ddd00gps64xplblkn8dx5yivldskiy8i1n"; + }; + + propagatedBuildInputs = [ + cryptography + httpx + ]; + + checkInputs = [ + pytest-aiohttp + pytest-mock + pytestCheckHook + respx + ]; + + pythonImportsCheck = [ "haphilipsjs" ]; + + meta = with lib; { + description = "Python library to interact with Philips TVs with jointSPACE API"; + homepage = "https://github.com/danielperna84/ha-philipsjs"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix index f75891c260..0164e84f8f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.2.11"; + version = "0.2.13"; src = fetchFromGitHub { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-S2pVxYpB8NcZIbhC+gnGrJxM6tvoPS1Uh87HTYiksWI="; + sha256 = "sha256-RzBEiO8IfeMls7ssCZ2yhL78UVrpZykwDl1IUshqOu8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hdate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hdate/default.nix new file mode 100644 index 0000000000..a034eddd56 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/hdate/default.nix @@ -0,0 +1,63 @@ +{ lib +, astral +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytestCheckHook +, pythonOlder +, pytz +}: + +buildPythonPackage rec { + pname = "hdate"; + version = "0.10.2"; + disabled = pythonOlder "3.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "py-libhdate"; + repo = "py-libhdate"; + rev = "v${version}"; + sha256 = "07b0c7q8w6flj4q72v58d3wymsxfp5qz8z97qhhc2977mjx5fsxd"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + astral + pytz + ]; + + checkInputs = [ + pytestCheckHook + ]; + + patches = [ + # Version was not updated for the release + (fetchpatch { + name = "update-version.patch"; + url = "https://github.com/py-libhdate/py-libhdate/commit/b8186a891b29fed99def5ce0985ee0ae1e0dd77e.patch"; + sha256 = "1pmhgh57x9390ff5gyisng0l6b79sd6dxmf172hpk1gr03c3hv98"; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml --replace "^2020.5" ">=2020.5" + ''; + + pytestFlagsArray = [ + "tests" + ]; + + pythonImportsCheck = [ "hdate" ]; + + meta = with lib; { + description = "Python module for Jewish/Hebrew date and Zmanim"; + homepage = "https://github.com/py-libhdate/py-libhdate"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix index d2590d1495..5264ff2489 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix @@ -5,7 +5,7 @@ , numpy , pytestCheckHook , scipy -, scikitlearn +, scikit-learn , fetchPypi , joblib , six @@ -29,12 +29,18 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ numpy scipy scikitlearn joblib six ]; + propagatedBuildInputs = [ numpy scipy scikit-learn joblib six ]; preCheck = '' cd hdbscan/tests rm __init__.py ''; checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # known flaky tests: https://github.com/scikit-learn-contrib/hdbscan/issues/420 + "test_mem_vec_diff_clusters" + "test_all_points_mem_vec_diff_clusters" + "test_approx_predict_diff_clusters" + ]; meta = with lib; { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix index 036122f702..1d6d6b39d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix @@ -42,6 +42,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "hickle" ]; meta = { + # incompatible with h5py>=3.0, see https://github.com/telegraphic/hickle/issues/143 + broken = true; description = "Serialize Python data to HDF5"; homepage = "https://github.com/telegraphic/hickle"; license = lib.licenses.mit; 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 790e7aa08f..2b9165dee2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hidapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hidapi/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, libusb1, udev, darwin, fetchPypi, buildPythonPackage, cython }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, xcbuild +, cython +, libusb1 +, udev +, darwin +}: buildPythonPackage rec { pname = "hidapi"; @@ -9,18 +18,17 @@ buildPythonPackage rec { sha256 = "a1170b18050bc57fae3840a51084e8252fd319c0fc6043d68c8501deb0e25846"; }; - propagatedBuildInputs = - lib.optionals stdenv.isLinux [ libusb1 udev ] ++ - lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]) ++ - [ cython ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ]; + + propagatedBuildInputs = [ cython ] + ++ lib.optionals stdenv.isLinux [ libusb1 udev ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]); # Fix the USB backend library lookup postPatch = lib.optionalString stdenv.isLinux '' 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 - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py --replace 'macos_sdk_path =' 'macos_sdk_path = "" #' ''; pythonImportsCheck = [ "hid" ]; @@ -30,7 +38,7 @@ buildPythonPackage rec { homepage = "https://github.com/trezor/cython-hidapi"; # license can actually be either bsd3 or gpl3 # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt - license = licenses.bsd3; + license = with licenses; [ bsd3 gpl3Only ]; maintainers = with maintainers; [ np prusnak ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix index 8d2afcf5e7..eb7e05afff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, numpy, scikitlearn, setuptools_scm, cython, pytest }: +{ lib, fetchurl, buildPythonPackage, numpy, scikit-learn, setuptools_scm, cython, pytest }: buildPythonPackage rec { pname = "hmmlearn"; @@ -10,7 +10,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptools_scm cython ]; - propagatedBuildInputs = [ numpy scikitlearn ]; + propagatedBuildInputs = [ numpy scikit-learn ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hsluv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hsluv/default.nix new file mode 100644 index 0000000000..b6573db532 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/hsluv/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "hsluv"; + version = "5.0.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "hsluv"; + repo = "hsluv-python"; + rev = "v${version}"; + sha256 = "0r0w8ycjwfg3pmzjghzrs0lkam93fzvgiqvrwh3nl9jnqlpw7v7j"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "hsluv" ]; + + meta = with lib; { + description = "Python implementation of HSLuv"; + homepage = "https://github.com/hsluv/hsluv-python"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix index dbbdf0bb38..079b5e71a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix @@ -5,24 +5,25 @@ , h11 , h2 , pproxy +, pytest-asyncio +, pytest-trio , pytestCheckHook , pytestcov , sniffio -, uvicorn , trustme -, trio +, uvicorn }: buildPythonPackage rec { pname = "httpcore"; - version = "0.12.3"; + version = "0.13.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "09hbjc5wzhrnri5y3idxcq329d7jiaxljc7y6npwv9gh9saln109"; + sha256 = "sha256-KvqBVQUaF3p2oJz0tt3Bkn2JiKEHqrZ3b6I9f0JK5h8="; }; propagatedBuildInputs = [ @@ -33,18 +34,19 @@ buildPythonPackage rec { checkInputs = [ pproxy + pytest-asyncio + pytest-trio pytestCheckHook pytestcov - uvicorn trustme - trio + uvicorn ]; - pytestFlagsArray = [ + disabledTestPaths = [ # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known - "--ignore=tests/test_threadsafety.py" - "--ignore=tests/sync_tests/test_interfaces.py" - "--ignore=tests/sync_tests/test_retries.py" + "tests/test_threadsafety.py" + "tests/sync_tests/test_interfaces.py" + "tests/sync_tests/test_retries.py" ]; pythonImportsCheck = [ "httpcore" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix index 2aba203ea0..b45c3e85f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.17.1"; + version = "0.18.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-P4Uki+vlAgVECBUz9UGvv1ip49jmf0kYbyU2/mkWE3U="; + sha256 = "sha256-6EYBTRXaVHBgW/JzZvWLz55AqgocOyym2FVtu2Nkp/U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/humblewx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/humblewx/default.nix new file mode 100644 index 0000000000..7fd0b0e8dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/humblewx/default.nix @@ -0,0 +1,42 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, wxPython_4_0 +, python3 +}: + +buildPythonPackage rec { + pname = "humblewx"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "thetimelineproj"; + repo = pname; + rev = version; + sha256 = "0fv8gwlbcj000qq34inbwgxf0xgibs590dsyqnw0mmyb7f1iq210"; + }; + + # timeline is not compatible with wxPython_4_1. reported upstream + propagatedBuildInputs = [ wxPython_4_0 ]; + + checkPhase = '' + runHook preCheck + for i in examples/*; do + ${python3.interpreter} $i + done + runHook postCheck + ''; + + # Unable to access the X Display, is $DISPLAY set properly? + # would have to use nixos module tests, but it is not worth it + doCheck = false; + + pythonImportsCheck = [ "humblewx" ]; + + meta = { + homepage = "https://github.com/thetimelineproj/humblewx"; + description = "Library that simplifies creating user interfaces with wxPython"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ davidak ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyperlink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyperlink/default.nix index ad56de8678..21927683b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hyperlink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hyperlink/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, idna, typing ? null }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, idna +, typing ? null +}: buildPythonPackage rec { pname = "hyperlink"; @@ -6,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b"; + sha256 = "0sx50lkivsfjxx9zr4yh7l9gll2l9kvl0v0w8w4wk2x5v9bzjyj2"; }; propagatedBuildInputs = [ idna ] @@ -14,6 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "A featureful, correct URL for Python"; + homepage = "https://github.com/python-hyper/hyperlink"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ apeschar ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix index 86b43465fb..9fdeca082b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix @@ -4,8 +4,10 @@ , fetchFromGitHub , pytestCheckHook , pytestcov , numba , numpy -, scikitlearn +, scikit-learn , scipy +, matplotlib +, seaborn }: buildPythonPackage rec { @@ -24,12 +26,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ numba numpy - scikitlearn + scikit-learn scipy ]; - checkInputs = [ pytestCheckHook pytestcov ]; - pytestFlagsArray = [ "--ignore=docs" ]; + checkInputs = [ pytestCheckHook pytestcov matplotlib seaborn ]; + disabledTestPaths = [ + "docs" + "benchmarks" + "examples" + ]; meta = with lib; { homepage = "https://github.com/neurodata/hyppo"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/i2c-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/i2c-tools/default.nix new file mode 100644 index 0000000000..60af11e241 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/i2c-tools/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, i2c-tools +}: + +buildPythonPackage rec { + inherit (i2c-tools) pname version src; + + buildInputs = [ i2c-tools ]; + + preConfigure = "cd py-smbus"; + + meta = with lib; { + inherit (i2c-tools.meta) homepage platforms; + + description = "wrapper for i2c-tools' smbus stuff"; + # from py-smbus/smbusmodule.c + license = [ licenses.gpl2Only ]; + maintainers = [ maintainers.evils ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix index 011909d6b8..ed87f3678b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix @@ -1,6 +1,11 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, tatsu, arrow -, pytestCheckHook, pytest-flakes +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, tatsu +, arrow +, pytestCheckHook +, pytest-flakes }: buildPythonPackage rec { @@ -9,21 +14,35 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "C4ptainCrunch"; - repo = "ics.py"; + owner = "ics-py"; + repo = "ics-py"; rev = "v${version}"; sha256 = "0rrdc9rcxc3ys6rml81b8m8qdlisk78a34bdib0wy65hlkmyyykn"; }; - propagatedBuildInputs = [ tatsu arrow ]; + propagatedBuildInputs = [ + arrow + tatsu + ]; + + checkInputs = [ + pytest-flakes + pytestCheckHook + ]; postPatch = '' + # 0.8 will move to python-dateutil substituteInPlace requirements.txt \ --replace "arrow>=0.11,<0.15" "arrow" substituteInPlace setup.cfg --replace "--pep8" "" ''; - checkInputs = [ pytestCheckHook pytest-flakes ]; + disabledTests = [ + # Failure seems to be related to arrow > 1.0 + "test_event" + ]; + + pythonImportsCheck = [ "ics" ]; meta = with lib; { description = "Pythonic and easy iCalendar library (RFC 5545)"; @@ -32,9 +51,8 @@ buildPythonPackage rec { write ics data in a developer friendly way. ''; homepage = "http://icspy.readthedocs.org/en/stable/"; - changelog = "https://github.com/C4ptainCrunch/ics.py/releases/tag/v${version}"; + changelog = "https://github.com/ics-py/ics-py/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ primeos ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix index 71bed73f9d..f745b735f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix @@ -8,7 +8,7 @@ , mock , pytorch , pynvml -, scikitlearn +, scikit-learn , tqdm }: @@ -24,7 +24,7 @@ buildPythonPackage rec { }; checkInputs = [ pytestCheckHook matplotlib mock pytest_xdist ]; - propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ]; + propagatedBuildInputs = [ pytorch scikit-learn tqdm pynvml ]; # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite. doCheck = pythonOlder "3.9"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix index db59ba70bb..bb186d6594 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -1,29 +1,42 @@ { lib , buildPythonPackage -, fetchPypi -, fetchpatch , isPy3k +, fetchPypi +, substituteAll +, ffmpeg +, python }: buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.4.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "13b05b17a941a9f4a90b16910b1ffac159448cff051a153da8ba4b4343ffa195"; - }; - patches = [ (fetchpatch { - # Fixes compatibility with python3.9 - # Should be included in the next release after 0.4.2 - url = "https://github.com/imageio/imageio-ffmpeg/pull/43/commits/b90c39fe3d29418d67d953588ed9fdf4d848f811.patch"; - sha256 = "0d9kf4w6ldwag3s2dr9zjin6wrj66fnl4fn8379ci4q4qfsqgx3f"; - })]; + version = "0.4.3"; disabled = !isPy3k; - # No test infrastructure in repository. - doCheck = false; + src = fetchPypi { + inherit pname version; + sha256 = "f826260a3207b872f1a4ba87ec0c8e02c00afba4fd03348a59049bdd8215841e"; + }; + + patches = [ + (substituteAll { + src = ./ffmpeg-path.patch; + ffmpeg = "${ffmpeg}/bin/ffmpeg"; + }) + ]; + + checkPhase = '' + runHook preCheck + + ${python.interpreter} << EOF + from imageio_ffmpeg import get_ffmpeg_version + assert get_ffmpeg_version() == '${ffmpeg.version}' + EOF + + runHook postCheck + ''; + + pythonImportsCheck = [ "imageio_ffmpeg" ]; meta = with lib; { description = "FFMPEG wrapper for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch new file mode 100644 index 0000000000..d193ec199f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch @@ -0,0 +1,39 @@ +diff --git a/imageio_ffmpeg/_utils.py b/imageio_ffmpeg/_utils.py +index 1399cfd..c0eb9be 100644 +--- a/imageio_ffmpeg/_utils.py ++++ b/imageio_ffmpeg/_utils.py +@@ -23,33 +23,7 @@ def get_ffmpeg_exe(): + if exe: + return exe + +- plat = get_platform() +- +- # 2. Try from here +- bin_dir = resource_filename("imageio_ffmpeg", "binaries") +- exe = os.path.join(bin_dir, FNAME_PER_PLATFORM.get(plat, "")) +- if exe and os.path.isfile(exe) and _is_valid_exe(exe): +- return exe +- +- # 3. Try binary from conda package +- # (installed e.g. via `conda install ffmpeg -c conda-forge`) +- if plat.startswith("win"): +- exe = os.path.join(sys.prefix, "Library", "bin", "ffmpeg.exe") +- else: +- exe = os.path.join(sys.prefix, "bin", "ffmpeg") +- if exe and os.path.isfile(exe) and _is_valid_exe(exe): +- return exe +- +- # 4. Try system ffmpeg command +- exe = "ffmpeg" +- if _is_valid_exe(exe): +- return exe +- +- # Nothing was found +- raise RuntimeError( +- "No ffmpeg exe could be found. Install ffmpeg on your system, " +- "or set the IMAGEIO_FFMPEG_EXE environment variable." +- ) ++ return '@ffmpeg@' + + + def _popen_kwargs(prevent_sigint=False): diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix index 2b334fd121..1672e798f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix @@ -1,17 +1,12 @@ { lib , buildPythonPackage , isPy27 -, pathlib , fetchPypi +, imageio-ffmpeg +, numpy , pillow , psutil -, imageio-ffmpeg -, pytest -, numpy -, isPy3k -, ffmpeg_3 -, futures ? null -, enum34 +, pytestCheckHook }: buildPythonPackage rec { @@ -24,26 +19,21 @@ buildPythonPackage rec { inherit pname version; }; - checkInputs = [ pytest psutil ] ++ lib.optionals isPy3k [ - imageio-ffmpeg ffmpeg_3 - ]; - propagatedBuildInputs = [ numpy pillow ]; + propagatedBuildInputs = [ + imageio-ffmpeg + numpy + pillow + ]; - checkPhase = '' + checkInputs = [ + psutil + pytestCheckHook + ]; + + preCheck = '' export IMAGEIO_USERDIR="$TMP" export IMAGEIO_NO_INTERNET="true" export HOME="$(mktemp -d)" - py.test - ''; - - # For some reason, importing imageio also imports xml on Nix, see - # https://github.com/imageio/imageio/issues/395 - - # Also, there are tests that test the downloading of ffmpeg if it's not installed. - # "Uncomment" those by renaming. - postPatch = '' - substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\"," - substituteInPlace tests/test_ffmpeg.py --replace 'test_get_exe_installed' 'get_exe_installed' ''; meta = with lib; { @@ -51,5 +41,4 @@ buildPythonPackage rec { homepage = "http://imageio.github.io/"; license = licenses.bsd2; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix index 700c23827f..75de29b233 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.40.0"; + version = "0.41.0"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - sha256 = "sha256-7qLiVN3pBkbZQlA12ZOkgpiV/JybrPTmEIeJjy4ZS3A="; + sha256 = "sha256-gtfVZTHeiYamKkcu9n/CJ4O4X1YneY2QB3XZnvtNL3U="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/0.4.nix b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/0.4.nix index 96ba16b1cd..6709092ca9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/0.4.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/0.4.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }: +{ lib, buildPythonPackage, fetchPypi, scikit-learn, pandas, nose, pytest }: buildPythonPackage rec { pname = "imbalanced-learn"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "5bd9e86e40ce4001a57426541d7c79b18143cbd181e3330c1a3e5c5c43287083"; }; - propagatedBuildInputs = [ scikitlearn ]; + propagatedBuildInputs = [ scikit-learn ]; checkInputs = [ nose pytest pandas ]; checkPhase = '' export HOME=$PWD diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix index cf3fca9aa0..aad2e3e07a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -4,7 +4,7 @@ , isPy27 , pandas , pytestCheckHook -, scikitlearn +, scikit-learn }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0a9xrw4qsh95g85pg2611hvj6xcfncw646si2icaz22haw1x410w"; }; - propagatedBuildInputs = [ scikitlearn ]; + propagatedBuildInputs = [ scikit-learn ]; checkInputs = [ pytestCheckHook pandas ]; preCheck = '' export HOME=$TMPDIR diff --git a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix index eb8605c45d..204e3e93b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "img2pdf"; - version = "0.4.0"; + version = "0.4.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "eaee690ab8403dd1a9cb4db10afee41dd3e6c7ed63bdace02a0121f9feadb0c9"; + sha256 = "sha256-OKEinKhLIR13gtHWWtclGpeBvyT29kl8c4x1X8/tVVI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix index 6cbed7221a..b79ba4b7db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix @@ -13,6 +13,6 @@ buildPythonPackage rec { homepage = "https://github.com/twisted/treq"; description = "Incremental is a small library that versions your Python projects"; license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix deleted file mode 100644 index b250dfc6c7..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildPythonPackage -, html5lib -, six -, beautifulsoup4 -, pkgs -}: - -buildPythonPackage rec { - version = "0.1.0"; - pname = "infoqscraper"; - - src = pkgs.fetchFromGitHub { - owner = "cykl"; - repo = pname; - rev = "v${version}"; - sha256 = "07mxp4mla7fwfc032f3mxrhjarnhkjqdxxibf9ba87c93z3dq8jj"; - }; - - # requires network - doCheck = false; - - buildInputs = [ html5lib ]; - propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg_3 pkgs.swftools pkgs.rtmpdump ]; - - meta = with lib; { - description = "Discover presentations and/or create a movie consisting of slides and audio track from an infoq url"; - homepage = "https://github.com/cykl/infoqscraper/wiki"; - license = licenses.mit; - maintainers = with maintainers; [ edwtjo ]; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix index a0efa9b575..e6e1e605cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "ipydatawidgets"; - version = "4.2.0"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d0e4b58b59b508165e8562b8f5d1dbfcd739855847ec0477bd9185a5e9b7c5bc"; + sha256 = "d9f94828c11e3b40350fb14a02e027f42670a7c372bcb30db18d552dcfab7c01"; }; propagatedBuildInputs = [ 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 44c8c7bfd0..2d25eb645b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, ipywidgets, matplotlib }: +{ lib +, buildPythonPackage +, fetchPypi +, ipywidgets +, matplotlib +, jupyter-packaging +}: buildPythonPackage rec { pname = "ipympl"; @@ -9,7 +15,7 @@ buildPythonPackage rec { sha256 = "f0f1f356d8cb9d4fb51bb86dbbf837c190145316cb72f66081872ebc4d6db0a1"; }; - propagatedBuildInputs = [ ipywidgets matplotlib ]; + propagatedBuildInputs = [ ipywidgets matplotlib jupyter-packaging ]; # There are no unit tests in repository doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix index db05436d04..746cd3ab8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.7"; + version = "3.10.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gbMxV9qOLCpIH3rUceG1ds9ZUpjwOv1gyYL3GLkS3Ik="; + sha256 = "sha256-6kBu8uFDiKs5ZJXw9gTS08lstaJWuWvAVW3Ycc19x7Q="; }; checkInputs = [ @@ -22,7 +22,13 @@ buildPythonPackage rec { # requires network connection doCheck = false; - pythonImportsCheck = [ "isbnlib" ]; + pythonImportsCheck = [ + "isbnlib" + "isbnlib.config" + "isbnlib.dev" + "isbnlib.dev.helpers" + "isbnlib.registry" + ]; meta = with lib; { description = "Extract, clean, transform, hyphenate and metadata for ISBNs"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iso8601/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iso8601/default.nix index 783f6f1eb3..d0a74f400b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iso8601/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iso8601/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -13,15 +13,18 @@ buildPythonPackage rec { sha256 = "8aafd56fa0290496c5edbb13c311f78fa3a241f0853540da09d9363eae3ebd79"; }; - checkInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - py.test iso8601 - ''; + pytestFlagsArray = [ "iso8601" ]; - meta = { - homepage = "https://bitbucket.org/micktwomey/pyiso8601/"; + pythonImportsCheck = [ "iso8601" ]; + + meta = with lib; { description = "Simple module to parse ISO 8601 dates"; - maintainers = with lib.maintainers; [ phreedom ]; + homepage = "https://pyiso8601.readthedocs.io/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/isort/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/isort/4.nix index b2ef4e66f3..5da9a5c6b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/isort/4.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/isort/4.nix @@ -38,6 +38,6 @@ in buildPythonPackage rec { description = "A Python utility / library to sort Python imports"; homepage = "https://github.com/timothycrosley/isort"; license = licenses.mit; - maintainers = with maintainers; [ couchemar nand0p ]; + maintainers = with maintainers; [ couchemar ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/isort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/isort/default.nix index bc11697339..1195f0f6b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/isort/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/isort/default.nix @@ -72,6 +72,6 @@ in buildPythonPackage rec { description = "A Python utility / library to sort Python imports"; homepage = "https://github.com/PyCQA/isort"; license = licenses.mit; - maintainers = with maintainers; [ couchemar nand0p ]; + maintainers = with maintainers; [ couchemar ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix index 460b0cddf6..d2d4719dab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { cargoSha256 = "0ifvpdizcdp2c5x2x2j1bhhy5a75q0pk7a63dmh52mlpmh45fy6r"; - LIBCLANG_PATH = llvmPackages.libclang + "/lib"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; propagatedBuildInputs = [ requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix index efc1152678..f9f71a587a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix @@ -2,14 +2,17 @@ buildPythonPackage rec { pname = "jq"; - version = "1.1.2"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - sha256 = "77e747c6ad10ce65479f5f9064ab036483bf307bf71fdd7d6235ef895fcc506e"; + sha256 = "1ryxcll7601ki9rwlnryhhxpmwwnxs2qxq7kjm2b0xcqgzx1vv7r"; }; - patches = [ ./jq-py-setup.patch ]; + patches = [ + # Removes vendoring + ./jq-py-setup.patch + ]; buildInputs = [ jq ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jq/jq-py-setup.patch b/third_party/nixpkgs/pkgs/development/python-modules/jq/jq-py-setup.patch index df5245a0c3..cf87137967 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jq/jq-py-setup.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/jq/jq-py-setup.patch @@ -1,17 +1,17 @@ -From 968ddf2bd773e800e46737fced743bd00af9aa0d Mon Sep 17 00:00:00 2001 -From: William Kral -Date: Tue, 8 Sep 2020 22:04:24 -0700 -Subject: [PATCH] Vastly simplify setup.py for distro compatibility +From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001 +From: "Robert T. McGibbon" +Date: Fri, 7 May 2021 19:14:20 -0400 +Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility --- - setup.py | 101 ++----------------------------------------------------- - 1 file changed, 2 insertions(+), 99 deletions(-) + setup.py | 98 +------------------------------------------------------- + 1 file changed, 1 insertion(+), 97 deletions(-) diff --git a/setup.py b/setup.py -index cb63f60..87380ed 100644 +index 663792c..3ebcabe 100644 --- a/setup.py +++ b/setup.py -@@ -1,114 +1,19 @@ +@@ -1,113 +1,19 @@ #!/usr/bin/env python import os @@ -79,8 +79,7 @@ index cb63f60..87380ed 100644 - tarball_path=jq_lib_tarball_path, - lib_dir=jq_lib_dir, - commands=[ -- ["autoreconf", "-i"], -- ["./configure", "CFLAGS=-fPIC", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir], +- ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir], - ["make"], - ]) - @@ -93,7 +92,7 @@ index cb63f60..87380ed 100644 - - macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET") - if macosx_deployment_target: -- os.environ['MACOSX_DEPLOYMENT_TARGET'] = macosx_deployment_target +- os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target) - - def run_command(args): - print("Executing: %s" % ' '.join(args)) @@ -127,21 +126,19 @@ index cb63f60..87380ed 100644 ) setup( -@@ -120,8 +25,7 @@ setup( - url='http://github.com/mwilliamson/jq.py', +@@ -120,7 +26,6 @@ setup( python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', license='BSD 2-Clause', -- ext_modules = [jq_extension], + ext_modules = [jq_extension], - cmdclass={"build_ext": jq_build_ext}, -+ ext_modules=[jq_extension], classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', -@@ -137,4 +41,3 @@ setup( - 'Programming Language :: Python :: 3.8', +@@ -137,4 +42,3 @@ setup( + 'Programming Language :: Python :: 3.9', ], ) - -- -2.28.0 +2.29.3 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-logging/default.nix index 3d34cb2475..1f4425a3e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-logging/default.nix @@ -30,10 +30,8 @@ buildPythonPackage rec { ]; # - Quart is not packaged for Nixpkgs. - # - FastAPI is broken, see #112701 and tiangolo/fastapi#2335. - checkInputs = [ wheel flask /*quart*/ sanic /*fastapi*/ uvicorn requests pytestCheckHook ]; - disabledTests = [ "quart" "fastapi" ]; - disabledTestPaths = [ "tests/test_fastapi.py" ]; + checkInputs = [ wheel flask /*quart*/ sanic fastapi uvicorn requests pytestCheckHook ]; + disabledTests = [ "quart" ]; # Tests spawn servers and try to connect to them. __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonref/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonref/default.nix index 3154f63f31..2ab8ec45a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonref/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonref/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { description = "An implementation of JSON Reference for Python"; homepage = "https://github.com/gazpachoking/jsonref"; license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix index eedfcfbcb6..0b893f7776 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix @@ -1,39 +1,54 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, GitPython +, jupyter-packaging +, jupyter_client +, jupyterlab , markdown-it-py +, mdit-py-plugins , nbformat -, pytest +, notebook +, pytestCheckHook , pyyaml , toml }: buildPythonPackage rec { pname = "jupytext"; - version = "1.11.0"; + version = "1.11.2"; + format = "pyproject"; - disabled = isPy27; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "9062d001baaa32430fbb94a2c9394ac906db0a58da94e7aa4e414b73fd7d51bc"; + src = fetchFromGitHub { + owner = "mwouts"; + repo = pname; + rev = "v${version}"; + hash = "sha256-S2SKAC2oT4VIVMMDbu/Puo87noAgnQs1hh88JphutA8="; }; + buildInputs = [ jupyter-packaging jupyterlab ]; propagatedBuildInputs = [ markdown-it-py + mdit-py-plugins nbformat pyyaml toml ]; checkInputs = [ - pytest + pytestCheckHook + GitPython + jupyter_client + notebook ]; - - # requires test notebooks which are not shipped with the pypi release - # also, pypi no longer includes tests - doCheck = false; - checkPhase = '' - pytest - ''; + # Tests that use a Jupyter notebook require $HOME to be writable. + HOME = "$TMPDIR"; + # Pre-commit tests expect the source directory to be a Git repository. + pytestFlagsArray = [ "--ignore-glob='tests/test_pre_commit_*.py'" ]; + pythonImportsCheck = [ "jupytext" "jupytext.cli" ]; meta = with lib; { description = "Jupyter notebooks as Markdown documents, Julia, Python or R scripts"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jxmlease/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jxmlease/default.nix new file mode 100644 index 0000000000..727548f21d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jxmlease/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, lxml +, python +}: + +buildPythonPackage rec { + pname = "jxmlease"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "17l3w3ak07p72s8kv8hg0ilxs0kkxjn7bfwnl3g2cw58v1siab31"; + }; + + propagatedBuildInputs = [ + lxml + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover -v + runHook postCheck + ''; + + meta = with lib; { + description = "Converts between XML and intelligent Python data structures"; + homepage = "https://github.com/Juniper/jxmlease"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-asciimagic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-asciimagic/default.nix index f62e602896..087775b2ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-asciimagic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-asciimagic/default.nix @@ -7,24 +7,19 @@ buildPythonPackage rec { pname = "karton-asciimagic"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "0yvd0plpwy5qkd2jljpd6wm6dlj2g8csvj1q2md23vsgx7h7v2vm"; + sha256 = "0d15fhb3y0jpwdfm4y11i6pmfa9szr943cm6slvf0ir31f9nznyz"; }; propagatedBuildInputs = [ karton-core ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "karton.core==4.0.5" "karton-core" - ''; - checkPhase = '' runHook preCheck ${python.interpreter} -m unittest discover diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-autoit-ripper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-autoit-ripper/default.nix index d1f79f42a2..e675c055d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-autoit-ripper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-autoit-ripper/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "karton-autoit-ripper"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "0vdsxkbjcr0inpcfjh45gl72ipzklkhgs06fdpkyy9y0cfx3zq7z"; + sha256 = "1bsqpf9w6d9fjysmnafaglg2w41gsafs2xz4dzcgc7n92shpcs8w"; }; propagatedBuildInputs = [ @@ -28,7 +28,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ --replace "autoit-ripper==1.0.0" "autoit-ripper" \ - --replace "karton.core==4.0.4" "karton-core" \ --replace "malduck==3.1.0" "malduck>=3.1.0" \ --replace "regex==2020.2.20" "regex>=2020.2.20" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix index a623486f03..ea9710ecd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "karton-classifier"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "05pxv0smrzgmljykc6yx0rx8b85ck7fa09xjkjw0dd7lb6bb19a6"; + sha256 = "0s09mzsw546klnvm59wzj9vdwd2hyzgxvapi20k86q3prs9ncds6"; }; propagatedBuildInputs = [ @@ -27,7 +27,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ --replace "chardet==3.0.4" "chardet" \ - --replace "karton-core==4.0.4" "karton-core" \ --replace "python-magic==0.4.18" "python-magic" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix index 9144a4026f..71170ac534 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "karton-config-extractor"; - version = "1.1.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "14592b9vq2iza5agxr29z1mh536if7a9p9hvyjnibsrv22mzwz7l"; + sha256 = "1kq0gbfz9y0n0bcblyrmwv4la3lcf86lf80794sdvyvn49g0brny"; }; propagatedBuildInputs = [ @@ -22,8 +22,6 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace requirements.txt \ - --replace "karton-core==4.2.0" "karton-core" substituteInPlace requirements.txt \ --replace "malduck==4.1.0" "malduck" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix index c82cb89578..3ec455a8ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "karton-dashboard"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "101qmx6nmiim0vrz2ldk973ns498hnxla1xy7nys9kh9wijg4msk"; + sha256 = "0qygv9lkd1jad5b4l0zz6hsi7m8q0fmpwaa6hpp7p9x6ql7gnyl8"; }; propagatedBuildInputs = [ @@ -27,8 +27,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "Flask==1.1.1" "Flask" \ - --replace "karton-core==4.1.0" "karton-core" + --replace "Flask==1.1.1" "Flask" ''; # Project has no tests. pythonImportsCheck requires MinIO configuration diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix index 68b28bffe6..65bb683be2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "karton-mwdb-reporter"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "0ks8jrc4v87q6zhwqg40w6xv2wfkzslmnfmsmmkfjj8mak8nk70f"; + sha256 = "0jrn5c83nhcjny4bc879wrsgcr7mbazm51jzdkxmxyqf543cc841"; }; propagatedBuildInputs = [ @@ -23,8 +23,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "karton-core==4.0.4" "karton-core" \ - --replace "mwdblib==3.3.1" "mwdblib" + --replace "mwdblib==3.4.0" "mwdblib" ''; # Project has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix index f64ee17f84..6183e95000 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "karton-yaramatcher"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "0yb9l5z826zli5cpcj234dmjdjha2g1lcwxyvpxm95whkhapc2cf"; + sha256 = "0mv8v1gk6p21pw9kx6cxr76l6c5fxd3p6dk85cwfzz100h8mdvar"; }; propagatedBuildInputs = [ @@ -22,12 +22,6 @@ buildPythonPackage rec { yara-python ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "karton-core==4.0.5" "karton-core" \ - --replace "yara-python==4.0.2" "yara-python" \ - ''; - checkPhase = '' runHook preCheck ${python.interpreter} -m unittest discover diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix new file mode 100644 index 0000000000..7f2cacea62 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, argon2_cffi +, keyring +, pycryptodome +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "keyrings.cryptfile"; + # NOTE: newer releases are bugged/incompatible + # https://github.com/frispete/keyrings.cryptfile/issues/15 + version = "1.3.4"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-jW+cKMm+xef8C+fl0CGe+6SEkYBHDjFX2/kLCZ62j6c="; + }; + + patches = [ + # upstream setup.cfg has an option that is not supported + ./fix-testsuite.patch + # change of API in keyrings.testing + (fetchpatch { + url = "https://github.com/frispete/keyrings.cryptfile/commit/6fb9e45f559b8b69f7a0a519c0bece6324471d79.patch"; + sha256 = "sha256-1878pMO9Ed1zs1pl+7gMjwx77HbDHdE1CryN8TPfPdU="; + }) + ]; + + propagatedBuildInputs = [ + argon2_cffi + keyring + pycryptodome + ]; + + pythonImportsCheck = [ + "keyrings.cryptfile" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + "test_set_properties" + "UncryptedFileKeyringTestCase" + ]; + + meta = with lib; { + description = "Encrypted file keyring backend"; + homepage = "https://github.com/frispete/keyrings.cryptfile"; + license = licenses.mit; + maintainers = teams.chia.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/fix-testsuite.patch b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/fix-testsuite.patch new file mode 100644 index 0000000000..8e32a64e52 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/fix-testsuite.patch @@ -0,0 +1,14 @@ +diff --git a/setup.cfg b/setup.cfg +index ec7eb30..7ffd831 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -5,9 +5,6 @@ dists = clean --all sdist bdist_wheel + [wheel] + universal = 1 + +-[tool:pytest] +-addopts = -s --cov=keyrings/cryptfile +- + [egg_info] + tag_build = + tag_date = 0 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/1_1.nix b/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/1_1.nix index 0702e3518e..762b5bc0b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/1_1.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/1_1.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "53eaed412477c836e1b9522c19858a8557d6e595077830146182225613b11a75"; }; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; # Does not include tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix index d4d6278709..2b157494f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "950a199911a8d94683a6b10321f9345d5a3a8433ec58b217ace979e18f16e248"; }; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; nativeBuildInputs = [ cppy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kmapper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kmapper/default.nix index 6c17366108..87f22172c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kmapper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kmapper/default.nix @@ -1,11 +1,11 @@ { lib , buildPythonPackage -, fetchPypi -, scikitlearn +, fetchFromGitHub +, scikit-learn , numpy , scipy , jinja2 -, pytest +, pytestCheckHook , networkx , matplotlib , python-igraph @@ -17,20 +17,22 @@ buildPythonPackage rec { pname = "kmapper"; version = "2.0.0"; - src = fetchPypi { - inherit pname version; - sha256 = "3708d889f96f6bbe89c52000dd9378ca4c35638180ff894b64ebbdfcfe62aab2"; + src = fetchFromGitHub { + owner = "scikit-tda"; + repo = "kepler-mapper"; + rev = "v${version}"; + sha256 = "0djm27si2bn18khrbb7rwhflc5ma6g9smhikhk5i1apwn5avm6l4"; }; propagatedBuildInputs = [ - scikitlearn + scikit-learn numpy scipy jinja2 ]; checkInputs = [ - pytest + pytestCheckHook networkx matplotlib python-igraph @@ -38,10 +40,6 @@ buildPythonPackage rec { ipywidgets ]; - checkPhase = '' - pytest test --ignore test/test_drawing.py - ''; - meta = with lib; { description = "Python implementation of Mapper algorithm for Topological Data Analysis"; homepage = "https://kepler-mapper.scikit-tda.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix index ce7cff4d79..957b8ad5fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix @@ -1,38 +1,67 @@ { lib -, buildPythonPackage -, fetchPypi -, requests -, jinja2 -, pillow -, rasterio -, shapely -, ndjson , backoff -, google-api-core , backports-datetime-fromisoformat +, buildPythonPackage +, dataclasses +, fetchFromGitHub +, google-api-core +, jinja2 +, ndjson +, pillow +, pydantic +, pytest-cases +, pytestCheckHook +, pythonOlder +, rasterio +, requests +, shapely }: buildPythonPackage rec { pname = "labelbox"; - version = "2.5.1"; + version = "2.5.4"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "7f2cbc5d4869d8acde865ad519fc1cc85338247cd7cf534334f988a040679219"; + src = fetchFromGitHub { + owner = "Labelbox"; + repo = "labelbox-python"; + rev = "v${version}"; + sha256 = "0182klvm8bjcm8fkl9w8ypj12s026czgid8ldl6jjvmzhxpmss68"; }; propagatedBuildInputs = [ - jinja2 requests pillow rasterio shapely ndjson backoff - google-api-core backports-datetime-fromisoformat + backoff + backports-datetime-fromisoformat + dataclasses + google-api-core + jinja2 + ndjson + pillow + pydantic + rasterio + requests + shapely + ]; + + postPatch = '' + substituteInPlace setup.py --replace "pydantic==1.8" "pydantic>=1.8" + ''; + + checkInputs = [ + pytest-cases + pytestCheckHook + ]; + + disabledTestPaths = [ + # Requires network access + "tests/integration" ]; - # Test cases are not running on pypi or GitHub - doCheck = false; pythonImportsCheck = [ "labelbox" ]; meta = with lib; { - homepage = "https://github.com/Labelbox/Labelbox"; description = "Platform API for LabelBox"; + homepage = "https://github.com/Labelbox/labelbox-python"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix index d8996a153e..9f787563e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix @@ -1,35 +1,38 @@ { lib , buildPythonPackage , fetchFromGitHub +, python , regex - # Test inputs -, pytestCheckHook }: buildPythonPackage rec { pname = "lark-parser"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "1v1piaxpz4780km2z5i6sr9ygi9wpn09yyh999b3f4y0dcz20pbd"; + sha256 = "1ggvlzpdzlrxl46fgi8cfq2rzlwn21shpdkm4pknnhfjlsinv913"; }; + # Optional import, but fixes some re known bugs & allows advanced regex features propagatedBuildInputs = [ regex ]; - checkInputs = [ pytestCheckHook ]; - disabledTestPaths = [ - "tests/test_nearley" # requires Js2Py package (not in nixpkgs) - ]; - disabledTests = [ - "test_override_rule" # has issue with file access paths - ]; + checkPhase = '' + runHook preCheck + + # Official way to run the tests. Runs unittest internally. + # pytest produces issues with some test resource paths (relies on __main__) + ${python.interpreter} -m tests + + runHook postCheck + ''; meta = with lib; { description = "A modern parsing library for Python, implementing Earley & LALR(1) and an easy interface"; - homepage = "https://github.com/lark-parser/lark"; + homepage = "https://lark-parser.readthedocs.io/"; + changelog = "https://github.com/lark-parser/lark/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fridh drewrisinger ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/19.nix b/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/19.nix new file mode 100644 index 0000000000..cca696f1df --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/19.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, twisted +, passlib +, pyopenssl +, pyparsing +, service-identity +, zope_interface +, isPy3k +, python +}: + +buildPythonPackage rec { + pname = "ldaptor"; + version = "19.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "64c7b870c77e34e4f5f9cfdf330b9702e89b4dd0f64275704f86c1468312c755"; + }; + + propagatedBuildInputs = [ + twisted passlib pyopenssl pyparsing service-identity zope_interface + ]; + + disabled = isPy3k; + + doCheck = false; + + meta = { + description = "A Pure-Python Twisted library for LDAP"; + homepage = "https://github.com/twisted/ldaptor"; + license = lib.licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libarcus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libarcus/default.nix index edea85876a..a48d70c544 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libarcus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libarcus/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, python, fetchFromGitHub -, cmake, sip, protobuf, pythonOlder }: +, cmake, sip_4, protobuf, pythonOlder }: buildPythonPackage rec { pname = "libarcus"; @@ -15,7 +15,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.4.0"; - propagatedBuildInputs = [ sip ]; + propagatedBuildInputs = [ sip_4 ]; nativeBuildInputs = [ cmake ]; buildInputs = [ protobuf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/liblarch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/liblarch/default.nix index 5ff8d25d54..957d37f217 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/liblarch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/liblarch/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , python , pygobject3 -, xvfb_run +, xvfb-run , gobject-introspection , gtk3 , pythonOlder @@ -32,7 +32,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck - ${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \ + ${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \ ${python.interpreter} nix_run_setup test runHook postCheck ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix index ce8f2a73fa..45f6bffd66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix @@ -4,7 +4,7 @@ , joblib , matplotlib , six -, scikitlearn +, scikit-learn , decorator , audioread , resampy @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "af0b9f2ed4bbf6aecbc448a4cd27c16453c397cb6bef0f0cfba0e63afea2b839"; }; - propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy soundfile pooch ]; + propagatedBuildInputs = [ joblib matplotlib six scikit-learn decorator audioread resampy soundfile pooch ]; # No tests # 1. Internet connection is required diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix index f6aa1b378f..7ecd09160f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }: +{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip_4 }: buildPythonPackage rec { pname = "libsavitar"; @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ sip ]; + propagatedBuildInputs = [ sip_4 ]; disabled = pythonOlder "3.4.0"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix index 1018ceaec4..a887c3ec8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix @@ -4,7 +4,7 @@ , cmake , numpy , scipy -, scikitlearn +, scikit-learn , llvmPackages ? null }: @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy scipy - scikitlearn + scikit-learn ]; postConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/linkify-it-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/linkify-it-py/default.nix new file mode 100644 index 0000000000..b9511bd5f3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/linkify-it-py/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, uc-micro-py +}: + +buildPythonPackage rec { + pname = "linkify-it-py"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "tsutsu3"; + repo = pname; + rev = "v${version}"; + hash = "sha256-gd51no6VqvIiW9fbCdp30zHG/us6by7FLHV2ul/XJAM="; + }; + + propagatedBuildInputs = [ uc-micro-py ]; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "linkify_it" ]; + + meta = with lib; { + description = "Links recognition library with full unicode support"; + homepage = "https://github.com/tsutsu3/linkify-it-py"; + license = licenses.mit; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix index ecf5990e74..4b2decb955 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix @@ -2,40 +2,61 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, installShellFiles , docopt , hidapi , pyusb , smbus-cffi +, i2c-tools +, pytestCheckHook }: buildPythonPackage rec { pname = "liquidctl"; - version = "1.5.1"; + version = "1.6.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1l6cvm8vs2gkmg4qwg5m5vqjql1gah2vd9vs7pcj2v5hf0cm5v9x"; + sha256 = "sha256-FYpr1mYzPc0rOE75fUNjxe/57EWl+zcbIbkqFseDhzI="; }; + nativeBuildInputs = [ installShellFiles ]; + propagatedBuildInputs = [ docopt hidapi pyusb smbus-cffi + i2c-tools ]; - # does not contain tests - doCheck = false; + outputs = [ "out" "man" ]; + + postInstall = '' + installManPage liquidctl.8 + installShellCompletion extra/completions/liquidctl.bash + + mkdir -p $out/lib/udev/rules.d + cp extra/linux/71-liquidctl.rules $out/lib/udev/rules.d/. + ''; + + checkInputs = [ pytestCheckHook ]; + + postBuild = '' + # needed for pythonImportsCheck + export XDG_RUNTIME_DIR=$TMPDIR + ''; + pythonImportsCheck = [ "liquidctl" ]; meta = with lib; { description = "Cross-platform CLI and Python drivers for AIO liquid coolers and other devices"; homepage = "https://github.com/liquidctl/liquidctl"; changelog = "https://github.com/liquidctl/liquidctl/blob/master/CHANGELOG.md"; - license = licenses.gpl3; - maintainers = with maintainers; [ arturcygan ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ arturcygan evils ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix index b5e6847a9f..c7d2221a22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; # Set directory containing llvm-config binary preConfigure = '' - export LLVM_CONFIG=${llvm}/bin/llvm-config + export LLVM_CONFIG=${llvm.dev}/bin/llvm-config ''; checkPhase = '' ${python.executable} runtests.py 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 0960a82481..0fcf15fe94 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.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "ags-slc"; repo = pname; rev = "v${version}"; - sha256 = "1vzn1vm3zf86l7qncbmghjrwyvla9dc2v8abn8jajbl47gm7r5f7"; + sha256 = "1cbiv21yryjqy46av9hbjccks95sxznrx8nypd3yzihf1vkjiq5a"; }; propagatedBuildInputs = [ dnspython sphinx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix new file mode 100644 index 0000000000..4baf8600ac --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix @@ -0,0 +1,59 @@ +{ lib +, betamax +, buildPythonPackage +, cachetools +, coloredlogs +, emoji +, fetchPypi +, nose +, python +, pythonOlder +, pytz +, requests +}: + +buildPythonPackage rec { + pname = "locationsharinglib"; + version = "4.1.6"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "092j8z01nwjqh5zr7aj8mxl1zjd3j2irhrs39dhn47bd6db2a6ij"; + }; + + propagatedBuildInputs = [ + coloredlogs + requests + cachetools + pytz + ]; + + checkInputs = [ + betamax + emoji + nose + ]; + + postPatch = '' + # Tests requirements want to pull in multiple modules which we don't need + substituteInPlace setup.py \ + --replace "tests_require=test_requirements" "tests_require=[]" + ''; + + checkPhase = '' + runHook preCheck + # Only coverage no real unit tests + ${python.interpreter} setup.py nosetests + runHook postCheck + ''; + + pythonImportsCheck = [ "locationsharinglib" ]; + + meta = with lib; { + description = "Python package to retrieve coordinates from a Google account"; + homepage = "https://locationsharinglib.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mail-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mail-parser/default.nix index 219a9066dc..a2e7898f04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mail-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mail-parser/default.nix @@ -14,16 +14,6 @@ buildPythonPackage rec { LC_ALL = "en_US.utf-8"; - # remove version bounds - prePatch = '' - sed -i -e 's/==.*//g' requirements.txt - '' - # ipaddress is part of the standard library of Python 3.3+ - + lib.optionalString (!pythonOlder "3.3") '' - substituteInPlace requirements.txt \ - --replace "ipaddress" "" - ''; - nativeBuildInputs = [ glibcLocales ]; propagatedBuildInputs = [ simplejson six ] ++ lib.optional (pythonOlder "3.3") ipaddress; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix index c7a8a3e17f..322c4ac533 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix @@ -1,41 +1,36 @@ { lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, pythonOlder , attrs -, coverage +, linkify-it-py , psutil , pytest-benchmark +, pytest-regressions +, typing-extensions }: buildPythonPackage rec { pname = "markdown-it-py"; - version = "0.6.2"; + version = "1.0.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "executablebooks"; - repo = "markdown-it-py"; + repo = pname; rev = "v${version}"; - sha256 = "1g9p8pdnvjya436lii63r5gjajhmbhmyh9ngbjqf9dqny05nagz1"; + hash = "sha256-GA7P2I8N+i2ISsVgx58zyhrfKMcZ7pL4X9T/trbsr1Y="; }; - propagatedBuildInputs = [ attrs ]; + propagatedBuildInputs = [ attrs linkify-it-py ] + ++ lib.optional (pythonOlder "3.8") typing-extensions; checkInputs = [ - coverage - pytest-benchmark psutil + pytest-benchmark + pytest-regressions pytestCheckHook ]; - - disabledTests = [ - # Requires the unpackaged pytest-regressions fixture plugin - "test_amsmath" - "test_container" - "test_deflist" - "test_dollarmath" - "test_spec" - "test_texmath" - ]; + pytestImportsCheck = [ "markdown_it" ]; meta = with lib; { description = "Markdown parser done right"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix index 2c929d9a69..a6ee1a3bad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix @@ -1,24 +1,16 @@ -{ lib, stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache +{ lib, stdenv, fetchPypi, writeText, python, buildPythonPackage, pycairo, backports_functools_lru_cache , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32 , fetchpatch -, enableGhostscript ? false, ghostscript ? null, gtk3 +, enableGhostscript ? false, ghostscript, gtk3 , enableGtk3 ? false, cairo # darwin has its own "MacOSX" backend -, enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null +, enableTk ? !stdenv.isDarwin, tcl, tk, tkinter, libX11 , enableQt ? false, pyqt4 , Cocoa , pythonOlder }: -assert enableGhostscript -> ghostscript != null; -assert enableTk -> (tcl != null) - && (tk != null) - && (tkinter != null) - && (libX11 != null) - ; -assert enableQt -> pyqt4 != null; - buildPythonPackage rec { version = "2.2.3"; pname = "matplotlib"; @@ -54,7 +46,10 @@ buildPythonPackage rec { ++ lib.optionals enableQt [ pyqt4 ] ++ lib.optionals python.isPy2 [ functools32 subprocess32 ]; - setup_cfg = ./setup.cfg; + passthru.config = { + directories = { basedirlist = "."; }; + }; + setup_cfg = writeText "setup.cfg" (lib.generators.toINI {} passthru.config); preBuild = '' cp "$setup_cfg" ./setup.cfg ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix index 4be4189f8c..7364920cba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix @@ -1,33 +1,25 @@ -{ lib, stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache +{ lib, stdenv, fetchPypi, writeText, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver -, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection +, freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection , certifi, pillow -, enableGhostscript ? true, ghostscript ? null, gtk3 +, enableGhostscript ? true, ghostscript, gtk3 , enableGtk3 ? false, cairo # darwin has its own "MacOSX" backend -, enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null -, enableQt ? false, pyqt5 ? null +, enableTk ? !stdenv.isDarwin, tcl, tk, tkinter, libX11 +, enableQt ? false, pyqt5 , Cocoa , pythonOlder }: -assert enableGhostscript -> ghostscript != null; -assert enableTk -> (tcl != null) - && (tk != null) - && (tkinter != null) - && (libX11 != null) - ; -assert enableQt -> pyqt5 != null; - buildPythonPackage rec { - version = "3.3.4"; + version = "3.4.1"; pname = "matplotlib"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3e477db76c22929e4c6876c44f88d790aacdf3c3f8f3a90cb1975c0bf37825b0"; + sha256 = "84d4c4f650f356678a5d658a43ca21a41fca13f9b8b00169c0b76e6a6a948908"; }; XDG_RUNTIME_DIR = "/tmp"; @@ -39,13 +31,23 @@ buildPythonPackage rec { ++ lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = - [ cycler dateutil numpy pyparsing tornado freetype kiwisolver - certifi libpng mock pytz pillow ] + [ cycler dateutil numpy pyparsing tornado freetype qhull + kiwisolver certifi libpng mock pytz pillow ] ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] ++ lib.optionals enableTk [ tcl tk tkinter libX11 ] ++ lib.optionals enableQt [ pyqt5 ]; - setup_cfg = if stdenv.isDarwin then ./setup-darwin.cfg else ./setup.cfg; + passthru.config = { + directories = { basedirlist = "."; }; + libs = { + system_freetype = true; + system_qhull = true; + } // lib.optionalAttrs stdenv.isDarwin { + # LTO not working in darwin stdenv, see #19312 + enable_lto = false; + }; + }; + setup_cfg = writeText "setup.cfg" (lib.generators.toINI {} passthru.config); preBuild = '' cp "$setup_cfg" ./setup.cfg ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/setup-darwin.cfg b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/setup-darwin.cfg deleted file mode 100644 index f6463d9c57..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/setup-darwin.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[directories] -basedirlist = . - -[libs] -system_freetype = true -# LTO not working in darwin stdenv, see #19312 -enable_lto = false diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/setup.cfg b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/setup.cfg deleted file mode 100644 index 6a77386276..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/setup.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[directories] -basedirlist = . - -[libs] -system_freetype = true diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix index 69774b58eb..3e613fd89a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix @@ -2,9 +2,11 @@ , buildPythonPackage , fetchFromGitHub , git +, poetry-core , attrs , future , aiohttp +, aiohttp-socks , aiofiles , h11 , h2 @@ -16,27 +18,37 @@ , peewee , cachetools , atomicwrites +, pytestCheckHook +, faker +, aioresponses +, hypothesis +, pytest-aiohttp +, pytest-benchmark }: buildPythonPackage rec { pname = "matrix-nio"; - version = "0.15.2"; + version = "0.18.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "190xw3cvk4amr9pl8ip2i7k3xdjd0231kn2zl6chny5axx22p1dv"; + sha256 = "QHNirglqSxGMmbST96LUp9MHoGj0yAwLoTRlsbMqwaM="; }; nativeBuildInputs = [ git + poetry-core + pytestCheckHook ]; propagatedBuildInputs = [ attrs future aiohttp + aiohttp-socks aiofiles h11 h2 @@ -50,7 +62,20 @@ buildPythonPackage rec { atomicwrites ]; - doCheck = false; + checkInputs = [ + faker + aioresponses + hypothesis + pytest-aiohttp + pytest-benchmark + ]; + + disabledTests = [ + # touches network + "test_connect_wrapper" + # time dependent and flaky + "test_transfer_monitor_callbacks" + ]; meta = with lib; { description = "A Python Matrix client library, designed according to sans I/O principles"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix index 1ea14c3551..cf61eb2fa3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "5.1.4"; + version = "5.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Dinnerbone"; repo = pname; rev = "v${version}"; - sha256 = "1k8hjv965svbm95m7jaawlhdbxqpkjchlwvjwn1n7z90dfgn5kih"; + sha256 = "sha256-RlqzeixaHgyIl/7mMRkZAEsqJEP79Bz1bDGAU8PIetU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/md-toc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/md-toc/default.nix new file mode 100644 index 0000000000..aaec77a9ac --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/md-toc/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fpyutils +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "md-toc"; + version = "7.2.0"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "frnmst"; + repo = pname; + rev = version; + sha256 = "1v74iddfk5d6170frg89vzrkz9xrycl1f50g59imc7x7g50i6c2x"; + }; + + propagatedBuildInputs = [ + fpyutils + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py --replace "fpyutils>=1.2,<1.3" "fpyutils>=1.2" + ''; + + pytestFlagsArray = [ "md_toc/tests/*.py" ]; + + pythonImportsCheck = [ "md_toc" ]; + + meta = with lib; { + description = "Table of contents generator for Markdown"; + homepage = "https://docs.franco.net.eu.org/md-toc/"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix new file mode 100644 index 0000000000..159310035b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, importlib-metadata +, markdown-it-py +, poetry-core +, pytestCheckHook +, pythonOlder +, typing-extensions +}: + +buildPythonPackage rec { + pname = "mdformat"; + version = "0.7.6"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = pname; + rev = version; + sha256 = "0mnbi3vp7zgllpcpf6vrjw9y6jas95shphn99ayr8b8wgxsaqkif"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + markdown-it-py + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + ] ++ lib.optionals (pythonOlder "3.7") [ + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "mdformat" ]; + + meta = with lib; { + description = "CommonMark compliant Markdown formatter"; + homepage = "https://mdformat.rtfd.io/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdit-py-plugins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdit-py-plugins/default.nix new file mode 100644 index 0000000000..9c5705dbc4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, markdown-it-py +, pytest-regressions +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mdit-py-plugins"; + version = "0.2.8"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = pname; + rev = "v${version}"; + hash = "sha256-MXQjaVDuguGbmby6BQnrTdpq6Mih3HabXuyFxf9jB18="; + }; + + propagatedBuildInputs = [ markdown-it-py ]; + + checkInputs = [ pytestCheckHook pytest-regressions ]; + pythonImportsCheck = [ "mdit_py_plugins" ]; + + meta = with lib; { + description = "Collection of core plugins for markdown-it-py"; + homepage = "https://github.com/executablebooks/mdit-py-plugins"; + license = licenses.mit; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix new file mode 100644 index 0000000000..c8a9d78e7c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, dotmap +, fetchPypi +, pexpect +, protobuf +, pygatt +, pypubsub +, pyqrcode +, pyserial +, pythonOlder +, tabulate +, timeago +}: + +buildPythonPackage rec { + pname = "meshtastic"; + version = "1.2.30"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kjflc2jwnsgxyr2zx1gyykhak9fsgy6hxaxlggsz5sw9b8rdrby"; + }; + + propagatedBuildInputs = [ + dotmap + pexpect + protobuf + pygatt + pypubsub + pyqrcode + pyserial + tabulate + timeago + ]; + + postPatch = '' + # https://github.com/meshtastic/Meshtastic-python/pull/87 + substituteInPlace setup.py \ + --replace 'with open("README.md", "r") as fh:' "" \ + --replace "long_description = fh.read()" "" \ + --replace "long_description=long_description," 'long_description="",' + ''; + + # Project only provides PyPI releases which don't contain the tests + # https://github.com/meshtastic/Meshtastic-python/issues/86 + doCheck = false; + pythonImportsCheck = [ "meshtastic" ]; + + meta = with lib; { + description = "Python API for talking to Meshtastic devices"; + homepage = "https://meshtastic.github.io/Meshtastic-python/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/midiutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/midiutil/default.nix index d1cae8c780..a3527bc6e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/midiutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/midiutil/default.nix @@ -13,6 +13,6 @@ buildPythonPackage rec { homepage = "https://github.com/MarkCWirt/MIDIUtil"; description = "A pure python library for creating multi-track MIDI files"; license = licenses.mit; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlrose/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlrose/default.nix index 40e3b6ce09..2187f27268 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlrose/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlrose/default.nix @@ -1,21 +1,45 @@ -{ lib, isPy27, buildPythonPackage, fetchPypi, scikitlearn }: +{ lib +, isPy27 +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, scikit-learn +, pytestCheckHook +, pytest-randomly +}: buildPythonPackage rec { pname = "mlrose"; version = "1.3.0"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "cec83253bf6da67a7fb32b2c9ae13e9dbc6cfbcaae2aa3107993e69e9788f15e"; + src = fetchFromGitHub { + owner = "gkhayes"; + repo = "mlrose"; + rev = "v${version}"; + sha256 = "1dn43k3rcypj58ymcj849b37w66jz7fphw8842v6mlbij3x0rxfl"; }; - propagatedBuildInputs = [ scikitlearn ]; + patches = [ + # Fixes compatibility with scikit-learn 0.24.1 + (fetchpatch { + url = "https://github.com/gkhayes/mlrose/pull/55/commits/19caf8616fc194402678aa67917db334ad02852a.patch"; + sha256 = "1nivz3bn21nd21bxbcl16a6jmy7y5j8ilz90cjmd0xq4v7flsahf"; + }) + ]; + + propagatedBuildInputs = [ scikit-learn ]; + checkInputs = [ pytest-randomly pytestCheckHook ]; postPatch = '' - sed -i 's,sklearn,scikit-learn,g' setup.py + substituteInPlace setup.py --replace sklearn scikit-learn ''; + pythonImportsCheck = [ "mlrose" ]; + + # Fix random seed during tests + pytestFlagsArray = [ "--randomly-seed 0" ]; + meta = with lib; { description = "Machine Learning, Randomized Optimization and SEarch"; homepage = "https://github.com/gkhayes/mlrose"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix index 44402b36ec..4692dc61c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix @@ -5,7 +5,7 @@ , pytestCheckHook , scipy , numpy -, scikitlearn +, scikit-learn , pandas , matplotlib , joblib @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ scipy numpy - scikitlearn + scikit-learn pandas matplotlib joblib @@ -45,7 +45,7 @@ buildPythonPackage rec { license= licenses.bsd3; maintainers = with maintainers; [ evax ]; platforms = platforms.unix; - # incompatible with nixpkgs scikitlearn version + # incompatible with nixpkgs scikit-learn version broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix index bed191c39e..d8add2608b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix @@ -11,7 +11,7 @@ , matplotlib , nibabel , pandas -, scikitlearn +, scikit-learn }: buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { matplotlib nibabel pandas - scikitlearn + scikit-learn ]; preCheck = '' export HOME=$TMP diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moderngl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moderngl/default.nix index f32f541573..447d2b00b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moderngl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moderngl/default.nix @@ -4,6 +4,7 @@ , isPy3k , libGL , libX11 +, glcontext }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { disabled = !isPy3k; - buildInputs = [ libGL libX11 ]; + buildInputs = [ libGL libX11 glcontext ]; # Tests need a display to run. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix index 7f6d9893c9..e06d5aa378 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix @@ -7,6 +7,7 @@ , pyglet , pillow , pyrr +, glcontext }: buildPythonPackage rec { @@ -20,7 +21,7 @@ buildPythonPackage rec { sha256 = "1p03j91pk2bwycd13p0qi8kns1sf357180hd2mkaip8mfaf33x3q"; }; - propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr ]; + propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr glcontext ]; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix index a2398ce750..4690f9f882 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix @@ -1,22 +1,20 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 -, nose -, numpy -, six -, ruamel_yaml +, pythonOlder , msgpack -, coverage -, coveralls +, pytestCheckHook +, numpy +, pydantic , pymongo -, lsof +, ruamel_yaml +, tqdm }: buildPythonPackage rec { pname = "monty"; version = "2021.3.3"; - disabled = isPy27; # uses type annotations + disabled = pythonOlder "3.5"; # uses type annotations # No tests in Pypi src = fetchFromGitHub { @@ -26,15 +24,18 @@ buildPythonPackage rec { sha256 = "1nbv0ys0fv70rgzskkk8gsfr9dsmm7ykim5wv36li840zsj83b1l"; }; - checkInputs = [ lsof nose numpy msgpack coverage coveralls pymongo]; - propagatedBuildInputs = [ six ruamel_yaml ]; + propagatedBuildInputs = [ + ruamel_yaml + tqdm + msgpack + ]; - # test suite tries to decode bytes, but msgpack now returns a str - # https://github.com/materialsvirtuallab/monty/pull/121 - postPatch = '' - substituteInPlace tests/test_serialization.py \ - --replace ".decode('utf-8')" "" - ''; + checkInputs = [ + pytestCheckHook + numpy + pydantic + pymongo + ]; preCheck = '' substituteInPlace tests/test_os.py \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/motioneye-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/motioneye-client/default.nix new file mode 100644 index 0000000000..19bb9a39c2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/motioneye-client/default.nix @@ -0,0 +1,52 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-aiohttp +, pytest-timeout +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "motioneye-client"; + version = "0.3.6"; + format = "pyproject"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "dermotduffy"; + repo = pname; + rev = "v${version}"; + sha256 = "0j28rn7059km7q6z1kalp0pjcrd42wcm5mnbi94j93bvfld97w70"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest-aiohttp + pytest-timeout + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov-report=html:htmlcov --cov-report=xml:coverage.xml --cov-report=term-missing --cov=motioneye_client --cov-fail-under=100" "" + ''; + + pythonImportsCheck = [ "motioneye_client" ]; + + meta = with lib; { + description = "Python library for motionEye"; + homepage = "https://github.com/dermotduffy/motioneye-client"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moviepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moviepy/default.nix index 4cd1fec3d8..c3acdbe71e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moviepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moviepy/default.nix @@ -13,14 +13,14 @@ , advancedProcessing ? false , opencv3 ? null , scikitimage ? null -, scikitlearn ? null +, scikit-learn ? null , scipy ? null , matplotlib ? null , youtube-dl ? null }: assert advancedProcessing -> ( - opencv3 != null && scikitimage != null && scikitlearn != null + opencv3 != null && scikitimage != null && scikit-learn != null && scipy != null && matplotlib != null && youtube-dl != null); buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy decorator imageio imageio-ffmpeg tqdm requests proglog ] ++ (lib.optionals advancedProcessing [ - opencv3 scikitimage scikitlearn scipy matplotlib youtube-dl + opencv3 scikitimage scikit-learn scipy matplotlib youtube-dl ]); meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mox3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mox3/default.nix index 1883c9c8c0..593d845ad8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mox3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mox3/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { buildInputs = [ subunit testrepository testtools six ]; propagatedBuildInputs = [ pbr fixtures ]; - # Disabling as several tests depdencies are missing: + # Disabling as several tests dependencies are missing: # https://opendev.org/openstack/mox3/src/branch/master/test-requirements.txt doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix index 3df0527589..735d74b523 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.10.0"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "582e92e3b9fa68084dca6ecfd8db866ddc75cd9043de267c79d6b6277dd27f55"; + sha256 = "sha256-RnrwK7lKh6G2lbUb+GdmfoKKzA3Twd5fpUP2kALbSfo="; }; propagatedBuildInputs = [ @@ -22,15 +22,15 @@ buildPythonPackage rec { ]; # Tests assume Network Connectivity: - # https://github.com/AzureAD/microsoft-authentication-library-for-python/blob/e2958961e8ec16d0af4199f60c36c3f913497e48/tests/test_authority.py#L73 + # https://github.com/AzureAD/microsoft-authentication-library-for-python/blob/e2958961e8ec16d0af4199f60c36c3f913497e48/tests/test_authority.py#L73 doCheck = false; + pythonImportsCheck = [ "msal" ]; + meta = with lib; { description = "The Microsoft Authentication Library (MSAL) for Python library enables your app to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect"; homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python"; license = licenses.mit; - maintainers = with maintainers; [ - kamadorueda - ]; + maintainers = with maintainers; [ kamadorueda ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mutesync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mutesync/default.nix new file mode 100644 index 0000000000..98bf6ce074 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mutesync/default.nix @@ -0,0 +1,42 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchpatch +, fetchPypi +}: + +buildPythonPackage rec { + pname = "mutesync"; + version = "0.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "05r8maq59glwgysg98y1vrysfb1mkh9jpbag3ixl13n8jw8clp85"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + patches = [ + # Don't parse requirements.txt, https://github.com/currentoor/pymutesync/pull/1 + (fetchpatch { + name = "add-requirements.patch"; + url = "https://github.com/currentoor/pymutesync/commit/d66910fc83b1ae3060cdb3fe22a6f91fb70a67f0.patch"; + sha256 = "0axhgriyyv31b1r1yidxcrv0nyrqbb63xw5qrmv2iy2h0v96ijsk"; + }) + ]; + + # Project has not published tests yet + doCheck = false; + pythonImportsCheck = [ "mutesync" ]; + + meta = with lib; { + description = "Python module for interacting with mutesync buttons"; + homepage = "https://github.com/currentoor/pymutesync"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mwoauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mwoauth/default.nix index 0a73e99391..8743329917 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mwoauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mwoauth/default.nix @@ -17,14 +17,28 @@ buildPythonPackage rec { sha256 = "9e0d70a1fa6f452584de1cb853ae6c11f41233549f7839cfb879f99410f6ad46"; }; - # package has no tests + propagatedBuildInputs = [ + oauthlib + pyjwt + requests + requests_oauthlib + six + ]; + + postPatch = '' + # https://github.com/mediawiki-utilities/python-mwoauth/pull/43 + substituteInPlace setup.py --replace "PyJWT>=1.0.1,<2.0.0" "PyJWT>=1.0.1" + ''; + + # PyPI source has no tests included + # https://github.com/mediawiki-utilities/python-mwoauth/issues/44 doCheck = false; - propagatedBuildInputs = [ six pyjwt requests oauthlib requests_oauthlib ]; + pythonImportsCheck = [ "mwoauth" ]; meta = with lib; { - description = "A library designed to provide a simple means to performing an OAuth handshake with a MediaWiki installation with the OAuth Extension installed."; - homepage = "https://github.com/mediawiki-utilities/python-mwoauth"; + description = "Python library to perform OAuth handshakes with a MediaWiki installation"; + homepage = "https://github.com/mediawiki-utilities/python-mwoauth"; license = licenses.mit; maintainers = with maintainers; [ ixxie ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix index d80e66e07b..0fecd439e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix @@ -1,33 +1,31 @@ { lib , stdenv , buildPythonPackage -, fetchFromGitHub , click , colorama , cryptography , exrex +, fetchFromGitHub , pyopenssl , pyperclip +, pytest-mock +, pytestCheckHook , questionary , requests -, pytestCheckHook -, pytest-mock , requests-mock }: buildPythonPackage rec { pname = "myjwt"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "mBouamama"; repo = "MyJWT"; rev = version; - sha256 = "1n3lvdrzp6wbbcygjwa7xar2jnhjnrz7a9khmn2phhkkngxm5rc4"; + sha256 = "sha256-kZkqFeaQPd56BVaYmCWAbVu1xwbPAIlQC3u5/x3dh7A="; }; - patches = [ ./pinning.patch ]; - propagatedBuildInputs = [ click colorama @@ -40,15 +38,20 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestCheckHook pytest-mock + pytestCheckHook requests-mock ]; + postPatch = '' + # Remove all version pinning (E.g., tornado==5.1.1 -> tornado) + sed -i -e "s/==[0-9.]*//" requirements.txt + ''; + pythonImportsCheck = [ "myjwt" ]; meta = with lib; { - description = "CLI tool for testing vulnerabilities on Json Web Token(JWT)"; + description = "CLI tool for testing vulnerabilities of JSON Web Tokens (JWT)"; homepage = "https://github.com/mBouamama/MyJWT"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myjwt/pinning.patch b/third_party/nixpkgs/pkgs/development/python-modules/myjwt/pinning.patch deleted file mode 100644 index abae9d0e2e..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/myjwt/pinning.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/requirements.txt b/requirements.txt -index 3017e02..2b465db 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,8 +1,8 @@ --click==7.1.2 --colorama==0.4.4 --cryptography==3.3.1 --exrex==0.10.5 --pyOpenSSL==20.0.1 --pyperclip==1.8.1 --questionary==1.9.0 --requests==2.25.1 -+click -+colorama -+cryptography -+exrex -+pyOpenSSL -+pyperclip -+questionary -+requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix new file mode 100644 index 0000000000..860646af9c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -0,0 +1,49 @@ +{ lib +, black +, boto3 +, buildPythonPackage +, fetchFromGitHub +, jinja2 +, md-toc +, isort +, mdformat +, pyparsing +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mypy-boto3-builder"; + version = "4.12.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "vemel"; + repo = "mypy_boto3_builder"; + rev = version; + sha256 = "09kbmrpnph5kbxlqqavpxg3l85dmk3vzmwawa4s09y9gknxxkcv9"; + }; + + propagatedBuildInputs = [ + black + boto3 + isort + jinja2 + md-toc + mdformat + pyparsing + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "mypy_boto3_builder" ]; + + meta = with lib; { + description = "Type annotations builder for boto3"; + homepage = "https://vemel.github.io/mypy_boto3_builder/"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix new file mode 100644 index 0000000000..af97c5e103 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -0,0 +1,35 @@ +{ lib +, boto3 +, buildPythonPackage +, fetchPypi +, pythonOlder +, typing-extensions +}: + +buildPythonPackage rec { + pname = "mypy-boto3-s3"; + version = "1.17.71"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zgx3f41j80xy203jwms7j72svxy10ry5v9w3ql817ai4lcrspnn"; + }; + + propagatedBuildInputs = [ + boto3 + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "mypy_boto3_s3" ]; + + meta = with lib; { + description = "Type annotations for boto3"; + homepage = "https://vemel.github.io/boto3_stubs_docs/mypy_boto3_s3/"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nassl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nassl/default.nix index 908ecff8c1..97033224c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nassl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nassl/default.nix @@ -8,12 +8,15 @@ , tls-parser , cacert , pytestCheckHook +, pythonOlder }: let - zlibStatic = pkgsStatic.zlib.override { + zlibStatic = (pkgsStatic.zlib.override { splitStaticOutput = false; - }; + }).overrideAttrs (oldAttrs: { + NIX_CFLAGS_COMPILE = "${oldAttrs.NIX_CFLAGS_COMPILE} -fPIC"; + }); nasslOpensslArgs = { static = true; enableSSL2 = true; @@ -67,13 +70,14 @@ let in buildPythonPackage rec { pname = "nassl"; - version = "3.1.0"; + version = "4.0.0"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - sha256 = "1x1v0fpb6gcc2r0k2rsy0mc3v25s3qbva78apvi46n08c2l309ci"; + hash = "sha256-6lk2YfI9km10YbJAn38fvo9qa4iXcByL+udCsDe+kvU="; }; postPatch = let @@ -108,18 +112,21 @@ buildPythonPackage rec { invoke package.wheel ''; + doCheck = true; + + pythonImportsCheck = [ "nassl" ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - # Skip online tests - pytest -k 'not Online' - ''; + disabledTests = [ + "Online" + ]; meta = with lib; { homepage = "https://github.com/nabla-c0d3/nassl"; description = "Low-level OpenSSL wrapper for Python 3.7+"; platforms = with platforms; linux ++ darwin; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ veehaitch ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix index 531232bf8e..c145b9d888 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix @@ -1,26 +1,31 @@ -{ lib, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }: +{ lib, buildPythonPackage, pythonOlder, fetchFromGitLab +, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl +}: -let +buildPythonPackage rec { pname = "nbxmpp"; - version = "1.0.2"; - name = "${pname}-${version}"; -in buildPythonPackage { - inherit pname version; + version = "2.0.2"; + + disabled = pythonOlder "3.7"; + # Tests aren't included in PyPI tarball. - src = fetchzip { - name = "${name}.tar.bz2"; - url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?" - + "ref=${name}"; - sha256 = "1rhzsakqrybzq5j5b9400wjd14pncph47c1ggn5a6f3di03lk4az"; + src = fetchFromGitLab { + domain = "dev.gajim.org"; + owner = "gajim"; + repo = "python-nbxmpp"; + rev = "nbxmpp-${version}"; + sha256 = "0z27mxgfk7hvpx0xdrd8g9441rywv74yk7s83zjnc2mc7xvpwhf4"; }; buildInputs = [ precis-i18n ]; propagatedBuildInputs = [ gobject-introspection idna libsoup pygobject3 pyopenssl ]; + pythonImportsCheck = [ "nbxmpp" ]; + meta = with lib; { homepage = "https://dev.gajim.org/gajim/python-nbxmpp"; description = "Non-blocking Jabber/XMPP module"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix index 489b6bddf5..dd17a3f6c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix @@ -1,23 +1,24 @@ -{ lib, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, netifaces, pytest }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, pytestCheckHook }: buildPythonPackage rec { pname = "netdisco"; - version = "2.8.2"; + version = "2.8.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "dcaabf83b204282aacfb213b18799eb7af2d5a6defe529487bbd0548036392fe"; + sha256 = "sha256-4WS9PiErB6U7QuejTvbrOmnHetbE5S4zaUyhLCbyihM="; }; - propagatedBuildInputs = [ requests zeroconf netifaces ]; + propagatedBuildInputs = [ requests zeroconf ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - py.test - ''; + pythonImportsCheck = [ + "netdisco" + "netdisco.discovery" + ]; meta = with lib; { description = "Python library to scan local network for services and devices"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix index e3ce770398..39edd7e34d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pytestCheckHook, matplotlib -, nibabel, numpy, pandas, scikitlearn, scipy, joblib, requests }: +, nibabel, numpy, pandas, scikit-learn, scipy, joblib, requests }: buildPythonPackage rec { pname = "nilearn"; @@ -20,7 +20,7 @@ buildPythonPackage rec { numpy pandas requests - scikitlearn + scikit-learn scipy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nmigen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nmigen/default.nix index 1e38a087bc..d42e27a293 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nmigen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nmigen/default.nix @@ -3,11 +3,12 @@ , pythonOlder , fetchFromGitHub , setuptools -, setuptools_scm +, setuptools-scm , pyvcd , jinja2 , importlib-resources , importlib-metadata +, git # for tests , pytestCheckHook @@ -30,7 +31,7 @@ buildPythonPackage rec { sha256 = "0cjs9wgmxa76xqmjhsw4fsb2mhgvd85jgs2mrjxqp6fwp8rlgnl1"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm git ]; propagatedBuildInputs = [ setuptools diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix index 211e9d6185..c49a4105ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "55c11d7edbba2ba715f2b56f5294cad55cfd87bff98e2627c3047c2d5cc52d16"; }; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; propagatedBuildInputs = [ numpy llvmlite setuptools ]; pythonImportsCheck = [ "numba" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix index 839582e87f..25e81c89c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix @@ -14,20 +14,18 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "0.13.0"; + version = "14.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5202adcd96ddbbccbc267da02f2d14e977300c81291aaa77be4fd9f2e27cfa37"; + sha256 = "1zfcl3dq9ladqg7fnpx6kgxf1ckjzlc8v3j6wa8w6iwglm40ax4r"; }; propagatedBuildInputs = [ jupyterhub ]; - pytestFlagsArray = [ "oauthenticator/tests" ]; - checkInputs = [ google-api-python-client google-auth-oauthlib @@ -38,6 +36,20 @@ buildPythonPackage rec { requests-mock ]; + postPatch = '' + # The constraint was removed. No longer needed for > 14.0.0 + # https://github.com/jupyterhub/oauthenticator/pull/431 + substituteInPlace test-requirements.txt --replace "pyjwt>=1.7,<2.0" "pyjwt" + ''; + + disabledTests = [ + # Test are outdated, https://github.com/jupyterhub/oauthenticator/issues/432 + "test_azuread" + "test_mediawiki" + ]; + + pythonImportsCheck = [ "oauthenticator" ]; + meta = with lib; { description = "Authenticate JupyterHub users with common OAuth providers, including GitHub, Bitbucket, and more."; homepage = "https://github.com/jupyterhub/oauthenticator"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ofxparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ofxparse/default.nix index d018a924d8..33d027f1be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ofxparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ofxparse/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , six , beautifulsoup4 , lxml @@ -8,11 +8,15 @@ buildPythonPackage rec { pname = "ofxparse"; - version = "0.20"; + version = "unstable-2020-02-05"; - src = fetchPypi { - inherit pname version; - sha256 = "0zn3grc6xhgzcc81qc3dxkkwk731cjjqqhb46smw12lk09cdnigb"; + # The newer changes haven't been released yet and ledger-autosync + # depends on them: + src = fetchFromGitHub { + owner = "jseutter"; + repo = "ofxparse"; + rev = "3236cfd96434feb6bc79a8b66f3400f18e2ad3c4"; + sha256 = "1rkp174102q7hwjrg3na0qnfd612xb3r360b9blkbprjhzxy7gr7"; }; propagatedBuildInputs = [ six beautifulsoup4 lxml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ondilo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ondilo/default.nix index 7010bd473a..271243ab79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ondilo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ondilo/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ondilo"; - version = "0.2.0"; + version = "0.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "JeromeHXP"; repo = pname; rev = version; - sha256 = "0k7c9nacf7pxvfik3hkv9vvvda2sx5jrf6zwq7r077x7fw5l8d2b"; + sha256 = "sha256-MI6K+41I/IVi+GRBdmRIHbljULDFLAwpo3W8tdxCOBM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/common.nix b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/common.nix index 35655b207a..985d4e199e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/common.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/common.nix @@ -1,16 +1,16 @@ { lib , fetchFromGitHub }: rec { - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; rev = "v${version}"; - sha256 = "sha256-gw6Qt9BntPcF3zw19PXftDbhoCeBr8hwrujy51rb5Fc="; + sha256 = "sha256-ptB0jP0kp1Liynkfz0B0OMw6xNQG1s8IvxhgNAdEytM="; }; meta = with lib; { homepage = "https://openrazer.github.io/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ roelvandijk evanjs ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix index 3cd420c749..a55d26d83c 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy -, pandas, requests, Rtree, shapely, folium, scikitlearn, scipy}: +, pandas, requests, Rtree, shapely, folium, scikit-learn, scipy}: buildPythonPackage rec { pname = "osmnx"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1k3y5kl4k93vxaxyanc040x44s2fyyc3m1ndy2j3kg0037z8ad4z"; }; - propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ]; + propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy ]; # requires network doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ovoenergy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ovoenergy/default.nix new file mode 100644 index 0000000000..42615fa664 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ovoenergy/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, buildPythonPackage +, click +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "ovoenergy"; + version = "1.1.12"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "timmo001"; + repo = pname; + rev = "v${version}"; + sha256 = "1430k699gblxwspsbgxnha8afk6npqharhz2jyjw5gir9pi6g9cz"; + }; + + propagatedBuildInputs = [ + aiohttp + click + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "ovoenergy" ]; + + meta = with lib; { + description = "Python client for getting data from OVO's API"; + homepage = "https://github.com/timmo001/ovoenergy"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas/2.nix index 936a3db296..8af4094b0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas/2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas/2.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { # For OSX, we need to add a dependency on libcxx, which provides # `complex.h` and other libraries that pandas depends on to build. postPatch = lib.optionalString stdenv.isDarwin '' - cpp_sdk="${libcxx}/include/c++/v1"; + cpp_sdk="${lib.getDev libcxx}/include/c++/v1"; echo "Adding $cpp_sdk to the setup.py common_include variable" substituteInPlace setup.py \ --replace "['pandas/src/klib', 'pandas/src']" \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix index 7fd551e192..f3505e3c9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { # For OSX, we need to add a dependency on libcxx, which provides # `complex.h` and other libraries that pandas depends on to build. postPatch = lib.optionalString stdenv.isDarwin '' - cpp_sdk="${libcxx}/include/c++/v1"; + cpp_sdk="${lib.getDev libcxx}/include/c++/v1"; echo "Adding $cpp_sdk to the setup.py common_include variable" substituteInPlace setup.py \ --replace "['pandas/src/klib', 'pandas/src']" \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pathy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathy/default.nix new file mode 100644 index 0000000000..714e6945df --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pathy/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, typer +, dataclasses +, smart_open +, pytest +, mock +, google-cloud-storage +}: + +buildPythonPackage rec { + pname = "pathy"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-nb8my/5rkc7thuHnXZHe1Hg8j+sLBlYyJcLHWrrKZ5M="; + }; + + propagatedBuildInputs = [ smart_open typer google-cloud-storage ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "smart-open>=2.2.0,<4.0.0" "smart-open>=2.2.0" + ''; + + checkInputs = [ pytestCheckHook mock ]; + + # Exclude tests that require provider credentials + pytestFlagsArray = [ + "--ignore=pathy/_tests/test_clients.py" + "--ignore=pathy/_tests/test_gcs.py" + "--ignore=pathy/_tests/test_s3.py" + ]; + + meta = with lib; { + description = "A Path interface for local and cloud bucket storage"; + homepage = "https://github.com/justindujardin/pathy"; + license = licenses.asl20; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix index 6f5d8e2622..fd057d24d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.13.3"; + version = "3.14.4"; # pypi release does not provide tests src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "1r67hxb9m6v0xbnbqfnsw6dahmdr94pf81b4x51jfw6x9sa4izi4"; + sha256 = "0x85swpaffysc05kka0mab87cnilzw1lpacfhcx5ayabh0i2qsh6"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix index 65f3529e60..2868cea4ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix @@ -6,7 +6,7 @@ , joblib , matplotlib , numpy -, scikitlearn +, scikit-learn , scipy , pytestCheckHook }: @@ -26,7 +26,7 @@ buildPythonPackage rec { joblib matplotlib numpy - scikitlearn + scikit-learn scipy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix index a03452d786..958d3b7655 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.19.2"; + version = "1.19.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RMu008kS8toWfKAr+YoAQPfpMmDk7xFMKNXWFSAS6gc="; + sha256 = "sha256-fJxtV1QbDyFT4jqNdZzrPXy5MIkY+6atnpL44OWpC8g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pgpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgpy/default.nix index b3fde72bae..a79c65f405 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pgpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pgpy/default.nix @@ -1,31 +1,31 @@ -{ lib, isPy3k, fetchFromGitHub, buildPythonPackage +{ lib, pythonOlder, fetchFromGitHub, buildPythonPackage , six, enum34, pyasn1, cryptography, singledispatch ? null -, fetchPypi, pytestCheckHook }: +, pytestCheckHook }: buildPythonPackage rec { pname = "pgpy"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "SecurityInnovation"; repo = "PGPy"; - rev = version; - sha256 = "1v2b1dyq1sl48d2gw7vn4hv6sasd9ihpzzcq8yvxj9dgfak2y663"; + rev = "v${version}"; + sha256 = "03pch39y3hi4ici6y6lvz0j0zram8dw2wvnmq1zyjy3vyvm1ms4a"; }; propagatedBuildInputs = [ six pyasn1 cryptography + ] ++ lib.optionals (pythonOlder "3.4") [ singledispatch - ] ++ lib.optional (!isPy3k) enum34; + enum34 + ]; checkInputs = [ pytestCheckHook ]; - disabledTests = [ "test_sign_string" "test_verify_string" ]; - meta = with lib; { homepage = "https://github.com/SecurityInnovation/PGPy"; description = "Pretty Good Privacy for Python 2 and 3"; @@ -35,6 +35,6 @@ buildPythonPackage rec { 4880. ''; license = licenses.bsd3; - maintainers = with maintainers; [ eadwu ]; + maintainers = with maintainers; [ eadwu dotlambda ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix index d0cbf5bafe..c49d6bae31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix @@ -1,4 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, psycopg2 +, click +, configobj +, sqlparse +}: buildPythonPackage rec { pname = "pgspecial"; @@ -9,13 +17,16 @@ buildPythonPackage rec { sha256 = "b68feb0005f57861573d3fbb82c5c777950decfbb2d1624af57aec825db02c02"; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ click sqlparse psycopg2 ]; + propagatedBuildInputs = [ + click + sqlparse + psycopg2 + ]; - checkPhase = '' - find tests -name \*.pyc -delete - py.test tests - ''; + checkInputs = [ + configobj + pytestCheckHook + ]; meta = with lib; { description = "Meta-commands handler for Postgres Database"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix index 43ce5f1e76..8eab09046d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix @@ -65,6 +65,6 @@ buildPythonApplication rec { homepage = "https://github.com/bootphon/phonemizer"; description = "Simple text to phones converter for multiple languages"; license = licenses.gpl3; - maintainers = with maintainers; [ hexa ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix index ef32507321..1c8cae9f04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, gevent , nose , mock , twisted @@ -11,12 +12,34 @@ buildPythonPackage rec { pname = "pika"; version = "1.2.0"; - src = fetchPypi { - inherit pname version; - sha256 = "f023d6ac581086b124190cb3dc81dd581a149d216fa4540ac34f9be1e3970b89"; + src = fetchFromGitHub { + owner = "pika"; + repo = "pika"; + rev = version; + sha256 = "sha256-Wog6Wxa8V/zv/bBrFOigZi6KE5qRf82bf1GK2XwvpDI="; }; - checkInputs = [ nose mock twisted tornado ]; + propagatedBuildInputs = [ gevent tornado twisted ]; + + checkInputs = [ nose mock ]; + + postPatch = '' + # don't stop at first test failure + # don't run acceptance tests because they access the network + # don't report test coverage + substituteInPlace setup.cfg \ + --replace "stop = 1" "stop = 0" \ + --replace "tests=tests/unit,tests/acceptance" "tests=tests/unit" \ + --replace "with-coverage = 1" "with-coverage = 0" + ''; + + checkPhase = '' + runHook preCheck + + PIKA_TEST_TLS=true nosetests + + runHook postCheck + ''; meta = with lib; { description = "Pure-Python implementation of the AMQP 0-9-1 protocol"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix index 3aed634dfb..d7b2ff8d6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix @@ -1,19 +1,20 @@ { lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k , olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2 -, tk, libX11, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +, libxcb, tk, libX11, openjpeg, libimagequant, pyroma, numpy +, pytestCheckHook }@args: import ../pillow/generic.nix (rec { pname = "Pillow-SIMD"; - version = "7.0.0.post3"; + version = "8.1.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "uploadcare"; repo = "pillow-simd"; - rev = "v${version}"; - sha256 = "1h832xp1bzf951hr4dmjmxqfsv28sx9lr2cq96qdz1c72k40zj1h"; + rev = version; + sha256 = "1z0c1qpx7l1bhj71ww7za7kl29j5wdraqr2pdhv4dp1q74kgrr0m"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix index 48f15181ce..51da889621 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix @@ -1,45 +1,36 @@ -{ lib, fetchPypi, buildPythonPackage, pip, pytest, click, six -, setuptools_scm, git, glibcLocales, mock }: +{ lib +, fetchPypi +, pythonOlder +, buildPythonPackage +, pip +, pytest +, pytest-xdist +, click +, setuptools-scm +, git +, glibcLocales +, mock +, pep517 +}: buildPythonPackage rec { pname = "pip-tools"; - version = "6.0.1"; + version = "6.1.0"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3b0c7b95e8d3dfb011bb42cb38f356fcf5d0630480462b59c4d0a112b8d90281"; + sha256 = "sha256-QAv3finMpIwxq8IQBCkyu1LcwTjvTqTVLF20KaqK5u4="; }; LC_ALL = "en_US.UTF-8"; - checkInputs = [ pytest git glibcLocales mock ]; - propagatedBuildInputs = [ pip click six setuptools_scm ]; - - disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) [ - # Depend on network tests: - "test_allow_unsafe_option" #paramaterized, but all fail - "test_annotate_option" #paramaterized, but all fail - "test_editable_package_vcs" - "test_editable_top_level_deps_preserved" # can't figure out how to select only one parameter to ignore - "test_filter_pip_markers" - "test_filter_pip_markes" - "test_generate_hashes_all_platforms" - "test_generate_hashes_verbose" - "test_generate_hashes_with_editable" - "test_generate_hashes_with_url" - "test_generate_hashes_without_interfering_with_each_other" - "test_get_file_hash_without_interfering_with_each_other" - "test_get_hashes_local_repository_cache_miss" - "test_realistic_complex_sub_dependencies" - "test_stdin" - "test_upgrade_packages_option" - "test_url_package" - "test_editable_package" - "test_locally_available_editable_package_is_not_archived_in_cache_dir" - ]; + checkInputs = [ pytest git glibcLocales mock pytest-xdist ]; + propagatedBuildInputs = [ pip click setuptools-scm pep517 ]; checkPhase = '' export HOME=$(mktemp -d) VIRTUAL_ENV=1 - py.test -k "${disabledTests}" + py.test -m "not network" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix index 34a7bc6b31..e6f9242dde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pipx"; - version = "0.16.1.0"; + version = "0.16.2.1"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = version; - sha256 = "081raqsaq7i2x4yxhxppv930jhajdwmngin5wazy7vqhiy3xc669"; + sha256 = "1agdp8j4lw6z0lk2vv1m8d49r5vwfkpal3hdgq67vnjyp9904pf6"; }; propagatedBuildInputs = [ @@ -54,6 +54,7 @@ buildPythonPackage rec { "suffix" "legacy_venv" "determination" + "json" ]; meta = with lib; { 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 52c3711541..dc832809c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "PlexAPI"; - version = "4.5.1"; + version = "4.5.2"; disabled = isPy27; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "sha256-WrjIN6+7ybprnjCv57BdKaQYoQ+HgGVr/XytXcbAmwg="; + sha256 = "sha256-9rdpisEuLUO7oO7+7SQb4fXqRG30rf4R7bSFY+QpMhM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix index 289f1871f3..d62c2e8bb7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -1,31 +1,31 @@ { lib -, buildPythonPackage -, fetchFromGitHub , aiohttp , async-timeout +, buildPythonPackage , crcmod , defusedxml -, pyserial -, pytz -, python-dateutil -, semver +, fetchFromGitHub , jsonpickle +, munch , mypy +, pyserial , pytest-aiohttp , pytest-asyncio -, pytest-cov , pytestCheckHook +, python-dateutil +, pytz +, semver }: buildPythonPackage rec { pname = "plugwise"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = version; - sha256 = "sha256-MZ4R55vGUyWmR0Md83eNerzsgtYMch1vfQ3sqbm12bM="; + sha256 = "sha256-5r+Xe3EKLjuR7mPGEPOKzhE7G6OzNEClf847Px9VdWU="; }; propagatedBuildInputs = [ @@ -33,9 +33,10 @@ buildPythonPackage rec { async-timeout crcmod defusedxml + munch pyserial - pytz python-dateutil + pytz semver ]; @@ -44,8 +45,6 @@ buildPythonPackage rec { mypy pytest-aiohttp pytest-asyncio - pytest-cov - pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix index 8f260ad8cc..518840d415 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix @@ -1,19 +1,41 @@ -{ lib, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose, pyyaml }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, numpy +, scipy +, cython +, networkx +, joblib +, pandas +, nose +, pyyaml +}: + buildPythonPackage rec { pname = "pomegranate"; - version = "0.11.2"; + version = "0.13.5"; src = fetchFromGitHub { repo = pname; owner = "jmschrei"; rev = "v${version}"; - sha256 = "070ciwww1lhjmfwd5n1kcwgxwbgdfvmhjs4l156bnf08z9dlrafl"; + sha256 = "1hbxchp3daykkf1fa79a9mh34p78bygqcf1nv4qwkql3gw0pd6l7"; }; + patches = lib.optionals (lib.versionOlder version "13.6") [ + # Fix compatibility with recent joblib release, will be part of the next + # pomegranate release after 0.13.5 + (fetchpatch { + url = "https://github.com/jmschrei/pomegranate/commit/42d14bebc44ffd4a778b2a6430aa845591b7c3b7.patch"; + sha256 = "0f9cx0fj9xkr3hch7jyrn76zjypilh5bqw734caaw6g2m49lvbff"; + }) + ]; + propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ]; - checkInputs = [ nose ]; + checkInputs = [ pandas nose ]; # as of 0.13.5, it depends explicitly on nose, rather than pytest. meta = with lib; { description = "Probabilistic and graphical models for Python, implemented in cython for speed"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix index 94d86f7b71..4a9fdfa426 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix @@ -4,7 +4,7 @@ , isPy3k , fetchPypi , pythonPackages -, sip_5 +, sip , qtbase , qmake , pyqt5 @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; buildInputs = [ qtbase.dev poppler pyqt-builder ]; - nativeBuildInputs = [ pkg-config qmake sip_5 ]; + nativeBuildInputs = [ pkg-config qmake sip ]; propagatedBuildInputs = [ pyqt5.dev ]; format = "pyproject"; @@ -46,7 +46,7 @@ buildPythonPackage rec { [tool.sip.bindings.Poppler-Qt5] include-dirs = ["${poppler.dev}/include/poppler"] - tags = ["${sip_5.platform_tag}"] + tags = ["${sip.platform_tag}"] EOF ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ppscore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ppscore/default.nix index ad3a393a00..43dd1f249e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ppscore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ppscore/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , isPy27 , pandas -, scikitlearn +, scikit-learn , pytestCheckHook }: @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pandas - scikitlearn + scikit-learn ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prayer-times-calculator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prayer-times-calculator/default.nix new file mode 100644 index 0000000000..758c52f1d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/prayer-times-calculator/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "prayer-times-calculator"; + version = "0.0.4"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "uchagani"; + repo = pname; + rev = version; + sha256 = "053wa0zzfflaxlllh6sxgnrqqx8qyv4jcj85fsiv6n608kw202d5"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "prayer_times_calculator" ]; + + meta = with lib; { + description = "Python client for the Prayer Times API"; + homepage = "https://github.com/uchagani/prayer-times-calculator"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix index d349a58960..50b9eb5763 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix @@ -4,6 +4,8 @@ , glibcLocales , setuptools_scm , wcwidth +, importlib-metadata +, pythonOlder }: buildPythonPackage rec { @@ -18,7 +20,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ wcwidth ]; + propagatedBuildInputs = [ + wcwidth + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; preCheck = '' export LANG="en_US.UTF-8" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix index 941da2bf9a..95a79ea189 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "prison"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "betodealmeida"; repo = "python-rison"; rev = version; - sha256 = "14vb468iznf9416z993bbqihywp9ibyslw5vp67wfr200zyxjwak"; + sha256 = "sha256-qor40vUQeTdlO3vwug3GGNX5vkNaF0H7EWlRdsY4bvc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/privacyidea/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/privacyidea/default.nix index c28a009016..11ff6f71af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/privacyidea/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/privacyidea/default.nix @@ -1,10 +1,10 @@ { lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python, nixosTests , cryptography, pyrad, pymysql, python-dateutil, flask-versioned, flask_script -, defusedxml, croniter, flask_migrate, pyjwt, configobj, sqlsoup, pillow +, defusedxml, croniter, flask_migrate, pyjwt1, configobj, sqlsoup, pillow , python-gnupg, passlib, pyopenssl, beautifulsoup4, smpplib, flask-babel , ldap3, huey, pyyaml, qrcode, oauth2client, requests, lxml, cbor2, psycopg2 -, pydash +, pydash, ecdsa , mock, pytestCheckHook, responses, testfixtures }: @@ -29,10 +29,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography pyrad pymysql python-dateutil flask-versioned flask_script - defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow + defusedxml croniter flask_migrate pyjwt1 configobj sqlsoup pillow python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2 - pydash + pydash ecdsa ]; passthru.tests = { inherit (nixosTests) privacyidea; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix index 6b05f383ec..8af58a2565 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "21.3.4"; + version = "21.5.17"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+qi5M2I3VlmQKY8ghw4T3RZ4pFhoR8paf/Kr8QdS81Y="; + sha256 = "1826wz4d7qnlwl5csnjds1xh9ainicj2s004hlwv54bdvwx2ny1z"; }; patches = [ @@ -17,9 +17,15 @@ buildPythonPackage rec { }) ]; + pythonImportsCheck = [ + "pulsectl" + ]; + checkInputs = [ pulseaudio ]; + checkPhase = '' - ${python.interpreter} -m unittest pulsectl.tests.all + export HOME=$TMPDIR + ${python.interpreter} -m unittest discover ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix index 68c9d9180d..43cab7db67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix @@ -1,6 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi -, requests, websocket_client, python_magic -, pytest, mock }: +{ lib +, buildPythonPackage +, fetchPypi +, requests +, websocket_client +, python_magic +, cryptography +, pytestCheckHook +}: buildPythonPackage rec { pname = "pushbullet.py"; @@ -11,13 +17,17 @@ buildPythonPackage rec { sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64"; }; - propagatedBuildInputs = [ requests websocket_client python_magic ]; + propagatedBuildInputs = [ cryptography requests websocket_client python_magic ]; - checkInputs = [ pytest mock ]; - - checkPhase = '' - PUSHBULLET_API_KEY="" py.test -k "not test_e2e and not test_auth" + preCheck = '' + export PUSHBULLET_API_KEY="" ''; + checkInputs = [ pytestCheckHook ]; + disabledTests = [ + "test_auth_fail" + "test_auth_success" + "test_decryption" + ]; meta = with lib; { description = "A simple python client for pushbullet.com"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix index a24e1d5db1..b9f71de8e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix @@ -2,14 +2,13 @@ , buildPythonPackage , debugger , fetchPypi -, isPy3k , Mako -, makeWrapper , packaging , pysocks , pygments , ROPGadget , capstone +, colored-traceback , paramiko , pip , psutil @@ -17,28 +16,40 @@ , pyserial , dateutil , requests +, rpyc , tox , unicorn , intervaltree -, fetchpatch +, installShellFiles }: +let + debuggerName = lib.strings.getName debugger; +in buildPythonPackage rec { - version = "4.3.1"; + version = "4.5.0"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "12ja913kz8wl4afrmpzxh9fx6j7rcwc2vqzkvfr1fxn42gkqhqf4"; + sha256 = "sha256-IWHMorSASG/po8ib1whS3xPuoUUlD0tbbWI35DI2SIY="; }; - # Upstream has set an upper bound on unicorn because of https://github.com/Gallopsled/pwntools/issues/1538, - # but since that is a niche use case and it requires extra work to get unicorn 1.0.2rc3 to work we relax - # the bound here. Check if this is still necessary when updating! postPatch = '' + # Upstream has set an upper bound on unicorn because of https://github.com/Gallopsled/pwntools/issues/1538, + # but since that is a niche use case and it requires extra work to get unicorn 1.0.2rc3 to work we relax + # the bound here. Check if this is still necessary when updating! sed -i 's/unicorn>=1.0.2rc1,<1.0.2rc4/unicorn>=1.0.2rc1/' setup.py + + # Upstream hardcoded the check for the command `gdb-multiarch`; + # Forcefully use the provided debugger, as `gdb` (hence `pwndbg`) is built with multiarch in `nixpkgs`. + sed -i 's/gdb-multiarch/${debuggerName}/' pwnlib/gdb.py ''; + nativeBuildInputs = [ + installShellFiles + ]; + propagatedBuildInputs = [ Mako packaging @@ -46,6 +57,7 @@ buildPythonPackage rec { pygments ROPGadget capstone + colored-traceback paramiko pip psutil @@ -53,6 +65,7 @@ buildPythonPackage rec { pyserial dateutil requests + rpyc tox unicorn intervaltree @@ -60,9 +73,13 @@ buildPythonPackage rec { doCheck = false; # no setuptools tests for the package + postInstall = '' + installShellCompletion --bash extra/bash_completion.d/shellcraft + ''; + postFixup = '' mkdir -p "$out/bin" - makeWrapper "${debugger}/bin/${lib.strings.getName debugger}" "$out/bin/pwntools-gdb" + makeWrapper "${debugger}/bin/${debuggerName}" "$out/bin/pwntools-gdb" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-canary/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-canary/default.nix new file mode 100644 index 0000000000..531624781b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-canary/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +}: + +buildPythonPackage rec { + pname = "py-canary"; + version = "0.5.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "snjoetw"; + repo = pname; + rev = version; + sha256 = "0j743cc0wv7im3anx1vvdm79zyvw67swhc3zwwc1r8626dgnmxjr"; + }; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + mock + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ "canary" ]; + + meta = with lib; { + description = "Python package for Canary Security Camera"; + homepage = "https://github.com/snjoetw/py-canary"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix index f9e276b3bb..12b9668f1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , buildPythonPackage , pytestCheckHook , sysctl @@ -9,28 +8,15 @@ buildPythonPackage rec { pname = "py-cpuinfo"; - version = "7.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "workhorsy"; repo = pname; rev = "v${version}"; - sha256 = "10qfaibyb2syiwiyv74l7d97vnmlk079qirgnw3ncklqjs0s3gbi"; + sha256 = "sha256-Mgzj1HTasUNHeHMVwV6d+TeyVqnBNUwCJ1EC3kfovf8="; }; - patches = [ - # Make it detect Apple Silicon, remove after https://github.com/workhorsy/py-cpuinfo/pull/161 is merged. - (fetchpatch { - url = "https://github.com/workhorsy/py-cpuinfo/commit/54c32da6678f9d75ec5acf4534056cdc85c2a04d.patch"; - sha256 = "sha256-3R46KrpACAQ1V0CQtz48V5mQXxvplUQrXnACtiE8WqY="; - }) - # Continuation of the patch above - (fetchpatch { - url = "https://github.com/workhorsy/py-cpuinfo/commit/0d00f4b99750f292c85ff23e1039ea9489cb7ec8.patch"; - sha256 = "sha256-mHoXoCAEG2v3xpQppRFWzSvhYCp5i9CZkbEgtiLVzMs="; - }) - ]; - checkInputs = [ pytestCheckHook ]; @@ -42,17 +28,19 @@ buildPythonPackage rec { --replace "_run_and_get_stdout(['sysctl'" "_run_and_get_stdout(['${sysctl}/bin/sysctl'" ''; - meta = { - description = "Get CPU info with pure Python 2 & 3"; + pythonImportsCheck = [ "cpuinfo" ]; + + meta = with lib; { + description = "Get CPU info with pure Python"; longDescription = '' Py-cpuinfo gets CPU info with pure Python and should work without any extra programs or libraries, beyond what your OS provides. It does not require any compilation (C/C++, assembly, etc.) to use and works with - Python 2 and 3. + Python. ''; - inherit (src.meta) homepage; + homepage = "https://github.com/workhorsy/py-cpuinfo"; changelog = "https://github.com/workhorsy/py-cpuinfo/blob/v${version}/ChangeLog"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ costrouc ]; + license = licenses.mit; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-dmidecode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-dmidecode/default.nix new file mode 100644 index 0000000000..e74a8d7ac2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-dmidecode/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, dmidecode }: + +buildPythonPackage rec { + pname = "py-dmidecode"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bv1vmhj8h520kj6slwpz16xfmgp117yjjkfyihkl5ix6mn5zkpa"; + }; + + propagatedBuildInputs = [ dmidecode ]; + + # Project has no tests. + doCheck = false; + pythonImportsCheck = [ "dmidecode" ]; + + meta = with lib; { + homepage = "https://github.com/zaibon/py-dmidecode/"; + description = "Python library that parses the output of dmidecode"; + license = licenses.asl20; + maintainers = with maintainers; [ davidtwco ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-ubjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-ubjson/default.nix new file mode 100644 index 0000000000..4efa2b8b6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-ubjson/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "py-ubjson"; + version = "0.16.1"; + + src = fetchFromGitHub { + owner = "Iotic-Labs"; + repo = pname; + rev = "v${version}"; + sha256 = "1frn97xfa88zrfmpnvdk1pc03yihlchhph99bhjayvzlfcrhm5v3"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "test/test.py" ]; + + pythonImportsCheck = [ "ubjson" ]; + + meta = with lib; { + description = "Universal Binary JSON draft-12 serializer for Python"; + homepage = "https://github.com/Iotic-Labs/py-ubjson"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix index 236a38c7e6..59d0cdb729 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ exiv2 boost ]; # work around python distutils compiling C++ with $CC (see issue #26709) - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; meta = with lib; { homepage = "https://launchpad.net/py3exiv2"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyaftership/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyaftership/default.nix index e65812cb31..6253d95111 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyaftership/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyaftership/default.nix @@ -1,4 +1,13 @@ -{ aiohttp, async-timeout, buildPythonPackage, fetchPypi, isPy3k, lib }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, aiohttp +, async-timeout +, aresponses +, pytest-asyncio +, pytestCheckHook +}: buildPythonPackage rec { pname = "pyaftership"; @@ -6,16 +15,17 @@ buildPythonPackage rec { disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "28b62c323d06492399b60d8135a58d6feaa1d60837eddc14e57ea2b69d356c0a"; + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "0jyzgwaijkp80whi58a0hgjzmnlczmd9vwn11z2m0j01kbdwznn5"; }; propagatedBuildInputs = [ aiohttp async-timeout ]; - # No tests - doCheck = false; - pythonImportsCheck = [ "pyaftership.tracker" ]; + checkInputs = [ pytestCheckHook aresponses pytest-asyncio ]; + pythonImportsCheck = [ "pyaftership" ]; meta = with lib; { description = "Python wrapper package for the AfterShip API"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix index 6bea15df38..ea6e852217 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "4.2.2"; + version = "4.2.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jabesq"; repo = "pyatmo"; rev = "v${version}"; - sha256 = "sha256-3IxDDLa8KMHVkHAeTmdNVRPc5aKzF3VwL2kKnG8Fp7I="; + sha256 = "sha256-hbs+1x/pwv00dhm+1Yj1effddJZHDjs2K3oeBmdCY+k="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix index 5ae00417b6..b566edef64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix @@ -1,13 +1,13 @@ -{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }: +{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome }: buildPythonPackage rec { pname = "pyatspi"; - version = "2.38.0"; + version = "2.38.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/4CTEv0ML2HhkcGBoaY4owtXm5G2gs+1oFU1pVJltD0="; + sha256 = "0lc1p6p296c9q3lffi03v902jlsj34i7yyl3rcyaq94wwbljg7z4"; }; nativeBuildInputs = [ pkg-config ]; @@ -20,9 +20,10 @@ buildPythonPackage rec { disabled = !isPy3k; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "python3.pkgs.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix index 7517de5975..391be3c17b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { description = "Python library for the BrowserID Protocol"; homepage = "https://github.com/mozilla/PyBrowserID"; license = licenses.mpl20; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycflow2dot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycflow2dot/default.nix new file mode 100644 index 0000000000..db1ac8fabb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycflow2dot/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cflow +, graphviz +, pydot +, networkx +, which +}: + +buildPythonPackage rec { + pname = "pycflow2dot"; + version = "0.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zm8x2pd0q6zza0fw7hg9g1qvybfnjq6ql9b8mh2fc45l7l25655"; + }; + + propagatedBuildInputs = [ + cflow + graphviz + pydot + networkx + which + ]; + + pythonImportsCheck = [ "pycflow2dot" ]; + checkPhase = '' + cd tests + export PATH=$out/bin:$PATH + make all + ''; + + meta = with lib; { + description = "Layout C call graphs from cflow using GraphViz dot"; + homepage = "https://github.com/johnyf/pycflow2dot"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ evils ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pychannels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pychannels/default.nix index 0c5e290334..8923e5c9c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pychannels/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pychannels/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pychannels"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "fancybits"; repo = pname; rev = version; - sha256 = "0dqc0vhf6c5r3g7nfbpa668x6z2zxrznk6h907s6sxkq4sbqnhqf"; + sha256 = "sha256-E+VL4mJ2KxS5bJZc3Va+wvyVjT55LJz+1wHkxDRa85s="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyclimacell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyclimacell/default.nix index c9eb0f0353..7f5703585c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyclimacell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyclimacell/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyclimacell"; - version = "0.18.0"; + version = "0.18.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "raman325"; repo = pname; rev = "v${version}"; - sha256 = "0pxlh3lwd1az6v7vbaz9kv6ngqxf34iddp7vr0d0p8apbvinwrha"; + sha256 = "sha256-jWHjnebg4Aar48gid7bB7XYXOQtSqbmVmASsZd0YoPc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix index b750bd30b0..614393cf2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, numpy, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, matplotlib, numpy, pytest, seaborn }: buildPythonPackage rec { pname = "pycm"; @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ matplotlib numpy seaborn ]; checkPhase = '' pytest Test/ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix index fe62d1be1e..e202d1928f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix @@ -1,11 +1,12 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , isPyPy , fetchPypi , pythonOlder , curl , openssl , bottle -, pytest +, pytestCheckHook , nose , flaky }: @@ -20,6 +21,11 @@ buildPythonPackage rec { sha256 = "8301518689daefa53726b59ded6b48f33751c383cf987b0ccfbbc4ed40281325"; }; + preConfigure = '' + substituteInPlace setup.py --replace '--static-libs' '--libs' + export PYCURL_SSL_LIBRARY=openssl + ''; + buildInputs = [ curl openssl.out @@ -31,34 +37,48 @@ buildPythonPackage rec { checkInputs = [ bottle - pytest + pytestCheckHook nose flaky ]; - # skip impure or flakey tests - # See also: - # * https://github.com/NixOS/nixpkgs/issues/77304 - checkPhase = '' - HOME=$TMPDIR pytest tests -k "not test_ssl_in_static_libs \ - and not test_keyfunction \ - and not test_keyfunction_bogus_return \ - and not test_libcurl_ssl_gnutls \ - and not test_libcurl_ssl_nss \ - and not test_libcurl_ssl_openssl" \ - --ignore=tests/getinfo_test.py \ - --ignore=tests/memory_mgmt_test.py \ - --ignore=tests/multi_memory_mgmt_test.py \ - --ignore=tests/multi_timer_test.py + pytestFlagsArray = [ + # don't pick up the tests directory below examples/ + "tests" + ]; + + preCheck = '' + export HOME=$TMPDIR ''; - preConfigure = '' - substituteInPlace setup.py --replace '--static-libs' '--libs' - export PYCURL_SSL_LIBRARY=openssl - ''; + disabledTests = [ + # libcurl stopped passing the reason phrase from the HTTP status line + # https://github.com/pycurl/pycurl/issues/679 + "test_failonerror" + "test_failonerror_status_line_invalid_utf8_python3" + # bottle>=0.12.17 escapes utf8 properly, so these test don't work anymore + # https://github.com/pycurl/pycurl/issues/669 + "test_getinfo_content_type_invalid_utf8_python3" + "test_getinfo_cookie_invalid_utf8_python3" + "test_getinfo_raw_content_type_invalid_utf8" + "test_getinfo_raw_cookie_invalid_utf8" + # tests that require network access + "test_keyfunction" + "test_keyfunction_bogus_return" + # OSError: tests/fake-curl/libcurl/with_openssl.so: cannot open shared object file: No such file or directory + "test_libcurl_ssl_openssl" + # OSError: tests/fake-curl/libcurl/with_nss.so: cannot open shared object file: No such file or directory + "test_libcurl_ssl_nss" + # OSError: tests/fake-curl/libcurl/with_gnutls.so: cannot open shared object file: No such file or directory + "test_libcurl_ssl_gnutls" + # AssertionError: assert 'crypto' in ['curl'] + "test_ssl_in_static_libs" + ]; - meta = { + meta = with lib; { homepage = "http://pycurl.sourceforge.net/"; description = "Python wrapper for libcurl"; + license = licenses.lgpl2Only; + maintainers = with maintainers; []; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydbus/default.nix index 09f777b018..aa3a41e2f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydbus/default.nix @@ -15,6 +15,6 @@ buildPythonPackage rec { homepage = "https://github.com/LEW21/pydbus"; description = "Pythonic DBus library"; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ gnidorah ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydelijn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydelijn/default.nix new file mode 100644 index 0000000000..08a3bf8236 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydelijn/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytz +}: + +buildPythonPackage rec { + pname = "pydelijn"; + version = "0.6.1"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lwd2f043hy7gf1ly9zpaq1yg947bqw2af8vhwssf48zpisfgc81"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + pytz + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pydelijn" ]; + + meta = with lib; { + description = "Python package to retrieve realtime data of passages at stops of De Lijn"; + homepage = "https://github.com/bollewolle/pydelijn"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix index be3cddc7c1..2cb89812ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , isPy27 @@ -49,6 +50,9 @@ buildPythonPackage { # This test try to remove a dicom inside $HOME/.pydicom/data/ and download it again. disabledTests = [ "test_fetch_data_files" + ] ++ lib.optionals stdenv.isAarch64 [ + # https://github.com/pydicom/pydicom/issues/1386 + "test_array" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix index 7e09a21e36..29d6df409a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -30,7 +30,11 @@ buildPythonPackage rec { mock ]; - checkPhase = "nosetests"; + postPatch = '' + substituteInPlace setup.py --replace "xlrd<2" "xlrd<3" + ''; + + checkPhase = "nosetests --exclude test_issue_151"; meta = { description = "A wrapper library to read, manipulate and write data in xls using xlrd and xlwt"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix index 36980ddbad..075297794b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix @@ -12,16 +12,23 @@ buildPythonPackage rec { pname = "pyflume"; - version = "0.6.4"; + version = "0.7.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ChrisMandich"; repo = "PyFlume"; rev = "v${version}"; - sha256 = "1dm560hh6fl1waiwsq8m31apmvvwhc3y95bfdb7449bs8k96dmxq"; + sha256 = "129sz33a270v120bzl9l98nmvdzn7ns4cf9w2v18lmzlldbyz2vn"; }; + prePatch = '' + substituteInPlace setup.py --replace 'pyjwt==2.0.1' 'pyjwt>=2.0.1' + substituteInPlace setup.py --replace 'ratelimit==2.2.1' 'ratelimit>=2.2.1' + substituteInPlace setup.py --replace 'pytz==2019.2' 'pytz>=2019.2' + substituteInPlace setup.py --replace 'requests==2.24.0' 'requests>=2.24.0' + ''; + propagatedBuildInputs = [ pyjwt ratelimit @@ -34,6 +41,15 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + # https://github.com/ChrisMandich/PyFlume/issues/18 + substituteInPlace setup.py \ + --replace "pyjwt==2.0.1" "pyjwt>=2.0.1" \ + --replace "ratelimit==2.2.1" "ratelimit>=2.2.1" \ + --replace "pytz==2019.2" "pytz>=2019.2" \ + --replace "requests==2.24.0" "requests>=2.24.0" + ''; + pythonImportsCheck = [ "pyflume" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix index 33479cc66e..180f5902fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix @@ -1,22 +1,14 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, pkg-config, fuse3, trio, pytestCheckHook, pytest-trio, which }: +{ lib, buildPythonPackage, fetchPypi, pkg-config, fuse3, trio, pytestCheckHook, pytest-trio, which }: buildPythonPackage rec { pname = "pyfuse3"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "9feb42a8639dc4815522ee6af6f7221552cfd2df1c7a7e9df96767be65e18667"; + sha256 = "45f0053ad601b03a36e2c283a5271403674245a66a0daf50e3deaab0ea4fa82f"; }; - patches = [ - # Fixes tests with pytest 6, to be removed in next stable version - (fetchpatch { - url = "https://github.com/libfuse/pyfuse3/commit/0070eddfc33fc2fba8eb4fe9353a2d2fa1ae575b.patch"; - sha256 = "0lb4x1j31ihs3qkn61x41k2vqwcjl2fp1c2qx2jg9br6yqhjmg3b"; - }) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse3 ]; @@ -36,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python 3 bindings for libfuse 3 with async I/O support"; homepage = "https://github.com/libfuse/pyfuse3"; - license = licenses.gpl2; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ nyanloutre ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygatt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygatt/default.nix new file mode 100644 index 0000000000..9d596e1723 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygatt/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, nose +, pexpect +, pyserial +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pygatt"; + version = "4.0.5"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "peplin"; + repo = pname; + rev = "v${version}"; + sha256 = "1zdfxidiw0l8n498sy0l33n90lz49n25x889cx6jamjr7frlcihd"; + }; + + propagatedBuildInputs = [ + pexpect + pyserial + ]; + + checkInputs = [ + mock + nose + pytestCheckHook + ]; + + postPatch = '' + # Not support for Python < 3.4 + substituteInPlace setup.py --replace "'enum-compat'" "" + ''; + + pythonImportsCheck = [ "pygatt" ]; + + meta = with lib; { + description = "Python wrapper the BGAPI for accessing Bluetooth LE Devices"; + homepage = "https://github.com/peplin/pygatt"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygbm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygbm/default.nix index 0d2747c1cb..5367f622e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygbm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygbm/default.nix @@ -4,7 +4,7 @@ , scipy , numpy , numba -, scikitlearn +, scikit-learn , pytest , pythonOlder }: @@ -25,7 +25,7 @@ buildPythonPackage rec { scipy numpy numba - scikitlearn + scikit-learn ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix index 130be6d44c..804b33c2f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix @@ -2,12 +2,17 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub +, setuptools-scm , gmt , numpy , netcdf4 , pandas , packaging , xarray +, pytest-mpl +, ipython +, ghostscript +, pytestCheckHook }: buildPythonPackage rec { @@ -28,12 +33,14 @@ buildPythonPackage rec { --replace "env.get(\"GMT_LIBRARY_PATH\", \"\")" "env.get(\"GMT_LIBRARY_PATH\", \"${gmt}/lib\")" ''; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ numpy netcdf4 pandas packaging xarray ]; - doCheck = false; # requires network access - - postBuild = "export HOME=$TMP"; - + doCheck = false; # the *entire* test suite requires network access + checkInputs = [ pytestCheckHook pytest-mpl ghostscript ipython ]; + postBuild = '' + export HOME=$TMP + ''; pythonImportsCheck = [ "pygmt" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.36.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.36.nix index ccad57eba1..ce9410eaf8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.36.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.36.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection, -pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: +pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome }: buildPythonPackage rec { pname = "pygobject"; @@ -23,13 +23,6 @@ buildPythonPackage rec { ++ lib.optionals stdenv.isDarwin [ which ncurses ]; propagatedBuildInputs = [ pycairo cairo ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "python3.pkgs.${pname}3"; - }; - }; - meta = with lib; { homepage = "https://pygobject.readthedocs.io/"; description = "Python bindings for Glib"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix index 8c26ec6174..373577dc46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix @@ -1,37 +1,66 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection, -pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: +{ lib +, stdenv +, fetchurl +, buildPythonPackage +, pkg-config +, glib +, gobject-introspection +, pycairo +, cairo +, which +, ncurses +, meson +, ninja +, isPy3k +, gnome +}: buildPythonPackage rec { pname = "pygobject"; - version = "3.38.0"; + version = "3.40.1"; - disabled = ! isPy3k; + outputs = [ "out" "dev" ]; + + disabled = !isPy3k; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "A3LRu5Ei/Bn1AKJJsfOMK7Z0hQAPWIdJe0sgWz5whNU="; + sha256 = "0d80g5kgf2i9cginyhalvb7ibfk9g30yilqzmcsw6h6byj8xbih0"; }; - outputs = [ "out" "dev" ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + gobject-introspection + ]; - nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ]; - buildInputs = [ glib gobject-introspection ] - ++ lib.optionals stdenv.isDarwin [ which ncurses ]; - propagatedBuildInputs = [ pycairo cairo ]; + buildInputs = [ + glib + gobject-introspection + ] ++ lib.optionals stdenv.isDarwin [ + ncurses + ]; + + propagatedBuildInputs = [ + pycairo + cairo + ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "python3.pkgs.${pname}3"; + versionPolicy = "odd-unstable"; }; }; meta = with lib; { homepage = "https://pygobject.readthedocs.io/"; description = "Python bindings for Glib"; - license = licenses.gpl2; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix index ade4c01833..efc06ad0c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyhaversion"; - version = "21.3.0"; + version = "21.5.0"; # Only 3.8.0 and beyond are supported disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-2vW4BN5qwJZYQ8FU3bpSA2v1dX6TOhcHDbHRMDPoRAs="; + sha256 = "sha256-/F4UMFUs60o3QazfFYEWgTGHg4z5knzNWolUpk5SIeM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyialarm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyialarm/default.nix new file mode 100644 index 0000000000..6a35445fca --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyialarm/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, dicttoxml +, fetchFromGitHub +, pythonOlder +, xmltodict +}: + +buildPythonPackage rec { + pname = "pyialarm"; + version = "1.5"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "RyuzakiKK"; + repo = pname; + rev = "v${version}"; + sha256 = "0vpscc2h13mmwscvjpm0bfd80x94mzh4d204v6n421mdz3ddhjqp"; + }; + + propagatedBuildInputs = [ + dicttoxml + xmltodict + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pyialarm" ]; + + meta = with lib; { + description = "Python library to interface with Antifurto365 iAlarm systems"; + homepage = "https://github.com/RyuzakiKK/pyialarm"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyicu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyicu/default.nix index efb7467e48..1b01f1904e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyicu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyicu/default.nix @@ -3,20 +3,20 @@ , fetchPypi , pytestCheckHook , six -, icu +, icu68 }: buildPythonPackage rec { pname = "PyICU"; - version = "2.6"; + version = "2.7.3"; src = fetchPypi { inherit pname version; - sha256 = "0wb3v421i2fnnxdywam4ay8hqvnxlz0r2nrpx5lqy3rn6dlbz9d9"; + sha256 = "1jv1pds94agvn3zs33a8p8f0mk7f5pjwmczmg1s05ri5p0kzk4h8"; }; - nativeBuildInputs = [ icu ]; # for icu-config - buildInputs = [ icu ]; + nativeBuildInputs = [ icu68 ]; # for icu-config, but should be replaced with pkg-config + buildInputs = [ icu68 ]; checkInputs = [ pytestCheckHook six ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix index cfe5112ab2..be746ae279 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.0.10"; + version = "1.0.11"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-8b/PvMFHvYGVWw6ycLnL8n972cn+1QW/VTMiblMPam4="; + sha256 = "sha256-dT01nKXDjkFSIf2BmrIcC8a9n00hlyd59oPwXn1CBaw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/1.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/1.nix new file mode 100644 index 0000000000..285e5e2e76 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/1.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cryptography +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "PyJWT"; + version = "1.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "pytest>=4.0.1,<5.0.0" "pytest" + + # drop coverage + sed -i '/pytest-cov/d' setup.py + sed -i '/--cov/d' setup.cfg + ''; + + propagatedBuildInputs = [ + cryptography + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "JSON Web Token implementation in Python"; + homepage = "https://github.com/jpadilla/pyjwt"; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix index c33f2b0680..4617869988 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix @@ -1,28 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi -, cryptography, ecdsa -, pytestrunner, pytestcov, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, cryptography +, ecdsa +, pytest-cov +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - pname = "PyJWT"; - version = "2.0.1"; + pname = "pyjwt"; + version = "2.1.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "a5c70a06e1f33d81ef25eecd50d50bd30e34de1ca8b2b9fa3fe0daaabcf69bf7"; + pname = "PyJWT"; + inherit version; + sha256 = "sha256-+6ROeJi7yhYKKytQH0koJPyDgkhdOm8Rul0MGTfOYTA="; }; - propagatedBuildInputs = [ cryptography ecdsa ]; + propagatedBuildInputs = [ + cryptography + ecdsa + ]; - checkInputs = [ pytestrunner pytestcov pytest ]; + checkInputs = [ + pytest-cov + pytestCheckHook + ]; - postPatch = '' - substituteInPlace setup.py --replace "pytest>=4.0.1,<5.0.0" "pytest" - ''; - - # ecdsa changed internal behavior - checkPhase = '' - pytest tests -k 'not ec_verify_should_return_false_if_signature_invalid' - ''; + pythonImportsCheck = [ "jwt" ]; meta = with lib; { description = "JSON Web Token implementation in Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykdl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykdl/default.nix index 674a43f5f3..9a0431b2b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykdl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, toPythonModule, fetchpatch, cmake, orocos-kdl, python, sip }: +{ lib, stdenv, toPythonModule, fetchpatch, cmake, orocos-kdl, python, sip_4 }: toPythonModule (stdenv.mkDerivation { pname = "pykdl"; @@ -18,7 +18,7 @@ toPythonModule (stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ orocos-kdl ]; - propagatedBuildInputs = [ python sip ]; + propagatedBuildInputs = [ python sip_4 ]; meta = with lib; { description = "Kinematics and Dynamics Library (Python bindings)"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix index 13d7a4fd24..fd4c0088b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykerberos/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pykerberos"; - version = "1.2.1"; + version = "1.2.3.dev0"; src = fetchPypi { inherit pname version; - sha256 = "0v47p840myqgc7hr4lir72xshcfpa0w8j9n077h3njpqyn6wlbag"; + sha256 = "17zjiw6rqgfic32px86qls1i3z7anp15dgb3sprbdvywy98alryn"; }; nativeBuildInputs = [ krb5 ]; # for krb5-config @@ -15,6 +15,7 @@ buildPythonPackage rec { # there are no tests doCheck = false; + pythonImportsCheck = [ "kerberos" ]; meta = with lib; { description = "High-level interface to Kerberos"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykmtronic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykmtronic/default.nix index 7a055c1ed3..29a3f04e32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykmtronic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykmtronic/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pykmtronic"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "9d0301882f06a0c4865c89bb6c2a381c4a1ba6fe2a7a07d56351bdf5f96c9fa5"; + sha256 = "sha256-8qLyBJp7C93x0PWbgDAtNEDJ5VLNfwZ3DRZfudRCBgo="; }; propagatedBuildInputs = [ aiohttp lxml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykoplenti/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykoplenti/default.nix new file mode 100644 index 0000000000..98182ddf68 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykoplenti/default.nix @@ -0,0 +1,41 @@ +{ lib +, aiohttp +, buildPythonPackage +, click +, fetchFromGitHub +, prompt_toolkit +, pycryptodome +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pykoplenti"; + version = "1.0.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "stegm"; + repo = pname; + rev = "v${version}"; + sha256 = "12nsyz8a49vhby1jp991vaky82fm93jrgcsjzwa2rixwg1zql4sw"; + }; + + propagatedBuildInputs = [ + aiohttp + click + prompt_toolkit + pycryptodome + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pykoplenti" ]; + + meta = with lib; { + description = "Python REST client API for Kostal Plenticore Inverters"; + homepage = "https://github.com/stegm/pykoplenti/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix index b16ea62717..5a0a53005b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pylast"; - version = "4.2.0"; + version = "4.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-w/mkAUUgj7L7Xv+nz1pI1TYKfihH3S3MbxaNQ4VtoH0="; + sha256 = "sha256-R1enQk6luuBiobMPDn5x1SXx7zUI/5c8dPtyWkmG/18="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix index 54b2f65ad9..9d8b36c5ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.4.2"; + version = "2.4.3"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "0535y4sdi521a9s7di8ld0i8aav0afbxmx0956v6sjpyqmqdm6hr"; + sha256 = "1mybq9jynypxbaxj921s3sx8dph8n3hmipmv4nla1g9h07g9g02z"; }; propagatedBuildInputs = [ @@ -42,9 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Pylint plugin to analyze Django applications"; homepage = "https://github.com/PyCQA/pylint-django"; - license = licenses.gpl2; - maintainers = with maintainers; [ - kamadorueda - ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ kamadorueda ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix index e283cc10d1..64573a1a52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "A bug and style checker for Python"; platforms = platforms.all; license = licenses.gpl1Plus; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } 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 10935d2d88..6c2702ef3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { homepage = "https://pylint.pycqa.org/"; description = "A bug and style checker for Python"; license = licenses.gpl1Plus; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix index 2f39be7982..894e5c128e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python MAVLink interface and utilities"; homepage = "https://github.com/ArduPilot/pymavlink"; - license = with licenses; [ lgpl3Only mit ]; + license = with licenses; [ lgpl3Plus mit ]; maintainers = with maintainers; [ lopsided98 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymeteireann/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymeteireann/default.nix new file mode 100644 index 0000000000..7e48a4089a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymeteireann/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pytz +, xmltodict +}: + +buildPythonPackage rec { + pname = "pymeteireann"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "DylanGore"; + repo = "PyMetEireann"; + rev = version; + sha256 = "1904f8mvv4ghzbniswmdwyj5v71m6y3yn1b4grjvfds05skalm67"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + pytz + xmltodict + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "meteireann" ]; + + meta = with lib; { + description = "Python module to communicate with the Met Éireann Public Weather Forecast API"; + homepage = "https://github.com/DylanGore/PyMetEireann/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix index 9d524bfe94..46b60419ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "riptideio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b85jfBZfMZtqtmID+tGBgOe9o0BbmBH83UV71lYAI5c="; + sha256 = "sha256-jqVfBAjIdRBB5AYd0ZkMi7qAUR6vSYeBI4OYEv+mKwE="; }; # Twisted asynchronous version is not supported due to a missing dependency diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymorphy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymorphy2/default.nix new file mode 100644 index 0000000000..8c00975d08 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymorphy2/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchPypi +, buildPythonPackage +, isPy3k +, dawg-python +, docopt +, pymorphy2-dicts-ru +}: + +buildPythonPackage rec { + pname = "pymorphy2"; + version = "0.9.1"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + hash = "sha256-hsRHFX3uLrI0HvvkU44SgadUdWuhqjLad6iWFMWLVgw="; + }; + + propagatedBuildInputs = [ + dawg-python + docopt + pymorphy2-dicts-ru + ]; + + pythonImportsCheck = [ "pymorphy2" ]; + + meta = with lib; { + description = "Morphological analyzer/inflection engine for Russian and Ukrainian"; + homepage = "https://github.com/kmike/pymorphy2"; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymorphy2/dicts-ru.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymorphy2/dicts-ru.nix new file mode 100644 index 0000000000..bee9dd4924 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymorphy2/dicts-ru.nix @@ -0,0 +1,23 @@ +{ lib +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "pymorphy2-dicts-ru"; + version = "2.4.417127.4579844"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-eMrQOtymBQIavTh6Oy61FchRuG6UaCoe8jVKLHT8wZY="; + }; + + pythonImportsCheck = [ "pymorphy2_dicts_ru" ]; + + meta = with lib; { + description = "Russian dictionaries for pymorphy2"; + homepage = "https://github.com/kmike/pymorphy2-dicts/"; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix index 7ca7229338..f3b5b9ba68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, python3, cmake -, pythonOlder, libnest2d, sip, clipper }: +, pythonOlder, libnest2d, sip_4, clipper }: buildPythonPackage rec { version = "4.8.0"; @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "18dn92vgr4gvf9scfh93yg9bwrhdjvq62di08rpi7pqjrrvq2nvp"; }; - propagatedBuildInputs = [ libnest2d sip clipper ]; + propagatedBuildInputs = [ libnest2d sip_4 clipper ]; nativeBuildInputs = [ cmake ]; CLIPPER_PATH = "${clipper.out}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix new file mode 100644 index 0000000000..e81a4b8dd6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools-scm +, requests +, six +, pytestCheckHook +, pyyaml +}: + +buildPythonPackage rec { + pname = "pynetbox"; + version = "6.1.2"; + + src = fetchFromGitHub { + owner = "netbox-community"; + repo = pname; + rev = "v${version}"; + sha256 = "0di07rny3gqdfb0rf7hm3x03rpn7rydpv3lrl7cak2ccpqm0wzhl"; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + requests + six + ]; + + checkInputs = [ + pytestCheckHook + pyyaml + ]; + + disabledTestPaths = [ + # requires docker for integration test + "tests/integration" + ]; + + meta = with lib; { + description = "API client library for Netbox"; + homepage = "https://github.com/netbox-community/pynetbox"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix index 8cddeb8873..fa9db26b5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , nose -, scikitlearn +, scikit-learn , scipy , numba , llvmlite @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - scikitlearn + scikit-learn scipy numba llvmlite diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyobihai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyobihai/default.nix new file mode 100644 index 0000000000..79d8363372 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyobihai/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "pyobihai"; + version = "1.3.1"; + disabled = pythonOlder "3.6"; + + # GitHub release, https://github.com/dshokouhi/pyobihai/issues/10 + src = fetchPypi { + inherit pname version; + sha256 = "1vvf5if57dfd091a7fb5rvx63hvf0isrx28j72nj2aav1as460qp"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pyobihai" ]; + + meta = with lib; { + description = "Python package to interact with Obihai devices"; + homepage = "https://github.com/dshokouhi/pyobihai"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix index b1e81140a9..d983e2bc14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchPypi , buildPythonPackage , Mako @@ -12,14 +13,18 @@ , opencl-headers , ocl-icd , pybind11 +, mesa_drivers }: -buildPythonPackage rec { +let + os-specific-buildInputs = + if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; +in buildPythonPackage rec { pname = "pyopencl"; version = "2021.1.4"; checkInputs = [ pytest ]; - buildInputs = [ opencl-headers ocl-icd pybind11 ]; + buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix index d7f15d966b..d371fd7bce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, packaging, sip_5 }: +{ lib, fetchPypi, buildPythonPackage, packaging, sip }: buildPythonPackage rec { pname = "pyqt-builder"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0g51yak53zzjs4gpq65i01cmpz7w8cjny9wfyxlgr2vi0wag107v"; }; - propagatedBuildInputs = [ packaging sip_5 ]; + propagatedBuildInputs = [ packaging sip ]; pythonImportsCheck = [ "pyqtbuild" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix index 3427438b8a..2652b5eb00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkg-config, lndir, dbus, makeWrapper }: +{ lib, stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip_4, qt4, pkg-config, lndir, dbus, makeWrapper }: buildPythonPackage rec { pname = "PyQt-x11-gpl"; - version = "4.12"; + version = "4.12.3"; format = "other"; src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt4_gpl_x11-${version}.tar.gz"; - sha256 = "1nw8r88a5g2d550yvklawlvns8gd5slw53yy688kxnsa65aln79w"; + sha256 = "0wnlasg62rm5d39nq1yw4namcx2ivxgzl93r5f2vb9s0yaz5l3x0"; }; postPatch = '' @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config lndir makeWrapper qt4 ]; buildInputs = [ qt4 dbus ]; - propagatedBuildInputs = [ sip ]; + propagatedBuildInputs = [ sip_4 ]; postInstall = '' for i in $out/bin/*; do diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix index 6e4b4d37f2..2671b27a63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix @@ -16,9 +16,9 @@ let inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34; sip = if isPy3k then - pythonPackages.sip_5 + pythonPackages.sip else - (pythonPackages.sip.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: { + (pythonPackages.sip_4.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: { # If we install sip in another folder, then we need to create a __init__.py as well # if we want to be able to import it with Python 2. # Python 3 could rely on it being an implicit namespace package, however, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmf/default.nix index 25f5fc6a20..3b350954ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmf/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }: +{ lib, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest, cython }: buildPythonPackage rec { pname = "pysmf"; @@ -9,13 +9,17 @@ buildPythonPackage rec { sha256 = "10i7vvvdx6c3gl4afsgnpdanwgzzag087zs0fxvfipnqknazj806"; }; - nativeBuildInputs = [ pkg-config pytest ]; + postUnpack = '' + rm $sourceRoot/src/smf.c + ''; + + nativeBuildInputs = [ pkg-config pytest cython ]; buildInputs = [ libsmf glib ]; meta = with lib; { homepage = "http://das.nasophon.de/pysmf/"; description = "Python extension module for reading and writing Standard MIDI Files, based on libsmf."; license = licenses.bsd2; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix index 3219bd53ac..05411e0d7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.44"; + version = "0.0.49"; disabled = !isPy3k; @@ -23,10 +23,14 @@ buildPythonPackage rec { owner = "amelchio"; repo = pname; rev = "v${version}"; - sha256 = "108818mkb037zs4ikilrskfppcbmqslsm6zaxmy8pphjh7c299mz"; + sha256 = "sha256-f8MBf2E7kHzvdt7oBwdJZ91jlU6I5np1FhOmxgxbqYw="; }; - propagatedBuildInputs = [ ifaddr requests xmltodict ]; + propagatedBuildInputs = [ + ifaddr + requests + xmltodict + ]; checkInputs = [ pytestCheckHook @@ -38,10 +42,10 @@ buildPythonPackage rec { "test_desc_from_uri" # test requires network access ]; - meta = { - homepage = "https://github.com/amelchio/pysonos"; + meta = with lib; { description = "A SoCo fork with fixes for Home Assistant"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ juaningan ]; + homepage = "https://github.com/amelchio/pysonos"; + license = licenses.mit; + maintainers = with maintainers; [ juaningan ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix index 9b778f9e21..45bc2a55e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub -, pillow, xlib, six, xvfb_run, sphinx }: +, pillow, xlib, six, xvfb-run, sphinx }: buildPythonPackage rec { pname = "pystray"; @@ -14,7 +14,7 @@ buildPythonPackage rec { nativeBuildInputs = [ sphinx ]; propagatedBuildInputs = [ pillow xlib six ]; - checkInputs = [ xvfb_run ]; + checkInputs = [ xvfb-run ]; checkPhase = '' rm tests/icon_tests.py # test needs user input diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysvg-py3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysvg-py3/default.nix new file mode 100644 index 0000000000..6f9ba79613 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysvg-py3/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, python +}: + +buildPythonPackage rec { + pname = "pysvg-py3"; + version = "0.2.2-post3"; + + src = fetchFromGitHub { + owner = "alorence"; + repo = pname; + rev = version; + sha256 = "1slync0knpcjgl4xpym8w4249iy6vmrwbarpnbjzn9xca8g1h2f0"; + }; + + checkPhase = '' + runHook preCheck + mkdir testoutput + ${python.interpreter} sample/tutorial.py + runHook postCheck + ''; + + pythonImportsCheck = [ "pysvg" ]; + + meta = { + homepage = "https://github.com/alorence/pysvg-py3"; + description = "Creating SVG with Python"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ davidak ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix index 9155151950..bf17988e75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix @@ -3,56 +3,35 @@ , fetchFromGitHub , taglib , cython -, pytest -, glibcLocales -, fetchpatch +, pytestCheckHook }: buildPythonPackage rec { - pname = "pytaglib"; - version = "1.4.5"; + pname = "pytaglib"; + version = "1.4.6"; src = fetchFromGitHub { owner = "supermihi"; repo = pname; rev = "v${version}"; - sha256 = "1gvvadlgk8ny8bg76gwvvfcwp1nfgrjphi60h5f9ha7h5ff1g2wb"; + sha256 = "sha256-UAWXR1MCxEB48n7oQE+L545F+emlU3HErzLX6YTRteg="; }; - patches = [ - # fix tests on python 2.7 - (fetchpatch { - url = "https://github.com/supermihi/pytaglib/commit/0c4ae750fcd5b18d2553975c7e3e183e9dca5bf1.patch"; - sha256 = "1kv3c68vimx5dc8aacvzphiaq916avmprxddi38wji8p2ql6vngj"; - }) - - # properly install pyprinttags - (fetchpatch { - url = "https://github.com/supermihi/pytaglib/commit/ba7a1406ddf35ddc41ed57f1c8d1f2bc2ed2c93a.patch"; - sha256 = "0pi0dcq7db5fd3jnbwnfsfsgxvlhnm07z5yhpp93shk0s7ci2bwp"; - }) - (fetchpatch { - url = "https://github.com/supermihi/pytaglib/commit/28772f6f94d37f05728071381a0fa04c6a14783a.patch"; - sha256 = "0h259vzj1l0gpibdf322yclyd10x5rh1anzhsjj2ghm6rj6q0r0m"; - }) + buildInputs = [ + cython + taglib ]; - postPatch = '' - substituteInPlace setup.py --replace "'pytest-runner', " "" - ''; + checkInputs = [ + pytestCheckHook + ]; - buildInputs = [ taglib cython ]; + pythonImportsCheck = [ "taglib" ]; - checkInputs = [ pytest glibcLocales ]; - - checkPhase = '' - LC_ALL=en_US.utf-8 pytest . - ''; - - meta = { + meta = with lib; { + description = "Python bindings for the Taglib audio metadata library"; homepage = "https://github.com/supermihi/pytaglib"; - description = "Python 2.x/3.x bindings for the Taglib audio metadata library"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.mrkkrp ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mrkkrp ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix index 68b67f061b..22b57f9e77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { + broken = true; # unmaintained and incompatible with pytest>=6.0 homepage = "https://github.com/kensho-technologies/pytest-annotate"; description = "Generate PyAnnotate annotations from your pytest tests"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix index e71b3e7350..b087cd6f45 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch , execnet , glob2 , Mako @@ -7,29 +7,38 @@ , parse-type , py , pytest +, pytestCheckHook , six }: buildPythonPackage rec { pname = "pytest-bdd"; - version = "4.0.1"; + version = "4.0.2"; # tests are not included in pypi tarball src = fetchFromGitHub { owner = "pytest-dev"; repo = pname; rev = version; - sha256 = "1yqzz44as4pxffmg4hk9lijvnvlc2chg1maq1fbj5i4k4jpagvjz"; + sha256 = "0pxx4c8lm68rw0jshbr09fnadg8zz8j73q0qi49yw9s7yw86bg5l"; }; + patches = [ + # Fixed compatibility with pytest > 6.1 + (fetchpatch { + url = "https://github.com/pytest-dev/pytest-bdd/commit/e1dc0cad9a1c1ba563ccfbc24f9993d83ac59293.patch"; + sha256 = "1p3gavh6nir2a8crd5wdf0prfrg0hmgar9slvn8a21ils3k5pm5y"; + }) + ]; + + buildInputs = [ pytest ]; propagatedBuildInputs = [ glob2 Mako parse parse-type py six ]; - # Tests require extra dependencies - checkInputs = [ execnet mock pytest ]; - checkPhase = '' - PATH=$PATH:$out/bin pytest + checkInputs = [ pytestCheckHook execnet mock ]; + preCheck = '' + export PATH=$PATH:$out/bin ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix new file mode 100644 index 0000000000..2914b3cf9a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, makefun +, decopatch +, pythonOlder +, pytest +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pytest-cases"; + version = "3.4.6"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "17w4s6622i97q81g15zamqm536ib00grgdfk2f4kk9bw2k7sdlq6"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + decopatch + makefun + ]; + + postPatch = '' + substituteInPlace setup.cfg --replace "pytest-runner" "" + ''; + + # Tests have dependencies (pytest-harvest, pytest-steps) which + # are not available in Nixpkgs. Most of the packages (decopatch, + # makefun, pytest-*) have circular dependecies. + doCheck = false; + + pythonImportsCheck = [ "pytest_cases" ]; + + meta = with lib; { + description = "Separate test code from test cases in pytest"; + homepage = "https://github.com/smarie/python-pytest-cases"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix index 335846fc34..2b1ab664a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -4,7 +4,9 @@ , isPy27 , six , pytest +, pytestCheckHook , numpy +, setuptools_scm }: buildPythonPackage rec { @@ -17,7 +19,12 @@ buildPythonPackage rec { sha256 = "6fe747418461d7b202824a3486ba8f4fa17a9bd0b1eddc743ba1d6d87f03391a"; }; - buildInputs = [ pytest ]; + nativeBuildInputs = [ + setuptools_scm + ]; + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ six @@ -25,14 +32,9 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook ]; - # check_distribution incorrectly pulls pytest version - checkPhase = '' - pytest -k 'not check_distribution' - ''; - meta = with lib; { description = "Pytest plugin with advanced doctest features"; homepage = "https://astropy.org"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix index d6f30486f9..1773a4b579 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Colin-b"; repo = "pytest_httpx"; rev = "v${version}"; - sha256 = "08idd3y6khxjqkn46diqvkjvsl4w4pxhl6z1hspbkrj0pqwf9isi"; + sha256 = "sha256-Awhsm8jmoCZTBnfrrauLxAEKtpxTzjPMXmx7HR0f/g4="; }; buildInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/2.nix index 3764a05af0..d474d281a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/2.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Thin-wrapper around the mock package for easier use with py.test."; homepage = "https://github.com/pytest-dev/pytest-mock"; license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix index 3e044b4fe5..a39e2e716e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Thin-wrapper around the mock package for easier use with pytest"; homepage = "https://github.com/pytest-dev/pytest-mock"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-ordering/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ordering/default.nix index 6cd1ed2279..c5e8a786b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-ordering/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ordering/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { homepage = "https://github.com/ftobia/pytest-ordering"; description = "Pytest plugin to run your tests in a specific order"; license = licenses.mit; + broken = true; # See https://github.com/NixOS/nixpkgs/pull/122264 maintainers = with maintainers; [ eadwu ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix new file mode 100644 index 0000000000..90b72c886e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, pythonOlder +, matplotlib +, numpy +, pandas +, pillow +, pytest +, pytest-datadir +, pytestCheckHook +, pyyaml +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pytest-regressions"; + version = "2.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "15a71f77cb266dd4ca94331abe4c339ad056b2b2175e47442711c98cf6d65716"; + }; + + patches = [ + # Make pytest-regressions compatible with NumPy 1.20. + # Should be part of the next release. + (fetchpatch { + url = "https://github.com/ESSS/pytest-regressions/commit/ffad2c7fd1d110f420f4e3ca3d39d90cae18a972.patch"; + sha256 = "sha256-bUna7MnMV6u9oEaZMsFnr4gE28rz/c0O2+Hyk291+l0="; + }) + ]; + + nativeBuildInputs = [ setuptools-scm ]; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ numpy pandas pillow pytest-datadir pyyaml ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + checkInputs = [ pytestCheckHook matplotlib ]; + pythonImportsCheck = [ "pytest_regressions" "pytest_regressions.plugin" ]; + + meta = with lib; { + description = "Pytest fixtures to write regression tests"; + longDescription = '' + pytest-regressions makes it simple to test general data, images, + files, and numeric tables by saving expected data in a data + directory (courtesy of pytest-datadir) that can be used to verify + that future runs produce the same data. + ''; + homepage = "https://github.com/ESSS/pytest-regressions"; + license = licenses.mit; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix index ca3c9a37c1..7de68cadbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Extensible server fixures for py.test"; homepage = "https://github.com/manahl/pytest-plugins"; license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-binance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-binance/default.nix index aea47c7b9e..cd1e09557e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-binance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-binance/default.nix @@ -1,25 +1,55 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, requests-mock, tox -, autobahn, certifi, chardet, cryptography, dateparser, pyopenssl, requests, service-identity, twisted }: +{ lib +, aiohttp +, buildPythonPackage +, dateparser +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +, six +, ujson +, websockets +}: buildPythonPackage rec { - version = "0.7.9"; pname = "python-binance"; + version = "1.0.10"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "476459d91f6cfe0a37ccac38911643ea6cca632499ad8682e0957a075f73d239"; + src = fetchFromGitHub { + owner = "sammchardy"; + repo = pname; + rev = "v${version}"; + sha256 = "09pq2blvky1ah4k8yc6zkp2g5nkn3awc52ad3lxvj6m33akfzxiv"; }; - doCheck = false; # Tries to test multiple interpreters with tox - checkInputs = [ pytest requests-mock tox ]; + propagatedBuildInputs = [ + aiohttp + dateparser + requests + six + ujson + websockets + ]; - propagatedBuildInputs = [ autobahn certifi chardet cryptography dateparser pyopenssl requests service-identity twisted ]; + checkInputs = [ + pytestCheckHook + requests-mock + ]; - meta = { + disabledTestPaths = [ + # Tests require network access + "tests/test_api_request.py" + "tests/test_historical_klines.py" + ]; + + pythonImportsCheck = [ "binance" ]; + + meta = with lib; { description = "Binance Exchange API python implementation for automated trading"; homepage = "https://github.com/sammchardy/python-binance"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.bhipple ]; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/3.nix index e4c71782f9..5deeec0bb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/3.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/3.nix @@ -13,6 +13,7 @@ , websocket_client , websockets , pytestCheckHook +, pythonAtLeast }: buildPythonPackage rec { @@ -63,5 +64,6 @@ buildPythonPackage rec { homepage = "https://github.com/miguelgrinberg/python-engineio/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ graham33 ]; + broken = stdenv.isDarwin && (pythonAtLeast "3.9"); # See https://github.com/miguelgrinberg/python-socketio/issues/567 }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-fontconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-fontconfig/default.nix index 88778ff794..4aabb208a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-fontconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-fontconfig/default.nix @@ -29,6 +29,6 @@ in buildPythonPackage rec { homepage = "https://github.com/Vayn/python-fontconfig"; description = "Python binding for Fontconfig"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ gnidorah ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix index 36c297358e..b1b0c70d86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix @@ -35,10 +35,16 @@ in buildPythonPackage rec { export BOOST_PYTHON_LIB="boost_python${pythonVersion}" export BOOST_THREAD_LIB="boost_thread" export BOOST_SYSTEM_LIB="boost_system" + export PYCAIRO=true ''; nativeBuildInputs = [ mapnik # for mapnik_config + pkgs.pkgconfig + ]; + + patches = [ + ./find-pycairo-with-pkg-config.patch ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/find-pycairo-with-pkg-config.patch b/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/find-pycairo-with-pkg-config.patch new file mode 100644 index 0000000000..1f35af36ee --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/find-pycairo-with-pkg-config.patch @@ -0,0 +1,18 @@ +diff --git a/setup.py b/setup.py +index 82a31d733..1c876a553 100755 +--- a/setup.py ++++ b/setup.py +@@ -228,10 +228,9 @@ extra_comp_args = list(filter(lambda arg: arg != "-fvisibility=hidden", extra_co + if os.environ.get("PYCAIRO", "false") == "true": + try: + extra_comp_args.append('-DHAVE_PYCAIRO') +- print("-I%s/include/pycairo".format(sys.exec_prefix)) +- extra_comp_args.append("-I{0}/include/pycairo".format(sys.exec_prefix)) +- #extra_comp_args.extend(check_output(["pkg-config", '--cflags', 'pycairo']).strip().split(' ')) +- #linkflags.extend(check_output(["pkg-config", '--libs', 'pycairo']).strip().split(' ')) ++ pycairo_name = 'py3cairo' if PYTHON3 else 'pycairo' ++ extra_comp_args.extend(check_output(["pkg-config", '--cflags', pycairo_name]).strip().split(' ')) ++ linkflags.extend(check_output(["pkg-config", '--libs', pycairo_name]).strip().split(' ')) + except: + raise Exception("Failed to find compiler options for pycairo") + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix index 1d9025a035..2374c6797f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix @@ -24,20 +24,19 @@ buildPythonPackage rec { pname = "python-miio"; - version = "0.5.5.2"; + version = "0.5.6"; disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lk7egCyj+vSsaXmxuWxlQuom8n3JEs/RIWwCuwTOXeI="; + sha256 = "sha256-tmGt50xBDV++/pqyXsuxHdrwv+XbkjvtrzsYBzQh7zE="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace 'croniter = "^0"' 'croniter = "*"' \ - --replace 'defusedxml = "^0.6"' 'defusedxml = "*"' \ - --replace 'zeroconf = "^0.28"' 'zeroconf = "*"' + --replace 'defusedxml = "^0.6"' 'defusedxml = "*"' ''; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix index 7a53e73b2b..49113dfad5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , redis -, pytest +, pytestCheckHook , process-tests , pkgs , withDjango ? false, django_redis @@ -17,15 +17,20 @@ buildPythonPackage rec { sha256 = "4265a476e39d476a8acf5c2766485c44c75f3a1bd6cf73bb195f3079153b8374"; }; - checkInputs = [ pytest process-tests pkgs.redis ]; + propagatedBuildInputs = [ + redis + ] ++ lib.optional withDjango django_redis; - checkPhase = '' - pytest tests/ - ''; - - propagatedBuildInputs = [ redis ] - ++ lib.optional withDjango django_redis; + checkInputs = [ + pytestCheckHook + process-tests + pkgs.redis + ]; + disabledTests = [ + # https://github.com/ionelmc/python-redis-lock/issues/86 + "test_no_overlap2" + ]; meta = with lib; { homepage = "https://github.com/ionelmc/python-redis-lock"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix index 904437bdcf..1a7974ecd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix @@ -1,5 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi -, unzip }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "python-simple-hipchat"; @@ -10,8 +9,6 @@ buildPythonPackage rec { sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav"; }; - nativeBuildInputs = [ unzip ]; - meta = with lib; { description = "Easy peasy wrapper for HipChat's v1 API"; homepage = "https://github.com/kurttheviking/simple-hipchat-py"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-snap7/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-snap7/default.nix index 05d804bc67..b494d2e442 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-snap7/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-snap7/default.nix @@ -24,7 +24,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "snap7" - "snap7.six" "snap7.util" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix new file mode 100644 index 0000000000..dcf2688082 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, trio, curio, async-timeout, fetchPypi, pythonOlder }: + +buildPythonPackage rec { + pname = "python-socks"; + version = "1.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1n6xb18jy41ybgkmamakg6psp3qididd45qknxiggngaiibz43kx"; + }; + + disabled = pythonOlder "3.6.1"; + + propagatedBuildInputs = [ trio curio async-timeout ]; + + meta = with lib; { + description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python"; + homepage = "https://github.com/romis2012/python-socks"; + license = licenses.asl20; + maintainers = with maintainers; [ mjlbach ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix index b5155fd4bb..7fc92a2236 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "13.4.1"; + version = "13.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "141w3701jjl460702xddqvi3hswp24jnkl6cakvz2aqrmcyxq7sc"; + sha256 = "sha256-g9v0zUYyf9gYu2ZV8lCAJKCt5o69s1RNo1xGmtwjvds="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix index bdf09fdf2c..a310736c74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix @@ -3,8 +3,7 @@ , docutils , fetchFromGitHub , isPy27 -, nose -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -21,7 +20,13 @@ buildPythonPackage rec { checkInputs = [ docutils - pytest + pytestCheckHook + ]; + + disabledTestPaths = [ + # file imports 'dummy_threading', which was deprecated since py37 + # and removed in py39 + "test_python_toolbox/test_cute_profile/test_cute_profile.py" ]; meta = with lib; { 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 6f83f587f5..2690f8ea7e 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 @@ -8,30 +8,33 @@ buildPythonPackage rec { pname = "python-vlc"; - version = "3.0.11115"; + version = "3.0.12118"; src = fetchPypi { inherit pname version; - sha256 = "a4d3bdddfce84a8fb1b2d5447193a0239c55c16ca246e5194d48efd59c4e236b"; + hash = "sha256-Vm8vfDA/aACFHKzAFt8cbu7AlK1j4KSdh9udaYCU8fs="; }; - propagatedBuildInputs = [ - setuptools - ]; - patches = [ + # Patch path for VLC (substituteAll { src = ./vlc-paths.patch; libvlcPath="${libvlc}/lib/libvlc.so.5"; }) ]; + propagatedBuildInputs = [ + setuptools + ]; + doCheck = false; # no tests + pythonImportsCheck = [ "vlc" ]; + meta = with lib; { - homepage = "https://wiki.videolan.org/PythonBinding"; - maintainers = with maintainers; [ tbenst ]; description = "Python bindings for VLC, the cross-platform multimedia player and framework"; + homepage = "https://wiki.videolan.org/PythonBinding"; license = licenses.lgpl21Plus; + maintainers = with maintainers; [ tbenst ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix index d0054f7076..7387d387db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix @@ -2,8 +2,7 @@ , fetchPypi , fetchNuGet , buildPythonPackage -, python -, pytest +, pytestCheckHook , pycparser , psutil , pkg-config @@ -15,29 +14,36 @@ let - UnmanagedExports127 = fetchNuGet { - baseName = "UnmanagedExports"; - version = "1.2.7"; - sha256 = "0bfrhpmq556p0swd9ssapw4f2aafmgp930jgf00sy89hzg2bfijf"; - outputFiles = [ "*" ]; - }; - - NUnit371 = fetchNuGet { - baseName = "NUnit"; - version = "3.7.1"; - sha256 = "1yc6dwaam4w2ss1193v735nnl79id78yswmpvmjr1w4bgcbdza4l"; - outputFiles = [ "*" ]; - }; + dotnetPkgs = [ + (fetchNuGet { + baseName = "UnmanagedExports"; + version = "1.2.7"; + sha256 = "0bfrhpmq556p0swd9ssapw4f2aafmgp930jgf00sy89hzg2bfijf"; + outputFiles = [ "*" ]; + }) + (fetchNuGet { + baseName = "NUnit"; + version = "3.12.0"; + sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; + outputFiles = [ "*" ]; + }) + (fetchNuGet { + baseName = "System.ValueTuple"; + version = "4.5.0"; + sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; + outputFiles = [ "*" ]; + }) + ]; in buildPythonPackage rec { pname = "pythonnet"; - version = "2.4.0"; + version = "2.5.2"; src = fetchPypi { inherit pname version; - sha256 = "1ach9jic7a9rd3vmc4bphkr9fq01a0qk81f8a7gr9npwzmkqx8x3"; + sha256 = "1qzdc6jd7i9j7p6bcihnr98y005gv1358xqdr1plpbpnl6078a5p"; }; postPatch = '' @@ -50,7 +56,6 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - pytest pycparser pkg-config @@ -59,13 +64,15 @@ buildPythonPackage rec { mono - NUnit371 - UnmanagedExports127 - ]; + ] ++ dotnetPkgs; buildInputs = [ glib mono + ]; + + checkInputs = [ + pytestCheckHook psutil # needed for memory leak tests ]; @@ -73,22 +80,21 @@ buildPythonPackage rec { rm -rf packages mkdir packages - ln -s ${NUnit371}/lib/dotnet/NUnit/ packages/NUnit.3.7.1 - ln -s ${UnmanagedExports127}/lib/dotnet/NUnit/ packages/UnmanagedExports.1.2.7 + ${builtins.concatStringsSep "\n" ( + builtins.map ( + x: ''ln -s ${x}/lib/dotnet/${x.baseName} ./packages/${x.baseName}.${x.version}'' + ) dotnetPkgs)} # Setting TERM=xterm fixes an issue with terminfo in mono: System.Exception: Magic number is wrong: 542 export TERM=xterm ''; - checkPhase = '' - ${python.interpreter} -m pytest - ''; - meta = with lib; { description = ".Net and Mono integration for Python"; homepage = "https://pythonnet.github.io"; license = licenses.mit; + # + badPlatforms = [ "aarch64-linux" ]; maintainers = with maintainers; [ jraygauthier ]; - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytomlpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytomlpp/default.nix new file mode 100644 index 0000000000..19edd7057e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytomlpp/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pybind11 +, pytestCheckHook +, dateutil +, doxygen +, python +, pelican +, matplotlib +}: + +buildPythonPackage rec { + pname = "pytomlpp"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "bobfang1992"; + repo = pname; + rev = version; + fetchSubmodules = true; + sha256 = "1h06a2r0f5q4mml485113mn7a7585zmhqsk2p1apcybyydllcqda"; + }; + + buildInputs = [ pybind11 ]; + + checkInputs = [ + pytestCheckHook + + dateutil + doxygen + python + pelican + matplotlib + ]; + + # pelican requires > 2.7 + doCheck = !pythonOlder "3.6"; + + preCheck = '' + cd tests + ''; + + pythonImportsCheck = [ "pytomlpp" ]; + + meta = with lib; { + description = "A python wrapper for tomlplusplus"; + homepage = "https://github.com/bobfang1992/pytomlpp"; + license = licenses.mit; + maintainers = with maintainers; [ evils ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 285602bce4..e340d5eefa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , isPy27 , numpy -, scikitlearn +, scikit-learn , pytestCheckHook , pytorch , torchvision @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy pytorch - scikitlearn + scikit-learn torchvision tqdm ]; @@ -41,10 +41,16 @@ buildPythonPackage rec { disabledTests = [ # requires FAISS (not in Nixpkgs) "test_accuracy_calculator_and_faiss" + "test_global_embedding_space_tester" + "test_with_same_parent_label_tester" # require network access: "test_get_nearest_neighbors" "test_tuplestoweights_sampler" "test_untrained_indexer" + "test_metric_loss_only" + "test_pca" + # flaky + "test_distributed_classifier_loss_and_miner" ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix index 1880a0e2bf..41af9502c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix @@ -18,7 +18,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "1.8.0"; + version = "1.8.1"; in buildPythonPackage { inherit version; @@ -64,6 +64,7 @@ in buildPythonPackage { meta = with lib; { description = "Open source, prototype-to-production deep learning platform"; homepage = "https://pytorch.org/"; + changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}"; license = licenses.unfree; # Includes CUDA and Intel MKL. platforms = platforms.linux; maintainers = with maintainers; [ danieldk ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix index bc83859703..4855d13571 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -1,14 +1,17 @@ version: { x86_64-linux-37 = { - url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-bs29RJS0vy0xok3fvf8yvZlTibyGYqRUvUDT6M4gKQc="; + name = "torch-${version}-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-lxj066PiB+S88GqQnXKgd9RCiKkMk3mctx/eBieZjAk="; }; x86_64-linux-38 = { - url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-+h45HMo5N9Xeox8xoagKAb1KgGLAOUSMJUu/WljrB4c="; + name = "torch-${version}-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-qvTQMLz4CQPgalzUyYwz6rm+ExyWlIzI+FSMQhxM4eM="; }; x86_64-linux-39 = { - url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-Ixj6yGCuc9xkhsDeIiNnTZ72E5/HXxV68r+Nzk/KVSQ="; + name = "torch-${version}-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-z0pzEiljU+E2x2SuOEAg86dmVY1iFZSDOCfoOAFhLQo="; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytube/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytube/default.nix index 8bcfa8b6c7..dd6ece2163 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytube/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "10.7.2"; + version = "10.8.1"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - sha256 = "sha256-85pHzfQYyqwX8mQ5msIojM/0FSfeaC12KJw4mXmji3g="; + sha256 = "sha256-QPYu6UA0CEf/FSFoN+OfjhbDgkrMOjxaxNpFcDQzAz0="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix index 8cd250f6e0..93fd8403be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.12.0"; + version = "2.16.0"; disabled = isPy27; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pAZszyv7jXEwtQYzEk5Zq2ULP0K2vX0y6IvR6wYsJ9c="; + sha256 = "sha256-U1Ak0oGy0FxBMqRM2A3N7VuNDz2aUW4FFW+hKKhjfdk="; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix index 393170cfb9..1146fe892f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "1.3.1"; + version = "1.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "02fpbyg46mlpc2c1j4zylw9a1h6bacxvigrl3cndsf6fxlhfx15z"; + sha256 = "sha256-xvHvZx22orJR94cRMyyXey27Ksh2/ULHRvv7xxXv11k="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index 310170d040..618dfef417 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { preBuild = '' export CC=${stdenv.cc.targetPrefix}cc + substituteInPlace pyvex_c/Makefile --replace 'AR=ar' 'AR=${stdenv.cc.targetPrefix}ar' ''; # No tests are available on PyPI, GitHub release has tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix index a020517dcc..e750f234fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix @@ -6,7 +6,7 @@ , pytest , pythonOlder , qt5 -, xvfb_run +, xvfb-run }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { checkInputs = [ pytest - xvfb_run + xvfb-run ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxb/default.nix new file mode 100644 index 0000000000..3be79736e5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxb/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + pname = "PyXB"; + version = "1.2.6"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "1d17pyixbfvjyi2lb0cfp0ch8wwdf44mmg3r5pwqhyyqs66z601a"; + }; + + pythonImportsCheck = [ + "pyxb" + ]; + + # tests don't complete + # https://github.com/pabigot/pyxb/issues/130 + doCheck = false; + + meta = with lib; { + description = "Python XML Schema Bindings"; + homepage = "https://github.com/pabigot/pyxb"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix index 87f6b9756e..a72b460377 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix @@ -5,6 +5,7 @@ , nose , lxml , requests +, six }: buildPythonPackage rec { @@ -17,7 +18,11 @@ buildPythonPackage rec { sha256 = "22524120d744b50d25ef6bfc7052637e4ead9e2afac92563231ec89848f5adf5"; }; - propagatedBuildInputs = [ lxml requests ]; + propagatedBuildInputs = [ + lxml + requests + six + ]; # future is not used, and pathlib is installed part of python38+ # w/o an external package diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix index b1cdd7f523..3233e435f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -14,7 +14,7 @@ , qiskit-ignis , qiskit-terra , quandl -, scikitlearn +, scikit-learn , yfinance # Optional inputs , withTorch ? false @@ -59,7 +59,7 @@ buildPythonPackage rec { qiskit-terra qiskit-ignis quandl - scikitlearn + scikit-learn yfinance ] ++ lib.optionals (withTorch) [ pytorch ] ++ lib.optionals (withPyscf) [ pyscf ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix index 403fa0f05a..996259f683 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -5,7 +5,7 @@ , python , numpy , qiskit-terra -, scikitlearn +, scikit-learn , scipy # Optional package inputs , withVisualization ? false @@ -44,7 +44,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy qiskit-terra - scikitlearn + scikit-learn scipy ] ++ lib.optionals (withCvx) [ cvxpy ] ++ lib.optionals (withVisualization) [ matplotlib ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix index dcbe213966..05c12c1c62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -10,7 +10,7 @@ buildPythonPackage { src = qscintilla.src; format = "other"; - nativeBuildInputs = [ sip qtbase ]; + nativeBuildInputs = [ sip_4 qtbase ]; buildInputs = [ qscintilla ]; propagatedBuildInputs = [ pyqt5 ]; @@ -40,7 +40,7 @@ buildPythonPackage { --qsci-libdir=${qscintilla}/lib \ --pyqt-sipdir=${pyqt5}/share/sip/PyQt5 \ --qsci-sipdir=$out/share/sip/PyQt5 \ - --sip-incdir=${sip}/include + --sip-incdir=${sip_4}/include ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/radio_beam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/radio_beam/default.nix index f1f3200bb7..58137e3adb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/radio_beam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/radio_beam/default.nix @@ -2,9 +2,8 @@ , fetchPypi , buildPythonPackage , astropy -, pytest -, pytest-astropy -, astropy-helpers +, pytestCheckHook +, pytest-doctestplus , scipy }: @@ -13,25 +12,18 @@ buildPythonPackage rec { version = "0.3.3"; src = fetchPypi { - inherit pname version; + inherit version; + pname = "radio-beam"; sha256 = "e34902d91713ccab9f450b9d3e82317e292cf46a30bd42f9ad3c9a0519fcddcd"; }; propagatedBuildInputs = [ astropy ]; - nativeBuildInputs = [ astropy-helpers ]; - - # Disable automatic update of the astropy-helper module - postPatch = '' - substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" - ''; - - checkInputs = [ pytest pytest-astropy scipy ]; + checkInputs = [ pytestCheckHook pytest-doctestplus scipy ]; # Tests must be run in the build directory - checkPhase = '' + preCheck = '' cd build/lib - pytest ''; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ramlfications/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ramlfications/default.nix index c3ae88d177..081a3a2857 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ramlfications/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ramlfications/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { description = "A Python RAML parser."; homepage = "https://ramlfications.readthedocs.org"; license = licenses.asl20; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/random2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/random2/default.nix index 6845a5707d..cb84d32ef4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/random2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/random2/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , isPyPy +, fetchpatch }: buildPythonPackage rec { @@ -15,6 +16,14 @@ buildPythonPackage rec { sha256 = "34ad30aac341039872401595df9ab2c9dc36d0b7c077db1cea9ade430ed1c007"; }; + patches = [ + # Patch test suite for python >= 3.9 + (fetchpatch { + url = "https://github.com/strichter/random2/pull/3/commits/1bac6355d9c65de847cc445d782c466778b94fbd.patch"; + sha256 = "064137pg1ilv3f9r10123lqbqz45070jca8pjjyp6gpfd0yk74pi"; + }) + ]; + meta = with lib; { homepage = "http://pypi.python.org/pypi/random2"; description = "Python 3 compatible Python 2 `random` Module"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix index 225a8f149e..7a27055aba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix @@ -1,27 +1,40 @@ { lib , buildPythonPackage , fetchFromGitHub +, cryptography , requests -, python +, pytestCheckHook }: buildPythonPackage rec { pname = "requests-http-signature"; - version = "0.1.0"; + version = "0.2.0"; # .pem files for tests aren't present on PyPI src = fetchFromGitHub { owner = "pyauth"; repo = pname; rev = "v${version}"; - sha256 = "0y96wsbci296m1rcxx0ybx8r44rdvyb59p1jl27p7rgz7isr3kx1"; + sha256 = "1jsplqrxadjsc86f0kb6dgpblgwplxrpi0ql1a714w8pbbz4z3h7"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + cryptography + requests + ]; - checkPhase = '' - ${python.interpreter} test/test.py - ''; + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "test/test.py" ]; + + disabledTests = [ + # Test require network access + "test_readme_example" + ]; + + pythonImportsCheck = [ "requests_http_signature" ]; meta = with lib; { description = "A Requests auth module for HTTP Signature"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix index 68da058194..0a3fa27a80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "respx"; - version = "0.16.3"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lundberg"; repo = pname; rev = version; - sha256 = "0if9sg83rznl37hsjw6pfk78jpxi421g9p21wd92jcd6073g4nbd"; + sha256 = "sha256-unGAIsslGXOUHXr0FKzC9bX6+Q3mNGZ9Z/dtjz0gkj4="; }; # Coverage is under 100 % due to the excluded tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rfc3339-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rfc3339-validator/default.nix index f51a232550..6294eee7f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rfc3339-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rfc3339-validator/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , pytestCheckHook , hypothesis @@ -9,12 +10,12 @@ buildPythonPackage rec { pname = "rfc3339-validator"; - version = "0.1.3"; + version = "0.1.4"; src = fetchPypi { pname = "rfc3339_validator"; inherit version; - sha256 = "7a578aa0740e9ee2b48356fe1f347139190c4c72e27f303b3617054efd15df32"; + sha256 = "0srg0b89aikzinw72s433994k5gv5lfyarq1adhas11kz6yjm2hk"; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix index 52bef42f27..d292eaa522 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix @@ -6,7 +6,7 @@ , colorama , dataclasses , ipywidgets -, poetry +, poetry-core , pygments , typing-extensions , pytestCheckHook @@ -14,27 +14,33 @@ buildPythonPackage rec { pname = "rich"; - version = "9.13.0"; + version = "10.1.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; - # tests not included in pypi tarball src = fetchFromGitHub { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "0si3rzhg8wfxw4aakkp8sr6nbzfa54rl0w92macd1338q90ha4ly"; + sha256 = "sha256-HH+k9uiK34yoqu83rknCIe2DpoqJRHkcqABuj8zjzqs="; }; - format = "pyproject"; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ CommonMark colorama ipywidgets pygments typing-extensions - ] ++ lib.optional (pythonOlder "3.7") dataclasses; + ] ++ lib.optional (pythonOlder "3.7") [ + dataclasses + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "rich" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix index acd017a7a2..7bc7df0b8f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix @@ -5,7 +5,7 @@ , cython , numpy , scipy -, scikitlearn +, scikit-learn , persim , pytest }: @@ -28,7 +28,7 @@ buildPythonPackage rec { cython numpy scipy - scikitlearn + scikit-learn persim ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/roombapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/roombapy/default.nix index 9c438bde75..459037d619 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/roombapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/roombapy/default.nix @@ -1,31 +1,42 @@ -{ buildPythonPackage +{ lib +, amqtt +, buildPythonPackage , fetchFromGitHub -, hbmqtt -, lib , paho-mqtt -, poetry +, poetry-core , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "roombapy"; - version = "1.6.2-1"; + version = "1.6.3"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pschmitt"; repo = "roombapy"; rev = version; - sha256 = "14k7bys479xwpa4alpdwphzmxm3x8kc48nfqnshn1wj94vyxc425"; + sha256 = "sha256-GkDfIC2jx4Mpguk/Wu45pZw0czhabJwTz58WYSLCOV8="; }; - format = "pyproject"; + nativeBuildInputs = [ poetry-core ]; - nativeBuildInputs = [ poetry ]; propagatedBuildInputs = [ paho-mqtt ]; - checkInputs = [ hbmqtt pytest-asyncio pytestCheckHook ]; - pytestFlagsArray = [ "tests/" "--ignore=tests/test_discovery.py" ]; + checkInputs = [ + amqtt + pytest-asyncio + pytestCheckHook + ]; + + disabledTestPaths = [ + # Requires network access + "tests/test_discovery.py" + ]; + pythonImportsCheck = [ "roombapy" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rst2ansi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rst2ansi/default.nix new file mode 100644 index 0000000000..e161f56d31 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/rst2ansi/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, docutils, }: + +buildPythonPackage rec { + pname = "rst2ansi"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Gxf7mmKNQPV5M60aOqlSNGREvgaUaVCOc+lQYNoz/m8="; + }; + + propagatedBuildInputs = [ docutils ]; + + meta = with lib; { + description = "A rst converter to ansi-decorated console output"; + homepage = "https://github.com/Snaipe/python-rst-to-ansi"; + license = licenses.mit; + maintainers = with maintainers; [ vojta001 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rtoml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rtoml/default.nix new file mode 100644 index 0000000000..f50ad55817 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/rtoml/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools-rust +, rustPlatform +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "rtoml"; + version = "0.6.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "samuelcolvin"; + repo = pname; + rev = "v${version}"; + sha256 = "07bf30if1wmbqjp5n4ib43n6frx8ybyxc9fndxncq7aylkrhd7hy"; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "1q082sdac5vm4l3b45rfjp4vppp9y9qhagdjqqfdz8gdhm1k8yyy"; + }; + + nativeBuildInputs = with rustPlatform; [ + setuptools-rust + rust.rustc + rust.cargo + cargoSetupHook + ]; + + pythonImportsCheck = [ "rtoml" ]; + + checkInputs = [ pytestCheckHook ]; + preCheck = '' + cd tests + ''; + + meta = with lib; { + description = "Rust based TOML library for python"; + homepage = "https://github.com/samuelcolvin/rtoml"; + license = licenses.mit; + maintainers = with maintainers; [ evils ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix index 69b928aad0..9244a94d23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix @@ -1,33 +1,43 @@ { lib , buildPythonPackage -, fetchPypi +, pythonAtLeast +, fetchFromGitHub +, colorcet +, cryptography , flask , flask-compress , flask-cors , flask-sockets +, gevent , imageio , numpy -, scipy , pillow -, gevent -, wget +, pyopenssl +, scipy , six -, colorcet , unidecode , urllib3 +, wget +, deepdiff +, pytestCheckHook +, pytestcov +, websocket_client }: buildPythonPackage rec { pname = "runway-python"; version = "0.6.1"; - src = fetchPypi { - inherit pname version; - sha256 = "66cf1517dd817bf6db3792608920274f964dd0ced8dabecd925b8bc17aa95740"; + src = fetchFromGitHub { + owner = "runwayml"; + repo = "model-sdk"; + rev = version; + sha256 = "1ww2wai1qnly8i7g42vhkkbs4yp7wi9x4fjdxsg9fl3izjra0zs2"; }; propagatedBuildInputs = [ colorcet + cryptography flask flask-compress flask-cors @@ -36,6 +46,7 @@ buildPythonPackage rec { imageio numpy pillow + pyopenssl scipy six unidecode @@ -43,13 +54,30 @@ buildPythonPackage rec { wget ]; - # tests are not packaged in the released tarball - doCheck = false; - pythonImportsCheck = [ "runway" ]; + checkInputs = [ + deepdiff + pytestCheckHook + pytestcov + websocket_client + ]; + + disabledTests = [ + # these tests require network + "test_file_deserialization_remote" + "test_file_deserialization_absolute_directory" + "test_file_deserialization_remote_directory" + ] ++ lib.optionals (pythonAtLeast "3.9") [ + # AttributeError: module 'base64' has no attribute 'decodestring + # https://github.com/runwayml/model-sdk/issues/99 + "test_image_serialize_and_deserialize" + "test_segmentation_serialize_and_deserialize_colormap" + "test_segmentation_serialize_and_deserialize_labelmap" + ]; + meta = { description = "Helper library for creating Runway models"; homepage = "https://github.com/runwayml/model-sdk"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanic-testing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanic-testing/default.nix index fa1dfc6870..e5194e36bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sanic-testing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic-testing/default.nix @@ -20,6 +20,12 @@ buildPythonPackage rec { hash = "sha256-hBAq+/BKs0a01M89Nb8HaClqxB+W5PTfjVzef/m9SWs="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'httpx>=0.16, <0.18' 'httpx' \ + --replace 'httpcore==0.12.*' 'httpcore' + ''; + propagatedBuildInputs = [ httpx sanic websockets httpcore ]; # `sanic` is explicitly set to null when building `sanic` itself diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix index 31dcc86e0b..8c18380c3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix @@ -37,8 +37,12 @@ buildPythonPackage rec { inherit doCheck; disabledTests = [ - "test_gunicorn" # No "examples" directory in pypi distribution. - "test_zero_downtime" # No "examples.delayed_response.app" module in pypi distribution. + # No "examples" directory in pypi distribution + "test_gunicorn" + "test_zero_downtime" + # flaky + "test_keep_alive_client_timeout" + "test_reloader_live" ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix index f13fecc085..fe4cd4ea48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix @@ -12,7 +12,7 @@ , pandas , scipy , hdmedians -, scikitlearn +, scikit-learn , coverage , python , isPy3k @@ -30,7 +30,7 @@ buildPythonPackage rec { buildInputs = [ cython ]; checkInputs = [ coverage ]; - propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy hdmedians scikitlearn ]; + propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy hdmedians scikit-learn ]; # cython package not included for tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/0.20.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/0.20.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/0.20.nix rename to third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/0.20.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix similarity index 80% rename from third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix index 7e9e37831e..dfce61df6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix @@ -7,7 +7,8 @@ , glibcLocales , numpy , scipy -, pytest +, pytestCheckHook +, pytest-xdist , pillow , cython , joblib @@ -54,17 +55,30 @@ buildPythonPackage rec { joblib threadpoolctl ]; - checkInputs = [ pytest ]; + + checkInputs = [ pytestCheckHook pytest-xdist ]; LC_ALL="en_US.UTF-8"; - doCheck = !stdenv.isAarch64; - # Skip test_feature_importance_regression - does web fetch - checkPhase = '' - cd $TMPDIR - HOME=$TMPDIR OMP_NUM_THREADS=1 pytest -k "not test_feature_importance_regression" --pyargs sklearn + preBuild = '' + export SKLEARN_BUILD_PARALLEL=$NIX_BUILD_CORES ''; + doCheck = !stdenv.isAarch64; + + # Skip test_feature_importance_regression - does web fetch + disabledTests = [ "test_feature_importance_regression" ]; + + pytestFlagsArray = [ "-n" "$NIX_BUILD_CORES" "--pyargs" "sklearn" ]; + + preCheck = '' + cd $TMPDIR + export HOME=$TMPDIR + export OMP_NUM_THREADS=1 + ''; + + pythonImportsCheck = [ "sklearn" ]; + meta = with lib; { description = "A set of python modules for machine learning and data mining"; changelog = let diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix index 0a5171f22f..3b7106ac4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix @@ -5,7 +5,7 @@ , matplotlib , numpy , scipy -, scikitlearn +, scikit-learn , pyaml , pytestCheckHook }: @@ -26,7 +26,7 @@ buildPythonPackage rec { matplotlib numpy scipy - scikitlearn + scikit-learn pyaml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix index f6d573573b..bf3e1d1ef4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , numpy , scipy -, scikitlearn +, scikit-learn , matplotlib , numba , umap-learn @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy scipy - scikitlearn + scikit-learn matplotlib numba umap-learn diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix index 7580647f5a..06802a8a2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix @@ -1,8 +1,17 @@ { lib , fetchFromGitHub , buildPythonPackage -, pyusb +, cython +, git +, pkgconfig +, pytest-runner +, setuptools-scm +, future , numpy +, pyusb +, mock +, pytestCheckHook +, zipp }: ## Usage @@ -18,19 +27,35 @@ buildPythonPackage rec { owner = "ap--"; repo = "python-seabreeze"; rev = "v${version}"; - sha256 = "1lna3w1vsci35dhyi7qjvbb99gxvzk23k195c7by7kkrps844q1j"; + sha256 = "1hm9aalpb9sdp8s7ckn75xvyiacp5678pv9maybm5nz0z2h29ibq"; + leaveDotGit = true; }; + nativeBuildInputs = [ + cython + git + pkgconfig + pytest-runner + setuptools-scm + ]; + + propagatedBuildInputs = [ + future + numpy + pyusb + ]; + postInstall = '' mkdir -p $out/etc/udev/rules.d - cp misc/10-oceanoptics.rules $out/etc/udev/rules.d/10-oceanoptics.rules + cp os_support/10-oceanoptics.rules $out/etc/udev/rules.d/10-oceanoptics.rules ''; - # underlying c libraries are tested and fail - # (c libs are used with anaconda, which we don't care about as we use the alternative path, being that of pyusb). - doCheck = false; - - propagatedBuildInputs = [ pyusb numpy ]; + # few backends enabled, but still some tests + checkInputs = [ + pytestCheckHook + mock + zipp + ]; setupPyBuildFlags = [ "--without-cseabreeze" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/segments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/segments/default.nix index 00953a8e90..f1c0ad3bf0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/segments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/segments/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Unicode Standard tokenization routines and orthography profile segmentation"; homepage = "https://github.com/cldf/segments"; license = licenses.asl20; - maintainers = with maintainers; [ hexa ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix index 664f84933e..370d254898 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix @@ -6,6 +6,7 @@ , geckodriver , urllib3 , xorg +, nixosTests }: @@ -47,6 +48,10 @@ buildPythonPackage rec { cp -v x_ignore_nofocus.so selenium/webdriver/firefox/${if stdenv.is64bit then "amd64" else "x86"}/ ''; + passthru.tests = { + testing-bitwarden = nixosTests.bitwarden; + }; + meta = with lib; { description = "The selenium package is used to automate web browser interaction from Python"; homepage = "http://www.seleniumhq.org"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index ba5b37c8d9..9526c27eb1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "71de00c9711926816f750bc0f57ef2abbcb1bfbdf5378c601df7ec978f44857a"; + sha256 = "sha256-wSJ9ONyjFbo1GCNz8SnD4nIujtmZ5SWE5qyn0oeHBzk="; }; checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seqeval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seqeval/default.nix index 15322632ad..9ed516e4d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seqeval/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seqeval/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , numpy -, scikitlearn +, scikit-learn , perl , pytestCheckHook }: @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy - scikitlearn + scikit-learn ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix index bef492e5db..26b8d732be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { description = "Setuptools plugin that makes unit tests execute with trial instead of pyunit."; homepage = "https://github.com/rutsky/setuptools-trial"; license = licenses.bsd2; - maintainers = with maintainers; [ ryansydnor nand0p ]; + maintainers = with maintainers; [ ryansydnor ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix index 5600f4a6aa..128dacfd55 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix @@ -5,7 +5,7 @@ , pytestCheckHook , numpy , scipy -, scikitlearn +, scikit-learn , pandas , tqdm , slicer @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy scipy - scikitlearn + scikit-learn pandas tqdm slicer diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix index cd89c1c8aa..af92f34595 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix @@ -1,10 +1,8 @@ { lib , fetchFromGitHub , buildPythonPackage +, authlib , requests -, pyopenssl -, cryptography -, idna , mock , isPy27 , nose @@ -24,21 +22,20 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ + authlib requests - pyopenssl - cryptography - idna ]; checkInputs = [ nose pytz responses - ] ++ lib.optionals isPy27 [ mock ]; + ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "mock==1.0.1" "mock" + checkPhase = '' + runHook preCheck + nosetests -v + runHook postCheck ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sip/4.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/sip/4.x.nix new file mode 100644 index 0000000000..5334d11963 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sip/4.x.nix @@ -0,0 +1,44 @@ +{ lib, fetchurl, buildPythonPackage, python, isPyPy, sip-module ? "sip" }: + +buildPythonPackage rec { + pname = sip-module; + version = "4.19.25"; + format = "other"; + + disabled = isPyPy; + + src = fetchurl { + url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; + sha256 = "04a23cgsnx150xq86w1z44b6vr2zyazysy9mqax0fy346zlr77dk"; + }; + + configurePhase = '' + ${python.executable} ./configure.py \ + --sip-module ${sip-module} \ + -d $out/${python.sitePackages} \ + -b $out/bin -e $out/include + ''; + + enableParallelBuilding = true; + + installCheckPhase = let + modules = [ + sip-module + "sipconfig" + ]; + imports = lib.concatMapStrings (module: "import ${module};") modules; + in '' + echo "Checking whether modules can be imported..." + PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ${python.interpreter} -c "${imports}" + ''; + + doCheck = true; + + meta = with lib; { + description = "Creates C++ bindings for Python modules"; + homepage = "http://www.riverbankcomputing.co.uk/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovek323 sander ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sip/5.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/sip/5.x.nix deleted file mode 100644 index c15589b77b..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/sip/5.x.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, packaging, toml }: - -buildPythonPackage rec { - pname = "sip"; - version = "5.5.0"; - - src = fetchPypi { - pname = "sip"; - inherit version; - sha256 = "1idaivamp1jvbbai9yzv471c62xbqxhaawccvskaizihkd0lq0jx"; - }; - - propagatedBuildInputs = [ packaging toml ]; - - # There aren't tests - doCheck = false; - - pythonImportsCheck = [ "sipbuild" ]; - - # FIXME: Why isn't this detected automatically? - # Needs to be specified in pyproject.toml, e.g.: - # [tool.sip.bindings.MODULE] - # tags = [PLATFORM_TAG] - platform_tag = - if stdenv.targetPlatform.isLinux then - "WS_X11" - else if stdenv.targetPlatform.isDarwin then - "WS_MACX" - else if stdenv.targetPlatform.isWindows then - "WS_WIN" - else - throw "unsupported platform"; - - meta = with lib; { - description = "Creates C++ bindings for Python modules"; - homepage = "http://www.riverbankcomputing.co.uk/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ eduardosm ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix index 0027c1c0ba..c15589b77b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix @@ -1,44 +1,40 @@ -{ lib, fetchurl, buildPythonPackage, python, isPyPy, sip-module ? "sip" }: +{ lib, stdenv, fetchPypi, buildPythonPackage, packaging, toml }: buildPythonPackage rec { - pname = sip-module; - version = "4.19.24"; - format = "other"; + pname = "sip"; + version = "5.5.0"; - disabled = isPyPy; - - src = fetchurl { - url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; - sha256 = "1ra15vb5i9gkg2vdvh16cq9x2mmzw1yi3xphxs8q34q1pf83gkgd"; + src = fetchPypi { + pname = "sip"; + inherit version; + sha256 = "1idaivamp1jvbbai9yzv471c62xbqxhaawccvskaizihkd0lq0jx"; }; - configurePhase = '' - ${python.executable} ./configure.py \ - --sip-module ${sip-module} \ - -d $out/${python.sitePackages} \ - -b $out/bin -e $out/include - ''; + propagatedBuildInputs = [ packaging toml ]; - enableParallelBuilding = true; + # There aren't tests + doCheck = false; - installCheckPhase = let - modules = [ - sip-module - "sipconfig" - ]; - imports = lib.concatMapStrings (module: "import ${module};") modules; - in '' - echo "Checking whether modules can be imported..." - PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ${python.interpreter} -c "${imports}" - ''; + pythonImportsCheck = [ "sipbuild" ]; - doCheck = true; + # FIXME: Why isn't this detected automatically? + # Needs to be specified in pyproject.toml, e.g.: + # [tool.sip.bindings.MODULE] + # tags = [PLATFORM_TAG] + platform_tag = + if stdenv.targetPlatform.isLinux then + "WS_X11" + else if stdenv.targetPlatform.isDarwin then + "WS_MACX" + else if stdenv.targetPlatform.isWindows then + "WS_WIN" + else + throw "unsupported platform"; meta = with lib; { description = "Creates C++ bindings for Python modules"; homepage = "http://www.riverbankcomputing.co.uk/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 sander ]; - platforms = platforms.all; + license = licenses.gpl3Only; + maintainers = with maintainers; [ eduardosm ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix index d973bc70bc..2530b96520 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikit-learn, python }: buildPythonPackage rec { pname = "sklearn-deap"; @@ -20,7 +20,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ numpy scipy deap scikitlearn ]; + propagatedBuildInputs = [ numpy scipy deap scikit-learn ]; checkPhase = '' ${python.interpreter} test.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix index 3504557b50..db3b8ed431 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix @@ -8,7 +8,7 @@ , numpy , pandas , pytorch -, scikitlearn +, scikit-learn , scipy , tabulate , tqdm @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "9910f97339e654c8d38e0075d87b735e69e5eb11db59c527fb36705b30c8d0a4"; }; - propagatedBuildInputs = [ numpy pytorch scikitlearn scipy tabulate tqdm ]; + propagatedBuildInputs = [ numpy pytorch scikit-learn scipy tabulate tqdm ]; checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slimit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slimit/default.nix deleted file mode 100644 index 30654bd03f..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/slimit/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, fetchpatch, python, ply }: - -buildPythonPackage rec { - pname = "slimit"; - version = "0.8.1"; - - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "f433dcef899f166b207b67d91d3f7344659cb33b8259818f084167244e17720b"; - }; - - # Some patches from https://github.com/rspivak/slimit/pull/65 - patches = lib.optionals isPy3k [ - (fetchpatch { - url = "https://github.com/lelit/slimit/commit/a61e12d88cc123c4b7af2abef21d06fd182e561a.patch"; - sha256 = "0lbhvkgn4l8g9fwvb81rfwjx7hsaq2pid8a5gczdk1ba65wfvdq5"; - }) - (fetchpatch { - url = "https://github.com/lelit/slimit/commit/e8331659fb89e8a4613c5e4e338c877fead9c551.patch"; - sha256 = "1hv4ysn09c9bfd5bxhhrp51hsi81hdidmx0y7zcrjjiich9ayrni"; - }) - ]; - - propagatedBuildInputs = [ ply ]; - - checkPhase = '' - ${python.interpreter} -m unittest discover -s src/slimit - ''; - - meta = with lib; { - description = "JavaScript minifier"; - homepage = "https://slimit.readthedocs.org/"; - license = licenses.mit; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix index f648905251..f28708bdf0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.7.0"; + version = "1.7.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-fy7sRKS7ih4JmjOW/noL8qJ1xWVpQLbBbObHnMwT3Bc="; + sha256 = "sha256-mvg23FdHJZeIZRcm8GLWmm9DDTBt29jmsUHB/smVSec="; }; patches = [ 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 fdf984563e..237f36e201 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 @@ -1,5 +1,6 @@ -{ buildPythonPackage -, isPy27 +{ lib +, buildPythonPackage +, pythonOlder , asn1crypto , azure-storage-blob , boto3 @@ -10,7 +11,6 @@ , idna , ijson , isPy3k -, lib , oscrypto , pyarrow , pyasn1-modules @@ -25,20 +25,14 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.4.1"; - disabled = isPy27; + version = "2.4.3"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5c9180e61202a7beb1df83231688423091ca0a04ee559d2a78ff77f9c727baae"; + sha256 = "sha256-+jAfUwaofWM5Ef1kk4AEAbBM/UES8/ZzLd4QJfkEQsM="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL'," \ - --replace 'pytz<2021.0' 'pytz' - ''; - propagatedBuildInputs = [ azure-storage-blob asn1crypto @@ -55,16 +49,26 @@ buildPythonPackage rec { pytz requests six - ] ++ lib.optionals (!isPy3k) [ pyarrow pyasn1-modules urllib3 ]; - # tests require encrypted secrets, see + postPatch = '' + # https://github.com/snowflakedb/snowflake-connector-python/issues/705 + substituteInPlace setup.py \ + --replace "idna>=2.5,<3" "idna" \ + --replace "chardet>=3.0.2,<4" "chardet" + ''; + + # Tests require encrypted secrets, see # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters doCheck = false; - pythonImportsCheck = [ "snowflake" "snowflake.connector" ]; + + pythonImportsCheck = [ + "snowflake" + "snowflake.connector" + ]; meta = with lib; { description = "Snowflake Connector for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix new file mode 100644 index 0000000000..0ac1edfd50 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchPypi +, fetchpatch +, buildPythonPackage +, isPy3k +, rustPlatform +, setuptools-rust +, libiconv +}: + +buildPythonPackage rec { + pname = "spacy-alignments"; + version = "0.8.3"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + hash = "sha256-zrqBjaIjtF6bJMbmw7Zo+BeApN6sxxfLkrzsDjdvC78="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit patches src; + name = "${pname}-${version}"; + hash = "sha256-YRyG2yflEXKklNqXiDD9oK3J1lq4o704+Eeu2hyY3xI="; + }; + + patches = [ + # Add Cargo.lock, from upstream PR: + # https://github.com/explosion/spacy-alignments/pull/3 + (fetchpatch { + url = "https://github.com/explosion/spacy-alignments/commit/7b0ba13ff0d245bfbbe344a36fb7bbd311dd4906.diff"; + sha256 = "sha256-jx97SSC+3z+ByInNs8Uq58H50eCo4fDCwEi6VKxRs2k="; + excludes = [ ".gitignore" ]; + }) + ]; + + nativeBuildInputs = [ + setuptools-rust + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + + # Fails because spacy_alignments module cannot be loaded correctly. + doCheck = false; + + pythonImportsCheck = [ "spacy_alignments" ]; + + meta = with lib; { + description = "Align tokenizations for spaCy and transformers"; + homepage = "https://github.com/explosion/spacy-alignments"; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-pkuseg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-pkuseg/default.nix new file mode 100644 index 0000000000..670174a057 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-pkuseg/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, cython +, numpy +, srsly +}: + +buildPythonPackage rec { + pname = "spacy-pkuseg"; + version = "0.0.28"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit version; + pname = "spacy_pkuseg"; + hash = "sha256-mmA/baY9ohvrM41ak5L+G8CUrSQeZCrzmMAoND4X/NI="; + }; + + # Does not seem to have actual tests, but unittest discover + # recognizes some non-tests as tests and fails. + doCheck = false; + + nativeBuildInputs = [ cython ]; + + propagatedBuildInputs = [ numpy srsly ]; + + pythonImportsCheck = [ "spacy_pkuseg" ]; + + meta = with lib; { + description = "Toolkit for multi-domain Chinese word segmentation (spaCy fork)"; + homepage = "https://github.com/explosion/spacy-pkuseg"; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/annotate.py b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/annotate.py new file mode 100644 index 0000000000..d0be2d1c33 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/annotate.py @@ -0,0 +1,68 @@ +import pytest +import spacy + +en_text = ( + "When Sebastian Thrun started working on self-driving cars at " + "Google in 2007, few people outside of the company took him " + "seriously. “I can tell you very senior CEOs of major American " + "car companies would shake my hand and turn away because I wasn’t " + "worth talking to,” said Thrun, in an interview with Recode earlier " + "this week.") + + +@pytest.fixture +def en_core_web_trf(): + return spacy.load("en_core_web_trf") + + +@pytest.fixture +def doc_en_core_web_trf(en_core_web_trf): + return en_core_web_trf(en_text) + + +def test_entities(doc_en_core_web_trf): + entities = list(map(lambda e: (e.text, e.label_), + doc_en_core_web_trf.ents)) + + assert entities == [ + ('Sebastian Thrun', 'PERSON'), + ('Google', 'ORG'), + ('2007', 'DATE'), + ('American', 'NORP'), + ('Thrun', 'PERSON'), + ('Recode', 'ORG'), + ('earlier this week', 'DATE'), + ] + + +def test_nouns(doc_en_core_web_trf): + assert [ + chunk.text for chunk in doc_en_core_web_trf.noun_chunks] == [ + 'Sebastian Thrun', + 'self-driving cars', + 'Google', + 'few people', + 'the company', + 'him', + 'I', + 'you', + 'very senior CEOs', + 'major American car companies', + 'my hand', + 'I', + 'Thrun', + 'an interview', + 'Recode'] + + +def test_verbs(doc_en_core_web_trf): + assert [ + token.lemma_ for token in doc_en_core_web_trf if token.pos_ == "VERB"] == [ + 'start', + 'take', + 'tell', + 'shake', + 'turn', + 'be', + 'talk', + 'say'] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix new file mode 100644 index 0000000000..11a927a0a6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix @@ -0,0 +1,23 @@ +{ stdenv, pytest, spacy_models }: + +stdenv.mkDerivation { + name = "spacy-transformers-annotation-test"; + + src = ./.; + + dontConfigure = true; + dontBuild = true; + doCheck = true; + + checkInputs = [ pytest spacy_models.en_core_web_trf ]; + + checkPhase = '' + pytest annotate.py + ''; + + installPhase = '' + touch $out + ''; + + meta.timeout = 60; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix new file mode 100644 index 0000000000..1d02460167 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix @@ -0,0 +1,42 @@ +{ lib +, callPackage +, fetchPypi +, buildPythonPackage +, pytorch +, spacy +, spacy-alignments +, srsly +, transformers +}: + +buildPythonPackage rec { + pname = "spacy-transformers"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-AYshH2trMTgeSkAPRb6wRWpm4gA5FaKV2NJd+PhzAy4="; + }; + + propagatedBuildInputs = [ + pytorch + spacy + spacy-alignments + srsly + transformers + ]; + + # Test fails due to missing arguments for trfs2arrays(). + doCheck = false; + + pythonImportsCheck = [ "spacy_transformers" ]; + + passthru.tests.annotation = callPackage ./annotation-test { }; + + meta = with lib; { + description = "spaCy pipelines for pretrained BERT, XLNet and GPT-2"; + homepage = "https://github.com/explosion/spacy-transformers"; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/annotate.py b/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/annotate.py index 822eb8ac07..eb62880848 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/annotate.py +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/annotate.py @@ -26,10 +26,11 @@ def test_entities(doc_en_core_web_sm): assert entities == [ ('Sebastian Thrun', 'PERSON'), - ('Google', 'ORG'), ('2007', 'DATE'), + ('2007', 'DATE'), ('American', 'NORP'), - ('Thrun', 'ORG'), - ('earlier this week', 'DATE') + ('Thrun', 'PERSON'), + ('Recode', 'PERSON'), + ('earlier this week', 'DATE'), ] @@ -60,10 +61,9 @@ def test_verbs(doc_en_core_web_sm): 'work', 'drive', 'take', - 'can', 'tell', - 'would', 'shake', 'turn', + 'be', 'talk', 'say'] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix index 077ac0e6a3..3cabc1d6ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -7,42 +7,52 @@ , blis , catalogue , cymem +, jinja2 , jsonschema , murmurhash , numpy , pathlib -, plac , preshed , requests , setuptools , srsly +, spacy-legacy , thinc +, typer , wasabi +, packaging +, pathy +, pydantic }: buildPythonPackage rec { pname = "spacy"; - version = "3.0.5"; + version = "3.0.6"; src = fetchPypi { inherit pname version; - sha256 = "9f7a09fbad53aac2a3cb7696a902de62b94575a15d249dd5e26a98049328060e"; + hash = "sha256-ViirifH1aAmciAsSqcN/Ts4pq4kmBmDP33KMAnEYecU="; }; propagatedBuildInputs = [ blis catalogue cymem + jinja2 jsonschema murmurhash numpy - plac preshed requests setuptools srsly + spacy-legacy thinc wasabi + packaging + pathy + pydantic + typer ] ++ lib.optional (pythonOlder "3.4") pathlib; checkInputs = [ @@ -57,10 +67,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ --replace "blis>=0.4.0,<0.8.0" "blis>=0.4.0,<1.0" \ - --replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \ - --replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \ - --replace "srsly>=1.0.2,<1.1.0" "srsly>=1.0.2,<3.0" \ - --replace "thinc>=7.4.1,<7.5.0" "thinc>=7.4.1,<8" + --replace "pydantic>=1.7.1,<1.8.0" "pydantic>=1.7.1,<1.8.3" ''; pythonImportsCheck = [ "spacy" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix new file mode 100644 index 0000000000..f8b011d83c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix @@ -0,0 +1,26 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "spacy-legacy"; + version = "3.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Uy94rjFllSj622RTzd6UJaQmIniCw4gpeq/X57QcIpA="; + }; + + # checkInputs = [ pytestCheckHook spacy ]; + doCheck = false; + pythonImportsCheck = [ "spacy_legacy" ]; + + meta = with lib; { + description = "A Path interface for local and cloud bucket storage"; + homepage = "https://github.com/justindujardin/pathy"; + license = licenses.asl20; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.json b/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.json index 3a427f8932..a2989b6da5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.json +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.json @@ -1,264 +1,332 @@ -[{ - "pname": "da_core_news_lg", - "version": "2.3.0", - "sha256": "18y1jany1ha27jkwb9563haxsbylm0axkh5c8009lsfxc8y2w9hr", - "license": "cc-by-sa-40" -}, -{ - "pname": "da_core_news_md", - "version": "2.3.0", - "sha256": "06nm5grj5jdx0rja7vw1f91vvd69p6vhafrwpfr1npqk24j6cacb", - "license": "cc-by-sa-40" -}, -{ - "pname": "da_core_news_sm", - "version": "2.3.0", - "sha256": "00byhlrcbg4wxplr473g9b3126pvk4vwy0q34xg0zx4994qb6rgn", - "license": "cc-by-sa-40" -}, -{ - "pname": "de_core_news_lg", - "version": "2.3.0", - "sha256": "0rixhgdz4z7sq6f2b1w3n5cn1645cr37g40hbd9xzlvdzdf5cg6d", - "license": "mit" -}, -{ - "pname": "de_core_news_md", - "version": "2.3.0", - "sha256": "0kxir1w000r5fn1kpa38m7688xinkn2mk1m82aiwqlck3r72jdi6", - "license": "mit" -}, -{ - "pname": "de_core_news_sm", - "version": "2.3.0", - "sha256": "00cbmrf4njg28laysapdnp4rv4lw4yw03rxkynw1ain5fwb0izl7", - "license": "mit" -}, -{ - "pname": "el_core_news_lg", - "version": "2.3.0", - "sha256": "001c19dd1kirlvzbdv2i89zw8nf6c4icv2w0chm7rd6x9m3i13gd", - "license": "cc-by-nc-sa-30" -}, -{ - "pname": "el_core_news_md", - "version": "2.3.0", - "sha256": "170x8bzm5nf02mhkxyxjk58yk2639hsjb5b9prcc69500c0vmnp0", - "license": "cc-by-nc-sa-30" -}, -{ - "pname": "el_core_news_sm", - "version": "2.3.0", - "sha256": "10mh3za4jvr07rawzk8ps642rp11s3smraj9xvrxflik4fqkz18b", - "license": "cc-by-nc-sa-30" -}, -{ - "pname": "en_core_web_lg", - "version": "2.3.0", - "sha256": "0mfa5wz31ya295jhyj489gb4qy806zmpq1zc11bvv5alv2m35if2", - "license": "mit" -}, -{ - "pname": "en_core_web_md", - "version": "2.3.0", - "sha256": "1ys8sqkhiap1mq6mhbkbq8bc07lvl68xngbx725xkwvirzl5gabh", - "license": "mit" -}, -{ - "pname": "en_core_web_sm", - "version": "2.3.0", - "sha256": "04icv9qf4pj53ll8vqxcjl2a723q1k00i7lifk8wx5saif28g37a", - "license": "mit" -}, -{ - "pname": "en_vectors_web_lg", - "version": "2.3.0", - "sha256": "13g012rwh0bcxx3ii5mmygqzyryah1y3zd000zhidnacc1x1g743", - "license": "cc-by-sa-30" -}, -{ - "pname": "es_core_news_lg", - "version": "2.3.0", - "sha256": "1r0pr0lzs3j9w7rd5z9nw87iayjm36v7f7gamvaiiphs6bc5p7ls", - "license": "gpl3" -}, -{ - "pname": "es_core_news_md", - "version": "2.3.0", - "sha256": "0nz33bmpr3rxqbnv6vb1id8pkfsvh8ii8vqplwgb3b8772kmpzy2", - "license": "gpl3" -}, -{ - "pname": "es_core_news_sm", - "version": "2.3.0", - "sha256": "02xqhg4m0gg5r9yibvl02zixkll6w0nsmbdhp07y5yyaqjarc90d", - "license": "gpl3" -}, -{ - "pname": "fr_core_news_lg", - "version": "2.3.0", - "sha256": "1yliamws8nqqjhpk9gr2dzlk0dms2mr958zbj21biv8fimbq60ik", - "license": "lgpllr" -}, -{ - "pname": "fr_core_news_md", - "version": "2.3.0", - "sha256": "04fk212ksac3bp9dj7dmzsdcnbqmbsgymsic6ddcv9zbfdv5d0db", - "license": "lgpllr" -}, -{ - "pname": "fr_core_news_sm", - "version": "2.3.0", - "sha256": "0kldww855z67qfc9maa9z1lsvdf5vj5vc8gj0x3h68kv5n1xr4h0", - "license": "lgpllr" -}, -{ - "pname": "it_core_news_lg", - "version": "2.3.0", - "sha256": "192rdmqnwl3ajxzhnw4r1cqv5bkziv0yc2bbzckmzqss64wk7k70", - "license": "cc-by-nc-sa-30" -}, -{ - "pname": "it_core_news_md", - "version": "2.3.0", - "sha256": "019ih4vwq1w6j38j0wc8pyyg1an6yy37wxq2w4amwppynmmcnd5w", - "license": "cc-by-nc-sa-30" -}, -{ - "pname": "it_core_news_sm", - "version": "2.3.0", - "sha256": "1c3ywqa8li0j7cyvd1xqbb096y61978hd6qv7rc6cxxjdhmkrrds", - "license": "cc-by-nc-sa-40" -}, -{ - "pname": "lt_core_news_lg", - "version": "2.3.0", - "sha256": "0hn5w8n7mgv33i6gvnaxl1j44n9gz4j86gg1a9jjlgdw5z98n0p2", - "license": "cc-by-sa-40" -}, -{ - "pname": "lt_core_news_md", - "version": "2.3.0", - "sha256": "1xya79cz2xd5vgzg6qg0ww5j2bmv7kppdk3mdjf6zpwrlzwdbk5d", - "license": "cc-by-sa-40" -}, -{ - "pname": "lt_core_news_sm", - "version": "2.3.0", - "sha256": "0r3rbqgz4897wyhz5jli30lryb45039f4rlvn4q0364cg1pm92g9", - "license": "cc-by-sa-40" -}, -{ - "pname": "nb_core_news_lg", - "version": "2.3.0", - "sha256": "18mblypw3c82004qz5w1p3262iqwn99wl9b781dq7aqwxskr02d6", - "license": "mit" -}, -{ - "pname": "nb_core_news_md", - "version": "2.3.0", - "sha256": "0iw97k9glxbar8mrpvnmmcb1nffgdhb83akn99p53pwmqbzxy9p3", - "license": "mit" -}, -{ - "pname": "nb_core_news_sm", - "version": "2.3.0", - "sha256": "07b7xri2q3m7fvn9a2gjc1044a3f14231vr32hrw96h7k6vg95h7", - "license": "mit" -}, -{ - "pname": "nl_core_news_lg", - "version": "2.3.0", - "sha256": "016166kzpgi0p3m0x3k308a0r60a28yz7npagjvmpl1dfm9lzhnv", - "license": "cc-by-sa-40" -}, -{ - "pname": "nl_core_news_md", - "version": "2.3.0", - "sha256": "1anfhig531k9k14s0cbgsvmvifp3h50qi1h8dhx894kjmq10k2lg", - "license": "cc-by-sa-40" -}, -{ - "pname": "nl_core_news_sm", - "version": "2.3.0", - "sha256": "0alvz7pn7cj0yax8h5gp71vrdblh3mcsmyhzgiddsd44ry35nxnj", - "license": "cc-by-sa-40" -}, -{ - "pname": "pl_core_news_lg", - "version": "2.3.0", - "sha256": "1acchp8pv1h4c6cwvxz07lh4ychn6aw809zfg3mbbsxgsgd2ahjr", - "license": "gpl3" -}, -{ - "pname": "pl_core_news_md", - "version": "2.3.0", - "sha256": "19jjjjvbys3ayibkm3cx497b4bh63ll39hfq04wx116rj4ajpwwg", - "license": "gpl3" -}, -{ - "pname": "pl_core_news_sm", - "version": "2.3.0", - "sha256": "166mqlfkgiszcc6hwg2mr6sir9y88y22nd81a1nidq0fiif5lfji", - "license": "gpl3" -}, -{ - "pname": "pt_core_news_lg", - "version": "2.3.0", - "sha256": "18gvdmfwyy2sbq6206imglhghyagd6a4gb6wcfkwhm7lzbnq714d", - "license": "cc-by-sa-40" -}, -{ - "pname": "pt_core_news_md", - "version": "2.3.0", - "sha256": "1yxnpwby2aq6ydvd35lylc4fs141fisfnzlx8pl88pp2b2gxijvl", - "license": "cc-by-sa-40" -}, -{ - "pname": "pt_core_news_sm", - "version": "2.3.0", - "sha256": "1vcvzdg9f93x0vaafkk9l9xhpmaavfj0cf0l3p06c5kx2d76f9ph", - "license": "cc-by-sa-40" -}, -{ - "pname": "ro_core_news_sm", - "version": "2.3.0", - "sha256": "0lsmbdwsaczv37y5sa1vvgwszy2hs8jp24a0nvc5qm8vb71rxj8w", - "license": "cc-by-sa-40" -}, -{ - "pname": "ro_core_news_md", - "version": "2.3.0", - "sha256": "1igwkz3yd1117gi2g78yilh9ln8n5yrdimas4prfxjgzwid3q8bc", - "license": "cc-by-sa-40" -}, -{ - "pname": "ro_core_news_lg", - "version": "2.3.0", - "sha256": "0id1y32kjfans7llh1i55rgr4n2x6xn208y4qf6yl3pbc17i0n9z", - "license": "cc-by-sa-40" -}, -{ - "pname": "xx_ent_wiki_sm", - "version": "2.3.0", - "sha256": "0x3zmmybl5kh4dn5prkfmr4q5j9bh13p40qc3rhdfi0i3jxc11pn", - "license": "mit" -}, -{ - "pname": "zh_core_web_lg", - "version": "2.3.1", - "sha256": "17zxk7cz47k07yb3qaigc3sx4dj4zwilr1lsn2jq6w7jc8k2h1ll", - "license": "mit" -}, -{ - "pname": "zh_core_web_md", - "version": "2.3.1", - "sha256": "1n4iwxyam4ykn0f9jdzwkhczack8r9c3kkbyga3c4h6iwqsflzcj", - "license": "mit" -}, -{ - "pname": "zh_core_web_sm", - "version": "2.3.1", - "sha256": "1lj5nwhx38cpwnvajwxlfkf84dr1xx2h6wwbg3scycsh459i9fpc", - "license": "mit" -}] +[ + { + "pname": "da_core_news_lg", + "version": "3.0.0", + "sha256": "0l0wljc1lm9a72ngfd4aa90laz4zcc37ix9nsiaqlw004v01z7wj", + "license": "cc-by-sa-40" + }, + { + "pname": "da_core_news_md", + "version": "3.0.0", + "sha256": "14h3ym22224aimfk2kj88pmn83hkb57w402i0x6pd7ra86n372lh", + "license": "cc-by-sa-40" + }, + { + "pname": "da_core_news_sm", + "version": "3.0.0", + "sha256": "05893dpmx76waqnlysnkq8hz9271rkk30xf6hy98gka6244l9a1l", + "license": "cc-by-sa-40" + }, + { + "pname": "de_core_news_lg", + "version": "3.0.0", + "sha256": "0s7vfpr9gv22pvh697ffg35fppxkjhw23ynf4bpz73hl9jikdqvj", + "license": "mit" + }, + { + "pname": "de_core_news_md", + "version": "3.0.0", + "sha256": "09vvlm3rxmyiima81y4bvcyxhn9bjxrqlkbmglzmwhrhxm84nkmx", + "license": "mit" + }, + { + "pname": "de_core_news_sm", + "version": "3.0.0", + "sha256": "1w5aqfzknnnxpsi9i6kn6bki58j0mp24d4gr2203bf6g5kahiq03", + "license": "mit" + }, + { + "pname": "de_dep_news_trf", + "version": "3.0.0", + "sha256": "1snkm911jn73mqfz0y0anr12r6j3gdi6wd8qmd5alwm623x4s6hm", + "license": "mit" + }, + { + "pname": "el_core_news_lg", + "version": "3.0.0", + "sha256": "011lqmx3f3laf2vvqp0hxp5y105pn54kwdh1xzw4hs2pj6fac9p5", + "license": "cc-by-nc-sa-30" + }, + { + "pname": "el_core_news_md", + "version": "3.0.0", + "sha256": "0p75c18sg38j9dj79ykmm5kzcwjxccpgrcw4cjcscb6ad6wwvcjx", + "license": "cc-by-nc-sa-30" + }, + { + "pname": "el_core_news_sm", + "version": "3.0.0", + "sha256": "0gvisa7yg1w49hpfp79ahy50v64l3rmk56k0k7zkgc8ml1gn892r", + "license": "cc-by-nc-sa-30" + }, + { + "pname": "en_core_web_lg", + "version": "3.0.0", + "sha256": "0sdb85zvfb12d14k3wy23dfryy3xwc9ag79zq71qnxwpvvygmc8y", + "license": "mit" + }, + { + "pname": "en_core_web_md", + "version": "3.0.0", + "sha256": "0c669b1vsp3z28n52lfsijmkn9465r8zjjygjml5rlf9lf1paxa5", + "license": "mit" + }, + { + "pname": "en_core_web_sm", + "version": "3.0.0", + "sha256": "0risizvzkicffw7vgrj92z23dfb7zvvzihqgvjcrx8989b7b6wq6", + "license": "mit" + }, + { + "pname": "en_core_web_trf", + "version": "3.0.0", + "sha256": "0plmg77rv1spr0swn4jakci16mbqsxm32mz9nnwc9ylynbvgrhmn", + "license": "mit" + }, + { + "pname": "es_core_news_lg", + "version": "3.0.0", + "sha256": "0832w8qmg0fp2q8329ndlbbzpfkpbw9v38ny7106a45xaz0rn2xc", + "license": "gpl3" + }, + { + "pname": "es_core_news_md", + "version": "3.0.0", + "sha256": "01is980r63a5418jq917scapzkl9xydj56lrsxbr16fya0hh8qnn", + "license": "gpl3" + }, + { + "pname": "es_core_news_sm", + "version": "3.0.0", + "sha256": "1wgya0f25dgix57pb60fyl4hf2msma16d1f6cf617ypk6g3v80rb", + "license": "gpl3" + }, + { + "pname": "es_dep_news_trf", + "version": "3.0.0", + "sha256": "07lim35p0mxb75qiym79wcrak3j7wcan393260haxgwrj29rzpvv", + "license": "gpl3" + }, + { + "pname": "fr_core_news_lg", + "version": "3.0.0", + "sha256": "1frg734lb64gkm7pagqp1mj7lqpwsxxj5vyjm10yja0rkdi6kcca", + "license": "lgpllr" + }, + { + "pname": "fr_core_news_md", + "version": "3.0.0", + "sha256": "1xshr9r639hdb8vkj5nribk4lkm3a5fb7zrxj3y3p678dr53xalz", + "license": "lgpllr" + }, + { + "pname": "fr_core_news_sm", + "version": "3.0.0", + "sha256": "0n23c9rbg1b44c8yjlf6cc0g8ccj6x0rmfjg76ddmpkjaj83jwv1", + "license": "lgpllr" + }, + { + "pname": "fr_dep_news_trf", + "version": "3.0.0", + "sha256": "192l6n5yxn1ndc4fk8k759j2d5hryj9mfkpy2aminaxr4dmp2imr", + "license": "lgpllr" + }, + { + "pname": "it_core_news_lg", + "version": "3.0.0", + "sha256": "121nki732wrnfyzcflvsv54nvrz3l3hx55hkd72hlhrvjw0kvkv5", + "license": "cc-by-nc-sa-30" + }, + { + "pname": "it_core_news_md", + "version": "3.0.0", + "sha256": "0m168wrf1p6dz5kc4n5ga2h8c0d6jzxx876i3ndrg6b7z418hhi5", + "license": "cc-by-nc-sa-30" + }, + { + "pname": "it_core_news_sm", + "version": "3.0.0", + "sha256": "132v06cah8l7q4caxg6n4nw34v9jd8y8cqp20njryx4nirm9c36l", + "license": "cc-by-nc-sa-30" + }, + { + "pname": "lt_core_news_lg", + "version": "3.0.0", + "sha256": "034qycqpbdiyzhpzjz92kpnx6z2nai70dddz75r48hylzlw1d92h", + "license": "cc-by-sa-40" + }, + { + "pname": "lt_core_news_md", + "version": "3.0.0", + "sha256": "18mb2lmrjwnsc7s4yaq3yvdbh8p8p1k0xpm8cqn521hanpr0jqj3", + "license": "cc-by-sa-40" + }, + { + "pname": "lt_core_news_sm", + "version": "3.0.0", + "sha256": "1p998h9lnp16czj3gg8781gywg17dap2h9f8qc6f87daxyc9bdjs", + "license": "cc-by-sa-40" + }, + { + "pname": "mk_core_news_lg", + "version": "3.0.0", + "sha256": "1fmrpgq9plndid7402wkybidpi0phnybb3031jxppan99ihr3hfj", + "license": "cc-by-sa-40" + }, + { + "pname": "mk_core_news_md", + "version": "3.0.0", + "sha256": "1mnabkyjxph2xa4g2an5rqp24d4gbq969ln27zpjycyiwxlkz7vl", + "license": "cc-by-sa-40" + }, + { + "pname": "mk_core_news_sm", + "version": "3.0.0", + "sha256": "1ax6pl61n0p4qf4wcd6c7d42zqjrgh3vhlpl6xby57a78547asxr", + "license": "cc-by-sa-40" + }, + { + "pname": "nb_core_news_lg", + "version": "3.0.0", + "sha256": "07a8nsfswlpb2jc2afzf201bjkl2nlz40kqmjx3dbva8jphj3ljs", + "license": "mit" + }, + { + "pname": "nb_core_news_md", + "version": "3.0.0", + "sha256": "0y1vydhhgb6cifq7k4vc7dy4jl6wb1z6pklbv65v6nxl7rhn76fz", + "license": "mit" + }, + { + "pname": "nb_core_news_sm", + "version": "3.0.0", + "sha256": "1lk1869cb2176j6lvd8lraclfl706p12m1gvvf1ixm99ra8zkxhs", + "license": "mit" + }, + { + "pname": "nl_core_news_lg", + "version": "3.0.0", + "sha256": "0iq4ayzh9g9gil4l8kcl5qcm0l16hymavsqgiczf3ddvamciqaxs", + "license": "cc-by-sa-40" + }, + { + "pname": "nl_core_news_md", + "version": "3.0.0", + "sha256": "0g9dkzwxndcf05bnhkd9fzqj7n614naspyhalg6h9h1kb7v3m2ak", + "license": "cc-by-sa-40" + }, + { + "pname": "nl_core_news_sm", + "version": "3.0.0", + "sha256": "1l4mk3gs15yc5kssy4x4lyab9kmg9y199h4hvizwh8y1ifqbqy03", + "license": "cc-by-sa-40" + }, + { + "pname": "pl_core_news_lg", + "version": "3.0.0", + "sha256": "14ldch7rps1qxh3ldczh7f29ra3dq2kxaxpfbx7r6f1xpmk5s1rv", + "license": "gpl3" + }, + { + "pname": "pl_core_news_md", + "version": "3.0.0", + "sha256": "0fx6ipd8ll2d0w8qwn9cjw0q7w0r3l40467d6mizi4mx93q7m7iw", + "license": "gpl3" + }, + { + "pname": "pl_core_news_sm", + "version": "3.0.0", + "sha256": "0p1gcniyrn9qya4wg1qd6ijfchc7lhk0dh4iba8y71mss3n162fs", + "license": "gpl3" + }, + { + "pname": "pt_core_news_lg", + "version": "3.0.0", + "sha256": "1vsw1ng364466jz6ffyj9dj3jh4s68gk7csxylc1fj7wac8jxrbj", + "license": "cc-by-sa-40" + }, + { + "pname": "pt_core_news_md", + "version": "3.0.0", + "sha256": "11laikyd6m9zprk7bnfn0v2lixvkcgvpv95dp0zpc0q2izmky6q8", + "license": "cc-by-sa-40" + }, + { + "pname": "pt_core_news_sm", + "version": "3.0.0", + "sha256": "12d59q1gvpx8dj48iq17sindd6wid09hnjb4fw0rb00bb28rmqk1", + "license": "cc-by-sa-40" + }, + { + "pname": "ro_core_news_lg", + "version": "3.0.0", + "sha256": "11mkip5piy6g7rg51ljqjn61s4ydlafl6qp3v29zmm3lghc66h8c", + "license": "cc-by-sa-40" + }, + { + "pname": "ro_core_news_md", + "version": "3.0.0", + "sha256": "1jyf3khki7xqbp6ir0p4y2p7rdhs36zq2i1960ik4kr2mhnzrblg", + "license": "cc-by-sa-40" + }, + { + "pname": "ro_core_news_sm", + "version": "3.0.0", + "sha256": "0gc61gdfgji92mjdpznkf30nl1fz7378h9bz8dlhvnc401hjzsky", + "license": "cc-by-sa-40" + }, + { + "pname": "ru_core_news_lg", + "version": "3.0.0", + "sha256": "1x1hxvhki62ypj3x0s4syfhz3znlflp36qkp4l2g2sbxjj2qw7n3", + "license": "mit" + }, + { + "pname": "ru_core_news_md", + "version": "3.0.0", + "sha256": "0ks0qdyq6627cbg8fbbhvr83d3m8njs2aj8pri540gz9nrbj5479", + "license": "mit" + }, + { + "pname": "ru_core_news_sm", + "version": "3.0.0", + "sha256": "1x3bmd7f0fqf03wds01imwpbv4xng1qq9iq61m8rbqvskm5jlzbb", + "license": "mit" + }, + { + "pname": "xx_ent_wiki_sm", + "version": "3.0.0", + "sha256": "1115vap4c6snvkwq8bmc8dld1mw5ky0w9n112hadp85pv012ccds", + "license": "mit" + }, + { + "pname": "xx_sent_ud_sm", + "version": "3.0.0", + "sha256": "062g3xfb3fp33b56wa4fj84smr5rlc0dbja102khxnqm2aakk99k", + "license": "cc-by-sa-30" + }, + { + "pname": "zh_core_web_lg", + "version": "3.0.0", + "sha256": "1ai34fc2wfmb35f1zissddf6jjqpg51wqiyqqq35h03jyf4731jr", + "license": "mit" + }, + { + "pname": "zh_core_web_md", + "version": "3.0.0", + "sha256": "10npzl8nvyj4jdn2f9iai9inq5c4x3hxdk0ycgg9wcgqaj09gnxa", + "license": "mit" + }, + { + "pname": "zh_core_web_sm", + "version": "3.0.0", + "sha256": "1f9x5lr8vnvb1n8hc59vm2xi6kv2rj78x1vm916z6ic3vg7vwl1h", + "license": "mit" + }, + { + "pname": "zh_core_web_trf", + "version": "3.0.0", + "sha256": "178w8dfcvx4aabasid6r0pnwqd5k02cvlq35siqjgfn7j3zb56z0", + "license": "mit" + } +] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.nix index 8c57d2e0d2..c34bbdfb83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.nix @@ -1,4 +1,12 @@ -{ lib, buildPythonPackage, fetchurl, jieba, pkuseg, spacy }: +{ lib +, buildPythonPackage +, fetchurl +, jieba +, pymorphy2 +, sentencepiece +, spacy +, spacy-pkuseg +, spacy-transformers }: let buildModelPackage = { pname, version, sha256, license }: let @@ -12,7 +20,15 @@ let }; propagatedBuildInputs = [ spacy ] - ++ lib.optionals (lang == "zh") [ jieba pkuseg ]; + ++ lib.optionals (lang == "zh") [ jieba spacy-pkuseg ] + ++ lib.optionals (lib.hasSuffix "_trf" pname) [ spacy-transformers ] + ++ lib.optionals (lang == "ru") [ pymorphy2 ] + ++ lib.optionals (pname == "fr_dep_news_trf") [ sentencepiece ]; + + postPatch = lib.optionals (pname == "fr_dep_news_trf") '' + substituteInPlace meta.json \ + --replace "sentencepiece==0.1.91" "sentencepiece>=0.1.91" + ''; pythonImportsCheck = [ pname ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix index d2f79c1834..329b225b57 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix @@ -1,11 +1,12 @@ { lib , fetchPypi +, fetchpatch , buildPythonPackage , aplpy , joblib , astropy , radio_beam -, pytest +, pytestCheckHook , pytest-astropy , astropy-helpers }: @@ -20,13 +21,18 @@ buildPythonPackage rec { sha256 = "17zisr26syfb8kn89xj17lrdycm0hsmy5yp5zrn236wgd8rjriki"; }; + patches = [ + # Fix compatibility with radio_beam >= 0.3.3. Will be included + # in the next release of spectral cube > 0.5.0 + (fetchpatch { + url = "https://github.com/radio-astro-tools/spectral-cube/commit/bbe4295ebef7dfa6fe4474275a29acd6cb0cb544.patch"; + sha256 = "1qddfm3364kc34yf6wd9nd6rxh4qc2v5pqilvz9adwb4a50z28bf"; + }) + ]; + nativeBuildInputs = [ astropy-helpers ]; propagatedBuildInputs = [ astropy radio_beam joblib ]; - checkInputs = [ aplpy pytest pytest-astropy ]; - - checkPhase = '' - pytest spectral_cube - ''; + checkInputs = [ pytestCheckHook aplpy pytest-astropy ]; meta = { description = "Library for reading and analyzing astrophysical spectral data cubes"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix index 7d4629be50..379dbdd0b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, colorama , sphinx , livereload }: @@ -14,10 +15,15 @@ buildPythonPackage rec { sha256 = "de1ca3b66e271d2b5b5140c35034c89e47f263f2cd5db302c9217065f7443f05"; }; - propagatedBuildInputs = [ sphinx livereload ]; + propagatedBuildInputs = [ + colorama + sphinx + livereload + ]; # No tests included. doCheck = false; + pythonImportsCheck = [ "sphinx_autobuild" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jinja/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jinja/default.nix index 060d7f14a3..6f721ad1a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jinja/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jinja/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx extension to include jinja templates in documentation"; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/2.nix index 5cf2cecd97..0424b9b4c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/2.nix @@ -77,6 +77,6 @@ buildPythonPackage rec { description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; homepage = "http://sphinx.pocoo.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ nand0p ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix index 1c5cc29f41..5e31b6b19f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix @@ -1,24 +1,18 @@ { lib , buildPythonPackage -, fetchPypi -, pytest -, simplejson -, mock -, glibcLocales -, html5lib , pythonOlder -, enum34 -, python -, docutils -, jinja2 -, pygments -, alabaster +, fetchFromGitHub +# propagatedBuildInputs , Babel -, snowballstemmer -, six -, whoosh +, alabaster +, docutils , imagesize +, jinja2 +, packaging +, pygments , requests +, setuptools +, snowballstemmer , sphinxcontrib-applehelp , sphinxcontrib-devhelp , sphinxcontrib-htmlhelp @@ -26,56 +20,70 @@ , sphinxcontrib-qthelp , sphinxcontrib-serializinghtml , sphinxcontrib-websupport -, typing ? null -, setuptools -, packaging +# check phase +, html5lib +, imagemagick +, pytestCheckHook +, typed-ast }: buildPythonPackage rec { pname = "sphinx"; - version = "3.3.1"; - src = fetchPypi { - pname = "Sphinx"; - inherit version; - sha256 = "1e8d592225447104d1172be415bc2972bd1357e3e12fdc76edf2261105db4300"; - }; - LC_ALL = "en_US.UTF-8"; + version = "3.5.4"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "sphinx-doc"; + repo = pname; + rev = "v${version}"; + sha256 = "1xjii3dl01rq8x2bsxc6zywiy1s7arfgxrg5l8ml54w1748shadd"; + }; - checkInputs = [ pytest ]; - buildInputs = [ simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34; - # Disable two tests that require network access. - checkPhase = '' - cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored' - ''; propagatedBuildInputs = [ - docutils - jinja2 - pygments - alabaster Babel + alabaster + docutils + imagesize + jinja2 packaging + pygments + requests setuptools snowballstemmer - six - whoosh - imagesize - requests sphinxcontrib-applehelp sphinxcontrib-devhelp sphinxcontrib-htmlhelp sphinxcontrib-jsmath sphinxcontrib-qthelp sphinxcontrib-serializinghtml + # extra[docs] sphinxcontrib-websupport - ] ++ lib.optional (pythonOlder "3.5") typing; + ]; - # Lots of tests. Needs network as well at some point. - doCheck = false; + checkInputs = [ + imagemagick + html5lib + pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.8") [ + typed-ast + ]; - meta = { - description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; - homepage = "http://sphinx.pocoo.org/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ nand0p ]; + disabledTests = [ + # requires network access + "test_anchors_ignored" + "test_defaults" + "test_defaults_json" + "test_latex_images" + ]; + + meta = with lib; { + description = "Python documentation generator"; + longDescription = '' + A tool that makes it easy to create intelligent and beautiful + documentation for Python projects + ''; + homepage = "https://www.sphinx-doc.org"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix new file mode 100644 index 0000000000..81fa983125 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sphinx +, actdiag +, blockdiag +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-actdiag"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-TtuFZOLkig4MULLndDQlrTTx8RiGw34MsjmXoPladMY="; + }; + + propagatedBuildInputs = [ sphinx actdiag blockdiag ]; + + pythonImportsCheck = [ "sphinxcontrib.actdiag" ]; + + meta = with lib; { + description = "Sphinx actdiag extension"; + homepage = "https://github.com/blockdiag/sphinxcontrib-actdiag"; + maintainers = with maintainers; [ davidtwco ]; + license = licenses.bsd2; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index 956e3c033b..97e9c7529f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx blockdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-blockdiag"; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; license = licenses.bsd2; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix new file mode 100644 index 0000000000..10963a73a9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sphinx +, blockdiag +, nwdiag +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-nwdiag"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-bula1DutRv6NwfZRhciZfLHRZmXu42p+qvbeExN/+Fk="; + }; + + propagatedBuildInputs = [ sphinx blockdiag nwdiag ]; + + pythonImportsCheck = [ "sphinxcontrib.nwdiag" ]; + + meta = with lib; { + description = "Sphinx nwdiag extension"; + homepage = "https://github.com/blockdiag/sphinxcontrib-nwdiag"; + maintainers = with maintainers; [ davidtwco ]; + license = licenses.bsd2; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix new file mode 100644 index 0000000000..c7407300d3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sphinx +, blockdiag +, seqdiag +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-seqdiag"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-THJ1ra/W2X/lQaDjGbL27VMn0lWPJApwgKMrPhL0JY0="; + }; + + propagatedBuildInputs = [ sphinx blockdiag seqdiag ]; + + pythonImportsCheck = [ "sphinxcontrib.seqdiag" ]; + + meta = with lib; { + description = "Sphinx seqdiag extension"; + homepage = "https://github.com/blockdiag/sphinxcontrib-seqdiag"; + maintainers = with maintainers; [ davidtwco ]; + license = licenses.bsd2; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 2b5beb4df0..35b7cf38aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx spelling extension"; homepage = "https://bitbucket.org/dhellmann/sphinxcontrib-spelling"; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; license = licenses.bsd2; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spidev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spidev/default.nix index 0d0fd58236..90ca839bc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spidev/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spidev/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { description = "Python bindings for Linux SPI access through spidev"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; + platforms = platforms.linux; }; } 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 c6db32a15e..86550f9987 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix @@ -6,20 +6,19 @@ , catalogue , mock , numpy -, pathlib , pytest -, pytz +, ruamel-yaml }: buildPythonPackage rec { pname = "srsly"; - version = "2.4.0"; + version = "2.4.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e29730be53015970e4a59050e8e9f9be44d762108a617df56c9dfc981b515ab7"; + hash = "sha256-sPKuwKMp5ufnQqCmDpmnSWjKKb5x81xcTeIh4ygXaSY="; }; nativeBuildInputs = [ cython ]; @@ -30,13 +29,9 @@ buildPythonPackage rec { mock numpy pytest - pytz + ruamel-yaml ]; - # TypeError: cannot serialize '_io.BufferedRandom' object - # Possibly because of sandbox restrictions. - doCheck = false; - pythonImportsCheck = [ "srsly" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sslyze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sslyze/default.nix index 991f85c900..5680b4bd36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sslyze/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sslyze/default.nix @@ -6,39 +6,44 @@ , typing-extensions , faker , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "sslyze"; - version = "3.1.0"; + version = "4.1.0"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - sha256 = "02p0lgpkfq88dys0dqw0z8bpg9g8pds2lvs9awd9f2w5cb1pwr83"; + hash = "sha256-oSTKNiECczlPAbv5Azc023PcquFbnlC5O+8tVgNcUW0="; }; patchPhase = '' substituteInPlace setup.py \ - --replace "cryptography>=2.6,<3.3" "cryptography>=2.6,<4.0" + --replace "cryptography>=2.6,<3.5" "cryptography>=2.6,<4.0" ''; checkInputs = [ pytestCheckHook ]; - checkPhase = '' - # Most of the tests are online; hence, applicable tests are listed - # explicitly here - pytest \ - tests/test_main.py \ - tests/test_scanner.py \ - tests/cli_tests/test_console_output.py \ - tests/cli_tests/test_json_output.py \ - tests/cli_tests/test_server_string_parser.py \ - tests/plugins_tests/test_scan_commands.py \ - tests/plugins_tests/certificate_info/test_certificate_utils.py \ - -k "not (TestScanner and test_client_certificate_missing)" - ''; + # Most of the tests are online; hence, applicable tests are listed + # explicitly here + pytestFlagsArray = [ + "tests/test_main.py" + "tests/test_scanner.py" + "tests/cli_tests/test_console_output.py" + "tests/cli_tests/test_json_output.py" + "tests/cli_tests/test_server_string_parser.py" + "tests/plugins_tests/test_scan_commands.py" + "tests/plugins_tests/certificate_info/test_certificate_utils.py" + ]; + + disabledTests = [ + "test_error_client_certificate_needed" + ]; + pythonImportsCheck = [ "sslyze" ]; propagatedBuildInputs = [ nassl cryptography typing-extensions faker ]; @@ -47,7 +52,7 @@ buildPythonPackage rec { homepage = "https://github.com/nabla-c0d3/sslyze"; description = "Fast and powerful SSL/TLS scanning library"; platforms = platforms.linux ++ platforms.darwin; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ veehaitch ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix index 32e4bab5af..c607d45e17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix @@ -12,6 +12,8 @@ buildPythonPackage rec { postPatch = '' rm test/unit/installation.py sed -i "/test.unit.installation/d" test/settings.cfg + # https://github.com/torproject/stem/issues/56 + sed -i '/MOCK_VERSION/d' run_tests.py ''; checkInputs = [ mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stytra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stytra/default.nix index 80eefc0a63..fba544789a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stytra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stytra/default.nix @@ -8,7 +8,6 @@ , pandas , tables , git -, ffmpeg_3 , scikitimage , matplotlib , qdarkstyle @@ -59,7 +58,6 @@ buildPythonPackage rec { pandas tables git - ffmpeg_3 scikitimage matplotlib qdarkstyle @@ -79,7 +77,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/portugueslab/stytra"; description = "A modular package to control stimulation and track behaviour"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ tbenst ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix index 9ba073df92..cc47eafd1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix @@ -1,37 +1,44 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub +, pythonOlder , h5py , matplotlib , numpy , phonopy , pymatgen -, pytest , scipy , seekpath , spglib +, castepxbin +, pytestCheckHook }: buildPythonPackage rec { pname = "sumo"; - version = "2.2.1"; + version = "2.2.4"; + + disabled = pythonOlder "3.6"; # No tests in Pypi tarball src = fetchFromGitHub { owner = "SMTG-UCL"; repo = "sumo"; rev = "v${version}"; - sha256 = "0r88f5w33h9b0mv7shlqc4przwvas5ycgndvl91wqjnm3b2s3ix0"; + sha256 = "051353gsxmh4qnabshfnc00mmzdbh1fgk1xdfnsfgcnijxgw25bb"; }; - propagatedBuildInputs = [ numpy scipy spglib pymatgen h5py matplotlib seekpath phonopy ]; + propagatedBuildInputs = [ + spglib + numpy + scipy + h5py + pymatgen + phonopy + matplotlib + seekpath + castepxbin + ]; - checkInputs = [ pytest ]; - - checkPhase = '' - pytest . - ''; - - # tests have type annotations, can only run on 3.5+ - doCheck = (!isPy27); + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Toolkit for plotting and analysis of ab initio solid-state calculation data"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix index 65eb6abb04..2de1e3fd5f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix @@ -11,6 +11,7 @@ , beautifulsoup4 , drms , glymur +, h5netcdf , hypothesis , matplotlib , numpy @@ -50,6 +51,7 @@ buildPythonPackage rec { pandas astropy astropy-helpers + h5netcdf parfive sqlalchemy scikitimage diff --git a/third_party/nixpkgs/pkgs/development/python-modules/surepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/surepy/default.nix index dd071b5cf0..ff2b588e47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/surepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/surepy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "surepy"; - version = "0.5.0"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "benleb"; repo = pname; rev = "v${version}"; - sha256 = "1adsnjya142bxdhfxqsi2qa35ylvdcibigs1wafjlxazlxs3mg0j"; + sha256 = "sha256-XoYiZPBc9SybyKocui1HqSA+YPiPpbupJWMCfmQT5RU="; }; nativeBuildInputs = [ poetry-core ]; @@ -43,11 +43,6 @@ buildPythonPackage rec { rich ]; - postPatch = '' - # halo is out-dated, https://github.com/benleb/surepy/pull/7 - substituteInPlace pyproject.toml --replace "^0.0.30" "^0.0.31" - ''; - # Project has no tests doCheck = false; pythonImportsCheck = [ "surepy" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix index 5216fc7d0d..b6754e15ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix @@ -2,6 +2,7 @@ , odfpy , openpyxl , pandas +, setuptools-scm , pytest , pytestcov , pyyaml @@ -20,6 +21,7 @@ buildPythonPackage rec { sha256 = "f83cac08454f225a34a305daa20e2110d5e6335135d505f93bc66583a5f9c10d"; }; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ]; checkInputs = [ pytest pytestcov unicodecsv pandas ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tappy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tappy/default.nix new file mode 100644 index 0000000000..9e0b83bc92 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tappy/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tap.py"; + version = "3.0"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-9e7u6/1k5T0yZhdSu0wohYmjuru5bbPzkaTsKfE1nHA="; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "tap" ]; + + meta = with lib; { + homepage = "https://github.com/python-tap/tappy"; + description = "A set of tools for working with the Test Anything Protocol (TAP) in Python"; + license = licenses.bsd2; + maintainers = with maintainers; [ sfrijters ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/telfhash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/telfhash/default.nix index a7aca8866e..ddb265bf03 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/telfhash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/telfhash/default.nix @@ -17,6 +17,8 @@ buildPythonPackage { sha256 = "jNu6qm8Q/UyJVaCqwFOPX02xAR5DwvCK3PaH6Fvmakk="; }; + patches = [ ./telfhash-new-tlsh-hash.patch ]; + # The tlsh library's name is just "tlsh" postPatch = '' substituteInPlace requirements.txt --replace "python-tlsh" "tlsh" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/telfhash/telfhash-new-tlsh-hash.patch b/third_party/nixpkgs/pkgs/development/python-modules/telfhash/telfhash-new-tlsh-hash.patch new file mode 100644 index 0000000000..3984a4c1e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/telfhash/telfhash-new-tlsh-hash.patch @@ -0,0 +1,30 @@ +diff --git a/telfhash/grouping.py b/telfhash/grouping.py +index c62f8d9..4ee9f0b 100644 +--- a/telfhash/grouping.py ++++ b/telfhash/grouping.py +@@ -32,10 +32,10 @@ import tlsh + def get_combination(telfhash_data): + + # +- # TLSH hash is 70 characters long. if the telfhash is not 70 ++ # The new TLSH hash is 72 characters long. if the telfhash is not 72 + # characters in length, exclude from the list + # +- files_list = [x for x in list(telfhash_data.keys()) if telfhash_data[x]["telfhash"] is not None and len(telfhash_data[x]["telfhash"]) == 70] ++ files_list = [x for x in list(telfhash_data.keys()) if telfhash_data[x]["telfhash"] is not None and len(telfhash_data[x]["telfhash"]) == 72] + + # + # get the combination of all the possible pairs of filenames +diff --git a/telfhash/telfhash.py b/telfhash/telfhash.py +index f2bbd25..c6e346c 100755 +--- a/telfhash/telfhash.py ++++ b/telfhash/telfhash.py +@@ -132,7 +132,7 @@ def get_hash(symbols_list): + symbol_string = ",".join(symbols_list) + encoded_symbol_string = symbol_string.encode("ascii") + +- return tlsh.forcehash(encoded_symbol_string).lower() ++ return tlsh.forcehash(encoded_symbol_string) + + + def elf_get_imagebase(elf): diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch b/third_party/nixpkgs/pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch new file mode 100644 index 0000000000..c9cb8b4a52 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch @@ -0,0 +1,40 @@ +From d944d8fa6cb6d1667f3e4c4e0cff4c4b2a7c0a30 Mon Sep 17 00:00:00 2001 +From: Cole Helbling +Date: Fri, 7 May 2021 11:00:46 -0700 +Subject: [PATCH] Replace `debut` with `debian-inspector` + +--- + requirements.in | 2 +- + tern/analyze/common.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/requirements.in b/requirements.in +index edd90ab..5135841 100644 +--- a/requirements.in ++++ b/requirements.in +@@ -12,6 +12,6 @@ requests + stevedore + pbr + dockerfile-parse +-debut ++debian-inspector + regex + GitPython +diff --git a/tern/analyze/common.py b/tern/analyze/common.py +index 6962404..0f5e77d 100644 +--- a/tern/analyze/common.py ++++ b/tern/analyze/common.py +@@ -19,8 +19,8 @@ from tern.utils import cache + from tern.utils import constants + from tern.utils import general + from tern.utils import rootfs +-from debut import debcon +-from debut import copyright as debut_copyright ++from debian_inspector import debcon ++from debian_inspector import copyright as debut_copyright + + # global logger + logger = logging.getLogger(constants.logger_name) +-- +2.31.1 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tern/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tern/default.nix index 6247087dd6..7eb889c873 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tern/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tern/default.nix @@ -7,7 +7,7 @@ , requests , stevedore , pbr -, debut +, debian-inspector , regex , GitPython , prettytable @@ -22,6 +22,14 @@ buildPythonPackage rec { sha256 = "606c62944991b2cbcccf3f5353be693305d6d7d318c3865b9ecca49dbeab2727"; }; + patches = [ + # debut was renamed to debian-inspector + # https://github.com/tern-tools/tern/pull/962 + # NOTE: Has to be in-tree because the upstream patch doesn't apply cleanly + # to the PyPi source. + ./0001-Replace-debut-with-debian-inspector.patch + ]; + preBuild = '' cp requirements.{in,txt} ''; @@ -36,7 +44,7 @@ buildPythonPackage rec { dockerfile-parse requests stevedore - debut + debian-inspector regex GitPython prettytable diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix index 31b02e3f26..9f9fe685c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix @@ -9,7 +9,7 @@ , pyphen , pytest , requests -, scikitlearn +, scikit-learn , scipy , spacy , srsly @@ -35,7 +35,7 @@ buildPythonPackage rec { pyemd pyphen requests - scikitlearn + scikit-learn scipy spacy srsly diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix index a92d349e99..4aac0d756d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.0.2"; + version = "8.0.3"; src = fetchPypi { inherit pname version; - sha256 = "20f033b3d9fbd02389d8f828cebcd3a42aee3e17ed4c2d56c6d5163af83a9cee"; + hash = "sha256-w3CnpG0BtYjY1fmdjV42s8usRRJjg1b6Qw9/Urs6iJc="; }; buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timeago/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timeago/default.nix new file mode 100644 index 0000000000..0c2a688f67 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/timeago/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "timeago"; + version = "1.0.15"; + + src = fetchFromGitHub { + owner = "hustcc"; + repo = pname; + rev = version; + sha256 = "03vm7c02l4g2d1x33w382i1psk8i3an7xchk69yinha33fjj1cag"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "test/testcase.py" ]; + + pythonImportsCheck = [ "timeago" ]; + + meta = with lib; { + description = "Python module to format past datetime output"; + homepage = "https://github.com/hustcc/timeago"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tld/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tld/default.nix index 13f23edaad..ed601a2620 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tld/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tld/default.nix @@ -26,6 +26,12 @@ buildPythonPackage rec { tox ]; + # these tests require network access, but disabledTestPaths doesn't work. + # the file needs to be `import`ed by another python test file, so it + # can't simply be removed. + preCheck = '' + echo > src/tld/tests/test_commands.py + ''; pythonImportsCheck = [ "tld" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tls-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tls-parser/default.nix index 5b6bfe6a0e..ad35fe5012 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tls-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tls-parser/default.nix @@ -1,5 +1,5 @@ { lib -, isPy27 +, pythonOlder , fetchFromGitHub , buildPythonPackage , pytestCheckHook @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "tls-parser"; version = "1.2.2"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; @@ -19,6 +19,8 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "tls_parser" ]; + meta = with lib; { homepage = "https://github.com/nabla-c0d3/tls_parser"; description = "Small library to parse TLS records"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix new file mode 100644 index 0000000000..62980dcca8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchurl +, isPy37 +, isPy38 +, isPy39 +, patchelf +, pillow +, python +, pytorch-bin +}: + +let + pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; + srcs = import ./binary-hashes.nix version; + unsupported = throw "Unsupported system"; + version = "0.9.1"; +in buildPythonPackage { + inherit version; + + pname = "torchvision"; + + format = "wheel"; + + src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; + + disabled = !(isPy37 || isPy38 || isPy39); + + nativeBuildInputs = [ + patchelf + ]; + + propagatedBuildInputs = [ + pillow + pytorch-bin + ]; + + pythonImportsCheck = [ "torchvision" ]; + + postFixup = let + rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ]; + in '' + # Note: after patchelf'ing, libcudart can still not be found. However, this should + # not be an issue, because PyTorch is loaded before torchvision and brings + # in the necessary symbols. + patchelf --set-rpath "${rpath}:${pytorch-bin}/${python.sitePackages}/torch/lib:" \ + "$out/${python.sitePackages}/torchvision/_C.so" + ''; + + meta = with lib; { + description = "PyTorch vision library"; + homepage = "https://pytorch.org/"; + changelog = "https://github.com/pytorch/vision/releases/tag/v${version}"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix new file mode 100644 index 0000000000..b9a991e24a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -0,0 +1,22 @@ +# Warning: use the same CUDA version as pytorch-bin. +# +# Precompiled wheels can be found at: +# https://download.pytorch.org/whl/torch_stable.html + +version: { + x86_64-linux-37 = { + name = "torchvision-${version}-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torchvision-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-7EMVB8KZg2I3P4RqnIVk/7OOAPA1OWOipns58cSCUrw="; + }; + x86_64-linux-38 = { + name = "torchvision-${version}-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torchvision-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-VjsCBW9Lusr4aDQLqaFh5dpV/5ZJ5PDs7nY4CbCHDTA="; + }; + x86_64-linux-39 = { + name = "torchvision-${version}-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torchvision-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-pzR7TBE+WcAmozskoeOVBuMkGJf9tvsaXsUkTcu86N8="; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix index ec648281c8..8bfbd534f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/twisted/treq"; description = "A requests-like API built on top of twisted.web's Agent"; license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix new file mode 100644 index 0000000000..1ebad53220 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix @@ -0,0 +1,93 @@ +{ lib +, buildPythonPackage +, callPackage +, fetchFromGitHub +, cerberus +, configparser +, deepdiff +, geoip2 +, jinja2 +, openpyxl +, tabulate +, yangson +, pytestCheckHook +, pyyaml +}: + +let + ttp_templates = callPackage ./templates.nix { }; +in +buildPythonPackage rec { + pname = "ttp"; + version = "0.6.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "dmulyalin"; + repo = pname; + rev = version; + sha256 = "08pglwmnhdrsj9rgys1zclhq1h597izb0jq7waahpdabfg25v2sw"; + }; + + propagatedBuildInputs = [ + # https://github.com/dmulyalin/ttp/blob/master/docs/source/Installation.rst#additional-dependencies + cerberus + configparser + deepdiff + geoip2 + jinja2 + # n2g unpackaged + # netmiko unpackaged + # nornir unpackaged + openpyxl + tabulate + yangson + ]; + + pythonImportsCheck = [ + "ttp" + ]; + + checkInputs = [ + pytestCheckHook + pyyaml + ttp_templates + ]; + + disabledTestPaths = [ + # missing package n2g + "test/pytest/test_N2G_formatter.py" + ]; + + disabledTests = [ + # data structure mismatches + "test_yangson_validate" + "test_yangson_validate_yang_lib_in_output_tag_data" + "test_yangson_validate_multiple_inputs_mode_per_input_with_yang_lib_in_file" + "test_yangson_validate_multiple_inputs_mode_per_template" + "test_yangson_validate_multiple_inputs_mode_per_input_with_yang_lib_in_file_to_xml" + "test_yangson_validate_multiple_inputs_mode_per_template_to_xml" + "test_adding_data_from_files" + "test_lookup_include_csv" + "test_inputs_with_template_base_path" + "test_group_inputs" + "test_inputs_url_filters_extensions" + # ValueError: dictionary update sequence element #0 has length 1; 2 is required + "test_include_attribute_with_yaml_loader" + # TypeError: string indices must be integers + "test_lookup_include_yaml" + # missing package n2g + "test_n2g_formatter" + ]; + + pytestFlagsArray = [ + "test/pytest" + ]; + + meta = with lib; { + description = "Template Text Parser"; + homepage = "https://github.com/dmulyalin/ttp"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ttp/templates.nix b/third_party/nixpkgs/pkgs/development/python-modules/ttp/templates.nix new file mode 100644 index 0000000000..835548d078 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ttp/templates.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "ttp-templates"; + version = "0.1.1"; + format = "setuptools"; + + src = fetchPypi { + pname = "ttp_templates"; + inherit version; + sha256 = "0vg7k733i8jqnfz8mpq8kzr2l7b7drk29zkzik91029f6w7li007"; + }; + + # drop circular dependency on ttp + postPatch = '' + substituteInPlace setup.py --replace '"ttp>=0.6.0"' "" + ''; + + # circular dependency on ttp + doCheck = false; + + meta = with lib; { + description = "Template Text Parser Templates"; + homepage = "https://github.com/dmulyalin/ttp_templates"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/txaio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txaio/default.nix index c2f2c9451b..074e7b8d50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/txaio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/txaio/default.nix @@ -1,30 +1,55 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, mock, six, twisted, isPy37, isPy27 }: +{ lib +, buildPythonPackage +, fetchPypi +, mock +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, six +, twisted +, zope_interface +}: buildPythonPackage rec { pname = "txaio"; version = "21.2.1"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "7d6f89745680233f1c4db9ddb748df5e88d2a7a37962be174c0fd04c8dba1dc8"; + sha256 = "sha256-fW+JdFaAIz8cTbndt0jfXojSp6N5Yr4XTA/QTI26Hcg="; }; - checkInputs = [ pytest mock ]; + propagatedBuildInputs = [ + six + twisted + zope_interface + ]; - propagatedBuildInputs = [ six twisted ]; + checkInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; - checkPhase = '' - py.test -k "not test_sdist" - ''; + disabledTests = [ + # No real value + "test_sdist" + # Some tests seems out-dated and require additional data + "test_as_future" + "test_errback" + "test_create_future" + "test_callback" + "test_immediate_result" + "test_cancel" + ]; - # Needs some fixing - doCheck = false; + pythonImportsCheck = [ "txaio" ]; meta = with lib; { - description = "Utilities to support code that runs unmodified on Twisted and asyncio."; - homepage = "https://github.com/crossbario/txaio"; - license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; + description = "Utilities to support code that runs unmodified on Twisted and asyncio"; + homepage = "https://github.com/crossbario/txaio"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/txgithub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txgithub/default.nix index 09af476e94..45e3667649 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/txgithub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/txgithub/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { description = "GitHub API client implemented using Twisted."; homepage = "https://github.com/tomprince/txgithub"; license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/txrequests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txrequests/default.nix index be32dc4a73..cf3bee52c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/txrequests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/txrequests/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { description = "Asynchronous Python HTTP for Humans."; homepage = "https://github.com/tardyp/txrequests"; license = licenses.asl20; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix index 05bc653b05..8e4abc5bd0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.2.13"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zDUFe/yMCThn+qJqDekMrUHEf1glGxBw4pioExLLoqg="; + sha256 = "sha256-XzfiLzRK1/DCmnxPW/H+KqnBuCbpYPawS2JnTQq+Vbw="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uc-micro-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uc-micro-py/default.nix new file mode 100644 index 0000000000..9b20e22511 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/uc-micro-py/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "uc-micro-py"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "tsutsu3"; + repo = "uc.micro-py"; + rev = "v${version}"; + hash = "sha256-23mKwoRGjtxpCOC26V8bAN5QEHLDOoSqPeTlUuIrxZ0="; + }; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "uc_micro" ]; + + meta = with lib; { + description = "Micro subset of unicode data files for linkify-it-py"; + homepage = "https://github.com/tsutsu3/uc.micro-py"; + license = licenses.mit; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix index f888704e6a..fcf96a715f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , nose , numpy -, scikitlearn +, scikit-learn , scipy , numba , pynndescent @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy - scikitlearn + scikit-learn scipy numba pynndescent diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix index 96b27127cc..b5ff5be206 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix @@ -1,19 +1,25 @@ { lib , buildPythonPackage , fetchFromGitHub +, poetry-core }: buildPythonPackage rec { pname = "unpaddedbase64"; - version = "1.1.0"; + version = "2.1.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - sha256 = "0if3fjfxga0bwdq47v77fs9hrcqpmwdxry2i2a7pdqsp95258nxd"; + sha256 = "1n6har8pxv0mqb96lanzihp1xf76aa17jw3977drb1fgz947pnmz"; }; + nativeBuildInputs = [ + poetry-core + ]; + meta = with lib; { homepage = "https://github.com/matrix-org/python-unpaddedbase64"; description = "Unpadded Base64"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/userpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/userpath/default.nix index 8366a56158..237293370a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/userpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/userpath/default.nix @@ -2,19 +2,18 @@ , buildPythonPackage , fetchPypi , click -, distro }: buildPythonPackage rec { pname = "userpath"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256="0mfjmvx286z1dmnrc7bm65x8gj8qrmkcyagl0vf5ywfq0bm48591"; + sha256="0fj2lj9vcns5sxv72v3ggrszcl7j1jd9a6ycnsl00218nycliy31"; }; - propagatedBuildInputs = [ click distro ]; + propagatedBuildInputs = [ click ]; # test suite is difficult to emulate in sandbox due to shell manipulation doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix index 3ba9dcb5f1..125850a080 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix @@ -44,8 +44,15 @@ buildPythonPackage rec { "--assert=plain" "--strict" "--tb=native" + ] ++ lib.optionals (stdenv.isAarch64) [ + # test gets stuck in epoll_pwait on hydras aarch64 builders + # https://github.com/MagicStack/uvloop/issues/412 + "--deselect" "tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data" + ]; + + disabledTestPaths = [ # ignore code linting tests - "--ignore=tests/test_sourcecode.py" + "tests/test_sourcecode.py" ]; # force using installed/compiled uvloop vs source by moving tests to temp dir diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix index 1f7642bfe3..01ab42ed9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , isPy27 , click , click-log @@ -45,6 +46,14 @@ buildPythonPackage rec { pytest-subtesthack ]; + patches = [ + (fetchpatch { + name = "update-usage-deprecated-method.patch"; + url = "https://github.com/pimutils/vdirsyncer/commit/7577fa21177442aacc2d86640ef28cebf1c4aaef.patch"; + sha256 = "0inkr1wfal20kssij8l5myhpjivxg8wlvhppqc3lvml9d1i75qbh"; + }) + ]; + postPatch = '' substituteInPlace setup.py --replace "click>=5.0,<6.0" "click" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix index da13ad2102..c482211320 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -11,7 +11,7 @@ , pygments , numpy , scipy -, scikitlearn }: +, scikit-learn }: buildPythonPackage rec { pname = "vowpalwabbit"; @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy - scikitlearn + scikit-learn scipy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix index df9586fc8e..9d96977088 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "watchdog"; - version = "2.0.3"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QojTqYQyTbSS5XqhaWZiOKJXjwr1oIFoVSZgj7n2vWE="; + sha256 = "sha256-KJREC06pWm70xdFS3u2+JwyuRgkmgnELcCigTWppgPY="; }; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webssh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webssh/default.nix new file mode 100644 index 0000000000..00aff79437 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/webssh/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, tornado, paramiko }: + +buildPythonPackage rec { + pname = "webssh"; + version = "1.5.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Au6PE8jYm8LkEp0B1ymW//ZkrkcV0BauwufQmrHLEU4="; + }; + + propagatedBuildInputs = [ tornado paramiko ]; + + pythonImportsCheck = [ "webssh" ]; + + meta = with lib; { + homepage = "https://github.com/huashengdun/webssh/"; + description = "Web based ssh client"; + license = licenses.mit; + maintainers = with maintainers; [ davidtwco ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whoosh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whoosh/default.nix index d3ff703f69..e31d97a07d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whoosh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whoosh/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { checking library."; homepage = "https://bitbucket.org/mchaput/whoosh"; license = licenses.bsd2; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/word2vec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/word2vec/default.nix index 259566c8fc..bda8f59d2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/word2vec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/word2vec/default.nix @@ -4,7 +4,7 @@ , fetchzip , cython , numpy -, scikitlearn +, scikit-learn , six , setuptools_scm , gcc @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm gcc ]; - propagatedBuildInputs = [ cython numpy scikitlearn six ]; + propagatedBuildInputs = [ cython numpy scikit-learn six ]; checkInputs = [ pytest pytestcov ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix index d687ffd2d0..6aa8599653 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix @@ -6,38 +6,43 @@ , msgpack , mecab-python3 , jieba -, pytest -, pythonOlder +, pytestCheckHook +, isPy27 , fetchFromGitHub }: buildPythonPackage rec { pname = "wordfreq"; - version = "2.3.2"; - disabled = pythonOlder "3"; + version = "2.5"; + disabled = isPy27; src = fetchFromGitHub { owner = "LuminosoInsight"; repo = "wordfreq"; - # upstream don't tag by version rev = "v${version}"; - sha256 = "078657iiksrqzcc2wvwhiilf3xxq5vlinsv0kz03qzqr1qyvbmas"; + sha256 = "09wzraddbdw3781pk2sxlz8knax9jrcl24ymz54wx6sk0gvq95i7"; }; - propagatedBuildInputs = [ regex langcodes ftfy msgpack mecab-python3 jieba ]; + propagatedBuildInputs = [ + regex + langcodes + ftfy + msgpack + mecab-python3 + jieba + ]; - # patch to relax version requirements for regex - # dependency to prevent break in upgrade postPatch = '' substituteInPlace setup.py --replace "regex ==" "regex >=" ''; - checkInputs = [ pytest ]; - - checkPhase = '' - # These languages require additional dictionaries - pytest tests -k 'not test_japanese and not test_korean and not test_languages and not test_french_and_related' - ''; + checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # These languages require additional dictionaries that aren't packaged + "test_languages" + "test_japanese" + "test_korean" + ]; meta = with lib; { description = "A library for looking up the frequencies of words in many languages, based on many sources of data"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xdot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xdot/default.nix index 7dbbd89e78..e28deaf07d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xdot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xdot/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb_run +{ lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb-run , wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gtk3, numpy }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { disabled = !isPy3k; nativeBuildInputs = [ wrapGAppsHook ]; propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 numpy ]; - checkInputs = [ xvfb_run ]; + checkInputs = [ xvfb-run ]; checkPhase = '' xvfb-run -s '-screen 0 800x600x24' ${python3.interpreter} nix_run_setup test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xgboost/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xgboost/default.nix index 81a8d05f5b..4f02d72c9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xgboost/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xgboost/default.nix @@ -1,8 +1,8 @@ { buildPythonPackage -, pytest -, nose +, pytestCheckHook +, cmake , scipy -, scikitlearn +, scikit-learn , stdenv , xgboost , substituteAll @@ -10,28 +10,52 @@ , matplotlib , graphviz , datatable +, hypothesis }: buildPythonPackage { pname = "xgboost"; inherit (xgboost) version src meta; - patches = [ - (substituteAll { - src = ./lib-path-for-python.patch; - libpath = "${xgboost}/lib"; - extention = stdenv.hostPlatform.extensions.sharedLibrary; - }) + nativeBuildInputs = [ cmake ]; + buildInputs = [ xgboost ]; + propagatedBuildInputs = [ scipy ]; + checkInputs = [ + pytestCheckHook + scikit-learn + pandas + matplotlib + graphviz + datatable + hypothesis ]; - postPatch = "cd python-package"; - - propagatedBuildInputs = [ scipy ]; - buildInputs = [ xgboost ]; - checkInputs = [ nose pytest scikitlearn pandas matplotlib graphviz datatable ]; - - checkPhase = '' - ln -sf ../demo . - nosetests ../tests/python + # Override existing logic for locating libxgboost.so which is not appropriate for Nix + prePatch = let + libPath = "${xgboost}/lib/libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}"; + in '' + echo 'find_lib_path = lambda: ["${libPath}"]' > python-package/xgboost/libpath.py ''; + + dontUseCmakeConfigure = true; + + postPatch = '' + cd python-package + ''; + + preCheck = '' + ln -sf ../demo . + ln -s ${xgboost}/bin/xgboost ../xgboost + ''; + + pytestFlagsArray = ["../tests/python"]; + disabledTestPaths = [ + # Requires internet access: https://github.com/dmlc/xgboost/blob/03cd087da180b7dff21bd8ef34997bf747016025/tests/python/test_ranking.py#L81 + "../tests/python/test_ranking.py" + ]; + disabledTests = [ + "test_cli_binary_classification" + "test_model_compatibility" + ]; + } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xgboost/lib-path-for-python.patch b/third_party/nixpkgs/pkgs/development/python-modules/xgboost/lib-path-for-python.patch deleted file mode 100644 index c9252c12fe..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/xgboost/lib-path-for-python.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/python-package/xgboost/libpath.py b/python-package/xgboost/libpath.py -index d87922c0..859a30fb 100644 ---- a/python-package/xgboost/libpath.py -+++ b/python-package/xgboost/libpath.py -@@ -19,32 +19,4 @@ def find_lib_path(): - lib_path: list(string) - List of all found library path to xgboost - """ -- curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__))) -- # make pythonpack hack: copy this directory one level upper for setup.py -- dll_path = [curr_path, os.path.join(curr_path, '../../lib/'), -- os.path.join(curr_path, './lib/'), -- os.path.join(sys.prefix, 'xgboost')] -- if sys.platform == 'win32': -- if platform.architecture()[0] == '64bit': -- dll_path.append(os.path.join(curr_path, '../../windows/x64/Release/')) -- # hack for pip installation when copy all parent source directory here -- dll_path.append(os.path.join(curr_path, './windows/x64/Release/')) -- else: -- dll_path.append(os.path.join(curr_path, '../../windows/Release/')) -- # hack for pip installation when copy all parent source directory here -- dll_path.append(os.path.join(curr_path, './windows/Release/')) -- dll_path = [os.path.join(p, 'xgboost.dll') for p in dll_path] -- elif sys.platform.startswith('linux') or sys.platform.startswith('freebsd'): -- dll_path = [os.path.join(p, 'libxgboost.so') for p in dll_path] -- elif sys.platform == 'darwin': -- dll_path = [os.path.join(p, 'libxgboost.dylib') for p in dll_path] -- -- lib_path = [p for p in dll_path if os.path.exists(p) and os.path.isfile(p)] -- -- # From github issues, most of installation errors come from machines w/o compilers -- if not lib_path and not os.environ.get('XGBOOST_BUILD_DOC', False): -- raise XGBoostLibraryNotFound( -- 'Cannot find XGBoost Library in the candidate path, ' + -- 'did you install compilers and run build.sh in root path?\n' -- 'List of candidates:\n' + ('\n'.join(dll_path))) -- return lib_path -+ return ["@libpath@/libxgboost@extention@"] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix index aefe3ed2b9..ca23184726 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.18.1"; + version = "0.18.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-Zf7Od3v54LxMofm67XHeRM4Yeg1+KQLRhFl1BihAxGc="; + sha256 = "sha256-7jfZtncjcYaAS/7N06FWXh4qSTH6y+VdFx3kKyQxIbM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix new file mode 100644 index 0000000000..44ac6cf9fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, pyxb +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "yangson"; + version = "1.4.8"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "11w4aq0w2rnkz1axgmw003z2snd4kc49dil6kp1ajlqnfh1pcx8m"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + pyxb + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "yangson" + ]; + + meta = with lib; { + description = "Library for working with data modelled in YANG"; + homepage = "https://github.com/CZ-NIC/yangson"; + license = with licenses; [ + gpl3Plus + lgpl3Plus + ]; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix index 4728da51a6..9c92e5e55a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.16.0"; + version = "0.17.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-/94/taeBI6xZ3uN/wfMnk/NPmk+j0+aaH8CAZBEsK10="; + sha256 = "sha256-b5+AGf9qFqQbx4Rq4RovK2NllYsB+sXVMFU4AvbDkzI="; }; 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 5105cbfff0..313f121510 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.29.0"; + version = "0.31.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eu+7ZYtFKx/X5REkNk+TjG9eQtbqiT+iVXvqjAbFQK8="; + sha256 = "sha256-U6GAJIRxxvgb0f/8vOA+2T19jq8QkFyRIaweqZbRmEQ="; }; propagatedBuildInputs = [ ifaddr ]; @@ -25,6 +25,7 @@ buildPythonPackage rec { disabledTests = [ # disable tests that expect some sort of networking in the build container + "test_close_multiple_times" "test_launch_and_close" "test_launch_and_close_v4_v6" "test_launch_and_close_v6_only" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix index 2543d06758..894539a3e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix @@ -3,32 +3,34 @@ , asynctest , buildPythonPackage , coloredlogs -, coveralls , fetchFromGitHub +, jsonschema , pyserial , pyserial-asyncio , pytest-asyncio , pytest-mock , pytest-timeout -, pytestcov , pytestCheckHook +, pythonOlder , voluptuous -, zigpy }: +, zigpy +}: buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { - owner = "zha-ng"; - repo = "zigpy-znp"; + owner = "zigpy"; + repo = pname; rev = "v${version}"; - sha256 = "1g5jssdnibhb4i4k1js9iy9w40cipf1gdnyp847x0bv6wblzx8rl"; + sha256 = "152d803jfrvkj4namni41fnbbnq85wd7zsqjhmkwrrmn2gvqjiln"; }; propagatedBuildInputs = [ async-timeout coloredlogs + jsonschema pyserial pyserial-asyncio voluptuous @@ -36,18 +38,19 @@ buildPythonPackage rec { ]; checkInputs = [ - asynctest - coveralls pytest-asyncio pytest-mock pytest-timeout - pytestcov pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.8") [ + asynctest ]; + pythonImportsCheck = [ "zigpy_znp" ]; + meta = with lib; { - description = "A library for zigpy which communicates with TI ZNP radios"; - homepage = "https://github.com/zha-ng/zigpy-znp"; + description = "Python library for zigpy which communicates with TI ZNP radios"; + homepage = "https://github.com/zigpy/zigpy-znp"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zulip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zulip/default.nix index ed2276623c..66033fcce3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zulip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zulip/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zulip"; - version = "0.7.1"; + version = "0.8.0"; disabled = !isPy3k; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zulip"; repo = "python-zulip-api"; rev = version; - sha256 = "0da1ki1v252avy27j6d7snnc0gyq0xa9fypm3qdmxhw2w79d6q36"; + sha256 = "sha256-gJ+YRJC6wmQzPakApOqytyPy34cS/jjzEZhRIvWUBIQ="; }; sourceRoot = "source/zulip"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix index 61dba04a79..11d1231b48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.23.1"; + version = "0.24.0"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "0kmmhn357k22ana0ysd8jlz1fyfaqlc8k74ryaik0rrw7nmn1n11"; + sha256 = "sha256-LHAlGWoASDiFwvy59uXl5GH5pPmMuthoo4ZrFegkCIU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/r-modules/default.nix b/third_party/nixpkgs/pkgs/development/r-modules/default.nix index ae23b32b71..067db74663 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/default.nix @@ -379,6 +379,7 @@ let packagesWithBuildInputs = { # sort -t '=' -k 2 gam = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; + RcppArmadillo = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; quantreg = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; rmutil = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; robustbase = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; diff --git a/third_party/nixpkgs/pkgs/development/r-modules/generic-builder.nix b/third_party/nixpkgs/pkgs/development/r-modules/generic-builder.nix index 1e96a64a5e..7201bab40e 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/generic-builder.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, R, libcxx, xvfb_run, util-linux, Cocoa, Foundation, gettext, gfortran }: +{ stdenv, lib, R, libcxx, xvfb-run, util-linux, Cocoa, Foundation, gettext, gfortran }: { name, buildInputs ? [], requireX ? false, ... } @ attrs: stdenv.mkDerivation ({ buildInputs = buildInputs ++ [R gettext] ++ - lib.optionals requireX [util-linux xvfb_run] ++ + lib.optionals requireX [util-linux xvfb-run] ++ lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran]; NIX_CFLAGS_COMPILE = - lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; configurePhase = '' runHook preConfigure @@ -29,7 +29,7 @@ stdenv.mkDerivation ({ rCommand = if requireX then # Unfortunately, xvfb-run has a race condition even with -a option, so that # we acquire a lock explicitly. - "flock ${xvfb_run} xvfb-run -a -e xvfb-error R" + "flock ${xvfb-run} xvfb-run -a -e xvfb-error R" else "R"; diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix index e95fb1573d..356224c023 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/solargraph/default.nix @@ -11,6 +11,6 @@ bundlerApp { description = "A Ruby language server"; homepage = "https://solargraph.org/"; license = licenses.mit; - maintainers = with maintainers; [ worldofpeace nicknovitski angristan ]; + maintainers = with maintainers; [ nicknovitski angristan ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix b/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix new file mode 100644 index 0000000000..46ef678b5b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix @@ -0,0 +1,38 @@ +{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: + +let + pname = "altair"; + version = "4.0.2"; + name = "${pname}-v${version}"; + + src = fetchurl { + url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; + sha256 = "sha256-HCoK+ljcTmyBZSCDe6u2x2urqrQfi3DIlXfCqGWvl3E="; + }; + + appimageContents = appimageTools.extract { inherit name src; }; +in +appimageTools.wrapType2 { + inherit src name; + + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "A feature-rich GraphQL Client IDE"; + homepage = "https://github.com/imolorhe/altair"; + license = licenses.mit; + maintainers = with maintainers; [ evalexpr ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index abcd947fa3..d256b6e767 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.5.2"; + version = "2.5.5"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-/Pl9qDzFSL67lBEyHPqy3QfNCXzR510SgM0U8f55Dqg="; + sha256 = "sha256-M5O2NEGIVPWYKl11yxMMVreEtDO1VqcMkiGGrjNmk3A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index 64efad5081..62476cacbb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.150.0"; + version = "0.150.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "sha256-75QSM2v4xDCkDnxW6Qb2ZGiWClOSDCd0jSrUdupMXxY="; + sha256 = "sha256-waQdS0HJVW2WFQFklmZJC0jr09JrDP5Fl7SxVS0dsgU="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix index db1cf9c6ea..6cc9409e94 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, llvmPackages, python2 }: +{ lib, stdenv, fetchurl, cmake, llvmPackages, python3 }: stdenv.mkDerivation rec { pname = "include-what-you-use"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz"; }; - buildInputs = with llvmPackages; [ clang-unwrapped llvm python2 ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = with llvmPackages; [ cmake llvm.dev llvm clang-unwrapped python3]; + buildInputs = [ llvmPackages.libclang ]; cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/massif-visualizer/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/massif-visualizer/default.nix index c2f0236ed0..78f8bbeb68 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/massif-visualizer/default.nix @@ -25,6 +25,6 @@ mkDerivation rec { description = "Tool that visualizes massif data generated by valgrind"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ lethalman zraexy ]; + maintainers = with maintainers; [ zraexy ]; }; } 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 dea2fd895f..279a69327f 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 @@ -17,6 +17,7 @@ , containers , hnix , bytestring +, fetchpatch }: mkDerivation rec { @@ -36,10 +37,13 @@ mkDerivation rec { executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ]; testHaskellDepends = [ tasty tasty-hunit tasty-th ]; - # Relax upper bound on hnix https://github.com/Synthetica9/nix-linter/pull/46 - postPatch = '' - substituteInPlace nix-linter.cabal --replace "hnix >=0.8 && < 0.11" "hnix >=0.8" - ''; + patches = [ + # Fix compatibility with hnix≥0.13.0 https://github.com/Synthetica9/nix-linter/pull/51 + (fetchpatch { + url = "https://github.com/Synthetica9/nix-linter/commit/f73acacd8623dc25c9a35f8e04e4ff33cc596af8.patch"; + sha256 = "139fm21hdg3vcw8hv35kxj4awd52bjqbb76mpzx191hzi9plj8qc"; + }) + ]; description = "Linter for Nix(pkgs), based on hnix"; homepage = "https://github.com/Synthetica9/nix-linter"; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index 9f4efe396c..7a9206af09 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1d746016iyswb9kw7gprg32vj5rcfa2y9j11r2hsp61hsjfvmg8c"; + sha256 = "0bx6y1y6cfqz77m23w4ab1j2i7s83kv301razv9rkkyxpnpb16hi"; }; - vendorSha256 = "0whd0b9rll0s42hrr2fqp412d5frzmrnqnynpq75wda5rqzmaf8r"; + vendorSha256 = "0rfbjhi78qcaghn9xw658xcxl2x4ln4gnnyi9hsf3wz4cbybird7"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/async-profiler/0001-Fix-darwin-build.patch b/third_party/nixpkgs/pkgs/development/tools/async-profiler/0001-Fix-darwin-build.patch new file mode 100644 index 0000000000..bfb636bf56 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/async-profiler/0001-Fix-darwin-build.patch @@ -0,0 +1,27 @@ +From e54c17899118ea940c36bc17a48d8ff759243f16 Mon Sep 17 00:00:00 2001 +From: Uri Baghin +Date: Sat, 8 May 2021 09:49:18 +1000 +Subject: [PATCH] Fix darwin build. + +--- + src/itimer.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/itimer.cpp b/src/itimer.cpp +index 08c46d1..52628ef 100644 +--- a/src/itimer.cpp ++++ b/src/itimer.cpp +@@ -52,8 +52,8 @@ Error ITimer::start(Arguments& args) { + + OS::installSignalHandler(SIGPROF, signalHandler); + +- long sec = _interval / 1000000000; +- long usec = (_interval % 1000000000) / 1000; ++ time_t sec = _interval / 1000000000; ++ suseconds_t usec = (_interval % 1000000000) / 1000; + struct itimerval tv = {{sec, usec}, {sec, usec}}; + + if (setitimer(ITIMER_PROF, &tv, NULL) != 0) { +-- +2.31.1 + diff --git a/third_party/nixpkgs/pkgs/development/tools/async-profiler/default.nix b/third_party/nixpkgs/pkgs/development/tools/async-profiler/default.nix index d271528de7..66177d3a34 100644 --- a/third_party/nixpkgs/pkgs/development/tools/async-profiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/async-profiler/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; + patches = [ + # https://github.com/jvm-profiling-tools/async-profiler/pull/428 + ./0001-Fix-darwin-build.patch + ]; + fixupPhase = '' substituteInPlace $out/bin/async-profiler \ --replace 'JATTACH=$SCRIPT_DIR/build/jattach' \ diff --git a/third_party/nixpkgs/pkgs/development/tools/ats-acc/default.nix b/third_party/nixpkgs/pkgs/development/tools/ats-acc/default.nix new file mode 100644 index 0000000000..73e475da39 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/ats-acc/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchFromGitHub, ats2 }: + +stdenv.mkDerivation rec { + pname = "ats-acc"; + version = "unstable-2018-10-21"; + + src = fetchFromGitHub { + owner = "sparverius"; + repo = pname; + rev = "2d49f4e76d0fe1f857ceb70deba4aed13c306dcb"; + sha256 = "sha256-Wp39488YNL40GKp4KaJwhi75PsYP+gMtrZqAvs4Q/sw="; + }; + + nativeBuildInputs = [ ats2 ]; + + meta = with lib; { + description = "Pretty-print error messages of the ATS Compiler"; + homepage = "https://github.com/sparverius/ats-acc"; + maintainers = with maintainers; [ fortuneteller2k ]; + license = licenses.unfree; # Upstream has no license + }; +} 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 446d54f90c..fd1cc24119 100644 --- a/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix @@ -1,21 +1,41 @@ { fetchFromGitHub, lib, python3Packages }: +let + python3Packages2 = python3Packages.override { + overrides = self: super: { + arrow = self.callPackage ../../python-modules/arrow/2.nix { }; + }; + }; +in +let + python3Packages = python3Packages2; # two separate let … in to avoid infinite recursion +in python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "2.1.0"; + version = "2.4.0"; - src = fetchFromGitHub { - owner = "Backblaze"; - repo = "B2_Command_Line_Tool"; - rev = "v${version}"; - sha256 = "1kkpvxqgh5pw4kr8lh5gy9d7960hv9zvajbjiqhj6xgykwbpbgmq"; + src = python3Packages.fetchPypi { + inherit version; + pname = "b2"; + sha256 = "sha256-nNQDdSjUolj3PjWRn1fPBAEtPlgeent2PxzHqwH1Z6s="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'setuptools_scm<6.0' 'setuptools_scm' + ''; + propagatedBuildInputs = with python3Packages; [ b2sdk class-registry phx-class-registry setuptools + docutils + rst2ansi + ]; + + nativeBuildInputs = with python3Packages; [ + setuptools-scm ]; checkInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/bacon/default.nix b/third_party/nixpkgs/pkgs/development/tools/bacon/default.nix new file mode 100644 index 0000000000..1cf066e6b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/bacon/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices }: + +rustPlatform.buildRustPackage rec { + pname = "bacon"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "Canop"; + repo = pname; + rev = "v${version}"; + sha256 = "0wyx216q9q7y60bnnw4cbpv9zlbnjm2hwq0llkjw60fp3qalj9am"; + }; + + cargoSha256 = "1pii5ajl3xgylrm20pkwbd1lk7gv0pshl1cxjfna0l63q56v7f21"; + + buildInputs = lib.optional stdenv.isDarwin CoreServices; + + meta = with lib; { + description = "Background rust code checker"; + homepage = "https://github.com/Canop/bacon"; + license = licenses.agpl3Only; + maintainers = [ maintainers.FlorianFranzen ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix index ab73b8cd8f..b676213d09 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bD04wqmtBgdNlPGXz7/4kYQ97r9EthFfGExxOjt8u7k="; + sha256 = "sha256-w2YCqFkZLsTddj9OPOIdFPgXcXapCGWkc5RaH7RHg24="; }; vendorSha256 = "sha256-IkW13y51NhKflAeHLu8k7DxRqYVnfMHSnfFuT6H/flo="; diff --git a/third_party/nixpkgs/pkgs/development/tools/boomerang/default.nix b/third_party/nixpkgs/pkgs/development/tools/boomerang/default.nix index 4ac9159520..b37ab9a2d3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/boomerang/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/boomerang/default.nix @@ -1,8 +1,11 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, capstone, bison, flex }: +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, qtbase, capstone, bison, flex }: mkDerivation rec { pname = "boomerang"; version = "0.5.2"; + # NOTE: When bumping version beyond 0.5.2, you likely need to remove + # the cstdint.patch below. The patch does a fix that has already + # been done upstream but is not yet part of a release src = fetchFromGitHub { owner = "BoomerangDecompiler"; @@ -13,6 +16,13 @@ mkDerivation rec { nativeBuildInputs = [ cmake bison flex ]; buildInputs = [ qtbase capstone ]; + patches = [ + (fetchpatch { + name = "include-missing-cstdint.patch"; + url = "https://github.com/BoomerangDecompiler/boomerang/commit/3342b0eac6b7617d9913226c06c1470820593e74.patch"; + sha256 = "sha256-941IydcV3mqj7AWvXTM6GePW5VgawEcL0wrBCXqeWvc="; + }) + ]; meta = with lib; { homepage = "https://github.com/BoomerangDecompiler/boomerang"; diff --git a/third_party/nixpkgs/pkgs/development/tools/boost-build/darwin-default-toolset.patch b/third_party/nixpkgs/pkgs/development/tools/boost-build/darwin-default-toolset.patch new file mode 100644 index 0000000000..ebe3f8d2e1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/boost-build/darwin-default-toolset.patch @@ -0,0 +1,12 @@ +diff --git a/src/build-system.jam b/src/build-system.jam +index 60425c54..c6842217 100644 +--- a/src/build-system.jam ++++ b/src/build-system.jam +@@ -644,7 +644,7 @@ local rule should-clean-project ( project ) + } + else if [ os.name ] = MACOSX + { +- default-toolset = darwin ; ++ default-toolset = clang-darwin ; + } + } diff --git a/third_party/nixpkgs/pkgs/development/tools/boost-build/default.nix b/third_party/nixpkgs/pkgs/development/tools/boost-build/default.nix index a821e661a6..5016aa590b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/boost-build/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/boost-build/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { sha256 = "1r4rwlq87ydmsdqrik4ly5iai796qalvw7603mridg2nwcbbnf54"; }; + patches = [ + # Upstream defaults to gcc on darwin, but we use clang. + ./darwin-default-toolset.patch + ]; + nativeBuildInputs = [ bison ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 1dfe784ec2..711b971c2d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -1,85 +1,22 @@ -{ buildBazelPackage -, cacert +{ buildGoModule , fetchFromGitHub -, git -, go , lib -, stdenv }: -buildBazelPackage rec { +buildGoModule rec { pname = "bazel-remote"; - version = "1.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "buchgr"; - repo = "bazel-remote"; + repo = pname; rev = "v${version}"; - sha256 = "1fpdw139d5q1377qnqbgkahmdr4mdaa17d2m10wkyvyvijwm4r2m"; + sha256 = "193amcx4nk7mr51jcawym46gizqmfkvksjxm64pf7s3wraf00v01"; }; - nativeBuildInputs = [ go git ]; + vendorSha256 = "1sxv9mya8plkn3hpjgfpzgwlh4m3cbhpywqv86brj2h9i4ad0gl5"; - bazelTarget = "//:bazel-remote"; - - removeRulesCC = false; - - # this is to work around `test -f` failing when called by gazelle - # https://github.com/bazelbuild/bazel-gazelle/blob/v0.19.1/internal/go_repository.bzl#L135 - patches = [ ./disable_build_file_generation.patch ]; - - fetchAttrs = { - preBuild = '' - patchShebangs . - - # tell rules_go to use the Go binary found in the PATH - sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE - - # tell rules_go to invoke GIT with custom CAINFO path - export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt" - - # force gazelle to use the nix go cache rather than its own - # export GO_REPOSITORY_USE_HOST_CACHE=1 - ''; - - preInstall = '' - # Remove the go_sdk (it's just a copy of the go derivation) and all - # references to it from the marker files. Bazel does not need to download - # this sdk because we have patched the WORKSPACE file to point to the one - # currently present in PATH. Without removing the go_sdk from the marker - # file, the hash of it will change anytime the Go derivation changes and - # that would lead to impurities in the marker files which would result in - # a different sha256 for the fetch phase. - rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker} - sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker - - # Remove the gazelle repository cache as it contains built binaries - chmod -R u+w $bazelOut/external/bazel_gazelle_go_repository_cache - rm -rf $bazelOut/external/{bazel_gazelle_go_repository_cache,\@bazel_gazelle_go_repository_cache.marker} - sed -e '/^FILE:@bazel_gazelle_go_repository_cache.*/d' -i $bazelOut/external/\@*.marker - - # Remove the gazelle tools, they contain go binaries that are built - # non-deterministically. As long as the gazelle version matches the tools - # should be equivalent. - rm -rf $bazelOut/external/{bazel_gazelle_go_repository_tools,\@bazel_gazelle_go_repository_tools.marker} - sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker - ''; - - sha256 = "1vijh3nl30n8k6xlx6in92pzs70x15akbqiqalk8apgvphvdz8vy"; - }; - - buildAttrs = { - preBuild = '' - patchShebangs . - - # tell rules_go to use the Go binary found in the PATH - sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE - ''; - - installPhase = '' - install -Dm755 bazel-bin/*_pure_stripped/bazel-remote $out/bin/bazel-remote - ''; - }; + doCheck = false; meta = with lib; { homepage = "https://github.com/buchgr/bazel-remote"; @@ -87,6 +24,5 @@ buildBazelPackage rec { license = licenses.asl20; maintainers = [ maintainers.uri-canva ]; platforms = platforms.darwin ++ platforms.linux; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 5b20ece768..fd29102b7e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -371,7 +371,7 @@ stdenv.mkDerivation rec { # libcxx includes aren't added by libcxx hook # https://github.com/NixOS/nixpkgs/pull/41589 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1" # don't use system installed Xcode to run clang, use Nix clang instead sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 31dbc2779c..7fc0342201 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -388,7 +388,7 @@ stdenv.mkDerivation rec { # libcxx includes aren't added by libcxx hook # https://github.com/NixOS/nixpkgs/pull/41589 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1" # don't use system installed Xcode to run clang, use Nix clang instead sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix index 0ec9d3ea93..9c3e99e23a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix @@ -28,6 +28,17 @@ let newPython = python3.override { sha256 = "18hpzh1am1dqx81fypn57r2wk565fi4g14292qrc5jm1h9dalzld"; }; }); + # https://github.com/conan-io/conan/issues/8876 + pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec { + version = "1.7.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"; + }; + disabledTests = [ + "test_ec_verify_should_return_false_if_signature_invalid" + ]; + }); }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix index 51b97b242d..90b17ed9bb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,17 +3,17 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.9.5"; + version = "2.9.6"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "12kv3286a2vkm3qpm2msiks87mkspxddgl7bwiacdias9dfda09n"; + sha256 = "0a8lq0yalar8szw155cxa8kywnk6yvakwi3xmxm1ahivn7i5hjq9"; }; jarsrc = fetchurl { # NOTE: This is actually a .jar, Github has issues url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.zip"; - sha256 = "1shyvg1471sc3bv4h3ax51626xw8a8w05f43bny6gmp8pyc0qjfz"; + sha256 = "1f3hb57rqp9qkh5n2wf65dvxraf21y15s3g643f2fhzc7vvl7ia1"; }; JARNAME = "${pname}-${version}-standalone.jar"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix index c2b10d823a..5867db0b57 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,137 +1,128 @@ { lib, stdenv, fetchFromGitHub, - fetchHex, erlang, - tree }: + fetchHex, erlang, makeWrapper, + writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }: let - version = "3.14.4"; + version = "3.15.1"; + owner = "erlang"; + deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchHex; }; + rebar3 = stdenv.mkDerivation rec { + pname = "rebar3"; + inherit version erlang; - # Dependencies should match the ones in: - # https://github.com/erlang/rebar3/blob/${version}/rebar.lock - # `sha256` could also be taken from https://hex.pm - Checksum + # How to obtain `sha256`: + # nix-prefetch-url --unpack https://github.com/erlang/rebar3/archive/${version}.tar.gz + src = fetchFromGitHub { + inherit owner; + repo = pname; + rev = version; + sha256 = "1pcy5m79g0l9l3d8lkbx6cq1w87z1g3sa6wwvgbgraj2v3wkyy5g"; + }; - bbmustache = fetchHex { - pkg = "bbmustache"; - version = "1.10.0"; - sha256 = "1vp27jqnq65a8iqp7j4z8nw9ad29dhky5agmg8aj75dvshzzmvs3"; - }; - certifi = fetchHex { - pkg = "certifi"; - version = "2.5.3"; - sha256 = "040w1scglvqhcvc1ifdnlcyrbwr0smi00w4xi8h03c99775nllgd"; - }; - cf = fetchHex { - pkg = "cf"; - version = "0.3.1"; - sha256 = "0wknz4xkqkhgvlx4vx5619p8m65v7g87lfgsvfy04jrsgm28spii"; - }; - cth_readable = fetchHex { - pkg = "cth_readable"; - version = "1.5.0"; - sha256 = "0z58b6frqdnhyzrmbdf6x78l3izbbh5z5i3am8hqc253r7xwv0dx"; - }; - erlware_commons = fetchHex { - pkg = "erlware_commons"; - version = "1.4.0"; - sha256 = "1rp2vkgzqm6sax7fc13rh9x6qzxsgg718dnv7l0kmarvyifcyphq"; - }; - eunit_formatters = fetchHex { - pkg = "eunit_formatters"; - version = "0.5.0"; - sha256 = "1jb3hzb216r29x2h4pcjwfmx1k81431rgh5v0mp4x5146hhvmj6n"; - }; - getopt = fetchHex { - pkg = "getopt"; - version = "1.0.1"; - sha256 = "53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c"; - }; - parse_trans = fetchHex { - pkg = "parse_trans"; - version = "3.3.1"; - sha256 = "12w8ai6b5s6b4hnvkav7hwxd846zdd74r32f84nkcmjzi1vrbk87"; + buildInputs = [ erlang ]; + + postPatch = '' + mkdir -p _checkouts _build/default/lib/ + + ${toString (lib.mapAttrsToList (k: v: '' + cp -R --no-preserve=mode ${v} _checkouts/${k} + '') deps)} + + # Bootstrap script expects the dependencies in _build/default/lib + # TODO: Make it accept checkouts? + for i in _checkouts/* ; do + ln -s $(pwd)/$i $(pwd)/_build/default/lib/ + done + ''; + + buildPhase = '' + HOME=. escript bootstrap + ''; + + installPhase = '' + mkdir -p $out/bin + cp rebar3 $out/bin/rebar3 + ''; + + meta = { + homepage = "https://github.com/rebar/rebar3"; + description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; + + longDescription = '' + rebar is a self-contained Erlang script, so it's easy to distribute or + even embed directly in a project. Where possible, rebar uses standard + Erlang/OTP conventions for project structures, thus minimizing the amount + of build configuration work. rebar also provides dependency management, + enabling application writers to easily re-use common libraries from a + variety of locations (hex.pm, git, hg, and so on). + ''; + + platforms = lib.platforms.unix; + maintainers = lib.teams.beam.members; + license = lib.licenses.asl20; + }; + + passthru.updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -ox errexit + PATH=${ + lib.makeBinPath [ + common-updater-scripts + coreutils + git + gnused + nix + (rebar3WithPlugins { globalPlugins = [rebar3-nix]; }) + ] + } + latest=$(list-git-tags https://github.com/${owner}/${pname}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1) + if [ "$latest" != "${version}" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + nix_path="$nixpkgs/pkgs/development/tools/build-managers/rebar3" + update-source-version rebar3 "$latest" --version-key=version --print-changes --file="$nix_path/default.nix" + tmpdir=$(mktemp -d) + cp -R $(nix-build $nixpkgs --no-out-link -A rebar3.src)/* "$tmpdir" + (cd "$tmpdir" && rebar3 nix lock -o "$nix_path/rebar-deps.nix") + else + echo "rebar3 is already up-to-date" + fi + ''; }; + rebar3WithPlugins = { plugins ? [ ], globalPlugins ? [ ] }: + let + pluginLibDirs = map (p: "${p}/lib/erlang/lib") (lib.unique (plugins ++ globalPlugins)); + globalPluginNames = lib.unique (map (p: p.packageName) globalPlugins); + rebar3Patched = (rebar3.overrideAttrs (old: { - providers = fetchHex { - pkg = "providers"; - version = "1.8.1"; - sha256 = "183b9128l4af60rs40agqh6kc6db33j4027ad6jajxn4x6nlamz4"; - }; + # skip-plugins.patch is necessary because otherwise rebar3 will always + # try to fetch plugins if they are not already present in _build. + # + # global-deps.patch makes it possible to use REBAR_GLOBAL_PLUGINS to + # instruct rebar3 to always load a certain plugin. It is necessary since + # REBAR_GLOBAL_CONFIG_DIR doesn't seem to work for this. + patches = [ ./skip-plugins.patch ./global-plugins.patch ]; + })); + in stdenv.mkDerivation { + pname = "rebar3-with-plugins"; + inherit (rebar3) version; + nativeBuildInputs = [ erlang makeWrapper ]; + unpackPhase = "true"; - relx = fetchHex { - pkg = "relx"; - version = "4.3.0"; - sha256 = "0h044arh41sr92r1nlg176shavlv7pvw17alwklhszgwlr4hk3kk"; - }; + # Here we extract the rebar3 escript (like `rebar3_prv_local_install.erl`) and + # add plugins to the code path. - ssl_verify_fun = fetchHex { - pkg = "ssl_verify_fun"; - version = "1.1.6"; - sha256 = "1026l1z1jh25z8bfrhaw0ryk5gprhrpnirq877zqhg253x3x5c5x"; - }; -in -stdenv.mkDerivation rec { - pname = "rebar3"; - inherit version erlang; - - # How to obtain `sha256`: - # nix-prefetch-url --unpack https://github.com/erlang/rebar3/archive/${version}.tar.gz - src = fetchFromGitHub { - owner = "erlang"; - repo = pname; - rev = version; - sha256 = "09bnqwli93sq1pcz4h88ks7qg7k8yrjy9fd46yyp8xdl7i4irwy2"; - }; - - bootstrapper = ./rebar3-nix-bootstrap; - - buildInputs = [ erlang tree ]; - - postPatch = '' - mkdir -p _checkouts - mkdir -p _build/default/lib/ - - cp --no-preserve=mode -R ${bbmustache} _checkouts/bbmustache - cp --no-preserve=mode -R ${certifi} _checkouts/certifi - cp --no-preserve=mode -R ${cf} _checkouts/cf - cp --no-preserve=mode -R ${cth_readable} _checkouts/cth_readable - cp --no-preserve=mode -R ${erlware_commons} _checkouts/erlware_commons - cp --no-preserve=mode -R ${eunit_formatters} _checkouts/eunit_formatters - cp --no-preserve=mode -R ${getopt} _checkouts/getopt - cp --no-preserve=mode -R ${parse_trans} _checkouts/parse_trans - cp --no-preserve=mode -R ${providers} _checkouts/providers - cp --no-preserve=mode -R ${relx} _checkouts/relx - cp --no-preserve=mode -R ${ssl_verify_fun} _checkouts/ssl_verify_fun - - # Bootstrap script expects the dependencies in _build/default/lib - # TODO: Make it accept checkouts? - for i in _checkouts/* ; do - ln -s $(pwd)/$i $(pwd)/_build/default/lib/ - done - ''; - - buildPhase = '' - HOME=. escript bootstrap - ''; - - installPhase = '' - mkdir -p $out/bin - cp rebar3 $out/bin/rebar3 - ''; - - meta = { - homepage = "https://github.com/rebar/rebar3"; - description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; - - longDescription = '' - rebar is a self-contained Erlang script, so it's easy to distribute or - even embed directly in a project. Where possible, rebar uses standard - Erlang/OTP conventions for project structures, thus minimizing the amount - of build configuration work. rebar also provides dependency management, - enabling application writers to easily re-use common libraries from a - variety of locations (hex.pm, git, hg, and so on). + installPhase = '' + erl -noshell -eval ' + {ok, Escript} = escript:extract("${rebar3Patched}/bin/rebar3", []), + {archive, Archive} = lists:keyfind(archive, 1, Escript), + {ok, _} = zip:extract(Archive, [{cwd, "'$out/lib'"}]), + init:stop(0) + ' + mkdir -p $out/bin + makeWrapper ${erlang}/bin/erl $out/bin/rebar3 \ + --set REBAR_GLOBAL_PLUGINS "${toString globalPluginNames}" \ + --suffix-each ERL_LIBS ":" "$out/lib ${toString pluginLibDirs}" \ + --add-flags "+sbtu +A1 -noshell -boot start_clean -s rebar3 main -extra" ''; - - platforms = lib.platforms.unix; - maintainers = lib.teams.beam.members; - license = lib.licenses.asl20; - }; -} + }; +in { inherit rebar3 rebar3WithPlugins; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/global-plugins.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/global-plugins.patch new file mode 100644 index 0000000000..9a8bb48f98 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/global-plugins.patch @@ -0,0 +1,14 @@ +diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl +index f2d22233..bee2cf18 100644 +--- a/src/rebar_plugins.erl ++++ b/src/rebar_plugins.erl +@@ -30,7 +30,8 @@ project_plugins_install(State) -> + top_level_install(State) -> + Profiles = rebar_state:current_profiles(State), + lists:foldl(fun(Profile, StateAcc) -> +- Plugins = rebar_state:get(State, {plugins, Profile}, []), ++ Plugins = rebar_state:get(State, {plugins, Profile}, []) ++ ++ [list_to_atom(P) || P <- string:lexemes(os:getenv("REBAR_GLOBAL_PLUGINS", ""), " ")], + handle_plugins(Profile, Plugins, StateAcc) + end, State, Profiles). + diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix new file mode 100644 index 0000000000..3aa1d1c165 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix @@ -0,0 +1,59 @@ +# Generated by rebar3_nix +{ fetchHex, fetchFromGitHub }: +{ + ssl_verify_fun = fetchHex { + pkg = "ssl_verify_fun"; + version = "1.1.6"; + sha256 = "sha256-vbDSRx9FPIj/OQjnaG+G+b4yfQZcwewW+kVAGX6gRoA="; + }; + relx = fetchHex { + pkg = "relx"; + version = "4.4.0"; + sha256 = "sha256-VcDtY7tdVeuYOhnrlNfzB1320Sbb3/QxAqZmCpH86SU="; + }; + providers = fetchHex { + pkg = "providers"; + version = "1.8.1"; + sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; + }; + parse_trans = fetchHex { + pkg = "parse_trans"; + version = "3.3.1"; + sha256 = "sha256-B82Vd4hfVjYtQU6MTE5r3xDUOodnq7ktJMvoskxUiIs="; + }; + getopt = fetchHex { + pkg = "getopt"; + version = "1.0.1"; + sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; + }; + eunit_formatters = fetchHex { + pkg = "eunit_formatters"; + version = "0.5.0"; + sha256 = "sha256-1si6ITQklE5uBbvAl8MgAc3Qq+OSXQJFTyKbINaHY8k="; + }; + erlware_commons = fetchHex { + pkg = "erlware_commons"; + version = "1.4.0"; + sha256 = "sha256-GF7PXPQ7qzoBPds2FM57un9seoJ5BOZOV9pU/N/c4uY="; + }; + cth_readable = fetchHex { + pkg = "cth_readable"; + version = "1.5.1"; + sha256 = "sha256-aGVBoi7+bKWkGgR7OVFsLdKPs8reXySi8ZFFs5Z/nYA="; + }; + cf = fetchHex { + pkg = "cf"; + version = "0.3.1"; + sha256 = "sha256-MV6NRH06SwK82/o5etA7u5iKbgqm9E063Q9OPDv5dnI="; + }; + certifi = fetchHex { + pkg = "certifi"; + version = "2.5.3"; + sha256 = "sha256-7VFqyzkpsQEgip1wAGLVIPOVPaO2uRjYZhBv+pgOHBA="; + }; + bbmustache = fetchHex { + pkg = "bbmustache"; + version = "1.10.0"; + sha256 = "sha256-Q+/6P9S7lSMVevWp4idsSTSVuEWfyHNxRKoYbLE84u4="; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap deleted file mode 100755 index f1deed1df3..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap +++ /dev/null @@ -1,267 +0,0 @@ -#!/usr/bin/env escript -%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*- -%%! -smp enable -%%% --------------------------------------------------------------------------- -%%% @doc -%%% The purpose of this command is to prepare a rebar3 project so that -%%% rebar3 understands that the dependencies are all already -%%% installed. If you want a hygienic build on nix then you must run -%%% this command before running rebar3. I suggest that you add a -%%% `Makefile` to your project and have the bootstrap command be a -%%% dependency of the build commands. See the nix documentation for -%%% more information. -%%% -%%% This command designed to have as few dependencies as possible so -%%% that it can be a dependency of root level packages like rebar3. To -%%% that end it does many things in a fairly simplistic way. That is -%%% by design. -%%% -%%% ### Assumptions -%%% -%%% This command makes the following assumptions: -%%% -%%% * It is run in a nix-shell or nix-build environment -%%% * that all dependencies have been added to the ERL_LIBS -%%% Environment Variable - --record(data, {version - , debug_info = false - , compile_ports - , erl_libs - , plugins - , root - , name}). - --define(HEX_REGISTRY_PATH, ".cache/rebar3/hex/default/registry"). - -main(Args) -> - {ok, ArgData} = parse_args(Args), - {ok, RequiredData} = gather_required_data_from_the_environment(ArgData), - do_the_bootstrap(RequiredData). - --spec do_the_bootstrap(#data{}) -> ok. -do_the_bootstrap(RequiredData) -> - ok = bootstrap_configs(RequiredData), - ok = bootstrap_plugins(RequiredData), - ok = bootstrap_libs(RequiredData). - -%% @doc -%% Argument parsing is super simple only because we want to keep the -%% dependencies minimal. For now there can be one entry on the -%% command line: "debug-info" --spec parse_args([string()]) -> #data{}. -parse_args(Args0) -> - PossibleArgs = sets:from_list(["debug-info"]), - Args1 = sets:from_list(Args0), - Result = sets:subtract(Args1, PossibleArgs), - case sets:to_list(Result) of - [] -> - {ok, #data{debug_info = sets:is_element("debug-info", Args1)}}; - UnknownArgs -> - io:format("Unexpected command line arguments passed in: ~p~n", - [UnknownArgs]), - erlang:halt(120) - end. - - --spec bootstrap_configs(#data{}) -> ok. -bootstrap_configs(RequiredData)-> - io:format("Boostrapping app and rebar configurations~n"), - ok = if_single_app_project_update_app_src_version(RequiredData), - ok = if_compile_ports_add_pc_plugin(RequiredData), - ok = if_debug_info_add(RequiredData). - --spec bootstrap_plugins(#data{}) -> ok. -bootstrap_plugins(#data{plugins = Plugins}) -> - io:format("Bootstrapping rebar3 plugins~n"), - Target = "_build/default/plugins/", - Paths = string:tokens(Plugins, " "), - CopiableFiles = - lists:foldl(fun(Path, Acc) -> - gather_dependency(Path) ++ Acc - end, [], Paths), - lists:foreach(fun (Path) -> - ok = link_app(Path, Target) - end, CopiableFiles). - --spec bootstrap_libs(#data{}) -> ok. -bootstrap_libs(#data{erl_libs = ErlLibs}) -> - io:format("Bootstrapping dependent libraries~n"), - Target = "_build/default/lib/", - Paths = string:tokens(ErlLibs, ":"), - CopiableFiles = - lists:foldl(fun(Path, Acc) -> - gather_directory_contents(Path) ++ Acc - end, [], Paths), - lists:foreach(fun (Path) -> - ok = link_app(Path, Target) - end, CopiableFiles). - --spec gather_dependency(string()) -> [{string(), string()}]. -gather_dependency(Path) -> - FullLibrary = filename:join(Path, "lib/erlang/lib/"), - case filelib:is_dir(FullLibrary) of - true -> - gather_directory_contents(FullLibrary); - false -> - [raw_hex(Path)] - end. - --spec raw_hex(string()) -> {string(), string()}. -raw_hex(Path) -> - [_, Name] = re:split(Path, "-hex-source-"), - {Path, erlang:binary_to_list(Name)}. - --spec gather_directory_contents(string()) -> [{string(), string()}]. -gather_directory_contents(Path) -> - {ok, Names} = file:list_dir(Path), - lists:map(fun(AppName) -> - {filename:join(Path, AppName), fixup_app_name(AppName)} - end, Names). - -%% @doc -%% Makes a symlink from the directory pointed at by Path to a -%% directory of the same name in Target. So if we had a Path of -%% {`foo/bar/baz/bash`, `baz`} and a Target of `faz/foo/foos`, the symlink -%% would be `faz/foo/foos/baz`. --spec link_app({string(), string()}, string()) -> ok. -link_app({Path, TargetFile}, TargetDir) -> - Target = filename:join(TargetDir, TargetFile), - make_symlink(Path, Target). - --spec make_symlink(string(), string()) -> ok. -make_symlink(Path, TargetFile) -> - file:delete(TargetFile), - ok = filelib:ensure_dir(TargetFile), - io:format("Making symlink from ~s to ~s~n", [Path, TargetFile]), - ok = file:make_symlink(Path, TargetFile). - -%% @doc -%% This takes an app name in the standard OTP - format -%% and returns just the app name. Why? Because rebar doesn't -%% respect OTP conventions in some cases. --spec fixup_app_name(string()) -> string(). -fixup_app_name(FileName) -> - case string:tokens(FileName, "-") of - [Name] -> Name; - [Name, _Version] -> Name; - [Name, _Version, _Tag] -> Name - end. - --spec gather_required_data_from_the_environment(#data{}) -> {ok, #data{}}. -gather_required_data_from_the_environment(ArgData) -> - {ok, ArgData#data{ version = guard_env("version") - , erl_libs = get_env("ERL_LIBS", []) - , plugins = get_env("buildPlugins", []) - , root = code:root_dir() - , name = guard_env("name") - , compile_ports = nix2bool(get_env("compilePorts", ""))}}. - --spec nix2bool(any()) -> boolean(). -nix2bool("1") -> - true; -nix2bool("") -> - false. - -get_env(Name) -> - os:getenv(Name). -get_env(Name, Def) -> - case get_env(Name) of - false -> Def; - Val -> Val - end. - --spec guard_env(string()) -> string(). -guard_env(Name) -> - case get_env(Name) of - false -> - stderr("Expected Environment variable ~s! Are you sure you are " - "running in a Nix environment? Either a nix-build, " - "nix-shell, etc?~n", [Name]), - erlang:halt(1); - Variable -> - Variable - end. - -%% @doc -%% If debug info is set we need to add debug info to the list of compile options -%% --spec if_debug_info_add(#data{}) -> ok. -if_debug_info_add(#data{debug_info = true}) -> - ConfigTerms = add_debug_info(read_rebar_config()), - Text = lists:map(fun(Term) -> io_lib:format("~tp.~n", [Term]) end, - ConfigTerms), - file:write_file("rebar.config", Text); -if_debug_info_add(_) -> - ok. - --spec add_debug_info([term()]) -> [term()]. -add_debug_info(Config) -> - ExistingOpts = case lists:keysearch(erl_opts, 1, Config) of - {value, {erl_opts, ExistingOptsList}} -> ExistingOptsList; - _ -> [] - end, - case lists:member(debug_info, ExistingOpts) of - true -> - Config; - false -> - lists:keystore(erl_opts, 1, Config, - {erl_opts, [debug_info | ExistingOpts]}) - end. - - -%% @doc -%% If the compile ports flag is set, rewrite the rebar config to -%% include the 'pc' plugin. --spec if_compile_ports_add_pc_plugin(#data{}) -> ok. -if_compile_ports_add_pc_plugin(#data{compile_ports = true}) -> - ConfigTerms = add_pc_to_plugins(read_rebar_config()), - Text = lists:map(fun(Term) -> io_lib:format("~tp.~n", [Term]) end, - ConfigTerms), - file:write_file("rebar.config", Text); -if_compile_ports_add_pc_plugin(_) -> - ok. - --spec add_pc_to_plugins([term()]) -> [term()]. -add_pc_to_plugins(Config) -> - PluginList = case lists:keysearch(plugins, 1, Config) of - {value, {plugins, ExistingPluginList}} -> ExistingPluginList; - _ -> [] - end, - lists:keystore(plugins, 1, Config, {plugins, [pc | PluginList]}). - --spec read_rebar_config() -> [term()]. -read_rebar_config() -> - case file:consult("rebar.config") of - {ok, Terms} -> - Terms; - _ -> - stderr("Unable to read rebar config!", []), - erlang:halt(1) - end. - - --spec if_single_app_project_update_app_src_version(#data{}) -> ok. -if_single_app_project_update_app_src_version(#data{name = Name, - version = Version}) -> - SrcFile = filename:join("src", - lists:concat([Name, ".app.src"])), - - case filelib:is_file(SrcFile) of - true -> - update_app_src_with_version(SrcFile, Version); - false -> - ok - end. - --spec update_app_src_with_version(string(), string()) -> ok. -update_app_src_with_version(SrcFile, Version) -> - {ok, [{application, Name, Details}]} = file:consult(SrcFile), - NewDetails = lists:keyreplace(vsn, 1, Details, {vsn, Version}), - ok = file:write_file(SrcFile, io_lib:fwrite("~p.\n", [{application, Name, NewDetails}])). - -%% @doc -%% Write the result of the format string out to stderr. --spec stderr(string(), [term()]) -> ok. -stderr(FormatStr, Args) -> - io:put_chars(standard_error, io_lib:format(FormatStr, Args)). diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/skip-plugins.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/skip-plugins.patch new file mode 100644 index 0000000000..3ee1656c9e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/skip-plugins.patch @@ -0,0 +1,54 @@ +diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl +index f2d22233..c61fa553 100644 +--- a/src/rebar_plugins.erl ++++ b/src/rebar_plugins.erl +@@ -106,31 +106,9 @@ handle_plugins(Profile, Plugins, State, Upgrade) -> + State3 = rebar_state:set(State2, deps_dir, DepsDir), + rebar_state:lock(State3, Locks). + +-handle_plugin(Profile, Plugin, State, Upgrade) -> ++handle_plugin(_Profile, Plugin, State, _Upgrade) -> + try +- {Apps, State2} = rebar_prv_install_deps:handle_deps_as_profile(Profile, State, [Plugin], Upgrade), +- {no_cycle, Sorted} = rebar_prv_install_deps:find_cycles(Apps), +- ToBuild = rebar_prv_install_deps:cull_compile(Sorted, []), +- +- %% Add already built plugin deps to the code path +- ToBuildPaths = [rebar_app_info:ebin_dir(A) || A <- ToBuild], +- PreBuiltPaths = [Ebin || A <- Apps, +- Ebin <- [rebar_app_info:ebin_dir(A)], +- not lists:member(Ebin, ToBuildPaths)], +- code:add_pathsa(PreBuiltPaths), +- +- %% Build plugin and its deps +- build_plugins(ToBuild, Apps, State2), +- +- %% Add newly built deps and plugin to code path +- State3 = rebar_state:update_all_plugin_deps(State2, Apps), +- NewCodePaths = [rebar_app_info:ebin_dir(A) || A <- ToBuild], +- +- %% Store plugin code paths so we can remove them when compiling project apps +- State4 = rebar_state:update_code_paths(State3, all_plugin_deps, PreBuiltPaths++NewCodePaths), +- rebar_paths:set_paths([plugins], State4), +- +- {plugin_providers(Plugin), State4} ++ {plugin_providers(Plugin), State} + catch + ?WITH_STACKTRACE(C,T,S) + ?DEBUG("~p ~p ~p", [C, T, S]), +@@ -138,15 +116,6 @@ handle_plugin(Profile, Plugin, State, Upgrade) -> + {[], State} + end. + +-build_plugins(MustBuildApps, AllApps, State) -> +- State1 = rebar_state:deps_to_build(State, MustBuildApps), +- State2 = rebar_state:all_deps(State1, AllApps), +- State3 = rebar_state:set(State2, deps_dir, ?DEFAULT_PLUGINS_DIR), +- {Args, Extra} = rebar_state:command_parsed_args(State), +- State4 = rebar_state:command_parsed_args(State3, {[{deps_only, true}|Args], Extra}), +- rebar_prv_compile:do(State4), +- ok. +- + plugin_providers({Plugin, _, _, _}) when is_atom(Plugin) -> + validate_plugin(Plugin); + plugin_providers({Plugin, _, _}) when is_atom(Plugin) -> diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix index 85bf919f77..403adaff89 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix @@ -4,37 +4,41 @@ let fuse = if stdenv.isDarwin then macfuse-stubs else fuse3; in stdenv.mkDerivation rec { pname = "tup"; - version = "0.7.10"; + version = "0.7.11"; outputs = [ "bin" "man" "out" ]; src = fetchFromGitHub { owner = "gittup"; repo = "tup"; rev = "v${version}"; - sha256 = "1qd07h4wi0743l7z2vybfvhwp61g2p2pc5qhl40672ryl24nvd1d"; + hash = "sha256-Q2Y5ErcfhLChi9Wezn8+7eNXYX2UXW1fBOqEclmgzOo="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse pcre ]; configurePhase = '' - sed -i 's/`git describe`/v${version}/g' src/tup/link.sh - sed -i 's/pcre-confg/pkg-config pcre/g' Tupfile Tuprules.tup + substituteInPlace src/tup/link.sh --replace '`git describe' '`echo ${version}' + substituteInPlace Tuprules.tup --replace 'pcre-config' 'pkg-config libpcre' ''; # Regular tup builds require fusermount to have suid, which nix cannot # currently provide in a build environment, so we bootstrap and use 'tup # generate' instead buildPhase = '' + runHook preBuild ./build.sh ./build/tup init ./build/tup generate script.sh ./script.sh + runHook postBuild ''; installPhase = '' + runHook preInstall install -D tup -t $bin/bin/ install -D tup.1 -t $man/share/man/man1/ + runHook postInstall ''; setupHook = ./setup-hook.sh; diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix index b1491bfa48..86aef4de9b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -14,21 +14,17 @@ buildGoModule rec { pname = "buildah"; - version = "1.20.1"; + version = "1.21.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-nlZblUPS0678dR0hyp+V9uH/nHL9YH81+O1Zzq8T8Pw="; + sha256 = "sha256-uNb5HCEft1vXASli+2zdKWzFzsAlI9/ILBWa7OQZBwE="; }; outputs = [ "out" "man" ]; - patches = [ - ../../../applications/virtualization/podman/remove-unconfigured-runtime-warn.patch - ]; - vendorSha256 = null; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix b/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix index f3d9b74181..a233288a28 100644 --- a/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, clang-unwrapped , cmake , libclang , libffi @@ -26,22 +25,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - llvm + llvm.dev ] ++ lib.optionals (withManual || withHTML) [ sphinx ]; cmakeFlags = [ - "-DCLANG_RESOURCE_DIR=${clang-unwrapped}/lib/clang/${lib.getVersion clang-unwrapped}/" + "-DCLANG_RESOURCE_DIR=${libclang.dev}/" "-DSPHINX_HTML=${if withHTML then "ON" else "OFF"}" "-DSPHINX_MAN=${if withManual then "ON" else "OFF"}" ]; buildInputs = [ - clang-unwrapped libffi libxml2 zlib + libclang ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/clang-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/clang-tools/default.nix index 498310d432..ba829f2c41 100644 --- a/third_party/nixpkgs/pkgs/development/tools/clang-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/clang-tools/default.nix @@ -1,22 +1,22 @@ { lib, stdenv, llvmPackages }: let - clang = llvmPackages.clang-unwrapped; + unwrapped = llvmPackages.clang-unwrapped; in stdenv.mkDerivation { pname = "clang-tools"; - version = lib.getVersion clang; + version = lib.getVersion unwrapped; dontUnpack = true; + clang = llvmPackages.clang; + inherit unwrapped; + installPhase = '' runHook preInstall mkdir -p $out/bin - export libc_includes="${lib.getDev stdenv.cc.libc}/include" - export libcpp_includes="${llvmPackages.libcxx}/include/c++/v1" - export clang=${clang} substituteAll ${./wrapper} $out/bin/clangd chmod +x $out/bin/clangd for tool in \ @@ -32,7 +32,7 @@ in stdenv.mkDerivation { runHook postInstall ''; - meta = clang.meta // { + meta = unwrapped.meta // { description = "Standalone command line tools for C++ development"; maintainers = with lib.maintainers; [ aherrmann ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/clang-tools/wrapper b/third_party/nixpkgs/pkgs/development/tools/clang-tools/wrapper old mode 100644 new mode 100755 index 53c99a67f2..eebc152d11 --- a/third_party/nixpkgs/pkgs/development/tools/clang-tools/wrapper +++ b/third_party/nixpkgs/pkgs/development/tools/clang-tools/wrapper @@ -1,20 +1,27 @@ #!/bin/sh buildcpath() { - local path + local path after while (( $# )); do case $1 in -isystem) shift path=$path${path:+':'}$1 + ;; + -idirafter) + shift + after=$after${after:+':'}$1 + ;; esac shift done - echo $path + echo $path${after:+':'}$after } -export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE}) -export CPATH=${CPATH}${CPATH:+':'}@libc_includes@ -export CPLUS_INCLUDE_PATH=${CPATH}${CPATH:+':'}@libcpp_includes@ +export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \ + $(<@clang@/nix-support/libc-cflags)) +export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \ + $(<@clang@/nix-support/libcxx-cxxflags) \ + $(<@clang@/nix-support/libc-cflags)) -exec -a "$0" @clang@/bin/$(basename $0) "$@" +exec -a "$0" @unwrapped@/bin/$(basename $0) "$@" diff --git a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix index 6254ec0a2c..b947fc1ebf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.1.29"; + version = "0.1.30"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RPlEFajIjEBKdL97xjQP6r3AAcCQlxw2Il8nkSjxa+k="; + sha256 = "sha256-uQj14arxDPc8/k1Cvp3T6hqjln30NFk9MzvYy8tAiJ8="; }; vendorSha256 = "sha256-pl3dLisu4Oc77kgfuteKbsZaDzrHo1wUigZEkM4081Q="; diff --git a/third_party/nixpkgs/pkgs/development/tools/clpm/default.nix b/third_party/nixpkgs/pkgs/development/tools/clpm/default.nix index ae2e1011ae..9d3ddace37 100644 --- a/third_party/nixpkgs/pkgs/development/tools/clpm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/clpm/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - ln -s ${openssl.out}/lib/libcrypto.so.* . - ln -s ${openssl.out}/lib/libssl.so.* . + ln -s ${openssl.out}/lib/libcrypto*${stdenv.hostPlatform.extensions.sharedLibrary}* . + ln -s ${openssl.out}/lib/libssl*${stdenv.hostPlatform.extensions.sharedLibrary}* . common-lisp.sh --script scripts/build.lisp runHook postBuild diff --git a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix index 4c6cbbbe6b..833f2f84b0 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.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "sha256-iFxRZq/8TW7Df+aAc5IN+FAXU4kvbDiHWiFOlWMmCY0="; + sha256 = "sha256-pxPqBUOsXbP9giaV5NS3a6Z6auN4vUTIrIKcNh8xURU="; }; - vendorSha256 = "sha256-LvaSs1y1CEP+cJc0vqTh/8MezmtuFAbfMgqloAjLZl8="; + vendorSha256 = "sha256-y8DRrthaUzMKxFbdbASvqsRMT+jex7jMJA6g7YF/VxI="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index db1f2aeabc..0b6c979244 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -1,5 +1,6 @@ { fetchFromGitHub, lib, buildGoModule, - makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: + makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep, + nixosTests }: buildGoModule rec { name = "buildkite-agent-${version}"; version = "3.29.0"; @@ -30,6 +31,10 @@ buildGoModule rec { --prefix PATH : '${lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' ''; + passthru.tests = { + smoke-test = nixosTests.buildkite-agents; + }; + meta = with lib; { description = "Build runner for buildkite.com"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix index ccb8b4eba6..bc464c2024 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix @@ -1,4 +1,4 @@ -{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, runc, stdenv }: +{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, nixos, runc, stdenv }: let inherit (haskell.lib) overrideCabal addBuildDepends; inherit (lib) makeBinPath; @@ -16,8 +16,16 @@ let makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath bundledBins} ''; }); -in pkg // { - meta = pkg.meta // { +in pkg.overrideAttrs (o: { + meta = o.meta // { position = toString ./default.nix + ":1"; }; - } + passthru = o.passthru // { + # Does not test the package, but evaluation of the related NixOS module. + tests.nixos-minimal-config = nixos { + boot.loader.grub.enable = false; + fileSystems."/".device = "bogus"; + services.hercules-ci-agent.enable = true; + }; + }; + }) diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index 5373b2d359..67074d4354 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.277.3"; + version = "2.277.4"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "1awixb55bkpqcvf2s59aph3kxdd70g9x1a5s5kly33kwrplcf8iy"; + sha256 = "19z72d0rkxpvl03aqz102in9ln08r9831lj3ymsgmglk8c37ici6"; }; buildCommand = '' 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 32ab88bf41..c4393821b7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.3.2"; + version = "4.3.5"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-sc/W4N+pd1bhLiyQLqm0j2o/RviT8iKzBZcD0GRDqqE="; + sha256 = "sha256-XOYq+p76XFt7j4oxMClZox5wsaXuV5ovcB6kZJhMBlU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix index 042f5a1aa6..226fc049e0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "webdis"; - version = "0.1.12"; + version = "0.1.15"; src = fetchFromGitHub { owner = "nicolasff"; repo = pname; rev = version; - sha256 = "sha256-pppA/Uyz1ge7UOG1PrqpTQC5sSGMWPw0J+CtaoZpOCM="; + sha256 = "sha256-ViU/CKkmBY8WwQq/oJ2/qETqr2k8JNFtNPhozw5BmEc="; }; buildInputs = [ hiredis http-parser jansson libevent ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/delve/default.nix b/third_party/nixpkgs/pkgs/development/tools/delve/default.nix index f0926e23aa..62e5159705 100644 --- a/third_party/nixpkgs/pkgs/development/tools/delve/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "delve"; - version = "1.6.0"; + version = "1.6.1"; goPackagePath = "github.com/go-delve/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "sha256-krNCS5GaEMuwQ9XS8w0myL+xZX6goNNNBgUiRVoZPIU="; + sha256 = "sha256-bTVCasemE8Vyjcs8wZBiiXEsW3UBndjpPQ5bi+4vQkw="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix index 83256efd5f..9ebc04ca63 100644 --- a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.59.0"; + version = "1.61.0"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-mkFKYWPUEHVtQi9eUPxvWYxNCfVrKdjo2bH2DEwL1d0="; + sha256 = "sha256-Z6G80Xg2DSoUj8vhxkDr3W/wh3fecRwxm0oly2GYDdg="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/third_party/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index d031145a99..b536dc9406 100644 --- a/third_party/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3 +{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome , python2Packages }: python2Packages.buildPythonApplication rec { @@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = [ libxml2Python ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix b/third_party/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix index e74a6b9c3c..5951c8d71f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -8,7 +8,7 @@ , docbook-xsl-nons , libxslt , gettext -, gnome3 +, gnome , withDblatex ? false, dblatex }: @@ -32,6 +32,13 @@ python3.pkgs.buildPythonApplication rec { passthru.respect_xml_catalog_files_var_patch ]; + strictDeps = true; + + depsBuildBuild = [ + python3 + pkg-config + ]; + nativeBuildInputs = [ pkg-config gettext @@ -70,7 +77,7 @@ python3.pkgs.buildPythonApplication rec { passthru = { # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix new file mode 100644 index 0000000000..68a8d1d035 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "earthly"; + version = "0.5.13"; + + src = fetchFromGitHub { + owner = "earthly"; + repo = "earthly"; + rev = "v${version}"; + sha256 = "sha256-XN3E1oCIlohALnaP17WOB7/1vaklmyAfVZLxrBOXhbo="; + }; + + vendorSha256 = "sha256-q3dDV0eop2NxXHFrlppWsZrO2Hz1q5xhs1DnB6PvG9g="; + + postInstall = '' + mv $out/bin/debugger $out/bin/earthly-debugger + mv $out/bin/shellrepeater $out/bin/earthly-shellrepeater + ''; + + meta = with lib; { + description = "Build automation for the container era"; + homepage = "https://earthly.dev/"; + changelog = "https://github.com/earthly/earthly/releases/tag/v${version}"; + license = licenses.mpl20; + maintainers = with maintainers; [ mdsp ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/ecpdap/default.nix b/third_party/nixpkgs/pkgs/development/tools/ecpdap/default.nix index 46b5945fb9..3bb12c40e3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ecpdap/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ecpdap/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, pkg-config, libusb1 }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, libusb1, AppKit }: rustPlatform.buildRustPackage rec { pname = "ecpdap"; @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ]; + buildInputs = [ libusb1 ] + ++ lib.optional stdenv.isDarwin AppKit; postInstall = '' mkdir -p $out/etc/udev/rules.d diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix index a3f58ae827..5ecec0059a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix @@ -86,30 +86,32 @@ rec { headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885"; }; - electron_10 = mkElectron "10.4.4" { - x86_64-linux = "e82d347ff4753fd4296550e403390c7a9c448d150ea6bb05bd245fd43ac5a708"; - x86_64-darwin = "b8f01dedbd81c58e1dc0fafd316e4c1be07681f7e6d42d3f6f3947cf78d9a8fa"; - i686-linux = "2e7847c902e174496e152030932a921ca1cfb2ffcb556e2a01b08d8235eb333d"; - armv7l-linux = "303c246816bff2dc7aeb26d37d99fe82e4bbe484e3e96f42731f6350498b1af2"; - aarch64-linux = "21ba3370b01870fc498d7e180d034a3e3b59a84af231d2dcd82984d6d09fd5da"; - headers = "0qxzsycpdq1g8a2yaw7g43da1f8ijpbhj97vvxza8nnvxiay5apf"; + electron_10 = mkElectron "10.4.5" { + x86_64-linux = "d7f6203d09b4419262e985001d4c4f6c1fdfa3150eddb0708df9e124bebd0503"; + x86_64-darwin = "e3ae7228010055b1d198d8dbaf0f34882d369d8caf76206a59f198301a3f3913"; + i686-linux = "dd6abc0dc00d8f9d0e31c8f2bb70f7bbbaec58af4c446f8b493bbae9a9428e2f"; + armv7l-linux = "86bc5f9d3dc94d19e847bf10ab22d98926b616d9febcbdceafd30e35b8f2b2db"; + aarch64-linux = "655b36d68332131250f7496de0bb03a1e93f74bb5fc4b4286148855874673dcd"; + headers = "1kfgww8wha86yw75k5yfq4mxvjlxgf1jmmzxy0p3hyr000kw26pk"; }; - electron_11 = mkElectron "11.4.4" { - x86_64-linux = "154ae71e674b37b6cb5ec56e0f569435cb9303a5b0c0608bd2e1d026803be1a5"; - x86_64-darwin = "783962e25433178a1e41b895dbbebc7b82efbe819dbd08c9314d2f4547c73e05"; - i686-linux = "fcfeba63e490648156f01bbe51f27123f93762713f6ab5e4433dc9c232708a25"; - armv7l-linux = "3b98dabbce5a5a8ba66d2f909174b792eeccddd95fd4396a596130f6817ec0d3"; - aarch64-linux = "cf886b382f4e3815487ee1403d4bb6ff434ecd9625e61c9ecf082f482c88617e"; - headers = "1wjcygxy6lvmf1lw857rcd499jk8103nvld0q3jj4r90gwbdhfi3"; + electron_11 = mkElectron "11.4.6" { + x86_64-linux = "03932a0b3328a00e7ed49947c70143b7b3455a3c1976defab2f74127cdae43e9"; + x86_64-darwin = "47de03b17ab20213c95d5817af3d7db2b942908989649202efdcd1d566dd24c3"; + i686-linux = "b76e69ad4b654384b4f1647f0cb362e78c1d99be7b814d7d32abc22294639ace"; + armv7l-linux = "cc4be8e0c348bc8db5002cf6c63c1d02fcb594f1f8bfc358168738c930098857"; + aarch64-linux = "75665dd5b2b9938bb4572344d459db65f46c5f7c637a32946c5a822cc23a77dc"; + aarch64-darwin = "0c782b1d4eb848bae780f4e3a236caa1671486264c1f8e72fde98f1256d8f9e5"; + headers = "0ip1wxgflifs86vk4xpz1555xa7yjy64ygqgd5a2g723148m52rk"; }; - electron_12 = mkElectron "12.0.5" { - x86_64-linux = "e89c97f7ee43bf08f2ddaba12c3b78fb26a738c0ea7608561f5e06c8ef37e22b"; - x86_64-darwin = "c5a5e8128478e2dd09fc7222fb0f562ed3aefa3c12470f1811345be03e9d3b76"; - i686-linux = "6ef8d93be6b05b66cb7c1f1640228dc1215d02851e190e7f16e4313d8ccd6135"; - armv7l-linux = "7312956ee48b1a8c02d778cac00e644e8cb27706cf4b387e91c3b062a1599a75"; - aarch64-linux = "7b2dc425ce70b94ef71b74ed59416e70c4285ae13ef7ea03505c1aafab44904f"; - headers = "1aqjhams0zvgq2bm9hc578ylmahi6qggzjfc69kh9vpv2sylimy9"; + electron_12 = mkElectron "12.0.7" { + x86_64-linux = "335b77b35361fac4e2df1b7e8de5cf055e0a1a2065759cb2dd4508e8a77949fa"; + x86_64-darwin = "c3238c9962c5ad0f9de23c9314f07e03410d096d7e9f9d91016dab2856606a9e"; + i686-linux = "16023d86b88c7fccafd491c020d064caa2138d6a3493664739714555f72e5b06"; + armv7l-linux = "53cc1250ff62f2353d8dd37552cbd7bdcaaa756106faee8b809303bed00e040a"; + aarch64-linux = "3eddc0c507a43cce4e714bfe509d99218b5ab99f4660dd173aac2a895576dc71"; + aarch64-darwin = "2bc8f37af68e220f93fb9abc62d1c56d8b64baaf0ef9ef974f24ddcbe4f8b488"; + headers = "1ji9aj7qr4b27m5kprsgsrl21rjphz5bbnmn6q0n2x84l429nyfb"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix index 7d4593dee3..def103f6e5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix @@ -26,7 +26,8 @@ let homepage = "https://github.com/electron/electron"; license = licenses.mit; maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ] + ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ]; knownVulnerabilities = optional (versionOlder version "6.0.0") "Electron version ${version} is EOL"; }; @@ -46,6 +47,7 @@ let armv7l-linux = "linux-armv7l"; aarch64-linux = "linux-arm64"; x86_64-darwin = "darwin-x64"; + aarch64-darwin = "darwin-arm64"; }; get = as: platform: as.${platform.system} or diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/print-hashes.sh b/third_party/nixpkgs/pkgs/development/tools/electron/print-hashes.sh index d6c5d94ec4..48c8f0412e 100755 --- a/third_party/nixpkgs/pkgs/development/tools/electron/print-hashes.sh +++ b/third_party/nixpkgs/pkgs/development/tools/electron/print-hashes.sh @@ -17,6 +17,7 @@ SYSTEMS=( [armv7l-linux]=linux-armv7l [aarch64-linux]=linux-arm64 [x86_64-darwin]=darwin-x64 + [aarch64-darwin]=darwin-arm64 ) hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" 2>/dev/null | tail -n1)" @@ -27,8 +28,10 @@ headers="$(nix-prefetch-url "https://atom.io/download/electron/v${VERSION}/node- echo " electron_${VERSION%%.*} = mkElectron \"${VERSION}\" {" for S in "${!SYSTEMS[@]}"; do - hash="$(grep " *electron-v${VERSION}-${SYSTEMS[$S]}.zip$" "$hashfile"|cut -f1 -d' ')" - echo " $S = \"$hash\";" + hash="$(grep " *electron-v${VERSION}-${SYSTEMS[$S]}.zip$" "$hashfile"|cut -f1 -d' ' || :)" + if [[ -n $hash ]]; then + echo " $S = \"$hash\";" + fi done echo " headers = \"$headers\";" diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix index 65dce6d2cd..5c32caad5b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "esbuild"; - version = "0.11.15"; + version = "0.12.0"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "1j6qli26i2hwkjqcigz7vyx6hg9daq4vlqigv7ddslw3h8hnp0md"; + sha256 = "sha256-JRGRm6fiJ3VIzcwoQOvqiN15vhSYuxGdZrLAH8FiC7g="; }; - vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q"; + vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; meta = with lib; { description = "An extremely fast JavaScript bundler"; diff --git a/third_party/nixpkgs/pkgs/development/tools/evans/default.nix b/third_party/nixpkgs/pkgs/development/tools/evans/default.nix new file mode 100644 index 0000000000..dfc9d34b5a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/evans/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "evans"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "ktr0731"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-q8HWDZpUWaitdZcWkvKEWWbIWCj9VmWCxxhAdcYZx8s="; + }; + + subPackages = [ "." ]; + + vendorSha256 = "sha256-ntRlrbsQjZmVxEg9361Q+f6Wb/R393+sbOKOEh5VKPk="; + + meta = with lib; { + description = "More expressive universal gRPC client"; + homepage = "https://evans.syfm.me/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ diogox ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/flip-link/default.nix b/third_party/nixpkgs/pkgs/development/tools/flip-link/default.nix index 36467848c4..697e4fb353 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flip-link/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/flip-link/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }: rustPlatform.buildRustPackage rec { pname = "flip-link"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "13rgpbwaz2b928rg15lbaszzjymph54pwingxpszp5paihx4iayr"; + buildInputs = lib.optional stdenv.isDarwin libiconv; + meta = with lib; { description = "Adds zero-cost stack overflow protection to your embedded programs"; homepage = "https://github.com/knurling-rs/flip-link"; diff --git a/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix b/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix index e76b62d45c..c8339fe6d8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.3"; + version = "3.14.4"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zns2XcydY4xxgF8FB6eje0pAt0DZnFOIAqXaSX0xoMg="; + sha256 = "sha256-RFVn5aL5MqsB7heDPVUci3Eyq6F/qo3RmdEaZbsC+Ng="; }; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix index e5883501f8..833f87e4a0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-nlNft9jOp8V8ks32LOb4wUTkRrXJ5K49gbHuRmCKz/0="; + sha256 = "sha256-u2roJsZZ5oG2dHo4kmSsoySjm1HRQJ659+D2M+LezCc="; }; vendorSha256 = "sha256-tS8YCGVOsfQp02vY6brmE3pxi70GG9DYcp1JDkcVG9Y="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/gir/default.nix b/third_party/nixpkgs/pkgs/development/tools/gir/default.nix index c88ffef4df..856cd44e26 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gir/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gir/default.nix @@ -2,16 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "gir"; - version = "2019-10-16"; + version = "unstable-2021-05-05"; src = fetchFromGitHub { owner = "gtk-rs"; repo = "gir"; - rev = "241d790085a712db7436c5c25b210ccb7d1a08d5"; - sha256 = "1kn5kgdma9j6dwpmv6jmydak7ajlgdkw9sfkh3q7h8c2a8yikvxr"; + rev = "c148542ce89b0bf7cbb9f5ef4179c96a45d022df"; + sha256 = "0vy366ipwnn0cpp14l1v5g3dpnsr3hd8mjp3333lp0946igfqsy5"; + leaveDotGit = true; # required for build.rs }; - cargoSha256 = "048qhlc4f5khxi7dnakgqkhgww44r6h3mlx2fm7y2wqivr3rj8p1"; + cargoSha256 = "11as1v88zf0f7l2ngllg5zqycvd05nb4vrsyl1dlarjvbq7fhvv8"; meta = with lib; { description = "Tool to generate rust bindings and user API for glib-based libraries"; diff --git a/third_party/nixpkgs/pkgs/development/tools/glade/default.nix b/third_party/nixpkgs/pkgs/development/tools/glade/default.nix index d77772c32d..3e5c7b0438 100644 --- a/third_party/nixpkgs/pkgs/development/tools/glade/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/glade/default.nix @@ -15,7 +15,7 @@ , libxml2 , docbook-xsl-nons , docbook_xml_dtd_42 -, gnome3 +, gnome , gdk-pixbuf , libxslt , gsettings-desktop-schemas @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { python3.pkgs.pygobject3 gsettings-desktop-schemas gdk-pixbuf - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix index a65a9276ad..6f86900edf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.7.4"; + version = "2.7.5"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-St8QgUZUU7THM9H8i7Z+bgKu9LhXhUqH/B14LGmDCn0="; + sha256 = "sha256-RdXViEEJR8yud2coSmAUfIe1mTCHiZHALrcGRslNfEg="; }; vendorSha256 = "sha256-//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA="; 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 9a0fa54fb2..355f468237 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.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m8VgjfNDxSX6fRG2/gEJlVc9hCnua+o79ttrd8P20kU="; + sha256 = "sha256-O3gfQon8ktObLVED4A5sCSOw8K1NIXP3a5AsLq3Svb4="; }; goPackagePath = "github.com/pelletier/go-toml"; diff --git a/third_party/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix b/third_party/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix index 0fd45598a8..659532e04e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gojsontoyaml"; - version = "unstable-2020-06-02"; + version = "unstable-2020-12-16"; src = fetchFromGitHub { owner = "brancz"; repo = "gojsontoyaml"; - rev = "3697ded27e8cfea8e547eb082ebfbde36f1b5ee6"; - sha256 = "07sisadpfnzbylzirs5ski8wl9fl18dm7xhbv8imw6ksxq4v467a"; + rev = "202f76bf8c1f8fb74941a845b349941064603185"; + sha256 = "sha256-N49iHQh28nAZBGJnLKG/aZPdn5fwPKQpdrXXtX28yss="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index 83bc3f473d..2019c7cb3e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.39.0"; + version = "1.40.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "0c9yka27k4v1waijk7mn7k31l5a373sclykypflchy7xnlrsa18v"; + sha256 = "sha256-5OtXfDPpdwVMnI5Pttr+XQPgJXI7YexPtBhIDeS1CXk="; }; - vendorSha256 = "1685iv1lsal462c8xqvs76x9dwvbwazrak902j0p12s0fyb66lpl"; + vendorSha256 = "sha256-8SPUOQ88RkU0dkyNccf+POKitXHlCRaxrIugV91gDZQ="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix index 6b13990461..2b3fb76903 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -1,35 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, jshon, electron_3 +{ lib, stdenvNoCC, fetchFromGitHub, jshon, electron_10 , runtimeShell, hyper-haskell-server, extra-packages ? [] }: let binPath = lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); - electron = electron_3; -in stdenv.mkDerivation rec { + electron = electron_10; +in stdenvNoCC.mkDerivation rec { pname = "hyper-haskell"; - version = "0.1.0.2"; + version = "0.2.3.0"; src = fetchFromGitHub { owner = "HeinrichApfelmus"; repo = "hyper-haskell"; rev = "v${version}"; - sha256 = "1k38h7qx12z7463z8466pji0nwfkp4qkg7q83kns2mzmwmw5jnmb"; + sha256 = "1nmkry4wh6a2dy98fcs81mq2p7zhxp1k0f4m3szr6fm3j1zwrd43"; }; propagatedBuildInputs = extra-packages; - buildCommand = '' + dontBuild = true; + + installPhase = '' mkdir -p $out/bin $out/share/hyper-haskell/worksheets $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/mime/packages # Electron app - cp -R $src/app $out + cp -R app $out # Desktop Launcher - cp $src/resources/hyper-haskell.desktop $out/share/applications/hyper-haskell.desktop - cp $src/resources/icons/icon.svg $out/share/icons/hicolor/scalable/apps/hyper-haskell.svg - cp $src/resources/shared-mime-info.xml $out/share/mime/packages/hyper-haskell.xml + cp resources/hyper-haskell.desktop $out/share/applications/hyper-haskell.desktop + cp resources/icons/icon.svg $out/share/icons/hicolor/scalable/apps/hyper-haskell.svg + cp resources/shared-mime-info.xml $out/share/mime/packages/hyper-haskell.xml # install example worksheets with backend set to nix - for worksheet in "$src/worksheets/"*.hhs; do + for worksheet in "worksheets/"*.hhs; do ${jshon}/bin/jshon -e settings -s nix -i packageTool -p < $worksheet > $out/share/hyper-haskell/worksheets/`basename $worksheet` done diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 875d5a8a4a..4a84823141 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -2,9 +2,8 @@ let ihaskellEnv = ghcWithPackages (self: [ self.ihaskell - (haskell.lib.doJailbreak self.ihaskell-blaze) - (haskell.lib.doJailbreak self.ihaskell-diagrams) - (haskell.lib.doJailbreak self.ihaskell-display) + self.ihaskell-blaze + self.ihaskell-diagrams ] ++ packages self); ihaskellSh = writeScriptBin "ihaskell-notebook" '' #! ${stdenv.shell} diff --git a/third_party/nixpkgs/pkgs/development/tools/irony-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/irony-server/default.nix index 2f8afb176e..2a7a7b1a16 100644 --- a/third_party/nixpkgs/pkgs/development/tools/irony-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/irony-server/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { pname = "irony-server"; inherit (irony) src version; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake llvmPackages.llvm.dev ]; buildInputs = [ llvmPackages.libclang llvmPackages.llvm ]; dontUseCmakeBuildDir = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix b/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix index e471489e70..7753556a4e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "2.5.2"; + version = "2.5.5"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c8v9O3ufTZ7/rWwLNoak0ITlEVlOg9MvheRjQIxPwKc="; + sha256 = "sha256-lNC8TwX462Lnt/uiKWt9hNa81g3tdenvvuNQJNkj7hM="; }; - vendorSha256 = "sha256-kJtJ2ut+yhgNoPIY5i3dKmQV0g+8RvcGnxCyay7wy2A="; + vendorSha256 = "sha256-uStmUhiZuUguxUx2L8ifSNnbMCs7Jk+6tq7qZdACjag="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix b/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix index 991f1a3771..064ef8453d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luaformatter"; - version = "1.3.4"; + version = "1.3.6"; src = fetchFromGitHub { owner = "koihik"; repo = "luaformatter"; rev = version; - sha256 = "163190g37r6npg5k5mhdwckdhv9nwy2gnfp5jjk8p0s6cyvydqjw"; + sha256 = "0440kdab5i0vhlk71sbprdrhg362al8jqpy7w2vdhcz1fpi5cm0b"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix index d686067e63..88bbfda5c7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.10.2"; + version = "0.10.3"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1yck935pcj9cg3qxzrmvgd16afsckz8wgmzf2rlmii2c1glrbq9c"; + outputHash = "1psmsiwd3xlbrvkdvr2zgs2b66kw8w2jvvqa399g7jhixh2fpbx4"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix index 3b9cc67bc2..8c01aea284 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.21"; + version = "0.2.22"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XDxG7F+oBatlb4ROBryt2Fop402riKmYoqZLJrUzBUQ="; + sha256 = "sha256-a+yw7QSLNX3hO2GnFCifYMbPWYwtleUZS1AqPsxw9t8="; }; - vendorSha256 = "sha256-PwVDMSl36m+6ISJQvyrkCjaL3xp5VkaZtfxyMpNn+KI="; + vendorSha256 = "sha256-6jD+gY/TmO/Ot507IlTLNdWv7G4BHYlk/E9rVoRD65A="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix index 995f3f7430..8042655a85 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix @@ -107,8 +107,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" "pie" ]; - # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. - configurePlatforms = [ "build" "host" ] ++ lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; + configurePlatforms = [ "build" "host" "target" ]; configureFlags = (if enableShared then [ "--enable-shared" "--disable-static" ] @@ -126,7 +125,19 @@ stdenv.mkDerivation { # RUNPATH instead of RPATH on binaries. This is important because # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime. "--enable-new-dtags" - ] ++ lib.optionals gold [ "--enable-gold" "--enable-plugins" ]; + + # force target prefix. Some versions of binutils will make it empty + # if `--host` and `--target` are too close, even if Nixpkgs thinks + # the platforms are different (e.g. because not all the info makes + # the `config`). Other versions of binutils will always prefix if + # `--target` is passed, even if `--host` and `--target` are the same. + # The easiest thing for us to do is not leave it to chance, and force + # the program prefix to be what we want it to be. + "--program-prefix=${targetPrefix}" + ] ++ lib.optionals gold [ + "--enable-gold" + "--enable-plugins" + ]; doCheck = false; # fails diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index 4128118dec..b905f5e8ed 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -7,26 +7,25 @@ , cmake , perl , zstd +, bashInteractive , xcodebuild , makeWrapper }: let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.2.1"; + version = "4.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-AmgJpW7AGCSggbHp1fLO5yhXS9LIm7O77nQdDERJYAA="; + hash = "sha256-ZBxDTMUZiZJLIYbvACTFwvlss+IZiMjiL0khfM5hFCM="; }; - patches = [ - # test/run use compgen to get environment variable names, but - # compgen isn't available in non-interactive bash. - ./env-instead-of-compgen.patch + outputs = [ "out" "man" ]; + patches = [ # When building for Darwin, test/run uses dwarfdump, whereas on # Linux it uses objdump. We don't have dwarfdump packaged for # Darwin, so this patch updates the test to also use objdump on @@ -38,18 +37,22 @@ let ccache = stdenv.mkDerivation rec { ]; nativeBuildInputs = [ asciidoc cmake perl ]; - buildInputs = [ zstd ]; - outputs = [ "out" "man" ]; - doCheck = true; - checkInputs = lib.optional stdenv.isDarwin xcodebuild; + checkInputs = [ + # test/run requires the compgen function which is available in + # bashInteractive, but not bash. + bashInteractive + ] ++ lib.optional stdenv.isDarwin xcodebuild; + checkPhase = '' + runHook preCheck export HOME=$(mktemp -d) ctest --output-on-failure ${lib.optionalString stdenv.isDarwin '' -E '^(test.nocpp2|test.basedir|test.multi_arch)$' ''} + runHook postCheck ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/env-instead-of-compgen.patch b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/env-instead-of-compgen.patch deleted file mode 100644 index 313de0fa58..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/env-instead-of-compgen.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/test/run b/test/run -index cbdd98f0..bc930200 100755 ---- a/test/run -+++ b/test/run -@@ -346,11 +346,11 @@ expect_perm() { - } - - reset_environment() { -- while IFS= read -r name; do -+ while IFS='=' read -r name value; do - if [[ $name =~ ^CCACHE_[A-Z0-9_]*$ ]]; then - unset $name - fi -- done < <(compgen -e) -+ done < <(env) - - unset GCC_COLORS - unset TERM diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ccls/default.nix index 06f3723509..986363b83e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ccls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ccls/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-jipSipgD0avd7XODlpxnqjHK3s6nacaxbIQIddix7X8="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = with llvmPackages; [ clang-unwrapped llvm rapidjson ]; + nativeBuildInputs = [ cmake llvmPackages.llvm.dev ]; + buildInputs = with llvmPackages; [ libclang llvm rapidjson ]; cmakeFlags = [ "-DCCLS_VERSION=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix index d62ad413e1..dbab7c880e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Command line parser for C++11"; homepage = "https://github.com/CLIUtils/CLI11"; platforms = platforms.unix; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; license = licenses.bsd3; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/creduce/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/creduce/default.nix index 75234fde6c..0ae900060b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/creduce/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/creduce/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake, makeWrapper -, llvm, clang-unwrapped +, llvm, libclang , flex , zlib , perlPackages @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { sha256 = "1b833z0g1hich68kzbkpfc26xb8w2phfl5savy8c6ir9ihwy1a8w"; }; - nativeBuildInputs = [ cmake makeWrapper ]; + nativeBuildInputs = [ cmake makeWrapper llvm.dev ]; buildInputs = [ # Ensure stdenv's CC is on PATH before clang-unwrapped stdenv.cc # Actual deps: - llvm clang-unwrapped + llvm libclang flex zlib ] ++ (with perlPackages; [ perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey ]); diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix index fe33df530c..e24c133e8b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub, cmake, flex -, clang-unwrapped, llvm, unifdef +, libclang, llvm, unifdef , pebble, psutil, pytestCheckHook, pytest-flake8 }: @@ -19,8 +19,8 @@ buildPythonApplication rec { ./unifdef.patch ]; - nativeBuildInputs = [ cmake flex ]; - buildInputs = [ clang-unwrapped llvm unifdef ]; + nativeBuildInputs = [ cmake flex llvm.dev ]; + buildInputs = [ libclang llvm llvm.dev unifdef ]; propagatedBuildInputs = [ pebble psutil ]; checkInputs = [ pytestCheckHook pytest-flake8 unifdef ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix index 5c130a99c9..a44b5ed8c7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/d-feet/default.nix @@ -7,7 +7,7 @@ , gtk3 , python3 , wrapGAppsHook -, gnome3 +, gnome , libwnck3 , gobject-introspection , gettext @@ -16,13 +16,13 @@ python3.pkgs.buildPythonApplication rec { pname = "d-feet"; - version = "0.3.15"; + version = "0.3.16"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/d-feet/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1cgxgpj546jgpyns6z9nkm5k48lid8s36mvzj8ydkjqws2d19zqz"; + sha256 = "hzPOS5qaVOwYWx2Fv02p2dEQUogqiAdg/2D5d5stHMs="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gtk3 libwnck3 ]; @@ -61,7 +61,7 @@ python3.pkgs.buildPythonApplication rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "dfeet"; versionPolicy = "none"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/distcc/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/distcc/default.nix index 38ddc1ff43..6de12a8452 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/distcc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/distcc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python3, gtk2, runCommand +{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python3, gtk3, runCommand , gcc, autoconf, automake, which, procps, libiberty_static , runtimeShell , sysconfDir ? "" # set this parameter to override the default value $out/etc @@ -7,18 +7,18 @@ let name = "distcc"; - version = "2016-02-24"; + version = "2021-03-11"; distcc = stdenv.mkDerivation { name = "${name}-${version}"; src = fetchFromGitHub { owner = "distcc"; repo = "distcc"; - rev = "b2fa4e21b4029e13e2c33f7b03ca43346f2cecb8"; - sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6"; + rev = "de21b1a43737fbcf47967a706dab4c60521dbbb1"; + sha256 = "0zjba1090awxkmgifr9jnjkxf41zhzc4f6mrnbayn3v6s77ca9x4"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [popt avahi pkg-config python3 gtk2 autoconf automake which procps libiberty_static]; + buildInputs = [popt avahi pkg-config python3 gtk3 autoconf automake which procps libiberty_static]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) @@ -30,7 +30,7 @@ let ${if static then "LDFLAGS=-static" else ""} --with${if static == true || popt == null then "" else "out"}-included-popt --with${if avahi != null then "" else "out"}-avahi - --with${if gtk2 != null then "" else "out"}-gtk + --with${if gtk3 != null then "" else "out"}-gtk --without-gnome --enable-rfc2553 --disable-Werror # a must on gcc 4.6 diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix index 6f92377897..66d4e8bc05 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix @@ -61,8 +61,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; + configurePlatforms = [ "build" "host" "target" ]; # GDB have to be built out of tree. preConfigure = '' @@ -72,6 +71,13 @@ stdenv.mkDerivation rec { configureScript = "../configure"; configureFlags = with lib; [ + # Set the program prefix to the current targetPrefix. + # This ensures that the prefix always conforms to + # nixpkgs' expectations instead of relying on the build + # system which only receives `config` which is merely a + # subset of the platform description. + "--program-prefix=${targetPrefix}" + "--enable-targets=all" "--enable-64-bit-bfd" "--disable-install-libbfd" "--disable-shared" "--enable-static" diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/global/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/global/default.nix index 7ace6f857c..739615a841 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/global/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/global/default.nix @@ -6,11 +6,11 @@ let pygments = python3Packages.pygments; in stdenv.mkDerivation rec { pname = "global"; - version = "6.6.5"; + version = "6.6.6"; src = fetchurl { url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - sha256 = "10vvsgx8v54whb4j9mk5qqyb5h3rdd9da0il3wir8pcpksyk0dww"; + sha256 = "sha256-dYB4r/+Y1MBRxYeFx62j7Rl3+rt3+Il/9le3HMYtTV0="; }; nativeBuildInputs = [ libtool makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gob2/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gob2/default.nix index b78c111ccb..06487845fb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/gob2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/gob2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, bison, flex, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, glib, bison, flex, gnome }: stdenv.mkDerivation rec { pname = "gob2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib bison flex ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/jiq/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/jiq/default.nix new file mode 100644 index 0000000000..c52a9ae4c0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/jiq/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub, jq, makeWrapper }: + +buildGoModule rec { + pname = "jiq"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "fiatjaf"; + repo = pname; + rev = version; + sha256 = "sha256-EPhnfgmn0AufuxwcwRrEEQk+RD97akFJSzngkTl4LmY="; + }; + + vendorSha256 = "sha256-ZUmOhPGy+24AuxdeRVF0Vnu8zDGFrHoUlYiDdfIV5lc="; + + nativeBuildInputs = [ makeWrapper ]; + + checkInputs = [ jq ]; + + postInstall = '' + wrapProgram $out/bin/jiq \ + --prefix PATH : ${lib.makeBinPath [ jq ]} + ''; + + meta = with lib; { + homepage = "https://github.com/fiatjaf/jiq"; + license = licenses.mit; + description = "jid on jq - interactive JSON query tool using jq expressions"; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix index 217cbe5e02..dbcb8d52f1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix @@ -1,4 +1,4 @@ -{ autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, unzip, zip }: +{ autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, zip }: stdenv.mkDerivation rec { name = "jscoverage-0.5.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { ./jsfalse_to_null.patch ]; - nativeBuildInputs = [ unzip perl python3 zip ]; + nativeBuildInputs = [ perl python3 zip ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix index 96ce9d4059..ab196ebc5b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix @@ -14,7 +14,7 @@ , libgsf , gcab , bzip2 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix index 7f73fb9a1b..b1d59c9450 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "nimlsp"; - version = "0.2.6"; + version = "0.3.2"; src = fetchFromGitHub { owner = "PMunch"; repo = "nimlsp"; rev = "v${version}"; - sha256 = "13kw3zjh0iqymwqxwhyj8jz6hgswwahf1rjd6iad7c6gcwrrg6yl"; + sha256 = "1lm823nvpp3bj9527jd8n1jxh6y8p8ngkfkj91p94m7ffai6jazq"; }; nativeBuildInputs = [ nim ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix index 01f2ced1f4..0a2bbc30fb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Source code search and cross reference engine"; homepage = "https://opengrok.github.io/OpenGrok/"; license = licenses.cddl; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix index cafa63e96b..0c52a89229 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8Bo6ZSpecdMX/Hoj0N1/iptfqybPUoQ0T9IQima+Bbo="; + sha256 = "sha256-5+h1fyTCp1jUZeKRCeDhfqAA11SMyR5nw2Y2x6JyIwY="; }; - vendorSha256 = "sha256-oP7ZekG7YdRhUvt48wxalt8y8QmVFkAw9GRIKBmi9sg="; + vendorSha256 = "sha256-m5ddUwuTX0mSihkoGIMQKidptwUL8Bao5HgHJBWX0os="; # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index 480c7cfd55..eec1576711 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -3,28 +3,39 @@ , rustPlatform , fetchFromGitHub , installShellFiles +, libiconv , Security +, CoreServices }: rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "2.2.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - sha256 = "06x7j4ppgw24xbsnyj1icaksngqbvq6mk8wfcqikzmvmifjspx9m"; + hash = "sha256-jOxneMqeyvMQWKPNha59H6qWSFmx+Z71SU2+M5VWMsA="; }; - cargoSha256 = "0gzxylpn2hps0kxczd6wwcqhnvm6ir971bfvpgjr6rxi12hs47ky"; + cargoHash = "sha256-H6czxSTw93RNTaN0OJyv0RfwmGAiFkpDgUtXHCD+jrY="; + + outputs = [ "out" "man" ]; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security CoreServices ]; postInstall = '' installManPage texlab.1 + + # Remove generated dylib of html2md dependency. TexLab statically + # links to the generated rlib and doesn't reference the dylib. I + # couldn't find any way to prevent building this by passing cargo flags. + # See https://gitlab.com/Kanedias/html2md/-/blob/0.2.10/Cargo.toml#L20 + rm "$out/lib/libhtml2md${stdenv.hostPlatform.extensions.sharedLibrary}" + rmdir "$out/lib" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/mix2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/mix2nix/default.nix new file mode 100644 index 0000000000..e814f44757 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/mix2nix/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub, elixir, erlang }: + +stdenv.mkDerivation rec { + pname = "mix2nix"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "ydlr"; + repo = "mix2nix"; + rev = version; + sha256 = "11qn80im5zfbx25ibxqrgi90mglf8pnsmrqsami633mcf2gvj2hy"; + }; + + nativeBuildInputs = [ elixir ]; + buildInputs = [ erlang ]; + + buildPhase = "mix escript.build"; + installPhase = "install -Dt $out/bin mix2nix"; + + meta = with lib; { + description = "Generate nix expressions from mix.lock file."; + license = licenses.mit; + maintainers = with maintainers; [ ydlr ] ++ teams.beam.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/nemiver/default.nix b/third_party/nixpkgs/pkgs/development/tools/nemiver/default.nix index 58c0f2ed28..7894dfe797 100644 --- a/third_party/nixpkgs/pkgs/development/tools/nemiver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/nemiver/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , pkg-config -, gnome3 +, gnome , gtk3 , libxml2 , intltool @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "nemiver"; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/nwjs/default.nix b/third_party/nixpkgs/pkgs/development/tools/nwjs/default.nix index 1356bc46ce..9cfb3c448e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/nwjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/nwjs/default.nix @@ -3,7 +3,7 @@ , xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig , gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify -, ffmpeg_3, libxcb, cups +, ffmpeg, libxcb, cups , sqlite, udev , libuuid , sdk ? false @@ -22,7 +22,7 @@ let xorg.libXScrnSaver cups libcap libnotify # libnw-specific (not chromium dependencies) - ffmpeg_3 libxcb + ffmpeg libxcb # chromium runtime deps (dlopen’d) sqlite udev libuuid diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/1.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/1.nix index a16b3ab23f..ad90878791 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/1.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/1.nix @@ -2,7 +2,7 @@ if !lib.versionAtLeast ocaml.version "4.02" || lib.versionAtLeast ocaml.version "4.12" -then throw "dune is not available for OCaml ${ocaml.version}" +then throw "dune 1 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix index f1365792fb..2acc7e5bdf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, ocaml, findlib }: if lib.versionOlder ocaml.version "4.08" -then throw "dune is not available for OCaml ${ocaml.version}" +then throw "dune 2 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix index 51f731c943..e0710079b6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, mono6 +, mono , msbuild , dotnet-sdk , makeWrapper @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { chmod -R u+w $out/src mv $out/src/.msbuild/Current/{bin,Bin} - makeWrapper ${mono6}/bin/mono $out/bin/omnisharp \ + makeWrapper ${mono}/bin/mono $out/bin/omnisharp \ --add-flags "$out/src/OmniSharp.exe" ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/pactorio/default.nix b/third_party/nixpkgs/pkgs/development/tools/pactorio/default.nix index d29e124437..8defc8c06c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pactorio/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pactorio/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, installShellFiles, lib, rustPlatform }: +{ fetchFromGitHub, installShellFiles, lib, stdenv, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "pactorio"; @@ -14,6 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1m7bvi6i52xqvssjx5fr2dz25ny7hkmb8w8p23pczpdmpd2y0r7r"; nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optional stdenv.isDarwin Security; preFixup = '' completions=($releaseDir/build/pactorio-*/out/completions) diff --git a/third_party/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix b/third_party/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix index ce733b8a21..2cd8ff4fdb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ llvmPackages.clang ]; buildInputs = [ llvmPackages.libclang ]; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; postInstall = '' mkdir -p $out/share/kak/autoload/plugins diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix index ebba9903a4..a945f3bdde 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix @@ -1,48 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "re2c"; - version = "1.3"; + version = "2.1.1"; src = fetchFromGitHub { owner = "skvadrik"; repo = "re2c"; rev = version; - sha256 = "0aqlf2h6i2m3dq11dkq89p4w4c9kp4x66s5rhp84gmpz5xqv1x5h"; + sha256 = "06nvk5sf4vrc2bvpj4vi2xwy3ggv548sn530drz5fi67nhzgga26"; }; - patches = [ - (fetchpatch { - name = "CVE-2018-21232-part1.patch"; - url = "https://github.com/skvadrik/re2c/commit/fd634998f813340768c333cdad638498602856e5.patch"; - sha256 = "1blyg5lyhqd4ymisih65xl0g36ig71ijia4skkkd59rdvj78aiw6"; - }) - - (fetchpatch { - name = "CVE-2018-21232-part2.patch"; - url = "https://github.com/skvadrik/re2c/commit/7b5643476bd99c994c4f51b8143f942982d85521.patch"; - sha256 = "0rhmgqrinpk49r9x75ygrs14lz72aw5ad5kr6qp9bdyl8gs082qp"; - }) - - (fetchpatch { - name = "CVE-2018-21232-part3.patch"; - url = "https://github.com/skvadrik/re2c/commit/4d9c809355b574f2a58eac119f5e076c48e4d1e2.patch"; - sha256 = "0k86wg9icw1gkqpf7rq2w6xsq4caxw3rc0zfxf39liwa35027rai"; - }) - - (fetchpatch { - name = "CVE-2018-21232-part4.patch"; - url = "https://github.com/skvadrik/re2c/commit/89be91f3df00657261870adbc590209fdb2bc405.patch"; - sha256 = "1aygy9va7jwby93chlskwg7z90fn07x5hym0gziwlkx8k900p3a3"; - }) - - (fetchpatch { - name = "CVE-2020-11958.patch"; - url = "https://github.com/skvadrik/re2c/commit/c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a.patch"; - sha256 = "1d95ahxk92g7k87sda9gxgmr3blyfzwd2y7h9jxj8zkd74knd9zh"; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; doCheck = true; @@ -54,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool for writing very fast and very flexible scanners"; - homepage = "http://re2c.org"; + homepage = "https://re2c.org"; license = licenses.publicDomain; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice ]; 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 aa58864fed..f217aefc2d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -512,7 +512,7 @@ self: super: # Set directory containing llvm-config binary preConfigure = '' - export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config + export LLVM_CONFIG=${pkgs.llvm.dev}/bin/llvm-config ''; __impureHostDeps = lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/capture.nix b/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/capture.nix index a9443eeadf..2d33dedbdd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/capture.nix +++ b/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/capture.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = sysprof.meta // { description = "Static library for Sysprof capture data generation"; + license = lib.licenses.bsd2Patent; platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix b/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix index 9e749adea2..6ceda01604 100644 --- a/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix @@ -5,6 +5,7 @@ , gettext , glib , gtk3 +, json-glib , itstool , libdazzle , libxml2 @@ -15,18 +16,18 @@ , shared-mime-info , systemd , wrapGAppsHook -, gnome3 +, gnome }: stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.38.1"; + version = "3.40.1"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1z2i9187f2jx456l7h07wy8m9a0p7pj3xiv1aji3snq7rjb1lkj0"; + sha256 = "0dvlzjwi3a4g37cpyhqpf41f5hypf0gim1jw9wqlv30flbb00l62"; }; nativeBuildInputs = [ @@ -39,17 +40,27 @@ stdenv.mkDerivation rec { pkg-config shared-mime-info wrapGAppsHook - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme + ]; + + buildInputs = [ + glib + gtk3 + json-glib + pango + polkit + systemd + libdazzle ]; - buildInputs = [ glib gtk3 pango polkit systemd.dev (lib.getLib systemd) libdazzle ]; mesonFlags = [ "-Dsystemdunitdir=lib/systemd/system" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; @@ -65,6 +76,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp/default.nix index 6ca016f8e6..5db843e6f6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "protoc-gen-twirp"; - version = "7.2.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "twitchtv"; repo = "twirp"; rev = "v${version}"; - sha256 = "sha256-W7t36F1St0YLPowHaZSboVNnvX7E2Lg5tPWeyeUSabA="; + sha256 = "sha256-lwozRwH96nh4Zlf6ggOF+FuUEfxkN38wxygg5HXw/M0="; }; goPackagePath = "github.com/twitchtv/twirp"; diff --git a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix index ed8da83e30..0bd33f19f8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix +++ b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix @@ -1,37 +1,38 @@ +# This has been automatically generated by the script +# ./update.sh. This should not be changed by hand. { mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool -, base, bower-json, bytestring, Cabal, containers, cryptonite -, dhall, directory, either, extra, fetchgit, file-embed, filepath -, foldl, fsnotify, generic-lens, Glob, hpack, hspec, hspec-discover +, base, bower-json, bytestring, containers, cryptonite, dhall +, directory, either, extra, fetchgit, file-embed, filepath, foldl +, fsnotify, generic-lens, Glob, hspec, hspec-discover , hspec-megaparsec, http-client, http-conduit, http-types , lens-family-core, lib, megaparsec, mtl, network-uri, open-browser , optparse-applicative, prettyprinter, process, QuickCheck, retry -, rio, rio-orphans, safe, semver-range, stm, stringsearch -, tar, template-haskell, temporary, text, time, transformers -, turtle, unliftio, unordered-containers, utf8-string, versions -, with-utf8, zlib +, rio, rio-orphans, safe, semver-range, stm, stringsearch, tar +, template-haskell, temporary, text, time, transformers, turtle +, unliftio, unordered-containers, utf8-string, versions, with-utf8 +, zlib }: mkDerivation { pname = "spago"; - version = "0.20.1"; + version = "0.20.2"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "1j2yi6zz9m0k0298wllin39h244v8b2rx87yxxgdbjg77kn96vxg"; - rev = "41ad739614f4f2c2356ac921308f9475a5a918f4"; + sha256 = "11jh3bszvl8zfi4xcabpx43jply28dxdywd6fadxspaa05jdxxn2"; + rev = "0f38c9153e46f30e9d87963e181f5c1a595f4b64"; fetchSubmodules = true; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async-pool base bower-json - bytestring Cabal containers cryptonite dhall directory either - file-embed filepath foldl fsnotify generic-lens Glob http-client - http-conduit http-types lens-family-core megaparsec mtl network-uri - open-browser optparse-applicative prettyprinter process retry rio - rio-orphans safe semver-range stm stringsearch tar template-haskell - temporary text time transformers turtle unliftio - unordered-containers utf8-string versions with-utf8 zlib + bytestring containers cryptonite dhall directory either file-embed + filepath foldl fsnotify generic-lens Glob http-client http-conduit + http-types lens-family-core megaparsec mtl network-uri open-browser + optparse-applicative prettyprinter process retry rio rio-orphans + safe semver-range stm stringsearch tar template-haskell temporary + text time transformers turtle unliftio unordered-containers + utf8-string versions with-utf8 zlib ]; - libraryToolDepends = [ hpack ]; executableHaskellDepends = [ ansi-terminal base text turtle with-utf8 ]; @@ -40,7 +41,6 @@ mkDerivation { process QuickCheck temporary text turtle versions ]; testToolDepends = [ hspec-discover ]; - prePatch = "hpack"; homepage = "https://github.com/purescript/spago#readme"; license = lib.licenses.bsd3; } diff --git a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/update.sh b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/update.sh index 74bc010506..12595885df 100755 --- a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/update.sh +++ b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p cabal2nix curl jq +#!nix-shell -i bash -p cabal2nix curl jq haskellPackages.cabal2nix-unstable -I nixpkgs=. # # This script will update the spago derivation to the latest version using # cabal2nix. @@ -25,7 +25,10 @@ new_version=$(curl --silent "https://api.github.com/repos/purescript/spago/relea echo "Updating spago from old version $old_version to new version $new_version." echo "Running cabal2nix and outputting to ${spago_derivation_file}..." -cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" > "$spago_derivation_file" +echo "# This has been automatically generated by the script" > "$spago_derivation_file" +echo "# ./update.sh. This should not be changed by hand." >> "$spago_derivation_file" + +cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" >> "$spago_derivation_file" # TODO: This should ideally also automatically update the docsSearchVersion # from pkgs/development/haskell/configuration-nix.nix. diff --git a/third_party/nixpkgs/pkgs/development/tools/pypi2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/pypi2nix/default.nix index 980aa0f09e..04d61995d3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pypi2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pypi2nix/default.nix @@ -20,4 +20,6 @@ pkgs.buildPythonApplication rec { toml jsonschema ]; + # https://github.com/nix-community/pypi2nix/issues/460 + meta.broken = true; } diff --git a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix index dc5699ed37..2b0227407d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix @@ -64,7 +64,7 @@ mkDerivation rec { # Fix paths to libclang library. substituteInPlace src/shared/clang/clang_installation.pri \ - --replace 'LIBCLANG_LIBS = -L$${LLVM_LIBDIR}' 'LIBCLANG_LIBS = -L${llvmPackages_8.libclang}/lib' \ + --replace 'LIBCLANG_LIBS = -L$${LLVM_LIBDIR}' 'LIBCLANG_LIBS = -L${llvmPackages_8.libclang.lib}/lib' \ --replace 'LIBCLANG_LIBS += $${CLANG_LIB}' 'LIBCLANG_LIBS += -lclang' \ --replace 'LIBTOOLING_LIBS = -L$${LLVM_LIBDIR}' 'LIBTOOLING_LIBS = -L${clang_qt_vendor}/lib' \ --replace 'LLVM_CXXFLAGS ~= s,-gsplit-dwarf,' '${lib.concatStringsSep "\n" ["LLVM_CXXFLAGS ~= s,-gsplit-dwarf," " LLVM_CXXFLAGS += -fno-rtti"]}' diff --git a/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix b/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix index ae1ac3e39f..ca8359a32a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core +{ lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome, atk, at-spi2-atk, at-spi2-core , gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem }: diff --git a/third_party/nixpkgs/pkgs/development/tools/rq/default.nix b/third_party/nixpkgs/pkgs/development/tools/rq/default.nix index 838740d1fd..c9e78650f6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rq/default.nix @@ -11,13 +11,20 @@ rustPlatform.buildRustPackage rec { sha256 = "0km9d751jr6c5qy4af6ks7nv3xfn13iqi03wq59a1c73rnf0zinp"; }; + postPatch = '' + # Remove #[deny(warnings)] which is equivalent to -Werror in C. + # Prevents build failures when upgrading rustc, which may give more warnings. + substituteInPlace src/lib.rs \ + --replace "#![deny(warnings)]" "" + ''; + cargoSha256 = "0c5vwy3c5ji602dj64z6jqvcpi2xff03zvjbnwihb3ydqwnb3v67"; - buildInputs = [ llvmPackages.clang-unwrapped v8 ] + buildInputs = [ llvmPackages.libclang v8 ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; configurePhase = '' - export LIBCLANG_PATH="${llvmPackages.clang-unwrapped}/lib" + export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" export V8_SOURCE="${v8}" ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/rtags/default.nix b/third_party/nixpkgs/pkgs/development/tools/rtags/default.nix index e5da0ddf59..6ecbe05832 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rtags/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rtags/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation rec { pname = "rtags"; version = "2.38"; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ llvmPackages.llvm openssl emacs ] + nativeBuildInputs = [ cmake pkg-config llvmPackages.llvm.dev ]; + buildInputs = [ llvmPackages.llvm llvmPackages.libclang openssl emacs ] ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ] ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix index 962e8c562c..598d01a8af 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-0d8+Rkb4h1DoFUQ7u2/kPR/fUUz0YvI+hNT4iXL3mxY="; }; - cargoSha256 = "sha256-cUDOi3QwjEJaBXGSQZQ76gZ702QLNok8fr6U2q+tVao="; + cargoSha256 = "0r60smhlx1992a1s1k5sxjpdqllb2xsqcimgx3ldp5fdkfphk3cw"; #for substituteAll libclang = llvmPackages.libclang.lib; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { propagatedBuildInputs = [ clang ]; # to populate NIX_CXXSTDLIB_COMPILE configurePhase = '' - export LIBCLANG_PATH="${libclang}/lib" + export LIBCLANG_PATH="${libclang.lib}/lib" ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix index 8b40d9b686..05629d613d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix @@ -5,23 +5,28 @@ rustPlatform.buildRustPackage rec { version = "0.3.3"; # Upstream doesn't commit `Cargo.lock`, see https://github.com/rust-embedded/cargo-binutils/pull/99 - src = let - repo = fetchFromGitHub { - owner = "rust-embedded"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Dgn+f4aSsDSh+RC8yvt3ydkdtwib5jEVsnZkod5c7Vo="; - }; - in runCommand "source" { } '' - cp -R ${repo} $out - chmod -R +w $out - cp ${./Cargo.lock} $out/Cargo.lock - ''; + src = + let + repo = fetchFromGitHub { + owner = "rust-embedded"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Dgn+f4aSsDSh+RC8yvt3ydkdtwib5jEVsnZkod5c7Vo="; + }; + in + runCommand "source" { } '' + cp -R ${repo} $out + chmod -R +w $out + cp ${./Cargo.lock} $out/Cargo.lock + ''; cargoSha256 = "sha256-Zrl269PacPi81TrGTIDzmVndgGY5i5lYyspiOj43rpw="; meta = with lib; { - description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain"; + description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain."; + longDescription = '' + In order for this to work, you either need to run `rustup component add llvm-tools-preview` or install the `llvm-tools-preview` component using your Nix library (e.g. nixpkgs-mozilla, or rust-overlay) + ''; homepage = "https://github.com/rust-embedded/cargo-binutils"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ stupremee ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix index 8d12da30a6..7db1ea7f37 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix @@ -45,6 +45,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/lu-zero/cargo-c/releases/tag/v${version}"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix index 71d4646c1a..092a0a10b1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cache"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "matthiaskrgr"; repo = pname; rev = version; - sha256 = "sha256-qRwyNSAYuAnU17o/5zqKuvixQw7xfA6wNVzN6QRbZlY="; + sha256 = "sha256-/xP6TQcLyY1XC8r5SCkwej/I6fMaV5PqNNuvK1WbmeM="; }; - cargoSha256 = "sha256-OpqVP097GYiARq7gbsMGFFGkFaQz3qeux12aMJj7W3Y="; + cargoSha256 = "sha256-1ZNbqydRsXmMGLhqPrgNAE8bhpZCMAJO/YQbOvtiS/s="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix index 57866918f0..9e95ee4430 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.19.2"; + version = "0.19.4"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-aqvdAljAJsYtmxz/WtMrrnmJJRXDpqDjUn1LusoM8ns="; + sha256 = "sha256-XwwzMo06TdyOtGE9Z48mkEr6DnB/89wtMrW+UWr0G/Q="; }; - cargoSha256 = "sha256-KwnZmehh0vdR1eSPBrY6yHJR6r7mhIEgfN4soEBDTjU="; + cargoSha256 = "sha256-gA2Fg4CCi0W+GqJoNPZWw/OjNYh2U2UsC6eMZ9W1QN8="; nativeBuildInputs = [ perl pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix index 989885e99a..4fb994b3ee 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix @@ -1,22 +1,24 @@ { lib , rustPlatform, fetchFromGitHub -, libusb1, pkg-config, rustfmt }: +, libusb1, libftdi1, pkg-config, rustfmt }: rustPlatform.buildRustPackage rec { pname = "cargo-embed"; - version = "0.8.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "probe-rs"; repo = pname; rev = "v${version}"; - sha256 = "0klkgl7c42vhqxj6svw26lcr7rccq89bl17jn3p751x6281zvr35"; + sha256 = "1z8n883cb4jca3phi9x2kwl01xclyr00l8jxgiyd28l2jik78i5k"; }; - cargoSha256 = "0w21q2fpr077m8jr24ld3qjimwk1m4fy9dh14fq9nv5xd4f5s8n8"; + cargoSha256 = "1ir9qngxmja6cm42m40jqbga9mlfjllm23ca26wyigjv3025pi6i"; nativeBuildInputs = [ pkg-config rustfmt ]; - buildInputs = [ libusb1 ]; + buildInputs = [ libusb1 libftdi1 ]; + + cargoBuildFlags = [ "--features=ftdi" ]; meta = with lib; { description = "A cargo extension for working with microcontrollers"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index 934976f738..a9a01fcc66 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-1+A+n5VQS8zJULiR8IWLGo+RnFuVjg6ist8G3eCsXJM="; + buildInputs = lib.optional stdenv.isDarwin libiconv; + meta = with lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix index 94b5000b9b..f3fc148f02 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-feature"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0nvl5smibl81b826xcsrjx8p89lcfpj7wqdsvywnj7jd3p5ag03n"; + buildInputs = lib.optional stdenv.isDarwin libiconv; + meta = with lib; { description = "Allows conveniently modify features of crate"; homepage = "https://github.com/Riey/cargo-feature"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix index 39b56c2d65..a2679b53c4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix @@ -1,22 +1,29 @@ { lib -, rustPlatform, fetchFromGitHub -, libusb1, pkg-config, rustfmt }: +, stdenv +, rustPlatform +, fetchFromGitHub +, libusb1 +, openssl +, pkg-config +, rustfmt +, Security +}: rustPlatform.buildRustPackage rec { pname = "cargo-flash"; - version = "0.8.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "probe-rs"; repo = pname; rev = "v${version}"; - sha256 = "1bcpv1r4pdpp22w7za7kdy7jl487x3nlwxiz6sqq3iq6wq3j9zj0"; + sha256 = "sha256-aQ5647woODs/A4fcxSsQoQHL6YQ0TpfQFegtXETqlHk="; }; - cargoSha256 = "1pf117fgw9x9diksqv58cw7i0kzmp25yj73y5ll69sk46b6z4j90"; + cargoSha256 = "sha256-P7xyg9I1MhmiKlyAI9cvABcYKNxB6TSvTgMsMk5KxAQ="; nativeBuildInputs = [ pkg-config rustfmt ]; - buildInputs = [ libusb1 ]; + buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "A cargo extension for working with microcontrollers"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix index ced5d7cd58..56a2962f0c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -1,17 +1,19 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, stdenv, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "rust-fuzz"; repo = "cargo-fuzz"; rev = version; - sha256 = "sha256-kBbwE4ToUud5BDDlGoey2qpp2imzO6t3FcIbV3NTFa8="; + sha256 = "sha256-txlHXboQi3Z8AMIJJBZsBrCA7xggF0zGDpKqcD8UxMo="; }; - cargoSha256 = "sha256-zqRlB2Kck4icMKzhaeeakEnn6O7zhoKPa5ZWbGooWIg="; + cargoSha256 = "sha256-eEfry6Q2YiIkNEHu6C8p17pUTF43eS1/iTP2oATZ/F8="; + + buildInputs = lib.optional stdenv.isDarwin libiconv; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix index e621fa9b97..0c37739335 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix @@ -1,22 +1,19 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, libiconv, stdenv }: rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - version = "0.16.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; rev = version; - sha256 = "1lcbdzh139lhmpz3pyik8nbgrbfc42z9ydz2hkg2lzjdpfdsz3ag"; + sha256 = "1qzzkhailxjqwp3rmdcpp112wn3x0gfi788vwj77pfdyclhpj0a7"; }; - cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "0qjzbcaznnmb0p0r23s82jjbfs5mhhkacg26lf8fq4vvlkr1hsqf"; - - patches = [ ./ignore-rustfmt-test.patch ]; - - cargoBuildFlags = [ "-p cargo-insta" ]; + sourceRoot = "source/cargo-insta"; + cargoSha256 = "01fj2j7ibrk5dyrfkmc610lh1p6f6bgzbgivq3dsd64vslhqmabw"; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; meta = with lib; { description = "A Cargo subcommand for snapshot testing"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/ignore-rustfmt-test.patch b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/ignore-rustfmt-test.patch deleted file mode 100644 index 6c38158d59..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/ignore-rustfmt-test.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/runtime.rs -+++ b/src/runtime.rs -@@ -85,6 +85,7 @@ fn format_rust_expression(value: &str) -> Cow<'_, str> { - } - - #[test] -+#[ignore] - fn test_format_rust_expression() { - use crate::assert_snapshot; - assert_snapshot!(format_rust_expression("vec![1,2,3]"), @"vec![1, 2, 3]"); diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix index 7d63b7adce..76f766685a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix @@ -2,6 +2,8 @@ , rustPlatform , fetchFromGitHub , nix-update-script +, stdenv +, libiconv }: rustPlatform.buildRustPackage rec { @@ -17,6 +19,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-LxqxRtMKUKZeuvk1caoYy8rv1bkEOQBM8i5SXMF4GXc="; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + passthru = { updateScript = nix-update-script { attrPath = pname; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index 4300719147..2f20c66bbe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.17"; + version = "0.33.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-D/8fjJIyHCRzkomRsYUnGjDMCusjNX8ZYmLjowCYgcM="; + sha256 = "sha256-OnCSWAGcxQsLq5aQmd/15lAQmdsCGPqLeRYWXQG0oG0="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-Upegh3W31sTaXl0iHZ3HiYs9urgXH/XhC0vQBAWvDIc="; + cargoSha256 = "sha256-BsE5+0bL9ctsdZ/PM1d6TfrXuzNMYHejoqA3bgH8140="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix index 32ce1464f8..c6a02a4dff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -4,20 +4,23 @@ , nix-update-script , pkg-config , openssl +, stdenv +, libiconv +, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "1ynv5d2rxlc1gzq93v8qjyl5063w7q42g9m95250yh2lmf9hdj5i"; + sha256 = "sha256-7XOpK6+JVV/p+g/Lb/ORUC9msME0vtuDbmiCBmuOJ8w="; }; - cargoSha256 = "03rphdps17gzcmf8n5w14x5i5rjnfznsl150s3cz5vzhbmnlpszf"; + cargoSha256 = "sha256-KYITZHBcb5G+7PW8kwbHSsereVjH39cVLQjqNaCq2iU="; passthru = { updateScript = nix-update-script { @@ -28,7 +31,9 @@ rustPlatform.buildRustPackage rec { # Integration tests fail doCheck = false; - buildInputs = [ openssl ]; + buildInputs = if stdenv.isDarwin + then [ libiconv Security ] + else [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix index 9fadea3f31..968a6ce457 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.20"; + version = "0.1.21"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1gAkc8x9rl80xkFWR2iKYOjkHplWUPWQZDbE8U5gkOM="; + sha256 = "sha256-Voei7j3WRDu70NkcJvjqPJ4ikOUupOhvFNEHHRyF6/Q="; }; - cargoSha256 = "sha256-APUQYqC0MYNeeuehkQvxQsjOnXBgvEMNBqfoUy2KH0U="; + cargoSha256 = "sha256-zMya7bEehNKIfwQtJ252sflg06P4Ra8/lgBjn4UUqRg="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix index 43f13b2e99..017fb7d484 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix @@ -1,19 +1,19 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "7.6.1"; + version = "7.8.0"; src = fetchFromGitHub { owner = "passcod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vjX8xfwv/DOogji+OQCB9l5ebGBNoLW722TGpZ5Wg80="; + sha256 = "sha256-ZbVBwSg3roIMA+5LVP3omtTgbAJ7HAdJDXyAybWuRLw="; }; - cargoSha256 = "sha256-ku+tI0DIofV0EZ413sPjbJDUSqwTxiT8NWBeURrJW1k="; + cargoSha256 = "sha256-6aoi/CLla/yKa5RuVgn8RJ9AK1j1wtZeBn+6tpXrJvA="; - buildInputs = lib.optional stdenv.isDarwin CoreServices; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; # `test with_cargo` tries to call cargo-watch as a cargo subcommand # (calling cargo-watch with command `cargo watch`) diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix index 5dad37d081..2e3391de94 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-S3t1hv/mRn6vwyzT78DPIacqiJV3CnjGdOKsdSyYs8g="; }; - cargoSha256 = "sha256-uaeJmGEQHVSuILlYlJOHmRWWdN6FPvrHu6CbJyb60MY="; + cargoSha256 = "1ycvbdgd50l1nahq63zi9yp3793smkswlwhsqjrmws5b1fqzv9w0"; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix index 41175ad853..a5713d944a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix @@ -27,7 +27,7 @@ python.pkgs.buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src patches; name = "${pname}-${version}"; - hash = "sha256-//TmozgWy9zrSpMKX92XdHj4fw/T1Elfgn4YhhR7ot0="; + hash = "sha256-u3L9nXHKILznyZTgxdvZyOCQZFZhuADrtI7zXYQzrbE="; }; patches = [ ./Cargo.lock.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix index c4dc0c3410..262d8c4945 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix @@ -1,20 +1,22 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, libusb1 }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, libusb1 +, libiconv, AppKit, IOKit }: rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "knurling-rs"; repo = pname; rev = "v${version}"; - sha256 = "QEUsigoSqVczrsSSDnOhTXm94JTXHgxeNY0tGsOaRyg="; + sha256 = "avaGBIKldr+1Zwq+7NOHt2wldmY/6Lb6bi9uVHZFI5Q="; }; - cargoSha256 = "Fr5XWIUHXyfesouHi0Uryf/ZgB/rDDJ4G1BYGHw0QeQ="; + cargoSha256 = "HmDKfb8F6sGnaX64FR3No2GbBYm4bVopbjs8d35WiZQ="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ]; + buildInputs = [ libusb1 ] + ++ lib.optionals stdenv.isDarwin [ libiconv AppKit IOKit ]; meta = with lib; { description = "Run embedded programs just like native ones."; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/racer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/racer/default.nix index 3ad4b54b47..c4d0d605cf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/racer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/racer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "racer"; - version = "2.1.40"; + version = "2.1.44"; src = fetchFromGitHub { owner = "racer-rust"; repo = "racer"; rev = "v${version}"; - sha256 = "sha256-8Is+RBfcXKbGSFzYoolLHs30rxlNI//xVGEOhxP2TV8="; + sha256 = "sha256-EmxJg2QDpGZ5TbMy9y6P11LdMucBdvewkRewuUzccGM="; }; - cargoSha256 = "sha256-iUomr9viCdZk4nV75/OP8vHtJpMbmy+pq1IbaA2lLmE="; + cargoSha256 = "sha256-kKQnpEashpIwrXubuZIpU+tzxFaUjr6jaVunYPqaHnM="; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optional stdenv.isDarwin Security; 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 4a30a70fa0..a038e9d65d 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 @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake, fetchpatch , libiconv , useMimalloc ? false , doCheck ? true @@ -6,16 +6,32 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-04-19"; - cargoSha256 = "sha256-CXkI3CQ/v6RBMM2Dpp2u+qnRwba+nqzeaPSJGBiQUoY="; + version = "2021-05-17"; + cargoSha256 = "sha256-uSBukInJ3FEMmMpG9DN3XeXm+hzUFqCrZORb4NIEJhw="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-W/cUwZEvlUXzqQ/futeNFwDWR/cTL/RLZaW2srIs83Q="; + sha256 = "sha256-BsabpY4LArfsDPAMsggxKu1+OQZmqRe//+a5uBcuFps="; }; + patches = [ + # Revert updates which require rust 1.52.0. + # We currently have rust 1.51.0 in nixpkgs. + # https://github.com/rust-analyzer/rust-analyzer/pull/8718 + (fetchpatch { + url = "https://github.com/rust-analyzer/rust-analyzer/pull/8718/commits/607d8a2f61e56fabb7a3bc5132592917fcdca970.patch"; + sha256 = "sha256-g1yyq/XSwGxftnqSW1bR5UeMW4gW28f4JciGvwQ/n08="; + revert = true; + }) + (fetchpatch { + url = "https://github.com/rust-analyzer/rust-analyzer/pull/8718/commits/6a16ec52aa0d91945577c99cdf421b303b59301e.patch"; + sha256 = "sha256-n7Ew/0fG8zPaMFCi8FVLjQZwJSaczI/QoehC6pDLrAk="; + revert = true; + }) + ]; + buildAndTestSubdir = "crates/rust-analyzer"; cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rustup-toolchain-install-master/0001-dynamically-patchelf-binaries.patch b/third_party/nixpkgs/pkgs/development/tools/rust/rustup-toolchain-install-master/0001-dynamically-patchelf-binaries.patch new file mode 100644 index 0000000000..1754ce11c4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rustup-toolchain-install-master/0001-dynamically-patchelf-binaries.patch @@ -0,0 +1,61 @@ +diff --git a/src/main.rs b/src/main.rs +index 3cb6896..7f070e0 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -275,7 +275,9 @@ fn install_single_toolchain( + + // install + if maybe_dry_client.is_some() { +- rename(&toolchain.dest, toolchain_path)?; ++ rename(&toolchain.dest, toolchain_path.clone())?; ++ nix_patchelf(toolchain_path) ++ .expect("failed to patch toolchain for NixOS"); + eprintln!( + "toolchain `{}` is successfully installed!", + toolchain.dest.display() +@@ -291,6 +293,45 @@ fn install_single_toolchain( + Ok(()) + } + ++fn nix_patchelf(mut toolchain_path: PathBuf) -> Result<(), Error> { ++ toolchain_path.push("bin"); ++ ++ for entry in toolchain_path.read_dir()? { ++ let entry = entry?; ++ if !entry.file_type()?.is_file() { ++ continue; ++ } ++ ++ eprintln!("info: you seem to be running NixOS. Attempting to patch {}", ++ entry.path().to_str().unwrap()); ++ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") ++ .arg("--set-interpreter") ++ .arg("@dynamicLinker@") ++ .arg(entry.path()) ++ .output(); ++ } ++ ++ toolchain_path.pop(); ++ toolchain_path.push("lib"); ++ ++ for entry in toolchain_path.read_dir()? { ++ let entry = entry?; ++ if !entry.file_type()?.is_file() { ++ continue; ++ } ++ ++ eprintln!("info: you seem to be running NixOS. Attempting to patch {}", ++ entry.path().to_str().unwrap()); ++ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") ++ .arg("--set-rpath") ++ .arg("@libPath@") ++ .arg(entry.path()) ++ .output(); ++ } ++ ++ Ok(()) ++} ++ + fn fetch_master_commit(client: &Client, github_token: Option<&str>) -> Result { + eprintln!("fetching master commit hash... "); + fetch_master_commit_via_git() diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix new file mode 100644 index 0000000000..cae5453fa6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl +, runCommand +, patchelf +, zlib +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "rustup-toolchain-install-master"; + version = "1.7.3"; + + src = fetchFromGitHub { + owner = "kennytm"; + repo = pname; + rev = "v${version}"; + hash = "sha256-J25ER/g8Kylw/oTIEl4Gl8i1xmhR+4JM5M5EHpl1ras="; + }; + + patches = + let + patchelfPatch = runCommand "0001-dynamically-patchelf-binaries.patch" { + CC = stdenv.cc; + patchelf = patchelf; + libPath = "$ORIGIN/../lib:${lib.makeLibraryPath [ zlib ]}"; + } + '' + export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) + substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ + --subst-var patchelf \ + --subst-var dynamicLinker \ + --subst-var libPath + ''; + in + lib.optionals stdenv.isLinux [ patchelfPatch ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; + + cargoSha256 = "n7t8Ap9hdhrjmtKjfdyozf26J7yhu57pedm19CunLF4="; + + meta = with lib; { + description = "Install a rustc master toolchain usable from rustup"; + homepage = "https://github.com/kennytm/rustup-toolchain-install-master"; + license = licenses.mit; + maintainers = with maintainers; [ davidtwco ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix index 9e63dcf914..d13481804c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security ]; + ++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security libiconv ]; meta = with lib; { description = diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix index 8afb9c033c..c66cbe3c2c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }: with rustPlatform; @@ -16,6 +16,8 @@ buildRustPackage rec { cargoSha256 = "0c0f86x17fzav5q76z3ha3g00rbgyz2lm5a5v28ggy0jmg9xgsv6"; + buildInputs = lib.optional stdenv.isDarwin libiconv; + meta = with lib; { description = "Generate Rust register maps (`struct`s) from SVD files"; homepage = "https://github.com/rust-embedded/svd2rust"; diff --git a/third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix b/third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix index 97c03fb457..6bac5a95fc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix @@ -1,7 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, jdk, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, jdk11, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }: let - # The default one still uses jdk8 (#89731) - gradle = (gradleGen.override (old: { java = jdk; })).gradle_6_8; + gradle = (gradleGen.override (old: { java = jdk11; })).gradle_6_8; pname = "scenebuilder"; version = "15.0.1"; @@ -17,7 +16,7 @@ let name = "${pname}-deps"; inherit src; - nativeBuildInputs = [ jdk perl gradle ]; + nativeBuildInputs = [ jdk11 perl gradle ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d); @@ -77,7 +76,7 @@ let in stdenv.mkDerivation rec { inherit pname src version; - nativeBuildInputs = [ jdk gradle makeWrapper glib wrapGAppsHook ]; + nativeBuildInputs = [ jdk11 gradle makeWrapper glib wrapGAppsHook ]; dontWrapGApps = true; # prevent double wrapping @@ -101,7 +100,7 @@ in stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${jdk}/bin/java $out/bin/${pname} --add-flags "-jar $out/share/${pname}/${pname}.jar" "''${gappsWrapperArgs[@]}" + makeWrapper ${jdk11}/bin/java $out/bin/${pname} --add-flags "-jar $out/share/${pname}/${pname}.jar" "''${gappsWrapperArgs[@]}" ''; desktopItems = [ desktopItem ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix index db43c7f8e4..2af1d5e2a0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-GhLw8wt5eDixKNGtxGA0Fjw3auQ3AsjKa+0M4mLTQlg="; + sha256 = "sha256-ZHEujkl+GUk5WjgDWdbJwOIKuOqJnIpGnvD1SsrHuhI="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/sqsh/default.nix b/third_party/nixpkgs/pkgs/development/tools/sqsh/default.nix index 9c56efcb59..ba4a681a59 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sqsh/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sqsh/default.nix @@ -14,9 +14,6 @@ in stdenv.mkDerivation rec { preConfigure = '' export SYBASE=${freetds} - - substituteInPlace src/cmd_connect.c \ - --replace CS_TDS_80 CS_TDS_73 '' + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace "libct.so" "libct.dylib" ''; @@ -27,6 +24,17 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; + patches = [ + (fetchurl { + # https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/databases/sqsh/patches/patch-src_cmd_connect_c + name = "patch-src_cmd_connect_c.patch"; + url = "https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/databases/sqsh/patches/patch-src_cmd_connect_c?rev=1.2&content-type=text/plain"; + sha256 = "1dz97knr2h0a0ca1vq2mx6h8s3ns9jb1a0qraa4wkfmcdi3aqw0j"; + }) + ]; + + patchFlags = [ "-p0" ]; + meta = with lib; { description = "Command line tool for querying Sybase/MSSQL databases"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/treefmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/treefmt/default.nix index c90492c6ae..9b426882fe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/treefmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/treefmt/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "treefmt"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - sha256 = "0a4yikkqppawii1q0kzsxwfp1aid688wa0lixjwfsl279lr69css"; + sha256 = "10mv18hsyz5kd001i6cgk0xag4yk7rhxvs09acp2s68qni1v8vx2"; }; - cargoSha256 = "08k60gd23yanfraxpbw9hi7jbqgsxz9mv1ci6q9piis5742zlj9s"; + cargoSha256 = "02455sk8n900j8qr79mrchk7m0gb4chhw0saa280p86vn56flvs0"; meta = { description = "one CLI to format the code tree"; diff --git a/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix b/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix index d31c030eda..9284e1df45 100644 --- a/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix @@ -1,4 +1,5 @@ -{ rustPlatform, fetchFromGitHub, pkg-config, openssl, lib }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config +, openssl, libiconv, CoreServices, Security }: rustPlatform.buildRustPackage rec { pname = "trunk"; @@ -12,7 +13,9 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = if stdenv.isDarwin + then [ libiconv CoreServices Security ] + else [ openssl ]; cargoSha256 = "Qv7knTmNYtw0tbyWhFIV7tYkQiwFxcNPAeNiGCyeV8s="; diff --git a/third_party/nixpkgs/pkgs/development/tools/vala-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/vala-language-server/default.nix index 4cad79f9a8..7a5ab2ae41 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vala-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vala-language-server/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "Code Intelligence for Vala & Genie"; homepage = "https://github.com/benwaffle/vala-language-server"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ andreasfelix worldofpeace ]; + maintainers = with maintainers; [ andreasfelix ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/vala-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/vala-lint/default.nix index a45ced8a49..3c91880e16 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vala-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vala-lint/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , glib , meson @@ -12,13 +13,13 @@ stdenv.mkDerivation rec { pname = "vala-lint-unstable"; - version = "2020-08-18"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "vala-lang"; repo = "vala-lint"; - rev = "fc5dd9e95bc61540b404d5bc070c0629903baad9"; - sha256 = "n6pp6vYGaRF8B3phWp/e9KnpKGf0Op+xGVdT6HHe0rM="; + rev = "5b06cc2341ae7e9f7f8c35c542ef78c36e864c30"; + sha256 = "KwJ5sCp9ZrrxIqc6qi2+ZdHBt1esNOO1+uDkS+d9mW8="; }; nativeBuildInputs = [ @@ -34,8 +35,7 @@ stdenv.mkDerivation rec { glib ]; - # See https://github.com/vala-lang/vala-lint/issues/133 - doCheck = false; + doCheck = true; meta = with lib; { homepage = "https://github.com/vala-lang/vala-lint"; diff --git a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index 70c634fc9b..b97a4438c0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TNytKq2LqLWxNrqesOJbNQUTirvPkxLMqJmtbmFq+0Y="; + sha256 = "sha256:0qbsybs91v9vnkxj4kpwqhzk4hgpkq36wnixxjajg038x7slds4i"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/fetch-source.nix b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/fetch-source.nix deleted file mode 100644 index fc9b149887..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/fetch-source.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs ? (import ../../../../. {}) -, fetchFromGitHub ? pkgs.fetchFromGitHub -}: - -fetchFromGitHub { - owner = "moretea"; - repo = "yarn2nix"; - rev = "9e7279edde2a4e0f5ec04c53f5cd64440a27a1ae"; - sha256 = "0zz2lrwn3y3rb8gzaiwxgz02dvy3s552zc70zvfqc0zh5dhydgn7"; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/generate.sh b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/generate.sh deleted file mode 100755 index bfe1cda5e7..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/generate.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash - -### -### This script runs 'nix-build' with ./fetch-source.nix and copies a subset -### of the resulting store path into the current working directory. -### -### To disable running chmod, you may set the environment -### variable "FIX_RIGHTS" to "no". -### - -set -euo pipefail - -# 'nix-build' command -NIX_BUILD_BIN="${NIX_BUILD_BIN:-"/usr/bin/env nix-build"}" - -# where to place the yarn2nix source -TARGET_DIR="${TARGET_DIR:-"./yarn2nix"}" - -# whether to run 'chmod -R u=rwX,g=rX,o-rwx' on copied files in $TARGET_DIR -FIX_RIGHTS="${FIX_RIGHTS:-"yes"}" - -fetch_git_source() { - [[ -f ./fetch-source.nix ]] && ret="$($NIX_BUILD_BIN --no-out-link ./fetch-source.nix)" && ec="$?" || ec="$?" - if [[ "$ec" == "0" ]]; then - echo "$ret" - else - printf "error: failed at 'fetch_git_source()' with '%s'" "$ret" - fi -} - -result="$(fetch_git_source)" -if [[ "$result" == "/nix/store"* ]]; then - mkdir -p "$TARGET_DIR" - cp -Rv \ - "${result}/"{bin,internal,lib,nix,default.nix,package.json,yarn.nix,yarn.lock,LICENSE.txt} \ - "$TARGET_DIR" - [[ "$FIX_RIGHTS" = "yes" ]] \ - && chmod -v "u=rwX,g=rX,o-rwx" -R \ - "$TARGET_DIR/"{bin,internal,lib,nix,default.nix,package.json,yarn.nix,yarn.lock,LICENSE.txt} -fi diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js index bd48b84f22..d3c7288a50 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js +++ b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js @@ -22,8 +22,8 @@ function urlToName(url) { } return url - .replace('https://registry.yarnpkg.com/', '') // prevents having long directory names - .replace(/[@/:-]/g, '_') // replace @ and : and - characters with underscore + .replace(/https:\/\/(.)*(.com)\//g, '') // prevents having long directory names + .replace(/[@/%:-]/g, '_') // replace @ and : and - and % characters with underscore } module.exports = urlToName diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock index 803f6b3875..6e22aa4fe4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock +++ b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock @@ -2,108 +2,113 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8" - integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" + integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g== dependencies: - "@babel/highlight" "^7.0.0" + "@babel/highlight" "^7.8.3" -"@babel/generator@^7.2.2": - version "7.2.2" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.2.2.tgz#18c816c70962640eab42fe8cae5f3947a5c65ccc" - integrity sha512-I4o675J/iS8k+P38dvJ3IBGqObLXyQLTxtrR4u9cSUJOURvafeEWb/pFMOTwtNrmq73mJzyF6ueTbO1BtN0Zeg== +"@babel/generator@^7.9.6": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43" + integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ== dependencies: - "@babel/types" "^7.2.2" + "@babel/types" "^7.9.6" jsesc "^2.5.1" - lodash "^4.17.10" + lodash "^4.17.13" source-map "^0.5.0" - trim-right "^1.0.1" -"@babel/helper-function-name@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53" - integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw== +"@babel/helper-function-name@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c" + integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw== dependencies: - "@babel/helper-get-function-arity" "^7.0.0" - "@babel/template" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/helper-get-function-arity" "^7.8.3" + "@babel/template" "^7.8.3" + "@babel/types" "^7.9.5" -"@babel/helper-get-function-arity@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3" - integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ== +"@babel/helper-get-function-arity@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5" + integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA== dependencies: - "@babel/types" "^7.0.0" + "@babel/types" "^7.8.3" -"@babel/helper-split-export-declaration@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813" - integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag== +"@babel/helper-split-export-declaration@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9" + integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA== dependencies: - "@babel/types" "^7.0.0" + "@babel/types" "^7.8.3" -"@babel/highlight@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4" - integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw== +"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80" + integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g== + +"@babel/highlight@^7.8.3": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079" + integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ== dependencies: + "@babel/helper-validator-identifier" "^7.9.0" chalk "^2.0.0" - esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.2.2", "@babel/parser@^7.2.3": - version "7.2.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.2.3.tgz#32f5df65744b70888d17872ec106b02434ba1489" - integrity sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA== +"@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.6": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7" + integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q== -"@babel/template@^7.1.0": - version "7.2.2" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907" - integrity sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g== +"@babel/runtime-corejs3@^7.8.3": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz#67aded13fffbbc2cb93247388cf84d77a4be9a71" + integrity sha512-6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA== dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.2.2" - "@babel/types" "^7.2.2" + core-js-pure "^3.0.0" + regenerator-runtime "^0.13.4" -"@babel/traverse@^7.0.0": - version "7.2.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8" - integrity sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw== +"@babel/runtime@^7.0.0", "@babel/runtime@^7.4.5": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f" + integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ== dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.2.2" - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-split-export-declaration" "^7.0.0" - "@babel/parser" "^7.2.3" - "@babel/types" "^7.2.2" + regenerator-runtime "^0.13.4" + +"@babel/template@^7.8.3": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b" + integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg== + dependencies: + "@babel/code-frame" "^7.8.3" + "@babel/parser" "^7.8.6" + "@babel/types" "^7.8.6" + +"@babel/traverse@^7.7.0": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442" + integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg== + dependencies: + "@babel/code-frame" "^7.8.3" + "@babel/generator" "^7.9.6" + "@babel/helper-function-name" "^7.9.5" + "@babel/helper-split-export-declaration" "^7.8.3" + "@babel/parser" "^7.9.6" + "@babel/types" "^7.9.6" debug "^4.1.0" globals "^11.1.0" - lodash "^4.17.10" + lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.2.2": - version "7.2.2" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.2.2.tgz#44e10fc24e33af524488b716cdaee5360ea8ed1e" - integrity sha512-fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg== +"@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.5", "@babel/types@^7.9.6": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7" + integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA== dependencies: - esutils "^2.0.2" - lodash "^4.17.10" + "@babel/helper-validator-identifier" "^7.9.5" + lodash "^4.17.13" to-fast-properties "^2.0.0" -"@iamstarkov/listr-update-renderer@0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@iamstarkov/listr-update-renderer/-/listr-update-renderer-0.4.1.tgz#d7c48092a2dcf90fd672b6c8b458649cb350c77e" - integrity sha512-IJyxQWsYDEkf8C8QthBn5N8tIUR9V9je6j3sMIpAkonaadjbvxmRC6RAhpa3RKxndhNnU2M6iNbtJwd7usQYIA== - dependencies: - chalk "^1.1.3" - cli-truncate "^0.2.1" - elegant-spinner "^1.0.1" - figures "^1.7.0" - indent-string "^3.0.0" - log-symbols "^1.0.2" - log-update "^2.3.0" - strip-ansi "^3.0.1" - "@samverschueren/stream-to-observable@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" @@ -129,9 +134,9 @@ acorn-jsx@^3.0.0: acorn "^3.0.4" acorn-jsx@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e" - integrity sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg== + version "5.2.0" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe" + integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ== acorn@^3.0.4: version "3.3.0" @@ -139,14 +144,14 @@ acorn@^3.0.4: integrity sha1-ReN/s56No/JbruP/U2niu18iAXo= acorn@^5.5.0: - version "5.7.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" - integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== + version "5.7.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" + integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg== -acorn@^6.0.2: - version "6.0.5" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz#81730c0815f3f3b34d8efa95cb7430965f4d887a" - integrity sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg== +acorn@^6.0.7: + version "6.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" + integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== ajv-keywords@^2.1.0: version "2.1.1" @@ -163,20 +168,20 @@ ajv@^5.2.3, ajv@^5.3.0: fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" -ajv@^6.5.3, ajv@^6.6.1: - version "6.6.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d" - integrity sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g== +ajv@^6.10.2, ajv@^6.9.1: + version "6.12.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd" + integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ== dependencies: - fast-deep-equal "^2.0.1" + fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ansi-escapes@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30" - integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw== +ansi-escapes@^3.0.0, ansi-escapes@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" + integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== ansi-regex@^2.0.0: version "2.1.1" @@ -188,10 +193,10 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-regex@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9" - integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w== +ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== ansi-styles@^2.2.1: version "2.2.1" @@ -240,13 +245,14 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= -array-includes@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" - integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0= +array-includes@^3.0.3, array-includes@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348" + integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ== dependencies: - define-properties "^1.1.2" - es-abstract "^1.7.0" + define-properties "^1.1.3" + es-abstract "^1.17.0" + is-string "^1.0.5" array-union@^1.0.1: version "1.0.2" @@ -265,6 +271,14 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= +array.prototype.flat@^1.2.1: + version "1.2.3" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" + integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -285,17 +299,15 @@ astral-regex@^1.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== -atob@^2.1.1: +atob@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -axobject-query@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9" - integrity sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww== - dependencies: - ast-types-flow "0.0.7" +axobject-query@^2.0.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz#2bdffc0371e643e5f03ba99065d5179b9ca79799" + integrity sha512-ICt34ZmrVt8UQnvPl6TVyDTkmhXmAyAT4Jh5ugfGUX4MOrZ+U/ZY6/sdylRw3qGNr9Ub5AJsaHeDMzNLehRdOQ== babel-code-frame@^6.22.0: version "6.26.0" @@ -307,16 +319,16 @@ babel-code-frame@^6.22.0: js-tokens "^3.0.2" babel-eslint@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.1.tgz#919681dc099614cd7d31d45c8908695092a1faed" - integrity sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ== + version "10.1.0" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232" + integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg== dependencies: "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.0.0" - "@babel/traverse" "^7.0.0" - "@babel/types" "^7.0.0" - eslint-scope "3.7.1" + "@babel/parser" "^7.7.0" + "@babel/traverse" "^7.7.0" + "@babel/types" "^7.7.0" eslint-visitor-keys "^1.0.0" + resolve "^1.12.0" babel-runtime@^6.23.0, babel-runtime@^6.26.0: version "6.26.0" @@ -378,11 +390,6 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== -builtin-modules@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= - cache-base@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" @@ -430,9 +437,9 @@ callsites@^2.0.0: integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= callsites@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3" - integrity sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw== + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== camelcase-keys@^4.1.0: version "4.2.0" @@ -468,10 +475,10 @@ chalk@^1.0.0, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" - integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ== +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== dependencies: ansi-styles "^3.2.1" escape-string-regexp "^1.0.5" @@ -523,9 +530,9 @@ cli-truncate@^0.2.1: string-width "^1.0.1" cli-width@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" - integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" + integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== cliui@^3.2.0: version "3.2.0" @@ -567,9 +574,9 @@ color-name@1.1.3: integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= commander@^2.11.0, commander@^2.14.1, commander@^2.9.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" - integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== common-tags@^1.4.0: version "1.8.0" @@ -577,9 +584,9 @@ common-tags@^1.4.0: integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw== component-emitter@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" - integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= + version "1.3.0" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" + integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== concat-map@0.0.1: version "0.0.1" @@ -596,6 +603,11 @@ concat-stream@^1.6.0: readable-stream "^2.2.2" typedarray "^0.0.6" +confusing-browser-globals@^1.0.5: + version "1.0.9" + resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz#72bc13b483c0276801681871d4898516f8f54fdd" + integrity sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw== + contains-path@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" @@ -606,33 +618,29 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= +core-js-pure@^3.0.0: + version "3.6.5" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813" + integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA== + core-js@^2.4.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.1.tgz#87416ae817de957a3f249b3b5ca475d4aaed6042" - integrity sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg== + version "2.6.11" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" + integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cosmiconfig@5.0.6: - version "5.0.6" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39" - integrity sha512-6DWfizHriCrFWURP1/qyhsiFvYdlJzbCzmtFWh744+KyWsJo5+kPzUZZaMRSSItoYc0pxFX7gEO7ZC1/gN/7AQ== - dependencies: - is-directory "^0.3.1" - js-yaml "^3.9.0" - parse-json "^4.0.0" - -cosmiconfig@^5.0.7: - version "5.0.7" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04" - integrity sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA== +cosmiconfig@^5.0.7, cosmiconfig@^5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" + integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== dependencies: import-fresh "^2.0.0" is-directory "^0.3.1" - js-yaml "^3.9.0" + js-yaml "^3.13.1" parse-json "^4.0.0" cross-spawn@^5.0.1, cross-spawn@^5.1.0: @@ -656,16 +664,16 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: which "^1.2.9" damerau-levenshtein@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514" - integrity sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ= + version "1.0.6" + resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz#143c1641cb3d85c60c32329e26899adea8701791" + integrity sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug== date-fns@^1.27.2: version "1.30.1" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c" integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw== -debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: +debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -702,9 +710,16 @@ dedent@^0.7.0: integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= deep-equal@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" - integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU= + version "1.1.1" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== + dependencies: + is-arguments "^1.0.4" + is-date-object "^1.0.1" + is-regex "^1.0.4" + object-is "^1.0.1" + object-keys "^1.1.1" + regexp.prototype.flags "^1.2.0" deep-is@~0.1.3: version "0.1.3" @@ -753,9 +768,9 @@ del@^3.0.0: rimraf "^2.2.8" dlv@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.2.tgz#270f6737b30d25b6657a7e962c784403f85137e5" - integrity sha512-xxD4VSH67GbRvSGUrckvha94RD7hjgOH7rqGxiytLpkaeMvixOHFZTGFK6EkIm3T761OVHT8ABHmGkq9gXgu6Q== + version "1.1.3" + resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" + integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA== docopt@^0.6.2: version "0.6.2" @@ -777,20 +792,27 @@ doctrine@^2.1.0: dependencies: esutils "^2.0.2" +doctrine@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== + dependencies: + esutils "^2.0.2" + elegant-spinner@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= -emoji-regex@^6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.5.1.tgz#9baea929b155565c11ea41c6626eaa65cef992c2" - integrity sha512-PAHp6TxrCy7MGMFidro8uikr+zlJJKJ/Q6mm2ExZ7HwkyR9lSVFfE3kt36qcwa24BQL7y0G9axycGjK1A/0uNQ== +emoji-regex@^7.0.1, emoji-regex@^7.0.2: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== end-of-stream@^1.1.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" - integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q== + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== dependencies: once "^1.4.0" @@ -801,22 +823,27 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.7.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9" - integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg== +es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.5: + version "1.17.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" + integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg== dependencies: - es-to-primitive "^1.2.0" + es-to-primitive "^1.2.1" function-bind "^1.1.1" has "^1.0.3" - is-callable "^1.1.4" - is-regex "^1.0.4" - object-keys "^1.0.12" + has-symbols "^1.0.1" + is-callable "^1.1.5" + is-regex "^1.0.5" + object-inspect "^1.7.0" + object-keys "^1.1.1" + object.assign "^4.1.0" + string.prototype.trimleft "^2.1.1" + string.prototype.trimright "^2.1.1" -es-to-primitive@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377" - integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg== +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== dependencies: is-callable "^1.1.4" is-date-object "^1.0.1" @@ -827,28 +854,28 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -eslint-config-airbnb-base@^13.1.0: - version "13.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.1.0.tgz#b5a1b480b80dfad16433d6c4ad84e6605052c05c" - integrity sha512-XWwQtf3U3zIoKO1BbHh6aUhJZQweOwSt4c2JrPDg9FP3Ltv3+YfEv7jIDB8275tVnO/qOHbfuYg3kzw6Je7uWw== +eslint-config-airbnb-base@^13.2.0: + version "13.2.0" + resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.2.0.tgz#f6ea81459ff4dec2dda200c35f1d8f7419d57943" + integrity sha512-1mg/7eoB4AUeB0X1c/ho4vb2gYkNH8Trr/EgCT/aGmKhhG+F6vF5s8+iRBlWAzFIAphxIdp3YfEKgEl0f9Xg+w== dependencies: - eslint-restricted-globals "^0.1.1" + confusing-browser-globals "^1.0.5" object.assign "^4.1.0" - object.entries "^1.0.4" + object.entries "^1.1.0" eslint-config-airbnb@^17.1.0: - version "17.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-17.1.0.tgz#3964ed4bc198240315ff52030bf8636f42bc4732" - integrity sha512-R9jw28hFfEQnpPau01NO5K/JWMGLi6aymiF6RsnMURjTk+MqZKllCqGK/0tOvHkPi/NWSSOU2Ced/GX++YxLnw== + version "17.1.1" + resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-17.1.1.tgz#2272e0b86bb1e2b138cdf88d07a3b6f4cda3d626" + integrity sha512-xCu//8a/aWqagKljt+1/qAM62BYZeNq04HmdevG5yUGWpja0I/xhqd6GdLRch5oetEGFiJAnvtGuTEAese53Qg== dependencies: - eslint-config-airbnb-base "^13.1.0" + eslint-config-airbnb-base "^13.2.0" object.assign "^4.1.0" - object.entries "^1.0.4" + object.entries "^1.1.0" eslint-config-prettier@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.3.0.tgz#41afc8d3b852e757f06274ed6c44ca16f939a57d" - integrity sha512-Bc3bh5bAcKNvs3HOpSi6EfGA2IIp7EzWcg2tS4vP7stnXu/J1opihHDM7jI9JCIckyIDTgZLSWn7J3HY0j2JfA== + version "3.6.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.6.0.tgz#8ca3ffac4bd6eeef623a0651f9d754900e3ec217" + integrity sha512-ixJ4U3uTLXwJts4rmSVW/lMXjlGwCijhBJHk8iVqKKSifeI0qgFEfWl8L63isfc8Od7EiBALF6BX3jKLluf/jQ== dependencies: get-stdin "^6.0.0" @@ -857,59 +884,62 @@ eslint-config-standard@^12.0.0: resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz#638b4c65db0bd5a41319f96bba1f15ddad2107d9" integrity sha512-COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ== -eslint-import-resolver-node@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a" - integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q== +eslint-import-resolver-node@^0.3.2: + version "0.3.3" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404" + integrity sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg== dependencies: debug "^2.6.9" - resolve "^1.5.0" + resolve "^1.13.1" -eslint-module-utils@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz#b270362cd88b1a48ad308976ce7fa54e98411746" - integrity sha1-snA2LNiLGkitMIl2zn+lTphBF0Y= +eslint-module-utils@^2.4.1: + version "2.6.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" + integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== dependencies: - debug "^2.6.8" - pkg-dir "^1.0.0" + debug "^2.6.9" + pkg-dir "^2.0.0" eslint-plugin-es@^1.3.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.0.tgz#475f65bb20c993fc10e8c8fe77d1d60068072da6" - integrity sha512-XfFmgFdIUDgvaRAlaXUkxrRg5JSADoRC8IkKLc/cISeR3yHVMefFHQZpcyXXEUUPHfy5DwviBcrfqlyqEwlQVw== + version "1.4.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.1.tgz#12acae0f4953e76ba444bfd1b2271081ac620998" + integrity sha512-5fa/gR2yR3NxQf+UXkeLeP8FBBl6tSgdrAz1+cF84v1FMM4twGwQoqTnn+QxFLcPOrF4pdKEJKDB/q9GoyJrCA== dependencies: - eslint-utils "^1.3.0" + eslint-utils "^1.4.2" regexpp "^2.0.1" eslint-plugin-import@^2.14.0: - version "2.14.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz#6b17626d2e3e6ad52cfce8807a845d15e22111a8" - integrity sha512-FpuRtniD/AY6sXByma2Wr0TXvXJ4nA/2/04VPlfpmUDPOpOY264x+ILiwnrk/k4RINgDAyFZByxqPUbSQ5YE7g== + version "2.20.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz#91fc3807ce08be4837141272c8b99073906e588d" + integrity sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg== dependencies: + array-includes "^3.0.3" + array.prototype.flat "^1.2.1" contains-path "^0.1.0" - debug "^2.6.8" + debug "^2.6.9" doctrine "1.5.0" - eslint-import-resolver-node "^0.3.1" - eslint-module-utils "^2.2.0" - has "^1.0.1" - lodash "^4.17.4" - minimatch "^3.0.3" + eslint-import-resolver-node "^0.3.2" + eslint-module-utils "^2.4.1" + has "^1.0.3" + minimatch "^3.0.4" + object.values "^1.1.0" read-pkg-up "^2.0.0" - resolve "^1.6.0" + resolve "^1.12.0" eslint-plugin-jsx-a11y@^6.1.2: - version "6.1.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.1.2.tgz#69bca4890b36dcf0fe16dd2129d2d88b98f33f88" - integrity sha512-7gSSmwb3A+fQwtw0arguwMdOdzmKUgnUcbSNlo+GjKLAQFuC2EZxWqG9XHRI8VscBJD5a8raz3RuxQNFW+XJbw== + version "6.2.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz#b872a09d5de51af70a97db1eea7dc933043708aa" + integrity sha512-CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg== dependencies: + "@babel/runtime" "^7.4.5" aria-query "^3.0.0" array-includes "^3.0.3" ast-types-flow "^0.0.7" - axobject-query "^2.0.1" + axobject-query "^2.0.2" damerau-levenshtein "^1.0.4" - emoji-regex "^6.5.1" + emoji-regex "^7.0.2" has "^1.0.3" - jsx-ast-utils "^2.0.1" + jsx-ast-utils "^2.2.1" eslint-plugin-node@^8.0.0: version "8.0.1" @@ -924,40 +954,31 @@ eslint-plugin-node@^8.0.0: semver "^5.5.0" eslint-plugin-promise@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.0.1.tgz#2d074b653f35a23d1ba89d8e976a985117d1c6a2" - integrity sha512-Si16O0+Hqz1gDHsys6RtFRrW7cCTB6P7p3OJmKp3Y3dxpQE2qwOA7d3xnV+0mBmrPoi0RBnxlCKvqu70te6wjg== + version "4.2.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a" + integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw== eslint-plugin-react@^7.12.2: - version "7.12.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.12.3.tgz#b9ca4cd7cd3f5d927db418a1950366a12d4568fd" - integrity sha512-WTIA3cS8OzkPeCi4KWuPmjR33lgG9r9Y/7RmnLTRw08MZKgAfnK/n3BO4X0S67MPkVLazdfCNT/XWqcDu4BLTA== + version "7.20.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz#f98712f0a5e57dfd3e5542ef0604b8739cd47be3" + integrity sha512-rqe1abd0vxMjmbPngo4NaYxTcR3Y4Hrmc/jg4T+sYz63yqlmJRknpEQfmWY+eDWPuMmix6iUIK+mv0zExjeLgA== dependencies: - array-includes "^3.0.3" + array-includes "^3.1.1" doctrine "^2.1.0" has "^1.0.3" - jsx-ast-utils "^2.0.1" - object.fromentries "^2.0.0" - prop-types "^15.6.2" - resolve "^1.9.0" + jsx-ast-utils "^2.2.3" + object.entries "^1.1.1" + object.fromentries "^2.0.2" + object.values "^1.1.1" + prop-types "^15.7.2" + resolve "^1.15.1" + string.prototype.matchall "^4.0.2" + xregexp "^4.3.0" eslint-plugin-standard@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.0.tgz#f845b45109c99cd90e77796940a344546c8f6b5c" - integrity sha512-OwxJkR6TQiYMmt1EsNRMe5qG3GsbjlcOhbGUBY4LtavF9DsLaTcoR+j2Tdjqi23oUwKNUqX7qcn5fPStafMdlA== - -eslint-restricted-globals@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz#35f0d5cbc64c2e3ed62e93b4b1a7af05ba7ed4d7" - integrity sha1-NfDVy8ZMLj7WLpO0saevBbp+1Nc= - -eslint-scope@3.7.1: - version "3.7.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" - integrity sha1-PWPD7f2gLgbgGkUq2IyqzHzctug= - dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" + version "4.0.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz#ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4" + integrity sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ== eslint-scope@^3.7.1: version "3.7.3" @@ -967,23 +988,25 @@ eslint-scope@^3.7.1: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-scope@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172" - integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA== +eslint-scope@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" + integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg== dependencies: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.3.0, eslint-utils@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512" - integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q== +eslint-utils@^1.3.1, eslint-utils@^1.4.2: + version "1.4.3" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" + integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== + dependencies: + eslint-visitor-keys "^1.1.0" -eslint-visitor-keys@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" - integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ== +eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" + integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== eslint@^4.0.0, eslint@^4.5.0: version "4.19.1" @@ -1030,46 +1053,45 @@ eslint@^4.0.0, eslint@^4.5.0: text-table "~0.2.0" eslint@^5.11.1: - version "5.12.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.12.0.tgz#fab3b908f60c52671fb14e996a450b96c743c859" - integrity sha512-LntwyPxtOHrsJdcSwyQKVtHofPHdv+4+mFwEe91r2V13vqpM8yLr7b1sW+Oo/yheOPkWYsYlYJCkzlFAt8KV7g== + version "5.16.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea" + integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg== dependencies: "@babel/code-frame" "^7.0.0" - ajv "^6.5.3" + ajv "^6.9.1" chalk "^2.1.0" cross-spawn "^6.0.5" debug "^4.0.1" - doctrine "^2.1.0" - eslint-scope "^4.0.0" + doctrine "^3.0.0" + eslint-scope "^4.0.3" eslint-utils "^1.3.1" eslint-visitor-keys "^1.0.0" - espree "^5.0.0" + espree "^5.0.1" esquery "^1.0.1" esutils "^2.0.2" - file-entry-cache "^2.0.0" + file-entry-cache "^5.0.1" functional-red-black-tree "^1.0.1" glob "^7.1.2" globals "^11.7.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" - inquirer "^6.1.0" - js-yaml "^3.12.0" + inquirer "^6.2.2" + js-yaml "^3.13.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.3.0" - lodash "^4.17.5" + lodash "^4.17.11" minimatch "^3.0.4" mkdirp "^0.5.1" natural-compare "^1.4.0" optionator "^0.8.2" path-is-inside "^1.0.2" - pluralize "^7.0.0" progress "^2.0.0" regexpp "^2.0.1" semver "^5.5.1" strip-ansi "^4.0.0" strip-json-comments "^2.0.1" - table "^5.0.2" + table "^5.2.3" text-table "^0.2.0" espree@^3.5.2, espree@^3.5.4: @@ -1080,12 +1102,12 @@ espree@^3.5.2, espree@^3.5.4: acorn "^5.5.0" acorn-jsx "^3.0.0" -espree@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.0.tgz#fc7f984b62b36a0f543b13fb9cd7b9f4a7f5b65c" - integrity sha512-1MpUfwsdS9MMoN7ZXqAr9e9UKdVHDcvrJpyx7mm1WuQlx/ygErEQBzgi5Nh5qBHIoYweprhtMkTCb9GhcAIcsA== +espree@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a" + integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A== dependencies: - acorn "^6.0.2" + acorn "^6.0.7" acorn-jsx "^5.0.0" eslint-visitor-keys "^1.0.0" @@ -1095,11 +1117,11 @@ esprima@^4.0.0: integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== esquery@^1.0.0, esquery@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708" - integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA== + version "1.3.1" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" + integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== dependencies: - estraverse "^4.0.0" + estraverse "^5.1.0" esrecurse@^4.1.0: version "4.2.1" @@ -1108,15 +1130,20 @@ esrecurse@^4.1.0: dependencies: estraverse "^4.1.0" -estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" - integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM= +estraverse@^4.1.0, estraverse@^4.1.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642" + integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw== esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs= + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== execa@^0.7.0: version "0.7.0" @@ -1181,10 +1208,10 @@ external-editor@^2.0.4: iconv-lite "^0.4.17" tmp "^0.0.33" -external-editor@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27" - integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA== +external-editor@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" + integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== dependencies: chardet "^0.7.0" iconv-lite "^0.4.24" @@ -1209,17 +1236,17 @@ fast-deep-equal@^1.0.0: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ= -fast-deep-equal@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" - integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= +fast-deep-equal@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" + integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-levenshtein@~2.0.4: +fast-levenshtein@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= @@ -1247,6 +1274,13 @@ file-entry-cache@^2.0.0: flat-cache "^1.2.1" object-assign "^4.0.1" +file-entry-cache@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" + integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g== + dependencies: + flat-cache "^2.0.1" + fill-range@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" @@ -1257,19 +1291,6 @@ fill-range@^4.0.0: repeat-string "^1.6.1" to-regex-range "^2.1.0" -find-parent-dir@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54" - integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ= - -find-up@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" - integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= - dependencies: - path-exists "^2.0.0" - pinkie-promise "^2.0.0" - find-up@^2.0.0, find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -1294,6 +1315,25 @@ flat-cache@^1.2.1: rimraf "~2.6.2" write "^0.2.1" +flat-cache@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" + integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA== + dependencies: + flatted "^2.0.0" + rimraf "2.6.3" + write "1.0.3" + +flatted@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" + integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== + +fn-name@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7" + integrity sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc= + for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -1336,9 +1376,9 @@ get-caller-file@^1.0.1: integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== get-own-enumerable-property-symbols@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203" - integrity sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg== + version "3.0.2" + resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" + integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== get-stdin@^5.0.1: version "5.0.1" @@ -1368,9 +1408,9 @@ get-value@^2.0.3, get-value@^2.0.6: integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: - version "7.1.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" - integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ== + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -1392,9 +1432,9 @@ glob@~7.0.6: path-is-absolute "^1.0.0" globals@^11.0.1, globals@^11.1.0, globals@^11.7.0: - version "11.9.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249" - integrity sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg== + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globby@^6.1.0: version "6.1.0" @@ -1408,9 +1448,9 @@ globby@^6.1.0: pinkie-promise "^2.0.0" graceful-fs@^4.1.2: - version "4.1.15" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" - integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== + version "4.2.4" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" + integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== has-ansi@^2.0.0: version "2.0.0" @@ -1429,10 +1469,10 @@ has-flag@^3.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= -has-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" - integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q= +has-symbols@^1.0.0, has-symbols@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" + integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== has-value@^0.3.1: version "0.3.1" @@ -1465,7 +1505,7 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has@^1.0.1, has@^1.0.3: +has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== @@ -1473,9 +1513,9 @@ has@^1.0.1, has@^1.0.3: function-bind "^1.1.1" hosted-git-info@^2.1.4: - version "2.7.1" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047" - integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w== + version "2.8.8" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" + integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== husky@^1.3.1: version "1.3.1" @@ -1511,9 +1551,9 @@ ignore@^4.0.6: integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== ignore@^5.0.2: - version "5.0.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.0.4.tgz#33168af4a21e99b00c5d41cbadb6a6cb49903a45" - integrity sha512-WLsTMEhsQuXpCiG173+f3aymI43SXa+fB1rSfbzyP4GkPP+ZFVuO0/3sFUGNBtifisPeDcl/uD/Y2NxZ7xFq4g== + version "5.1.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" + integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== import-fresh@^2.0.0: version "2.0.0" @@ -1524,9 +1564,9 @@ import-fresh@^2.0.0: resolve-from "^3.0.0" import-fresh@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz#a3d897f420cab0e671236897f75bc14b4885c390" - integrity sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ== + version "3.2.1" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" + integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== dependencies: parent-module "^1.0.0" resolve-from "^4.0.0" @@ -1550,9 +1590,9 @@ inflight@^1.0.4: wrappy "1" inherits@2, inherits@^2.0.3, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== inquirer@^3.0.6: version "3.3.0" @@ -1574,25 +1614,34 @@ inquirer@^3.0.6: strip-ansi "^4.0.0" through "^2.3.6" -inquirer@^6.1.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52" - integrity sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg== +inquirer@^6.2.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca" + integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ== dependencies: - ansi-escapes "^3.0.0" - chalk "^2.0.0" + ansi-escapes "^3.2.0" + chalk "^2.4.2" cli-cursor "^2.1.0" cli-width "^2.0.0" - external-editor "^3.0.0" + external-editor "^3.0.3" figures "^2.0.0" - lodash "^4.17.10" + lodash "^4.17.12" mute-stream "0.0.7" run-async "^2.2.0" - rxjs "^6.1.0" + rxjs "^6.4.0" string-width "^2.1.0" - strip-ansi "^5.0.0" + strip-ansi "^5.1.0" through "^2.3.6" +internal-slot@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3" + integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g== + dependencies: + es-abstract "^1.17.0-next.1" + has "^1.0.3" + side-channel "^1.0.2" + invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" @@ -1612,6 +1661,11 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" +is-arguments@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3" + integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA== + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -1622,17 +1676,10 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-builtin-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" - integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74= - dependencies: - builtin-modules "^1.0.0" - -is-callable@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" - integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== +is-callable@^1.1.4, is-callable@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" + integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q== is-ci@^2.0.0: version "2.0.0" @@ -1656,9 +1703,9 @@ is-data-descriptor@^1.0.0: kind-of "^6.0.0" is-date-object@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" - integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" + integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== is-descriptor@^0.1.0: version "0.1.6" @@ -1713,9 +1760,9 @@ is-fullwidth-code-point@^2.0.0: integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= is-glob@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0" - integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A= + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== dependencies: is-extglob "^2.1.1" @@ -1757,7 +1804,7 @@ is-path-inside@^1.0.0: dependencies: path-is-inside "^1.0.1" -is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: +is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== @@ -1765,16 +1812,16 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: isobject "^3.0.1" is-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" - integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= + version "2.2.2" + resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" + integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== -is-regex@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" - integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= +is-regex@^1.0.4, is-regex@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" + integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ== dependencies: - has "^1.0.1" + has "^1.0.3" is-regexp@^1.0.0: version "1.0.0" @@ -1791,12 +1838,17 @@ is-stream@^1.1.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= +is-string@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" + integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== + is-symbol@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38" - integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw== + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" + integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== dependencies: - has-symbols "^1.0.0" + has-symbols "^1.0.1" is-windows@^1.0.2: version "1.0.2" @@ -1825,21 +1877,6 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -jest-get-type@^22.1.0: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4" - integrity sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w== - -jest-validate@^23.5.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.6.0.tgz#36761f99d1ed33fcd425b4e4c5595d62b6597474" - integrity sha512-OFKapYxe72yz7agrDAWi8v2WL8GIfVqcbKRCLbRG9PAxtzF9b1SEDdTpytNDN12z2fJynoBwpMpvj2R39plI2A== - dependencies: - chalk "^2.0.1" - jest-get-type "^22.1.0" - leven "^2.1.0" - pretty-format "^23.6.0" - "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -1850,10 +1887,10 @@ js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@^3.12.0, js-yaml@^3.9.0, js-yaml@^3.9.1: - version "3.12.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600" - integrity sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA== +js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.9.1: + version "3.13.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" + integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== dependencies: argparse "^1.0.7" esprima "^4.0.0" @@ -1883,12 +1920,13 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= -jsx-ast-utils@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f" - integrity sha1-6AGxs5mF4g//yHtA43SAgOLcrH8= +jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f" + integrity sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA== dependencies: array-includes "^3.0.3" + object.assign "^4.1.0" kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" @@ -1910,9 +1948,9 @@ kind-of@^5.0.0: integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" - integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== lcid@^1.0.0: version "1.0.0" @@ -1921,11 +1959,6 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" -leven@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580" - integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA= - levn@^0.3.0, levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" @@ -1935,25 +1968,23 @@ levn@^0.3.0, levn@~0.3.0: type-check "~0.3.2" lint-staged@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.1.0.tgz#dbc3ae2565366d8f20efb9f9799d076da64863f2" - integrity sha512-yfSkyJy7EuVsaoxtUSEhrD81spdJOe/gMTGea3XaV7HyoRhTb9Gdlp6/JppRZERvKSEYXP9bjcmq6CA5oL2lYQ== + version "8.2.1" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.2.1.tgz#752fcf222d9d28f323a3b80f1e668f3654ff221f" + integrity sha512-n0tDGR/rTCgQNwXnUf/eWIpPNddGWxC32ANTNYsj2k02iZb7Cz5ox2tytwBu+2r0zDXMEMKw7Y9OD/qsav561A== dependencies: - "@iamstarkov/listr-update-renderer" "0.4.1" chalk "^2.3.1" commander "^2.14.1" - cosmiconfig "5.0.6" + cosmiconfig "^5.2.0" debug "^3.1.0" dedent "^0.7.0" del "^3.0.0" execa "^1.0.0" - find-parent-dir "^0.3.0" g-status "^2.0.2" is-glob "^4.0.0" is-windows "^1.0.2" - jest-validate "^23.5.0" listr "^0.14.2" - lodash "^4.17.5" + listr-update-renderer "^0.5.0" + lodash "^4.17.11" log-symbols "^2.2.0" micromatch "^3.1.8" npm-which "^3.0.1" @@ -1964,6 +1995,7 @@ lint-staged@^8.1.0: staged-git-files "1.1.2" string-argv "^0.0.2" stringify-object "^3.2.2" + yup "^0.27.0" listr-silent-renderer@^1.1.1: version "1.1.1" @@ -2041,19 +2073,19 @@ lodash.memoize@^4.1.2: integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= lodash.merge@^4.6.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54" - integrity sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ== + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== lodash.unescape@4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c" integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw= -lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0: - version "4.17.11" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" - integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== +lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.4, lodash@^4.3.0: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== log-symbols@^1.0.2: version "1.0.2" @@ -2087,11 +2119,11 @@ loglevel-colored-level-prefix@^1.0.0: loglevel "^1.4.1" loglevel@^1.4.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa" - integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po= + version "1.6.8" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171" + integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA== -loose-envify@^1.3.1: +loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== @@ -2184,37 +2216,32 @@ mimic-fn@^1.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== -minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: +minimatch@^3.0.2, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== dependencies: brace-expansion "^1.1.7" -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= - -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= +minimist@^1.2.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== mixin-deep@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" - integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ== + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== dependencies: for-in "^1.0.2" is-extendable "^1.0.1" mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== dependencies: - minimist "0.0.8" + minimist "^1.2.5" ms@2.0.0: version "2.0.0" @@ -2222,9 +2249,9 @@ ms@2.0.0: integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= ms@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== mute-stream@0.0.7: version "0.0.7" @@ -2266,12 +2293,12 @@ nopt@~3.0.6: abbrev "1" normalize-package-data@^2.3.2: - version "2.4.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" - integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw== + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== dependencies: hosted-git-info "^2.1.4" - is-builtin-module "^1.0.0" + resolve "^1.10.0" semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" @@ -2317,10 +2344,23 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-keys@^1.0.11, object-keys@^1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2" - integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag== +object-inspect@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" + integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== + +object-is@^1.0.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6" + integrity sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + +object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== object-visit@^1.0.0: version "1.0.1" @@ -2339,25 +2379,25 @@ object.assign@^4.1.0: has-symbols "^1.0.0" object-keys "^1.0.11" -object.entries@^1.0.4: - version "1.1.0" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519" - integrity sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA== +object.entries@^1.1.0, object.entries@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz#ee1cf04153de02bb093fec33683900f57ce5399b" + integrity sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ== dependencies: define-properties "^1.1.3" - es-abstract "^1.12.0" + es-abstract "^1.17.0-next.1" function-bind "^1.1.1" has "^1.0.3" -object.fromentries@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.0.tgz#49a543d92151f8277b3ac9600f1e930b189d30ab" - integrity sha512-9iLiI6H083uiqUuvzyY6qrlmc/Gz8hLQFOcb/Ri/0xXFkSNS3ctV+CbE6yM2+AnkYfOB3dGjdzC0wrMLIhQICA== +object.fromentries@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9" + integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ== dependencies: - define-properties "^1.1.2" - es-abstract "^1.11.0" + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" function-bind "^1.1.1" - has "^1.0.1" + has "^1.0.3" object.pick@^1.3.0: version "1.3.0" @@ -2366,6 +2406,16 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" +object.values@^1.1.0, object.values@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" + integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + function-bind "^1.1.1" + has "^1.0.3" + once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -2381,16 +2431,16 @@ onetime@^2.0.0: mimic-fn "^1.0.0" optionator@^0.8.2: - version "0.8.2" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64" - integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q= + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== dependencies: deep-is "~0.1.3" - fast-levenshtein "~2.0.4" + fast-levenshtein "~2.0.6" levn "~0.3.0" prelude-ls "~1.1.2" type-check "~0.3.2" - wordwrap "~1.0.0" + word-wrap "~1.2.3" os-locale@^2.0.0: version "2.1.0" @@ -2419,9 +2469,9 @@ p-limit@^1.1.0: p-try "^1.0.0" p-limit@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.1.0.tgz#1d5a0d20fb12707c758a655f6bbc4386b5930d68" - integrity sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g== + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== dependencies: p-try "^2.0.0" @@ -2445,9 +2495,9 @@ p-map@^1.1.1: integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA== p-map@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.0.0.tgz#be18c5a5adeb8e156460651421aceca56c213a50" - integrity sha512-GO107XdrSUmtHxVoi60qc9tUl/KkNKm+X2CF4P9amalpGxv5YqVPJNfSb0wcA+syCopkZvYYIzW8OVTQW59x/w== + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" + integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== p-try@^1.0.0: version "1.0.0" @@ -2455,14 +2505,14 @@ p-try@^1.0.0: integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= p-try@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1" - integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== parent-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.0.tgz#df250bdc5391f4a085fb589dad761f5ad6b865b5" - integrity sha512-8Mf5juOMmiE4FcmzYc4IaiS9L3+9paz2KOiXzkRviCP6aDmN49Hz6EMWz0lGNp9pX80GvvAuLADtyGfW/Em3TA== + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== dependencies: callsites "^3.0.0" @@ -2486,13 +2536,6 @@ pascalcase@^0.1.1: resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= -path-exists@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" - integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= - dependencies: - pinkie-promise "^2.0.0" - path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" @@ -2547,12 +2590,12 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= -pkg-dir@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" - integrity sha1-ektQio1bstYp1EcFb/TpyTFM89Q= +pkg-dir@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" + integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= dependencies: - find-up "^1.0.0" + find-up "^2.1.0" pkg-dir@^3.0.0: version "3.0.0" @@ -2562,9 +2605,9 @@ pkg-dir@^3.0.0: find-up "^3.0.0" please-upgrade-node@^3.0.2, please-upgrade-node@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac" - integrity sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ== + version "3.2.0" + resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" + integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== dependencies: semver-compare "^1.0.0" @@ -2627,11 +2670,11 @@ prettier-eslint@^8.5.0: vue-eslint-parser "^2.0.2" prettier@^1.7.0: - version "1.15.3" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.3.tgz#1feaac5bdd181237b54dbe65d874e02a1472786a" - integrity sha512-gAU9AGAPMaKb3NNSUUuhhFAS7SCO4ALTN4nRIn6PJ075Qd28Yn2Ig2ahEJWdJwJmlEBTUfC7mMUSFy8MwsOCfg== + version "1.19.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" + integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== -pretty-format@^23.0.1, pretty-format@^23.6.0: +pretty-format@^23.0.1: version "23.6.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760" integrity sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw== @@ -2640,22 +2683,28 @@ pretty-format@^23.0.1, pretty-format@^23.6.0: ansi-styles "^3.2.0" process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" - integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== progress@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -prop-types@^15.6.2: - version "15.6.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102" - integrity sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ== +prop-types@^15.7.2: + version "15.7.2" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" + integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== dependencies: - loose-envify "^1.3.1" + loose-envify "^1.4.0" object-assign "^4.1.1" + react-is "^16.8.1" + +property-expr@^1.5.0: + version "1.5.1" + resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-1.5.1.tgz#22e8706894a0c8e28d58735804f6ba3a3673314f" + integrity sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g== pseudomap@^1.0.2: version "1.0.2" @@ -2685,6 +2734,11 @@ ramda@^0.26.1: resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06" integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ== +react-is@^16.8.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== + read-pkg-up@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" @@ -2712,9 +2766,9 @@ read-pkg@^4.0.1: pify "^3.0.0" readable-stream@^2.2.2: - version "2.3.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" - integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -2729,6 +2783,11 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== +regenerator-runtime@^0.13.4: + version "0.13.5" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" + integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== + regex-not@^1.0.0, regex-not@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" @@ -2737,6 +2796,14 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" +regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" + integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + regexpp@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab" @@ -2805,10 +2872,10 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1, resolve@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06" - integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ== +resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.8.1: + version "1.17.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" + integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== dependencies: path-parse "^1.0.6" @@ -2825,19 +2892,24 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== -rimraf@^2.2.8, rimraf@~2.6.2: +rimraf@2.6.3, rimraf@~2.6.2: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== dependencies: glob "^7.1.3" -run-async@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" - integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA= +rimraf@^2.2.8: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== dependencies: - is-promise "^2.1.0" + glob "^7.1.3" + +run-async@^2.2.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" + integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== run-node@^1.0.0: version "1.0.0" @@ -2863,10 +2935,10 @@ rxjs@^5.3.0: dependencies: symbol-observable "1.0.1" -rxjs@^6.1.0, rxjs@^6.3.3: - version "6.3.3" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55" - integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw== +rxjs@^6.3.3, rxjs@^6.4.0: + version "6.5.5" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec" + integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ== dependencies: tslib "^1.9.0" @@ -2893,9 +2965,9 @@ semver-compare@^1.0.0: integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.5.1: - version "5.6.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" - integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== semver@5.5.0: version "5.5.0" @@ -2907,20 +2979,10 @@ set-blocking@^2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= -set-value@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" - integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE= - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.1" - to-object-path "^0.3.0" - -set-value@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" - integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg== +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== dependencies: extend-shallow "^2.0.1" is-extendable "^0.1.1" @@ -2939,15 +3001,23 @@ shebang-regex@^1.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= +side-channel@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947" + integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA== + dependencies: + es-abstract "^1.17.0-next.1" + object-inspect "^1.7.0" + signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== simple-git@^1.85.0: - version "1.107.0" - resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.107.0.tgz#12cffaf261c14d6f450f7fdb86c21ccee968b383" - integrity sha512-t4OK1JRlp4ayKRfcW6owrWcRVLyHRUlhGd0uN6ZZTqfDq8a5XpcUdOKiGRNobHEuMtNqzp0vcJNvhYWwh5PsQA== + version "1.132.0" + resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.132.0.tgz#53ac4c5ec9e74e37c2fd461e23309f22fcdf09b1" + integrity sha512-xauHm1YqCTom1sC9eOjfq3/9RKiUA9iPnxBbrY2DdL8l4ADMu0jjM5l5lphQP5YWNqAL2aXC/OeuQ76vHtW5fg== dependencies: debug "^4.0.1" @@ -2968,10 +3038,10 @@ slice-ansi@1.0.0: dependencies: is-fullwidth-code-point "^2.0.0" -slice-ansi@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.0.0.tgz#5373bdb8559b45676e8541c66916cdd6251612e7" - integrity sha512-4j2WTWjp3GsZ+AOagyzVbzp4vWGtZ0hEZ/gDY/uTvm6MTxUfTUIsnMIFb1bn8o0RuXiqUw15H1bue8f22Vw2oQ== +slice-ansi@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" + integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== dependencies: ansi-styles "^3.2.0" astral-regex "^1.0.0" @@ -3008,11 +3078,11 @@ snapdragon@^0.8.1: use "^3.1.0" source-map-resolve@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" - integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA== + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== dependencies: - atob "^2.1.1" + atob "^2.1.2" decode-uri-component "^0.2.0" resolve-url "^0.2.1" source-map-url "^0.4.0" @@ -3037,22 +3107,22 @@ spdx-correct@^3.0.0: spdx-license-ids "^3.0.0" spdx-exceptions@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977" - integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA== + version "2.3.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== spdx-expression-parse@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" - integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg== + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== dependencies: spdx-exceptions "^2.1.0" spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz#81c0ce8f21474756148bbb5f3bfc0f36bf15d76e" - integrity sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g== + version "3.0.5" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654" + integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q== split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" @@ -3101,6 +3171,61 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +string-width@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + +string.prototype.matchall@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e" + integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0" + has-symbols "^1.0.1" + internal-slot "^1.0.2" + regexp.prototype.flags "^1.3.0" + side-channel "^1.0.2" + +string.prototype.trimend@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913" + integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + +string.prototype.trimleft@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc" + integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string.prototype.trimstart "^1.0.0" + +string.prototype.trimright@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3" + integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string.prototype.trimend "^1.0.0" + +string.prototype.trimstart@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54" + integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -3131,12 +3256,12 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f" - integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow== +strip-ansi@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== dependencies: - ansi-regex "^4.0.0" + ansi-regex "^4.1.0" strip-bom@^3.0.0: version "3.0.0" @@ -3182,6 +3307,11 @@ symbol-observable@^1.1.0: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== +synchronous-promise@^2.0.6: + version "2.0.12" + resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.12.tgz#219934f23c19c9aa716276cf2e1f8d4e5b04d07f" + integrity sha512-rIDJiHmIK02tXU+eW1v6a7rNIIiMLm5JUF5Uj2fT6oLSulg7WNDVoqvkYqkFoJzf4v2gmTLppvzegdo9R+7h1Q== + table@4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36" @@ -3194,15 +3324,15 @@ table@4.0.2: slice-ansi "1.0.0" string-width "^2.1.1" -table@^5.0.2: - version "5.1.1" - resolved "https://registry.yarnpkg.com/table/-/table-5.1.1.tgz#92030192f1b7b51b6eeab23ed416862e47b70837" - integrity sha512-NUjapYb/qd4PeFW03HnAuOJ7OMcBkJlqeClWxeNlQ0lXGSb52oZXGzkO0/I0ARegQ2eUT1g2VDJH0eUxDRcHmw== +table@^5.2.3: + version "5.4.6" + resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" + integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== dependencies: - ajv "^6.6.1" - lodash "^4.17.11" - slice-ansi "2.0.0" - string-width "^2.1.1" + ajv "^6.10.2" + lodash "^4.17.14" + slice-ansi "^2.1.0" + string-width "^3.0.0" text-table@^0.2.0, text-table@~0.2.0: version "0.2.0" @@ -3251,15 +3381,15 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= +toposort@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330" + integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA= tslib@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" - integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== + version "1.13.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" + integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== type-check@~0.3.2: version "0.3.2" @@ -3287,14 +3417,14 @@ typescript@^2.5.1: integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w== union-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" - integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ= + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== dependencies: arr-union "^3.1.0" get-value "^2.0.6" is-extendable "^0.1.1" - set-value "^0.4.3" + set-value "^2.0.1" unset-value@^1.0.0: version "1.0.0" @@ -3358,10 +3488,10 @@ which@^1.2.10, which@^1.2.9: dependencies: isexe "^2.0.0" -wordwrap@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= +word-wrap@~1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== wrap-ansi@^2.0.0: version "2.1.0" @@ -3384,6 +3514,13 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= +write@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" + integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig== + dependencies: + mkdirp "^0.5.1" + write@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757" @@ -3391,6 +3528,13 @@ write@^0.2.1: dependencies: mkdirp "^0.5.1" +xregexp@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50" + integrity sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g== + dependencies: + "@babel/runtime-corejs3" "^7.8.3" + y18n@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" @@ -3425,3 +3569,15 @@ yargs@10.0.3: which-module "^2.0.0" y18n "^3.2.1" yargs-parser "^8.0.0" + +yup@^0.27.0: + version "0.27.0" + resolved "https://registry.yarnpkg.com/yup/-/yup-0.27.0.tgz#f8cb198c8e7dd2124beddc2457571329096b06e7" + integrity sha512-v1yFnE4+u9za42gG/b/081E7uNW9mUj3qtkmelLbW5YPROZzSH/KUUyJu9Wt8vxFJcT9otL/eZopS0YK1L5yPQ== + dependencies: + "@babel/runtime" "^7.0.0" + fn-name "~2.0.1" + lodash "^4.17.11" + property-expr "^1.5.0" + synchronous-promise "^2.0.6" + toposort "^2.0.2" diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix index 9f4154b328..b8dba6833f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix @@ -1,92 +1,108 @@ -{ fetchurl, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { - name = "_babel_code_frame___code_frame_7.0.0.tgz"; + name = "_babel_code_frame___code_frame_7.8.3.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz"; - sha1 = "06e2ab19bdb535385559aabb5ba59729482800f8"; + name = "_babel_code_frame___code_frame_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz"; + sha1 = "33e25903d7481181534e12ec0a25f16b6fcf419e"; }; } { - name = "_babel_generator___generator_7.2.2.tgz"; + name = "_babel_generator___generator_7.9.6.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.2.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.2.2.tgz"; - sha1 = "18c816c70962640eab42fe8cae5f3947a5c65ccc"; + name = "_babel_generator___generator_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz"; + sha1 = "5408c82ac5de98cda0d77d8124e99fa1f2170a43"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.9.5.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz"; - sha1 = "a0ceb01685f73355d4360c1247f582bfafc8ff53"; + name = "_babel_helper_function_name___helper_function_name_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz"; + sha1 = "2b53820d35275120e1874a82e5aabe1376920a5c"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz"; - sha1 = "83572d4320e2a4657263734113c42868b64e49c3"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz"; + sha1 = "b894b947bd004381ce63ea1db9f08547e920abd5"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.0.0.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz"; - sha1 = "3aae285c0311c2ab095d997b8c9a94cad547d813"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz"; + sha1 = "31a9f30070f91368a7182cf05f831781065fc7a9"; }; } { - name = "_babel_highlight___highlight_7.0.0.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.5.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz"; - sha1 = "f710c38c8d458e6dd9a201afb637fcb781ce99e4"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz"; + sha1 = "90977a8e6fbf6b431a7dc31752eee233bf052d80"; }; } { - name = "_babel_parser___parser_7.2.3.tgz"; + name = "_babel_highlight___highlight_7.9.0.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.2.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.2.3.tgz"; - sha1 = "32f5df65744b70888d17872ec106b02434ba1489"; + name = "_babel_highlight___highlight_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz"; + sha1 = "4e9b45ccb82b79607271b2979ad82c7b68163079"; }; } { - name = "_babel_template___template_7.2.2.tgz"; + name = "_babel_parser___parser_7.9.6.tgz"; path = fetchurl { - name = "_babel_template___template_7.2.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz"; - sha1 = "005b3fdf0ed96e88041330379e0da9a708eb2907"; + name = "_babel_parser___parser_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz"; + sha1 = "3b1bbb30dabe600cd72db58720998376ff653bc7"; }; } { - name = "_babel_traverse___traverse_7.2.3.tgz"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.9.6.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.2.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz"; - sha1 = "7ff50cefa9c7c0bd2d81231fdac122f3957748d8"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz"; + sha1 = "67aded13fffbbc2cb93247388cf84d77a4be9a71"; }; } { - name = "_babel_types___types_7.2.2.tgz"; + name = "_babel_runtime___runtime_7.9.6.tgz"; path = fetchurl { - name = "_babel_types___types_7.2.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.2.2.tgz"; - sha1 = "44e10fc24e33af524488b716cdaee5360ea8ed1e"; + name = "_babel_runtime___runtime_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz"; + sha1 = "a9102eb5cadedf3f31d08a9ecf294af7827ea29f"; }; } { - name = "_iamstarkov_listr_update_renderer___listr_update_renderer_0.4.1.tgz"; + name = "_babel_template___template_7.8.6.tgz"; path = fetchurl { - name = "_iamstarkov_listr_update_renderer___listr_update_renderer_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/@iamstarkov/listr-update-renderer/-/listr-update-renderer-0.4.1.tgz"; - sha1 = "d7c48092a2dcf90fd672b6c8b458649cb350c77e"; + name = "_babel_template___template_7.8.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz"; + sha1 = "86b22af15f828dfb086474f964dcc3e39c43ce2b"; + }; + } + { + name = "_babel_traverse___traverse_7.9.6.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz"; + sha1 = "5540d7577697bf619cc57b92aa0f1c231a94f442"; + }; + } + { + name = "_babel_types___types_7.9.6.tgz"; + path = fetchurl { + name = "_babel_types___types_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz"; + sha1 = "2c5502b427251e9de1bd2dff95add646d95cc9f7"; }; } { @@ -122,11 +138,11 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.0.1.tgz"; + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz"; - sha1 = "32a064fd925429216a09b141102bfdd185fae40e"; + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; + sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; }; } { @@ -138,19 +154,19 @@ }; } { - name = "acorn___acorn_5.7.3.tgz"; + name = "acorn___acorn_5.7.4.tgz"; path = fetchurl { - name = "acorn___acorn_5.7.3.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz"; - sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279"; + name = "acorn___acorn_5.7.4.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz"; + sha1 = "3e8d8a9947d0599a1796d10225d7432f4a4acf5e"; }; } { - name = "acorn___acorn_6.0.5.tgz"; + name = "acorn___acorn_6.4.1.tgz"; path = fetchurl { - name = "acorn___acorn_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz"; - sha1 = "81730c0815f3f3b34d8efa95cb7430965f4d887a"; + name = "acorn___acorn_6.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz"; + sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474"; }; } { @@ -170,19 +186,19 @@ }; } { - name = "ajv___ajv_6.6.2.tgz"; + name = "ajv___ajv_6.12.2.tgz"; path = fetchurl { - name = "ajv___ajv_6.6.2.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz"; - sha1 = "caceccf474bf3fc3ce3b147443711a24063cc30d"; + name = "ajv___ajv_6.12.2.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz"; + sha1 = "c629c5eced17baf314437918d2da88c99d5958cd"; }; } { - name = "ansi_escapes___ansi_escapes_3.1.0.tgz"; + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; path = fetchurl { - name = "ansi_escapes___ansi_escapes_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz"; - sha1 = "f73207bb81207d75fd6c83f125af26eea378ca30"; + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"; }; } { @@ -202,11 +218,11 @@ }; } { - name = "ansi_regex___ansi_regex_4.0.0.tgz"; + name = "ansi_regex___ansi_regex_4.1.0.tgz"; path = fetchurl { - name = "ansi_regex___ansi_regex_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz"; - sha1 = "70de791edf021404c3fd615aa89118ae0432e5a9"; + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; }; } { @@ -274,11 +290,11 @@ }; } { - name = "array_includes___array_includes_3.0.3.tgz"; + name = "array_includes___array_includes_3.1.1.tgz"; path = fetchurl { - name = "array_includes___array_includes_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz"; - sha1 = "184b48f62d92d7452bb31b323165c7f8bd02266d"; + name = "array_includes___array_includes_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz"; + sha1 = "cdd67e6852bdf9c1215460786732255ed2459348"; }; } { @@ -305,6 +321,14 @@ sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; }; } + { + name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; + path = fetchurl { + name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz"; + sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; + }; + } { name = "arrify___arrify_1.0.1.tgz"; path = fetchurl { @@ -346,11 +370,11 @@ }; } { - name = "axobject_query___axobject_query_2.0.2.tgz"; + name = "axobject_query___axobject_query_2.1.2.tgz"; path = fetchurl { - name = "axobject_query___axobject_query_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz"; - sha1 = "ea187abe5b9002b377f925d8bf7d1c561adf38f9"; + name = "axobject_query___axobject_query_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz"; + sha1 = "2bdffc0371e643e5f03ba99065d5179b9ca79799"; }; } { @@ -362,11 +386,11 @@ }; } { - name = "babel_eslint___babel_eslint_10.0.1.tgz"; + name = "babel_eslint___babel_eslint_10.1.0.tgz"; path = fetchurl { - name = "babel_eslint___babel_eslint_10.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.1.tgz"; - sha1 = "919681dc099614cd7d31d45c8908695092a1faed"; + name = "babel_eslint___babel_eslint_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz"; + sha1 = "6968e568a910b78fb3779cdd8b6ac2f479943232"; }; } { @@ -425,14 +449,6 @@ sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; }; } - { - name = "builtin_modules___builtin_modules_1.1.1.tgz"; - path = fetchurl { - name = "builtin_modules___builtin_modules_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; - }; - } { name = "cache_base___cache_base_1.0.1.tgz"; path = fetchurl { @@ -482,11 +498,11 @@ }; } { - name = "callsites___callsites_3.0.0.tgz"; + name = "callsites___callsites_3.1.0.tgz"; path = fetchurl { - name = "callsites___callsites_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz"; - sha1 = "fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"; + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; }; } { @@ -522,11 +538,11 @@ }; } { - name = "chalk___chalk_2.4.1.tgz"; + name = "chalk___chalk_2.4.2.tgz"; path = fetchurl { - name = "chalk___chalk_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz"; - sha1 = "18c49ab16a037b6eb0152cc83e3471338215b66e"; + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; }; } { @@ -586,11 +602,11 @@ }; } { - name = "cli_width___cli_width_2.2.0.tgz"; + name = "cli_width___cli_width_2.2.1.tgz"; path = fetchurl { - name = "cli_width___cli_width_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz"; - sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + name = "cli_width___cli_width_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz"; + sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"; }; } { @@ -642,11 +658,11 @@ }; } { - name = "commander___commander_2.19.0.tgz"; + name = "commander___commander_2.20.3.tgz"; path = fetchurl { - name = "commander___commander_2.19.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz"; - sha1 = "f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"; + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; }; } { @@ -658,11 +674,11 @@ }; } { - name = "component_emitter___component_emitter_1.2.1.tgz"; + name = "component_emitter___component_emitter_1.3.0.tgz"; path = fetchurl { - name = "component_emitter___component_emitter_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz"; - sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + name = "component_emitter___component_emitter_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"; + sha1 = "16e4070fba8ae29b679f2215853ee181ab2eabc0"; }; } { @@ -681,6 +697,14 @@ sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; }; } + { + name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz"; + path = fetchurl { + name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz"; + sha1 = "72bc13b483c0276801681871d4898516f8f54fdd"; + }; + } { name = "contains_path___contains_path_0.1.0.tgz"; path = fetchurl { @@ -698,11 +722,19 @@ }; } { - name = "core_js___core_js_2.6.1.tgz"; + name = "core_js_pure___core_js_pure_3.6.5.tgz"; path = fetchurl { - name = "core_js___core_js_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.1.tgz"; - sha1 = "87416ae817de957a3f249b3b5ca475d4aaed6042"; + name = "core_js_pure___core_js_pure_3.6.5.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz"; + sha1 = "c79e75f5e38dbc85a662d91eea52b8256d53b813"; + }; + } + { + name = "core_js___core_js_2.6.11.tgz"; + path = fetchurl { + name = "core_js___core_js_2.6.11.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz"; + sha1 = "38831469f9922bded8ee21c9dc46985e0399308c"; }; } { @@ -714,19 +746,11 @@ }; } { - name = "cosmiconfig___cosmiconfig_5.0.6.tgz"; + name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; path = fetchurl { - name = "cosmiconfig___cosmiconfig_5.0.6.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz"; - sha1 = "dca6cf680a0bd03589aff684700858c81abeeb39"; - }; - } - { - name = "cosmiconfig___cosmiconfig_5.0.7.tgz"; - path = fetchurl { - name = "cosmiconfig___cosmiconfig_5.0.7.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz"; - sha1 = "39826b292ee0d78eda137dfa3173bd1c21a43b04"; + name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; + sha1 = "040f726809c591e77a17c0a3626ca45b4f168b1a"; }; } { @@ -746,11 +770,11 @@ }; } { - name = "damerau_levenshtein___damerau_levenshtein_1.0.4.tgz"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; path = fetchurl { - name = "damerau_levenshtein___damerau_levenshtein_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz"; - sha1 = "03191c432cb6eea168bb77f3a55ffdccb8978514"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz"; + sha1 = "143c1641cb3d85c60c32329e26899adea8701791"; }; } { @@ -810,11 +834,11 @@ }; } { - name = "deep_equal___deep_equal_1.0.1.tgz"; + name = "deep_equal___deep_equal_1.1.1.tgz"; path = fetchurl { - name = "deep_equal___deep_equal_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz"; - sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; + name = "deep_equal___deep_equal_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz"; + sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a"; }; } { @@ -866,11 +890,11 @@ }; } { - name = "dlv___dlv_1.1.2.tgz"; + name = "dlv___dlv_1.1.3.tgz"; path = fetchurl { - name = "dlv___dlv_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/dlv/-/dlv-1.1.2.tgz"; - sha1 = "270f6737b30d25b6657a7e962c784403f85137e5"; + name = "dlv___dlv_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz"; + sha1 = "5c198a8a11453596e751494d49874bc7732f2e79"; }; } { @@ -897,6 +921,14 @@ sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d"; }; } + { + name = "doctrine___doctrine_3.0.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; + sha1 = "addebead72a6574db783639dc87a121773973961"; + }; + } { name = "elegant_spinner___elegant_spinner_1.0.1.tgz"; path = fetchurl { @@ -906,19 +938,19 @@ }; } { - name = "emoji_regex___emoji_regex_6.5.1.tgz"; + name = "emoji_regex___emoji_regex_7.0.3.tgz"; path = fetchurl { - name = "emoji_regex___emoji_regex_6.5.1.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.5.1.tgz"; - sha1 = "9baea929b155565c11ea41c6626eaa65cef992c2"; + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; }; } { - name = "end_of_stream___end_of_stream_1.4.1.tgz"; + name = "end_of_stream___end_of_stream_1.4.4.tgz"; path = fetchurl { - name = "end_of_stream___end_of_stream_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz"; - sha1 = "ed29634d19baba463b6ce6b80a37213eab71ec43"; + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; }; } { @@ -930,19 +962,19 @@ }; } { - name = "es_abstract___es_abstract_1.13.0.tgz"; + name = "es_abstract___es_abstract_1.17.5.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz"; - sha1 = "ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"; + name = "es_abstract___es_abstract_1.17.5.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz"; + sha1 = "d8c9d1d66c8981fb9200e2251d799eee92774ae9"; }; } { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; path = fetchurl { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; - sha1 = "edf72478033456e8dda8ef09e00ad9650707f377"; + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; }; } { @@ -954,27 +986,27 @@ }; } { - name = "eslint_config_airbnb_base___eslint_config_airbnb_base_13.1.0.tgz"; + name = "eslint_config_airbnb_base___eslint_config_airbnb_base_13.2.0.tgz"; path = fetchurl { - name = "eslint_config_airbnb_base___eslint_config_airbnb_base_13.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.1.0.tgz"; - sha1 = "b5a1b480b80dfad16433d6c4ad84e6605052c05c"; + name = "eslint_config_airbnb_base___eslint_config_airbnb_base_13.2.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.2.0.tgz"; + sha1 = "f6ea81459ff4dec2dda200c35f1d8f7419d57943"; }; } { - name = "eslint_config_airbnb___eslint_config_airbnb_17.1.0.tgz"; + name = "eslint_config_airbnb___eslint_config_airbnb_17.1.1.tgz"; path = fetchurl { - name = "eslint_config_airbnb___eslint_config_airbnb_17.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-17.1.0.tgz"; - sha1 = "3964ed4bc198240315ff52030bf8636f42bc4732"; + name = "eslint_config_airbnb___eslint_config_airbnb_17.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-17.1.1.tgz"; + sha1 = "2272e0b86bb1e2b138cdf88d07a3b6f4cda3d626"; }; } { - name = "eslint_config_prettier___eslint_config_prettier_3.3.0.tgz"; + name = "eslint_config_prettier___eslint_config_prettier_3.6.0.tgz"; path = fetchurl { - name = "eslint_config_prettier___eslint_config_prettier_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.3.0.tgz"; - sha1 = "41afc8d3b852e757f06274ed6c44ca16f939a57d"; + name = "eslint_config_prettier___eslint_config_prettier_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.6.0.tgz"; + sha1 = "8ca3ffac4bd6eeef623a0651f9d754900e3ec217"; }; } { @@ -986,43 +1018,43 @@ }; } { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz"; - sha1 = "58f15fb839b8d0576ca980413476aab2472db66a"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz"; + sha1 = "dbaa52b6b2816b50bc6711af75422de808e98404"; }; } { - name = "eslint_module_utils___eslint_module_utils_2.2.0.tgz"; + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz"; - sha1 = "b270362cd88b1a48ad308976ce7fa54e98411746"; + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; + sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6"; }; } { - name = "eslint_plugin_es___eslint_plugin_es_1.4.0.tgz"; + name = "eslint_plugin_es___eslint_plugin_es_1.4.1.tgz"; path = fetchurl { - name = "eslint_plugin_es___eslint_plugin_es_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.0.tgz"; - sha1 = "475f65bb20c993fc10e8c8fe77d1d60068072da6"; + name = "eslint_plugin_es___eslint_plugin_es_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.1.tgz"; + sha1 = "12acae0f4953e76ba444bfd1b2271081ac620998"; }; } { - name = "eslint_plugin_import___eslint_plugin_import_2.14.0.tgz"; + name = "eslint_plugin_import___eslint_plugin_import_2.20.2.tgz"; path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.14.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz"; - sha1 = "6b17626d2e3e6ad52cfce8807a845d15e22111a8"; + name = "eslint_plugin_import___eslint_plugin_import_2.20.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz"; + sha1 = "91fc3807ce08be4837141272c8b99073906e588d"; }; } { - name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.1.2.tgz"; + name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.2.3.tgz"; path = fetchurl { - name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.1.2.tgz"; - sha1 = "69bca4890b36dcf0fe16dd2129d2d88b98f33f88"; + name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.2.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz"; + sha1 = "b872a09d5de51af70a97db1eea7dc933043708aa"; }; } { @@ -1034,43 +1066,27 @@ }; } { - name = "eslint_plugin_promise___eslint_plugin_promise_4.0.1.tgz"; + name = "eslint_plugin_promise___eslint_plugin_promise_4.2.1.tgz"; path = fetchurl { - name = "eslint_plugin_promise___eslint_plugin_promise_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.0.1.tgz"; - sha1 = "2d074b653f35a23d1ba89d8e976a985117d1c6a2"; + name = "eslint_plugin_promise___eslint_plugin_promise_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz"; + sha1 = "845fd8b2260ad8f82564c1222fce44ad71d9418a"; }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.12.3.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.20.0.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.12.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.12.3.tgz"; - sha1 = "b9ca4cd7cd3f5d927db418a1950366a12d4568fd"; + name = "eslint_plugin_react___eslint_plugin_react_7.20.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz"; + sha1 = "f98712f0a5e57dfd3e5542ef0604b8739cd47be3"; }; } { - name = "eslint_plugin_standard___eslint_plugin_standard_4.0.0.tgz"; + name = "eslint_plugin_standard___eslint_plugin_standard_4.0.1.tgz"; path = fetchurl { - name = "eslint_plugin_standard___eslint_plugin_standard_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.0.tgz"; - sha1 = "f845b45109c99cd90e77796940a344546c8f6b5c"; - }; - } - { - name = "eslint_restricted_globals___eslint_restricted_globals_0.1.1.tgz"; - path = fetchurl { - name = "eslint_restricted_globals___eslint_restricted_globals_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz"; - sha1 = "35f0d5cbc64c2e3ed62e93b4b1a7af05ba7ed4d7"; - }; - } - { - name = "eslint_scope___eslint_scope_3.7.1.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz"; - sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; + name = "eslint_plugin_standard___eslint_plugin_standard_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz"; + sha1 = "ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4"; }; } { @@ -1082,27 +1098,27 @@ }; } { - name = "eslint_scope___eslint_scope_4.0.0.tgz"; + name = "eslint_scope___eslint_scope_4.0.3.tgz"; path = fetchurl { - name = "eslint_scope___eslint_scope_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz"; - sha1 = "50bf3071e9338bcdc43331794a0cb533f0136172"; + name = "eslint_scope___eslint_scope_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz"; + sha1 = "ca03833310f6889a3264781aa82e63eb9cfe7848"; }; } { - name = "eslint_utils___eslint_utils_1.3.1.tgz"; + name = "eslint_utils___eslint_utils_1.4.3.tgz"; path = fetchurl { - name = "eslint_utils___eslint_utils_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz"; - sha1 = "9a851ba89ee7c460346f97cf8939c7298827e512"; + name = "eslint_utils___eslint_utils_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz"; + sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f"; }; } { - name = "eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz"; - sha1 = "3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; + sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2"; }; } { @@ -1114,11 +1130,11 @@ }; } { - name = "eslint___eslint_5.12.0.tgz"; + name = "eslint___eslint_5.16.0.tgz"; path = fetchurl { - name = "eslint___eslint_5.12.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-5.12.0.tgz"; - sha1 = "fab3b908f60c52671fb14e996a450b96c743c859"; + name = "eslint___eslint_5.16.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz"; + sha1 = "a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"; }; } { @@ -1130,11 +1146,11 @@ }; } { - name = "espree___espree_5.0.0.tgz"; + name = "espree___espree_5.0.1.tgz"; path = fetchurl { - name = "espree___espree_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-5.0.0.tgz"; - sha1 = "fc7f984b62b36a0f543b13fb9cd7b9f4a7f5b65c"; + name = "espree___espree_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz"; + sha1 = "5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"; }; } { @@ -1146,11 +1162,11 @@ }; } { - name = "esquery___esquery_1.0.1.tgz"; + name = "esquery___esquery_1.3.1.tgz"; path = fetchurl { - name = "esquery___esquery_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz"; - sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708"; + name = "esquery___esquery_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; + sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; }; } { @@ -1162,19 +1178,27 @@ }; } { - name = "estraverse___estraverse_4.2.0.tgz"; + name = "estraverse___estraverse_4.3.0.tgz"; path = fetchurl { - name = "estraverse___estraverse_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz"; - sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; }; } { - name = "esutils___esutils_2.0.2.tgz"; + name = "estraverse___estraverse_5.1.0.tgz"; path = fetchurl { - name = "esutils___esutils_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz"; - sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; + name = "estraverse___estraverse_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz"; + sha1 = "374309d39fd935ae500e7b92e8a6b4c720e59642"; + }; + } + { + name = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; }; } { @@ -1226,11 +1250,11 @@ }; } { - name = "external_editor___external_editor_3.0.3.tgz"; + name = "external_editor___external_editor_3.1.0.tgz"; path = fetchurl { - name = "external_editor___external_editor_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz"; - sha1 = "5866db29a97826dbe4bf3afd24070ead9ea43a27"; + name = "external_editor___external_editor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz"; + sha1 = "cb03f740befae03ea4d283caed2741a83f335495"; }; } { @@ -1250,19 +1274,19 @@ }; } { - name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; - sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; + sha1 = "545145077c501491e33b15ec408c294376e94ae4"; }; } { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; path = fetchurl { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; }; } { @@ -1297,6 +1321,14 @@ sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; } + { + name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; + sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c"; + }; + } { name = "fill_range___fill_range_4.0.0.tgz"; path = fetchurl { @@ -1305,22 +1337,6 @@ sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; }; } - { - name = "find_parent_dir___find_parent_dir_0.3.0.tgz"; - path = fetchurl { - name = "find_parent_dir___find_parent_dir_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz"; - sha1 = "33c44b429ab2b2f0646299c5f9f718f376ff8d54"; - }; - } - { - name = "find_up___find_up_1.1.2.tgz"; - path = fetchurl { - name = "find_up___find_up_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz"; - sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; - }; - } { name = "find_up___find_up_2.1.0.tgz"; path = fetchurl { @@ -1345,6 +1361,30 @@ sha1 = "2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"; }; } + { + name = "flat_cache___flat_cache_2.0.1.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz"; + sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0"; + }; + } + { + name = "flatted___flatted_2.0.2.tgz"; + path = fetchurl { + name = "flatted___flatted_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz"; + sha1 = "4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"; + }; + } + { + name = "fn_name___fn_name_2.0.1.tgz"; + path = fetchurl { + name = "fn_name___fn_name_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz"; + sha1 = "5214d7537a4d06a4a301c0cc262feb84188002e7"; + }; + } { name = "for_in___for_in_1.0.2.tgz"; path = fetchurl { @@ -1402,11 +1442,11 @@ }; } { - name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.0.tgz"; + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; path = fetchurl { - name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz"; - sha1 = "b877b49a5c16aefac3655f2ed2ea5b684df8d203"; + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; + sha1 = "b5fde77f22cbe35f390b4e089922c50bce6ef664"; }; } { @@ -1450,11 +1490,11 @@ }; } { - name = "glob___glob_7.1.3.tgz"; + name = "glob___glob_7.1.6.tgz"; path = fetchurl { - name = "glob___glob_7.1.3.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz"; - sha1 = "3960832d3f1574108342dafd3a67b332c0969df1"; + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; }; } { @@ -1466,11 +1506,11 @@ }; } { - name = "globals___globals_11.9.0.tgz"; + name = "globals___globals_11.12.0.tgz"; path = fetchurl { - name = "globals___globals_11.9.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz"; - sha1 = "bde236808e987f290768a93d065060d78e6ab249"; + name = "globals___globals_11.12.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"; + sha1 = "ab8795338868a0babd8525758018c2a7eb95c42e"; }; } { @@ -1482,11 +1522,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.1.15.tgz"; + name = "graceful_fs___graceful_fs_4.2.4.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.1.15.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz"; - sha1 = "ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"; + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; }; } { @@ -1514,11 +1554,11 @@ }; } { - name = "has_symbols___has_symbols_1.0.0.tgz"; + name = "has_symbols___has_symbols_1.0.1.tgz"; path = fetchurl { - name = "has_symbols___has_symbols_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz"; - sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + name = "has_symbols___has_symbols_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; + sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; }; } { @@ -1562,11 +1602,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_2.7.1.tgz"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz"; - sha1 = "97f236977bd6e125408930ff6de3eec6281ec047"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; + sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; }; } { @@ -1602,11 +1642,11 @@ }; } { - name = "ignore___ignore_5.0.4.tgz"; + name = "ignore___ignore_5.1.4.tgz"; path = fetchurl { - name = "ignore___ignore_5.0.4.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-5.0.4.tgz"; - sha1 = "33168af4a21e99b00c5d41cbadb6a6cb49903a45"; + name = "ignore___ignore_5.1.4.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz"; + sha1 = "84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"; }; } { @@ -1618,11 +1658,11 @@ }; } { - name = "import_fresh___import_fresh_3.0.0.tgz"; + name = "import_fresh___import_fresh_3.2.1.tgz"; path = fetchurl { - name = "import_fresh___import_fresh_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz"; - sha1 = "a3d897f420cab0e671236897f75bc14b4885c390"; + name = "import_fresh___import_fresh_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; + sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; }; } { @@ -1650,11 +1690,11 @@ }; } { - name = "inherits___inherits_2.0.3.tgz"; + name = "inherits___inherits_2.0.4.tgz"; path = fetchurl { - name = "inherits___inherits_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; }; } { @@ -1666,11 +1706,19 @@ }; } { - name = "inquirer___inquirer_6.2.1.tgz"; + name = "inquirer___inquirer_6.5.2.tgz"; path = fetchurl { - name = "inquirer___inquirer_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz"; - sha1 = "9943fc4882161bdb0b0c9276769c75b32dbfcd52"; + name = "inquirer___inquirer_6.5.2.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz"; + sha1 = "ad50942375d036d327ff528c08bd5fab089928ca"; + }; + } + { + name = "internal_slot___internal_slot_1.0.2.tgz"; + path = fetchurl { + name = "internal_slot___internal_slot_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz"; + sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"; }; } { @@ -1697,6 +1745,14 @@ sha1 = "169c2f6d3df1f992618072365c9b0ea1f6878656"; }; } + { + name = "is_arguments___is_arguments_1.0.4.tgz"; + path = fetchurl { + name = "is_arguments___is_arguments_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz"; + sha1 = "3faf966c7cba0ff437fb31f6250082fcf0448cf3"; + }; + } { name = "is_arrayish___is_arrayish_0.2.1.tgz"; path = fetchurl { @@ -1714,19 +1770,11 @@ }; } { - name = "is_builtin_module___is_builtin_module_1.0.0.tgz"; + name = "is_callable___is_callable_1.1.5.tgz"; path = fetchurl { - name = "is_builtin_module___is_builtin_module_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - } - { - name = "is_callable___is_callable_1.1.4.tgz"; - path = fetchurl { - name = "is_callable___is_callable_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz"; - sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"; + name = "is_callable___is_callable_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz"; + sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab"; }; } { @@ -1754,11 +1802,11 @@ }; } { - name = "is_date_object___is_date_object_1.0.1.tgz"; + name = "is_date_object___is_date_object_1.0.2.tgz"; path = fetchurl { - name = "is_date_object___is_date_object_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz"; - sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + name = "is_date_object___is_date_object_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz"; + sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"; }; } { @@ -1826,11 +1874,11 @@ }; } { - name = "is_glob___is_glob_4.0.0.tgz"; + name = "is_glob___is_glob_4.0.1.tgz"; path = fetchurl { - name = "is_glob___is_glob_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz"; - sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0"; + name = "is_glob___is_glob_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; + sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; }; } { @@ -1890,19 +1938,19 @@ }; } { - name = "is_promise___is_promise_2.1.0.tgz"; + name = "is_promise___is_promise_2.2.2.tgz"; path = fetchurl { - name = "is_promise___is_promise_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + name = "is_promise___is_promise_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz"; + sha1 = "39ab959ccbf9a774cf079f7b40c7a26f763135f1"; }; } { - name = "is_regex___is_regex_1.0.4.tgz"; + name = "is_regex___is_regex_1.0.5.tgz"; path = fetchurl { - name = "is_regex___is_regex_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz"; - sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + name = "is_regex___is_regex_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz"; + sha1 = "39d589a358bf18967f726967120b8fc1aed74eae"; }; } { @@ -1930,11 +1978,19 @@ }; } { - name = "is_symbol___is_symbol_1.0.2.tgz"; + name = "is_string___is_string_1.0.5.tgz"; path = fetchurl { - name = "is_symbol___is_symbol_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz"; - sha1 = "a055f6ae57192caee329e7a860118b497a950f38"; + name = "is_string___is_string_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz"; + sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"; + }; + } + { + name = "is_symbol___is_symbol_1.0.3.tgz"; + path = fetchurl { + name = "is_symbol___is_symbol_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; + sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; }; } { @@ -1977,22 +2033,6 @@ sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; }; } - { - name = "jest_get_type___jest_get_type_22.4.3.tgz"; - path = fetchurl { - name = "jest_get_type___jest_get_type_22.4.3.tgz"; - url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz"; - sha1 = "e3a8504d8479342dd4420236b322869f18900ce4"; - }; - } - { - name = "jest_validate___jest_validate_23.6.0.tgz"; - path = fetchurl { - name = "jest_validate___jest_validate_23.6.0.tgz"; - url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.6.0.tgz"; - sha1 = "36761f99d1ed33fcd425b4e4c5595d62b6597474"; - }; - } { name = "js_tokens___js_tokens_4.0.0.tgz"; path = fetchurl { @@ -2010,11 +2050,11 @@ }; } { - name = "js_yaml___js_yaml_3.12.1.tgz"; + name = "js_yaml___js_yaml_3.13.1.tgz"; path = fetchurl { - name = "js_yaml___js_yaml_3.12.1.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz"; - sha1 = "295c8632a18a23e054cf5c9d3cecafe678167600"; + name = "js_yaml___js_yaml_3.13.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz"; + sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847"; }; } { @@ -2058,11 +2098,11 @@ }; } { - name = "jsx_ast_utils___jsx_ast_utils_2.0.1.tgz"; + name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; path = fetchurl { - name = "jsx_ast_utils___jsx_ast_utils_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz"; - sha1 = "e801b1b39985e20fffc87b40e3748080e2dcac7f"; + name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz"; + sha1 = "8a9364e402448a3ce7f14d357738310d9248054f"; }; } { @@ -2090,11 +2130,11 @@ }; } { - name = "kind_of___kind_of_6.0.2.tgz"; + name = "kind_of___kind_of_6.0.3.tgz"; path = fetchurl { - name = "kind_of___kind_of_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz"; - sha1 = "01146b36a6218e64e58f3a8d66de5d7fc6f6d051"; + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; }; } { @@ -2105,14 +2145,6 @@ sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; }; } - { - name = "leven___leven_2.1.0.tgz"; - path = fetchurl { - name = "leven___leven_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz"; - sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; - }; - } { name = "levn___levn_0.3.0.tgz"; path = fetchurl { @@ -2122,11 +2154,11 @@ }; } { - name = "lint_staged___lint_staged_8.1.0.tgz"; + name = "lint_staged___lint_staged_8.2.1.tgz"; path = fetchurl { - name = "lint_staged___lint_staged_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.1.0.tgz"; - sha1 = "dbc3ae2565366d8f20efb9f9799d076da64863f2"; + name = "lint_staged___lint_staged_8.2.1.tgz"; + url = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.2.1.tgz"; + sha1 = "752fcf222d9d28f323a3b80f1e668f3654ff221f"; }; } { @@ -2194,11 +2226,11 @@ }; } { - name = "lodash.merge___lodash.merge_4.6.1.tgz"; + name = "lodash.merge___lodash.merge_4.6.2.tgz"; path = fetchurl { - name = "lodash.merge___lodash.merge_4.6.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz"; - sha1 = "adc25d9cb99b9391c59624f379fbba60d7111d54"; + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a"; }; } { @@ -2210,11 +2242,11 @@ }; } { - name = "lodash___lodash_4.17.11.tgz"; + name = "lodash___lodash_4.17.15.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.11.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz"; - sha1 = "b39ea6229ef607ecd89e2c8df12536891cac9b8d"; + name = "lodash___lodash_4.17.15.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; + sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; }; } { @@ -2250,11 +2282,11 @@ }; } { - name = "loglevel___loglevel_1.6.1.tgz"; + name = "loglevel___loglevel_1.6.8.tgz"; path = fetchurl { - name = "loglevel___loglevel_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz"; - sha1 = "e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"; + name = "loglevel___loglevel_1.6.8.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz"; + sha1 = "8a25fb75d092230ecd4457270d80b54e28011171"; }; } { @@ -2362,35 +2394,27 @@ }; } { - name = "minimist___minimist_0.0.8.tgz"; + name = "minimist___minimist_1.2.5.tgz"; path = fetchurl { - name = "minimist___minimist_0.0.8.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; }; } { - name = "minimist___minimist_1.2.0.tgz"; + name = "mixin_deep___mixin_deep_1.3.2.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"; + sha1 = "1120b43dc359a785dce65b55b82e257ccf479566"; }; } { - name = "mixin_deep___mixin_deep_1.3.1.tgz"; + name = "mkdirp___mkdirp_0.5.5.tgz"; path = fetchurl { - name = "mixin_deep___mixin_deep_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz"; - sha1 = "a49e7268dce1a0d9698e45326c5626df3543d0fe"; - }; - } - { - name = "mkdirp___mkdirp_0.5.1.tgz"; - path = fetchurl { - name = "mkdirp___mkdirp_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; }; } { @@ -2402,11 +2426,11 @@ }; } { - name = "ms___ms_2.1.1.tgz"; + name = "ms___ms_2.1.2.tgz"; path = fetchurl { - name = "ms___ms_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; - sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; }; } { @@ -2450,11 +2474,11 @@ }; } { - name = "normalize_package_data___normalize_package_data_2.4.0.tgz"; + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; path = fetchurl { - name = "normalize_package_data___normalize_package_data_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha1 = "12f95a307d58352075a04907b84ac8be98ac012f"; + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; }; } { @@ -2506,11 +2530,27 @@ }; } { - name = "object_keys___object_keys_1.0.12.tgz"; + name = "object_inspect___object_inspect_1.7.0.tgz"; path = fetchurl { - name = "object_keys___object_keys_1.0.12.tgz"; - url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz"; - sha1 = "09c53855377575310cca62f55bb334abff7b3ed2"; + name = "object_inspect___object_inspect_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz"; + sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"; + }; + } + { + name = "object_is___object_is_1.1.2.tgz"; + path = fetchurl { + name = "object_is___object_is_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz"; + sha1 = "c5d2e87ff9e119f78b7a088441519e2eec1573b6"; + }; + } + { + name = "object_keys___object_keys_1.1.1.tgz"; + path = fetchurl { + name = "object_keys___object_keys_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; + sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; }; } { @@ -2530,19 +2570,19 @@ }; } { - name = "object.entries___object.entries_1.1.0.tgz"; + name = "object.entries___object.entries_1.1.1.tgz"; path = fetchurl { - name = "object.entries___object.entries_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz"; - sha1 = "2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519"; + name = "object.entries___object.entries_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz"; + sha1 = "ee1cf04153de02bb093fec33683900f57ce5399b"; }; } { - name = "object.fromentries___object.fromentries_2.0.0.tgz"; + name = "object.fromentries___object.fromentries_2.0.2.tgz"; path = fetchurl { - name = "object.fromentries___object.fromentries_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.0.tgz"; - sha1 = "49a543d92151f8277b3ac9600f1e930b189d30ab"; + name = "object.fromentries___object.fromentries_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz"; + sha1 = "4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"; }; } { @@ -2553,6 +2593,14 @@ sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; }; } + { + name = "object.values___object.values_1.1.1.tgz"; + path = fetchurl { + name = "object.values___object.values_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; + sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; + }; + } { name = "once___once_1.4.0.tgz"; path = fetchurl { @@ -2570,11 +2618,11 @@ }; } { - name = "optionator___optionator_0.8.2.tgz"; + name = "optionator___optionator_0.8.3.tgz"; path = fetchurl { - name = "optionator___optionator_0.8.2.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz"; - sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; }; } { @@ -2610,11 +2658,11 @@ }; } { - name = "p_limit___p_limit_2.1.0.tgz"; + name = "p_limit___p_limit_2.3.0.tgz"; path = fetchurl { - name = "p_limit___p_limit_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.1.0.tgz"; - sha1 = "1d5a0d20fb12707c758a655f6bbc4386b5930d68"; + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; }; } { @@ -2642,11 +2690,11 @@ }; } { - name = "p_map___p_map_2.0.0.tgz"; + name = "p_map___p_map_2.1.0.tgz"; path = fetchurl { - name = "p_map___p_map_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-map/-/p-map-2.0.0.tgz"; - sha1 = "be18c5a5adeb8e156460651421aceca56c213a50"; + name = "p_map___p_map_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz"; + sha1 = "310928feef9c9ecc65b68b17693018a665cea175"; }; } { @@ -2658,19 +2706,19 @@ }; } { - name = "p_try___p_try_2.0.0.tgz"; + name = "p_try___p_try_2.2.0.tgz"; path = fetchurl { - name = "p_try___p_try_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz"; - sha1 = "85080bb87c64688fa47996fe8f7dfbe8211760b1"; + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; }; } { - name = "parent_module___parent_module_1.0.0.tgz"; + name = "parent_module___parent_module_1.0.1.tgz"; path = fetchurl { - name = "parent_module___parent_module_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.0.tgz"; - sha1 = "df250bdc5391f4a085fb589dad761f5ad6b865b5"; + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; }; } { @@ -2697,14 +2745,6 @@ sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; }; } - { - name = "path_exists___path_exists_2.1.0.tgz"; - path = fetchurl { - name = "path_exists___path_exists_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz"; - sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; - }; - } { name = "path_exists___path_exists_3.0.0.tgz"; path = fetchurl { @@ -2786,11 +2826,11 @@ }; } { - name = "pkg_dir___pkg_dir_1.0.0.tgz"; + name = "pkg_dir___pkg_dir_2.0.0.tgz"; path = fetchurl { - name = "pkg_dir___pkg_dir_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz"; - sha1 = "7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"; + name = "pkg_dir___pkg_dir_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz"; + sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; }; } { @@ -2802,11 +2842,11 @@ }; } { - name = "please_upgrade_node___please_upgrade_node_3.1.1.tgz"; + name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz"; path = fetchurl { - name = "please_upgrade_node___please_upgrade_node_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz"; - sha1 = "ed320051dfcc5024fae696712c8288993595e8ac"; + name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz"; + sha1 = "aeddd3f994c933e4ad98b99d9a556efa0e2fe942"; }; } { @@ -2850,11 +2890,11 @@ }; } { - name = "prettier___prettier_1.15.3.tgz"; + name = "prettier___prettier_1.19.1.tgz"; path = fetchurl { - name = "prettier___prettier_1.15.3.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-1.15.3.tgz"; - sha1 = "1feaac5bdd181237b54dbe65d874e02a1472786a"; + name = "prettier___prettier_1.19.1.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz"; + sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb"; }; } { @@ -2866,11 +2906,11 @@ }; } { - name = "process_nextick_args___process_nextick_args_2.0.0.tgz"; + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; path = fetchurl { - name = "process_nextick_args___process_nextick_args_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; - sha1 = "a37d732f4271b4ab1ad070d35508e8290788ffaa"; + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; }; } { @@ -2882,11 +2922,19 @@ }; } { - name = "prop_types___prop_types_15.6.2.tgz"; + name = "prop_types___prop_types_15.7.2.tgz"; path = fetchurl { - name = "prop_types___prop_types_15.6.2.tgz"; - url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz"; - sha1 = "05d5ca77b4453e985d60fc7ff8c859094a497102"; + name = "prop_types___prop_types_15.7.2.tgz"; + url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; + sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; + }; + } + { + name = "property_expr___property_expr_1.5.1.tgz"; + path = fetchurl { + name = "property_expr___property_expr_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/property-expr/-/property-expr-1.5.1.tgz"; + sha1 = "22e8706894a0c8e28d58735804f6ba3a3673314f"; }; } { @@ -2929,6 +2977,14 @@ sha1 = "8d41351eb8111c55353617fc3bbffad8e4d35d06"; }; } + { + name = "react_is___react_is_16.13.1.tgz"; + path = fetchurl { + name = "react_is___react_is_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; + sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; + }; + } { name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; path = fetchurl { @@ -2954,11 +3010,11 @@ }; } { - name = "readable_stream___readable_stream_2.3.6.tgz"; + name = "readable_stream___readable_stream_2.3.7.tgz"; path = fetchurl { - name = "readable_stream___readable_stream_2.3.6.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz"; - sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"; + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; }; } { @@ -2969,6 +3025,14 @@ sha1 = "be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"; }; } + { + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; + sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; + }; + } { name = "regex_not___regex_not_1.0.2.tgz"; path = fetchurl { @@ -2977,6 +3041,14 @@ sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c"; }; } + { + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; + path = fetchurl { + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; + sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"; + }; + } { name = "regexpp___regexpp_1.1.0.tgz"; path = fetchurl { @@ -3082,11 +3154,11 @@ }; } { - name = "resolve___resolve_1.9.0.tgz"; + name = "resolve___resolve_1.17.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz"; - sha1 = "a14c6fdfa8f92a7df1d996cb7105fa744658ea06"; + name = "resolve___resolve_1.17.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz"; + sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; }; } { @@ -3114,11 +3186,19 @@ }; } { - name = "run_async___run_async_2.3.0.tgz"; + name = "rimraf___rimraf_2.7.1.tgz"; path = fetchurl { - name = "run_async___run_async_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz"; - sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + }; + } + { + name = "run_async___run_async_2.4.1.tgz"; + path = fetchurl { + name = "run_async___run_async_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; + sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; }; } { @@ -3154,11 +3234,11 @@ }; } { - name = "rxjs___rxjs_6.3.3.tgz"; + name = "rxjs___rxjs_6.5.5.tgz"; path = fetchurl { - name = "rxjs___rxjs_6.3.3.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz"; - sha1 = "3c6a7fa420e844a81390fb1158a9ec614f4bad55"; + name = "rxjs___rxjs_6.5.5.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz"; + sha1 = "c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"; }; } { @@ -3194,11 +3274,11 @@ }; } { - name = "semver___semver_5.6.0.tgz"; + name = "semver___semver_5.7.1.tgz"; path = fetchurl { - name = "semver___semver_5.6.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz"; - sha1 = "7e74256fbaa49c75aa7c7a205cc22799cac80004"; + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; }; } { @@ -3218,19 +3298,11 @@ }; } { - name = "set_value___set_value_0.4.3.tgz"; + name = "set_value___set_value_2.0.1.tgz"; path = fetchurl { - name = "set_value___set_value_0.4.3.tgz"; - url = "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz"; - sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; - }; - } - { - name = "set_value___set_value_2.0.0.tgz"; - path = fetchurl { - name = "set_value___set_value_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz"; - sha1 = "71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"; + name = "set_value___set_value_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"; + sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b"; }; } { @@ -3250,19 +3322,27 @@ }; } { - name = "signal_exit___signal_exit_3.0.2.tgz"; + name = "side_channel___side_channel_1.0.2.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + name = "side_channel___side_channel_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz"; + sha1 = "df5d1abadb4e4bf4af1cd8852bf132d2f7876947"; }; } { - name = "simple_git___simple_git_1.107.0.tgz"; + name = "signal_exit___signal_exit_3.0.3.tgz"; path = fetchurl { - name = "simple_git___simple_git_1.107.0.tgz"; - url = "https://registry.yarnpkg.com/simple-git/-/simple-git-1.107.0.tgz"; - sha1 = "12cffaf261c14d6f450f7fdb86c21ccee968b383"; + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; + }; + } + { + name = "simple_git___simple_git_1.132.0.tgz"; + path = fetchurl { + name = "simple_git___simple_git_1.132.0.tgz"; + url = "https://registry.yarnpkg.com/simple-git/-/simple-git-1.132.0.tgz"; + sha1 = "53ac4c5ec9e74e37c2fd461e23309f22fcdf09b1"; }; } { @@ -3290,11 +3370,11 @@ }; } { - name = "slice_ansi___slice_ansi_2.0.0.tgz"; + name = "slice_ansi___slice_ansi_2.1.0.tgz"; path = fetchurl { - name = "slice_ansi___slice_ansi_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.0.0.tgz"; - sha1 = "5373bdb8559b45676e8541c66916cdd6251612e7"; + name = "slice_ansi___slice_ansi_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz"; + sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636"; }; } { @@ -3322,11 +3402,11 @@ }; } { - name = "source_map_resolve___source_map_resolve_0.5.2.tgz"; + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; path = fetchurl { - name = "source_map_resolve___source_map_resolve_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; - sha1 = "72e2cc34095543e43b2c62b2c4c10d4a9054f259"; + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; }; } { @@ -3354,27 +3434,27 @@ }; } { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; path = fetchurl { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha1 = "2ea450aee74f2a89bfb94519c07fcd6f41322977"; + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; }; } { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; path = fetchurl { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; - sha1 = "99e119b7a5da00e05491c9fa338b7904823b41d0"; + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; }; } { - name = "spdx_license_ids___spdx_license_ids_3.0.3.tgz"; + name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz"; - sha1 = "81c0ce8f21474756148bbb5f3bfc0f36bf15d76e"; + name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; + sha1 = "3694b5804567a458d3c8045842a6358632f62654"; }; } { @@ -3433,6 +3513,54 @@ sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; }; } + { + name = "string_width___string_width_3.1.0.tgz"; + path = fetchurl { + name = "string_width___string_width_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; + sha1 = "22767be21b62af1081574306f69ac51b62203961"; + }; + } + { + name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; + path = fetchurl { + name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz"; + sha1 = "48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"; + }; + } + { + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; + path = fetchurl { + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha1 = "85812a6b847ac002270f5808146064c995fb6913"; + }; + } + { + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.2.tgz"; + path = fetchurl { + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; + sha1 = "4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"; + }; + } + { + name = "string.prototype.trimright___string.prototype.trimright_2.1.2.tgz"; + path = fetchurl { + name = "string.prototype.trimright___string.prototype.trimright_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; + sha1 = "c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"; + }; + } + { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + path = fetchurl { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"; + }; + } { name = "string_decoder___string_decoder_1.1.1.tgz"; path = fetchurl { @@ -3466,11 +3594,11 @@ }; } { - name = "strip_ansi___strip_ansi_5.0.0.tgz"; + name = "strip_ansi___strip_ansi_5.2.0.tgz"; path = fetchurl { - name = "strip_ansi___strip_ansi_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz"; - sha1 = "f78f68b5d0866c20b2c9b8c61b5298508dc8756f"; + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; }; } { @@ -3537,6 +3665,14 @@ sha1 = "c22688aed4eab3cdc2dfeacbb561660560a00804"; }; } + { + name = "synchronous_promise___synchronous_promise_2.0.12.tgz"; + path = fetchurl { + name = "synchronous_promise___synchronous_promise_2.0.12.tgz"; + url = "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.12.tgz"; + sha1 = "219934f23c19c9aa716276cf2e1f8d4e5b04d07f"; + }; + } { name = "table___table_4.0.2.tgz"; path = fetchurl { @@ -3546,11 +3682,11 @@ }; } { - name = "table___table_5.1.1.tgz"; + name = "table___table_5.4.6.tgz"; path = fetchurl { - name = "table___table_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-5.1.1.tgz"; - sha1 = "92030192f1b7b51b6eeab23ed416862e47b70837"; + name = "table___table_5.4.6.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz"; + sha1 = "1292d19500ce3f86053b05f0e8e7e4a3bb21079e"; }; } { @@ -3610,19 +3746,19 @@ }; } { - name = "trim_right___trim_right_1.0.1.tgz"; + name = "toposort___toposort_2.0.2.tgz"; path = fetchurl { - name = "trim_right___trim_right_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz"; - sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; + name = "toposort___toposort_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz"; + sha1 = "ae21768175d1559d48bef35420b2f4962f09c330"; }; } { - name = "tslib___tslib_1.9.3.tgz"; + name = "tslib___tslib_1.13.0.tgz"; path = fetchurl { - name = "tslib___tslib_1.9.3.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz"; - sha1 = "d7e4dd79245d85428c4d7e4822a79917954ca286"; + name = "tslib___tslib_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz"; + sha1 = "c881e13cc7015894ed914862d276436fa9a47043"; }; } { @@ -3658,11 +3794,11 @@ }; } { - name = "union_value___union_value_1.0.0.tgz"; + name = "union_value___union_value_1.0.1.tgz"; path = fetchurl { - name = "union_value___union_value_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz"; - sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; + name = "union_value___union_value_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"; + sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847"; }; } { @@ -3738,11 +3874,11 @@ }; } { - name = "wordwrap___wordwrap_1.0.0.tgz"; + name = "word_wrap___word_wrap_1.2.3.tgz"; path = fetchurl { - name = "wordwrap___wordwrap_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; }; } { @@ -3769,6 +3905,14 @@ sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; } + { + name = "write___write_1.0.3.tgz"; + path = fetchurl { + name = "write___write_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz"; + sha1 = "0800e14523b923a387e415123c865616aae0f5c3"; + }; + } { name = "write___write_0.2.1.tgz"; path = fetchurl { @@ -3777,6 +3921,14 @@ sha1 = "5fc03828e264cea3fe91455476f7a3c566cb0757"; }; } + { + name = "xregexp___xregexp_4.3.0.tgz"; + path = fetchurl { + name = "xregexp___xregexp_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz"; + sha1 = "7e92e73d9174a99a59743f67a4ce879a04b5ae50"; + }; + } { name = "y18n___y18n_3.2.1.tgz"; path = fetchurl { @@ -3809,5 +3961,13 @@ sha1 = "6542debd9080ad517ec5048fb454efe9e4d4aaae"; }; } + { + name = "yup___yup_0.27.0.tgz"; + path = fetchurl { + name = "yup___yup_0.27.0.tgz"; + url = "https://registry.yarnpkg.com/yup/-/yup-0.27.0.tgz"; + sha1 = "f8cb198c8e7dd2124beddc2457571329096b06e7"; + }; + } ]; } diff --git a/third_party/nixpkgs/pkgs/development/web/cog/default.nix b/third_party/nixpkgs/pkgs/development/web/cog/default.nix index 5344c1b833..a08687e70f 100644 --- a/third_party/nixpkgs/pkgs/development/web/cog/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/cog/default.nix @@ -11,19 +11,19 @@ , webkitgtk , makeWrapper , wrapGAppsHook -, gnome3 +, gnome , gdk-pixbuf }: stdenv.mkDerivation rec { pname = "cog"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "igalia"; repo = "cog"; rev = "v${version}"; - sha256 = "sha256-E6rACj25rdV5dww91PzYEX1r2A9YLNgAVyiYceP1KI8="; + sha256 = "sha256-eF7rvOjZntcMmn622342yqfp4ksZ6R/FFBT36bYCViE="; }; buildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { webkitgtk glib-networking gdk-pixbuf - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix index a4046c37ab..97cd5b8726 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 = "7.1.0"; + version = "7.3.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "1m52v6hhblrjji9c5885bn5qq0xlaw36krbmqfac7fhgsxmkxd2h"; + sha256 = "158bpk4czfv2kkh1al1bb42jb0h3mbx9r72dk6crr2gg0bhabn8m"; }; passthru.updateScript = ./update.sh; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index 9b645fb55e..80e68003b4 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -11,25 +11,29 @@ , CoreServices , Metal , Foundation +, QuartzCore , librusty_v8 ? callPackage ./librusty_v8.nix { } }: rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.9.2"; + version = "1.10.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FKhSFqFZhqzrXrJcBc0YBNHoUq0/1+ULZ9sE+LyNQTI="; + sha256 = "sha256-uePCEYcYahsxcgA+GDcloqqo+dr7Y2N/9nps6Y79D58="; }; - cargoSha256 = "sha256-Pp322D7YtdpeNnKWcE78tvLh5nFNcrh9oGYX2eCiPzI="; + cargoSha256 = "sha256-6fm1RWuTVWCE6nKgkC/SRQYRXGf9SGv7kAXWNqsdQS8="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv libobjc Security CoreServices Metal Foundation ]; + buildAndTestSubdir = "cli"; + + buildInputs = lib.optionals stdenv.isDarwin + [ libiconv libobjc Security CoreServices Metal Foundation QuartzCore ]; # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem # To avoid this we pre-download the file and place it in the locations it will require it in advance @@ -51,9 +55,6 @@ rustPlatform.buildRustPackage rec { doCheck = false; postInstall = '' - # remove test plugin and test server - rm -r $out/lib $out/bin/test_server $out/bin/denort - installShellCompletion --cmd deno \ --bash <($out/bin/deno completions bash) \ --fish <($out/bin/deno completions fish) \ diff --git a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix index c1dbd0f773..8ae163f2c9 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.22.1"; + version = "0.22.2"; shas = { - x86_64-linux = "sha256-rHI5qzwmDvlIdjUCZwvl6/s2Oe6d3/V7TJwfP1AFjik="; - aarch64-linux = "sha256-7VhrOkzWayZFTsq0II5uh+TxXaIDSkc0E19ZwT3Hl6c="; - x86_64-darwin = "sha256-zXXL2YqgjFmuDHGReIGWVxfSS3PMND0J0qlHRV/rKs8="; - aarch64-darwin = "sha256-X/CCJn5yWJH2x6lCGAFllrQUj7XLA3TICRP3aiWytjk="; + x86_64-linux = "sha256-bLGSt9a+drzXMy64iiERFHfdDsIR2YqwwNlkpzIM07Q="; + aarch64-linux = "sha256-MtCB7XaFho+a64fidPO88URIq7X9HvGqN5a9hzuCX4s="; + x86_64-darwin = "sha256-aLeZ0cIdmQHDxSGPx6IBwweZWwDI/m/1kFQTC7dQ3bs="; + aarch64-darwin = "sha256-SZGx/kRvp88mfMqDX+d4GNDs4t+P383kjnNPqwkqkHI="; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index b65c342aaa..f531c9a902 100644 --- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.211"; + version = "0.0.220"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-iR8vEXLRdhLggFvu4Vhb8WW2Wo6qzAMQWC7qUMlWGd8="; + sha256 = "sha256-QuNe2Q7d0WSF3pkDNKxs6b6hO9Q99oJM+ZddHD/tOaI="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-eEcFxEpVBad57mJXaCCYVeMO+cooUOLsSTKIZnu8Bok="; + vendorSha256 = "sha256-zoheYyeofg8oVRicnZt+lFOixIH/Ssv7Kh7zC6yT/uY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix index 24b65e4e8a..1c854368df 100644 --- a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2021.1.1"; + version = "2021.3.0"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-GPOeLSbKiaJR5ppzyJMllzM+2gSddZN7+P5ttkocuDg="; + sha256 = "sha256-RtEkWi0J3nYzT+IhdyBlGeUE2SCmhlnfw0L6sOvE4WI="; }; nativeBuildInputs = diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix index 54f4352c53..7fad6a020a 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix @@ -1,8 +1,8 @@ -{ callPackage, openssl, icu, python2, lib, stdenv, enableNpm ? true }: +{ callPackage, icu68, python2, lib, stdenv, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { - inherit openssl icu; + icu = icu68; python = python2; }; in diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix index 0d48003268..7054e4c66b 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix @@ -1,14 +1,14 @@ -{ callPackage, openssl, python3, lib, stdenv, enableNpm ? true }: +{ callPackage, icu68, python3, lib, stdenv, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { - inherit openssl; + icu = icu68; python = python3; }; in buildNodejs { inherit enableNpm; - version = "14.16.1"; - sha256 = "1hxsk83g2plv6vv3ir1ngca0rwqdy3lq70r504d2qv3msszdnjp4"; + version = "14.17.0"; + sha256 = "1vf989canwcx0wdpngvkbz2x232yccp7fzs1vcbr60rijgzmpq2n"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix index d22c2f213b..e6903098b3 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix @@ -1,8 +1,8 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, icu68, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { - inherit openssl; + icu = icu68; python = python3; }; in diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix index b114c65cd1..dec02ad22f 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.0.0"; - sha256 = "00mada0vvybizygwhzsq6gcz0m2k864lfiiqqlnw8gcc3q8r1js7"; + version = "16.2.0"; + sha256 = "1krm3cnpbnqg4mfl3cpp8x2i1rr6hba9qbl60wyg5f5g8ac3pyfh"; } diff --git a/third_party/nixpkgs/pkgs/development/web/postman/default.nix b/third_party/nixpkgs/pkgs/development/web/postman/default.nix index 02376c0bfe..b8763c9432 100644 --- a/third_party/nixpkgs/pkgs/development/web/postman/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/postman/default.nix @@ -2,16 +2,16 @@ , atk, at-spi2-atk, at-spi2-core, alsaLib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3 , freetype, fontconfig, nss, nspr, pango, udev, libuuid, libX11, libxcb, libXi , libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes -, libXrender, libXtst, libXScrnSaver +, libXrender, libXtst, libXScrnSaver, libdrm, mesa }: stdenv.mkDerivation rec { pname = "postman"; - version = "7.36.1"; + version = "8.4.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "sha256-6brThKTAQI3cu3SSqvEIT1nwlQ/jPTP+d/Q/m/Ez5nQ="; + sha256 = "040l0g6m8lmjrm0wvq8z13xyddasz7v95v54d658w14gv0n713vw"; name = "${pname}.tar.gz"; }; @@ -43,10 +43,12 @@ stdenv.mkDerivation rec { gtk3 freetype fontconfig + mesa nss nspr pango udev + libdrm libuuid libX11 libxcb diff --git a/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix b/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix index b8a9f94a23..b8a7e6a4b8 100644 --- a/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bootstrap"; - version = "4.6.0"; + version = "5.0.0"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; - sha256 = "sha256-CiEUUa0mCrUSp+XCoWNs8plJxhWHZZD+K+UBJSDu1CM="; + sha256 = "sha256-CsPvq8exUL2k/b/QK9c2S68DIsDDR8qxho0WgDJ3/Vs="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/web/valum/default.nix b/third_party/nixpkgs/pkgs/development/web/valum/default.nix index 847943d83b..f62e9027af 100644 --- a/third_party/nixpkgs/pkgs/development/web/valum/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/valum/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Web micro-framework written in Vala"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/0ad/data.nix b/third_party/nixpkgs/pkgs/games/0ad/data.nix index 5cb28b3f3b..9533af21b1 100644 --- a/third_party/nixpkgs/pkgs/games/0ad/data.nix +++ b/third_party/nixpkgs/pkgs/games/0ad/data.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { description = "A free, open-source game of ancient warfare -- data files"; homepage = "https://play0ad.com/"; license = licenses.cc-by-sa-30; + maintainers = with maintainers; [ chvp ]; platforms = platforms.linux; hydraPlatforms = []; }; diff --git a/third_party/nixpkgs/pkgs/games/0ad/game.nix b/third_party/nixpkgs/pkgs/games/0ad/game.nix index bb3b7c0138..feaf434732 100644 --- a/third_party/nixpkgs/pkgs/games/0ad/game.nix +++ b/third_party/nixpkgs/pkgs/games/0ad/game.nix @@ -2,7 +2,7 @@ , pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2 -, gloox, nvidia-texture-tools, zeroad-data +, gloox, nvidia-texture-tools , withEditor ? true, wxGTK }: @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { "-I${fmt.dev}/include" ]; + patches = [ ./rootdir_env.patch ]; + configurePhase = '' # Delete shipped libraries which we don't need. rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey} @@ -62,7 +64,6 @@ stdenv.mkDerivation rec { ${lib.optionalString withEditor "--enable-atlas"} \ --bindir="$out"/bin \ --libdir="$out"/lib/0ad \ - --datadir="$out"/share/0ad/data \ --without-tests \ -j $NIX_BUILD_CORES popd @@ -85,11 +86,6 @@ stdenv.mkDerivation rec { # Copy l10n data. install -Dm755 -t $out/share/0ad/data/l10n binaries/data/l10n/* - # Link in game data from package - ln -s ${zeroad-data}/share/0ad/data/config $out/share/0ad/data/config - ln -s ${zeroad-data}/share/0ad/data/mods $out/share/0ad/data/mods - ln -s ${zeroad-data}/share/0ad/data/tools $out/share/0ad/data/tools - # Copy libraries. install -Dm644 -t $out/lib/0ad binaries/system/*.so @@ -105,6 +101,7 @@ stdenv.mkDerivation rec { gpl2 lgpl21 mit cc-by-sa-30 licenses.zlib # otherwise masked by pkgs.zlib ]; + maintainers = with maintainers; [ chvp ]; platforms = subtractLists platforms.i686 platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/games/0ad/rootdir_env.patch b/third_party/nixpkgs/pkgs/games/0ad/rootdir_env.patch new file mode 100644 index 0000000000..95463c7e2d --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/0ad/rootdir_env.patch @@ -0,0 +1,39 @@ +diff --git a/source/ps/GameSetup/Paths.cpp b/source/ps/GameSetup/Paths.cpp +index 474364e..bf084b4 100644 +--- a/source/ps/GameSetup/Paths.cpp ++++ b/source/ps/GameSetup/Paths.cpp +@@ -155,32 +155,8 @@ Paths::Paths(const CmdLineArgs& args) + + /*static*/ OsPath Paths::Root(const OsPath& argv0) + { +-#if OS_ANDROID +- return OsPath("/sdcard/0ad"); // TODO: this is kind of bogus +-#else +- +- // get full path to executable +- OsPath pathname = sys_ExecutablePathname(); // safe, but requires OS-specific implementation +- if(pathname.empty()) // failed, use argv[0] instead +- { +- errno = 0; +- pathname = wrealpath(argv0); +- if(pathname.empty()) +- WARN_IF_ERR(StatusFromErrno()); +- } +- +- // make sure it's valid +- if(!FileExists(pathname)) +- { +- LOGERROR("Cannot find executable (expected at '%s')", pathname.string8()); +- WARN_IF_ERR(StatusFromErrno()); +- } +- +- for(size_t i = 0; i < 2; i++) // remove "system/name.exe" +- pathname = pathname.Parent(); +- return pathname; +- +-#endif ++ UNUSED2(argv0); ++ return OsPath(getenv("ZEROAD_ROOTDIR")); + } + + /*static*/ OsPath Paths::RootData(const OsPath& argv0) diff --git a/third_party/nixpkgs/pkgs/games/0verkill/default.nix b/third_party/nixpkgs/pkgs/games/0verkill/default.nix index 69a371f09d..fa654832e2 100644 --- a/third_party/nixpkgs/pkgs/games/0verkill/default.nix +++ b/third_party/nixpkgs/pkgs/games/0verkill/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, gccStdenv , fetchFromGitHub , autoreconfHook , xorgproto @@ -7,7 +7,7 @@ , libXpm }: -stdenv.mkDerivation rec { +gccStdenv.mkDerivation rec { pname = "0verkill"; version = "unstable-2011-01-13"; diff --git a/third_party/nixpkgs/pkgs/games/alephone/default.nix b/third_party/nixpkgs/pkgs/games/alephone/default.nix index 6562a60a5b..347ccd8df6 100644 --- a/third_party/nixpkgs/pkgs/games/alephone/default.nix +++ b/third_party/nixpkgs/pkgs/games/alephone/default.nix @@ -7,12 +7,12 @@ let self = stdenv.mkDerivation rec { outputs = [ "out" "icons" ]; pname = "alephone"; - version = "1.3.1"; + version = "1.4"; src = fetchurl { - url = let date = "20200904"; + url = let date = "20210408"; in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2"; - sha256 = "13ck3mp9qd5pkiq6zwvr744bwvmnqkgj5vpf325sz1mcvnv7l8lh"; + sha256 = "sha256-tMwATUhUpo8W2oSWxGSZcAHVkj1PWEvUR/rpMZwWCWA="; }; nativeBuildInputs = [ pkg-config icoutils ]; diff --git a/third_party/nixpkgs/pkgs/games/alephone/infinity/default.nix b/third_party/nixpkgs/pkgs/games/alephone/infinity/default.nix index 5db83c579e..f6002469a0 100644 --- a/third_party/nixpkgs/pkgs/games/alephone/infinity/default.nix +++ b/third_party/nixpkgs/pkgs/games/alephone/infinity/default.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon-infinity"; desktopName = "Marathon-Infinity"; - version = "20200904"; + version = "20210408"; icon = alephone.icons + "/marathon-infinity.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip"; - sha256 = "1n2zfiqjbakkk9dpnzfndqyvq3aml2kjrr2b1wm8g1n44nbc8clq"; + sha256 = "sha256-j9iwSrI7cjqnuRQX+qn8sWXQ6E+DQ19l7OzAL9KHcJU="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/games/anki/bin.nix b/third_party/nixpkgs/pkgs/games/anki/bin.nix index 54e1646fca..09f92b0f84 100644 --- a/third_party/nixpkgs/pkgs/games/anki/bin.nix +++ b/third_party/nixpkgs/pkgs/games/anki/bin.nix @@ -3,14 +3,14 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.43"; + version = "2.1.44"; unpacked = stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2"; - sha256 = "0kadv3fxi76h7xxmb4lckkgcwiv0b7cn630l62dxa2abxibans29"; + sha256 = "01d5ll3vsd4v0ikxgamv47bkwmag15vnmsgpda5wivc3dyawc9j9"; }; installPhase = '' @@ -49,7 +49,7 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // { src = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg"; - sha256 = "0vvgiybq1ygq7cly1r4ircgzg2cpprindr7nnlbnrmandjy2kw49"; + sha256 = "1zrdih4rjsq30480sf200pw59r42p3nq2md56kj2l641kbc7ljka"; }; nativeBuildInputs = [ undmg ]; diff --git a/third_party/nixpkgs/pkgs/games/assaultcube/default.nix b/third_party/nixpkgs/pkgs/games/assaultcube/default.nix index a2c00ddc14..640ea81c6c 100644 --- a/third_party/nixpkgs/pkgs/games/assaultcube/default.nix +++ b/third_party/nixpkgs/pkgs/games/assaultcube/default.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://assault.cubers.net"; maintainers = [ ]; platforms = platforms.linux; # should work on darwin with a little effort. - license = lib.licenses.zlib; + license = lib.licenses.unfree; }; } diff --git a/third_party/nixpkgs/pkgs/games/cataclysm-dda/git.nix b/third_party/nixpkgs/pkgs/games/cataclysm-dda/git.nix index 9af90481ac..b07689c093 100644 --- a/third_party/nixpkgs/pkgs/games/cataclysm-dda/git.nix +++ b/third_party/nixpkgs/pkgs/games/cataclysm-dda/git.nix @@ -2,9 +2,9 @@ , tiles ? true, Cocoa , debug ? false , useXdgDir ? false -, version ? "2019-11-22" -, rev ? "a6c8ece992bffeae3788425dd4b3b5871e66a9cd" -, sha256 ? "0ww2q5gykxm802z1kffmnrfahjlx123j1gfszklpsv0b1fccm1ab" +, version ? "2020-12-09" +, rev ? "cb02195d9fb5ba71f35a105be4104c3d8883065c" +, sha256 ? "108cs6vp99qmqqfnmczad0xjgcl82bypm5xszwnlfcswdsrfs4da" }: let diff --git a/third_party/nixpkgs/pkgs/games/colobot/default.nix b/third_party/nixpkgs/pkgs/games/colobot/default.nix index 25b91d80f2..b26244ccc5 100644 --- a/third_party/nixpkgs/pkgs/games/colobot/default.nix +++ b/third_party/nixpkgs/pkgs/games/colobot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, SDL2, SDL2_image, SDL2_ttf, libpng +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, SDL2, SDL2_image, SDL2_ttf, libpng , glew, gettext, libsndfile, libvorbis, libogg, physfs, openal , xmlstarlet, doxygen, python3, callPackage }: @@ -18,6 +18,15 @@ stdenv.mkDerivation rec { sha256 = "0viq5s4zqs33an7rdmc3anf74ml7mwwcwf60alhvp9hj5jr547s2"; }; + patches = [ + # Fix issue with newer compilers, like used in nixpkgs + # https://github.com/colobot/colobot/pull/1291 + (fetchpatch { + url = "https://github.com/colobot/colobot/commit/fc2bd68876ac6302dbc8e91e8ffa33592db14b21.patch"; + sha256 = "sha256-PKe8jeyHpTT86tprSafQhNqTYBrSonz+r2fL1lVJdfo="; + }) + ]; + nativeBuildInputs = [ cmake xmlstarlet doxygen python3 ]; buildInputs = [ boost SDL2 SDL2_image SDL2_ttf libpng glew gettext libsndfile libvorbis libogg physfs openal ]; diff --git a/third_party/nixpkgs/pkgs/games/cutemaze/default.nix b/third_party/nixpkgs/pkgs/games/cutemaze/default.nix index 0cd16e433d..44c48af5c2 100644 --- a/third_party/nixpkgs/pkgs/games/cutemaze/default.nix +++ b/third_party/nixpkgs/pkgs/games/cutemaze/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "cutemaze"; - version = "1.2.6"; + version = "1.3.0"; src = fetchurl { url = "https://gottcode.org/cutemaze/${pname}-${version}-src.tar.bz2"; - sha256 = "0pw31j2i3ifndikhz9w684ia00r8zvcgnb66ign9w4lgs1zjgcrw"; + sha256 = "sha256-h7+H2E37ZVSnlPa6ID+lNEvFtU5PfdMSlBjqBumojoU="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/third_party/nixpkgs/pkgs/games/freeorion/default.nix b/third_party/nixpkgs/pkgs/games/freeorion/default.nix index de25fa691d..dea5190d97 100644 --- a/third_party/nixpkgs/pkgs/games/freeorion/default.nix +++ b/third_party/nixpkgs/pkgs/games/freeorion/default.nix @@ -1,39 +1,81 @@ -{ lib, stdenv, fetchFromGitHub, cmake, doxygen, graphviz, makeWrapper -, boost168, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff -, libjpeg, libGLU, libGL, glew, libxslt +{ lib +, stdenv +, fetchFromGitHub +, cmake +, doxygen +, graphviz +, makeWrapper +, cppcheck +, boost16x +, SDL2 +, python3 +, freetype +, openal +, libogg +, libvorbis +, zlib +, libpng +, libtiff +, libjpeg +, libGLU +, libGL +, glew +, libxslt }: stdenv.mkDerivation rec { - version = "0.4.9"; + version = "0.4.10.1"; pname = "freeorion"; src = fetchFromGitHub { - owner = "freeorion"; - repo = "freeorion"; + owner = "freeorion"; + repo = "freeorion"; rev = "v${version}"; - sha256 = "18xigx4qla225ybf7mc1w8zfm81nhcm1i5181n5l2fbndvslb1wf"; + sha256 = "sha256-Itt2JIStx+JsnMMBvbeJXSEJpaS/pd1UMvPGNd50k7I="; }; buildInputs = [ - (boost168.override { enablePython = true; }) - SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg libGLU libGL glew ]; + (boost16x.override { enablePython = true; python = python3; }) + (python3.withPackages (p: with p; [ pycodestyle ])) + SDL2 + freetype + glew + libGL + libGLU + libjpeg + libogg + libpng + libtiff + libvorbis + openal + zlib + ]; - nativeBuildInputs = [ cmake doxygen graphviz makeWrapper ]; + nativeBuildInputs = [ + cmake + cppcheck + doxygen + graphviz + makeWrapper + ]; + + # as of 0.4.10.1 FreeOrion doesn't work with "-DOpenGL_GL_PREFERENCE=GLVND" + cmakeFlags = [ "-DOpenGL_GL_PREFERENCE=LEGACY" ]; postInstall = '' - mkdir -p $out/fixpaths + mkdir -p $out/libexec # We need final slashes for XSLT replace to work properly - substitute ${./fix-paths.xslt} $out/fixpaths/fix-paths.xslt \ + substitute ${./fix-paths.xslt} $out/share/freeorion/fix-paths.xslt \ --subst-var-by nixStore "$NIX_STORE/" \ --subst-var-by out "$out/" - substitute ${./fix-paths.sh} $out/fixpaths/fix-paths \ + substitute ${./fix-paths.sh} $out/libexec/fix-paths \ --subst-var-by libxsltBin ${libxslt.bin} \ --subst-var-by shell ${stdenv.shell} \ --subst-var out - chmod +x $out/fixpaths/fix-paths + chmod +x $out/libexec/fix-paths wrapProgram $out/bin/freeorion \ - --run $out/fixpaths/fix-paths \ + --run $out/libexec/fix-paths \ --prefix LD_LIBRARY_PATH : $out/lib/freeorion ''; diff --git a/third_party/nixpkgs/pkgs/games/freeorion/fix-paths.sh b/third_party/nixpkgs/pkgs/games/freeorion/fix-paths.sh index 3f82533dd6..def017ddc5 100644 --- a/third_party/nixpkgs/pkgs/games/freeorion/fix-paths.sh +++ b/third_party/nixpkgs/pkgs/games/freeorion/fix-paths.sh @@ -1,6 +1,6 @@ #!@shell@ if [ -e ~/.config/freeorion/config.xml ]; then - @libxsltBin@/bin/xsltproc -o ~/.config/freeorion/config.xml @out@/fixpaths/fix-paths.xslt ~/.config/freeorion/config.xml + @libxsltBin@/bin/xsltproc -o ~/.config/freeorion/config.xml @out@/share/freeorion/fix-paths.xslt ~/.config/freeorion/config.xml fi exit 0 diff --git a/third_party/nixpkgs/pkgs/games/frotz/default.nix b/third_party/nixpkgs/pkgs/games/frotz/default.nix index 2e90176be7..9b5256fc1c 100644 --- a/third_party/nixpkgs/pkgs/games/frotz/default.nix +++ b/third_party/nixpkgs/pkgs/games/frotz/default.nix @@ -5,6 +5,8 @@ , libsndfile , libvorbis , ncurses +, which +, pkg-config , lib, stdenv }: stdenv.mkDerivation rec { @@ -19,6 +21,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-xVC/iE71W/Wdy5aPGH9DtcVAHWCcg3HkEA3iDV6OYUo="; }; + nativeBuildInputs = [ which pkg-config ]; buildInputs = [ libao libmodplug libsamplerate libsndfile libvorbis ncurses ]; preBuild = '' makeFlagsArray+=( diff --git a/third_party/nixpkgs/pkgs/games/gnuchess/default.nix b/third_party/nixpkgs/pkgs/games/gnuchess/default.nix index 69ec574a64..9f7d1684a5 100644 --- a/third_party/nixpkgs/pkgs/games/gnuchess/default.nix +++ b/third_party/nixpkgs/pkgs/games/gnuchess/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="gnuchess"; - version="6.2.7"; + version="6.2.8"; name="${baseName}-${version}"; url="mirror://gnu/chess/${name}.tar.gz"; - sha256="0ilq4bfl0lwyzf11q7n2skydjhalfn3bgxhrp5hjxs5bc5d6fdp5"; + sha256="0irqb0wl30c2i1rs8f6mm1c89l7l9nxxv7533lr408h1m36lc16m"; }; buildInputs = [ flex diff --git a/third_party/nixpkgs/pkgs/games/gscrabble/default.nix b/third_party/nixpkgs/pkgs/games/gscrabble/default.nix index 74411d63d3..f0e4121d8f 100644 --- a/third_party/nixpkgs/pkgs/games/gscrabble/default.nix +++ b/third_party/nixpkgs/pkgs/games/gscrabble/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonApplication, fetchFromGitHub , gtk3, wrapGAppsHook, gst_all_1, gobject-introspection -, python3Packages, gnome3 }: +, python3Packages, gnome }: buildPythonApplication { pname = "gscrabble"; @@ -19,7 +19,7 @@ buildPythonApplication { buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - gnome3.adwaita-icon-theme gtk3 gobject-introspection + gnome.adwaita-icon-theme gtk3 gobject-introspection ]; propagatedBuildInputs = with python3Packages; [ gst-python pygobject3 ]; diff --git a/third_party/nixpkgs/pkgs/games/gweled/default.nix b/third_party/nixpkgs/pkgs/games/gweled/default.nix index b15bb43a45..fc187afbe8 100644 --- a/third_party/nixpkgs/pkgs/games/gweled/default.nix +++ b/third_party/nixpkgs/pkgs/games/gweled/default.nix @@ -1,20 +1,24 @@ -{ lib, stdenv, fetchbzr, intltool +{ lib, stdenv, fetchbzr, gettext , gtk2, wrapGAppsHook, autoreconfHook, pkg-config , libmikmod, librsvg, libcanberra-gtk2, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "gweled"; - version = "unstable-2018-02-15"; + version = "unstable-2021-02-11"; src = fetchbzr { url = "lp:gweled"; - rev = "94"; - sha256 = "01c38y4df5a06wqbsmsn8ysxx7hav9yvw6zdwbc9m5m55z7vmdb8"; + rev = "108"; + sha256 = "sha256-rM4dgbYfSrVqZwi+xzKuEtmtjK3HVvqeutmni1vleLo="; }; doCheck = false; - nativeBuildInputs = [ wrapGAppsHook intltool autoreconfHook pkg-config ]; + postPatch = '' + substituteInPlace configure.ac --replace "AM_GNU_GETTEXT_VERSION([0.19.8])" "AM_GNU_GETTEXT_VERSION([${gettext.version}])" + ''; + + nativeBuildInputs = [ wrapGAppsHook gettext autoreconfHook pkg-config ]; buildInputs = [ gtk2 libmikmod librsvg hicolor-icon-theme libcanberra-gtk2 ]; diff --git a/third_party/nixpkgs/pkgs/games/hedgewars/default.nix b/third_party/nixpkgs/pkgs/games/hedgewars/default.nix index ea714d8bc7..9062af5be3 100644 --- a/third_party/nixpkgs/pkgs/games/hedgewars/default.nix +++ b/third_party/nixpkgs/pkgs/games/hedgewars/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_3, freeglut +{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs , qtbase, qttools @@ -29,7 +29,7 @@ mkDerivation rec { SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image fpc lua5_1 llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 - ffmpeg_3 freeglut physfs + ffmpeg freeglut physfs qtbase ] ++ lib.optional withServer ghc; @@ -102,6 +102,6 @@ mkDerivation rec { hedgehog or hedgehogs after a player's or CPU turn is shown only when all movement on the battlefield has ceased).''; maintainers = with maintainers; [ kragniz fpletz ]; - inherit (ghc.meta) platforms; + inherit (fpc.meta) platforms; }; } diff --git a/third_party/nixpkgs/pkgs/games/iortcw/sp.nix b/third_party/nixpkgs/pkgs/games/iortcw/sp.nix index fc1976b0fb..fa6f73a177 100644 --- a/third_party/nixpkgs/pkgs/games/iortcw/sp.nix +++ b/third_party/nixpkgs/pkgs/games/iortcw/sp.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { homepage = src.meta.homepage; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/megaglest/default.nix b/third_party/nixpkgs/pkgs/games/megaglest/default.nix index c97ea55882..5f79b86956 100644 --- a/third_party/nixpkgs/pkgs/games/megaglest/default.nix +++ b/third_party/nixpkgs/pkgs/games/megaglest/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, cmake, pkg-config, 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 +, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib , fetchFromGitHub }: let @@ -13,7 +13,7 @@ let }; path-env = buildEnv { name = "megaglest-path-env"; - paths = [ bash which gnome3.zenity ]; + paths = [ bash which gnome.zenity ]; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/games/minetest/default.nix b/third_party/nixpkgs/pkgs/games/minetest/default.nix index ddb415a6ad..7ffa361da5 100644 --- a/third_party/nixpkgs/pkgs/games/minetest/default.nix +++ b/third_party/nixpkgs/pkgs/games/minetest/default.nix @@ -76,9 +76,9 @@ let }; v5 = { - version = "5.3.0"; - sha256 = "03ga3j3cg38w4lg4d4qxasmnjdl8n3lbizidrinanvyfdyvznyh6"; - dataSha256 = "1liciwlh013z5h08ib0psjbwn5wkvlr937ir7kslfk4vly984cjx"; + version = "5.4.1"; + sha256 = "062ilb7s377q3hwfhl8q06vvcw2raydz5ljzlzwy2dmyzmdcndb8"; + dataSha256 = "0i45lbnikvgj9kxdp0yphpjjwjcgp4ibn49xkj78j5ic1s9n8jd4"; }; in { diff --git a/third_party/nixpkgs/pkgs/games/opendune/default.nix b/third_party/nixpkgs/pkgs/games/opendune/default.nix index e5ac89239a..0c9c71e38d 100644 --- a/third_party/nixpkgs/pkgs/games/opendune/default.nix +++ b/third_party/nixpkgs/pkgs/games/opendune/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { description = "Dune, Reinvented"; homepage = "https://github.com/OpenDUNE/OpenDUNE"; license = licenses.gpl2; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/openjk/default.nix b/third_party/nixpkgs/pkgs/games/openjk/default.nix index ecb2cd3c46..c16b38fc8f 100644 --- a/third_party/nixpkgs/pkgs/games/openjk/default.nix +++ b/third_party/nixpkgs/pkgs/games/openjk/default.nix @@ -58,6 +58,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/JACoders/OpenJK"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/openmw/default.nix b/third_party/nixpkgs/pkgs/games/openmw/default.nix index 3357bf15f8..8e6ed3cdb8 100644 --- a/third_party/nixpkgs/pkgs/games/openmw/default.nix +++ b/third_party/nixpkgs/pkgs/games/openmw/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg_3 -, boost, cmake, SDL2, unshield, openal, libXt, pkg-config }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkg-config +, openscenegraph +, mygui +, bullet +, ffmpeg +, boost +, SDL2 +, unshield +, openal +, libXt +}: let openscenegraph_ = openscenegraph.overrideDerivation (self: { @@ -11,9 +24,9 @@ let sha256 = "0d74hijzmj82nx3jkv5qmr3pkgvplra0b8fbjx1y3vmzxamb0axd"; }; }); -in -stdenv.mkDerivation rec { +in +mkDerivation rec { version = "0.46.0"; pname = "openmw"; @@ -25,10 +38,23 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost ffmpeg_3 bullet mygui openscenegraph_ SDL2 unshield openal libXt qtbase ]; + + buildInputs = [ + SDL2 + boost + bullet + ffmpeg + libXt + mygui + openal + openscenegraph_ + unshield + ]; cmakeFlags = [ "-DDESIRED_QT_VERSION:INT=5" + # as of 0.46, openmw is broken with GLVND + "-DOpenGL_GL_PREFERENCE=LEGACY" ]; dontWrapQtApps = true; @@ -37,7 +63,7 @@ stdenv.mkDerivation rec { description = "An unofficial open source engine reimplementation of the game Morrowind"; homepage = "http://openmw.org"; license = licenses.gpl3Plus; - platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/games/openmw/tes3mp.nix b/third_party/nixpkgs/pkgs/games/openmw/tes3mp.nix index 95659e5a08..72b698ceb7 100644 --- a/third_party/nixpkgs/pkgs/games/openmw/tes3mp.nix +++ b/third_party/nixpkgs/pkgs/games/openmw/tes3mp.nix @@ -1,96 +1,134 @@ -{ lib, stdenv, cmake, openmw, fetchFromGitHub, luajit, makeWrapper, mygui }: +{ lib +, stdenv +, cmake +, openmw +, fetchFromGitHub +, formats +, luajit +, makeWrapper +, symlinkJoin +, mygui +, crudini +}: # revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy let - # TES3MP_STABLE_VERSION_FILE - compatHash = "292536439eeda58becdb7e441fe2e61ebb74529e"; - rakNet = fetchFromGitHub { - owner = "TES3MP"; - repo = "CrabNet"; - # usually fixed: - # https://github.com/GrimKriegor/TES3MP-deploy/blob/d2a4a5d3acb64b16d9b8ca85906780aeea8d311b/tes3mp-deploy.sh#L589 - rev = "4eeeaad2f6c11aeb82070df35169694b4fb7b04b"; - sha256 = "0p0li9l1i5lcliswm5w9jql0zff9i6fwhiq0bl130m4i7vpr4cr3"; - }; - rakNetLibrary = stdenv.mkDerivation { - name = "RakNetLibrary"; - src = rakNet; - nativeBuildInputs = [ cmake ]; - installPhase = '' - install -Dm755 lib/libRakNetLibStatic.a $out/lib/libRakNetLibStatic.a - ''; - }; - coreScripts = fetchFromGitHub { - owner = "TES3MP"; - repo = "CoreScripts"; - # usually latest in stable branch (e.g. 0.7.0) - rev = "24aae91d9ddad38cdb3b0e0a13af59f142803e94"; - sha256 = "1rfmxxr9ircfagdpbdrzl26msdhx1i3g974cblbv69078cradfh3"; - }; - # https://github.com/TES3MP/openmw-tes3mp/issues/555 - mygui_ = mygui.overrideAttrs (oldAttrs: rec { - version = "3.2.2"; + # raknet could also be split into dev and lib outputs + raknet = stdenv.mkDerivation { + pname = "raknet"; + version = "unstable-2018-07-14"; src = fetchFromGitHub { - owner = "MyGUI"; - repo = "mygui"; - rev = "MyGUI${version}"; - sha256 = "1wk7jmwm55rhlqqcyvqsxdmwvl70bysl9azh4kd9n57qlmgk3zmw"; + owner = "TES3MP"; + repo = "CrabNet"; + # usually fixed: + # https://github.com/GrimKriegor/TES3MP-deploy/blob/d2a4a5d3acb64b16d9b8ca85906780aeea8d311b/tes3mp-deploy.sh#L589 + rev = "4eeeaad2f6c11aeb82070df35169694b4fb7b04b"; + sha256 = "0p0li9l1i5lcliswm5w9jql0zff9i6fwhiq0bl130m4i7vpr4cr3"; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + install -Dm555 lib/libRakNetLibStatic.a $out/lib/libRakNetLibStatic.a + ''; + }; + + coreScripts = stdenv.mkDerivation { + pname = "corescripts"; + version = "unstable-2020-07-27"; + + src = fetchFromGitHub { + owner = "TES3MP"; + repo = "CoreScripts"; + # usually latest in stable branch (e.g. 0.7.1) + rev = "3c2d31595344db586d8585db0ef1fc0da89898a0"; + sha256 = "sha256-m/pt2Et58HOMc1xqllGf4hjPLXNcc14+X0h84ouZDeg="; + }; + + buildCommand = '' + dir=$out/share/openmw-tes3mp + mkdir -p $dir + cp -r $src $dir/CoreScripts + ''; + }; + + # build an unwrapped version so we don't have to rebuild it all over again in + # case the scripts or wrapper scripts change. + unwrapped = openmw.overrideAttrs (oldAttrs: rec { + pname = "openmw-tes3mp-unwrapped"; + version = "unstable-2020-08-07"; + + src = fetchFromGitHub { + owner = "TES3MP"; + repo = "openmw-tes3mp"; + # usually latest in stable branch (e.g. 0.7.1) + rev = "ce5df6d18546e37aac9746d99c00d27a7f34b00d"; + sha256 = "sha256-xLslShNA6rVFl9kt6BNGDpSYMpO25jBTCteLJoSTXdg="; + }; + + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ]; + + buildInputs = oldAttrs.buildInputs ++ [ luajit ]; + + cmakeFlags = oldAttrs.cmakeFlags ++ [ + "-DBUILD_OPENCS=OFF" + "-DRakNet_INCLUDES=${raknet.src}/include" + "-DRakNet_LIBRARY_RELEASE=${raknet}/lib/libRakNetLibStatic.a" + "-DRakNet_LIBRARY_DEBUG=${raknet}/lib/libRakNetLibStatic.a" + ]; + + # https://github.com/TES3MP/openmw-tes3mp/issues/552 + patches = [ ./tes3mp.patch ]; + + NIX_CFLAGS_COMPILE = "-fpermissive"; + + preConfigure = '' + substituteInPlace files/version.in \ + --subst-var-by OPENMW_VERSION_COMMITHASH ${src.rev} + ''; + + # move everything that we wrap out of the way + postInstall = '' + mkdir -p $out/libexec + mv $out/bin/tes3mp-* $out/libexec + ''; + + meta = with lib; { + description = "Multiplayer for TES3:Morrowind based on OpenMW"; + homepage = "https://tes3mp.com/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ peterhoeg ]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; }); -in openmw.overrideAttrs (oldAttrs: rec { - version = "2019-11-19"; - name = "openmw-tes3mp-${version}"; - src = fetchFromGitHub { - owner = "TES3MP"; - repo = "openmw-tes3mp"; - # usually latest in stable branch (e.g. 0.7.0) - rev = "ad9ee80641a3e22d0780daca051df7f4e90f3615"; - sha256 = "03a1vldiv5lk7yq6lhicx3qz8hjfxhind2dj0w9lg5839ljyk6jv"; + cfgFile = (formats.ini { }).generate "tes3mp-server.cfg" { + Plugins.home = "${coreScripts}/share/openmw-tes3mp/CoreScripts"; }; - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ]; - buildInputs = [ luajit mygui_ ] ++ oldAttrs.buildInputs; +in +symlinkJoin rec { + name = "openmw-tes3mp-${unwrapped.version}"; + inherit (unwrapped) version meta; - cmakeFlags = oldAttrs.cmakeFlags ++ [ - "-DBUILD_OPENCS=OFF" - "-DRakNet_INCLUDES=${rakNet}/include" - "-DRakNet_LIBRARY_RELEASE=${rakNetLibrary}/lib/libRakNetLibStatic.a" - "-DRakNet_LIBRARY_DEBUG=${rakNetLibrary}/lib/libRakNetLibStatic.a" - ]; + nativeBuildInputs = [ makeWrapper ]; - dontWrapQtApps = true; + paths = [ unwrapped ]; - # https://github.com/TES3MP/openmw-tes3mp/issues/552 - patches = [ - ./tes3mp.patch - ]; - NIX_CFLAGS_COMPILE = "-fpermissive"; + # crudini --merge will create the file if it doesn't exist + postBuild = '' + mkdir -p $out/bin - preConfigure = '' - substituteInPlace files/version.in \ - --subst-var-by OPENMW_VERSION_COMMITHASH ${compatHash} - ''; + dir=\''${XDG_CONFIG_HOME:-\$HOME/.config}/openmw - postInstall = '' - # components/process/processinvoker.cpp: path.prepend(QLatin1String("./")) - wrapProgram $out/bin/tes3mp-browser \ + makeWrapper ${unwrapped}/libexec/tes3mp-browser $out/bin/tes3mp-browser \ --run "cd $out/bin" - wrapProgram $out/bin/tes3mp-server \ - --run "mkdir -p ~/.config/openmw" \ - --run "cd ~/.config/openmw" \ - --run "[ -d CoreScripts ] || cp --no-preserve=mode -r ${coreScripts} CoreScripts" \ - --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/CoreScripts\" > tes3mp-server.cfg" \ + + makeWrapper ${unwrapped}/libexec/tes3mp-server $out/bin/tes3mp-server \ + --run "mkdir -p $dir" \ + --run "${crudini}/bin/crudini --merge $dir/${cfgFile.name} < ${cfgFile}" \ --run "cd $out/bin" ''; - - meta = with lib; { - description = "Multiplayer for TES3:Morrowind based on OpenMW"; - homepage = "https://tes3mp.com/"; - license = licenses.gpl3; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ gnidorah ]; - }; -}) +} diff --git a/third_party/nixpkgs/pkgs/games/openra/default.nix b/third_party/nixpkgs/pkgs/games/openra/default.nix index 2e8533f781..22d3c6c879 100644 --- a/third_party/nixpkgs/pkgs/games/openra/default.nix +++ b/third_party/nixpkgs/pkgs/games/openra/default.nix @@ -25,7 +25,7 @@ let lua = pkgs.lua5_1; # It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure, # rather than having to look to the logs why it is not starting. - inherit (pkgs.gnome3) zenity; + inherit (pkgs.gnome) zenity; }); /* Building a set of engines or mods requires some dependencies as well, diff --git a/third_party/nixpkgs/pkgs/games/openra/packages.nix b/third_party/nixpkgs/pkgs/games/openra/packages.nix index c09b697771..2f4c83c7d5 100644 --- a/third_party/nixpkgs/pkgs/games/openra/packages.nix +++ b/third_party/nixpkgs/pkgs/games/openra/packages.nix @@ -15,7 +15,7 @@ let lua = pkgs.lua5_1; # It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure, # rather than having to look to the logs why it is not starting. - inherit (pkgs.gnome3) zenity; + inherit (pkgs.gnome) zenity; }); /* Building a set of engines or mods requires some dependencies as well, diff --git a/third_party/nixpkgs/pkgs/games/openttd/default.nix b/third_party/nixpkgs/pkgs/games/openttd/default.nix index 34de043a65..5c77e8a2c1 100644 --- a/third_party/nixpkgs/pkgs/games/openttd/default.nix +++ b/third_party/nixpkgs/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - sha256 = "sha256-qZGeLkKbsI+in+jme6m8dckOnvb6ZCSOs0IjoyXUAKM="; + sha256 = "sha256-D7qTWiqBX0/ozW3C4q4z9ydpU4cxIo+EimOzpulILm0="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/games/openxray/default.nix b/third_party/nixpkgs/pkgs/games/openxray/default.nix index 8fe47d31ca..58c82aec36 100644 --- a/third_party/nixpkgs/pkgs/games/openxray/default.nix +++ b/third_party/nixpkgs/pkgs/games/openxray/default.nix @@ -3,14 +3,14 @@ , pcre, makeWrapper, fetchpatch }: let - version = "784-october-preview"; + version = "822-december-preview"; src = fetchFromGitHub { owner = "OpenXRay"; repo = "xray-16"; rev = version; - sha256 = "0q0h70gbpscdvn45wpxicljj4ji3cd2maijd5b7jhr1695h61q5y"; fetchSubmodules = true; + sha256 = "06f3zjnib7hipyl3hnc6mwcj9f50kbwn522wzdjydz8qgdg60h3m"; }; # https://github.com/OpenXRay/xray-16/issues/518 @@ -20,7 +20,7 @@ let inherit src; - postUnpack = "sourceRoot+=/Externals/cryptopp"; + sourceRoot = "source/Externals/cryptopp"; makeFlags = [ "PREFIX=${placeholder "out"}" ]; enableParallelBuilding = true; @@ -35,25 +35,30 @@ let }; }; in stdenv.mkDerivation rec { - pname = "OpenXRay"; + pname = "openxray"; inherit version src; - hardeningDisable = [ "format" ]; - cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ]; - + # TODO https://github.com/OpenXRay/GameSpy/pull/6, check if merged in version > 822 + # Fixes format hardening patches = [ (fetchpatch { - url = "https://github.com/OpenXRay/xray-16/commit/4532cba11e98808c92e56e246188863261ef9201.patch"; - sha256 = "1hrm4rkkg946ai95krzpf3isryzbb2vips63gxf481plv4vlcfc9"; + url = "https://github.com/OpenXRay/GameSpy/pull/6/commits/155af876281f5d94f0142886693314d97deb2d4c.patch"; + sha256 = "1l0vcgvzzx8n56shpblpfdhvpr6c12fcqf35r0mflaiql8q7wn88"; + stripLen = 1; + extraPrefix = "Externals/GameSpy/"; }) ]; + cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ]; + buildInputs = [ glew freeimage liblockfile openal cryptopp libtheora SDL2 lzo libjpeg libogg tbb pcre ]; + nativeBuildInputs = [ cmake makeWrapper ]; + # https://github.com/OpenXRay/xray-16/issues/786 preConfigure = '' substituteInPlace src/xrCore/xrCore.cpp \ --replace /usr/share $out/share @@ -71,7 +76,7 @@ in stdenv.mkDerivation rec { license = licenses.unfree // { url = "https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt"; }; - maintainers = [ maintainers.gnidorah ]; + maintainers = with maintainers; [ OPNA2608 ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index 7dd9235b69..827eb89eba 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.502.0"; + version = "2021.515.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "IOneihYQry0pRXYaxZuVLIj2Ydei//khvpqwiJoakZ8="; + sha256 = "c2+Ybb9wMb9FSTxprJPLKGEv2q6y0jcMA4kEN2r7yyA="; }; 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 9c839ec376..170a0497ad 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -26,8 +26,8 @@ }) (fetchNuGet { name = "Humanizer"; - version = "2.9.9"; - sha256 = "07ql79qz4m7cdr6g0f0dxjywrv70xzpzz45gch73x1ad4vwc5n4m"; + version = "2.8.26"; + sha256 = "11kddzyzqpq9gkz0hmrblq494nh86va6wxx6z89xi6w1f4vj15ak"; }) (fetchNuGet { name = "Humanizer.Core"; @@ -36,243 +36,228 @@ }) (fetchNuGet { name = "Humanizer.Core"; - version = "2.9.9"; - sha256 = "05sn5l0qg5bi8qxqxlch88zlk79z9pbh6jwln7b3yxnp4hkj4kvm"; + version = "2.8.26"; + sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; }) (fetchNuGet { name = "Humanizer.Core.af"; - version = "2.9.9"; - sha256 = "0l51ll73gjjarpyknj81v8f64mg0f0zlc7q3sgcz4fkmj6n0wxb3"; + version = "2.8.26"; + sha256 = "0znrq4frlkq1qi20301hlzxa6mdc275fa1i1a1i8ldgk9cjq94k9"; }) (fetchNuGet { name = "Humanizer.Core.ar"; - version = "2.9.9"; - sha256 = "1akrcrxl01phzp1cyhknwcmghhmr808dzv9aj8vzjmyq67p8mnja"; + version = "2.8.26"; + sha256 = "1hi7mln48p1nmxlgdq725s4cvla9nlkvbmrsql1rfjjlsy8hn6n7"; }) (fetchNuGet { name = "Humanizer.Core.az"; - version = "2.9.9"; - sha256 = "0jsxjvhmgwngx5b1yki5g6ns7yhzn3m5invzlnl79dh09krx9pg4"; + version = "2.8.26"; + sha256 = "0av7ycrqwvmikqia3z3qkp9967zilrhayny17zkm0d0mnjq62vs6"; }) (fetchNuGet { name = "Humanizer.Core.bg"; - version = "2.9.9"; - sha256 = "0l32vi52qkvx267qnykid5965199h6rcy5r04gmkv3lg2ydds0ig"; + version = "2.8.26"; + sha256 = "13j6zk2cmk7a119azxlpjhfwykrzk0vkf5a799fb2fzkvhnj4hkg"; }) (fetchNuGet { name = "Humanizer.Core.bn-BD"; - version = "2.9.9"; - sha256 = "1yivbxcxh15jgy8j5fzrd40c9k75wmcd9wdy1333zwcyrwqzpx7v"; + version = "2.8.26"; + sha256 = "0h619sksggfi7dnaycz6bj9aiqdgn0d8dpgjgdl73crw52lr70p9"; }) (fetchNuGet { name = "Humanizer.Core.cs"; - version = "2.9.9"; - sha256 = "05ysribnj8b2q2fcm33lcgz7mcdgx5q53w6vihyjc5s6zmlfqqfr"; + version = "2.8.26"; + sha256 = "11bh3k15388bi5wizaihnwqk7wb4n7q636fqjllwdhjggqrsc3f6"; }) (fetchNuGet { name = "Humanizer.Core.da"; - version = "2.9.9"; - sha256 = "0d6swwliw0cbb03vjv2i1n8vcclwzragi1ik3m6ysbwm1m0sip5v"; + version = "2.8.26"; + sha256 = "09b3x3bw3cgby9qvaccnqz2y6d8gl3497dh7q0dk1iznsxbk4x4m"; }) (fetchNuGet { name = "Humanizer.Core.de"; - version = "2.9.9"; - sha256 = "085ijfkbz4q6q90z0qc4k5hsv2acdlhli8whiikil9mlrjsjrqhi"; + version = "2.8.26"; + sha256 = "1pyp2a9my20wlwjjzv563kshl9fpjb2kd4cw41l4wvsz1bsq3l22"; }) (fetchNuGet { name = "Humanizer.Core.el"; - version = "2.9.9"; - sha256 = "1f5fr6l8f4brva1jxx6migv9yhp98svwkzly1b2b6n43ngppn4jd"; + version = "2.8.26"; + sha256 = "0v3sdcxca4dam1y5yjh9n6v711ys0zdv38hr4kij35s6277ls6lb"; }) (fetchNuGet { name = "Humanizer.Core.es"; - version = "2.9.9"; - sha256 = "0nwwxhp2wgq424fy2mjrgsjsm86y818zl64k6zibkcnfldm8als6"; + version = "2.8.26"; + sha256 = "0wh9qvqf80cngwsz2jnrsjpmaax4xa2xp8bbk5xs480kp071z37q"; }) (fetchNuGet { name = "Humanizer.Core.fa"; - version = "2.9.9"; - sha256 = "1268lf9lxxnnax0ivyghh707fy50z09qds2jlh53dw1q0lxqgp50"; + version = "2.8.26"; + sha256 = "00v56ddjfv6sr6w5246gn5z0padwswvnngp8mdl7gjfg5ycmbkl1"; }) (fetchNuGet { name = "Humanizer.Core.fi-FI"; - version = "2.9.9"; - sha256 = "1cjs78z1lc7a42b1wvcpxpydyv65rvyfvfic8k0d2flwcv98i7z2"; + version = "2.8.26"; + sha256 = "1pgs0j5ri50a6vhljplhrlc8jj1hrd9ggxkj60d9v5kk9xibzzyd"; }) (fetchNuGet { name = "Humanizer.Core.fr"; - version = "2.9.9"; - sha256 = "1al0xbg6p0287v60a4s6k7vgsng6k4m0scwlshmqsqxmvfsa1wk3"; + version = "2.8.26"; + sha256 = "0kkhgy3yn8vfqlx3dhb9m3cazkgfxarknam4macng9y17l7wj83m"; }) (fetchNuGet { name = "Humanizer.Core.fr-BE"; - version = "2.9.9"; - sha256 = "0jvi063lsrzds52zvq4w4qx6khkjcn5k8mp4014pzlphfhvlfbcl"; + version = "2.8.26"; + sha256 = "13spcx07hph366qk073pz63s56nadaac7l4mr4a66gbpqd3814kb"; }) (fetchNuGet { name = "Humanizer.Core.he"; - version = "2.9.9"; - sha256 = "1azymmsf79dyl8ihx8kn19mymx98sjknaqrqf043fy8qwirll1wm"; + version = "2.8.26"; + sha256 = "1ccn82aj3rhrhsa3kvkrmjw0p687icxlfja8ngbh7sby4cszx9bk"; }) (fetchNuGet { name = "Humanizer.Core.hr"; - version = "2.9.9"; - sha256 = "1ygi02nxssn1wrdzammr5km7ak5h8yxghfvbcmy559npg0gy2gya"; + version = "2.8.26"; + sha256 = "12ii79bhai3kv7zr3k9k9dh569r6p3m4l4gj25cln2isr4wdi5r9"; }) (fetchNuGet { name = "Humanizer.Core.hu"; - version = "2.9.9"; - sha256 = "0nimza5dngvl6yyigavr1rk5068yf2fmq3w3nm128plbnc8ynxfr"; + version = "2.8.26"; + sha256 = "0cibbdxiqhwrjmxlr805mg3l9v0fl2ydx4m50608rkysjq6vxx7y"; }) (fetchNuGet { name = "Humanizer.Core.hy"; - version = "2.9.9"; - sha256 = "0v11hfh39mzm27dshmakhdnbpgzg660mskn1pkmmfdprka970cfj"; + version = "2.8.26"; + sha256 = "15aikm04f74abm4ak8rvnnkrlcz155gibn1y81pbgsyn7yrh84v3"; }) (fetchNuGet { name = "Humanizer.Core.id"; - version = "2.9.9"; - sha256 = "012bhisp75s4wv37ra692bfsvibnqgbfyipb2hw0743dqcy2mah2"; + version = "2.8.26"; + sha256 = "1i9gpzdfhmbvrqg858kqz5461sp3sh60g16dmcmyi1ik0qlspijn"; }) (fetchNuGet { name = "Humanizer.Core.it"; - version = "2.9.9"; - sha256 = "1jj7qbia4b09hsyll524mpz67vy4z25zazwc1g10yi1sjsyah92f"; + version = "2.8.26"; + sha256 = "01j7qskmqcxsakbx3bkxcjyzrh6nxi2v6kfzsfb0vf980qqq331l"; }) (fetchNuGet { name = "Humanizer.Core.ja"; - version = "2.9.9"; - sha256 = "1wqxw815287jlg6a6x3ffjhxvpa5al94jh3qkai2rw5kggcqzws4"; - }) - (fetchNuGet { - name = "Humanizer.Core.ko-KR"; - version = "2.9.9"; - sha256 = "1azggn1i8gnvc89kh7mv165bd2c7fwp1m1h9k6fcdk36kl4xxb97"; - }) - (fetchNuGet { - name = "Humanizer.Core.ku"; - version = "2.9.9"; - sha256 = "1qpwancwa6hgafrcdpbdb00vq08hrk77wjl64dvcjsx010n4c0fc"; + version = "2.8.26"; + sha256 = "07d19ns4a4pa2k4vdc1af7wj10gaflq1ny4mx6y574afkdi8v6d5"; }) (fetchNuGet { name = "Humanizer.Core.lv"; - version = "2.9.9"; - sha256 = "1k6gxlzkpfmp8khn0dl0bfw878qpdff6zjqbirgpvlc57d00bws4"; + version = "2.8.26"; + sha256 = "1pm64sj65nmngyfa3hjcw67icfmlzr232hmgpnw7306sb7dxmnfv"; }) (fetchNuGet { name = "Humanizer.Core.ms-MY"; - version = "2.9.9"; - sha256 = "0p0lc3qkq5f8354g77xgy8qc9wyc509rca8xrzgc2lpzbvb4v008"; + version = "2.8.26"; + sha256 = "1yx4cc023kc4k14abk2ycmjy6y2xaknaz4zria7xsadf0fabd1jc"; }) (fetchNuGet { name = "Humanizer.Core.mt"; - version = "2.9.9"; - sha256 = "0qn2c583lbc5qg0i1inqjb7zn8vcmvmjy8k70ngb6qyl1navmvcm"; + version = "2.8.26"; + sha256 = "0iai35pzka9g6c3sgswki06fk6gdnq8kc88wyb4pcciivazz31px"; }) (fetchNuGet { name = "Humanizer.Core.nb"; - version = "2.9.9"; - sha256 = "12b7dx6jp5fcwsn54i7w1qz8y3cwbl8n8hia75iy9acd9l328shk"; + version = "2.8.26"; + sha256 = "0xprhiyjyq6mpha2lrav59n1f48508ddvm9nmdk5sm5k26ff3l90"; }) (fetchNuGet { name = "Humanizer.Core.nb-NO"; - version = "2.9.9"; - sha256 = "04f47z9klpj6dq1gqlbcgyrli2s3rjci75i8lrng63vjjqi7jpqh"; + version = "2.8.26"; + sha256 = "160c98wfh7d2xlvlra4x5rdj4klgcjwcy3gkb4ipg655byn2m1j2"; }) (fetchNuGet { name = "Humanizer.Core.nl"; - version = "2.9.9"; - sha256 = "19l4ik73500k2nxpcpylawy1aimb0awd82521abry3az4kc1lf29"; + version = "2.8.26"; + sha256 = "067pqm4i1mk83fqqr0bvzrchrvxwdnff18z3djgagclh1i4xqlvk"; }) (fetchNuGet { name = "Humanizer.Core.pl"; - version = "2.9.9"; - sha256 = "0hdh6gvz00xbrfyypwlbaw14409p75wqxraih2ckw23g8ci404l3"; + version = "2.8.26"; + sha256 = "1r1bbqb990war1hiag5f88yxw0k9jiid1ihb4s5bc1lzs3vfsb6x"; }) (fetchNuGet { name = "Humanizer.Core.pt"; - version = "2.9.9"; - sha256 = "03xplyqms9hpkl2bzhnqij3il78adi8a4azrs658rslpl8fl7ksd"; + version = "2.8.26"; + sha256 = "1bik0vjjdzw51yl11ng9gsi3ihz50ibwh1gdhh2vd13jxjzb512p"; }) (fetchNuGet { name = "Humanizer.Core.ro"; - version = "2.9.9"; - sha256 = "0x8qjkp8w32bhwr6509zpxlkvxb9izkgzq411hmh2sx4hrr90pzc"; + version = "2.8.26"; + sha256 = "12f2hry6x1p1mgx6g4kpig2jpybx52ibghvhdhjbbfhy32gv8dr0"; }) (fetchNuGet { name = "Humanizer.Core.ru"; - version = "2.9.9"; - sha256 = "0s2f9wxqwy281zw7aiswvfk8dg0i278g4z2l3bqn9iyijqm47zxx"; + version = "2.8.26"; + sha256 = "1hri12kwymzvdqcr66l8yiqiw3pmf9fk492z10yqljm576kyshgg"; }) (fetchNuGet { name = "Humanizer.Core.sk"; - version = "2.9.9"; - sha256 = "0nq27nx6xq81d5avriphm7s926xm34306v7l7c88n71kn097jzl9"; + version = "2.8.26"; + sha256 = "07jfgk67axw97b85dn4bwpjwf3swd74j9hdd870qps12xfp98i9j"; }) (fetchNuGet { name = "Humanizer.Core.sl"; - version = "2.9.9"; - sha256 = "0dwszkm2xd4ysh3rrjx1zran09hl532hjrppfckqyy6n65b4axyf"; + version = "2.8.26"; + sha256 = "060xbzwb7p9ypbqfklih2zal2rh6h55gq4hv3i6alvlbd3vsx29n"; }) (fetchNuGet { name = "Humanizer.Core.sr"; - version = "2.9.9"; - sha256 = "1vmfs9jp8ljlh6965pmb4afbcc9c4zlg5dn1pgbjc4miiwj6vc73"; + version = "2.8.26"; + sha256 = "0i2c24qmqnhp85b088qlbagxd48hcl0v1ly4m7hfbvx5s7fg8riv"; }) (fetchNuGet { name = "Humanizer.Core.sr-Latn"; - version = "2.9.9"; - sha256 = "1dakb2zcaxmm9qw8fnsz5z12mmbjgx7jm9plxbm7jidjn7z271yl"; + version = "2.8.26"; + sha256 = "1911a69sqssh9f007vmxbgyj4ym2ym4423xvw6cmbfhjcrhkfpbi"; }) (fetchNuGet { name = "Humanizer.Core.sv"; - version = "2.9.9"; - sha256 = "0jys46lz25yxx70w7y2623iabv3clf3lix8jzl8r68rj0lw6pxdz"; - }) - (fetchNuGet { - name = "Humanizer.Core.th-TH"; - version = "2.9.9"; - sha256 = "0r37ckvh68xvlyszgx94a8xxmya5cqiqnvdg5syw04lj0rshc3jb"; + version = "2.8.26"; + sha256 = "056h8n9i18yl78f9ppzn2kkrz2cs46aqv0j5y8xq360zarggh0nm"; }) (fetchNuGet { name = "Humanizer.Core.tr"; - version = "2.9.9"; - sha256 = "1dnba6wbf6r5a1gmf7a7136qhy1w8izbh6wimmmwqsch2sk4ng4f"; + version = "2.8.26"; + sha256 = "0dk8ga3fpxifxxkz0n68654h65cvrx00hy7q00m5vgvmcp70gxxn"; }) (fetchNuGet { name = "Humanizer.Core.uk"; - version = "2.9.9"; - sha256 = "1z0kdp2qkiyb4dhy22rqfik2b2c899nzkfh10907gp9827rdz3b9"; + version = "2.8.26"; + sha256 = "0bnj5xqlcqp4n8i04ra78dax4854zbf2jsygvb4lpiayyyaj2bxw"; }) (fetchNuGet { name = "Humanizer.Core.uz-Cyrl-UZ"; - version = "2.9.9"; - sha256 = "1rnqa7w8s44fnqpw4g2drcwyajd5zhmwkqipi5zfhh0bcdnj9hxx"; + version = "2.8.26"; + sha256 = "1bbf6mxas6brjw7rjljq5saz6v3ic6zbvm1b3c1jbk0hc0qkd7c8"; }) (fetchNuGet { name = "Humanizer.Core.uz-Latn-UZ"; - version = "2.9.9"; - sha256 = "1i1c6dy4bdglgyhv8g13lwqlis1snl7zcpdrvidw40f74ch0zq0g"; + version = "2.8.26"; + sha256 = "1bfgfihpynax30g9kq8kra7c4jxps2ccxsxrs9gls47xbs35cw2f"; }) (fetchNuGet { name = "Humanizer.Core.vi"; - version = "2.9.9"; - sha256 = "0ji0lmcm073x9fyigrw3b500drz268jarv6vfxpwxbzxd3mvnrys"; + version = "2.8.26"; + sha256 = "1vm765nvkp6wyfwlcgppimjrk04lkg8lscch3n1i1i5hlqxrs9ch"; }) (fetchNuGet { name = "Humanizer.Core.zh-CN"; - version = "2.9.9"; - sha256 = "10iyrahi7rdp8lq4rxb2k9pny7da2aw9xfy2la8jdjrjgmqwffsi"; + version = "2.8.26"; + sha256 = "1qyl12rdh4iv1k1qcivcmxxnh8y93ainf22pmch8vvw9yjhs1y7s"; }) (fetchNuGet { name = "Humanizer.Core.zh-Hans"; - version = "2.9.9"; - sha256 = "0f92fvzgcifaf2b64x8v52xckp1qxg88djlb9vlj083f6x29ick5"; + version = "2.8.26"; + sha256 = "1gqv3dyk236wlp5wb7kd4qnyrmp3cy36ycykl7zr91s25cdls5vy"; }) (fetchNuGet { name = "Humanizer.Core.zh-Hant"; - version = "2.9.9"; - sha256 = "0v9vqn6h467q7fy3xwabnqw48p48ilwkfg62b65j0q76ppnvsnvj"; + version = "2.8.26"; + sha256 = "1rhzbiqbx04l3kvzjklix90fxyc6vvmmw0p564ajdiximivs0pbh"; }) (fetchNuGet { name = "JetBrains.Annotations"; @@ -446,8 +431,8 @@ }) (fetchNuGet { name = "Microsoft.Diagnostics.Runtime"; - version = "2.0.217201"; - sha256 = "1r519zbbq13f76kc657wml735h9lcijkyxw6r96akn7cv9vgiwl6"; + version = "2.0.222201"; + sha256 = "1vsa6xbqi4f2mx85rjmq641r9zgssj0bbfcsqlsa5nx6lqh2rf2q"; }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; @@ -686,48 +671,48 @@ }) (fetchNuGet { name = "NuGet.Common"; - version = "5.9.0"; - sha256 = "1j0kk8rgssw920r7h8zfqwzsgvh3y5lalz19d5r07l9r9ngcj5w9"; + version = "5.9.1"; + sha256 = "0d919d15r6fzixfxz56xnayfbw9lfvpr99k7k2wlyh228l58xlng"; }) (fetchNuGet { name = "NuGet.Configuration"; - version = "5.9.0"; - sha256 = "16wqjflqvhgq5nqa7ips63hv6wd39171q337gk5wkr9ffpwarrx9"; + version = "5.9.1"; + sha256 = "13v3jmirwil1w74wwsspm31rzppb7fbnh99sfig6hrqxhxyzhgnc"; }) (fetchNuGet { name = "NuGet.DependencyResolver.Core"; - version = "5.9.0"; - sha256 = "1f1rcvl86qvix3hibm7xm5wzvwah5pc4ik9mnrgavnwixwkix9nz"; + version = "5.9.1"; + sha256 = "0bdmz886bmdgndy7101mq08idzwp8y73hf4l9az3jdndd6cia1ic"; }) (fetchNuGet { name = "NuGet.Frameworks"; - version = "5.9.0"; - sha256 = "099kb0mvglhfv5b0r1ddnkl6mm8l2x5kpmm1kqs5qkchk0a1y0ci"; + version = "5.9.1"; + sha256 = "12fjigazzlmh63479hralrfgdcqxq6qsdr57b9zj0ipwqj0s6l3i"; }) (fetchNuGet { name = "NuGet.LibraryModel"; - version = "5.9.0"; - sha256 = "1m6ym5dld0drpk7lm0i0ss30292rpk80b701n1nakqykfnkfhhfy"; + version = "5.9.1"; + sha256 = "1z1m6ik1sxsr129578dy22wspci4xavwjza0f08nm1vbb4v3y4va"; }) (fetchNuGet { name = "NuGet.Packaging"; - version = "5.9.0"; - sha256 = "0m0sn823v0lb4h2maxcndvj2k1a0iwwl1yndbhna2ir2lq2fi4px"; + version = "5.9.1"; + sha256 = "0yknzgwmpkcddba3b2d1kq9yizxxdd08xcxv508brr2079g01q6d"; }) (fetchNuGet { name = "NuGet.ProjectModel"; - version = "5.9.0"; - sha256 = "06qdfhxz5bsq2wx7i9dkc2rsr4bkk02mpyq27v6zrz36vyrckwx3"; + version = "5.9.1"; + sha256 = "0g3gxh0g6lcaczk9jczzkpmikxhdivfflpqw40jygs64r5837rbv"; }) (fetchNuGet { name = "NuGet.Protocol"; - version = "5.9.0"; - sha256 = "1nvfg1xxpjqbpdmw1xa6m7sbdp19ld442vqh3x4967z6c92wvc4n"; + version = "5.9.1"; + sha256 = "1wz7rv262wb42s1y866w9bcvpl22dr4s915dsky8sbc69y5646wn"; }) (fetchNuGet { name = "NuGet.Versioning"; - version = "5.9.0"; - sha256 = "1rby89nx39l533vhk0ikf16dd1d6kjjn4ld8b0y88g2mlnrdgz4m"; + version = "5.9.1"; + sha256 = "0vpswa6gz36z2vqwvbylmh7r9hjhlib91vbvkf0icjfkhzijjq08"; }) (fetchNuGet { name = "NUnit"; @@ -746,8 +731,8 @@ }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2021.427.0"; - sha256 = "18n9g21y7asgr51fskfk3m0sx07y1mwrsdq4s065i8yk8d412mh7"; + version = "2021.513.0"; + sha256 = "17cqmgfd40jbdkm5rq9wl1rcvv870yqryc29k4c8bdsvxxf4arv2"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -766,8 +751,8 @@ }) (fetchNuGet { name = "ppy.SDL2-CS"; - version = "1.0.225-alpha"; - sha256 = "1x8hvk9kikwi7wrvwxdxk3pkbs491iss2mvqgiw844zld5izihqc"; + version = "1.0.238-alpha"; + sha256 = "1n7pa7gy1hcgsfm3jix334qr6v229n1yymq58njj802l3k5g7980"; }) (fetchNuGet { name = "ppy.squirrel.windows"; diff --git a/third_party/nixpkgs/pkgs/games/privateer/0001-fix-VSFile-constructor.patch b/third_party/nixpkgs/pkgs/games/privateer/0001-fix-VSFile-constructor.patch deleted file mode 100644 index 05b02fe5d7..0000000000 --- a/third_party/nixpkgs/pkgs/games/privateer/0001-fix-VSFile-constructor.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e779a2b8d53e7e4721ce5ddb8e8b1caa753b66dd Mon Sep 17 00:00:00 2001 -From: Florian Friesdorf -Date: Wed, 4 Jan 2012 23:32:19 +0100 -Subject: [PATCH] fix VSFile constructor - ---- - src/vsfilesystem.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/vsfilesystem.h b/src/vsfilesystem.h -index 4bb7a66..71bf9b9 100644 ---- a/src/vsfilesystem.h -+++ b/src/vsfilesystem.h -@@ -291,7 +291,7 @@ namespace VSFileSystem - VSFile(); - VSFile( const char * buffer, long size, VSFileType type=ZoneBuffer, VSFileMode=ReadOnly); - VSFile( const char * filename, VSFileType type=UnknownFile, VSFileMode=ReadOnly); -- VSFile( const string &filename, VSFileType type=UnknownFile) { VSFile::VSFile( filename.c_str(), type); } -+ VSFile( const string &filename, VSFileType type=UnknownFile) { VSFile( filename.c_str(), type); } - ~VSFile(); - - FILE * GetFP() { return this->fp; } // This is still needed for special cases (when loading PNG files) --- -1.7.8 - diff --git a/third_party/nixpkgs/pkgs/games/privateer/default.nix b/third_party/nixpkgs/pkgs/games/privateer/default.nix deleted file mode 100644 index f3ea6dc8cb..0000000000 --- a/third_party/nixpkgs/pkgs/games/privateer/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchsvn, boost, cmake, ffmpeg_3, freeglut, glib, - gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, - libXmu, libGLU, libGL, openal, pixman, pkg-config, python27, SDL }: - -stdenv.mkDerivation { - name = "privateer-1.03"; - - src = fetchsvn { - #url = "mirror://sourceforge/project/privateer/Wing%20Commander%20Privateer/Privateer%20Gemini%20Gold%201.03/PrivateerGold1.03.bz2.bin"; - url = "https://privateer.svn.sourceforge.net/svnroot/privateer/privgold/trunk/engine"; - rev = "294"; - sha256 = "e1759087d4565d3fc95e5c87d0f6ddf36b2cd5befec5695ec56ed5f3cd144c63"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = - [ boost ffmpeg_3 freeglut glib gtk2 libjpeg libpng - libpthreadstubs libvorbis libXau libXdmcp libXmu libGLU libGL openal - pixman python27 SDL ]; - - patches = [ ./0001-fix-VSFile-constructor.patch ]; - - preConfigure = '' - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0)" - ''; - - installPhase = '' - mkdir -p $out/bin - cp vegastrike $out/bin - cp vegaserver $out/bin - ''; - - meta = with lib; { - homepage = "http://privateer.sourceforge.net/"; - description = "Adventure space flight simulation computer game"; - license = licenses.gpl2Plus; # and a special license for art data - # https://sourceforge.net/p/privateer/code/HEAD/tree/privgold/trunk/data/art-license.txt - - maintainers = with maintainers; [ ]; - platforms = with platforms; linux ++ darwin; - hydraPlatforms = []; - broken = true; # it won't build - }; -} diff --git a/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix b/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix index 3565ce10ba..0d0b03f514 100644 --- a/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix +++ b/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/r2mod_cli/default.nix b/third_party/nixpkgs/pkgs/games/r2mod_cli/default.nix index 6a7d12eadb..169385576a 100644 --- a/third_party/nixpkgs/pkgs/games/r2mod_cli/default.nix +++ b/third_party/nixpkgs/pkgs/games/r2mod_cli/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "r2mod_cli"; - version = "1.0.7"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Foldex"; repo = "r2mod_cli"; rev = "v${version}"; - sha256 = "13n2y9gsgb8hnr64y083x9c90j3b4awcmdn81mqmwcydpby3q848"; + sha256 = "sha256-VNqdVDBR6+eNOeUthPXLfz+0VoaNfSj4f04HLvjg6/0="; }; buildInputs = [ bashInteractive ]; diff --git a/third_party/nixpkgs/pkgs/games/steam-tui/default.nix b/third_party/nixpkgs/pkgs/games/steam-tui/default.nix new file mode 100644 index 0000000000..968f529421 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/steam-tui/default.nix @@ -0,0 +1,45 @@ +{ lib +, rustPlatform +, steamcmd +, fetchFromGitHub +, steam-run-native +, runtimeShell +, withWine ? false +, wine +}: + +rustPlatform.buildRustPackage rec { + pname = "steam-tui"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "dmadisetti"; + repo = pname; + rev = version; + sha256 = "sha256-UTXYlPecv0MVonr9zZwfwopfC/Fdch/ZSCxqgUsem40="; + }; + + cargoSha256 = "sha256-VYBzwDLSV4N4qt2dNgIS399T2HIbPTdQ2rDIeheLlfo="; + + buildInputs = [ steamcmd steam-run-native ] + ++ lib.optional withWine wine; + + preFixup = '' + mv $out/bin/steam-tui $out/bin/.steam-tui-unwrapped + cat > $out/bin/steam-tui <Append(ID_MNU_ABOUT_1003_Mnu_Obj, wxT("About")); + SetMenuBar(WxMenuBar1); + +- WxCheckBox11 = new wxCheckBox(this, ID_WXCHECKBOX11, wxT("yellow"), wxPoint(152, 208), wxSize(49, 17), 0, wxDefaultValidator, wxT("WxCheckBox11")); ++ WxCheckBox11 = new wxCheckBox(this, ID_WXCHECKBOX11, wxT("yellow"), wxPoint(@scalingFactor@*152,@scalingFactor@*208), wxSize(@scalingFactor@*49,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxCheckBox11")); + +- WxCheckBox10 = new wxCheckBox(this, ID_WXCHECKBOX10, wxT("green"), wxPoint(104, 208), wxSize(49, 17), 0, wxDefaultValidator, wxT("WxCheckBox10")); ++ WxCheckBox10 = new wxCheckBox(this, ID_WXCHECKBOX10, wxT("green"), wxPoint(@scalingFactor@*104,@scalingFactor@*208), wxSize(@scalingFactor@*49,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxCheckBox10")); + +- WxCheckBox9 = new wxCheckBox(this, ID_WXCHECKBOX9, wxT("blue"), wxPoint(56, 208), wxSize(41, 17), 0, wxDefaultValidator, wxT("WxCheckBox9")); ++ WxCheckBox9 = new wxCheckBox(this, ID_WXCHECKBOX9, wxT("blue"), wxPoint(@scalingFactor@*56,@scalingFactor@*208), wxSize(@scalingFactor@*41,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxCheckBox9")); + +- WxCheckBox8 = new wxCheckBox(this, ID_WXCHECKBOX8, wxT("red"), wxPoint(8, 208), wxSize(41, 17), 0, wxDefaultValidator, wxT("WxCheckBox8")); ++ WxCheckBox8 = new wxCheckBox(this, ID_WXCHECKBOX8, wxT("red"), wxPoint(@scalingFactor@*8,@scalingFactor@*208), wxSize(@scalingFactor@*41,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxCheckBox8")); + +- WxStaticBox5 = new wxStaticBox(this, ID_WXSTATICBOX5, wxT("AI Players"), wxPoint(0, 192), wxSize(265, 49)); ++ WxStaticBox5 = new wxStaticBox(this, ID_WXSTATICBOX5, wxT("AI Players"), wxPoint(@scalingFactor@*0,@scalingFactor@*192), wxSize(@scalingFactor@*265,@scalingFactor@*49)); + +- WxCheckBox7 = new wxCheckBox(this, ID_WXCHECKBOX7, wxT("No Music"), wxPoint(376, 192), wxSize(65, 17), 0, wxDefaultValidator, wxT("WxCheckBox7")); ++ WxCheckBox7 = new wxCheckBox(this, ID_WXCHECKBOX7, wxT("No Music"), wxPoint(@scalingFactor@*376,@scalingFactor@*192), wxSize(@scalingFactor@*65,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxCheckBox7")); + +- WxCheckBox6 = new wxCheckBox(this, ID_WXCHECKBOX6, wxT("No OpenGL"), wxPoint(280, 208), wxSize(81, 17), 0, wxDefaultValidator, wxT("WxCheckBox6")); ++ WxCheckBox6 = new wxCheckBox(this, ID_WXCHECKBOX6, wxT("No OpenGL"), wxPoint(@scalingFactor@*280,@scalingFactor@*208), wxSize(@scalingFactor@*81,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxCheckBox6")); + +- WxEdit7 = new wxTextCtrl(this, ID_WXEDIT7, wxT(""), wxPoint(112, 160), wxSize(145, 17), 0, wxDefaultValidator, wxT("WxEdit7")); ++ WxEdit7 = new wxTextCtrl(this, ID_WXEDIT7, wxT(""), wxPoint(@scalingFactor@*112,@scalingFactor@*160), wxSize(@scalingFactor@*145,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxEdit7")); + +- WxStaticText9 = new wxStaticText(this, ID_WXSTATICTEXT9, wxT("Settings Filename::"), wxPoint(8, 160), wxDefaultSize, 0, wxT("WxStaticText9")); ++ WxStaticText9 = new wxStaticText(this, ID_WXSTATICTEXT9, wxT("Settings Filename::"), wxPoint(@scalingFactor@*8,@scalingFactor@*160), wxDefaultSize, 0, wxT("WxStaticText9")); + +- WxButton3 = new wxButton(this, ID_WXBUTTON3, wxT("Launch Zod Engine"), wxPoint(208, 304), wxSize(121, 17), 0, wxDefaultValidator, wxT("WxButton3")); ++ WxButton3 = new wxButton(this, ID_WXBUTTON3, wxT("Launch Zod Engine"), wxPoint(@scalingFactor@*208,@scalingFactor@*304), wxSize(@scalingFactor@*121,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxButton3")); + +- WxStaticText8 = new wxStaticText(this, ID_WXSTATICTEXT8, wxT("--- Command Arguments ---"), wxPoint(8, 264), wxSize(520, 17), wxALIGN_CENTRE | wxST_NO_AUTORESIZE, wxT("WxStaticText8")); ++ WxStaticText8 = new wxStaticText(this, ID_WXSTATICTEXT8, wxT("--- Command Arguments ---"), wxPoint(@scalingFactor@*8,@scalingFactor@*264), wxSize(@scalingFactor@*520,@scalingFactor@*17), wxALIGN_CENTRE | wxST_NO_AUTORESIZE, wxT("WxStaticText8")); + +- WxEdit6 = new wxTextCtrl(this, ID_WXEDIT6, wxT(""), wxPoint(8, 280), wxSize(521, 17), 0, wxDefaultValidator, wxT("WxEdit6")); ++ WxEdit6 = new wxTextCtrl(this, ID_WXEDIT6, wxT(""), wxPoint(@scalingFactor@*8,@scalingFactor@*280), wxSize(@scalingFactor@*521,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxEdit6")); + +- WxStaticBox4 = new wxStaticBox(this, ID_WXSTATICBOX4, wxT("Launch Game"), wxPoint(0, 248), wxSize(537, 81)); ++ WxStaticBox4 = new wxStaticBox(this, ID_WXSTATICBOX4, wxT("Launch Game"), wxPoint(@scalingFactor@*0,@scalingFactor@*248), wxSize(@scalingFactor@*537,@scalingFactor@*81)); + +- WxCheckBox5 = new wxCheckBox(this, ID_WXCHECKBOX5, wxT("Bland Cursor"), wxPoint(448, 208), wxSize(81, 17), 0, wxDefaultValidator, wxT("WxCheckBox5")); ++ WxCheckBox5 = new wxCheckBox(this, ID_WXCHECKBOX5, wxT("Bland Cursor"), wxPoint(@scalingFactor@*448,@scalingFactor@*208), wxSize(@scalingFactor@*81,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxCheckBox5")); + +- WxCheckBox4 = new wxCheckBox(this, ID_WXCHECKBOX4, wxT("No Sound"), wxPoint(448, 192), wxSize(73, 17), 0, wxDefaultValidator, wxT("WxCheckBox4")); ++ WxCheckBox4 = new wxCheckBox(this, ID_WXCHECKBOX4, wxT("No Sound"), wxPoint(@scalingFactor@*448,@scalingFactor@*192), wxSize(@scalingFactor@*73,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxCheckBox4")); + +- WxCheckBox3 = new wxCheckBox(this, ID_WXCHECKBOX3, wxT("Is Windowed"), wxPoint(280, 192), wxSize(89, 17), 0, wxDefaultValidator, wxT("WxCheckBox3")); ++ WxCheckBox3 = new wxCheckBox(this, ID_WXCHECKBOX3, wxT("Is Windowed"), wxPoint(@scalingFactor@*280,@scalingFactor@*192), wxSize(@scalingFactor@*89,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxCheckBox3")); + +- WxStaticText7 = new wxStaticText(this, ID_WXSTATICTEXT7, wxT("x"), wxPoint(448, 168), wxSize(18, 17), wxALIGN_CENTRE | wxST_NO_AUTORESIZE, wxT("WxStaticText7")); ++ WxStaticText7 = new wxStaticText(this, ID_WXSTATICTEXT7, wxT("x"), wxPoint(@scalingFactor@*448,@scalingFactor@*168), wxSize(@scalingFactor@*18,@scalingFactor@*17), wxALIGN_CENTRE | wxST_NO_AUTORESIZE, wxT("WxStaticText7")); + +- WxEdit5 = new wxTextCtrl(this, ID_WXEDIT5, wxT("484"), wxPoint(472, 168), wxSize(57, 17), 0, wxDefaultValidator, wxT("WxEdit5")); ++ WxEdit5 = new wxTextCtrl(this, ID_WXEDIT5, wxT("484"), wxPoint(@scalingFactor@*472,@scalingFactor@*168), wxSize(@scalingFactor@*57,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxEdit5")); + +- WxEdit4 = new wxTextCtrl(this, ID_WXEDIT4, wxT("800"), wxPoint(384, 168), wxSize(57, 17), 0, wxDefaultValidator, wxT("WxEdit4")); ++ WxEdit4 = new wxTextCtrl(this, ID_WXEDIT4, wxT("800"), wxPoint(@scalingFactor@*384,@scalingFactor@*168), wxSize(@scalingFactor@*57,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxEdit4")); + +- WxStaticText6 = new wxStaticText(this, ID_WXSTATICTEXT6, wxT("Resolution::"), wxPoint(280, 168), wxDefaultSize, 0, wxT("WxStaticText6")); ++ WxStaticText6 = new wxStaticText(this, ID_WXSTATICTEXT6, wxT("Resolution::"), wxPoint(@scalingFactor@*280,@scalingFactor@*168), wxDefaultSize, 0, wxT("WxStaticText6")); + + wxArrayString arrayStringFor_WxChoice1; + arrayStringFor_WxChoice1.Add(wxT("null")); +@@ -149,42 +149,42 @@ void zod_launcherFrm::CreateGUIControls() + arrayStringFor_WxChoice1.Add(wxT("blue")); + arrayStringFor_WxChoice1.Add(wxT("green")); + arrayStringFor_WxChoice1.Add(wxT("yellow")); +- WxChoice1 = new wxChoice(this, ID_WXCHOICE1, wxPoint(384, 144), wxSize(145, 21), arrayStringFor_WxChoice1, 0, wxDefaultValidator, wxT("WxChoice1")); ++ WxChoice1 = new wxChoice(this, ID_WXCHOICE1, wxPoint(@scalingFactor@*384,@scalingFactor@*144), wxSize(@scalingFactor@*145,@scalingFactor@*21), arrayStringFor_WxChoice1, 0, wxDefaultValidator, wxT("WxChoice1")); + WxChoice1->SetSelection(1); + +- WxStaticText5 = new wxStaticText(this, ID_WXSTATICTEXT5, wxT("Player Team::"), wxPoint(280, 144), wxDefaultSize, 0, wxT("WxStaticText5")); ++ WxStaticText5 = new wxStaticText(this, ID_WXSTATICTEXT5, wxT("Player Team::"), wxPoint(@scalingFactor@*280,@scalingFactor@*144), wxDefaultSize, 0, wxT("WxStaticText5")); + +- WxEdit3 = new wxTextCtrl(this, ID_WXEDIT3, wxT(""), wxPoint(384, 72), wxSize(145, 17), 0, wxDefaultValidator, wxT("WxEdit3")); ++ WxEdit3 = new wxTextCtrl(this, ID_WXEDIT3, wxT(""), wxPoint(@scalingFactor@*384,@scalingFactor@*72), wxSize(@scalingFactor@*145,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxEdit3")); + +- WxStaticText4 = new wxStaticText(this, ID_WXSTATICTEXT4, wxT("Player Name::"), wxPoint(280, 72), wxDefaultSize, 0, wxT("WxStaticText4")); ++ WxStaticText4 = new wxStaticText(this, ID_WXSTATICTEXT4, wxT("Player Name::"), wxPoint(@scalingFactor@*280,@scalingFactor@*72), wxDefaultSize, 0, wxT("WxStaticText4")); + +- WxStaticBox3 = new wxStaticBox(this, ID_WXSTATICBOX3, wxT("Engine Settings"), wxPoint(272, 56), wxSize(265, 185)); ++ WxStaticBox3 = new wxStaticBox(this, ID_WXSTATICBOX3, wxT("Engine Settings"), wxPoint(@scalingFactor@*272,@scalingFactor@*56), wxSize(@scalingFactor@*265,@scalingFactor@*185)); + +- WxEdit2 = new wxTextCtrl(this, ID_WXEDIT2, wxT(""), wxPoint(112, 136), wxSize(145, 17), 0, wxDefaultValidator, wxT("WxEdit2")); ++ WxEdit2 = new wxTextCtrl(this, ID_WXEDIT2, wxT(""), wxPoint(@scalingFactor@*112,@scalingFactor@*136), wxSize(@scalingFactor@*145,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxEdit2")); + +- WxStaticText3 = new wxStaticText(this, ID_WXSTATICTEXT3, wxT("Map Filename::"), wxPoint(8, 136), wxDefaultSize, 0, wxT("WxStaticText3")); ++ WxStaticText3 = new wxStaticText(this, ID_WXSTATICTEXT3, wxT("Map Filename::"), wxPoint(@scalingFactor@*8,@scalingFactor@*136), wxDefaultSize, 0, wxT("WxStaticText3")); + +- WxCheckBox2 = new wxCheckBox(this, ID_WXCHECKBOX2, wxT("Filename is a Maplist"), wxPoint(96, 112), wxSize(121, 17), 0, wxDefaultValidator, wxT("WxCheckBox2")); ++ WxCheckBox2 = new wxCheckBox(this, ID_WXCHECKBOX2, wxT("Filename is a Maplist"), wxPoint(@scalingFactor@*96,@scalingFactor@*112), wxSize(@scalingFactor@*121,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxCheckBox2")); + +- WxCheckBox1 = new wxCheckBox(this, ID_WXCHECKBOX1, wxT("Is Dedicated"), wxPoint(8, 112), wxSize(89, 17), 0, wxDefaultValidator, wxT("WxCheckBox1")); ++ WxCheckBox1 = new wxCheckBox(this, ID_WXCHECKBOX1, wxT("Is Dedicated"), wxPoint(@scalingFactor@*8,@scalingFactor@*112), wxSize(@scalingFactor@*89,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxCheckBox1")); + +- WxStaticText2 = new wxStaticText(this, ID_WXSTATICTEXT2, wxT("----- OR -----"), wxPoint(8, 96), wxSize(249, 17), wxALIGN_CENTRE | wxST_NO_AUTORESIZE, wxT("WxStaticText2")); ++ WxStaticText2 = new wxStaticText(this, ID_WXSTATICTEXT2, wxT("----- OR -----"), wxPoint(@scalingFactor@*8,@scalingFactor@*96), wxSize(@scalingFactor@*249,@scalingFactor@*17), wxALIGN_CENTRE | wxST_NO_AUTORESIZE, wxT("WxStaticText2")); + +- WxStaticText1 = new wxStaticText(this, ID_WXSTATICTEXT1, wxT("Connect Address::"), wxPoint(8, 72), wxDefaultSize, 0, wxT("WxStaticText1")); ++ WxStaticText1 = new wxStaticText(this, ID_WXSTATICTEXT1, wxT("Connect Address::"), wxPoint(@scalingFactor@*8,@scalingFactor@*72), wxDefaultSize, 0, wxT("WxStaticText1")); + +- WxEdit1 = new wxTextCtrl(this, ID_WXEDIT1, wxT(""), wxPoint(112, 72), wxSize(145, 17), 0, wxDefaultValidator, wxT("WxEdit1")); ++ WxEdit1 = new wxTextCtrl(this, ID_WXEDIT1, wxT(""), wxPoint(@scalingFactor@*112,@scalingFactor@*72), wxSize(@scalingFactor@*145,@scalingFactor@*17), 0, wxDefaultValidator, wxT("WxEdit1")); + +- WxButton2 = new wxButton(this, ID_WXBUTTON2, wxT("Nighsoft Server"), wxPoint(136, 16), wxSize(121, 25), 0, wxDefaultValidator, wxT("WxButton2")); ++ WxButton2 = new wxButton(this, ID_WXBUTTON2, wxT("Nighsoft Server"), wxPoint(@scalingFactor@*136,@scalingFactor@*16), wxSize(@scalingFactor@*121,@scalingFactor@*25), 0, wxDefaultValidator, wxT("WxButton2")); + +- WxButton1 = new wxButton(this, ID_WXBUTTON1, wxT("Local Game"), wxPoint(8, 16), wxSize(121, 25), 0, wxDefaultValidator, wxT("WxButton1")); ++ WxButton1 = new wxButton(this, ID_WXBUTTON1, wxT("Local Game"), wxPoint(@scalingFactor@*8,@scalingFactor@*16), wxSize(@scalingFactor@*121,@scalingFactor@*25), 0, wxDefaultValidator, wxT("WxButton1")); + +- WxStaticBox2 = new wxStaticBox(this, ID_WXSTATICBOX2, wxT("Connection Settings"), wxPoint(0, 56), wxSize(265, 129)); ++ WxStaticBox2 = new wxStaticBox(this, ID_WXSTATICBOX2, wxT("Connection Settings"), wxPoint(@scalingFactor@*0,@scalingFactor@*56), wxSize(@scalingFactor@*265,@scalingFactor@*129)); + +- WxStaticBox1 = new wxStaticBox(this, ID_WXSTATICBOX1, wxT("Preset Settings"), wxPoint(0, 0), wxSize(537, 49)); ++ WxStaticBox1 = new wxStaticBox(this, ID_WXSTATICBOX1, wxT("Preset Settings"), wxPoint(@scalingFactor@*0,@scalingFactor@*0), wxSize(@scalingFactor@*537,@scalingFactor@*49)); + + SetTitle(wxT("The Zod Launcher")); + SetIcon(wxNullIcon); +- SetSize(8,8,545,376); ++ SetSize(8,8,@scalingFactor@*545,@scalingFactor@*376); + Center(); + + ////GUI Items Creation End +-- +2.29.3 + diff --git a/third_party/nixpkgs/pkgs/games/zod/default.nix b/third_party/nixpkgs/pkgs/games/zod/default.nix index c358e59992..f7d7a5612d 100644 --- a/third_party/nixpkgs/pkgs/games/zod/default.nix +++ b/third_party/nixpkgs/pkgs/games/zod/default.nix @@ -1,46 +1,110 @@ -{ lib, fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer -, libmysqlclient, makeWrapper }: - -stdenv.mkDerivation { - name = "zod-engine-2011-03-18"; - - src = fetchurl { - url = "mirror://sourceforge/zod/zod_src-2011-03-18.zip"; - sha256 = "00ny7a1yfn9zgl7q1ys27qafwc92dzxv07wjxl8nxa4f98al2g4n"; +{ lib +, config +, fetchzip +, stdenv +, SDL +, SDL_image +, SDL_ttf +, SDL_mixer +, libmysqlclient +, wxGTK +, symlinkJoin +, runCommandLocal +, makeWrapper +, coreutils +, scalingFactor ? 2 # this is to resize the fixed-size zod_launcher window +, substituteAll +}: +let + version = "2011-09-06"; + name = "zod-engine-${version}"; + src = fetchzip { + url = "mirror://sourceforge/zod/linux_releases/zod_linux-${version}.tar.gz"; + sha256 = "017v96aflrv07g8j8zk9mq8f8rqxl5228rjff5blq8dxpsv1sx7h"; }; - - srcAssets = fetchurl { - url = "mirror://sourceforge/zod/zod_assets-2011-03-12.rar"; - sha256 = "0gmg4ppr4y6ck04mandlp2fmdcyssmck999m012jx5v1rm57g2hn"; - }; - + nativeBuildInputs = [ + makeWrapper + ]; + buildInputs = [ + SDL + SDL_image + SDL_ttf + SDL_mixer + libmysqlclient + wxGTK + coreutils + ]; hardeningDisable = [ "format" ]; - - unpackPhase = '' - mkdir src - pushd src - unzip $src - popd - sourceRoot=`pwd`/src - ''; - - nativeBuildInputs = [ makeWrapper unrar unzip ]; - buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libmysqlclient ]; - NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql"; - - installPhase = '' - mkdir -p $out/bin $out/share/zod - pushd $out/share/zod - unrar x $srcAssets - popd - cp zod $out/bin - wrapProgram $out/bin/zod --run "cd $out/share/zod" - ''; - - meta = { - description = "Multiplayer remake of ZED"; - homepage = "http://zod.sourceforge.net/"; - license = lib.licenses.gpl3Plus; /* Says the web */ + zod_engine = stdenv.mkDerivation { + inherit name version src nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; + pname = "${name}-engine"; + enableParallelBuilding = true; + preBuild = "cd zod_src"; + installPhase = '' + mkdir -p $out/bin + install -m755 zod $out/bin/ + wrapProgram $out/bin/zod --run "cd ${zod_assets}/usr/lib/commander-zod" + ''; }; -} + zod_map_editor = stdenv.mkDerivation { + inherit name version src nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; + pname = "${name}-map_editor"; + enableParallelBuilding = true; + preBuild = "cd zod_src"; + makeFlags = [ "map_editor" ]; + installPhase = '' + mkdir -p $out/bin + install -m755 zod_map_editor $out/bin + wrapProgram $out/bin/zod_map_editor --run "cd ${zod_assets}/usr/lib/commander-zod" + ''; + }; + zod_launcher = stdenv.mkDerivation { + inherit name version src nativeBuildInputs buildInputs zod_engine zod_map_editor; + pname = "${name}-launcher"; + # This is necessary because the zod_launcher has terrible fixed-width window + # the Idea is to apply the scalingFactor to all positions and sizes and I tested 1,2,3 and 4 + # 2,3,4 look acceptable on my 4k monitor and 1 is unreadable. + # also the ./ in the run command is removed to have easier time starting the game + patches = [ + (substituteAll { + inherit scalingFactor; + src=./0002-add-scaling-factor-to-source.patch; + }) + ]; + postPatch = '' + substituteInPlace zod_launcher_src/zod_launcherFrm.cpp \ + --replace 'message = wxT("./zod");' 'message = wxT("zod");' + ''; + preBuild = "cd zod_launcher_src"; + installPhase = '' + mkdir -p $out/bin + install -m755 zod_launcher $out/bin + ''; + }; + zod_assets = runCommandLocal "${name}-assets" {} '' + mkdir -p $out/usr/lib/commander-zod{,blank_maps} + cp -r ${src}/assets $out/usr/lib/commander-zod/assets + for i in ${src}/*.map ${src}/*.txt; do + install -m644 $i $out/usr/lib/commander-zod + done + for map in ${src}/blank_maps/*; do + install -m644 $map $out/usr/lib/commander-zod/blank_maps + done + ''; +in + symlinkJoin { + inherit name; + paths = [ + zod_engine + zod_launcher + zod_map_editor + zod_assets + ]; + meta = with lib; { + description = "Multiplayer remake of ZED"; + homepage = "http://zod.sourceforge.net/"; + maintainers = with maintainers; [ zeri ]; + license = licenses.gpl3Plus; /* Says the website */ + }; + } diff --git a/third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix index 7302cfb25b..6e4a38ed17 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, foomatic-filters, bc, unzip, ghostscript, systemd, vim, time }: +{ lib, stdenv, fetchurl, foomatic-filters, bc, ghostscript, systemd, vim, time }: stdenv.mkDerivation rec { pname = "foo2zjs"; @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { sha256 = "14x3wizvncdy0xgvmcx541qanwb7bg76abygqy17bxycn1zh5r1x"; }; - nativeBuildInputs = [ unzip ]; buildInputs = [ foomatic-filters bc ghostscript systemd vim ]; patches = [ ./no-hardcode-fw.diff ]; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix b/third_party/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix index c62161c96f..3c2f8fa2a0 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix @@ -75,7 +75,7 @@ python2Packages.buildPythonApplication { pygobject2 reportlab usbutils - sip + sip_4 ] ++ lib.optionals withQt5 [ pyqt5 ]; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/hplip/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/hplip/default.nix index 6a7eb35ae5..98a67a75f0 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/hplip/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/hplip/default.nix @@ -36,13 +36,13 @@ let x86_64-linux = "x86_64"; armv6l-linux = "arm32"; armv7l-linux = "arm32"; - aarch64-linux = "aarch64"; + aarch64-linux = "arm64"; }; hplipArch = hplipPlatforms.${stdenv.hostPlatform.system} or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}"); - pluginArches = [ "x86_32" "x86_64" "arm32" "aarch64" ]; + pluginArches = [ "x86_32" "x86_64" "arm32" "arm64" ]; in @@ -79,7 +79,7 @@ python3Packages.buildPythonApplication { pygobject3 reportlab usbutils - sip + sip_4 dbus-python ] ++ lib.optionals withQt5 [ pyqt5 diff --git a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix index 734b2229c8..fe6d206c3e 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, libX11 }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, libX11, IOKit }: stdenv.mkDerivation rec { version = "0.8"; @@ -11,9 +11,20 @@ stdenv.mkDerivation rec { sha256 = "1zz0cm5cgvp9s5n4nzksl8rb11c7sw214bdafzra74smvqfjcjcf"; }; - buildInputs = [ libX11 ]; + patches = [ + # Fixes Darwin: https://github.com/FreeSpacenav/spacenavd/pull/38 + (fetchpatch { + url = "https://github.com/FreeSpacenav/spacenavd/commit/d6a25d5c3f49b9676d039775efc8bf854737c43c.patch"; + sha256 = "02pdgcvaqc20qf9hi3r73nb9ds7yk2ps9nnxaj0x9p50xjnhfg5c"; + }) + ]; - configureFlags = [ "--disable-debug"]; + buildInputs = [ libX11 ] + ++ lib.optional stdenv.isDarwin IOKit; + + configureFlags = [ "--disable-debug" ]; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with lib; { homepage = "http://spacenav.sourceforge.net/"; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/atari800/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/atari800/default.nix index 53f1009cfa..37e0d83f14 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/atari800/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/atari800/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook -, unzip, zlib, SDL, readline, libGLU, libGL, libX11 }: +, zlib, SDL, readline, libGLU, libGL, libX11 }: with lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy"; }; - nativeBuildInputs = [ autoreconfHook unzip ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib SDL readline libGLU libGL libX11 ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/caprice32/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/caprice32/default.nix index 3e20ba6164..6c2932f7e1 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/caprice32/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/caprice32/default.nix @@ -5,6 +5,9 @@ stdenv.mkDerivation rec { pname = "caprice32"; version = "4.6.0"; + # NOTE: When bumping version beyond 4.6.0, you likely need to remove + # string.patch below. The fix of this patch has already been + # done upstream but is not yet part of a release src = fetchFromGitHub { repo = "caprice32"; @@ -16,6 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils pkg-config ]; buildInputs = [ libpng SDL freetype zlib ]; + patches = [ ./string.patch ]; + makeFlags = [ "APP_PATH=${placeholder "out"}/share/caprice32" "RELEASE=1" diff --git a/third_party/nixpkgs/pkgs/misc/emulators/caprice32/string.patch b/third_party/nixpkgs/pkgs/misc/emulators/caprice32/string.patch new file mode 100644 index 0000000000..fabbbd80d5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/emulators/caprice32/string.patch @@ -0,0 +1,12 @@ +diff --git a/src/configuration.h b/src/configuration.h +index 34fd690..97fb0e5 100644 +--- a/src/configuration.h ++++ b/src/configuration.h +@@ -2,6 +2,7 @@ + #define CONFIGURATION_H + + #include ++#include + + namespace config + { diff --git a/third_party/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix b/third_party/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix index 246dbb7dd3..dddcc3a746 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix @@ -1,5 +1,5 @@ { callPackage, makeWrapper, gobject-introspection, cmake -, python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk-pixbuf, librsvg, intltool, libmirage }: +, python3Packages, gtk3, glib, libxml2, gnuplot, gnome, gdk-pixbuf, librsvg, intltool, libmirage }: let pkg = import ./base.nix { version = "3.2.3"; pkgName = "image-analyzer"; @@ -7,7 +7,7 @@ let pkg = import ./base.nix { }; in callPackage pkg { buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper - gnome3.adwaita-icon-theme gdk-pixbuf librsvg intltool + gnome.adwaita-icon-theme gdk-pixbuf librsvg intltool python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ]; drvParams = { nativeBuildInputs = [ gobject-introspection cmake ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix b/third_party/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix index 599531950a..8ce84ccae2 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix @@ -1,5 +1,5 @@ { callPackage, makeWrapper, gobject-introspection, cmake -, python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk-pixbuf, librsvg }: +, python3Packages, gtk3, glib, libnotify, intltool, gnome, gdk-pixbuf, librsvg }: let pkg = import ./base.nix { version = "3.2.3"; @@ -9,7 +9,7 @@ let inherit (python3Packages) python pygobject3; in callPackage pkg { buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper - gnome3.adwaita-icon-theme gdk-pixbuf librsvg ]; + gnome.adwaita-icon-theme gdk-pixbuf librsvg ]; drvParams = { nativeBuildInputs = [ gobject-introspection cmake ]; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/misc/emulators/mame/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/mame/default.nix index b50181a4d9..e803a13068 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/mame/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/mame/default.nix @@ -82,6 +82,6 @@ in mkDerivation { platforms = platforms.unix; # makefile needs fixes for install target badPlatforms = [ "aarch64-linux" ]; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/misc/emulators/nestopia/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/nestopia/default.nix index 70e5d94def..502e5c6472 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/nestopia/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/nestopia/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsaLib, gtk3 , makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg-utils -, epoxy, gdk-pixbuf, gnome3, wrapGAppsHook +, epoxy, gdk-pixbuf, gnome, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libarchive libao xdg-utils - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/default.nix index a6ada570a5..e6f1b4f1a7 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, which, pkg-config, makeWrapper -, ffmpeg_3, libGLU, libGL, freetype, libxml2, python3 +, ffmpeg, libGLU, libGL, freetype, libxml2, python3 , libobjc, AppKit, Foundation , alsaLib ? null , libdrm ? null @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wayland ] ++ optional withVulkan makeWrapper; - buildInputs = [ ffmpeg_3 freetype libxml2 libGLU libGL python3 SDL2 which ] + buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ optional withVulkan vulkan-loader ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] diff --git a/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix index ecda439e7a..8eab2f0572 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix @@ -1,23 +1,26 @@ -{ mkDerivation, lib, fetchgit, cmake, pkg-config, git +{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config, git , qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng -, ffmpeg, libevdev, python3 +, ffmpeg, libevdev, libusb1, zlib, curl, python3 +, sdl2Support ? true, SDL2 , pulseaudioSupport ? true, libpulseaudio , waylandSupport ? true, wayland , alsaSupport ? true, alsaLib }: let - majorVersion = "0.0.12"; - gitVersion = "10811-a86a3d2fe"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) + majorVersion = "0.0.16"; + gitVersion = "12235-a4f4b81e6"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) in mkDerivation { pname = "rpcs3"; version = "${majorVersion}-${gitVersion}"; - src = fetchgit { - url = "https://github.com/RPCS3/rpcs3"; - rev = "v${majorVersion}"; - sha256 = "182rkmbnnlcfzam4bwas7lwv10vqiqvvaw3299a3hariacd7rq8x"; + src = fetchFromGitHub { + owner = "RPCS3"; + repo = "rpcs3"; + rev = "a4f4b81e6b0c00f4c30f9f5f182e5fe56f9fb03c"; + fetchSubmodules = true; + sha256 = "1d70nljl1kmpbk50jpjki7dglw1bbxd7x4qzg6nz5np2sdsbpckd"; }; preConfigure = '' @@ -30,8 +33,13 @@ mkDerivation { ''; cmakeFlags = [ + "-DUSE_SYSTEM_ZLIB=ON" + "-DUSE_SYSTEM_LIBUSB=ON" "-DUSE_SYSTEM_LIBPNG=ON" "-DUSE_SYSTEM_FFMPEG=ON" + "-DUSE_SYSTEM_CURL=ON" + # NB: Can't use this yet, our CMake doesn't include FindWolfSSL.cmake + #"-DUSE_SYSTEM_WOLFSSL=ON" "-DUSE_NATIVE_INSTRUCTIONS=OFF" ]; @@ -39,8 +47,9 @@ mkDerivation { buildInputs = [ qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg - libevdev python3 - ] ++ lib.optional pulseaudioSupport libpulseaudio + libevdev zlib libusb1 curl python3 + ] ++ lib.optional sdl2Support SDL2 + ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional alsaSupport alsaLib ++ lib.optional waylandSupport wayland; @@ -48,7 +57,7 @@ mkDerivation { description = "PS3 emulator/debugger"; homepage = "https://rpcs3.net/"; maintainers = with maintainers; [ abbradar neonfuz ilian ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ruffle/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/ruffle/default.nix index affbf0af15..11be67b6d9 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/ruffle/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/ruffle/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "ruffle"; - version = "nightly-2021-04-02"; + version = "nightly-2021-05-14"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = pname; rev = version; - sha256 = "1diz94y53hvii28894zz65aya12v8yw1864lqpkrdbj67yc6ykdj"; + sha256 = "15azv8y7a4sgxvvhl7z45jyxj91b4nn681vband5726c7znskhwl"; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/ruffle_desktop --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib ''; - cargoSha256 = "0pnp5kmij4dwwvmgdv81mqcawcjcgg5gd6cpyf0xalyfjgj8i732"; + cargoSha256 = "0ihy4rgw9b4yqlqs87rx700h3a8wm02wpahhg7inic1lcag4bxif"; meta = with lib; { description = "An Adobe Flash Player emulator written in the Rust programming language."; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/vbam/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/vbam/default.nix index c21f67845d..bb5e7cea4e 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/vbam/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/vbam/default.nix @@ -2,6 +2,7 @@ , cairo , cmake , fetchFromGitHub +, fetchpatch , ffmpeg , gettext , libGLU, libGL @@ -46,6 +47,15 @@ stdenv.mkDerivation rec { "-DENABLE_SDL='true'" ]; + patches = [ + (fetchpatch { + # https://github.com/visualboyadvance-m/visualboyadvance-m/pull/793 + name = "fix-build-SDL-2.0.14.patch"; + url = "https://github.com/visualboyadvance-m/visualboyadvance-m/commit/619a5cce683ec4b1d03f08f316ba276d8f8cd824.patch"; + sha256 = "099cbzgq4r9g83bvdra8a0swfl1vpfng120wf4q7h6vs0n102rk9"; + }) + ]; + meta = with lib; { description = "A merge of the original Visual Boy Advance forks"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/yapesdl/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/yapesdl/default.nix index 307068cde0..5f4b7771fb 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/yapesdl/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/yapesdl/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { SDL2 ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}c++" ]; + installPhase = '' runHook preInstall install --directory $out/bin $out/share/doc/$pname diff --git a/third_party/nixpkgs/pkgs/misc/frescobaldi/default.nix b/third_party/nixpkgs/pkgs/misc/frescobaldi/default.nix index 070babc0cb..60fee5a6c8 100644 --- a/third_party/nixpkgs/pkgs/misc/frescobaldi/default.nix +++ b/third_party/nixpkgs/pkgs/misc/frescobaldi/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - lilypond pygame python-ly sip + lilypond pygame python-ly sip_4 pyqt5 poppler-qt5 pyqtwebengine ]; diff --git a/third_party/nixpkgs/pkgs/misc/jackaudio/default.nix b/third_party/nixpkgs/pkgs/misc/jackaudio/default.nix index 9dd9736744..865ab6ee1f 100644 --- a/third_party/nixpkgs/pkgs/misc/jackaudio/default.nix +++ b/third_party/nixpkgs/pkgs/misc/jackaudio/default.nix @@ -15,7 +15,7 @@ with lib; let inherit (python3Packages) python dbus-python; - shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; libOnly = prefix == "lib"; diff --git a/third_party/nixpkgs/pkgs/misc/jackaudio/jack1.nix b/third_party/nixpkgs/pkgs/misc/jackaudio/jack1.nix index ea7356b32e..c1ccc66848 100644 --- a/third_party/nixpkgs/pkgs/misc/jackaudio/jack1.nix +++ b/third_party/nixpkgs/pkgs/misc/jackaudio/jack1.nix @@ -5,7 +5,7 @@ }: let - shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; optAlsaLib = shouldUsePkg alsaLib; optDb = shouldUsePkg db; diff --git a/third_party/nixpkgs/pkgs/misc/lilypond/default.nix b/third_party/nixpkgs/pkgs/misc/lilypond/default.nix index d8db893f7d..b75f9c3f80 100644 --- a/third_party/nixpkgs/pkgs/misc/lilypond/default.nix +++ b/third_party/nixpkgs/pkgs/misc/lilypond/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "lilypond"; - version = "2.22.0"; + version = "2.22.1"; src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "0khg9dlm1b02mm9w54xqc9ydj416xkikn6p08g1asiyjf4qx1pb4"; + sha256 = "sha256-cqwtVMMQwxQcC3gtTgvvkALVUZz0ZjJ1mx8D72lpzDA="; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix index 74d9e3cffe..d1aa7d9911 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Electric Sheep, a distributed screen saver for evolving artificial organisms"; homepage = "https://electricsheep.org/"; - maintainers = with maintainers; [ nand0p fpletz ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; license = licenses.gpl1; }; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/vlock/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/vlock/default.nix index 243d582bdc..4813e24930 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/vlock/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/vlock/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Virtual console locking program"; license = licenses.gpl2; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/misc/sndio/default.nix b/third_party/nixpkgs/pkgs/misc/sndio/default.nix index c86198a698..3b4c34702d 100644 --- a/third_party/nixpkgs/pkgs/misc/sndio/default.nix +++ b/third_party/nixpkgs/pkgs/misc/sndio/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { pname = "sndio"; - version = "1.7.0"; - enableParallelBuilding = true; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = lib.optional stdenv.hostPlatform.isLinux alsaLib; + version = "1.8.0"; src = fetchurl { url = "http://www.sndio.org/sndio-${version}.tar.gz"; - sha256 = "0ljmac0lnjn61admgbcwjfcr5fwccrsblx9rj9bys8wlhz8f796x"; + sha256 = "027hlqji0h2cm96rb8qvkdmwxl56l59bgn828nvmwak2c2i5k703"; }; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = lib.optional stdenv.hostPlatform.isLinux alsaLib; + + enableParallelBuilding = true; + meta = with lib; { homepage = "http://www.sndio.org"; description = "Small audio and MIDI framework part of the OpenBSD project"; diff --git a/third_party/nixpkgs/pkgs/misc/t-rec/default.nix b/third_party/nixpkgs/pkgs/misc/t-rec/default.nix new file mode 100644 index 0000000000..b9663cee5c --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/t-rec/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, imagemagick, ffmpeg, rustPlatform, fetchFromGitHub, makeWrapper +, libiconv, Foundation }: + +let + binPath = lib.makeBinPath [ + imagemagick + ffmpeg + ]; +in +rustPlatform.buildRustPackage rec { + pname = "t-rec"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "sassman"; + repo = "t-rec-rs"; + rev = "v${version}"; + sha256 = "InArrBqfhDrsonjmCIPTBVOA/s2vYml9Ay6cdrKLd7c="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ imagemagick ] + ++ lib.optionals stdenv.isDarwin [ libiconv Foundation ]; + + postInstall = '' + wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}" + ''; + + cargoSha256 = "4gwfrC65YlXV6Wu2ninK1TvMNUkY1GstVYPr0FK+xLU="; + + meta = with lib; { + description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; + homepage = "https://github.com/sassman/t-rec-rs"; + license = with licenses; [ gpl3Only ]; + maintainers = [ maintainers.hoverbear ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/uboot/default.nix b/third_party/nixpkgs/pkgs/misc/uboot/default.nix index 6c59c13d12..cd40190712 100644 --- a/third_party/nixpkgs/pkgs/misc/uboot/default.nix +++ b/third_party/nixpkgs/pkgs/misc/uboot/default.nix @@ -18,10 +18,10 @@ }: let - defaultVersion = "2021.01"; + defaultVersion = "2021.04"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "0m04glv9kn3bhs62sn675w60wkrl4m3a4hnbnnw67s3l198y21xl"; + sha256 = "06p1vymf0dl6jc2xy5w7p42mpgppa46lmpm2ishmgsycnldqnhqd"; }; buildUBoot = { version ? null diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/aliases.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/aliases.nix index 4cfb6ccd37..4e08e5fe05 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/aliases.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/aliases.nix @@ -1,8 +1,7 @@ # Deprecated aliases - for backward compatibility +lib: -lib: overriden: - -with overriden; +final: prev: let # Removing recurseForDerivation prevents derivations of aliased attribute @@ -21,12 +20,12 @@ let # Make sure that we are not shadowing something from # all-packages.nix. - checkInPkgs = n: alias: if builtins.hasAttr n overriden + checkInPkgs = n: alias: if builtins.hasAttr n prev then throw "Alias ${n} is still in vim-plugins" else alias; mapAliases = aliases: - lib.mapAttrs (n: alias: removeDistribute + lib.mapAttrs (n: alias: removeDistribute (removeRecurseForDerivations (checkInPkgs n alias))) aliases; @@ -36,7 +35,7 @@ let ) (builtins.fromJSON (builtins.readFile ./deprecated.json)); in -mapAliases ({ +mapAliases (with prev; { airline = vim-airline; alternative = a-vim; # backwards compat, added 2014-10-21 bats = bats-vim; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/default.nix index e6bca9484a..cbc6ec7380 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/default.nix @@ -5,8 +5,12 @@ let inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix; + inherit (lib) extends; + + initialPackages = self: {}; + plugins = callPackage ./generated.nix { - inherit buildVimPluginFrom2Nix overrides; + inherit buildVimPluginFrom2Nix; }; # TL;DR @@ -21,8 +25,13 @@ let inherit llvmPackages; }; - aliases = lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib plugins); + aliases = if (config.allowAliases or true) then (import ./aliases.nix lib) else final: prev: {}; + extensible-self = lib.makeExtensible + (extends aliases + (extends overrides + (extends plugins initialPackages) + ) + ); in - -plugins // aliases + extensible-self diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 7eb81d54d8..250213ac0e 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -1,7 +1,7 @@ # This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit! -{ lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: -let - packages = ( self: +{ lib, buildVimPluginFrom2Nix, fetchFromGitHub }: + +final: prev: { a-vim = buildVimPluginFrom2Nix { pname = "a-vim"; @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-04-20"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "737c1bf1ac9becd67519f7a6832ad276feca8f08"; - sha256 = "0imngagc6p5mfx1v2maxcwzh75l1y4diyd1ymwjil51x93qkrzxi"; + rev = "bee8eccb421968d1f2628c15e9f2bfcc3d0418aa"; + sha256 = "1kfj40rfgyvzjk1ic9ax21cb8a58qhjbqh7knxgljkv7jhaclj4y"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -89,12 +89,12 @@ let aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2021-04-25"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "9cf0d261a5fb24908f6cc7588f568646dce3d712"; - sha256 = "051s3nxil63gl3y6xj047c8ifxpra1xqlp3bic3x2ww1fb3wpjz3"; + rev = "d1c07000f95825579f00e24077e65387fc1db0d6"; + sha256 = "1n1vs0n596mg82kmhmscfy983di6h86mhangs6rk3zdyhzyjax5b"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -161,12 +161,12 @@ let asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2021-03-03"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "8e018dee9c5e2205288bda01be0de196b04b7cf2"; - sha256 = "1ghv6zp3qajd4n9qv3mnxqhczi77qmds2b2iicbl252slvldr604"; + rev = "6c653c3f8f1c1cf7a34522c9555d5160f36d29ee"; + sha256 = "1zzdybfswlh66gw8a3imkwf7m6g13rlf6dqyg71c6bfmn3zlx2l0"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -183,6 +183,18 @@ let meta.homepage = "https://github.com/vmchale/ats-vim/"; }; + aurora = buildVimPluginFrom2Nix { + pname = "aurora"; + version = "2021-05-10"; + src = fetchFromGitHub { + owner = "ray-x"; + repo = "aurora"; + rev = "bf185b9c5aaaad7cfd20f29f92d3b77164f8f1e7"; + sha256 = "17ir0daw3rsfgprgvrskip2r19g15z05spdk14dz105nrgv4hh4y"; + }; + meta.homepage = "https://github.com/ray-x/aurora/"; + }; + auto-git-diff = buildVimPluginFrom2Nix { pname = "auto-git-diff"; version = "2019-09-23"; @@ -209,12 +221,12 @@ let auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-04-24"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "6e87fa2ed6b6fe7ccd14fe4b30cc00be47afc3c6"; - sha256 = "00d3ga6rpzwcz2pcdgwrnr2xymh1hizs46zzc8jjmrj58k8sg033"; + rev = "0a71b6211ff2d367f012b484e8eba9ef433b85c3"; + sha256 = "1axn0glc40kqygd50m28layk16y28ah9bi6j36id6v0czhxfi475"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -233,12 +245,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2021-02-26"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "1ed59bff2a84e48e1a243a7e5d336a395f610e2a"; - sha256 = "1acz9zwb9mwyhfckpzv22dy5c4bq83jrmvvbd22z9k0hm5py2538"; + rev = "39f8083c885149f52712b65b8d5380d63939bc23"; + sha256 = "1kc8lszdc4gglf5pyp7g6kb4kspml8rd41jv083p29ipwy9n8a8j"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -257,12 +269,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-04-21"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "54b4376d9a44b45f12b0f6f5bcc46f98b66782e1"; - sha256 = "0nh4rgyix8mj3wag8wpcy68avyrh5ps89a842fqdd5x6054d3apv"; + rev = "fa07efc01700896f1b52d11a237e16aacebac443"; + sha256 = "1x10ygg0mb11imx0q9nhz02w10csa3ca0djfldk9cbx5lb8f8f95"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -389,12 +401,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-04-29"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "23c8aacf13be02b985455ef027fbd28896dd1ef8"; - sha256 = "1bwaxs8rgyr1w81rqygia9ab7l10vcvad0d3xx89x17z6szakj3x"; + rev = "3e74c75ddb096e8128d573439a779527288ac685"; + sha256 = "0mkmla4y6g53nil6296irpb4zxa807cxj2jdr0fr2d4hp0y4xjci"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -461,12 +473,12 @@ let coc-clap = buildVimPluginFrom2Nix { pname = "coc-clap"; - version = "2021-03-04"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "vn-ki"; repo = "coc-clap"; - rev = "57116d2f999dfa025fac579835fd23e1a6341fa2"; - sha256 = "0m2khf11krkqmbykfx21yq9ydglz6dldw4xml5nkyqm93n37xn1s"; + rev = "8622be2674f3197bec8a0c4cfd177eb8455f45e6"; + sha256 = "063azqsibg25iv2c9smn4k6933frrwarqz640b14c041sgi6h8cx"; }; meta.homepage = "https://github.com/vn-ki/coc-clap/"; }; @@ -497,12 +509,12 @@ let coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-04-14"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "f76e290d6765261b0a4aee2247dfaaba77e30ab9"; - sha256 = "0xm9clynyp7h248iddpns7rqdllgvf3f34qlxn47fby2nh07galc"; + rev = "02cd0ca0fa06712b7609b87c50e5e05998b3a771"; + sha256 = "093dcv4hzxxz2ygawjka08j4s7akygh2fldn4mfzrxjyjpxqal0c"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -533,12 +545,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-04-29"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "473668eabee0592e817f9c692b0509c2743fb1c3"; - sha256 = "1r6wx6bpzfbhb8a95jw1gi2xkvx4h8i4rima2ylkrdbx86hgicjz"; + rev = "7cfbd335ceefc0103ff3cbd39b2b4abf353f70be"; + sha256 = "088ig7pc5z78zpc1l7siffdyvql9zbampx3fcxwch7xpjidas4ba"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -618,12 +630,12 @@ let compe-tabnine = buildVimPluginFrom2Nix { pname = "compe-tabnine"; - version = "2021-04-23"; + version = "2021-05-09"; src = fetchFromGitHub { owner = "tzachar"; repo = "compe-tabnine"; - rev = "f6ace45ef5cbd8b274d7163a2931c11083d34d44"; - sha256 = "0wjy38v3h5nqr2vw2ydhy2227cqkd8k14cnb3vr39xm5c0fc3ci5"; + rev = "755e45c97d29d73400f8fba591ff06054d37127a"; + sha256 = "0gsq2v0qpzw211fmss3c004pmqcfns9vy4fhki9a0c69zk1ggalp"; }; meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; @@ -690,24 +702,24 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-04-25"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "b7cc8a2e0936f3069235ed312fb89ff2a5390660"; - sha256 = "0bxbisyzpp9rrakzqp3kqx61yzgcqvg90qll76vx7s6mxp0qz9rw"; + rev = "5d3b1afe96d11f059016d0b556f2797b54af916e"; + sha256 = "0f4ms7c3bffak9dpx0c5wgq2asbg7xavr70cwsmxf0fifpacahhs"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; context_filetype-vim = buildVimPluginFrom2Nix { pname = "context_filetype-vim"; - version = "2021-03-04"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "f5e4ed8f7847cd5474017459c2a0f2dfd2bf971c"; - sha256 = "039mnsd6k0sgs8l1a8ngl3y817c8g657nv8v9bdw9h8l5a934cb2"; + rev = "7f8c2f1340d450951462778b412e3b18038b4e82"; + sha256 = "1zb4d5lk1gygyjqlkkjv46d0cgd2mddhgj7srlh0rcnlw3myswnr"; }; meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; @@ -726,12 +738,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-04-25"; + version = "2021-05-11"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "6ad4f8374c1c1b06146c5c866a404cd4f2b4a8f9"; - sha256 = "0nwfzsl4g8z45mj84sck7dz5yxrdgklp9l7xz3pialaz8bqsc6vm"; + rev = "2cababf4c1b6cc2e460bbbd63e69ed5d9fc2ee34"; + sha256 = "086gqc76ki8jwhhk4ihawjciwjsrq9k13bgwlnjhsp2rhm0vslb7"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -774,12 +786,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2021-03-15"; + version = "2021-05-09"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "24da62f64e6025be12ad60b16489b561f228e619"; - sha256 = "0x5z46rzhwrdr1fzq69c6bpn3dnjjj9a64s97wn220n4xwrz1y54"; + rev = "a7baf1ce934e725fbcd61b7e6aa27572c0439681"; + sha256 = "1bfi90h3xn0iz9kp2jglxsw22aq72si6xccvsfhxhjsz329rw239"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -882,12 +894,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-04-28"; + version = "2021-05-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "f0e31bf12b0dc1b8c733c3bf76fdfd9679fb63be"; - sha256 = "0js6k32jqkf4nfs7vpx6pd7ix36p2599nzd4myshfsphb470zbny"; + rev = "e1842ae0020ef53c7ed8f96ab1c51378c3323476"; + sha256 = "1r01lfdk07cybhf957zzkpl6qxiwfladk72qfc525ah2bqcrhik5"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -930,24 +942,24 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-04-28"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "b9ec10c07d4525001de2660ae1ee25ce572fa5c7"; - sha256 = "17vivrhyn4qhvw1a4bf5wycl136whiic1srpvvvh8fs4pzsc2yn3"; + rev = "fb8174a07c3a19091bfdbfc9439a15466d1649fa"; + sha256 = "041c8hhq76ih0s730zyfx16svfbzqfqyy6pl686aqikixldcz41l"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2021-04-28"; + version = "2021-05-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "2b89f3060bc0539b32ad50e2cba20de877cf960a"; - sha256 = "1hqj9gaymfkzlc0v0v0kg5ac9yn7zbv14zvwaly8bjf28q8vh5yn"; + rev = "ca02aa3b59fd3a6674ff6ce471267d1f716a2995"; + sha256 = "15r7wvcchybjp96jw9klr93sdz89qnrw033942kd0q2q19fkbxdj"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1172,12 +1184,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-04-28"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "0cb28652b7acab25ba85a598dfeae3829234fc6e"; - sha256 = "16arlh3xq8pfsicyc76jalvd6q2ld9k4xwdndmgkr2wsdmnc9kwz"; + rev = "55e81a95a65ed896670abdb3340888db9a57e300"; + sha256 = "1666wqczwi2xg4ghzdq7jsfsdbb2zrnkdgbhq0xjb3k8rs8921d4"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1218,6 +1230,18 @@ let meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; + diffview-nvim = buildVimPluginFrom2Nix { + pname = "diffview-nvim"; + version = "2021-05-17"; + src = fetchFromGitHub { + owner = "sindrets"; + repo = "diffview.nvim"; + rev = "daa7929d1f40485b832461fa919bd734da680e24"; + sha256 = "082mym32hwfyig199pdxw64fzfc8z56f0xfnia472vvb1saspsly"; + }; + meta.homepage = "https://github.com/sindrets/diffview.nvim/"; + }; + direnv-vim = buildVimPluginFrom2Nix { pname = "direnv-vim"; version = "2020-11-20"; @@ -1256,16 +1280,28 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2021-04-16"; + version = "2021-05-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "63d3c193ccb1652a972ca0def7ab82048bfb6068"; - sha256 = "0v0fd6n6fza1rj008zpjicvh9d8mcvz3kza8hhby9nx9cjlj2dpc"; + rev = "7dc1d45d7ffd275c06bf207795cf071ae6c9f1a4"; + sha256 = "1hxywy423ikfkmcyqm467j741mn0ar4c5k7li0liniygjwpiaxjm"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; + edge = buildVimPluginFrom2Nix { + pname = "edge"; + version = "2021-05-08"; + src = fetchFromGitHub { + owner = "sainnhe"; + repo = "edge"; + rev = "8f4cc117b703168f6c5d03ef65b36b095bb3f981"; + sha256 = "0rq256pwfrxpgy9w2wx4fk9jddmb0xrifhnjkdjf3cmir8xdl7mp"; + }; + meta.homepage = "https://github.com/sainnhe/edge/"; + }; + editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; version = "2021-04-04"; @@ -1402,12 +1438,12 @@ let fern-vim = buildVimPluginFrom2Nix { pname = "fern-vim"; - version = "2021-04-18"; + version = "2021-05-02"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "609610754b52d3d32616bd70094dcce3a88db3e6"; - sha256 = "1va4iaxnb03zk880k2kilsyr498pv0g78418d0nzxa4cdmvxcp5z"; + rev = "5409f2ef04e1959b5a8d177c962a57f2f2cb78ae"; + sha256 = "125bnbyjdhdj2ynrnxwn55cpq8v73zd0idlwshyk2a93w6mrxy7b"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1461,6 +1497,18 @@ let meta.homepage = "https://github.com/ncm2/float-preview.nvim/"; }; + floating-nvim = buildVimPluginFrom2Nix { + pname = "floating-nvim"; + version = "2021-05-08"; + src = fetchFromGitHub { + owner = "fhill2"; + repo = "floating.nvim"; + rev = "c47af010aa8e88758995858f0ed2771a99cd3e98"; + sha256 = "0cvs6c903bq4jk4l197vvdrk8q85rl7z7iy7cvd5m4k7yd937r50"; + }; + meta.homepage = "https://github.com/fhill2/floating.nvim/"; + }; + floobits-neovim = buildVimPluginFrom2Nix { pname = "floobits-neovim"; version = "2018-08-01"; @@ -1487,12 +1535,12 @@ let friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-04-17"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "ee28380b2300b374251b89d73e7e5b23c573e2bc"; - sha256 = "1ap2nf84gbrqlykw1l8zx01m9hm92vw57wkkzv2cqkjcbm3whqyg"; + rev = "47ef802dcb1ad384990b4842b4ba54e1af89316a"; + sha256 = "1mi62dyqiw32yl568p8nph74rb4n1hiimdv11ghrjca3jqasb6rk"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1521,6 +1569,18 @@ let meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; + fwatch-nvim = buildVimPluginFrom2Nix { + pname = "fwatch-nvim"; + version = "2021-04-26"; + src = fetchFromGitHub { + owner = "rktjmp"; + repo = "fwatch.nvim"; + rev = "5fd6bff00d7fa432cdc847819563dad90bcf649d"; + sha256 = "1jc3kv0w3767593p9capif3p0msf8ac5xal170757ghfiy2jhsp9"; + }; + meta.homepage = "https://github.com/rktjmp/fwatch.nvim/"; + }; + fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp-nvim"; version = "2021-02-04"; @@ -1535,12 +1595,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2021-04-14"; + version = "2021-05-09"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "ee91c93d4cbc6f29cf82877ca39f3ce23d5c5b7b"; - sha256 = "0zpf45wp0p924x96w9i171w5mbh25rzbmp987wpv8kgfzq7dviir"; + rev = "a88311b222eb9f90fa9fa72292e61d15c6767866"; + sha256 = "1k0czvf81f8svbrsny8x57xy594pabi8yvgb3ixylx94fpb95ap3"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1583,12 +1643,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2021-02-14"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "abbb157ac9d06fdfba537f97ab96e197b3bb36cb"; - sha256 = "008alqgqbrjh9sqgazqq1kk5hnpikd8afnia5lx9rv8c2am1d2fv"; + rev = "dec6adb151cc5514f8ea99b8568e7a4c94db6318"; + sha256 = "14k0crk6lvj6qp1rpfmldmw5w9axy7336aacpvfsh7d4a93xdjzv"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1631,24 +1691,24 @@ let git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2021-04-18"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "866b3ed000d483b27067d9bc89dbaa57a83244e8"; - sha256 = "1jj2nbsm5g1y9pw0frh35kbj17zpxy56gqym44gv8hy2wbhzwhbf"; + rev = "2a26734c6322449a56d02c25a2947e9b7519ca49"; + sha256 = "0ib0yl7zqklj9i1sgv854d3xl5sqbdf2khh9cpraik1rv23nlf2h"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; git-worktree-nvim = buildVimPluginFrom2Nix { pname = "git-worktree-nvim"; - version = "2021-04-23"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "34d1c630546dc21517cd2faad82e23f02f2860d1"; - sha256 = "0ddz2z7plw320kgsddlfywsa202bl8sxr9jbvldhh0j34q5lgdja"; + rev = "77cb4e1ef26d4133ac0cdfd3d5563b1456b8bf81"; + sha256 = "1q4155rd3rs5qr8spm7lw4yavgpv67yqgy4615agmarh94syn4rx"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -1667,12 +1727,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-04-26"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "3d378118e442690e2e15ee6a26917a5c1871f571"; - sha256 = "1ik37ppad5dzlkl237ls58hdlcm09igkklgr6zqjpili37p32z43"; + rev = "705d8376423bdf9aa3ef4f3237c25106ec4aa2e6"; + sha256 = "0fa1rw5zn0z6z106iy06wqnr0mksl3r7a3dl8fhwncmsil80dlg6"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1691,12 +1751,12 @@ let glow-nvim = buildVimPluginFrom2Nix { pname = "glow-nvim"; - version = "2021-04-27"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "npxbr"; repo = "glow.nvim"; - rev = "f3770dd754501139dd11566b8b739d828a773272"; - sha256 = "159arilpzv8pdwv4323gv85lwcz5libbk0drjkpbp2632bl9likh"; + rev = "7474d370ff5d9b4b62d8578c5c739f01b589767a"; + sha256 = "0kk5a3kskv3lb0143qdlshyd0phzivk7rdrh1234wdkcfw7llj8a"; }; meta.homepage = "https://github.com/npxbr/glow.nvim/"; }; @@ -1751,24 +1811,24 @@ let gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2021-04-15"; + version = "2021-05-02"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "42668ea643d56729467fb79c1a0a5e30289fe590"; - sha256 = "090jh2pwkl2mpycnii78457k2pkdj76l9x4p4yn9j662986imnhl"; + rev = "173f4d70115916cfb5f605c5a99e7c738dbb5e12"; + sha256 = "0y509alsjky51z6yzijfjh13lmj2na16wvwayzvf5nc19ls6adxk"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-nvim"; - version = "2021-04-23"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "npxbr"; repo = "gruvbox.nvim"; - rev = "9dc9ea64fd2fb255a39210e227fc7146855434af"; - sha256 = "04d8knfhidxdm8lzc15hklq1mm6i5kmdkik4iln4cbhd3cg33iqy"; + rev = "86bc293204a6c13f1650378c39bf248bd5a5a22f"; + sha256 = "0if2ad8s9r3pwdsqlkl6y82r0a0z86c6vlkdp28m18sxv848psx5"; }; meta.homepage = "https://github.com/npxbr/gruvbox.nvim/"; }; @@ -1833,6 +1893,18 @@ let meta.homepage = "https://github.com/mpickering/hlint-refactor-vim/"; }; + hologram-nvim = buildVimPluginFrom2Nix { + pname = "hologram-nvim"; + version = "2021-05-10"; + src = fetchFromGitHub { + owner = "edluffy"; + repo = "hologram.nvim"; + rev = "975e9fbd0c154deb9c4e212490fb31cfa4257c98"; + sha256 = "0xfwwmzmwj9s67jwr7bpazhbwdqpva7yzy4xsdx1l8pmaszni977"; + }; + meta.homepage = "https://github.com/edluffy/hologram.nvim/"; + }; + hoon-vim = buildVimPluginFrom2Nix { pname = "hoon-vim"; version = "2020-11-09"; @@ -1847,12 +1919,12 @@ let hop-nvim = buildVimPluginFrom2Nix { pname = "hop-nvim"; - version = "2021-04-16"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "998452d18934af4a527d4e1aa315fd2c74cb652a"; - sha256 = "0y17zm792fxakja4c852k9pw3lp20vgbyyzrmnc20112dll8vzgn"; + rev = "3655626906859f572b8c4ce9dd9d69e2e1e43b81"; + sha256 = "1qjg77zkgfvw9y0g9ab0fg52lx223h60r4jmrqnv89i9b0bfmz6f"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -1953,6 +2025,18 @@ let meta.homepage = "https://github.com/haya14busa/incsearch.vim/"; }; + indent-blankline-nvim-lua = buildVimPluginFrom2Nix { + pname = "indent-blankline-nvim-lua"; + version = "2021-04-28"; + src = fetchFromGitHub { + owner = "lukas-reineke"; + repo = "indent-blankline.nvim"; + rev = "ec5816267caa5fdde7a5e5a8359b9b19bc8ecf49"; + sha256 = "008q3rg6fz36k334ci30f1vci9hws4y04z8gr4wnq9q8qx57y7nh"; + }; + meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; + }; + indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline-nvim"; version = "2021-03-06"; @@ -2112,12 +2196,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-04-26"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "b437dae505b0fbb6aac92a9aad8f4fb68ea1259b"; - sha256 = "1l2kiaa44hd7x9a0w1x5kwfvqnkkzi9i7qnjnhch083chmjjy13d"; + rev = "ce59786999f4715b5c806a3a2162a1cfcf5e9cfd"; + sha256 = "1c9qyx5zd7ynpm2inws7kkig1zvs6j6j2gg5kl63ngvlcsihd0qk"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2196,24 +2280,24 @@ let lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit-nvim"; - version = "2021-03-25"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "fb5ab7d26ac414a7e7bfff6b89f69e2dd2fd3884"; - sha256 = "1nn6zhjqfk88jmavl9y8li4y08v3wb2m2kskq9yf36hadw29im30"; + rev = "acc383d1eab516318816f43e3e380fead8249acb"; + sha256 = "0w777was4z7yk3z6fn55phqzxmsbzbz0v4959h52yi91pdbb4qfc"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-04-28"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "86eaa396858a8da957d9f445e9d8bd4c0c304f96"; - sha256 = "0rq2f094jmz74krjszgahlx9qdhl4qghviy4qk64d9lygjjc8xln"; + rev = "db069b35c802df228a811b0d0a53cdc2c48e246b"; + sha256 = "09hr453mwlrv1vkdxk62qd03s62c14jzrflc4276vpmmrz78p03m"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -2304,12 +2388,12 @@ let lightline-ale = buildVimPluginFrom2Nix { pname = "lightline-ale"; - version = "2021-01-19"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "maximbaz"; repo = "lightline-ale"; - rev = "932ea5b9287b8ddfd7b7f0218bb28de52d013140"; - sha256 = "1b3xbhd32jk43z8baj1djls294whbq2qls01l90k4ihsq97jplb9"; + rev = "98a7417ff66829b1d14cb9e4e7aa6a1a0ef25103"; + sha256 = "1ripdl58pcmylgzzj92v8myjjw22h1g9g6drld9ng1qcg1zn2br8"; }; meta.homepage = "https://github.com/maximbaz/lightline-ale/"; }; @@ -2328,12 +2412,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2021-03-21"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "8a712365f9708044667589d9fffd87a4825d29f6"; - sha256 = "1622qd5lizfv65m5iy3r0bl3zy8phh4anyx93kj631p836s8y6cq"; + rev = "d70d69b3418957cdf7c4993e484f8b9d3eb1603c"; + sha256 = "1kd9qna82az80ixrwxx5c7cvjqly7ahi8b1l74fp7iaxbr0p5m8w"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2352,24 +2436,24 @@ let lispdocs-nvim = buildVimPluginFrom2Nix { pname = "lispdocs-nvim"; - version = "2021-04-14"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "tami5"; repo = "lispdocs.nvim"; - rev = "5225b347a722ba54ce3744364a3e0ff2939743cd"; - sha256 = "0x4nshkizivjz5ldb3scsxxi6x379g3rfpiplsixcs6bpxkib166"; + rev = "69fbcd854e9600b0f2c6f1c9ec4cb8fde8f5e6da"; + sha256 = "19n12m6rnv8blbavd2zkwwv6x7gjfziavc5i0zdh4h1l9x9hmwq3"; }; meta.homepage = "https://github.com/tami5/lispdocs.nvim/"; }; lsp-colors-nvim = buildVimPluginFrom2Nix { pname = "lsp-colors-nvim"; - version = "2021-04-23"; + version = "2021-04-30"; src = fetchFromGitHub { owner = "folke"; repo = "lsp-colors.nvim"; - rev = "525c57c1138ca5640547efb476758938aedba943"; - sha256 = "0dxalh12ifsghksl423bbawq096k8fcl1cgmnvaw3f2x71fngfs6"; + rev = "00b40add53f2f6bd249932d0c0cd25a42ce7a2fc"; + sha256 = "1qa1kb5abrka5iixmz81kz4v8xrs4jv620nd583rhwya2jmkbaji"; }; meta.homepage = "https://github.com/folke/lsp-colors.nvim/"; }; @@ -2398,6 +2482,18 @@ let meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; + lsp_signature-nvim = buildVimPluginFrom2Nix { + pname = "lsp_signature-nvim"; + version = "2021-05-17"; + src = fetchFromGitHub { + owner = "ray-x"; + repo = "lsp_signature.nvim"; + rev = "eb08dfbce1b8623faff6bb9a2c5c7aa8ac710c80"; + sha256 = "0bhq25lv40832z80q1fvyqz6p6cxw47miffq6cxacd0hzahw4agx"; + }; + meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; + }; + lspkind-nvim = buildVimPluginFrom2Nix { pname = "lspkind-nvim"; version = "2021-02-06"; @@ -2424,24 +2520,24 @@ let lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-04-25"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "6ba2b80b594c3ead11ab9bd1dbc94c0b4ea46c33"; - sha256 = "0xhdc18sdlbhhyd7p898n4ymyvrhjqbsj5yzb6vmjvc4d9gln1k6"; + rev = "9d9ee2d60ed22a603bd92afabd38e10eb15b413b"; + sha256 = "0b3mqn0w45wwdilxin1qsfxljm6rmzf984l9jgbgda4gk4a5df1p"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; lush-nvim = buildVimPluginFrom2Nix { pname = "lush-nvim"; - version = "2021-04-26"; + version = "2021-05-09"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "3a188f13ffcd026e1c29938ff2fb1a8177b8f953"; - sha256 = "06dk4xl1d4j06ccclzyg9nj3pcshypab5sv6wc5303by8l8j17j7"; + rev = "19b7cf9217abfc50c5ae9048d1cedd15e0349131"; + sha256 = "1gkng0nmis8xmfvywgv6gikjh4l0n5aqijhx0aqzi4k47pvp0cpi"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -2458,6 +2554,18 @@ let meta.homepage = "https://github.com/mkasa/lushtags/"; }; + markdown-preview-nvim = buildVimPluginFrom2Nix { + pname = "markdown-preview-nvim"; + version = "2021-03-10"; + src = fetchFromGitHub { + owner = "iamcco"; + repo = "markdown-preview.nvim"; + rev = "e5bfe9b89dc9c2fbd24ed0f0596c85fd0568b143"; + sha256 = "0bfkcfjqg2jqm4ss16ks1mfnlnpyg1l4l18g7pagw1dfka14y8fg"; + }; + meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/"; + }; + matchit-zip = buildVimPluginFrom2Nix { pname = "matchit-zip"; version = "2010-10-18"; @@ -2520,12 +2628,12 @@ let mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2021-04-09"; + version = "2021-05-01"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "7fc33a899acfbc172d8e12059c1ca18696346a89"; - sha256 = "05fhqvr9pinw6zfbjcdbm31c27wd94z7nyzp9f4vi8m1yhp4h6mk"; + rev = "84c9a59087e74d6bd7761cd4a920d9390c2a65f9"; + sha256 = "0qf4q5yh5f9kzxc96aq925ppj304hjnb4xxzjijc38jpvsmchjba"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -2820,12 +2928,12 @@ let neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-04-25"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "cd00786925191a245c85744c84ec0749b1c8b3f7"; - sha256 = "0770p37i6r0dwyx9chfg75zy0wcw8a044xfh7vk7ddcqcmp4flhy"; + rev = "4fb55d07e6a890d17ef6387ef4a08df112aff1cf"; + sha256 = "1slr7rm94n29i36ny00qa8rnpzgxaswjmsmrkva09gnpsik2haqn"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -2868,12 +2976,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2021-04-05"; + version = "2021-05-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "3ae169d555afb0dd8a3be4b0bb20c38efda62e68"; - sha256 = "1kjlhlnjf69hnl7aw11d211psi18qyb4l6k49xr868h7nrc2bns2"; + rev = "1315d10e60bd93483aaac4cc5a1623d13aede504"; + sha256 = "1w80id0123rbwmkicm8n053mp1wzqwh9lxxjmmp6bp6c2x97mgzk"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; @@ -2952,12 +3060,12 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2021-04-13"; + version = "2021-04-30"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "1b53686d5f1d1607dc67430e9243283fee3a9764"; - sha256 = "03qzbvry4mygx109mxxqqmbv9adh9ifsiwl0rsvfgp7kl6l6fzkk"; + rev = "ab475e1325ad6eaec15a3113f201a4e4a3ee2811"; + sha256 = "00zmrgb8f2i0i00xbqnidxln6bkz740q09cj7kysk5142z27435q"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -2976,12 +3084,12 @@ let nerdtree-git-plugin = buildVimPluginFrom2Nix { pname = "nerdtree-git-plugin"; - version = "2021-04-02"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "nerdtree-git-plugin"; - rev = "73da0283ead8fa2bbce83d219fcab3ba1e8cf0dd"; - sha256 = "17n79pmpnjnp6nirz4m4wwgfacrg26bdzjn4xj8i6ldkff5n20km"; + rev = "4524fb465b11881409482636ae716b4965011550"; + sha256 = "0cvb33drkv3rrgbniw9bz8xkxyr4cf0lyay9waw3lczpl2wmfwbm"; }; meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; }; @@ -3036,12 +3144,12 @@ let nnn-vim = buildVimPluginFrom2Nix { pname = "nnn-vim"; - version = "2021-04-27"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "422cd80e35c81a303d16a600f549dc4d319cecf6"; - sha256 = "187q3m0llrwmrqskf14cqy9ndvvj8nfnyrw46f8mdkrslkfs9vf2"; + rev = "c678c7e4e7ec5656c984708ad8823453ec425fa7"; + sha256 = "0kcr51vq0z5c7fhs5pdbbba2qnfqk2hl2ksprdkjf6l8nln0g8nw"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; @@ -3096,48 +3204,48 @@ let nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-04-28"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "0cacd33ec635430c80fd5522bad47662d3780f55"; - sha256 = "18angbsm98zzbykdh83xkl6m8cbnrqvxg3n0v9abwi2r02wnfwqb"; + rev = "0da518e9ccaa78355a3d5b08b4ecd5324b918789"; + sha256 = "13qdll3khcxgm32l9hqvnman3c8a1p8q34x0ry6p0yqlx2da05qx"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2021-04-12"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "9d6649c01221680e5bb20ff9e2455280d9665de2"; - sha256 = "18a974l753d92x3jyv5j0anri99hxzfw454lkz94amabbnc010p6"; + rev = "550e235da7edc910bc3c8018ce385a85d705bc67"; + sha256 = "1qvls8hmj2pdl3kk366667hwmw01hh7fp4nynn0xvyfkbw1bcylg"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-04-25"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "56316fcc87d2654903e4213817d5fba56008c81d"; - sha256 = "11z40nm53r5nq1h4q0l1gfrly2zdaqzp4li40zxzp962b80f0wxv"; + rev = "582e913d23e7afaf8f54beafd7dd21b1aea65ddc"; + sha256 = "0i18dzl6nwpk88qsdz7q155kscxgzma4p7nikszvqfy64dyxf3y7"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-04-27"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "41debce12f99970f13c16dfd4fd89da64cf6abcf"; - sha256 = "1ilsrcil3d7fwkfy1xqbcim0fc2ydal38b4xrvgv07bvih9pwflp"; + rev = "f395a14247ab5ca76254945c8ad8bb646a1c0f1c"; + sha256 = "1415v2cc6g81b6hh5h6ikqbr7qyzipbmbs59jb2jqqbjr5rwffg5"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3168,12 +3276,12 @@ let nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-04-19"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "99452ae6875889c12653963b68e53c4564848954"; - sha256 = "1d5hpn3mr2h3s5h2svajbxm0n49mmc5w0sip9cpzyfdpbnv1gic3"; + rev = "efe3a6614e74c5eafec89e5b256ea514c5e1ea15"; + sha256 = "00n9bh8m89jrg4jqaz34c8sp7y1h5x3v06xjir465635g66vq20h"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3192,36 +3300,36 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-04-23"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "c6cb4fcbc91b0404ae157f1942e305d66073ca1a"; - sha256 = "07mncx8bzigbh6yy7nbsgjb3g3fm1kx73wb6p7jl6h9ay3fmgrfc"; + rev = "7c6d12132339d7ef4136dabdd316a20e9c7dd8cf"; + sha256 = "1hjf67pn1brrfyl4lyqg4y7112r8p3ak85iimgb9pqgrifr3xpzm"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2021-04-26"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "96b8e0423609a23cb971edb1d10c757d7930787b"; - sha256 = "0z84xisjj4a0blfy7ds5hlwvvr6yc7nwiqglli1h6lp7abxs5xx0"; + rev = "29a79b7c15e7e15a416bcaa0efddfe67928b7bdd"; + sha256 = "0wl9dl83cx2hlik7yx6kknb7spsaqlzri2kybf3xcna44mqfq688"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-03-07"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "07aa4b435a832b122154a157ab6892ac4efb81fb"; - sha256 = "05cgypswm7qdl26jd6nfqahk2bmqvp482k9zjbk0an12kbzlsrz0"; + rev = "c2fd4d042c94d4246e583d7d0231365790fdafac"; + sha256 = "1kkq8l2c9142vbr2lbs1gc95np8mfaxyldzkaabydh99bh4z72v2"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -3240,12 +3348,12 @@ let nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-04-26"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "a23ce7882d3caf4df00e79c515c81633055bae45"; - sha256 = "0xlz3v4zzaklnkr5sx238i7d8agxbsk9zbs3br0dfjdbrvhgii02"; + rev = "1f7904ed99fa94ad9009fa5ece431fb2416558ce"; + sha256 = "1wdg6cbjzvfgxp5cn2pb10bkf34fxi5682x3kbk6hmlmrcipqlnv"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3264,12 +3372,12 @@ let nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-04-28"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "f449589f6c56426a82adead43fe8fdabda0454fb"; - sha256 = "0l6f2596cdwbrwyacc6w60ad8616ivxcamjqcx3jizw5b6wlb475"; + rev = "6fa8c5a9459504c2a090c0028b27da951e35a354"; + sha256 = "15zqxsjp3frdihl40r4141ml4kiydxqw4arjirzqzrsrblxavd5c"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3288,12 +3396,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-04-23"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "62977b6b2eeb20bd37703ebe4bc4b4c2ef006db2"; - sha256 = "0niwaq3mc7x1zaf3qx9dp43607rnhq2nvyizkxb7j1yir8a8dk4x"; + rev = "0699e6c16c37c08418339675d142af0e00ccbeaa"; + sha256 = "0rdqxcrcybvdspl22xzyrvv4rqikhq2liqja0jkf2xavc42j7fxx"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3312,12 +3420,12 @@ let nvim-nonicons = buildVimPluginFrom2Nix { pname = "nvim-nonicons"; - version = "2021-03-18"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "yamatsum"; repo = "nvim-nonicons"; - rev = "f136ab905ac99c9bd20a8bc4c470eb33768c54a0"; - sha256 = "1590gszcra3pagva6zplib35fqlgj26masjq3i6qgq85kpx5s55j"; + rev = "5056aebb8d0ecc87b26a4f7fe9e9e520e5ea493f"; + sha256 = "0z1j18hb5n3500b6sxm1dsya9yd9jnnywhhw9z3sbndb3irn2mny"; }; meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; @@ -3336,12 +3444,12 @@ let nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-04-29"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "58f5ba925b51cfd7edf73e1135588403151bc719"; - sha256 = "0033r4w4lh59a0ghvpk5r7ww4s46airfgi4idgizsc6w8xkrj2yy"; + rev = "bf7155b11278b5c849ddde2da76bfade668d8a92"; + sha256 = "01pcvq1kany4nrni4g7jnqkdg23bgyl68hfwfqcw8xabrl46p746"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -3360,12 +3468,12 @@ let nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-04-28"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "7e153f1a636d0dc92e013da3177bbbdf34e415a3"; - sha256 = "0djjvqx52anrsdar68l4alyiyxwfbcq6bfpdjcghyhnwmnnygb3n"; + rev = "46ffb283c490f96b31d699b766471f83da0bc0cf"; + sha256 = "0pimi8hm213n17lkiyz7ib4d804grzv3pzv060nh3qagdvi5rvnx"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; @@ -3384,60 +3492,60 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-04-28"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "bbf3f87884756330793510261193b0a725fb899b"; - sha256 = "1974jpw2sjz4v8vy7y665bl6avflsv7pdqmq9ahlqf2lw59x13hy"; + rev = "4dcc3fb4b38d4a29d175fda69a0bf35b2aa675c5"; + sha256 = "08aigjgwlkxx8x4g6pr8mc04liax0mq0bw7b6781fsfsxgf17g6q"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2021-04-18"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "d5070fb1171220e8db6eef77ed994079198d6522"; - sha256 = "1x534yrbjnf4bny3bykj7jkydhkjxspmipkbb685ja4nppc2lp41"; + rev = "b497f282b3db3d3e8641d724c49aedff0d83924c"; + sha256 = "0n5mdni9pvxg1cj1ri0nch4wk28kx0sy0k2vcw7c8d0pw5hfadqb"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; nvim-treesitter-refactor = buildVimPluginFrom2Nix { pname = "nvim-treesitter-refactor"; - version = "2021-03-17"; + version = "2021-05-03"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-refactor"; - rev = "edf1790d9cd365785d4f86848c079704aa7e4854"; - sha256 = "12rp2mj7va5qf55jzca0rgy1xrwkyf7p3zd3xw262m9lqm4hjqqc"; + rev = "1a377fafa30920fa974e68da230161af36bf56fb"; + sha256 = "06vww83i73f4gyp3x0007qqdk06dd2i9v1v9dk12ky9d8r0pmxl6"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-04-23"; + version = "2021-05-11"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "522b26a8795994b719a921a03cfacb0d7dcabf78"; - sha256 = "0ww1agq33l3jhbfwr5ri9m3ipr48kgwzlzxv96w43x6y29p61g2v"; + rev = "4f1ace57fbeed1f4e5613ea8c9b414ff0833eade"; + sha256 = "1in2q3igq74m900rkchdcgfcy3h60663b58xn2ydlbjsbzhc7vrn"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-04-19"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "d42bf9f52607c1cb281db570f3f47e0d84b03a02"; - sha256 = "13ndyskp3yx3nazg6xc1j3lzad588a1qdacs6ymh8vs616p5mqsf"; + rev = "5ef9c414cef1419b8576c62f1079b22315c72a04"; + sha256 = "1lxg9prli5zvy5f9ld83y1fjbm7y4ifkyvq16naxjr3grhp0lg76"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -3516,24 +3624,24 @@ let one-nvim = buildVimPluginFrom2Nix { pname = "one-nvim"; - version = "2021-03-20"; + version = "2021-05-05"; src = fetchFromGitHub { owner = "Th3Whit3Wolf"; repo = "one-nvim"; - rev = "b1461ea89c940bdc5ed142327e1cd85ed2c0e877"; - sha256 = "1w5avzyrcbg60prx3239iazcjvh2mk7lk6k256a1iyxb6dnkpbas"; + rev = "75e845eacc23f544b8990b5b6d10d8edf58cacfe"; + sha256 = "0zwz2kak0hk0kam0klh3ydynlw814g56vrqdn679ca6xqwzcihy3"; }; meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/"; }; onedark-vim = buildVimPluginFrom2Nix { pname = "onedark-vim"; - version = "2021-02-25"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "b70ed293f3c3adaea23f9fcd84ef942015664756"; - sha256 = "0wz4kmbgc9rlvbxj8s8xg1sx53w0v94r6qicq3ggs9raca51ywfg"; + rev = "bb949122420fd4ae7b29fdc467cf3a9c39d48882"; + sha256 = "1rrx97j4n1qmqfpc1shh00vw01ivhik70s50rdk9hsc7lmxnwxxh"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; @@ -3576,12 +3684,12 @@ let packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-04-28"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "c742488c5a9b5f8b04e5a85f6ab060a592a987ff"; - sha256 = "1yl9sq5qi4rbfzvm4n4ynrlvcfvca1vy8pa69c78pyx0lr3qh7z3"; + rev = "af1a46466c5752b9d1953fb508d2544473f4821e"; + sha256 = "01nkgvqq9v1bc729pd10ghih60d42iap6ivm7n39419rh2df9qsv"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3660,24 +3768,24 @@ let playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2021-04-17"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "a141bf5c9734ac164cb0dda5e7a2b8b16273a4f6"; - sha256 = "1grhxhnh5zij2brlk2bmy3b2y8bp9j75hyajfki8dk908pplng0i"; + rev = "79f71e2bd73978dfc7d228042d5e90c8545df623"; + sha256 = "1yrf0bdfn7xqmkzzwkzcf2hbcyaf21va3nd7fr5c9f4cvin3p0vr"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-04-28"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "d4476cdac636f3e6ae35aa9eb9bda6cbf4e11900"; - sha256 = "1axdm1kxdzwlhkpd4p59z5fkpj0igjpwgcy5c99w83gad66z1kwb"; + rev = "3f993308024697186c02d51df1330bf07c12535a"; + sha256 = "0riw3wy94qhbdvx32nmlc1s85n3ykg64n45p7i7mii0cd17mqm27"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3709,12 +3817,12 @@ let popup-nvim = buildVimPluginFrom2Nix { pname = "popup-nvim"; - version = "2021-03-10"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "popup.nvim"; - rev = "bc98ca6df9179452c368f0d7bac821a8fd4c01ac"; - sha256 = "0j1gkaba6z5vb922j47i7sq0d1zwkr5581w0nxd8c31klghg3kyn"; + rev = "5e3bece7b4b4905f4ec89bee74c09cfd8172a16a"; + sha256 = "1k6rz652fjkzhjd8ljr0l6vfispanrlpq0r4aya4qswzxni4rxhg"; }; meta.homepage = "https://github.com/nvim-lua/popup.nvim/"; }; @@ -3779,6 +3887,18 @@ let meta.homepage = "https://github.com/python-mode/python-mode/"; }; + QFEnter = buildVimPluginFrom2Nix { + pname = "QFEnter"; + version = "2020-10-09"; + src = fetchFromGitHub { + owner = "yssl"; + repo = "QFEnter"; + rev = "df0a75b287c210f98ae353a12bbfdaf73d858beb"; + sha256 = "0gdp7nmjlp8ng2rp2v66d8bincnkwrqqpbggb079f0f9szrqlp54"; + }; + meta.homepage = "https://github.com/yssl/QFEnter/"; + }; + quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; version = "2020-12-28"; @@ -3937,12 +4057,12 @@ let rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2020-10-02"; + version = "2021-04-19"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "d83f5a8e070a1fc7e7af0aeea58e71b78956daab"; - sha256 = "0iwj01p9c2kczhx69vxrh1qd4z41ymcgfq5235b1l0rnz4d6v82y"; + rev = "f97caeb0cf973c81e5b0be83e1f0f67bb5f28cd5"; + sha256 = "1l296pzf1pz7ahq57bdgnmpsaqi0snp503dp4xlwgay9xax803mv"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -3985,12 +4105,12 @@ let rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-04-23"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "7d734e9b52fe54b6cd19435f0823d56dc2d17426"; - sha256 = "181vq3p1f136qmb0qbd77khc04vrkdw8z9851car7lxs5m83wwp2"; + rev = "6f92ba636c06069592c64f85888b452da7e81cfd"; + sha256 = "1ng259hs6l6q17hc3y2iyd7v9xm6mkfg0jbpwgrbk4pf2clpn2aa"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4007,6 +4127,18 @@ let meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; + sad-vim = buildVimPluginFrom2Nix { + pname = "sad-vim"; + version = "2019-02-18"; + src = fetchFromGitHub { + owner = "hauleth"; + repo = "sad.vim"; + rev = "2f5b33b239a566ffedaa81cee3051bb613482d1e"; + sha256 = "11kxnrp3b6qc2rcp5jdqjb7cxh6lqy09v3yh7dk4kd51jkgxqbn4"; + }; + meta.homepage = "https://github.com/hauleth/sad.vim/"; + }; + salt-vim = buildVimPluginFrom2Nix { pname = "salt-vim"; version = "2017-07-01"; @@ -4079,6 +4211,18 @@ let meta.homepage = "https://github.com/osyo-manga/shabadou.vim/"; }; + Shade-nvim = buildVimPluginFrom2Nix { + pname = "Shade-nvim"; + version = "2021-04-29"; + src = fetchFromGitHub { + owner = "sunjon"; + repo = "Shade.nvim"; + rev = "0196387bba50b8d36cec99cd6483583ff2dedb42"; + sha256 = "0831k71gm8rpl54x63v7mgp9i1fgxydp2wig3yyd98dc7z9d8f48"; + }; + meta.homepage = "https://github.com/sunjon/Shade.nvim/"; + }; + ShowMultiBase = buildVimPluginFrom2Nix { pname = "ShowMultiBase"; version = "2010-10-18"; @@ -4093,12 +4237,12 @@ let sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2021-04-21"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "93021c0623c1822502a72131e2d45617510428b9"; - sha256 = "042d7zmwmi0xhlshwwrf9bhc0j4ybksxxnrs986vm65y58c11fk3"; + rev = "8097848380b5aedb487bc20879bcb2ab3220a8bc"; + sha256 = "1cl25p3cpb5k36vpk11cr092i1hkhbd781xbfawvr42jfkx2170p"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -4165,12 +4309,12 @@ let sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-04-24"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "784de58d2bcad8b16bce972c1727fb0cb07e43b2"; - sha256 = "04wlqd902fy474mk7688y2mysy8vsm3pf36d59bxd3jlspgp6zcl"; + rev = "11c554bdb70977f508d3a3ccaf87734d7b2c2e17"; + sha256 = "0xza499wjmf1v6zvc0j2s893rhvii4llk7z4rry991bc3fcbf0md"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4235,6 +4379,18 @@ let meta.homepage = "https://github.com/chrisgeo/sparkup/"; }; + specs-nvim = buildVimPluginFrom2Nix { + pname = "specs-nvim"; + version = "2021-05-05"; + src = fetchFromGitHub { + owner = "edluffy"; + repo = "specs.nvim"; + rev = "a62319a224b73b70af47a48ba076d7ec67b08526"; + sha256 = "1hs7qp3fr451ziddv08nyygnxx1n6y32fr0y97s9zjc7j13d3nc3"; + }; + meta.homepage = "https://github.com/edluffy/specs.nvim/"; + }; + splice-vim = buildVimPluginFrom2Nix { pname = "splice-vim"; version = "2020-01-15"; @@ -4346,12 +4502,12 @@ let supertab = buildVimPluginFrom2Nix { pname = "supertab"; - version = "2020-10-01"; + version = "2021-04-30"; src = fetchFromGitHub { owner = "ervandew"; repo = "supertab"; - rev = "d80e8e2c1fa08607fa34c0ca5f1b66d8a906c5ef"; - sha256 = "0wjaq6k1sb38qmjcp47cr0avvwhphr0wiyl8qvnc8qqyjf8y803k"; + rev = "f0093ae12a9115498f887199809a6114659fc858"; + sha256 = "1r1ck62raxhwcxjv7hic7jm9b5inm1vdqc51zn4nybclys7grnss"; }; meta.homepage = "https://github.com/ervandew/supertab/"; }; @@ -4370,12 +4526,12 @@ let swift-vim = buildVimPluginFrom2Nix { pname = "swift-vim"; - version = "2020-09-04"; + version = "2021-05-05"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "bfc662d11b3a006815d0b6972c1c0c2ebbc3b16e"; - sha256 = "1qf5f9p0kfi6bq2qi9izarva6r711vzlbrbdax8nq9g0pxa1bj3f"; + rev = "74af6626f63e331b60524d20dd69c9c5d03dc90c"; + sha256 = "0cizij9lv93yg8fxnh04vfpywaxywprmkcsvwginbi20hz155q4g"; }; meta.homepage = "https://github.com/keith/swift.vim/"; }; @@ -4430,12 +4586,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-03-23"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "f6012cb65da4bda46b0779a36840df36ad01483e"; - sha256 = "08vb3ffm1f47q5gxyqmmfv75x12001qpkqml7v612wnnfpclcqf5"; + rev = "fd4bc0f0e4e3a3bb09d48e7176e992b0613a4c68"; + sha256 = "0p3cd9qywx5xgas7mvn0a7qvsnmmpf8gpn8yix8r3vyhcg7ah5y6"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -4551,12 +4707,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-04-28"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "ad30a7b085afd31c66461b61e268aa88527199bb"; - sha256 = "0191bax9mpw8q4hy126wyyyxyrb79c89m01plmzh66baiahd3sxv"; + rev = "69eb5eacff421e05aeb1e02ff97ef64bfd955c53"; + sha256 = "1yn5hzv57lld6zpxd7cqnjhj3qb5l9ngnnrb9kfp6c6gy137wlj8"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4645,6 +4801,18 @@ let meta.homepage = "https://github.com/wellle/tmux-complete.vim/"; }; + todo-comments-nvim = buildVimPluginFrom2Nix { + pname = "todo-comments-nvim"; + version = "2021-05-16"; + src = fetchFromGitHub { + owner = "folke"; + repo = "todo-comments.nvim"; + rev = "0f6a87bb04925775bb2fd68c063152512e033313"; + sha256 = "1w2qgchd8r553i836pb4zjy2h23nryd5nfc905h5nxw0jaqb1f4i"; + }; + meta.homepage = "https://github.com/folke/todo-comments.nvim/"; + }; + todo-txt-vim = buildVimPluginFrom2Nix { pname = "todo-txt-vim"; version = "2021-03-20"; @@ -4694,6 +4862,18 @@ let meta.homepage = "https://github.com/tremor-rs/tremor-vim/"; }; + trouble-nvim = buildVimPluginFrom2Nix { + pname = "trouble-nvim"; + version = "2021-05-15"; + src = fetchFromGitHub { + owner = "folke"; + repo = "trouble.nvim"; + rev = "4375f1f0b2457fcbb91d32de457e6e3b3bb7eba7"; + sha256 = "1szn4fklxm23nbi30arx6qqf96v0s1v0q11vqx886y9a6c2i325m"; + }; + meta.homepage = "https://github.com/folke/trouble.nvim/"; + }; + tslime-vim = buildVimPluginFrom2Nix { pname = "tslime-vim"; version = "2020-09-09"; @@ -4744,12 +4924,12 @@ let undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2021-04-02"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "101edfb795bc17b814efb12e6df6a884507a34f6"; - sha256 = "0fa2iqgzc85955ixa4hf1mjy7sm7hrbkha5l1scganc9zswd5iv2"; + rev = "271c56586196b8e42cdcadc8037aa5d3051071c4"; + sha256 = "1sjsv4zzmkkj3l56gbb5f0ad0g6clh1wc76q4d6qsaqv4qg4nsal"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -5080,12 +5260,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-04-28"; + version = "2021-05-09"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "30f8ada1d6021d89228092b3c51840916c75a542"; - sha256 = "0mriz1c0yfwavgmawj52n42rxzsmi3mchww5wlkvs6274am63da6"; + rev = "ab4962b83866e181b989cb550c527cbfa327942c"; + sha256 = "14df2fk5psn27v3rhpxv1h7yhpkzl4rzld7i148lm02cj0qahnhq"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -5104,12 +5284,12 @@ let vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2021-04-16"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "0f9995d5996adf613297896c744415cd9e6b7a80"; - sha256 = "1zwicvlrfpvgczjnzjdkjhv2b110v5xbmvj132xl8a7xsj3rzg1d"; + rev = "140238f65ef8168f2b046c52c6297cc596f8b347"; + sha256 = "062c12db6dhi3dv83iff1b940idhipimk3hsjcp1i4c3mbxxr78p"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -5176,14 +5356,14 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-04-26"; + version = "2021-05-07"; src = fetchFromGitHub { - owner = "Chiel92"; + owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "916f9e10461def8c71b5359c0e0b7a08f80d5fc5"; - sha256 = "1sn631dyqni3hf5psn2jhndzckw3p5vl7i57p6i5n6n3lhzzcvj7"; + rev = "58bbc3c8751ba48d1c0ecba040ce43699272d800"; + sha256 = "0ylb8jljin1g5big1lfjrfww576fcb1wakz5shial8xgpw9w1hx1"; }; - meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; + meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; vim-automkdir = buildVimPluginFrom2Nix { @@ -5236,12 +5416,12 @@ let vim-beancount = buildVimPluginFrom2Nix { pname = "vim-beancount"; - version = "2021-04-16"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "nathangrigg"; repo = "vim-beancount"; - rev = "dd2f56a122b698454af582cbe7eae471dbdc48f8"; - sha256 = "00wcq3wg02rjzhc83cm4gvc9fw78a7s5gds4qdn7zqf55ha2d6vi"; + rev = "2f970a0c826275f7d07fa145ba9a35c15b15232d"; + sha256 = "0fzacrlfr8fy5j1kps1mbkik0ln7lgd9c9jv74xd3mrz50hzqzby"; }; meta.homepage = "https://github.com/nathangrigg/vim-beancount/"; }; @@ -5356,12 +5536,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-04-25"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "1afdd263a862bae0641f565e3f2952e1c01cec43"; - sha256 = "0c2jrz02dsdykc3xxqw1yfnllmrpwzs6ygjqcclghw5mygfc3xcg"; + rev = "f343ae73bbc678be228791d7891996db12fbee47"; + sha256 = "020xbya3hk0mz658g5jwkbk2v1313v2aa5cj8sl40cgqzp0lgmm1"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5548,12 +5728,12 @@ let vim-crates = buildVimPluginFrom2Nix { pname = "vim-crates"; - version = "2021-04-03"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-crates"; - rev = "96a40ee5c976390c142b0074d7a4a7e54b0cfa00"; - sha256 = "0nd8w4rx1s0fnhxn0ngl3dxj94ar8vjn611684v5pbxdpj6b92fm"; + rev = "f6f13113997495654a58f27d7169532c0d125214"; + sha256 = "1acm52hlv0qhisgcy8xwck6zv29b8x40bcngg7z3invv47b1gi7k"; }; meta.homepage = "https://github.com/mhinz/vim-crates/"; }; @@ -5572,12 +5752,12 @@ let vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2021-02-02"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "8dd7f1bf25acee493a5114e627ea90a9850c5fa8"; - sha256 = "0pjq14i7w2snlbzsqhfdn0fkribjsyngg6fcmpgacm4jvx3iviql"; + rev = "fce515d173d8d9bbf279e1fefea5eacd6be98be8"; + sha256 = "0hb97jhhrqi6drzfzirg9wdyg9jprw8pzd9ahklx380w2pkvzz4n"; }; meta.homepage = "https://github.com/ap/vim-css-color/"; }; @@ -5620,12 +5800,12 @@ let vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2021-04-22"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "63bfd6d99ba17832f4740efa5e2e6ad6537d4552"; - sha256 = "0p9n1n8n0167kgq4wwwxsnair2hqqvy6vwcqchnb15hifl3cl0w3"; + rev = "fb0833459d3c329df2e861eb8cc62b60295b62af"; + sha256 = "1wwk110kf8y8gcaqq1v0alhpzb90fjx849zkkr6zia45xgrzwmh2"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -5654,14 +5834,26 @@ let meta.homepage = "https://github.com/konfekt/vim-DetectSpellLang/"; }; + vim-deus = buildVimPluginFrom2Nix { + pname = "vim-deus"; + version = "2021-03-28"; + src = fetchFromGitHub { + owner = "ajmwagar"; + repo = "vim-deus"; + rev = "1be965e7bc1c01e7db5e46dcd0e50d32d4eef434"; + sha256 = "1h0imrxhxw81hkh9xl75rcnx7ll5fry6hcf7flx84n6nawvfzyvm"; + }; + meta.homepage = "https://github.com/ajmwagar/vim-deus/"; + }; + vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2021-02-19"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "4d14cb82cf7381c2f8eca284d1a757faaa73b159"; - sha256 = "1wwqchf50c19a5d5g037rjjpskn7dpsq9alhzim2x6bgffb5yamd"; + rev = "4c2df59e37b6680e0ec17b543b11a405dc40262c"; + sha256 = "0knpfl0lwiy0w2f9qd3gz3yl03dqzn6fllv0isl0iz24csya6v2h"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -5774,6 +5966,18 @@ let meta.homepage = "https://github.com/junegunn/vim-easy-align/"; }; + vim-easyescape = buildVimPluginFrom2Nix { + pname = "vim-easyescape"; + version = "2020-11-22"; + src = fetchFromGitHub { + owner = "zhou13"; + repo = "vim-easyescape"; + rev = "fd7875f1657fd54fae85088acf289b9723d8a790"; + sha256 = "0h8kmhliicbdqhximp3d961crp6qkjjs4yciksl037ds47kzrkif"; + }; + meta.homepage = "https://github.com/zhou13/vim-easyescape/"; + }; + vim-easygit = buildVimPluginFrom2Nix { pname = "vim-easygit"; version = "2018-07-08"; @@ -5824,12 +6028,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2021-04-21"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "c3cb96e153728fbfd050173b4af19118b131f278"; - sha256 = "1v0rgzpnpanics4zhx3y9m6ppa727yc0mvcx065jg2a2a1563sgy"; + rev = "6dc61ad4dcfa520d56f3a4373bd507f529a25382"; + sha256 = "1rqr16wcwzrs6w9iwg4wghqm7nb1jgzwjmfimvclnkbqpp8ssaq6"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -5968,12 +6172,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2021-03-20"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "e04a615e72ec2e216116b5c6514ac4d86b21ffc3"; - sha256 = "1q17xlwprkvx27fbb9xg1zh5nyx8gif3pp6p8vd3r6zhzqqdl469"; + rev = "07b0256b08e0da6d31200663cbe6d6f8c995a287"; + sha256 = "0zp3ghiqyg1qf8rxx5a1hqxyz4sqqw1afbh9qzsjlw18g0va86kj"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -6028,24 +6232,24 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-04-22"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "4a1938457489fe072acf2fbbe7142a3cfb0d8ad8"; - sha256 = "1va57czyrihcc2cihbbil5vqhnlzvjrb9bw7wirdrpjrd04ciaa4"; + rev = "1c63ac05e6bfe99cddcbf39dcdf84ff4660696e0"; + sha256 = "1yryf2dnkhphivnm1miakya8jq37iszgl97mjjar35819vrz7hab"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2021-04-26"; + version = "2021-05-02"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "30fe977b46bee7a7005fd808d14aa425149f4563"; - sha256 = "1ap1ghyi3f61zi5kc17nc7sw4dh3r7g2mlypy19hzhrfxysdxz7b"; + rev = "cabecb166bde31d9fe86caac7e51284cff575da2"; + sha256 = "13ybny4i20p6xi6rp6vzngbrjwjpikvcrhg8spj1g9n2z5wcc2xz"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -6088,12 +6292,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-04-23"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "8f4a23e6639ff67c0efd7242870d4beed47b5d37"; - sha256 = "0ss8qlxgidlf1ma6z3ma63lqgaynnbrj9fdbw38szwc823vdqiid"; + rev = "0868c30cc08a4cf49b5f43e08412c671b19fa3f0"; + sha256 = "06pqam0ap0pb87gr8dvwzvnx1i62g73l81jrnwl7mzzz26p3ircj"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -6136,12 +6340,12 @@ let vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2021-03-18"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "e9058ebb9b9563ec77bc96fb19b2138f6512beef"; - sha256 = "17wpar2ais3cx1jaak9l8fck7fks2yczn7flcvgfcwvjxd9vyxgq"; + rev = "0fe3f4eb4c4477d3dd09b155e20d128d99b1da3f"; + sha256 = "0viys51afhflfz3zjg769v7zxz422a3jra079ld94mn3kqan8lra"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -6208,12 +6412,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-04-28"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "a2f964d0e22b9023e1f0233b611461d64dabcd4b"; - sha256 = "1gwb2wncdqn51ifp3pkgjz1lw2c7fzavh43639scj9mdj8rr6r12"; + rev = "8c883d7f30c220d572177e8ff1d3945f618b492a"; + sha256 = "1sjxrkbx4hba7nyysp3jpw3hlxz9vfkxj7bn0xzmgdr7s598mxxn"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -6244,24 +6448,24 @@ let vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2020-07-12"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "e9004ce564891412cfe433cfbb97295cccd06b39"; - sha256 = "1cs72x3wv4i11x7ch3gna1sxqn5zj3bd34smchfd00g4mf201lhs"; + rev = "b80004c050501122d58f82712b21d0b7c8dfc019"; + sha256 = "049552dvsk14hx4h9rp9g65xkf13n42z304lzxca69j5q6k1qrdl"; }; meta.homepage = "https://github.com/mhinz/vim-grepper/"; }; vim-gruvbox8 = buildVimPluginFrom2Nix { pname = "vim-gruvbox8"; - version = "2021-04-22"; + version = "2021-05-03"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-gruvbox8"; - rev = "217a87f4f751ed0d6fe5c79b2c0963f557bf0314"; - sha256 = "1gdys8ycmmykq121ix34wva75m18nda0camiqr4aavb9hj32faj6"; + rev = "68253ac63780918b02669ec15ac5bc3aa36e4641"; + sha256 = "0k355wqh8x8c35qvll494v98gbvvly96w79d94srzarvj4h9as55"; }; meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; }; @@ -6678,12 +6882,12 @@ let vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2021-04-01"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "fc059e80ff0b368a9188d6c16db052da6ac0951f"; - sha256 = "03x8hhaf5mirk38gb8j7k3fk6jjis64a4r2hnvkgg6hwf9h02f2g"; + rev = "e9e8547a57fa113945047c003d321fbbee770e03"; + sha256 = "15j7fb20rz6gndm04ac9lfwrbq9ss5pk9ilxj90rd1dmppvkdkfr"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -6906,28 +7110,40 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-04-29"; + version = "2021-05-03"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "b6898841c771df0a5231f74145e0813533d44def"; - sha256 = "0r5hg2hjcmwm6mkm7s41wij6hdlfq2g5xjvgg0bn8nhyn4048mgd"; + rev = "1f98a0656620bfc03dcb8bad87aa76a6304b3b73"; + sha256 = "177l1xbd1039mmxwk2ggbjawvnpqp362w0mnqvqs2655ib4zdbq3"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; vim-lsp-cxx-highlight = buildVimPluginFrom2Nix { pname = "vim-lsp-cxx-highlight"; - version = "2021-04-25"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "jackguo380"; repo = "vim-lsp-cxx-highlight"; - rev = "ce92c8e9b1ab587eb22ad017d536619b6a100d09"; - sha256 = "01h0lmxi9ly6qhywi5n7hzq881ff4kld7gzpzci81vflmi5k1gnx"; + rev = "9e42350272a413a51ce9a93b00c98682815ff7c1"; + sha256 = "1nsac8f2c0lj42a77wxcv3k6i8sbpm5ghip6nx7yz0dj7zd4xm10"; }; meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/"; }; + vim-lua = buildVimPluginFrom2Nix { + pname = "vim-lua"; + version = "2020-08-05"; + src = fetchFromGitHub { + owner = "tbastos"; + repo = "vim-lua"; + rev = "fa810f85437525bcea0fc4ff22c634935721d86d"; + sha256 = "1fkpfjpmv80lcd7jn95pzxrcbzn8avdywjknd5bn3212ahydg43m"; + }; + meta.homepage = "https://github.com/tbastos/vim-lua/"; + }; + vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; version = "2021-04-28"; @@ -7003,12 +7219,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-04-25"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "a39772e2fbd464776b0aa025ca04c2504379cf72"; - sha256 = "08sj11x507nh5fi5zx88p31wx936saqvw641rdwlk3g20b99sinj"; + rev = "f30d2d2d3a60905a09b516f843c130232da10060"; + sha256 = "0fj4hn481n5rg7z9hkybzpa6zv1dqc120i6112c8wasl89rg6xl5"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -7063,12 +7279,12 @@ let vim-monokai = buildVimPluginFrom2Nix { pname = "vim-monokai"; - version = "2021-02-12"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "65fa0678d8426ae2cc7a4c42a8f0d72bde2a7bbe"; - sha256 = "0r118mxm34kr8yk66x9ddg2yh44gn00iaxljfbhg43nhp8jyzjbn"; + rev = "66f7dc9c63296ea6ba408faa60bebe54a34c57f2"; + sha256 = "10ip0y9p2qf869h2yhp2zs6qc048rw1x5i0spziajca96251gvig"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -7339,12 +7555,12 @@ let vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-04-20"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "2a0af02d0fd59baeb84cf865e395827750c875f0"; - sha256 = "06vrham1zg5vfr4q4gmz2ski4y02c3bfivzy4rlfvjs81qj3vn3m"; + rev = "a2d1adf046d1ce09499fcd5d595a5376fa43bb05"; + sha256 = "0a2sakpw32gdvw6nraz6m3ifnb06ir0dyryh07ck719pkn9kp000"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -7387,12 +7603,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2021-04-16"; + version = "2021-04-30"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "5af0dcf7878a8c947ae5a69989524f0a1ba5f6da"; - sha256 = "17vb0xnzq6ic9naqg2wvjdh7s7ckz82ixv45pknxc21b6wjrfc75"; + rev = "587399591a9e9b8da9846c0d724a84a3bd1ce98e"; + sha256 = "1xghmq15i8wqfwx7gib8j54c5s3an9q4idy6c6mbywd75s4384m5"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -7507,12 +7723,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2021-02-08"; + version = "2021-04-30"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "cffcfe150bda75177920530c5f1911b52f70a065"; - sha256 = "0sgfnxi1f5mnzcbklcmq6x17r1z1kz8s7h2h94girmd4aga3gcp0"; + rev = "fc2813ef4484c7a5c080021ceaa6d1f70390d920"; + sha256 = "0fsl8w17z15sj21x5gd5ah5p5fjsnk0gzdx2n2p0jnkcb05bwzck"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -7687,12 +7903,12 @@ let vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2021-04-28"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "3f6acfc2de2fa06e8e61269cf6a900336552abdc"; - sha256 = "11hdq749sli3k4cp4g0s9vm7v2blp49k0s1r814drc0x5rxkj5fy"; + rev = "7685488adfbd2950a8ef4ecaedafef8a036f9275"; + sha256 = "1jsdxm2cgd5aqir3g7jbyq17xsslc8a5xmpmlsyci5hprrhnnv2c"; }; meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; @@ -7735,12 +7951,12 @@ let vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2021-04-26"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "c171b86845a64d9ed3f5b9b4040f1164be37f115"; - sha256 = "0jr2xif05xb4iiv18nr7xz978z246bkbabgx1djh73rpjk3683y3"; + rev = "e2c72b5cfb6a4e07e70806198c1ff491a6077fa8"; + sha256 = "1iyc8wjbr1iwch1vjzlw1x7q0vg7bnr4zwbga2rzw6lm0f8y4gkw"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -7939,12 +8155,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2021-04-22"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "6b9afcce385b1121d46f749f9cd46d05e132c1e4"; - sha256 = "04yh7cq9vi1hksksyphg8s4xz64qc6pmwnrbqapfgfsmp6jk11s5"; + rev = "6df213375c9d63faebb55f55aada2efa52458d12"; + sha256 = "0yv5v4f03hpn17dsazcr62bwf1y43j915wy9a33hv5wyicqszsyi"; }; meta.homepage = "https://github.com/mhinz/vim-signify/"; }; @@ -7985,6 +8201,18 @@ let meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; + vim-smali = buildVimPluginFrom2Nix { + pname = "vim-smali"; + version = "2015-11-05"; + src = fetchFromGitHub { + owner = "mzlogin"; + repo = "vim-smali"; + rev = "012c21565e6be8f1718ad634aa84730a0a84b42c"; + sha256 = "1mcdbcfiq5r21q297fxi18c3ah4193j1fnjnbjnrjh20r50wggx8"; + }; + meta.homepage = "https://github.com/mzlogin/vim-smali/"; + }; + vim-smalls = buildVimPluginFrom2Nix { pname = "vim-smalls"; version = "2015-05-02"; @@ -8119,24 +8347,24 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2021-04-23"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "df0f1dbdc0689f6172bdd3b8685868aa93446c6f"; - sha256 = "0idrzl2kgclalsxixrh21fkw6d2vd53apw47ajjlcsl94acy2139"; + rev = "81e36c352a8deea54df5ec1e2f4348685569bed2"; + sha256 = "1y8yi099lqg03781bnma2bj6x5lkvfq65vhdpnm65mfyak6dpzgz"; }; meta.homepage = "https://github.com/mhinz/vim-startify/"; }; vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2021-03-22"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "cee157ee4f73ddacfe1a70bb833b96f7a47a10c2"; - sha256 = "1y049vbjhsg80am0hxyrcq0d0p7qfyvb1z38nc7yd7bcgwsqc5ac"; + rev = "c622725676c179950ea4a789915efc6d53f142c3"; + sha256 = "168bdcbb13mdd40b0xq9i9chgsg6jr8h4f1jpzf05br5fxp09snk"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -8227,12 +8455,12 @@ let vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2020-10-13"; + version = "2021-05-05"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "659ba4f39caa38e6913f88c9f4369c00e852160f"; - sha256 = "0fqj9l7i052mvw0wlyg30bmihzi937svk3ggsp0rc9wlr30frg2p"; + rev = "5150f1ec06f51b087a11c71b498a4c4497e71e2c"; + sha256 = "1nwcc7didjyd2iw23qhxrg0rr66z93midabkwjdnlw8mzgha7lb7"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -8263,12 +8491,12 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2021-03-07"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "e62cac4d3186209a510f51becd768ee414b2be76"; - sha256 = "1c93kvlrgzp5fw5rgv053sin0f2f2chydxbvrkprpz71qmxqmq05"; + rev = "9166d42e5dc9bc0ef7e1b9e93d52bb4c5b923560"; + sha256 = "1wr1sqxjy1dqyvkvii8jrxwagfph52z2ij8p1nz5b1kpyzvvpg7b"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -8564,12 +8792,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-03-21"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "08e37d47406d7f57e5907af4dc6bd35cff2b04b3"; - sha256 = "157gvlpb0i3jn9gjcjgz02y843jh03pqnwfkv2bf9qh7bknrnxr5"; + rev = "17fed1b0471e224c59b9ae1b8a3cbeea570dd14b"; + sha256 = "13ffj8jmbazw6s35ddwwfmbg33wqqpc823i45m0b4q9h4ybjn4ry"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -8648,24 +8876,24 @@ let vim-wayland-clipboard = buildVimPluginFrom2Nix { pname = "vim-wayland-clipboard"; - version = "2021-04-28"; + version = "2021-05-01"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "bb44d7fb1a098c2fd4a4d26bb213a805184f30b8"; - sha256 = "07hc6nqhka544pgag0dh4k59w6cfn3vk9969ckg9ls6ywjwfyz8x"; + rev = "722aaf34486ffee924ccbc34eb22553642c1c153"; + sha256 = "1vg242139r1arz4kia4bbpmvzr4v5rp7gzy063f61xbvkdjwjx4q"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; }; vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2021-04-22"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "20163f6ffda855fa40a11cb999002211dc66288f"; - sha256 = "1g29z5f2w1g6znljdgwn49wp8g85m1pawvg8qjrh1kxyjv9dr8x1"; + rev = "da2934fcd36350b871ed8ccd54c8eae3a0dfc8ae"; + sha256 = "18n5mqwgkjsf67jg2r24d4w93hadg7fnqyvmqq6dd5bsmqwp9v14"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -8696,12 +8924,12 @@ let vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2020-12-02"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "f851600045c543f3646c709d7e03e231408eab81"; - sha256 = "0pi85rzls3g7ilb18idk8xbqya8ygjab5ndk09p4xmmww9z4v711"; + rev = "cd88d9bc34ca1df6bd06a9e427350d45a6c2931c"; + sha256 = "0gf0xla3jm8cp4j5mldn79kfbd3zlwil3wdgdvsx8w3kybi6dap1"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -8754,6 +8982,18 @@ let meta.homepage = "https://github.com/dag/vim2hs/"; }; + vim_current_word = buildVimPluginFrom2Nix { + pname = "vim_current_word"; + version = "2021-01-27"; + src = fetchFromGitHub { + owner = "dominikduda"; + repo = "vim_current_word"; + rev = "84ae9300de73cf878c805a6228a58d408b6b829d"; + sha256 = "0k0wq3aqrbwrqyfz36qdqzyq7cw16d34yvw0gvzyg7iany0z0r6r"; + }; + meta.homepage = "https://github.com/dominikduda/vim_current_word/"; + }; + vimacs = buildVimPluginFrom2Nix { pname = "vimacs"; version = "2016-03-24"; @@ -8864,12 +9104,12 @@ let vimsence = buildVimPluginFrom2Nix { pname = "vimsence"; - version = "2021-03-17"; + version = "2021-05-01"; src = fetchFromGitHub { owner = "vimsence"; repo = "vimsence"; - rev = "ad036250a116472218430aed1817e5b6c204d0b8"; - sha256 = "0yn3w193h9h1fyaniwdj4y7b744kwj11prxcq8iyg897v8jj25bk"; + rev = "79f43e9da378f66e7c7eb1c6193de8a805d8afe3"; + sha256 = "0ymdrv74q513ghz7cfsbs9y4qgimk5wbwizwf20dbqy2pcsq6i46"; }; meta.homepage = "https://github.com/vimsence/vimsence/"; }; @@ -8888,12 +9128,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-04-29"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "0c88cc8badeeee74f9cafbf461b72769b06a15d5"; - sha256 = "1f9k0mhcaaddjdd3619m95syy4rbh5fgacya9fr1580z16vcir8p"; + rev = "aacd62f09feed377c35930790514b2739fa08e51"; + sha256 = "0na5dvwc8hly32hjkicw8vgy0agx4zyvsrdrjn21sz0daw48cabi"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -8901,24 +9141,24 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-04-28"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "479152f38efb0a787de661b33838aa2dc5a6da75"; - sha256 = "0ahqys0408n7c9hzc6dy70cj3rrg4nzha38iwwvcf7my2nvldbx2"; + rev = "ffb07473638f5a155dde79bfdc6c0d92f30f463b"; + sha256 = "06h6rni46rfjhb9cn79swqnk9l7kxwv4hv265hizjk452scqwb7b"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPluginFrom2Nix { pname = "vimux"; - version = "2021-04-10"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "ee3075ad30560ffba20c695124c60faef97ec4a4"; - sha256 = "19plkjvifvbfnq56vcmzl0q3hxmcbd7q5f5cxk42jp038cry26ay"; + rev = "ee0dfae33062419f2c9ef6a202b3ce415adf6e6a"; + sha256 = "079pfs0hp9x2j9c7va78fjw7afp13yirgw9ajsd98lvkzrj5sflc"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -8997,24 +9237,24 @@ let which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key-nvim"; - version = "2021-04-29"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "6cf68b49d48f2e07b82aee18ad01c4115d9ce0e5"; - sha256 = "06r5hlwm1i1gim12k3i5kxrwnhjbq2xfxic5z0iax9m86szb4ja3"; + rev = "ec1474bb0c373eb583962deff20860c2af54f932"; + sha256 = "1fp6p7yaws8c737zi9i7fc3vvv8lxkkn5lygfzyrmk6drkhis67h"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; wildfire-vim = buildVimPluginFrom2Nix { pname = "wildfire-vim"; - version = "2014-11-16"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "gcmt"; repo = "wildfire.vim"; - rev = "e2baded7162260e05d2527f5bca9fca81f0bc8f2"; - sha256 = "01i12x8brsnqicj5vclg57nv6ha7nz70gilphf6sr14xr741ra1y"; + rev = "fa91b732fd1c5acd23b7b32d5fbbc884eedafc8d"; + sha256 = "15gikqmpaf5c6687kgc5ib57pw7gyvxaihdv5549s7p2xkkbcl24"; }; meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; @@ -9118,12 +9358,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-04-20"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "c8acf70d23337047af6548dbb8337d3e3a0c0357"; - sha256 = "0l24b07l1bdiwffpj2ajks879w69cjkn1adx9ak6pv98jlmsdzi1"; + rev = "7c4d05375a09a871f618f9688c7af517d4e69b76"; + sha256 = "0ghjcphxrav9zzg199d761ai83fzpcndsvyfxskwism4y803s3lf"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -9179,12 +9419,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2021-04-07"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "fc32adfada0fac7a2f6088672e177d410c9e3ae1"; - sha256 = "051l2dig6861xzl6zg41d6a776jhms7v6a86cap1ipd2rxkqh5yh"; + rev = "9ec189bc76ed2850f916394ed8d6127290f51338"; + sha256 = "0xl2pxgmam5ls7a59bdvx3gyzcgsq3wvgby2c5667627kcq05j6s"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; @@ -9201,5 +9441,4 @@ let meta.homepage = "https://github.com/troydm/zoomwintab.vim/"; }; -}); -in lib.fix' (lib.extends overrides packages) +} diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 3cc8620a89..d9629688c3 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -20,7 +20,7 @@ , dasht , direnv , fzf -, gnome3 +, gnome , khard , languagetool , llvmPackages @@ -97,7 +97,7 @@ self: super: { # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 preFixup = '' substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ - --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc.lib}/lib/libclang.so'" + --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.libclang.lib}/lib/libclang.so'" substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/libclang.py \ --replace "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang" @@ -515,7 +515,7 @@ self: super: { vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: { # on linux can use either Zenity or Yad. - propagatedBuildInputs = [ gnome3.zenity ]; + propagatedBuildInputs = [ gnome.zenity ]; meta = { description = "Simple color selector/picker plugin"; license = lib.licenses.publicDomain; @@ -605,7 +605,7 @@ self: super: { libiconv ]; - cargoSha256 = "1c8bwvwd23d7c3bk1ky1i8xgfz10dr8nqqcvp20g8rldjl8p2r08"; + cargoSha256 = "16fhiv6qmf7dv968jyybkgs1wkphy383s78g8w5wnz4i0czld8dq"; }; in '' @@ -615,16 +615,6 @@ self: super: { meta.platforms = lib.platforms.all; }); - vim-closer = super.vim-closer.overrideAttrs (old: { - patches = [ - # Fix duplicate tag in doc - (fetchpatch { - url = "https://github.com/rstacruz/vim-closer/commit/a504be8c7050e41b7dfc50c2362948e2cf7c5422.patch"; - sha256 = "065q30d913fm3pc7r5y53wmnb7q7bhv21qxavm65bkb91242d409"; - }) - ]; - }); - vim-codefmt = super.vim-codefmt.overrideAttrs (old: { dependencies = with self; [ vim-maktaba ]; }); diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py b/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py index 1180b4572d..df948cc0e5 100755 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py @@ -47,9 +47,9 @@ def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: s f.write(HEADER) f.write( """ -{ lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: -let - packages = ( self: +{ lib, buildVimPluginFrom2Nix, fetchFromGitHub }: + +final: prev: {""" ) for owner, repo, plugin in sorted_plugins: @@ -75,8 +75,7 @@ let ) f.write( """ -}); -in lib.fix' (lib.extends overrides packages) +} """ ) print(f"updated {outfile}") 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 c5e9deeb0a..196b7c1e12 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -4,6 +4,7 @@ AckslD/nvim-whichkey-setup.lua@main ackyshake/Spacegray.vim@main airblade/vim-gitgutter airblade/vim-rooter +ajmwagar/vim-deus akinsho/nvim-bufferline.lua akinsho/nvim-toggleterm.lua aklt/plantuml-syntax @@ -46,7 +47,6 @@ camspiers/lens.vim carlitux/deoplete-ternjs ccarpita/rtorrent-syntax-file cespare/vim-toml -Chiel92/vim-autoformat chikatoike/concealedyank.vim chikatoike/sourcemap.vim chkno/vim-haskell-module-name @@ -94,6 +94,7 @@ digitaltoad/vim-pug direnv/direnv.vim dleonard0/pony-vim-syntax dmix/elvish.vim +dominikduda/vim_current_word dpelle/vim-LanguageTool dracula/vim as dracula-vim drewtempelmeyer/palenight.vim @@ -105,6 +106,8 @@ eagletmt/ghcmod-vim eagletmt/neco-ghc easymotion/vim-easymotion editorconfig/editorconfig-vim +edluffy/hologram.nvim@main +edluffy/specs.nvim@main edwinb/idris2-vim ehamberg/vim-cute-python eigenfoo/stan-vim @@ -127,11 +130,14 @@ fatih/vim-go fcpg/vim-osc52 FelikZ/ctrlp-py-matcher fenetikm/falcon +fhill2/floating.nvim fiatjaf/neuron.vim fisadev/vim-isort flazz/vim-colorschemes floobits/floobits-neovim folke/lsp-colors.nvim@main +folke/todo-comments.nvim@main +folke/trouble.nvim@main folke/which-key.nvim@main freitass/todo.txt-vim frigoeu/psc-ide-vim @@ -170,6 +176,7 @@ guns/xterm-color-table.vim hashivim/vim-packer hashivim/vim-terraform hashivim/vim-vagrant +hauleth/sad.vim haya14busa/incsearch-easymotion.vim haya14busa/incsearch.vim haya14busa/is.vim @@ -188,6 +195,7 @@ hrsh7th/vim-vsnip-integ hsanson/vim-android hsitz/VimOrganizer iamcco/coc-spell-checker +iamcco/markdown-preview.nvim ianks/vim-tsx idanarye/vim-merginal idris-hackers/idris-vim @@ -277,7 +285,7 @@ keith/rspec.vim keith/swift.vim kevinhwang91/nvim-bqf@main kevinhwang91/nvim-hlslens@main -kevinhwang91/rnvimr +kevinhwang91/rnvimr@main kien/rainbow_parentheses.vim knubie/vim-kitty-navigator konfekt/fastfold @@ -321,6 +329,7 @@ LucHermitte/lh-vim-lib ludovicchabant/vim-gutentags ludovicchabant/vim-lawrencium lukas-reineke/indent-blankline.nvim +lukas-reineke/indent-blankline.nvim@lua as indent-blankline-nvim-lua lukaszkorecki/workflowish lumiliet/vim-twig luochen1990/rainbow @@ -391,6 +400,7 @@ mpickering/hlint-refactor-vim ms-jpq/chadtree@chad mtikekar/vim-bsv mzlogin/vim-markdown-toc +mzlogin/vim-smali nanotech/jellybeans.vim natebosch/vim-lsc nathanaelkane/vim-indent-guides @@ -513,6 +523,8 @@ raghur/fruzzy raghur/vim-ghost Raimondi/delimitMate rakr/vim-one +ray-x/aurora +ray-x/lsp_signature.nvim rbgrouleff/bclose.vim rbong/vim-flog rhysd/committia.vim @@ -523,6 +535,7 @@ rhysd/vim-grammarous rhysd/vim-operator-surround RishabhRD/nvim-lsputils RishabhRD/popfix +rktjmp/fwatch.nvim@main rktjmp/lush.nvim@main rmagatti/auto-session@main rodjek/vim-puppet @@ -543,6 +556,7 @@ rstacruz/vim-closer rust-lang/rust.vim ryanoasis/vim-devicons ryvnf/readline.vim +sainnhe/edge sainnhe/sonokai sakhnik/nvim-gdb saltstack/salt-vim @@ -575,6 +589,7 @@ sickill/vim-pasta SidOfc/mkdx simnalamburt/vim-mundo simrat39/rust-tools.nvim +sindrets/diffview.nvim@main SirVer/ultisnips sjl/gundo.vim sjl/splice.vim @@ -588,6 +603,7 @@ steelsojka/completion-buffers stefandtw/quickfix-reflector.vim stephpy/vim-yaml sunaku/vim-dasht +sunjon/Shade.nvim svermeulen/vim-subversive t9md/vim-choosewin t9md/vim-smalls @@ -596,6 +612,7 @@ takac/vim-hardtime tami5/compe-conjure tami5/lispdocs.nvim tami5/sql.nvim +tbastos/vim-lua tbodt/deoplete-tabnine ternjs/tern_for_vim terryma/vim-expand-region @@ -686,6 +703,7 @@ vhda/verilog_systemverilog.vim vigoux/LanguageTool.nvim vim-airline/vim-airline vim-airline/vim-airline-themes +vim-autoformat/vim-autoformat vim-erlang/vim-erlang-compiler vim-erlang/vim-erlang-omnicomplete vim-erlang/vim-erlang-runtime @@ -759,7 +777,9 @@ ycm-core/YouCompleteMe Yggdroot/indentLine Yggdroot/LeaderF Yilin-Yang/vim-markbar +yssl/QFEnter yuki-yano/ncm2-dictionary yunlingz/ci_dark zah/nim.vim +zhou13/vim-easyescape ziglang/zig.vim diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 15d280c075..6f61a94ca1 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ config, lib, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8 }: +{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8 }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -444,8 +444,8 @@ let mktplcRef = { name = "github-vscode-theme"; publisher = "github"; - version = "4.0.2"; - sha256 = "06mysdwjh7km874rrk0xc0xxaqx15b4a7x1i8dly440h8w3ng5bs"; + version = "4.1.1"; + sha256 = "14wz2b0bn1rnmpj28c0mivz2gacla2dgg8ncv7qfx9bsxhf95g68"; }; meta = with lib; { description = "GitHub theme for VS Code"; @@ -496,8 +496,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.211"; - sha256 = "1di2v1bhlhl1yi9rrmbq0r9gypiydl8xvj24yw64vsnkqs9yxbp3"; + version = "0.0.213"; + sha256 = "0fj7vvaqdldhbzm9dqh2plqlhg34jv5khd690xd87h418sv8rk95"; }; meta = with lib; { license = licenses.mit; @@ -702,9 +702,15 @@ let ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {}; - ms-python.python = callPackage ./python { - extractNuGet = callPackage ./python/extract-nuget.nix { }; - }; + ms-python.python = let + raw-package = callPackage ./python { + extractNuGet = callPackage ./python/extract-nuget.nix { }; + }; + in + buildEnv { + name = "vscode-extension-ms-python-python-full"; + paths = [ raw-package self.ms-toolsai.jupyter ]; + }; msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension { mktplcRef = { @@ -718,6 +724,18 @@ let }; }; + ms-toolsai.jupyter = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "jupyter"; + publisher = "ms-toolsai"; + version = "2021.5.745244803"; + sha256 = "0gjpsp61l8daqa87mpmxcrvsvb0pc2vwg7xbkvwn0f13c1739w9p"; + }; + meta = { + license = lib.licenses.unfree; + }; + }; + naumovs.color-highlight = buildVscodeMarketplaceExtension { mktplcRef = { name = "color-highlight"; @@ -908,6 +926,23 @@ let }; }; + stephlin.vscode-tmux-keybinding = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-tmux-keybinding"; + publisher = "stephlin"; + version = "0.0.6"; + sha256 = "0mph2nval1ddmv9hpl51fdvmagzkqsn8ljwqsfha2130bb7la0d9"; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/stephlin.vscode-tmux-keybinding/changelog"; + description = "A simple extension for tmux behavior in vscode terminal."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=stephlin.vscode-tmux-keybinding"; + homepage = "https://github.com/StephLin/vscode-tmux-keybinding"; + license = licenses.mit; + maintainers = with maintainers; [ dbirks ]; + }; + }; + streetsidesoftware.code-spell-checker = buildVscodeMarketplaceExtension { mktplcRef = { name = "code-spell-checker"; diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix index a7b0e17ecb..6f4bbfb7e9 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix @@ -7,14 +7,12 @@ , icu , stdenv , openssl -, mono6 +, mono }: let # Get as close as possible as the `package.json` required version. # This is what drives omnisharp. - mono = mono6; - rtDepsSrcsFromJson = builtins.fromJSON (builtins.readFile ./rt-deps-bin-srcs.json); rtDepsBinSrcs = builtins.mapAttrs (k: v: @@ -114,7 +112,7 @@ vscode-utils.buildVscodeMarketplaceExtension { declare omnisharp_dir="$PWD/${omnisharp.installPath}" unzip_to "${omnisharp.bin-src}" "$omnisharp_dir" rm "$omnisharp_dir/bin/mono" - ln -s -T "${mono6}/bin/mono" "$omnisharp_dir/bin/mono" + ln -s -T "${mono}/bin/mono" "$omnisharp_dir/bin/mono" chmod a+x "$omnisharp_dir/run" touch "$omnisharp_dir/install.Lock" @@ -136,6 +134,7 @@ vscode-utils.buildVscodeMarketplaceExtension { meta = with lib; { description = "C# for Visual Studio Code (powered by OmniSharp)"; + homepage = "https://github.com/OmniSharp/omnisharp-vscode"; license = licenses.mit; maintainers = [ maintainers.jraygauthier ]; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix index fb58c94cde..eb215d0fd2 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix @@ -38,8 +38,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens mktplcRef = { name = "vsliveshare"; publisher = "ms-vsliveshare"; - version = "1.0.4131"; - sha256 = "167fwb1nri9xs5bx14zdg2q3fsmlbihcvnk90fv9av8zirpwa3vs"; + version = "1.0.4272"; + sha256 = "kH8ZiNzpAfR1BnKjYc+hcNMEmhBNyHlnOlj8fCdNGjY="; }; }).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: { nativeBuildInputs = nativeBuildInputs ++ [ @@ -128,7 +128,7 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens description = "Live Share lets you achieve greater confidence at speed by streamlining collaborative editing, debugging, and more in real-time during development"; homepage = "https://aka.ms/vsls-docs"; license = licenses.unfree; - maintainers = with maintainers; [ jraygauthier ]; + maintainers = with maintainers; [ jraygauthier V ]; platforms = [ "x86_64-linux" ]; }; }) 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 1d86f82d27..89950a5159 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.9.114305"; + version = "2021.5.829140558"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix"; - sha256 = "1vh0wvfvzszc58lw7dbl60knpm5l6rrsghfchhn5dvwyadx4a33h"; + sha256 = "0y2HN4WGYUUXBfqp8Xb4oaA0hbLZmE3kDUXMBAOjvPQ="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix index 746bb4608a..29ca973a0a 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix @@ -2,7 +2,7 @@ , vscode-utils , useLocalExtensions ? false}: # Note that useLocalExtensions requires that vscode-server is not running -# on host. If it is, you'll need to remove ~/.vscode-server, +# on host. If it is, you'll need to remove $HOME/.vscode-server, # and redo the install by running "Connect to host" on client let @@ -11,7 +11,7 @@ let # patch runs on remote machine hence use of which # links to local node if version is 12 patch = '' - f="/home/''$USER/.vscode-server/bin/''$COMMIT_ID/node" + f="$HOME/.vscode-server/bin/$COMMIT_ID/node" localNodePath=''$(which node) if [ -x "''$localNodePath" ]; then localNodeVersion=''$(node -v) @@ -23,10 +23,10 @@ let fi ${lib.optionalString useLocalExtensions '' # Use local extensions - if [ -d ~/.vscode/extensions ]; then - if ! test -L "~/.vscode-server/extensions"; then - mkdir -p ~/.vscode-server - ln -s ~/.vscode/extensions ~/.vscode-server/ + if [ -d $HOME/.vscode/extensions ]; then + if ! test -L "$HOME/.vscode-server/extensions"; then + mkdir -p $HOME/.vscode-server + ln -s $HOME/.vscode/extensions $HOME/.vscode-server/ fi fi ''} diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix index ce0e1e7c3f..44e2bdb100 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix @@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.10.1"; + version = "2.11.0"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix"; - sha256 = "1galibrk4fx4qwa6q17mmwlikx78nmhgv1h98haiyak666cinzcq"; + sha256 = "0wqdya353b415qxs8jczmis3q6d8fddv1pdd8jdd0w64s1ibv3sy"; }; patches = [ ./fix-terraform-ls.patch ]; diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch index 1e72b7b81e..95e8d92da3 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch @@ -1,11 +1,11 @@ diff --git a/out/extension.js b/out/extension.js -index e815393..aeade0e 100644 +index e932d27..099126b 100644 --- a/out/extension.js +++ b/out/extension.js -@@ -141,25 +141,6 @@ function updateLanguageServer() { +@@ -143,25 +143,6 @@ function updateLanguageServer() { return __awaiter(this, void 0, void 0, function* () { - const delay = 1000 * 60 * 24; - setTimeout(updateLanguageServer, delay); // check for new updates every 24hrs + const delay = 1000 * 60 * 60 * 24; + languageServerUpdater.timeout(updateLanguageServer, delay); // check for new updates every 24hrs - // skip install if a language server binary path is set - if (!vscodeUtils_1.config('terraform').get('languageServer.pathToBinary')) { - const installer = new languageServerInstaller_1.LanguageServerInstaller(installPath, reporter); @@ -28,7 +28,7 @@ index e815393..aeade0e 100644 return startClients(); // on repeat runs with no install, this will be a no-op }); } -@@ -257,7 +238,7 @@ function pathToBinary() { +@@ -259,7 +240,7 @@ function pathToBinary() { reporter.sendTelemetryEvent('usePathToBinary'); } else { 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 86453b960c..7290c04342 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -13,8 +13,8 @@ in }; postPatch = '' - mkdir -p wakatime-master - cp -rt wakatime-master --no-preserve=all ${wakatime}/lib/python*/site-packages/wakatime + mkdir wakatime-cli + ln -s ${wakatime}/bin/wakatime ./wakatime-cli/wakatime-cli ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/default.nix deleted file mode 100644 index ee7158e2a8..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ callPackages, recurseIntoAttrs }: - -{ - netbsd = recurseIntoAttrs (callPackages ./netbsd {}); -} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix index 6d01bff3b3..801d574b5b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,5 +1,10 @@ -{ stdenv, stdenvNoCC, fetchcvs, lib, groff, mandoc, zlib, bison, flex -, writeText, buildPackages, splicePackages, symlinkJoin }: +{ stdenv, lib, stdenvNoCC +, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget +, buildPackages, splicePackages, newScope +, bsdSetupHook, makeSetupHook, fetchcvs, groff, mandoc, byacc, flex +, zlib +, writeText, symlinkJoin +}: let fetchNetBSD = path: version: sha256: fetchcvs { @@ -9,33 +14,57 @@ let tag = "netbsd-${lib.replaceStrings ["."] ["-"] version}-RELEASE"; }; - # Splice packages so we get the correct package when using - # nativeBuildInputs... - nbSplicedPackages = splicePackages { - pkgsBuildBuild = buildPackages.buildPackages.netbsd; - pkgsBuildHost = buildPackages.netbsd; - pkgsBuildTarget = {}; - pkgsHostHost = {}; - pkgsHostTarget = netbsd; - pkgsTargetTarget = {}; + otherSplices = { + selfBuildBuild = pkgsBuildBuild.netbsd; + selfBuildHost = pkgsBuildHost.netbsd; + selfBuildTarget = pkgsBuildTarget.netbsd; + selfHostHost = pkgsHostHost.netbsd; + selfTargetTarget = pkgsTargetTarget.netbsd or {}; # might be missing }; - netbsd = with nbSplicedPackages; { +in lib.makeScopeWithSplicing + splicePackages + newScope + otherSplices + (_: {}) + (_: {}) + (self: let + inherit (self) mkDerivation; + in { + + # Why do we have splicing and yet do `nativeBuildInputs = with self; ...`? + # + # We use `lib.makeScopeWithSplicing` because this should be used for all + # nested package sets which support cross, so the inner `callPackage` works + # correctly. But for the inline packages we don't bother to use + # `callPackage`. + # + # We still could have tried to `with` a big spliced packages set, but + # splicing is jank and causes a number of bootstrapping infinite recursions + # if one is not careful. Pulling deps out of the right package set directly + # side-steps splicing entirely and avoids those footguns. + # + # For non-bootstrap-critical packages, we might as well use `callPackage` for + # consistency with everything else, and maybe put in separate files too. + + compatIfNeeded = lib.optional (!stdenvNoCC.hostPlatform.isNetBSD) self.compat; mkDerivation = lib.makeOverridable (attrs: let stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; in stdenv'.mkDerivation ({ name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; - src = attrs.src or fetchNetBSD attrs.path attrs.version attrs.sha256; + src = fetchNetBSD attrs.path attrs.version attrs.sha256; extraPaths = [ ]; - nativeBuildInputs = [ makeMinimal install tsort lorder mandoc groff stat ]; - buildInputs = [ compat ]; - # depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = with buildPackages.netbsd; [ + bsdSetupHook + makeMinimal + install tsort lorder mandoc groff statHook + ]; + buildInputs = with self; compatIfNeeded; - OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; - HOST_SH = "${buildPackages.bash}/bin/sh"; + HOST_SH = stdenv'.shell; MACHINE_ARCH = { i686 = "i386"; @@ -49,22 +78,18 @@ let }.${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; - AR = "${stdenv'.cc.targetPrefix or ""}ar"; - CC = "${stdenv'.cc.targetPrefix or ""}cc"; - CPP = "${stdenv'.cc.targetPrefix or ""}cpp"; - CXX = "${stdenv'.cc.targetPrefix or ""}c++"; - LD = "${stdenv'.cc.targetPrefix or ""}ld"; - STRIP = "${stdenv'.cc.targetPrefix or ""}strip"; + BSD_PATH = attrs.path; - NETBSD_PATH = attrs.path; - - builder = ./builder.sh; + strictDeps = true; meta = with lib; { maintainers = with maintainers; [ matthewbauer qyliss ]; platforms = platforms.unix; license = licenses.bsd2; }; + } // lib.optionalAttrs stdenv'.hasCC { + # TODO should CC wrapper set this? + CPP = "${stdenv'.cc.targetPrefix}cpp"; } // lib.optionalAttrs stdenv'.isDarwin { MKRELRO = "no"; } // lib.optionalAttrs (stdenv'.cc.isClang or false) { @@ -84,14 +109,14 @@ let sha256 = "1xbzfd4i7allrkk1if74a8ymgpizyj0gkvdigzzj37qar7la7nc1"; version = "8.0"; - buildInputs = []; - nativeBuildInputs = []; + buildInputs = with self; []; + nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook ]; skipIncludesPhase = true; postPatch = '' patchShebangs configure - ${make.postPatch} + ${self.make.postPatch} ''; buildPhase = '' runHook preBuild @@ -106,32 +131,38 @@ let install -D nbmake $out/bin/nbmake ln -s $out/bin/nbmake $out/bin/make mkdir -p $out/share - cp -r $NETBSDSRCDIR/share/mk $out/share/mk + cp -r $BSDSRCDIR/share/mk $out/share/mk runHook postInstall ''; - extraPaths = [ make.src ] ++ make.extraPaths; + extraPaths = with self; [ make.src ] ++ make.extraPaths; }; - compat = if stdenv.hostPlatform.isNetBSD then stdenv else mkDerivation rec { + compat = mkDerivation (let + version = "8.0"; + commonDeps = [ zlib ]; + in { path = "tools/compat"; sha256 = "050449lq5gpxqsripdqip5ks49g5ypjga188nd3ss8dg1zf7ydz3"; - version = "8.0"; + inherit version; setupHooks = [ ../../../build-support/setup-hooks/role.bash ./compat-setup-hook.sh ]; - # override defaults to prevent infinite recursion - nativeBuildInputs = [ makeMinimal ]; - buildInputs = [ zlib ]; - # the build system re-runs `./configure` with `HOST_CC` (which is their # name for Build CC) as a compiler to make `defs.mk`, which is installed - depsBuildBuild = [ buildPackages.stdenv.cc ] ++ buildInputs; + depsBuildBuild = [ buildPackages.stdenv.cc ] ++ commonDeps; HOST_CC = "${buildPackages.stdenv.cc.targetPrefix}cc"; + nativeBuildInputs = with buildPackages.netbsd; commonDeps ++ [ + bsdSetupHook + makeMinimal + ]; + + buildInputs = with self; commonDeps; + # temporarily use gnuinstall for bootstrapping # bsdinstall will be built later makeFlags = [ @@ -148,24 +179,24 @@ let # why aren't these installed by netbsd? install -D compat_defs.h $out/include/compat_defs.h - install -D $NETBSDSRCDIR/include/cdbw.h $out/include/cdbw.h - install -D $NETBSDSRCDIR/sys/sys/cdbr.h $out/include/cdbr.h - install -D $NETBSDSRCDIR/sys/sys/featuretest.h \ + install -D $BSDSRCDIR/include/cdbw.h $out/include/cdbw.h + install -D $BSDSRCDIR/sys/sys/cdbr.h $out/include/cdbr.h + install -D $BSDSRCDIR/sys/sys/featuretest.h \ $out/include/sys/featuretest.h - install -D $NETBSDSRCDIR/sys/sys/md5.h $out/include/md5.h - install -D $NETBSDSRCDIR/sys/sys/rmd160.h $out/include/rmd160.h - install -D $NETBSDSRCDIR/sys/sys/sha1.h $out/include/sha1.h - install -D $NETBSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h - install -D $NETBSDSRCDIR/sys/sys/queue.h $out/include/sys/queue.h - install -D $NETBSDSRCDIR/include/vis.h $out/include/vis.h - install -D $NETBSDSRCDIR/include/db.h $out/include/db.h - install -D $NETBSDSRCDIR/include/netconfig.h $out/include/netconfig.h - install -D $NETBSDSRCDIR/include/rpc/types.h $out/include/rpc/types.h - install -D $NETBSDSRCDIR/include/utmpx.h $out/include/utmpx.h - install -D $NETBSDSRCDIR/include/tzfile.h $out/include/tzfile.h - install -D $NETBSDSRCDIR/sys/sys/tree.h $out/include/sys/tree.h - install -D $NETBSDSRCDIR/include/nl_types.h $out/include/nl_types.h - install -D $NETBSDSRCDIR/include/stringlist.h $out/include/stringlist.h + install -D $BSDSRCDIR/sys/sys/md5.h $out/include/md5.h + install -D $BSDSRCDIR/sys/sys/rmd160.h $out/include/rmd160.h + install -D $BSDSRCDIR/sys/sys/sha1.h $out/include/sha1.h + install -D $BSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h + install -D $BSDSRCDIR/sys/sys/queue.h $out/include/sys/queue.h + install -D $BSDSRCDIR/include/vis.h $out/include/vis.h + install -D $BSDSRCDIR/include/db.h $out/include/db.h + install -D $BSDSRCDIR/include/netconfig.h $out/include/netconfig.h + install -D $BSDSRCDIR/include/rpc/types.h $out/include/rpc/types.h + install -D $BSDSRCDIR/include/utmpx.h $out/include/utmpx.h + install -D $BSDSRCDIR/include/tzfile.h $out/include/tzfile.h + install -D $BSDSRCDIR/sys/sys/tree.h $out/include/sys/tree.h + install -D $BSDSRCDIR/include/nl_types.h $out/include/nl_types.h + install -D $BSDSRCDIR/include/stringlist.h $out/include/stringlist.h '' + lib.optionalString stdenv.isDarwin '' mkdir -p $out/include/ssp touch $out/include/ssp/ssp.h @@ -175,12 +206,12 @@ let --subst-var-by out $out \ --subst-var-by version ${version} ''; - extraPaths = [ libc.src libutil.src + extraPaths = with self; [ libc.src libutil.src (fetchNetBSD "include" "8.0" "128m77k16i7frvk8kifhmxzk7a37m7z1s0bbmja3ywga6sx6v6sq") (fetchNetBSD "external/bsd/flex" "8.0" "0yxcjshz9nj827qhmjwwjmzvmmqgaf0d25b42k7lj84vliwrgyr6") (fetchNetBSD "sys/sys" "8.0" "0b0yjjy0c0cvk5nyffppqwxlwh2s1qr2xzl97a9ldck00dibar94") ] ++ libutil.extraPaths ++ libc.extraPaths; - }; + }); # HACK: to ensure parent directories exist. This emulates GNU # install’s -D option. No alternative seems to exist in BSD install. @@ -193,10 +224,14 @@ let path = "usr.bin/xinstall"; version = "8.0"; sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; - extraPaths = [ mtree.src make.src ]; - nativeBuildInputs = [ makeMinimal mandoc groff ]; + extraPaths = with self; [ mtree.src make.src ]; + nativeBuildInputs = with buildPackages.netbsd; [ + bsdSetupHook + makeMinimal + mandoc groff + ]; skipIncludesPhase = true; - buildInputs = [ compat fts ]; + buildInputs = with self; compatIfNeeded ++ [ fts ]; installPhase = '' runHook preInstall @@ -214,9 +249,11 @@ let path = "include/fts.h"; sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; version = "8.0"; - nativeBuildInputs = [ ]; - propagatedBuildInputs = [ compat ]; - extraPaths = [ + nativeBuildInputs = with buildPackages.netbsd; [ + bsdSetupHook + ]; + propagatedBuildInputs = with self; compatIfNeeded; + extraPaths = with self; [ (fetchNetBSD "lib/libc/gen/fts.c" "8.0" "1a8hmf26242nmv05ipn3ircxb0jqmmi66rh78kkyi9vjwkfl3qn7") (fetchNetBSD "lib/libc/include/namespace.h" "8.0" "1sjvh9nw3prnk4rmdwrfsxh6gdb9lmilkn46jcfh3q5c8glqzrd7") (fetchNetBSD "lib/libc/gen/fts.3" "8.0" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") @@ -243,25 +280,49 @@ let ]; }; + # Don't add this to nativeBuildInputs directly. Use statHook instead. stat = mkDerivation { path = "usr.bin/stat"; version = "8.0"; sha256 = "0z4r96id2r4cfy443rw2s1n52n186xm0lqvs8s3qjf4314z7r7yh"; - nativeBuildInputs = [ makeMinimal install mandoc groff ]; + nativeBuildInputs = with buildPackages.netbsd; [ + bsdSetupHook + makeMinimal + install mandoc groff + ]; }; + # stat isn't in POSIX, and NetBSD stat supports a completely + # different range of flags than GNU stat, so including it in PATH + # breaks stdenv. Work around that with a hook that will point + # NetBSD's build system and NetBSD stat without including it in + # PATH. + statHook = makeSetupHook { + name = "netbsd-stat-hook"; + } (writeText "netbsd-stat-hook-impl" '' + makeFlagsArray+=(TOOL_STAT=${self.stat}/bin/stat) + ''); + tsort = mkDerivation { path = "usr.bin/tsort"; version = "8.0"; sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; - nativeBuildInputs = [ makeMinimal install mandoc groff ]; + nativeBuildInputs = with buildPackages.netbsd; [ + bsdSetupHook + makeMinimal + install mandoc groff + ]; }; lorder = mkDerivation { path = "usr.bin/lorder"; version = "8.0"; sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; - nativeBuildInputs = [ makeMinimal install mandoc groff ]; + nativeBuildInputs = with buildPackages.netbsd; [ + bsdSetupHook + makeMinimal + install mandoc groff + ]; }; ## ## END BOOTSTRAPPING @@ -278,17 +339,17 @@ let # make needs this to pick up our sys make files export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ + substituteInPlace $BSDSRCDIR/share/mk/bsd.lib.mk \ --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.kinc.mk \ + substituteInPlace $BSDSRCDIR/share/mk/bsd.kinc.mk \ --replace /bin/rm rm '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ + substituteInPlace $BSDSRCDIR/share/mk/bsd.sys.mk \ --replace '-Wl,--fatal-warnings' "" \ --replace '-Wl,--warn-shared-textrel' "" ''; postInstall = '' - make -C $NETBSDSRCDIR/share/mk FILESDIR=$out/share/mk install + make -C $BSDSRCDIR/share/mk FILESDIR=$out/share/mk install ''; extraPaths = [ (fetchNetBSD "share/mk" "8.0" "033q4w3rmvwznz6m7fn9xcf13chyhwwl8ijj3a9mrn80fkwm55qs") @@ -299,7 +360,7 @@ let path = "usr.sbin/mtree"; version = "8.0"; sha256 = "0hanmzm8bgwz2bhsinmsgfmgy6nbdhprwmgwbyjm6bl17vgn7vid"; - extraPaths = [ mknod.src ]; + extraPaths = with self; [ mknod.src ]; }; mknod = mkDerivation { @@ -358,15 +419,46 @@ let version = "8.0"; sha256 = "092y7db7k4kh2jq8qc55126r5qqvlb8lq8mhmy5ipbi36hwb4zrz"; HOSTPROG = "tic"; - buildInputs = [ compat ]; - nativeBuildInputs = [ makeMinimal install mandoc groff nbperf ]; + buildInputs = with self; compatIfNeeded; + nativeBuildInputs = with buildPackages.netbsd; [ + bsdSetupHook + makeMinimal + install mandoc groff nbperf + ]; makeFlags = [ "TOOLDIR=$(out)" ]; - extraPaths = [ + extraPaths = with self; [ libterminfo.src (fetchNetBSD "usr.bin/tic" "8.0" "0diirnzmdnpc5bixyb34c9rid9paw2a4zfczqrpqrfvjsf1nnljf") (fetchNetBSD "tools/Makefile.host" "8.0" "1p23dsc4qrv93vc6gzid9w2479jwswry9qfn88505s0pdd7h6nvp") ]; }; + + uudecode = mkDerivation { + path = "usr.bin/uudecode"; + version = "8.0"; + sha256 = "00a3zmh15pg4vx6hz0kaa5mi8d2b1sj4h512d7p6wbvxq6mznwcn"; + NIX_CFLAGS_COMPILE = lib.optional stdenv.isLinux "-DNO_BASE64"; + }; + + cksum = mkDerivation { + path = "usr.bin/cksum"; + version = "8.0"; + sha256 = "0327820171djn9dzb2q1arypxw2zsxiixnd1ahy34dagd9cwcphj"; + meta.platforms = lib.platforms.netbsd; + }; + + config = mkDerivation { + path = "usr.bin/config"; + version = "8.0"; + sha256 = "0piyn8lgdqxwz9wkgc2plzp2xpj93fs4xncri8l0jfas9rv5j2m5"; + NIX_CFLAGS_COMPILE = [ "-DMAKE_BOOTSTRAP" ]; + nativeBuildInputs = with buildPackages.netbsd; [ + bsdSetupHook + makeMinimal install mandoc byacc flex + ]; + buildInputs = with self; compatIfNeeded; + extraPaths = with self; [ cksum.src ]; + }; ## ## END COMMAND LINE TOOLS ## @@ -378,39 +470,79 @@ let path = "include"; version = "8.0"; sha256 = "128m77k16i7frvk8kifhmxzk7a37m7z1s0bbmja3ywga6sx6v6sq"; - nativeBuildInputs = [ makeMinimal install mandoc groff nbperf rpcgen ]; - extraPaths = [ common.src ]; + nativeBuildInputs = with buildPackages.netbsd; [ + bsdSetupHook + makeMinimal + install mandoc groff nbperf rpcgen + ]; + extraPaths = with self; [ common ]; headersOnly = true; noCC = true; - # meta.platforms = lib.platforms.netbsd; - makeFlags = [ "RPCGEN_CPP=${buildPackages.gcc-unwrapped}/bin/cpp" ]; + meta.platforms = lib.platforms.netbsd; + makeFlags = [ "RPCGEN_CPP=${buildPackages.stdenv.cc.cc}/bin/cpp" ]; }; - common = mkDerivation { - path = "common"; - version = "8.0"; - sha256 = "1fsm2b7p7zkhiz523jw75088cq2h39iknp0fp3di9a64bikwbhi1"; - }; + common = fetchNetBSD "common" "8.0" "1fsm2b7p7zkhiz523jw75088cq2h39iknp0fp3di9a64bikwbhi1"; - # The full kernel - sys = mkDerivation { + sys-headers = mkDerivation { + pname = "sys-headers"; path = "sys"; version = "8.0"; sha256 = "123ilg8fqmp69bw6bs6nh98fpi1v2n9lamrzar61p27ji6sj7g0w"; - propagatedBuildInputs = [ include ]; - #meta.platforms = lib.platforms.netbsd; - extraPaths = [ common.src ]; + + CONFIG = "GENERIC"; + + propagatedBuildInputs = with self; [ include ]; + nativeBuildInputs = with buildPackages.netbsd; [ + bsdSetupHook + makeMinimal install tsort lorder statHook uudecode config genassym + ]; + + postConfigure = '' + pushd arch/$MACHINE/conf + config $CONFIG + popd + ''; + + makeFlags = [ "FIRMWAREDIR=$(out)/libdata/firmware" ]; + hardeningDisable = [ "pic" ]; MKKMOD = "no"; + NIX_CFLAGS_COMPILE = [ "-Wa,--no-warn" ]; + + postBuild = '' + make -C arch/$MACHINE/compile/$CONFIG $makeFlags + ''; + + postInstall = '' + cp arch/$MACHINE/compile/$CONFIG/netbsd $out + ''; + + meta.platforms = lib.platforms.netbsd; + extraPaths = with self; [ common ]; + + installPhase = "includesPhase"; + dontBuild = true; + noCC = true; + }; + + # The full kernel. We do the funny thing of overridding the headers to the + # full kernal and not vice versa to avoid infinite recursion -- the headers + # come earlier in the bootstrap. + sys = self.sys-headers.override { + pname = "sys"; + installPhase = null; + noCC = false; + dontBuild = false; }; headers = symlinkJoin { name = "netbsd-headers-8.0"; - paths = [ include ] ++ map (pkg: pkg.override (_: { - installPhase = "includesPhase"; - dontBuild = true; - noCC = true; - meta.platforms = lib.platforms.all; - })) [ sys libpthread ]; + paths = with self; [ + include + sys-headers + libpthread-headers + ]; + meta.platforms = lib.platforms.netbsd; }; ## ## END HEADERS @@ -423,15 +555,24 @@ let path = "lib/libutil"; version = "8.0"; sha256 = "077syyxd303m4x7avs5nxzk4c9n13d5lyk5aicsacqjvx79qrk3i"; - extraPaths = [ common.src ]; + extraPaths = with self; [ common libc.src sys.src ]; + nativeBuildInputs = with buildPackages.netbsd; [ + bsdSetupHook + makeMinimal + byacc install tsort lorder mandoc statHook + ]; + buildInputs = with self; [ headers ]; + SHLIBINSTALLDIR = "$(out)/lib"; }; libedit = mkDerivation { path = "lib/libedit"; version = "8.0"; sha256 = "0pmqh2mkfp70bwchiwyrkdyq9jcihx12g1awd6alqi9bpr3f9xmd"; - buildInputs = [ libterminfo libcurses ]; - propagatedBuildInputs = [ compat ]; + buildInputs = with self; [ libterminfo libcurses ]; + propagatedBuildInputs = with self; compatIfNeeded; + SHLIBINSTALLDIR = "$(out)/lib"; + makeFlags = [ "LIBDO.terminfo=${self.libterminfo}/lib" ]; postPatch = '' sed -i '1i #undef bool_t' el.h substituteInPlace config.h \ @@ -449,16 +590,24 @@ let path = "lib/libterminfo"; version = "8.0"; sha256 = "14gp0d6fh6zjnbac2yjhyq5m6rca7gm6q1s9gilhzpdgl9m7vb9r"; - buildInputs = [ compat ]; + nativeBuildInputs = with buildPackages.netbsd; [ + bsdSetupHook + makeMinimal install tsort lorder mandoc statHook nbperf tic + ]; + buildInputs = with self; compatIfNeeded; + SHLIBINSTALLDIR = "$(out)/lib"; postPatch = '' substituteInPlace term.c --replace /usr/share $out/share substituteInPlace setupterm.c \ --replace '#include ' 'void use_env(bool);' ''; - postInstall = '' - make -C $NETBSDSRCDIR/share/terminfo BINDIR=$out/share install + postBuild = '' + make -C $BSDSRCDIR/share/terminfo $makeFlags BINDIR=$out/share ''; - extraPaths = [ + postInstall = '' + make -C $BSDSRCDIR/share/terminfo $makeFlags BINDIR=$out/share install + ''; + extraPaths = with self; [ (fetchNetBSD "share/terminfo" "8.0" "18db0fk1dw691vk6lsm6dksm4cf08g8kdm0gc4052ysdagg2m6sm") ]; }; @@ -467,14 +616,15 @@ let path = "lib/libcurses"; version = "8.0"; sha256 = "0azhzh1910v24dqx45zmh4z4dl63fgsykajrbikx5xfvvmkcq7xs"; - buildInputs = [ libterminfo ]; + buildInputs = with self; [ libterminfo ]; NIX_CFLAGS_COMPILE = [ "-D__scanflike(a,b)=" "-D__va_list=va_list" "-D__warn_references(a,b)=" ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="; - propagatedBuildInputs = [ compat ]; + propagatedBuildInputs = with self; compatIfNeeded; MKDOC = "no"; # missing vfontedpr + makeFlags = [ "LIBDO.terminfo=${self.libterminfo}/lib" ]; postPatch = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace printw.c \ --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ @@ -495,9 +645,6 @@ let version = "8.0"; sha256 = "03azp5anavhjr15sinjlik9792lyf7w4zmkcihlkksrywhs05axh"; meta.platforms = lib.platforms.netbsd; - postPatch = '' - substituteInPlace rpc/Makefile --replace /usr $out - ''; }; librpcsvc = mkDerivation { @@ -506,6 +653,11 @@ let sha256 = "14ri9w6gdhsm4id5ck133syyvbmkbknfa8w0xkklm726nskhfkj7"; makeFlags = [ "INCSDIR=$(out)/include/rpcsvc" ]; meta.platforms = lib.platforms.netbsd; + nativeBuildInputs = with buildPackages.netbsd; [ + bsdSetupHook + makeMinimal + install tsort lorder rpcgen statHook + ]; }; librt = mkDerivation { @@ -513,34 +665,56 @@ let version = "8.0"; sha256 = "078qsi4mg1hyyxr1awvjs9b0c2gicg3zw4vl603g1m9vm8gfxw9l"; meta.platforms = lib.platforms.netbsd; + extraPaths = with self; [ common libc.src ]; + postPatch = '' + sed -i 's,/usr\(/include/sys/syscall.h\),${self.headers}\1,g' \ + $BSDSRCDIR/lib/{libc,librt}/sys/Makefile.inc + ''; }; libcrypt = mkDerivation { path = "lib/libcrypt"; version = "8.0"; sha256 = "0siqan1wdqmmhchh2n8w6a8x1abbff8n4yb6jrqxap3hqn8ay54g"; + SHLIBINSTALLDIR = "$(out)/lib"; meta.platforms = lib.platforms.netbsd; }; - libpthread = mkDerivation { + libpthread-headers = mkDerivation { + pname = "libpthread-headers"; path = "lib/libpthread"; version = "8.0"; sha256 = "0pcz61klc3ijf5z2zf8s78nj7bwjfblzjllx7vr4z5qv3m0sdb3j"; + installPhase = "includesPhase"; + dontBuild = true; + noCC = true; meta.platforms = lib.platforms.netbsd; }; + libpthread = self.libpthread-headers.override { + pname = "libpthread"; + installPhase = null; + noCC = false; + dontBuild = false; + buildInputs = with self; [ headers ]; + extraPaths = with self; [ common libc.src sys.src ]; + }; + libresolv = mkDerivation { path = "lib/libresolv"; version = "8.0"; sha256 = "11vpb3p2343wyrhw4v9gwz7i0lcpb9ysmfs9gsx56b5gkgipdy4v"; meta.platforms = lib.platforms.netbsd; + extraPaths = with self; [ libc.src ]; }; libm = mkDerivation { path = "lib/libm"; version = "8.0"; sha256 = "0i22603cgj6n00gn2m446v4kn1pk109qs1g6ylrslmihfmiy2h1d"; + SHLIBINSTALLDIR = "$(out)/lib"; meta.platforms = lib.platforms.netbsd; + extraPaths = with self; [ sys.src ]; }; i18n_module = mkDerivation { @@ -548,6 +722,7 @@ let version = "8.0"; sha256 = "0w6y5v3binm7gf2kn7y9jja8k18rhnyl55cvvfnfipjqdxvxd9jd"; meta.platforms = lib.platforms.netbsd; + extraPaths = with self; [ libc.src ]; }; csu = mkDerivation { @@ -555,9 +730,14 @@ let version = "8.0"; sha256 = "0630lbvz6v4ic13bfg8ccwfhqkgcv76bfdw9f36rfsnwfgpxqsmq"; meta.platforms = lib.platforms.netbsd; - nativeBuildInputs = [ makeMinimal install mandoc groff flex - bison genassym gencat lorder tsort stat ]; - extraPaths = [ sys.src ld_elf_so.src ]; + nativeBuildInputs = with buildPackages.netbsd; [ + bsdSetupHook + makeMinimal + install mandoc groff flex + byacc genassym gencat lorder tsort statHook + ]; + buildInputs = with self; [ headers ]; + extraPaths = with self; [ sys.src ld_elf_so.src ]; }; ld_elf_so = mkDerivation { @@ -565,8 +745,12 @@ let version = "8.0"; sha256 = "1jmqpi0kg2daiqnvpwdyfy8rpnszxsm70sxizz0r7wn53xjr5hva"; meta.platforms = lib.platforms.netbsd; + LIBC_PIC = "${stdenv.cc.libc}/lib/libc_pic.a"; + # Hack to prevent a symlink being installed here for compatibility. + SHLINKINSTALLDIR = "/usr/libexec"; USE_FORT = "yes"; - extraPaths = [ libc.src ] ++ libc.extraPaths; + makeFlags = [ "CLIBOBJ=${stdenv.cc.libc}/lib" ]; + extraPaths = with self; [ libc.src ] ++ libc.extraPaths; }; libc = mkDerivation { @@ -575,24 +759,30 @@ let sha256 = "0lgbc58qgn8kwm3l011x1ml1kgcf7jsgq7hbf0hxhlbvxq5bljl3"; USE_FORT = "yes"; MKPROFILE = "no"; - extraPaths = [ common.src i18n_module.src sys.src - ld_elf_so.src libpthread.src libm.src libresolv.src - librpcsvc.src libutil.src librt.src libcrypt.src ]; - buildInputs = [ buildPackages.netbsd.headers csu ]; - nativeBuildInputs = [ makeMinimal install mandoc groff flex - bison genassym gencat lorder tsort stat ]; - NIX_CFLAGS_COMPILE = "-B${csu}/lib"; + extraPaths = with self; [ + common i18n_module.src sys.src + ld_elf_so.src libpthread.src libm.src libresolv.src + librpcsvc.src libutil.src librt.src libcrypt.src + ]; + nativeBuildInputs = with buildPackages.netbsd; [ + bsdSetupHook + makeMinimal + install mandoc groff flex + byacc genassym gencat lorder tsort statHook rpcgen + ]; + buildInputs = with self; [ headers csu ]; + NIX_CFLAGS_COMPILE = "-B${self.csu}/lib"; meta.platforms = lib.platforms.netbsd; SHLIBINSTALLDIR = "$(out)/lib"; NLSDIR = "$(out)/share/nls"; makeFlags = [ "FILESDIR=$(out)/var/db"]; postInstall = '' - pushd ${buildPackages.netbsd.headers} + pushd ${self.headers} find . -type d -exec mkdir -p $out/\{} \; find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; popd - pushd ${csu} + pushd ${self.csu} find . -type d -exec mkdir -p $out/\{} \; find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; popd @@ -601,34 +791,31 @@ let NIX_CFLAGS_COMPILE+=" -I$out/include" NIX_LDFLAGS+=" -L$out/lib" - make -C $NETBSDSRCDIR/lib/libpthread $makeFlags - make -C $NETBSDSRCDIR/lib/libpthread $makeFlags install + make -C $BSDSRCDIR/lib/libpthread $makeFlags + make -C $BSDSRCDIR/lib/libpthread $makeFlags install - make -C $NETBSDSRCDIR/lib/libm $makeFlags - make -C $NETBSDSRCDIR/lib/libm $makeFlags install + make -C $BSDSRCDIR/lib/libm $makeFlags + make -C $BSDSRCDIR/lib/libm $makeFlags install - make -C $NETBSDSRCDIR/lib/libresolv $makeFlags - make -C $NETBSDSRCDIR/lib/libresolv $makeFlags install + make -C $BSDSRCDIR/lib/libresolv $makeFlags + make -C $BSDSRCDIR/lib/libresolv $makeFlags install - make -C $NETBSDSRCDIR/lib/librpcsv $makeFlags - make -C $NETBSDSRCDIR/lib/librpcsv $makeFlags install + make -C $BSDSRCDIR/lib/librpcsvc $makeFlags + make -C $BSDSRCDIR/lib/librpcsvc $makeFlags install - make -C $NETBSDSRCDIR/lib/i18n_module $makeFlags - make -C $NETBSDSRCDIR/lib/i18n_module $makeFlags install + make -C $BSDSRCDIR/lib/i18n_module $makeFlags + make -C $BSDSRCDIR/lib/i18n_module $makeFlags install - make -C $NETBSDSRCDIR/lib/libutil $makeFlags - make -C $NETBSDSRCDIR/lib/libutil $makeFlags install + make -C $BSDSRCDIR/lib/libutil $makeFlags + make -C $BSDSRCDIR/lib/libutil $makeFlags install - make -C $NETBSDSRCDIR/lib/librt $makeFlags - make -C $NETBSDSRCDIR/lib/librt $makeFlags install + make -C $BSDSRCDIR/lib/librt $makeFlags + make -C $BSDSRCDIR/lib/librt $makeFlags install - make -C $NETBSDSRCDIR/lib/libcrypt $makeFlags - make -C $NETBSDSRCDIR/lib/libcrypt $makeFlags install - ''; - postPatch = '' - substituteInPlace sys/Makefile.inc \ - --replace /usr/include/sys/syscall.h ${buildPackages.netbsd.headers}/include/sys/syscall.h + make -C $BSDSRCDIR/lib/libcrypt $makeFlags + make -C $BSDSRCDIR/lib/libcrypt $makeFlags install ''; + inherit (self.librt) postPatch; }; # # END LIBRARIES @@ -664,6 +851,4 @@ let # END MISCELLANEOUS # - }; - -in netbsd +}) diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/builder.sh b/third_party/nixpkgs/pkgs/os-specific/bsd/setup-hook.sh similarity index 89% rename from third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/builder.sh rename to third_party/nixpkgs/pkgs/os-specific/bsd/setup-hook.sh index 925001567f..45babc38d7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/builder.sh +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/setup-hook.sh @@ -1,6 +1,4 @@ -source $stdenv/setup - -# NetBSD makefiles should be able to detect this +# BSD makefiles should be able to detect this # but without they end up using gcc on Darwin stdenv addMakeFlags() { export setOutputFlags= @@ -64,13 +62,12 @@ addMakeFlags() { makeFlags="-j $NIX_BUILD_CORES $makeFlags" } -setNetBSDSourceDir() { +setBSDSourceDir() { # merge together all extra paths # there should be a better way to do this sourceRoot=$PWD/$sourceRoot - export NETBSDSRCDIR=$sourceRoot - export BSDSRCDIR=$NETBSDSRCDIR - export _SRC_TOP_=$NETBSDSRCDIR + export BSDSRCDIR=$sourceRoot + export _SRC_TOP_=$BSDSRCDIR chmod -R u+w $sourceRoot for path in $extraPaths; do cd $path @@ -80,13 +77,14 @@ setNetBSDSourceDir() { done cd $sourceRoot - if [ -d "$NETBSD_PATH" ] - then sourceRoot=$sourceRoot/$NETBSD_PATH + if [ -d "$BSD_PATH" ] + then sourceRoot=$sourceRoot/$BSD_PATH fi } includesPhase() { if [ -z "${skipIncludesPhase:-}" ]; then + runHook preIncludes local flagsArray=( $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} @@ -98,6 +96,7 @@ includesPhase() { moveUsrDir + runHook postIncludes fi } @@ -105,18 +104,17 @@ moveUsrDir() { if [ -d $prefix ]; then # Remove lingering /usr references if [ -d $prefix/usr ]; then - cd $prefix/usr + pushd $prefix/usr find . -type d -exec mkdir -p $out/\{} \; find . \( -type f -o -type l \) -exec mv \{} $out/\{} \; + popd fi find $prefix -type d -empty -delete fi } -postUnpackHooks+=(setNetBSDSourceDir) +postUnpackHooks+=(setBSDSourceDir) preConfigureHooks+=(addMakeFlags) preInstallHooks+=(includesPhase) fixupOutputHooks+=(moveUsrDir) - -genericBuild diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix index b88107f992..1b60abf562 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -192,6 +192,20 @@ let mkdir -p $out/Library/Frameworks/ cp -r ${darwin-stubs}/System/Library/${lib.optionalString private "Private"}Frameworks/${name}.framework \ $out/Library/Frameworks + + cd $out/Library/Frameworks/${name}.framework + + versions=(./Versions/*) + if [ "''${#versions[@]}" != 1 ]; then + echo "Unable to determine current version of framework ${name}" + exit 1 + fi + current=$(basename ''${versions[0]}) + + chmod u+w -R . + ln -s "$current" Versions/Current + ln -s Versions/Current/* . + # NOTE there's no re-export checking here, this is probably wrong ''; }; @@ -312,7 +326,7 @@ in rec { "Versions/A/Frameworks/WebKitLegacy.framework/Versions/A/WebKitLegacy.tbd" ]; }); - } // lib.genAttrs [ "ContactsPersistence" "UIFoundation" "GameCenter" ] (x: tbdOnlyFramework x {}); + } // lib.genAttrs [ "ContactsPersistence" "GameCenter" "SkyLight" "UIFoundation" ] (x: tbdOnlyFramework x {}); bareFrameworks = lib.mapAttrs framework (import ./frameworks.nix { inherit frameworks libs; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix index 2343493154..3e431810f2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,9 +1,6 @@ -{ lib, stdenv, fetchurl, fetchzip, pkgs }: +{ lib, stdenv, stdenvNoCC, fetchurl, fetchzip, pkgs }: let - macosPackages_11_0_1 = import ./macos-11.0.1.nix { inherit applePackage'; }; - developerToolsPackages_11_3_1 = import ./developer-tools-11.3.1.nix { inherit applePackage'; }; - # This attrset can in theory be computed automatically, but for that to work nicely we need # import-from-derivation to work properly. Currently it's rather ugly when we try to bootstrap # a stdenv out of something like this. With some care we can probably get rid of this, but for @@ -190,17 +187,6 @@ let }) // (attrs.meta or {}); }); - applePackage' = namePath: version: sdkName: sha256: let - pname = builtins.head (lib.splitString "/" namePath); - appleDerivation = appleDerivation' pname version sdkName sha256; - callPackage = pkgs.newScope (packages // pkgs.darwin // { inherit appleDerivation; }); - in callPackage (./. + "/${namePath}"); - - applePackage = namePath: sdkName: sha256: let - pname = builtins.head (lib.splitString "/" namePath); - version = versions.${sdkName}.${pname}; - in applePackage' namePath version sdkName sha256; - IOKitSpecs = { IOAudioFamily = fetchApple "osx-10.10.5" "0ggq7za3iq8g02j16rj67prqhrw828jsw3ah3bxq8a1cvr55aqnq"; IOFireWireFamily = fetchApple "osx-10.10.5" "059qa1m668kwvchl90cqcx35b31zaqdg61zi11y1imn5s389y2g1"; @@ -225,11 +211,35 @@ let IOKitSrcs = lib.mapAttrs (name: value: if lib.isFunction value then value name else value) IOKitSpecs; +in + +# darwin package set +self: + +let + macosPackages_11_0_1 = import ./macos-11.0.1.nix { inherit applePackage'; }; + developerToolsPackages_11_3_1 = import ./developer-tools-11.3.1.nix { inherit applePackage'; }; + + applePackage' = namePath: version: sdkName: sha256: + let + pname = builtins.head (lib.splitString "/" namePath); + appleDerivation = appleDerivation' pname version sdkName sha256; + callPackage = self.newScope { inherit appleDerivation; }; + in callPackage (./. + "/${namePath}"); + + applePackage = namePath: sdkName: sha256: let + pname = builtins.head (lib.splitString "/" namePath); + version = versions.${sdkName}.${pname}; + in applePackage' namePath version sdkName sha256; + # Only used for bootstrapping. It’s convenient because it was the last version to come with a real makefile. adv_cmds-boot = applePackage "adv_cmds/boot.nix" "osx-10.5.8" "102ssayxbg9wb35mdmhswbnw0bg7js3pfd8fcbic83c5q3bqa6c6" {}; - # TODO: shorten this list, we should cut down to a minimum set of bootstrap or necessary packages here. - stubPackages = { +in + +developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { + # TODO: shorten this list, we should cut down to a minimum set of bootstrap or necessary packages here. + inherit (adv_cmds-boot) ps locale; architecture = applePackage "architecture" "osx-10.11.6" "1pbpjcd7is69hn8y29i98ci0byik826if8gnp824ha92h90w0fq3" {}; bsdmake = applePackage "bsdmake" "dev-tools-3.2.6" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {}; @@ -290,7 +300,4 @@ let # TODO(matthewbauer): # To be removed, once I figure out how to build a newer Security version. Security = applePackage "Security/boot.nix" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; - }; - - packages = developerToolsPackages_11_3_1 // macosPackages_11_0_1 // stubPackages; -in packages +} diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/maloader/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/maloader/default.nix index 3943092bcf..9142484e04 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/maloader/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/maloader/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ld-mac.cc ''; - NIX_CFLAGS_COMPILE = "-I${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = "-I${lib.getDev libcxx}/include/c++/v1"; buildInputs = [ clang libcxx ]; buildFlags = [ "USE_LIBCXX=1" "release" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/spacebar/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/spacebar/default.nix index 780347c60c..8cfbaa3f9a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/spacebar/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/spacebar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge }: +{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge, SkyLight }: stdenv.mkDerivation rec { pname = "spacebar"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0f5ddn3sx13rwwh0nfl784160s8ml3m5593d5fz2b1996aznzrsx"; }; - buildInputs = [ Carbon Cocoa ScriptingBridge ]; + buildInputs = [ Carbon Cocoa ScriptingBridge SkyLight ]; installPhase = '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/anbox/kmod.nix b/third_party/nixpkgs/pkgs/os-specific/linux/anbox/kmod.nix index 1ed6d9c5f7..9ce65cd872 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/anbox/kmod.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/anbox/kmod.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "anbox-modules"; - version = "2019-11-15-" + kernel.version; + version = "2020-06-14-${kernel.version}"; src = fetchFromGitHub { owner = "anbox"; repo = "anbox-modules"; - rev = "e0a237e571989987806b32881044c539db25e3e1"; - sha256 = "1km1nslp4f5znwskh4bb1b61r1inw1dlbwiyyq3rrh0f0agf8d0v"; + rev = "98f0f3b3b1eeb5a6954ca15ec43e150b76369086"; + sha256 = "sha256-6xDJQ4YItdbYqle/9VNfOc7D80yFGd9cFyF+CuABaF0="; }; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -34,10 +34,9 @@ stdenv.mkDerivation { meta = with lib; { description = "Anbox ashmem and binder drivers."; homepage = "https://github.com/anbox/anbox-modules"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; - broken = (versionOlder kernel.version "4.4"); + broken = kernel.kernelOlder "4.4" || kernel.kernelAtLeast "5.5"; maintainers = with maintainers; [ edwtjo ]; }; - } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix index d41c3e2dc3..fbe02d69f1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20210425"; + version = "20210501"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "sha256-crNK6mZCCqD/Lm3rNtfH/4F48RuQCqHWP+qsTNVLOGY="; + sha256 = "sha256-rlTulWclPqMl9LdHdcAtLARXGItiSeF3RX+neZrjgV4="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix index bb0c0b45d6..1b1fb41545 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix @@ -3,33 +3,44 @@ , flex, bison , linuxHeaders ? stdenv.cc.libc.linuxHeaders , gawk -, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform && lib.any (lib.meta.platformMatch stdenv.hostPlatform) perl.meta.platforms, perl -, withPython ? stdenv.hostPlatform == stdenv.buildPlatform && lib.any (lib.meta.platformMatch stdenv.hostPlatform) python.meta.platforms, python +, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform && lib.meta.availableOn stdenv.hostPlatform perl, perl +, withPython ? stdenv.hostPlatform == stdenv.buildPlatform && lib.meta.availableOn stdenv.hostPlatform python, python , swig , ncurses , pam , libnotify , buildPackages +, coreutils +, gnugrep +, gnused +, kmod +, writeShellScript +, closureInfo +, runCommand }: let - apparmor-series = "2.13"; - apparmor-patchver = "6"; - apparmor-version = apparmor-series + "." + apparmor-patchver; + apparmor-version = "3.0.1"; apparmor-meta = component: with lib; { homepage = "https://apparmor.net/"; description = "A mandatory access control system - ${component}"; license = licenses.gpl2; - maintainers = with maintainers; [ phreedom thoughtpolice joachifm ]; + maintainers = with maintainers; [ joachifm julm phreedom thoughtpolice ]; platforms = platforms.linux; }; apparmor-sources = fetchurl { - url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; - sha256 = "13xshy7905d9q9n8d8i0jmdi9m36wr525g4wlsp8k21n7yvvh9j4"; + url = "https://launchpad.net/apparmor/${lib.versions.majorMinor apparmor-version}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; + sha256 = "096zbg3v7b51x7f1ly61mzd3iy9alad6sd4lam98j2d6v5ragbcg"; }; + aa-teardown = writeShellScript "aa-teardown" '' + PATH="${lib.makeBinPath [coreutils gnused gnugrep]}:$PATH" + . ${apparmor-parser}/lib/apparmor/rc.apparmor.functions + remove_profiles + ''; + prePatchCommon = '' chmod a+x ./common/list_capabilities.sh ./common/list_af_names.sh patchShebangs ./common/list_capabilities.sh ./common/list_af_names.sh @@ -45,12 +56,6 @@ let name = "0003-Added-missing-typedef-definitions-on-parser.patch"; sha256 = "0yyaqz8jlmn1bm37arggprqz0njb4lhjni2d9c8qfqj0kll0bam0"; }) - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/testing/apparmor/0007-Do-not-build-install-vim-file-with-utils-package.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; - name = "0007-Do-not-build-install-vim-file-with-utils-package.patch"; - sha256 = "1m4dx901biqgnr4w4wz8a2z9r9dxyw7wv6m6mqglqwf2lxinqmp4"; - }) - # (alpine patches {1,4,5,6,8} are needed for apparmor 2.11, but not 2.12) ]; # Set to `true` after the next FIXME gets fixed or this gets some @@ -121,7 +126,11 @@ let libapparmor.python ]; - prePatch = prePatchCommon + '' + prePatch = prePatchCommon + + # Do not build vim file + lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i ./utils/Makefile -e "/\/d" + '' + '' substituteInPlace ./utils/apparmor/easyprof.py --replace "/sbin/apparmor_parser" "${apparmor-parser}/bin/apparmor_parser" substituteInPlace ./utils/apparmor/aa.py --replace "/sbin/apparmor_parser" "${apparmor-parser}/bin/apparmor_parser" substituteInPlace ./utils/logprof.conf --replace "/sbin/apparmor_parser" "${apparmor-parser}/bin/apparmor_parser" @@ -132,13 +141,21 @@ let installFlags = [ "DESTDIR=$(out)" "BINDIR=$(out)/bin" "VIM_INSTALL_PATH=$(out)/share" "PYPREFIX=" ]; postInstall = '' - for prog in aa-audit aa-autodep aa-cleanprof aa-complain aa-disable aa-enforce aa-genprof aa-logprof aa-mergeprof aa-status aa-unconfined ; do + sed -i $out/bin/aa-unconfined -e "/my_env\['PATH'\]/d" + for prog in aa-audit aa-autodep aa-cleanprof aa-complain aa-disable aa-enforce aa-genprof aa-logprof aa-mergeprof aa-unconfined ; do wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" done substituteInPlace $out/bin/aa-notify \ --replace /usr/bin/notify-send ${libnotify}/bin/notify-send \ --replace /usr/bin/perl "${perl}/bin/perl -I ${libapparmor}/${perl.libPrefix}" + + substituteInPlace $out/bin/aa-remove-unknown \ + --replace "/lib/apparmor/rc.apparmor.functions" "${apparmor-parser}/lib/apparmor/rc.apparmor.functions" + wrapProgram $out/bin/aa-remove-unknown \ + --prefix PATH : ${lib.makeBinPath [gawk]} + + ln -s ${aa-teardown} $out/bin/aa-teardown ''; inherit doCheck; @@ -166,7 +183,7 @@ let prePatch = prePatchCommon; postPatch = "cd ./binutils"; makeFlags = [ "LANGS=" "USE_SYSTEM=1" ]; - installFlags = [ "DESTDIR=$(out)" "BINDIR=$(out)/bin" ]; + installFlags = [ "DESTDIR=$(out)" "BINDIR=$(out)/bin" "SBINDIR=$(out)/bin" ]; inherit doCheck; @@ -187,6 +204,9 @@ let substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h" ## techdoc.pdf still doesn't build ... substituteInPlace ./parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages" + substituteInPlace parser/rc.apparmor.functions \ + --replace "/sbin/apparmor_parser" "$out/bin/apparmor_parser" + sed -i parser/rc.apparmor.functions -e '2i . ${./fix-rc.apparmor.functions.sh}' ''; inherit patches; postPatch = "cd ./parser"; @@ -248,8 +268,35 @@ let meta = apparmor-meta "kernel patches"; }; + # Generate generic AppArmor rules in a file, + # from the closure of given rootPaths. + # To be included in an AppArmor profile like so: + # include "$(apparmorRulesFromClosure {} [pkgs.hello]}" + apparmorRulesFromClosure = + { # The store path of the derivation is given in $path + additionalRules ? [] + # TODO: factorize here some other common paths + # that may emerge from use cases. + , baseRules ? [ + "r $path" + "r $path/etc/**" + "r $path/share/**" + # Note that not all libraries are prefixed with "lib", + # eg. glibc-2.30/lib/ld-2.30.so + "mr $path/lib/**.so*" + # eg. glibc-2.30/lib/gconv/gconv-modules + "r $path/lib/**" + ] + , name ? "" + }: rootPaths: runCommand + ( "apparmor-closure-rules" + + lib.optionalString (name != "") "-${name}" ) {} '' + touch $out + while read -r path + do printf >>$out "%s,\n" ${lib.concatMapStringsSep " " (x: "\"${x}\"") (baseRules ++ additionalRules)} + done <${closureInfo {inherit rootPaths;}}/store-paths + ''; in - { inherit libapparmor @@ -258,5 +305,6 @@ in apparmor-parser apparmor-pam apparmor-profiles - apparmor-kernel-patches; + apparmor-kernel-patches + apparmorRulesFromClosure; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/fix-rc.apparmor.functions.sh b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/fix-rc.apparmor.functions.sh new file mode 100644 index 0000000000..ebc1baaa92 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/fix-rc.apparmor.functions.sh @@ -0,0 +1,32 @@ +aa_action() { + STRING=$1 + shift + $* + rc=$? + if [ $rc -eq 0 ] ; then + aa_log_success_msg $"$STRING " + else + aa_log_failure_msg $"$STRING " + fi + return $rc +} + +aa_log_success_msg() { + [ -n "$1" ] && echo -n $1 + echo ": done." +} + +aa_log_warning_msg() { + [ -n "$1" ] && echo -n $1 + echo ": Warning." +} + +aa_log_failure_msg() { + [ -n "$1" ] && echo -n $1 + echo ": Failed." +} + +aa_log_skipped_msg() { + [ -n "$1" ] && echo -n $1 + echo ": Skipped." +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/builder.sh b/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/builder.sh deleted file mode 100644 index a9e5aaef39..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/builder.sh +++ /dev/null @@ -1,302 +0,0 @@ -# TODO gentoo removes some tools because there are xorg sources (?) - -source $stdenv/setup -set -x - -die(){ echo $@; exit 1; } - -unzip $src -run_file=fglrx-$build/amd-driver-installer-$build-x86.x86_64.run -sh $run_file --extract . - -for patch in $patches;do - patch -p1 < $patch -done - -case "$system" in - x86_64-linux) - arch=x86_64 - lib_arch=lib64 - DIR_DEPENDING_ON_XORG_VERSION=xpic_64a - ;; - i686-linux) - arch=x86 - lib_arch=lib - DIR_DEPENDING_ON_XORG_VERSION=xpic - ;; - *) exit 1;; -esac - -# Handle/Build the kernel module. - -if test -z "$libsOnly"; then - - kernelVersion=$(cd ${kernelDir}/lib/modules && ls) - kernelBuild=$(echo ${kernelDir}/lib/modules/$kernelVersion/build) - linuxsources=$(echo ${kernelDir}/lib/modules/$kernelVersion/source) - - # note: maybe the .config file should be used to determine this ? - # current kbuild infrastructure allows using CONFIG_* defines - # but ati sources don't use them yet.. - # copy paste from make.sh - - setSMP(){ - - linuxincludes=$kernelBuild/include - - # copied and stripped. source: make.sh: - # 3 - # linux/autoconf.h may contain this: #define CONFIG_SMP 1 - - # Before 2.6.33 autoconf.h is under linux/. - # For 2.6.33 and later autoconf.h is under generated/. - if [ -f $linuxincludes/generated/autoconf.h ]; then - autoconf_h=$linuxincludes/generated/autoconf.h - else - autoconf_h=$linuxincludes/linux/autoconf.h - fi - src_file=$autoconf_h - - [ -e $src_file ] || die "$src_file not found" - - if [ `cat $src_file | grep "#undef" | grep "CONFIG_SMP" -c` = 0 ]; then - SMP=`cat $src_file | grep CONFIG_SMP | cut -d' ' -f3` - echo "file $src_file says: SMP=$SMP" - fi - - if [ "$SMP" = 0 ]; then - echo "assuming default: SMP=$SMP" - fi - # act on final result - if [ ! "$SMP" = 0 ]; then - smp="-SMP" - def_smp=-D__SMP__ - fi - - } - - setModVersions(){ - ! grep CONFIG_MODVERSIONS=y $kernelBuild/.config || - def_modversions="-DMODVERSIONS" - # make.sh contains much more code to determine this whether its enabled - } - - # ============================================================== - # resolve if we are building for a kernel with a fix for CVE-2010-3081 - # On kernels with the fix, use arch_compat_alloc_user_space instead - # of compat_alloc_user_space since the latter is GPL-only - - COMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space - - for src_file in \ - $kernelBuild/arch/x86/include/asm/compat.h \ - $linuxsources/arch/x86/include/asm/compat.h \ - $kernelBuild/include/asm-x86_64/compat.h \ - $linuxsources/include/asm-x86_64/compat.h \ - $kernelBuild/include/asm/compat.h; - do - if [ -e $src_file ]; - then - break - fi - done - if [ ! -e $src_file ]; - then - echo "Warning: x86 compat.h not found in kernel headers" - echo "neither arch/x86/include/asm/compat.h nor include/asm-x86_64/compat.h" - echo "could be found in $kernelBuild or $linuxsources" - echo "" - else - if [ `cat $src_file | grep -c arch_compat_alloc_user_space` -gt 0 ] - then - COMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space - fi - echo "file $src_file says: COMPAT_ALLOC_USER_SPACE=$COMPAT_ALLOC_USER_SPACE" - fi - - # make.sh contains some code figuring out whether to use these or not.. - PAGE_ATTR_FIX=0 - setSMP - setModVersions - CC=gcc - MODULE=fglrx - LIBIP_PREFIX=$TMP/arch/$arch/lib/modules/fglrx/build_mod - [ -d $LIBIP_PREFIX ] - GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`" - - { # build .ko module - cd ./common/lib/modules/fglrx/build_mod/2.6.x - echo .lib${MODULE}_ip.a.GCC${GCC_MAJOR}.cmd - echo 'This is a dummy file created to suppress this warning: could not find /lib/modules/fglrx/build_mod/2.6.x/.libfglrx_ip.a.GCC4.cmd for /lib/modules/fglrx/build_mod/2.6.x/libfglrx_ip.a.GCC4' > lib${MODULE}_ip.a.GCC${GCC_MAJOR}.cmd - - sed -i -e "s@COMPAT_ALLOC_USER_SPACE@$COMPAT_ALLOC_USER_SPACE@" ../kcl_ioctl.c - - make CC=${CC} \ - LIBIP_PREFIX=$(echo "$LIBIP_PREFIX" | sed -e 's|^\([^/]\)|../\1|') \ - MODFLAGS="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=$PAGE_ATTR_FIX -DCOMPAT_ALLOC_USER_SPACE=$COMPAT_ALLOC_USER_SPACE $def_smp $def_modversions" \ - KVER=$kernelVersion \ - KDIR=$kernelBuild \ - PAGE_ATTR_FIX=$PAGE_ATTR_FIX \ - -j4 - - cd $TMP - } - -fi - -{ # install - mkdir -p $out/lib/xorg - cp -r common/usr/include $out - cp -r common/usr/sbin $out - cp -r common/usr/share $out - mkdir $out/bin/ - cp -f common/usr/X11R6/bin/* $out/bin/ - # cp -r arch/$arch/lib $out/lib - # what are those files used for? - cp -r common/etc $out - cp -r $DIR_DEPENDING_ON_XORG_VERSION/usr/X11R6/$lib_arch/* $out/lib/xorg - - # install kernel module - if test -z "$libsOnly"; then - t=$out/lib/modules/${kernelVersion}/kernel/drivers/misc - mkdir -p $t - - cp ./common/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $t - fi - - # should this be installed at all? - # its used by the example fglrx_gamma only - # don't use $out/lib/modules/dri because this will cause the kernel module - # aggregator code to see both: kernel version and the dri direcotry. It'll - # fail saying different kernel versions - cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/modules/dri $out/lib - cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/modules/dri/* $out/lib - cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/*.so* $out/lib - cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/fglrx/fglrx-libGL.so.1.2 $out/lib/fglrx-libGL.so.1.2 - cp -r $TMP/arch/$arch/usr/$lib_arch/* $out/lib - ln -s libatiuki.so.1.0 $out/lib/libatiuki.so.1 - ln -s fglrx-libGL.so.1.2 $out/lib/libGL.so.1 - ln -s fglrx-libGL.so.1.2 $out/lib/libGL.so - # FIXME : This file is missing or has changed versions - #ln -s libfglrx_gamma.so.1.0 $out/lib/libfglrx_gamma.so.1 - # make xorg use the ati version - ln -s $out/lib/xorg/modules/extensions/{fglrx/fglrx-libglx.so,libglx.so} - # Correct some paths that are hardcoded into binary libs. - if [ "$arch" == "x86_64" ]; then - for lib in \ - xorg/modules/extensions/fglrx/fglrx-libglx.so \ - xorg/modules/glesx.so \ - dri/fglrx_dri.so \ - fglrx_dri.so \ - fglrx-libGL.so.1.2 - do - oldPaths="/usr/X11R6/lib/modules/dri" - newPaths="/run/opengl-driver/lib/dri" - sed -i -e "s|$oldPaths|$newPaths|" $out/lib/$lib - done - else - oldPaths="/usr/X11R6/lib32/modules/dri\x00/usr/lib32/dri" - newPaths="/run/opengl-driver-32/lib/dri\x00/dev/null/dri" - sed -i -e "s|$oldPaths|$newPaths|" \ - $out/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so - - for lib in \ - dri/fglrx_dri.so \ - fglrx_dri.so \ - xorg/modules/glesx.so - do - oldPaths="/usr/X11R6/lib32/modules/dri/" - newPaths="/run/opengl-driver-32/lib/dri" - sed -i -e "s|$oldPaths|$newPaths|" $out/lib/$lib - done - - oldPaths="/usr/X11R6/lib32/modules/dri\x00" - newPaths="/run/opengl-driver-32/lib/dri" - sed -i -e "s|$oldPaths|$newPaths|" $out/lib/fglrx-libGL.so.1.2 - fi - # libstdc++ and gcc are needed by some libs - for pelib1 in \ - fglrx_dri.so \ - dri/fglrx_dri.so - do - patchelf --remove-needed libX11.so.6 $out/lib/$pelib1 - done - - for pelib2 in \ - libatiadlxx.so \ - xorg/modules/glesx.so \ - dri/fglrx_dri.so \ - fglrx_dri.so \ - libaticaldd.so - do - patchelf --set-rpath $glibcDir/lib/:$libStdCxx/lib/ $out/lib/$pelib2 - done -} - -if test -z "$libsOnly"; then - -{ # build samples - mkdir -p $out/bin - mkdir -p samples - cd samples - tar xfz ../common/usr/src/ati/fglrx_sample_source.tgz - eval "$patchPhaseSamples" - - - ( # build and install fgl_glxgears - cd fgl_glxgears; - gcc -DGL_ARB_texture_multisample=1 -g \ - -I$libGL/include -I$libGLU/include \ - -I$out/include \ - -L$libGL/lib -L$libGLU/lib -lGL -lGLU -lX11 -lm \ - -o $out/bin/fgl_glxgears -Wall fgl_glxgears.c - ) - - true || ( # build and install - - ### - ## FIXME ? - # doesn't build undefined reference to `FGLRX_X11SetGamma' - # which should be contained in -lfglrx_gamma - # This should create $out/lib/libfglrx_gamma.so.1.0 ? because there is - # a symlink named libfglrx_gamma.so.1 linking to libfglrx_gamma.so.1.0 in $out/lib/ - - cd programs/fglrx_gamma - gcc -fPIC -I${libXxf86vm.dev}/include \ - -I${xorgproto}/include \ - -I$out/X11R6/include \ - -L$out/lib \ - -Wall -lm -lfglrx_gamma -lX11 -lXext -o $out/bin/fglrx_xgamma fglrx_xgamma.c - ) - - { - # patch and copy statically linked qt libs used by amdcccle - patchelf --set-interpreter $(echo $glibcDir/lib/ld-linux*.so.2) $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtCore.so.4 && - patchelf --set-rpath $gcc/$lib_arch/ $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtCore.so.4 && - patchelf --set-rpath $gcc/$lib_arch/:$out/share/ati/:$libXrender/lib/:$libSM/lib/:$libICE/lib/:$libfontconfig/lib/:$libfreetype/lib/ $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtGui.so.4 && - mkdir -p $out/share/ati - cp -r $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtCore.so.4 $out/share/ati/ - cp -r $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtGui.so.4 $out/share/ati/ - # copy binaries and wrap them: - BIN=$TMP/arch/$arch/usr/X11R6/bin - patchelf --set-rpath $gcc/$lib_arch/:$out/share/ati/:$libXinerama/lib/:$libXrandr/lib/ $TMP/arch/$arch/usr/X11R6/bin/amdcccle - patchelf --set-rpath $libXrender/lib/:$libXrandr/lib/ $TMP/arch/$arch/usr/X11R6/bin/aticonfig - patchelf --shrink-rpath $BIN/amdcccle - for prog in $BIN/*; do - cp -f $prog $out/bin && - patchelf --set-interpreter $(echo $glibcDir/lib/ld-linux*.so.2) $out/bin/$(basename $prog) && - wrapProgram $out/bin/$(basename $prog) --prefix LD_LIBRARY_PATH : $out/lib/:$gcc/lib/:$out/share/ati/:$libXinerama/lib/:$libXrandr/lib/:$libfontconfig/lib/:$libfreetype/lib/${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH - done - } - - rm -f $out/lib/fglrx/switchlibglx && rm -f $out/lib/fglrx/switchlibGL - -} - -fi - -for p in $extraDRIlibs; do - for lib in $p/lib/*.so*; do - ln -s $lib $out/lib/ - done -done diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/default.nix deleted file mode 100644 index 768aa7d7e7..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/default.nix +++ /dev/null @@ -1,140 +0,0 @@ -{ stdenv, lib, fetchurl, kernel ? null, which -, xorg, makeWrapper, glibc, patchelf, unzip -, fontconfig, freetype, libGLU, libGL # for fgl_glxgears -, # Whether to build the libraries only (i.e. not the kernel module or - # driver utils). Used to support 32-bit binaries on 64-bit - # Linux. - libsOnly ? false -}: - -assert (!libsOnly) -> kernel != null; - -with lib; - -# This derivation requires a maximum of gcc49, Linux kernel 4.1 and xorg.xserver 1.17 -# and will not build or run using versions newer - -# If you want to use a different Xorg version probably -# DIR_DEPENDING_ON_XORG_VERSION in builder.sh has to be adopted (?) -# make sure libglx.so of ati is used. xorg.xorgserver does provide it as well -# which is a problem because it doesn't contain the xorgserver patch supporting -# the XORG_DRI_DRIVER_PATH env var. -# See https://marc.info/?l=nix-dev&m=139641585515351 for a -# workaround (TODO) - -# The gentoo ebuild contains much more "magic" and is usually a great resource to -# find patches XD - -# http://wiki.cchtml.com/index.php/Main_Page - -# /usr/lib/dri/fglrx_dri.so must point to /run/opengl-driver/lib/fglrx_dri.so -# This is done in the builder script. - -stdenv.mkDerivation rec { - - version = "15.12"; - pname = "ati-drivers"; - build = "15.302"; - - linuxonly = - if stdenv.hostPlatform.system == "i686-linux" then - true - else if stdenv.hostPlatform.system == "x86_64-linux" then - true - else throw "ati-drivers are Linux only. Sorry. The build was stopped."; - - name = pname + "-" + version + (optionalString (!libsOnly) "-${kernelDir.version}"); - - builder = ./builder.sh; - gcc = stdenv.cc.cc; - libXinerama = xorg.libXinerama; - libXrandr = xorg.libXrandr; - libXrender = xorg.libXrender; - libXxf86vm = xorg.libXxf86vm; - xorgproto = xorg.xorgproto; - libSM = xorg.libSM; - libICE = xorg.libICE; - libfreetype = freetype; - libfontconfig = fontconfig; - libStdCxx = stdenv.cc.cc.lib; - - src = fetchurl { - url = - "https://www2.ati.com/drivers/linux/radeon-crimson-15.12-15.302-151217a-297685e.zip"; - sha256 = "704f2dfc14681f76dae3b4120c87b1ded33cf43d5a1d800b6de5ca292bb61e58"; - curlOpts = "--referer https://www.amd.com/en/support"; - }; - - hardeningDisable = [ "pic" "format" ]; - - patchPhaseSamples = "patch -p2 < ${./patches/patch-samples.patch}"; - patches = [ - ./patches/15.12-xstate-fp.patch - ./patches/15.9-kcl_str.patch - ./patches/15.9-mtrr.patch - ./patches/15.9-preempt.patch - ./patches/15.9-sep_printf.patch ] - ++ optionals ( kernel != null && - (lib.versionAtLeast kernel.version "4.6") ) - [ ./patches/kernel-4.6-get_user_pages.patch - ./patches/kernel-4.6-page_cache_release-put_page.patch ] - ++ optionals ( kernel != null && - (lib.versionAtLeast kernel.version "4.7") ) - [ ./patches/4.7-arch-cpu_has_pge-v2.patch ] - ++ optionals ( kernel != null && - (lib.versionAtLeast kernel.version "4.9") ) - [ ./patches/4.9-get_user_pages.patch ]; - - nativeBuildInputs = [ unzip ]; - buildInputs = - [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM - xorg.libXrandr xorg.libXxf86vm xorg.xorgproto xorg.imake xorg.libICE - patchelf - libGLU libGL - fontconfig - freetype - makeWrapper - which - ]; - - inherit libsOnly; - - kernelDir = if libsOnly then null else kernel.dev; - - # glibc only used for setting the binaries interpreter - glibcDir = glibc.out; - - # outputs TODO: probably many fixes are needed; - LD_LIBRARY_PATH = makeLibraryPath - [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM - xorg.libXrandr xorg.libXxf86vm xorg.xorgproto xorg.imake xorg.libICE - libGLU libGL - fontconfig - freetype - stdenv.cc.cc - ]; - - # without this some applications like blender don't start, but they start - # with nvidia. This causes them to be symlinked to $out/lib so that they - # appear in /run/opengl-driver/lib which get's added to LD_LIBRARY_PATH - - extraDRIlibs = [ xorg.libXrandr.out xorg.libXrender.out xorg.libXext.out - xorg.libX11.out xorg.libXinerama.out xorg.libSM.out - xorg.libICE.out ]; - - inherit libGLU libGL; # only required to build the examples - - enableParallelBuilding = true; - - meta = with lib; { - description = "ATI Catalyst display drivers"; - homepage = "http://support.amd.com/us/gpudownload/Pages/index.aspx"; - license = licenses.unfree; - maintainers = with maintainers; [ marcweber offline jerith666 ]; - platforms = platforms.linux; - hydraPlatforms = []; - # Copied from the nvidia default.nix to prevent a store collision. - priority = 4; - }; - -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.12-xstate-fp.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.12-xstate-fp.patch deleted file mode 100644 index 22e43fc0c7..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.12-xstate-fp.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Krzysztof Kolasa -Date: Thu, 26 Nov 2015 14:28:46 +0100 -Subject: [PATCH] Patch for kernel 4.4.0-rc2 - -constant change of name XSTATE_XP to name XFEATURE_MASK_FP ---- - firegl_public.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index 3626c7b..f071d42 100644 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod//firegl_public.c -@@ -6463,7 +6463,11 @@ static int KCL_fpu_save_init(struct task_struct *tsk) - if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP)) - #else - copy_xregs_to_kernel(&fpu->state.xsave); -- if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP)) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0) -+ if (!(fpu->state.xsave.header.xfeatures & XFEATURE_MASK_FP)) -+#else -+ if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP)) -+#endif - #endif - return 1; - } else if (static_cpu_has(X86_FEATURE_FXSR)) { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-kcl_str.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-kcl_str.patch deleted file mode 100644 index 20c3bc8a16..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-kcl_str.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/common/lib/modules/fglrx/build_mod/kcl_str.c 2015-09-13 13:47:30.000000000 -0400 -+++ b/common/lib/modules/fglrx/build_mod/kcl_str.c 2015-09-13 13:49:42.000000000 -0400 -@@ -169,7 +169,11 @@ int ATI_API_CALL KCL_STR_Strnicmp(const - const char* s2, - KCL_TYPE_SizeSigned count) - { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) - return strnicmp(s1, s2, count); -+#else -+ return strncasecmp(s1, s2, count); -+#endif - } - - /** \brief Locate character in string diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-mtrr.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-mtrr.patch deleted file mode 100644 index bdf70b4ccd..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-mtrr.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-19 23:43:22.000000000 -0400 -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-19 23:52:07.000000000 -0400 -@@ -3442,7 +3442,11 @@ int ATI_API_CALL KCL_MEM_MTRR_Support(vo - int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size) - { - #ifdef CONFIG_MTRR -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) -+ return arch_phys_wc_add(base, size); -+#else - return mtrr_add(base, size, MTRR_TYPE_WRCOMB, 1); -+#endif - #else /* !CONFIG_MTRR */ - return -EPERM; - #endif /* !CONFIG_MTRR */ -@@ -3451,7 +3455,12 @@ int ATI_API_CALL KCL_MEM_MTRR_AddRegionW - int ATI_API_CALL KCL_MEM_MTRR_DeleteRegion(int reg, unsigned long base, unsigned long size) - { - #ifdef CONFIG_MTRR -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) -+ arch_phys_wc_del(reg); -+ return reg; -+#else - return mtrr_del(reg, base, size); -+#endif - #else /* !CONFIG_MTRR */ - return -EPERM; - #endif /* !CONFIG_MTRR */ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-preempt.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-preempt.patch deleted file mode 100644 index c659883513..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-preempt.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-08-30 17:36:02.000000000 -0400 -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-08-30 17:39:36.000000000 -0400 -@@ -21,6 +21,8 @@ - !!! since it requires changes to linux/init/main.c. - #endif /* !MODULE */ - -+#include -+ - // ============================================================ - #include - -@@ -4997,7 +4999,9 @@ static unsigned int kas_spin_unlock(kas_ - unsigned long ATI_API_CALL KAS_GetExecutionLevel(void) - { - unsigned long ret; -+ preempt_disable(); - ret = kas_GetExecutionLevel(); -+ preempt_enable(); - return ret; - } - -@@ -5022,8 +5026,10 @@ unsigned int ATI_API_CALL KAS_Ih_Execute - KCL_DEBUG5(FN_FIREGL_KAS,"0x%08X, 0x%08X\n", ih_routine, ih_context); - - //Prevent simultaneous entry on some SMP systems. -+ preempt_disable(); - if (test_and_set_bit(0, (void *)&(kasContext.in_interrupts[smp_processor_id()]))) - { -+ preempt_enable(); - KCL_DEBUG1(FN_FIREGL_KAS, "The processor is handling the interrupt\n"); - return IRQ_NONE; - } -@@ -5036,9 +5042,9 @@ unsigned int ATI_API_CALL KAS_Ih_Execute - - kasSetExecutionLevel(orig_level); - spin_unlock(&kasContext.lock_ih); -- - clear_bit(0, (void *)&(kasContext.in_interrupts[smp_processor_id()])); - KCL_DEBUG5(FN_FIREGL_KAS,"%d\n", ret); -+ preempt_enable(); - - return ret; - } -@@ -5256,6 +5262,7 @@ unsigned int ATI_API_CALL KAS_Spinlock_A - - KCL_DEBUG5(FN_FIREGL_KAS,"0x%08X\n", hSpinLock); - -+ preempt_disable(); - spin_lock_info.routine_type = spinlock_obj->routine_type; - spin_lock_info.plock = &(spinlock_obj->lock); - -@@ -5263,6 +5270,7 @@ unsigned int ATI_API_CALL KAS_Spinlock_A - - spinlock_obj->acquire_type = spin_lock_info.acquire_type; - spinlock_obj->flags = spin_lock_info.flags; -+ preempt_enable(); - - KCL_DEBUG5(FN_FIREGL_KAS,"%d\n", ret); - return ret; -@@ -6034,6 +6042,8 @@ unsigned int ATI_API_CALL KAS_Interlocke - - KCL_DEBUG5(FN_FIREGL_KAS,"0x%08X, 0x%08X, 0x%08X\n", hListHead, hListEntry, phPrevEntry); - -+ preempt_disable(); -+ - /* Protect the operation with spinlock */ - spin_lock_info.routine_type = listhead_obj->routine_type; - spin_lock_info.plock = &(listhead_obj->lock); -@@ -6041,6 +6051,7 @@ unsigned int ATI_API_CALL KAS_Interlocke - if (!kas_spin_lock(&spin_lock_info)) - { - KCL_DEBUG_ERROR("Unable to grab list spinlock\n"); -+ preempt_enable(); - return 0; /* No spinlock - no operation */ - } - -@@ -6065,6 +6076,7 @@ unsigned int ATI_API_CALL KAS_Interlocke - spin_unlock_info.flags = spin_lock_info.flags; - - ret = kas_spin_unlock(&spin_unlock_info); -+ preempt_enable(); - KCL_DEBUG5(FN_FIREGL_KAS,"%d", ret); - return ret; - } -@@ -6153,8 +6165,10 @@ unsigned int ATI_API_CALL KAS_Interlocke - spin_lock_info.routine_type = listhead_obj->routine_type; - spin_lock_info.plock = &(listhead_obj->lock); - -+ preempt_disable(); - if (!kas_spin_lock(&spin_lock_info)) - { -+ preempt_enable(); - KCL_DEBUG_ERROR("Unable to grab list spinlock"); - return 0; /* No spinlock - no operation */ - } -@@ -6178,6 +6192,7 @@ unsigned int ATI_API_CALL KAS_Interlocke - spin_unlock_info.flags = spin_lock_info.flags; - - ret = kas_spin_unlock(&spin_unlock_info); -+ preempt_enable(); - KCL_DEBUG5(FN_FIREGL_KAS,"%d", ret); - return ret; - } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-sep_printf.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-sep_printf.patch deleted file mode 100644 index 3e4e8d6499..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/15.9-sep_printf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-14 15:14:36.000000000 -0400 -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-14 16:18:58.000000000 -0400 -@@ -649,6 +649,8 @@ static int firegl_major_proc_read(struct - *eof = 1; - - len = snprintf(buf, request, "%d\n", major); -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) -+ seq_printf(m, "%d\n", major); - #else - len = seq_printf(m, "%d\n", major); - #endif diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch deleted file mode 100644 index cb86f5aff2..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -uNr 16.8/common/lib/modules/fglrx/build_mod/firegl_public.c 16.8b/common/lib/modules/fglrx/build_mod/firegl_public.c ---- 16.8/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-12-18 19:47:41.000000000 +0100 -+++ 16.8b/common/lib/modules/fglrx/build_mod/firegl_public.c 2016-08-15 15:09:37.228538907 +0200 -@@ -4518,7 +4518,11 @@ - write_cr0(cr0); - wbinvd(); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) -+ if (boot_cpu_has(X86_FEATURE_PGE)) -+#else - if (cpu_has_pge) -+#endif - { - cr4 = READ_CR4(); - WRITE_CR4(cr4 & ~X86_CR4_PGE); -@@ -4532,7 +4536,11 @@ - wbinvd(); - __flush_tlb(); - write_cr0(cr0 & 0xbfffffff); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) -+ if (boot_cpu_has(X86_FEATURE_PGE)) -+#else - if (cpu_has_pge) -+#endif - { - WRITE_CR4(cr4); - } -@@ -4559,7 +4567,11 @@ - write_cr0(cr0); - wbinvd(); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) -+ if (boot_cpu_has(X86_FEATURE_PGE)) -+#else - if (cpu_has_pge) -+#endif - { - cr4 = READ_CR4(); - WRITE_CR4(cr4 & ~X86_CR4_PGE); -@@ -4572,7 +4584,11 @@ - wbinvd(); - __flush_tlb(); - write_cr0(cr0 & 0xbfffffff); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) -+ if (boot_cpu_has(X86_FEATURE_PGE)) -+#else - if (cpu_has_pge) -+#endif - { - WRITE_CR4(cr4); - } -diff -uNr 16.8/common/lib/modules/fglrx/build_mod/firegl_public.h 16.8b/common/lib/modules/fglrx/build_mod/firegl_public.h ---- 16.8/common/lib/modules/fglrx/build_mod/firegl_public.h 2015-12-18 19:47:41.000000000 +0100 -+++ 16.8b/common/lib/modules/fglrx/build_mod/firegl_public.h 2016-08-15 15:09:05.815141238 +0200 -@@ -650,9 +650,15 @@ - #define cpu_has_pat test_bit(X86_FEATURE_PAT, (void *) &boot_cpu_data.x86_capability) - #endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) -+#ifndef boot_cpu_has(X86_FEATURE_PGE) -+#define boot_cpu_has(X86_FEATURE_PGE) test_bit(X86_FEATURE_PGE, &boot_cpu_data.x86_capability) -+#endif -+#else - #ifndef cpu_has_pge - #define cpu_has_pge test_bit(X86_FEATURE_PGE, &boot_cpu_data.x86_capability) - #endif -+#endif - - /* 2.6.29 defines pgprot_writecombine as a macro which resolves to a - * GPL-only function with the same name. So we always use our own diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch deleted file mode 100644 index 8a6c42cdb1..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit b3e4353fc68a6a024dcb95e2d61aa0afd7370233 -Author: Matt McHenry -Date: Fri Feb 3 20:19:41 2017 - - patch for 4.9 only - -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index 4ce095f..3b591e1 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -3224,7 +3224,7 @@ int ATI_API_CALL KCL_LockUserPages(unsigned long vaddr, unsigned long* page_list - int ret; - - down_read(¤t->mm->mmap_sem); -- ret = get_user_pages(vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL); -+ ret = get_user_pages(vaddr, page_cnt, 1, (struct page **)page_list, NULL); - up_read(¤t->mm->mmap_sem); - - return ret; -@@ -3242,7 +3242,7 @@ int ATI_API_CALL KCL_LockReadOnlyUserPages(unsigned long vaddr, unsigned long* p - int ret; - - down_read(¤t->mm->mmap_sem); -- ret = get_user_pages(vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL); -+ ret = get_user_pages(vaddr, page_cnt, 0, (struct page **)page_list, NULL); - up_read(¤t->mm->mmap_sem); - - return ret; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch deleted file mode 100644 index 1e7209ed5e..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index 9c70211..b2242af 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -3220,7 +3220,7 @@ int ATI_API_CALL KCL_LockUserPages(unsigned long vaddr, unsigned long* page_list - int ret; - - down_read(¤t->mm->mmap_sem); -- ret = get_user_pages(current, current->mm, vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL); -+ ret = get_user_pages(vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL); - up_read(¤t->mm->mmap_sem); - - return ret; -@@ -3238,7 +3238,7 @@ int ATI_API_CALL KCL_LockReadOnlyUserPages(unsigned long vaddr, unsigned long* p - int ret; - - down_read(¤t->mm->mmap_sem); -- ret = get_user_pages(current, current->mm, vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL); -+ ret = get_user_pages(vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL); - up_read(¤t->mm->mmap_sem); - - return ret; --- -2.9.2 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-page_cache_release-put_page.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-page_cache_release-put_page.patch deleted file mode 100644 index 28820790e4..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-page_cache_release-put_page.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index b2242af..586129c 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -3249,7 +3249,7 @@ void ATI_API_CALL KCL_UnlockUserPages(unsigned long* page_list, unsigned int pag - unsigned int i; - for (i=0; i - - #ifdef _WIN32 - #include diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/atop/atop.service.patch b/third_party/nixpkgs/pkgs/os-specific/linux/atop/atop.service.patch new file mode 100644 index 0000000000..3ef59e60cb --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/atop/atop.service.patch @@ -0,0 +1,10 @@ +--- a/atop.service ++++ b/atop.service +@@ -9,5 +9,6 @@ + Environment=LOGPATH=/var/log/atop +-EnvironmentFile=/etc/default/atop ++EnvironmentFile=-/etc/default/atop + ExecStartPre=/bin/sh -c 'test -n "$LOGINTERVAL" -a "$LOGINTERVAL" -eq "$LOGINTERVAL"' + ExecStartPre=/bin/sh -c 'test -n "$LOGGENERATIONS" -a "$LOGGENERATIONS" -eq "$LOGGENERATIONS"' ++ExecStartPre=/bin/sh -c 'mkdir -p "${LOGPATH}"' + ExecStart=/bin/sh -c 'exec @out@/bin/atop ${LOGOPTS} -w "${LOGPATH}/atop_$(date +%%Y%%m%%d)" ${LOGINTERVAL}' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/atop/atopacct.service.patch b/third_party/nixpkgs/pkgs/os-specific/linux/atop/atopacct.service.patch new file mode 100644 index 0000000000..9f2cd8f2e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/atop/atopacct.service.patch @@ -0,0 +1,7 @@ +--- a/atopacct.service ++++ b/atopacct.service +@@ -9,3 +9,3 @@ + Type=forking +-PIDFile=/var/run/atopacctd.pid ++PIDFile=/run/atopacctd.pid + ExecStart=@out@/bin/atopacctd diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix index e1b64c0a4b..50a3e3e631 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix @@ -1,4 +1,14 @@ -{lib, stdenv, fetchurl, zlib, ncurses}: +{ lib +, stdenv +, fetchurl +, zlib +, ncurses +, findutils +, systemd +, python3 +# makes the package unfree via pynvml +, withAtopgpu ? false +}: stdenv.mkDerivation rec { pname = "atop"; @@ -9,31 +19,52 @@ stdenv.mkDerivation rec { sha256 = "nsLKOlcWkvfvqglfmaUQZDK8txzCLNbElZfvBIEFj3I="; }; - buildInputs = [zlib ncurses]; + nativeBuildInputs = lib.optionals withAtopgpu [ python3.pkgs.wrapPython ]; + buildInputs = [ zlib ncurses ] ++ lib.optionals withAtopgpu [ python3 ]; + pythonPath = lib.optionals withAtopgpu [ python3.pkgs.pynvml ]; makeFlags = [ - "SCRPATH=$out/etc/atop" - "LOGPATH=/var/log/atop" - "INIPATH=$out/etc/rc.d/init.d" - "SYSDPATH=$out/lib/systemd/system" - "CRNPATH=$out/etc/cron.d" - "DEFPATH=$out/etc/default" - "ROTPATH=$out/etc/logrotate.d" + "DESTDIR=$(out)" + "BINPATH=/bin" + "SBINPATH=/bin" + "MAN1PATH=/share/man/man1" + "MAN5PATH=/share/man/man5" + "MAN8PATH=/share/man/man8" + "SYSDPATH=/lib/systemd/system" + "PMPATHD=/lib/systemd/system-sleep" + ]; + + patches = [ + # Fix paths in atop.service, atop-rotate.service, atopgpu.service, atopacct.service, + # and atop-pm.sh + ./fix-paths.patch + # Don't fail on missing /etc/default/atop, make sure /var/log/atop exists pre-start + ./atop.service.patch + # Specify PIDFile in /run, not /var/run to silence systemd warning + ./atopacct.service.patch ]; preConfigure = '' - sed -e "s@/usr/@$out/@g" -i $(find . -type f ) - sed -e "/mkdir.*LOGPATH/s@mkdir@echo missing dir @" -i Makefile - sed -e "/touch.*LOGPATH/s@touch@echo should have created @" -i Makefile - sed -e 's/chown/true/g' -i Makefile - sed -e '/chkconfig/d' -i Makefile - sed -e 's/chmod 04711/chmod 0711/g' -i Makefile + for f in *.{sh,service}; do + findutils=${findutils} systemd=${systemd} substituteAllInPlace "$f" + done + + substituteInPlace Makefile --replace 'chown' 'true' + substituteInPlace Makefile --replace 'chmod 04711' 'chmod 0711' ''; installTargets = [ "systemdinstall" ]; preInstall = '' - mkdir -p "$out"/{bin,sbin} + mkdir -p $out/bin ''; + postInstall = '' + # remove extra files we don't need + rm -r $out/{var,etc} $out/bin/atop{sar,}-${version} + '' + (if withAtopgpu then '' + wrapPythonPrograms + '' else '' + rm $out/lib/systemd/system/atopgpu.service $out/bin/atopgpud $out/share/man/man8/atopgpud.8 + ''); meta = with lib; { platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/atop/fix-paths.patch b/third_party/nixpkgs/pkgs/os-specific/linux/atop/fix-paths.patch new file mode 100644 index 0000000000..e6cd631d3c --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/atop/fix-paths.patch @@ -0,0 +1,48 @@ +--- a/atop.service ++++ b/atop.service +@@ -12,4 +12,4 @@ + ExecStartPre=/bin/sh -c 'test -n "$LOGGENERATIONS" -a "$LOGGENERATIONS" -eq "$LOGGENERATIONS"' +-ExecStart=/bin/sh -c 'exec /usr/bin/atop ${LOGOPTS} -w "${LOGPATH}/atop_$(date +%%Y%%m%%d)" ${LOGINTERVAL}' +-ExecStartPost=/usr/bin/find "${LOGPATH}" -name "atop_*" -mtime +${LOGGENERATIONS} -exec rm -v {} \; ++ExecStart=/bin/sh -c 'exec @out@/bin/atop ${LOGOPTS} -w "${LOGPATH}/atop_$(date +%%Y%%m%%d)" ${LOGINTERVAL}' ++ExecStartPost=@findutils@/bin/find "${LOGPATH}" -name "atop_*" -mtime +${LOGGENERATIONS} -exec rm -v {} \; + KillSignal=SIGUSR2 + +--- a/atop-rotate.service ++++ b/atop-rotate.service +@@ -4,3 +4,3 @@ + [Service] + Type=oneshot +-ExecStart=/usr/bin/systemctl try-restart atop.service ++ExecStart=@systemd@/bin/systemctl try-restart atop.service + +--- a/atopgpu.service ++++ b/atopgpu.service +@@ -6,5 +6,5 @@ + + [Service] +-ExecStart=/usr/sbin/atopgpud ++ExecStart=@out@/bin/atopgpud + Type=oneshot + RemainAfterExit=yes + +--- a/atopacct.service ++++ b/atopacct.service +@@ -10,3 +10,3 @@ + PIDFile=/var/run/atopacctd.pid +-ExecStart=/usr/sbin/atopacctd ++ExecStart=@out@/bin/atopacctd + +--- a/atop-pm.sh ++++ b/atop-pm.sh +@@ -2,8 +2,8 @@ + + case "$1" in +- pre) /usr/bin/systemctl stop atop ++ pre) @systemd@/bin/systemctl stop atop + exit 0 + ;; +- post) /usr/bin/systemctl start atop ++ post) @systemd@/bin/systemctl start atop + exit 0 + ;; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix index 354f4b1bff..7da1459341 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, kernel }: +{ lib, stdenv, fetchurl, fetchpatch, kernel }: let cfg = import ./version.nix; in @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256.${pname}; }; + patches = [ + (fetchpatch { + # Fix build with Kernel>=5.12, remove for batman-adv>=2021.1 + url = "https://git.open-mesh.org/batman-adv.git/patch/6d67ca7f530d4620e3d066b02aefbfd8893d6c05?hp=362da918384286a959ad7c3455d9d33d9ff99d7d"; + sha256 = "039x67yfkwl0b8af8vwx5m58ji2qn8x44rr1rkzi5j43cvmnh2cg"; + }) + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; 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 4235ecb38d..221f38faa8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix @@ -6,7 +6,7 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.19.0"; + version = "0.20.0"; disabled = !stdenv.isLinux; @@ -14,12 +14,12 @@ python.pkgs.buildPythonApplication rec { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "sha256:0k807vzznlb2icczw64ph6q28605kvghya2kd4h3c7jmap6gq1qg"; + sha256 = "1xnpz2zv445dp5h0160drv6xlvrnwfj23ngc4dp3clcd59jh1baq"; }; format = "other"; buildInputs = with llvmPackages; [ - llvm clang-unwrapped kernel + llvm llvm.dev libclang kernel elfutils luajit netperf iperf systemtap.stapBuild flex bash libbpf @@ -32,7 +32,7 @@ python.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = [ python.pkgs.netaddr ]; - nativeBuildInputs = [ makeWrapper cmake flex bison ] + nativeBuildInputs = [ makeWrapper cmake flex bison llvmPackages.llvm.dev ] # libelf is incompatible with elfutils-libelf ++ lib.filter (x: x != libelf) kernel.moduleBuildDependencies; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix index 701fed06bb..650e85df51 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix @@ -6,22 +6,22 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "v${version}"; - sha256 = "0njbixkrpdl9gjnkzg0ybmqsva0ydfda5vms66v8ij7xida2qy07"; + sha256 = "sha256-DZO47AH506DBVH/AuvOF3JfpRxv/D/lmzVg8WOH9Dqo="; }; buildInputs = with llvmPackages; - [ llvm clang-unwrapped + [ llvm libclang kernel elfutils libelf bcc libbpf libbfd libopcodes ]; - nativeBuildInputs = [ cmake pkg-config flex bison ] + nativeBuildInputs = [ cmake pkg-config flex bison llvmPackages.llvm.dev ] # libelf is incompatible with elfutils-libelf ++ lib.filter (x: x != libelf) kernel.moduleBuildDependencies; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cryptodev/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cryptodev/default.nix index bbd8d35403..f09679ba21 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cryptodev/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cryptodev/default.nix @@ -1,14 +1,14 @@ { fetchFromGitHub, lib, stdenv, kernel ? false }: stdenv.mkDerivation rec { - pname = "cryptodev-linux-1.11"; + pname = "cryptodev-linux-1.12"; name = "${pname}-${kernel.version}"; src = fetchFromGitHub { owner = "cryptodev-linux"; repo = "cryptodev-linux"; rev = pname; - sha256 = "1ky850qiyacq8p3lng7n3w6h3x2clqrz4lkv2cv3psy92mg9pvc9"; + sha256 = "sha256-vJQ10rG5FGbeEOqCUmH/pZ0P77kAW/MtUarywbtIyHw="; }; hardeningDisable = [ "pic" ]; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; homepage = "http://cryptodev-linux.org/"; + maintainers = with lib.maintainers; [ fortuneteller2k ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/default.nix index bffc90260c..c6f1c1d825 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dbus-broker"; - version = "22"; + version = "28"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; rev = "v${version}"; - sha256 = "0vxr73afix5wjxy8g4cckwhl242rrlazm52673iwmdyfz5nskj2x"; + sha256 = "1rsn74x6yhyl9w7jqgnzgzyhp9cln1602jyzpw5qvrkdk5b7zzgs"; fetchSubmodules = true; }; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ dbus linuxHeaders systemd ]; + mesonFlags = [ "-D=system-console-users=gdm,sddm,lightdm" ]; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; PKG_CONFIG_SYSTEMD_CATALOGDIR = "${placeholder "out"}/lib/systemd/catalog"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix index 2809605910..8a41cd126d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.38"; + version = "0.40"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "sha256-UR6NHIO/L/QbuVerXe32RNT33wwrDvIZpV6nlYaImI8="; + sha256 = "sha256-Yr08Kb8YU7xqBnhhS8rn+GFXAV68Hgj4aY26eptb9/8="; }; nativeBuildInputs = [ 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 62f95ef532..1ff0b9a154 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 @@ { lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - version = "2.4.1"; + version = "2.5.0"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "0f3i878g11yfw6n68p3qf125jsnggy706jhc8sc0z1xgap6qgh09"; + sha256 = "sha256-uOf/1624UtjaZtrk7XyQpeUGdTNVDnzZJZMgU86i+SM="; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix index 6eaa58f353..55b00ab871 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "eventstat"; - version = "0.04.11"; + version = "0.04.12"; src = fetchzip { url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; - sha256 = "0hsi5w8dmqwwdahnqvs83bam3j1cagw1ggm06d35dfwy5xknc5i4"; + sha256 = "sha256-XBSs/jZodCpI9BHgAF8+bE23gRCr2uebYiMJxxB8T5E="; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fatrace/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fatrace/default.nix index 61044526e4..2ae8bb2dca 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fatrace/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fatrace/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "fatrace"; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = version; - sha256 = "sha256-1daYCVGz8Zd42j2QMFL5EAULKkmBnbE828i5NV9Kcb8="; + sha256 = "sha256-w7leZPdmiTc+avihP203e6GLvbRzbCtNOJdF8MM2v68="; }; buildInputs = [ python3 which ]; 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 b66c4e7308..a544548853 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 @@ stdenvNoCC.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2021-03-15"; + version = "2021-05-11"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = "refs/tags/" + lib.replaceStrings ["-"] [""] version; - sha256 = "sha256-BnYqveVFJk/tVYgYuggXgYGcUCZT9iPkCQIi48FOTWc="; + sha256 = "015hajf3mq8dv2hw5wsyvi34zdqiwxp9p5dwdp8nrk4r9z5ysqxw"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-TzAMGj7IDhzXcFhHAd15aZvAqyN+OKlJTkIhVGoTkIs="; + outputHash = "034bwbl616vzl7lhcbvyz9dzmpzwi12vca3r5mszdxqh3z3s1g6a"; meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/gradm/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/gradm/default.nix index 7d2660ad26..cd99dfa5db 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/gradm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/gradm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gradm"; - version = "3.1-202012071814"; + version = "3.1-202102241600"; src = fetchurl { - url = "http://grsecurity.net/stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-ghl9P2IYsSHcJsVxJbFwfFS1CTZ2xLxdvyhdk/1OZG4="; + url = "https://grsecurity.net/stable/${pname}-${version}.tar.gz"; + sha256 = "02ni34hpggv00140p9gvh0lqi173zdddd2qhfi96hyr1axd5pl50"; }; nativeBuildInputs = [ bison flex ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "grsecurity RBAC administration and policy analysis utility"; homepage = "https://grsecurity.net"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice joachifm ]; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix index ada0ddef23..e925b98902 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hdparm"; - version = "9.60"; + version = "9.61"; src = fetchurl { url = "mirror://sourceforge/hdparm/hdparm-${version}.tar.gz"; - sha256 = "1k1mcv7naiacw1y6bdd1adnjfiq1kkx2ivsadjwmlkg4fff775w3"; + sha256 = "sha256-2hocOIfxC4OX6OAgE8qmEULg5yyw1zmXQhyi8vTfU0M="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hid-nintendo/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hid-nintendo/default.nix new file mode 100644 index 0000000000..321f96d0d3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hid-nintendo/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + pname = "hid-nintendo"; + version = "3.1"; + + src = fetchFromGitHub { + owner = "nicman23"; + repo = "dkms-hid-nintendo"; + rev = version; + sha256 = "sha256-IanH3yHfkQhqtKvKD8lh+muc9yX8XJ5bfdy1Or8Vd5g="; + }; + + setSourceRoot = '' + export sourceRoot=$(pwd)/source/src + ''; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = [ + "-C" + "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "M=$(sourceRoot)" + ]; + + buildFlags = [ "modules" ]; + installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; + installTargets = [ "modules_install" ]; + + meta = with lib; { + description = "A Nintendo HID kernel module"; + homepage = "https://github.com/nicman23/dkms-hid-nintendo"; + license = licenses.gpl2; + maintainers = [ maintainers.rencire ]; + platforms = platforms.linux; + broken = versionOlder kernel.version "4.14"; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/i2c-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/i2c-tools/default.nix index 23bc89b7d1..5c05ca6082 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/i2c-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/i2c-tools/default.nix @@ -1,12 +1,18 @@ -{ lib, stdenv, fetchurl, perl, read-edid }: +{ lib +, stdenv +, fetchgit +, perl +, read-edid +}: stdenv.mkDerivation rec { pname = "i2c-tools"; version = "4.2"; - src = fetchurl { - url = "https://www.kernel.org/pub/software/utils/i2c-tools/${pname}-${version}.tar.xz"; - sha256 = "1mmc1n8awl3winyrp1rcxg94vjsx9dc1y7gj7y88blc2f2ydmwip"; + src = fetchgit { + url = "https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git"; + rev = "v${version}"; + sha256 = "0vqrbp10klr7ylarr6cy1q7nafiqaky4iq5my5dqy101h93vg4pg"; }; buildInputs = [ perl ]; @@ -18,6 +24,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; + outputs = [ "out" "man" ]; + postInstall = '' rm -rf $out/include # Installs include/linux/i2c-dev.h that conflics with kernel headers ''; @@ -25,7 +33,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Set of I2C tools for Linux"; homepage = "https://i2c.wiki.kernel.org/index.php/I2C_Tools"; - license = licenses.gpl2; + # library is LGPL 2.1 or later; "most tools" GPL 2 or later + license = with licenses; [ lgpl21Plus gpl2Plus ]; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix index affc18e8f3..638983d6c1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.11.0"; + version = "5.12.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0m2wa14rhmdb6k07minmw5lk97vz4vn56ndka5849cqjh88fmqn5"; + sha256 = "sha256-nSaNuYo27ioOP/O5Ky7/9m/BE4pR5Am972qzz+FfMm8="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iputils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iputils/default.nix index 56942d6d42..495860ef57 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iputils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iputils/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns , libcap, libidn2 +, apparmorRulesFromClosure }: let @@ -20,6 +21,8 @@ in stdenv.mkDerivation rec { sha256 = "08j2hfgnfh31vv9rn1ml7090j2lsvm9wdpdz13rz60rmyzrx9dq3"; }; + outputs = ["out" "apparmor"]; + mesonFlags = [ "-DBUILD_RARPD=true" "-DBUILD_TRACEROUTE6=true" @@ -34,6 +37,26 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap ] ++ lib.optional (!stdenv.hostPlatform.isMusl) libidn2; + postInstall = '' + mkdir $apparmor + cat >$apparmor/bin.ping < + $out/bin/ping { + include + include + include + include "${apparmorRulesFromClosure { name = "ping"; } + ([libcap] ++ lib.optional (!stdenv.hostPlatform.isMusl) libidn2)}" + include + capability net_raw, + network inet raw, + network inet6 raw, + mr $out/bin/ping, + r $out/share/locale/**, + r @{PROC}/@{pid}/environ, + } + EOF + ''; meta = with lib; { description = "A set of small useful utilities for Linux networking"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix index 6e703feb99..63692149f3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.12"; + version = "1.14"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "sha256-o3Vc5p/AFZwbkEWJZzO6wWAJ/BmSh0eKxdnjm5B9BFU="; + sha256 = "sha256-uGe4TO1/bs8k2z3wOJqaZgT6u6yX/7wx4HMSS2hN4XE="; }; outputs = [ "out" "man" ] @@ -57,6 +57,8 @@ stdenv.mkDerivation rec { ]; postUnpack = '' + mkdir -p iwd/ell + ln -s ${ell.src}/ell/useful.h iwd/ell/useful.h patchShebangs . ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kbd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kbd/default.nix index 2119c10b9c..467de4b029 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kbd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kbd/default.nix @@ -1,15 +1,22 @@ -{ lib, stdenv, fetchurl, autoreconfHook, - gzip, bzip2, pkg-config, flex, check, - pam, coreutils +{ lib +, stdenv +, fetchurl +, nixosTests +, autoreconfHook +, pkg-config +, flex +, check +, pam +, coreutils }: stdenv.mkDerivation rec { pname = "kbd"; - version = "2.0.4"; + version = "2.4.0"; src = fetchurl { url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz"; - sha256 = "124swm93dm4ca0pifgkrand3r9gvj3019d4zkfxsj9djpvv0mnaz"; + sha256 = "17wvrqz2kk0w87idinhyvd31ih1dp7ldfl2yfx7ailygb0279w2m"; }; configureFlags = [ @@ -18,13 +25,8 @@ stdenv.mkDerivation rec { "--disable-nls" ]; - patches = [ ./search-paths.patch ]; - postPatch = '' - # Add Neo keymap subdirectory - sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.am - # Renaming keymaps with name clashes, because loadkeys just picks # the first keymap it sees. The clashing names lead to e.g. # "loadkeys no" defaulting to a norwegian dvorak map instead of @@ -33,21 +35,9 @@ stdenv.mkDerivation rec { mv qwertz/cz{,-qwertz}.map mv olpc/es{,-olpc}.map mv olpc/pt{,-olpc}.map - mv dvorak/{no.map,dvorak-no.map} mv fgGIod/trf{,-fgGIod}.map mv colemak/{en-latin9,colemak}.map popd - - # Fix the path to gzip/bzip2. - substituteInPlace src/libkeymap/findfile.c \ - --replace gzip ${gzip}/bin/gzip \ - --replace bzip2 ${bzip2.bin}/bin/bzip2 \ - - # We get a warning in armv5tel-linux and the fuloong2f, so we - # disable -Werror in it. - ${lib.optionalString (stdenv.isAarch32 || stdenv.hostPlatform.isMips) '' - sed -i s/-Werror// src/Makefile.am - ''} ''; postInstall = '' @@ -57,16 +47,16 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ check pam ]; nativeBuildInputs = [ autoreconfHook pkg-config flex ]; - makeFlags = [ "setowner=" ]; + passthru.tests = nixosTests.keymap; meta = with lib; { - homepage = "ftp://ftp.altlinux.org/pub/people/legion/kbd/"; - description = "Linux keyboard utilities and keyboard maps"; + homepage = "https://kbd-project.org/"; + description = "Linux keyboard tools and keyboard maps"; platforms = platforms.linux; license = licenses.gpl2Plus; + maintainers = with maintainers; [ davidak ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix deleted file mode 100644 index b3d5fe1b63..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, lib, fetchurl, gzip }: - -{ - dvp = stdenv.mkDerivation rec { - pname = "dvp"; - version = "1.2.1"; - - src = fetchurl { - url = "http://kaufmann.no/downloads/linux/dvp-${lib.replaceStrings ["."] ["_"] version}.map.gz"; - sha256 = "0e859211cfe16a18a3b9cbf2ca3e280a23a79b4e40b60d8d01d0fde7336b6d50"; - }; - - nativeBuildInputs = [ gzip ]; - - buildCommand = '' - mkdir -p $out/share/keymaps/i386/dvorak - gzip -c -d $src > $out/share/keymaps/i386/dvorak/dvp.map - ''; - }; - - neo = stdenv.mkDerivation { - pname = "neo"; - version = "2476"; - - src = fetchurl { - name = "neo.map"; - url = "https://raw.githubusercontent.com/neo-layout/neo-layout/" - + "a0dee06fed824abfad658b7f10e6d907b270be0a/linux/console/neo.map"; - sha256 = "19mfrd31vzpsjiwc7pshxm0b0sz5dd17xrz6k079cy4im1vf0r4g"; - }; - - buildCommand = '' - install -D $src $out/share/keymaps/i386/neo/neo.map - ''; - }; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kbd/search-paths.patch b/third_party/nixpkgs/pkgs/os-specific/linux/kbd/search-paths.patch deleted file mode 100644 index c9405a5672..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kbd/search-paths.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- a/src/libkeymap/analyze.l -+++ b/src/libkeymap/analyze.l -@@ -101,6 +101,9 @@ stack_pop(struct lk_ctx *ctx, void *scan - static const char *const include_dirpath0[] = { "", 0 }; - static const char *const include_dirpath1[] = { "", "../include/", "../../include/", 0 }; - static const char *const include_dirpath3[] = { -+ "/etc/kbd/" KEYMAPDIR "/include/", -+ "/etc/kbd/" KEYMAPDIR "/i386/include/", -+ "/etc/kbd/" KEYMAPDIR "/mac/include/", - DATADIR "/" KEYMAPDIR "/include/", - DATADIR "/" KEYMAPDIR "/i386/include/", - DATADIR "/" KEYMAPDIR "/mac/include/", 0 ---- a/src/loadkeys.c -+++ b/src/loadkeys.c -@@ -27,7 +27,7 @@ - #include "keymap.h" - - static const char *progname = NULL; --static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 }; -+static const char *const dirpath1[] = { "", "/etc/kbd/" KEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", 0 }; - static const char *const suffixes[] = { "", ".kmap", ".map", 0 }; - - static void __attribute__((noreturn)) ---- a/src/loadunimap.c -+++ b/src/loadunimap.c -@@ -30,7 +30,7 @@ - extern char *progname; - extern int force; - --static const char *const unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 }; -+static const char *const unidirpath[] = { "", "/etc/kbd/" UNIMAPDIR "/", DATADIR "/" UNIMAPDIR "/", 0 }; - static const char *const unisuffixes[] = { "", ".uni", ".sfm", 0 }; - - #ifdef MAIN ---- a/src/mapscrn.c -+++ b/src/mapscrn.c -@@ -27,7 +27,7 @@ void loadnewmap(int fd, char *mfil); - static int ctoi(char *); - - /* search for the map file in these directories (with trailing /) */ --static const char *const mapdirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 }; -+static const char *const mapdirpath[] = { "", "/etc/kbd/" TRANSDIR "/", DATADIR "/" TRANSDIR "/", 0 }; - static const char *const mapsuffixes[] = { "", ".trans", "_to_uni.trans", ".acm", 0 }; - - #ifdef MAIN ---- a/src/resizecons.c -+++ b/src/resizecons.c -@@ -101,7 +101,7 @@ static int vga_get_fontheight(void); - static void vga_set_cursor(int, int); - static void vga_set_verticaldisplayend_lowbyte(int); - --const char *const dirpath[] = { "", DATADIR "/" VIDEOMODEDIR "/", 0 }; -+const char *const dirpath[] = { "", "/etc/kbd/" VIDEOMODEDIR "/", DATADIR "/" VIDEOMODEDIR "/", 0}; - const char *const suffixes[] = { "", 0 }; - - int main(int argc, char **argv) ---- a/src/setfont.c -+++ b/src/setfont.c -@@ -53,10 +53,10 @@ int force = 0; - int debug = 0; - - /* search for the font in these directories (with trailing /) */ --const char *const fontdirpath[] = { "", DATADIR "/" FONTDIR "/", 0 }; -+const char *const fontdirpath[] = { "", "/etc/kbd/" FONTDIR "/", DATADIR "/" FONTDIR "/", 0 }; - const char *const fontsuffixes[] = { "", ".psfu", ".psf", ".cp", ".fnt", 0 }; - /* hide partial fonts a bit - loading a single one is a bad idea */ --const char *const partfontdirpath[] = { "", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 }; -+const char *const partfontdirpath[] = { "", "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 }; - const char *const partfontsuffixes[] = { "", 0 }; - - static inline int diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix index a2a63e2bca..34e80ac822 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix @@ -69,12 +69,12 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "5.11"; in + linuxHeaders = let version = "5.12"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1d37w0zvmf8c1l99xvy1hy6p55icjhmbsv7f0amxy2nly1a7pw04"; + sha256 = "sha256-fQ328r8jhNaNC9jh/j4HHWQ2Tc3GAC57XIfJLUj6w2Y="; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index 5cece836b7..776a422df7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -859,7 +859,7 @@ let # Bump the maximum number of CPUs to support systems like EC2 x1.* # instances and Xeon Phi. NR_CPUS = freeform "384"; - } // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") { + } // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enables support for the Allwinner Display Engine 2.0 SUN8I_DE2_CCU = whenAtLeast "4.13" yes; @@ -871,6 +871,14 @@ let # The kernel command line will override a platform-specific configuration from its device tree. # https://github.com/torvalds/linux/blob/856deb866d16e29bd65952e0289066f6078af773/kernel/dma/contiguous.c#L35-L44 CMA_SIZE_MBYTES = freeform "32"; + + # Many ARM SBCs hand off a pre-configured framebuffer. + # This always can can be replaced by the actual native driver. + # Keeping it a built-in ensures it will be used if possible. + FB_SIMPLE = yes; + + } // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux") { + ARM_LPAE = yes; }; }; in 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 0222fe5d5a..a7505c95f1 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,32 +1,32 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.231-hardened1.patch", - "sha256": "0camacpjlix1ajx2z1krsv7j5m9g7vaikp2qsa43w3xxgms1slp6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.231-hardened1/linux-hardened-4.14.231-hardened1.patch" + "name": "linux-hardened-4.14.232-hardened1.patch", + "sha256": "141bjr8z5gg5c9bwbq2krhpwzhs225g5465izgz38sls57dllll4", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.232-hardened1/linux-hardened-4.14.232-hardened1.patch" }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.188-hardened1.patch", - "sha256": "1l5hmfzkp9aajj48xny2khrg54501m57llykp6p3vpg9hwh19j1q", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.188-hardened1/linux-hardened-4.19.188-hardened1.patch" + "name": "linux-hardened-4.19.190-hardened1.patch", + "sha256": "111pxnnmajd1c7p51v99qc28dq7hrhji6ja0i5m46d2r8am1z4cz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.190-hardened1/linux-hardened-4.19.190-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.32-hardened1.patch", - "sha256": "0vl01f6kpb38qv9855x1c4fzih1xmfb1xby70dzfkp5bg53ms5r3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.32-hardened1/linux-hardened-5.10.32-hardened1.patch" + "name": "linux-hardened-5.10.37-hardened1.patch", + "sha256": "16bmvb6w55bdcd3nfz1ixwp081gcyx0hq885i0ixjnjz7n5q80wq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.37-hardened1/linux-hardened-5.10.37-hardened1.patch" }, "5.11": { "extra": "-hardened1", - "name": "linux-hardened-5.11.16-hardened1.patch", - "sha256": "1fxf1qcqrvgywxnyywsbav80ys0y4c9qg6s8ygmplyjvncd9005l", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.16-hardened1/linux-hardened-5.11.16-hardened1.patch" + "name": "linux-hardened-5.11.21-hardened1.patch", + "sha256": "087zg8mphpbzcac9xi9qqfzl7ccd3qb93jif2gqjvsm3q2pk2m3g", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.21-hardened1/linux-hardened-5.11.21-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.114-hardened1.patch", - "sha256": "0zbn9x59m6b62c9hjp47xkg1qk8a489nd99px2g4i24mnhgan0kf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.114-hardened1/linux-hardened-5.4.114-hardened1.patch" + "name": "linux-hardened-5.4.119-hardened1.patch", + "sha256": "1qbw8287jv96fqar5wi52yh1g6v9nnr53y2vpr3777sadcr19mm9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.119-hardened1/linux-hardened-5.4.119-hardened1.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 9ec576a1aa..431180c34b 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 lib; buildLinux (args // rec { - version = "4.14.231"; + version = "4.14.232"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "10k63vwibygdd6gzs4r6rncqqa0qf8cbnqznhbfsi41lxsnpjfsp"; + sha256 = "0sa3sz7bznlhijd0iwv37nyrrnw34iq6dq1bqr6cj2wpyrhr7h8x"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; 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 b1140311b6..5357251720 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 lib; buildLinux (args // rec { - version = "4.19.188"; + version = "4.19.190"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0xq00mwgclk89bk5jpmncjnz7vsq353qrnc0cjp0n9mi4vqg375h"; + sha256 = "0pf8py0id0r8wzr5050bik1sbhl8gsznnr5bvcmrs4jkhpp2m73g"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; 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 2cc14e6cf6..36b54e8191 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,12 +1,13 @@ -{ buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: +{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.267"; + version = "4.4.268"; extraMeta.branch = "4.4"; + extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1qk629fsl1glr0h1hxami3f4ivgl58iqsnw43slvn1yc91cb7ws4"; + sha256 = "1srk08kaxq5jjlqx804cgjffhcsrdkv3idh8ipagl6v2w4kas5v8"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; 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 eb6ef73dd1..d1cd267dd2 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,12 +1,13 @@ -{ buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: +{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.267"; + version = "4.9.268"; extraMeta.branch = "4.9"; + extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0q0a49b3wsxk9mqyy8b55lr1gmiqxjpqh2nlhj4xwcfzd7z9lfwq"; + sha256 = "0aknrlf5q0dsqib8c9klmf5c60dy7hg2zksb020qvyrp077gcrjv"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index cd09eadea1..f150ab1cb0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.32"; + version = "5.10.37"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1fnp0wyiswg8q4w89ssm1fz1ryfc1567fx08bz3fmf2cdqr8wkv4"; + sha256 = "0xz01g017s9kcc9awlg6p9wrm8pzxyk4fizrf3mq9i5gklqf7md8"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix index 6dc3a2772a..2988984e34 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.11.16"; + version = "5.11.21"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0hqgai4r40xxlfqp1paxhn2g4i4yqvi1k473dddcxjrhs60kc5i1"; + sha256 = "0zw7mpq6lfbw2ycv4lvkya93h1h18gvc8c66m82bca5y02xsasrn"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.12.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.12.nix new file mode 100644 index 0000000000..39366147ae --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -0,0 +1,20 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "5.12.4"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "0wv89gwf5v8m7wi2f3bv9mdr8n9raq998sy4m1m2lwwjhkpgwq2s"; + }; + + kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; +} // (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 e18cf2e23f..8d6a063e64 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 lib; buildLinux (args // rec { - version = "5.4.114"; + version = "5.4.119"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0mwmvvz817zgxalb2xcx0i49smjag6j81vmqxp2kpwjqrf3z165y"; + sha256 = "185jxk0cfnk8c6rfc78id2qwd9k2597xyc4dv2pahjc13v7xxrvi"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; 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 6e264a3ec6..ea04414804 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 = "17990"; - sha256 = "1hras4018lgvql1zxw26fzcvk0w1xh6pyh3kmhxxh23k61zl83zk"; + rev = "18063"; + sha256 = "1mmijqra6sq2pcc8yhh8m4k6x0dvhnq4xxzm1qs7kdznj2zwr8is"; } , ... }: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix index 8d0333e8fd..4bc5cee444 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.11.16"; + version = "5.11.21"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "1j25r45arikjwyhbr72r1935pr7a8g2j6vshggywdiixvizvrx9b"; + sha256 = "1klvik8nrqsqi5ijnga1li4gacsknmap75g2zp8f3hd3hz18d5n1"; }; extraMeta = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 382588c157..90c0c4e293 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.30-rt37"; # updated by ./update-rt.sh + version = "5.10.35-rt39"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0h06lavcbbj9a4dfzca9sprghiq9z33q8i4gh3n2912wmjsnj0nl"; + sha256 = "1zcqsjzqgcvlhkjwhzs6sxgbhzkfg898pbisivjqfymp8nfs2dxc"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1jibjfmjyn90n5jz5vq056n9xfzn9p8g9fsv7nmj5mfxxm4qhjal"; + sha256 = "03gq9y111k4js4cc87yc9y7hyg1wxwbc1bjyjdvb4nrx2wqka79y"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; 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 37ea8ab86f..34efc8e21e 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.109-rt56"; # updated by ./update-rt.sh + version = "5.4.115-rt57"; # 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 = "1vmpc6yrr2zm4m3naflwik5111jr8hy0mnyddwk31l0p4xbg8smc"; + sha256 = "1llxk04vlpi7a4ca2f5vlcxfn68n8yhmsar3hsl259i7hms28isv"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "08cg8b7mwihs8zgdh0jwi8hrn3hnf9j0jyplsyc7644wd6mqby4a"; + sha256 = "1xh7xi27q58njhfayi2lnk4id7hnlklkgh2zx012gxv4ari76g0k"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/klibc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/klibc/default.nix index dc96f3b6a6..522a74dea0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/klibc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/klibc/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "klibc"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; - sha256 = "0dmlkhnn5q8fc6rkzsisir4chkzmmiq6xkjmvyvf0g7yihwz2j2f"; + sha256 = "sha256-bcynCJEzINJjCfBbDCv2gHG/EbPa3MTmx9kjg3/CPuE="; }; patches = [ ./no-reinstall-kernel-headers.patch ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix index 2c9239b2e7..fbf7e4bd99 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix @@ -44,6 +44,11 @@ stdenv.mkDerivation rec { "PYTHONLIBDIR=$(py)/${python3.sitePackages}" ]; + postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace src/procattr.c \ + --replace "#include " "" + ''; + preInstall = optionalString enablePython '' mkdir -p $py/${python3.sitePackages}/selinux ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix index fde75fdcd6..0b0e9e8f20 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit (solaar) version; buildCommand = '' - install -Dm644 -t $out/etc/udev/rules.d ${solaar.src}/rules.d/*.rules + install -Dm444 -t $out/etc/udev/rules.d ${solaar.src}/rules.d/*.rules ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lsscsi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lsscsi/default.nix index 90c0361bce..6286735b75 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lsscsi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lsscsi/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "lsscsi-0.31"; + name = "lsscsi-0.32"; src = fetchurl { - url = "http://sg.danny.cz/scsi/lsscsi-0.31.tgz"; - sha256 = "1jpk15y9vqjb1lcj4pdzygpg0jf0lja7azjldpywc0s805rikgqj"; + url = "http://sg.danny.cz/scsi/lsscsi-0.32.tgz"; + sha256 = "sha256-CoAOnpTcoqtwLWXXJ3eujK4Hjj100Ly+1kughJ6AKaE="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lxc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lxc/default.nix index 1f5cf028a2..bad7622771 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lxc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.8"; + version = "4.0.9"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "16qbmysiyrvb1inbbdr8qwqa0c6h9mwyrbx4ry18x0kvrhmqamdc"; + sha256 = "0az56xpvhqiwmf9wfxzaz89s5idrgd9ynd13psscw3hlx480dkqz"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix index 258f4296e2..070b4a6207 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mbp2018-bridge-drv"; - version = "0.01"; + version = "2020-01-31"; src = fetchFromGitHub { owner = "MCMrARM"; repo = "mbp2018-bridge-drv"; - rev = "${version}"; - sha256 = "0ac2l51ybfrvg8m36x67rsvgjqs1vwp7c89ssvbjkrcq3y4qdb53"; + rev = "b43fcc069da73e051072fde24af4014c9c487286"; + sha256 = "sha256-o6yGiR+Y5SnX1johdi7fQWP5ts7HdDMqeju75UOhgik="; }; buildPhase = '' @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = platforms.linux; maintainers = [ lib.maintainers.hlolli ]; + broken = kernel.kernelOlder "5.4"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix index aff847c20f..7430182e5d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "2019-10-04"; + version = "2021-05-11"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git"; - rev = "73d6c59af8d1bcedf5de4aa1f5d5b7f765f545f5"; - sha256 = "18a7qm86gavg15gv4h6xfnapgq24v4dyvhwfp53lkssxyhjbli0z"; + rev = "43282e80e174cc73b09b81a4d17cb3a7b4dc5cfc"; + sha256 = "0l06ahmprqshh75pkdpagb8fgnp2bwn8q8hwp1yl3laww2ghm8i5"; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/netatop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/netatop/default.nix index fb0a4eb718..28f989929a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/netatop/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/netatop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, kernel, zlib }: +{ lib, stdenv, fetchurl, kernel, kmod, zlib }: let version = "3.1"; @@ -12,10 +12,16 @@ stdenv.mkDerivation { sha256 = "0qjw8glfdmngfvbn1w63q128vxdz2jlabw13y140ga9i5ibl6vvk"; }; - buildInputs = [ zlib ]; + buildInputs = [ kmod zlib ]; hardeningDisable = [ "pic" ]; + patches = [ + # fix paths in netatop.service + ./fix-paths.patch + # Specify PIDFile in /run, not /var/run to silence systemd warning + ./netatop.service.patch + ]; preConfigure = '' patchShebangs mkversion sed -i -e 's,^KERNDIR.*,KERNDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build,' \ @@ -24,12 +30,14 @@ stdenv.mkDerivation { -e s,/usr,$out, \ -e /init.d/d \ -e /depmod/d \ - -e /netatop.service/d \ + -e s,/lib/systemd,$out/lib/systemd, \ Makefile + + kmod=${kmod} substituteAllInPlace netatop.service ''; preInstall = '' - mkdir -p $out/bin $out/sbin $out/share/man/man{4,8} + mkdir -p $out/lib/systemd/system $out/bin $out/sbin $out/share/man/man{4,8} mkdir -p $out/lib/modules/${kernel.modDirVersion}/extra ''; @@ -38,6 +46,6 @@ stdenv.mkDerivation { homepage = "https://www.atoptool.nl/downloadnetatop.php"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/netatop/fix-paths.patch b/third_party/nixpkgs/pkgs/os-specific/linux/netatop/fix-paths.patch new file mode 100644 index 0000000000..0e71c4efdd --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/netatop/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/netatop.service ++++ b/netatop.service +@@ -8,5 +8,5 @@ + Type=oneshot +-ExecStartPre=/sbin/modprobe netatop +-ExecStart=/usr/sbin/netatopd +-ExecStopPost=/sbin/rmmod netatop ++ExecStartPre=@kmod@/bin/modprobe netatop ++ExecStart=@out@/bin/netatopd ++ExecStopPost=@kmod@/bin/rmmod netatop + PIDFile=/var/run/netatop.pid diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/netatop/netatop.service.patch b/third_party/nixpkgs/pkgs/os-specific/linux/netatop/netatop.service.patch new file mode 100644 index 0000000000..c7c798ee06 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/netatop/netatop.service.patch @@ -0,0 +1,7 @@ +--- a/netatop.service ++++ b/netatop.service +@@ -11,3 +11,3 @@ + ExecStopPost=@kmod@/bin/rmmod netatop +-PIDFile=/var/run/netatop.pid ++PIDFile=/run/netatop.pid + RemainAfterExit=yes diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/default.nix index 9fb7e36646..b317c5a1fb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/default.nix @@ -18,5 +18,6 @@ substituteAll { inherit runtimeShell nix; nix_x86_64_linux = fallback.x86_64-linux; nix_i686_linux = fallback.i686-linux; + nix_aarch64_linux = fallback.aarch64-linux; path = lib.makeBinPath [ coreutils jq gnused gnugrep ]; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 5874f334fe..087afb5b6a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -105,7 +105,7 @@ while [ "$#" -gt 0 ]; do ;; --flake) flake="$1" - flakeFlags=(--experimental-features 'nix-command flakes') + flakeFlags=(--extra-experimental-features 'nix-command flakes') shift 1 ;; --recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file) @@ -214,6 +214,47 @@ nixBuild() { fi } +nixFlakeBuild() { + if [ -z "$buildHost" ]; then + nix build "$@" --out-link "${tmpDir}/result" + readlink -f "${tmpDir}/result" + else + local attr="$1" + shift 1 + local evalArgs=() + local buildArgs=() + while [ "$#" -gt 0 ]; do + local i="$1"; shift 1 + case "$i" in + --recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file) + evalArgs+=("$i") + ;; + --update-input) + local j="$1"; shift 1 + evalArgs+=("$i" "$j") + ;; + --override-input) + local j="$1"; shift 1 + local k="$1"; shift 1 + evalArgs+=("$i" "$j" "$k") + ;; + *) + buildArgs+=("$i") + ;; + esac + done + + local drv="$(nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildArgs[@]}")" + if [ -a "$drv" ]; then + NIX_SSHOPTS=$SSHOPTS nix "${flakeFlags[@]}" copy --derivation --to "ssh://$buildHost" "$drv" + buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" + else + echo "nix eval failed" + exit 1 + fi + fi +} + if [ -z "$action" ]; then showSyntax; fi @@ -345,6 +386,8 @@ prebuiltNix() { echo @nix_x86_64_linux@ elif [[ "$machine" =~ i.86 ]]; then echo @nix_i686_linux@ + elif [[ "$machine" = aarch64 ]]; then + echo @nix_aarch64_linux@ else echo "$0: unsupported platform" exit 1 @@ -418,10 +461,7 @@ if [ -z "$rollback" ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' --no-out-link -A system "${extraBuildFlags[@]}")" else - outLink=$tmpDir/result - nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.toplevel" \ - "${extraBuildFlags[@]}" "${lockFlags[@]}" --out-link $outLink - pathToConfig="$(readlink -f $outLink)" + pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}")" fi copyToTarget "$pathToConfig" targetHostCmd nix-env -p "$profile" --set "$pathToConfig" @@ -429,24 +469,19 @@ if [ -z "$rollback" ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A system -k "${extraBuildFlags[@]}")" else - nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}" - pathToConfig="$(readlink -f ./result)" + pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}")" fi elif [ "$action" = build-vm ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A vm -k "${extraBuildFlags[@]}")" else - nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.vm" \ - "${extraBuildFlags[@]}" "${lockFlags[@]}" - pathToConfig="$(readlink -f ./result)" + pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.vm" "${extraBuildFlags[@]}" "${lockFlags[@]}")" fi elif [ "$action" = build-vm-with-bootloader ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A vmWithBootLoader -k "${extraBuildFlags[@]}")" else - nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.vmWithBootLoader" \ - "${extraBuildFlags[@]}" "${lockFlags[@]}" - pathToConfig="$(readlink -f ./result)" + pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.vmWithBootLoader" "${extraBuildFlags[@]}" "${lockFlags[@]}")" fi else showSyntax diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index 765118be11..92f6bd9062 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -14,15 +14,6 @@ let kernel = callPackage # a hacky way of extracting parameters from callPackage ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { }; - - maybePatch_drm_legacy = - lib.optional (lib.versionOlder "4.14" (kernel.version or "0")) - (fetchurl { - url = "https://raw.githubusercontent.com/MilhouseVH/LibreELEC.tv/b5d2d6a1" - + "/packages/x11/driver/xf86-video-nvidia-legacy/patches/" - + "xf86-video-nvidia-legacy-0010-kernel-4.14.patch"; - sha256 = "18clfpw03g8dxm61bmdkmccyaxir3gnq451z6xqa2ilm3j820aa5"; - }); in rec { # Policy: use the highest stable version as the default (on our master). @@ -73,32 +64,4 @@ rec { patches = [ ./vm_operations_struct-fault.patch ]; }; - - legacy_304 = generic { - version = "304.137"; - sha256_32bit = "1y34c2gvmmacxk2c72d4hsysszncgfndc4s1nzldy2q9qagkg66a"; - sha256_64bit = "1qp3jv6279k83k3z96p6vg3dd35y9bhmlyyyrkii7sib7bdmc7zb"; - settingsSha256 = "129f0j0hxzjd7g67qwxn463rxp295fsq8lycwm6272qykmab46cj"; - persistencedSha256 = null; - useGLVND = false; - useProfiles = false; - settings32Bit = true; - - prePatch = let - debPatches = fetchurl { - url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/" - + "nvidia-graphics-drivers-legacy-304xx_304.137-5.debian.tar.xz"; - sha256 = "0n8512mfcnvklfbg8gv4lzbkm3z6nncwj6ix2b8ngdkmc04f3b6l"; - }; - prefix = "debian/module/debian/patches"; - applyPatches = pnames: if pnames == [] then null else - '' - tar xf '${debPatches}' - sed 's|^\([+-]\{3\} [ab]\)/|\1/kernel/|' -i ${prefix}/*.patch - patches="$patches ${lib.concatMapStringsSep " " (pname: "${prefix}/${pname}.patch") pnames}" - ''; - in applyPatches [ "fix-typos" ]; - patches = maybePatch_drm_legacy; - broken = lib.versionAtLeast kernel.version "4.18"; - }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/openrazer/driver.nix b/third_party/nixpkgs/pkgs/os-specific/linux/openrazer/driver.nix index 4745ba818a..07113e6286 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/openrazer/driver.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/openrazer/driver.nix @@ -10,7 +10,8 @@ let common = import ../../../development/python-modules/openrazer/common.nix { inherit lib fetchFromGitHub; }; in stdenv.mkDerivation (common // { - name = "openrazer-${common.version}-${kernel.version}"; + pname = "openrazer"; + version = "${common.version}-${kernel.version}"; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -19,6 +20,8 @@ stdenv.mkDerivation (common // { ]; installPhase = '' + runHook preInstall + binDir="$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/hid" mkdir -p "$binDir" cp -v driver/*.ko "$binDir" @@ -32,9 +35,12 @@ stdenv.mkDerivation (common // { --replace /usr/bin/logger ${util-linux}/bin/logger \ --replace chgrp ${coreutils}/bin/chgrp \ --replace "PATH='/sbin:/bin:/usr/sbin:/usr/bin'" "" + + runHook postInstall ''; meta = common.meta // { description = "An entirely open source Linux driver that allows you to manage your Razer peripherals on GNU/Linux"; + broken = kernel.kernelOlder "4.19"; }; }) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix index 839b3f1b78..5edcd263f0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix @@ -1,5 +1,5 @@ { lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 -, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3 +, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome , gobject-introspection }: python3.pkgs.buildPythonApplication rec { @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = [ - gtk3 glib gnome3.adwaita-icon-theme python3 + gtk3 glib gnome.adwaita-icon-theme python3 ]; propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [ gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8192eu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8192eu/default.nix index d921eb71b0..b66a56a8f8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -5,37 +5,40 @@ with lib; let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtl8192eu"; in stdenv.mkDerivation rec { - name = "rtl8192eu-${kernel.version}-${version}"; - version = "4.4.1.20200620"; + pname = "rtl8192eu"; + version = "${kernel.version}-4.4.1.20210403"; src = fetchFromGitHub { owner = "Mange"; repo = "rtl8192eu-linux-driver"; - rev = "925ac2be34dd608a7ca42daebf9713f0c1bcec74"; - sha256 = "159vg0scq47wnn600karpgzx3naaiyl1rg8608c8d28nhm62gvjz"; + rev = "ab35c7e9672f37d75b7559758c99f6d027607687"; + sha256 = "sha256-sTIaye4oWNYEnNuXlrTLobaFKXzBLsfJXdJuc10EdJI="; }; hardeningDisable = [ "pic" ]; - nativeBuildInputs = kernel.moduleBuildDependencies; - - buildInputs = [ bc ]; + nativeBuildInputs = kernel.moduleBuildDependencies ++ [ bc ]; makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; enableParallelBuilding = true; installPhase = '' + runHook preInstall + mkdir -p ${modDestDir} find . -name '*.ko' -exec cp --parents {} ${modDestDir} \; find ${modDestDir} -name '*.ko' -exec xz -f {} \; + + runHook postInstall ''; - meta = { + meta = with lib; { description = "Realtek rtl8192eu driver"; homepage = "https://github.com/Mange/rtl8192eu-linux-driver"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + license = licenses.gpl2Only; + platforms = platforms.linux; + broken = stdenv.hostPlatform.isAarch64; maintainers = with maintainers; [ troydm ]; }; } 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 68a88fb677..43396a99b9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix @@ -1,26 +1,28 @@ { lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: stdenv.mkDerivation rec { - name = "rtl8812au-${kernel.version}-${version}"; - version = "5.6.4.2_35491.20200702"; + pname = "rtl8812au"; + version = "${kernel.version}-5.9.3.2.20210427"; src = fetchFromGitHub { owner = "gordboy"; - repo = "rtl8812au-5.6.4.2"; - rev = "3110ad65d0f03532bd97b1017cae67ca86dd34f6"; - sha256 = "0p0cv67dfr41npxn0c1frr0k9wiv0pdbvlzlmclgixn39xc6n5qz"; + repo = "rtl8812au-5.9.3.2"; + rev = "6ef5d8fcdb0b94b7490a9a38353877708fca2cd4"; + sha256 = "sha256-czExf4z0nf7XEJ1YnRSB3CrGV6NTmUKDiZjLmrh6Hwo="; }; nativeBuildInputs = [ bc nukeReferences ]; + buildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" "format" ]; prePatch = '' - substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/" - substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}" - substituteInPlace ./Makefile --replace /sbin/depmod \# - substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + substituteInPlace ./Makefile \ + --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ + --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + --replace /sbin/depmod \# \ + --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; makeFlags = [ @@ -42,9 +44,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod"; - homepage = "https://github.com/gordboy/rtl8812au-5.6.4.2"; - license = licenses.gpl2; + homepage = "https://github.com/gordboy/rtl8812au-5.9.3.2"; + license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ danielfullmer ]; + maintainers = with maintainers; [ fortuneteller2k ]; + broken = kernel.kernelOlder "4.10" || kernel.isHardened; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8814au/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8814au/default.nix index a710ef34e9..2b0fb9622a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8814au/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel }: -stdenv.mkDerivation rec { - name = "rtl8814au-${kernel.version}-${version}"; - version = "4.3.21"; +stdenv.mkDerivation { + pname = "rtl8814au"; + version = "${kernel.version}-unstable-2021-05-18"; src = fetchFromGitHub { - owner = "zebulon2"; - repo = "rtl8814au"; - rev = "a58c56a5a6cb99ffb872f07cb67b68197911854f"; - sha256 = "1ffm67da183nz009gm5v9w1bab081hrm113kk8knl9s5qbqnn13q"; + owner = "morrownr"; + repo = "8814au"; + rev = "388786c864f9b1437fc4d934b1eccf6d7f1e1355"; + sha256 = "sha256-2EnheODPFWTGN/fz45LWRSOGeV6pTENEUrehahj+PJ4="; }; buildInputs = kernel.moduleBuildDependencies; @@ -31,9 +31,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Realtek 8814AU USB WiFi driver"; - homepage = "https://github.com/zebulon2/rtl8814au"; - license = licenses.gpl2; + homepage = "https://github.com/morrownr/8814au"; + license = licenses.gpl2Only; maintainers = [ maintainers.lassulus ]; - platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821au/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821au/default.nix index 908220a1f2..08e097b0d5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821au/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: stdenv.mkDerivation rec { - name = "rtl8821au-${kernel.version}-${version}"; - version = "5.1.5+41"; + pname = "rtl8821au"; + version = "${kernel.version}-unstable-2021-05-18"; src = fetchFromGitHub { - owner = "zebulon2"; - repo = "rtl8812au"; - rev = "ecd3494c327c54110d21346ca335ef9e351cb0be"; - sha256 = "1kmdxgbh0s0v9809kdsi39p0jbm5cf10ivy40h8qj9hn70g1gw8q"; + owner = "morrownr"; + repo = "8821au"; + rev = "6f6a9d5772bb2b75f18374c01c82c6b3e8e3244d"; + sha256 = "sha256-RqtLR3sNcLXhUrNloSTRKubL1SVwzbVe73AsBYYSXNE="; }; nativeBuildInputs = [ bc nukeReferences ]; @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "rtl8821AU, rtl8812AU and rtl8811AU chipset driver with firmware"; - homepage = "https://github.com/zebulon2/rtl8812au"; - license = licenses.gpl2; + description = "rtl8821AU and rtl8812AU chipset driver with firmware"; + homepage = "https://github.com/morrownr/8821au"; + license = licenses.gpl2Only; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ plchldr ]; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix index cb8a02bcf3..b94bd3128e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tomaspinho/rtl8821ce"; license = licenses.gpl2Only; platforms = platforms.linux; + broken = stdenv.isAarch64; maintainers = with maintainers; [ hhm ]; }; } 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 20bb590895..556fd79391 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,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc }: + stdenv.mkDerivation rec { - name = "rtl8821cu-${kernel.version}-${version}"; - version = "unstable-2020-12-21"; + pname = "rtl8821cu"; + version = "${kernel.version}-unstable-2021-05-19"; src = fetchFromGitHub { - owner = "brektrou"; - repo = "rtl8821cu"; - rev = "428a0820487418ec69c0edb91726d1cf19763b1e"; - sha256 = "1ccl94727yq7gzn37ky91k0736cambgnkaa37r2f2hinpl9qdd8q"; + owner = "morrownr"; + repo = "8821cu"; + rev = "2430c354c9b15fa6193a263c99ce57211d50c66f"; + sha256 = "sha256-PkrpwebZYh/hBukqDQf6pxfbkVyA+CpYtte5pmzgLtw="; }; hardeningDisable = [ "pic" ]; @@ -29,8 +30,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Realtek rtl8821cu driver"; - homepage = "https://github.com/brektrou/rtl8821CU"; - license = licenses.gpl2; + homepage = "https://github.com/morrownr/8821cu"; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.contrun ]; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix index cc37ef13d5..4b194bb2f3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc }: stdenv.mkDerivation rec { - name = "rtl88x2bu-${kernel.version}-${version}"; - version = "unstable-2021-01-21"; + pname = "rtl88x2bu"; + version = "${kernel.version}-unstable-2021-05-18"; src = fetchFromGitHub { - owner = "cilynx"; - repo = "rtl88x2BU"; - rev = "48e7c19c92a77554403e1347447f8e2cfd780228"; - sha256 = "0nw2kgblpq6qlr43gbfxqvq0c83664f4czfwzsyfjr47rj00iyq7"; + owner = "morrownr"; + repo = "88x2bu"; + rev = "80b03962e33f86f99e898305d8d597140503de03"; + sha256 = "sha256-C7XOpKgwxM9UbfW3wHteInTmAUM3FFqN1MHMKxP8gBA="; }; hardeningDisable = [ "pic" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bc ]; buildInputs = kernel.moduleBuildDependencies; - prePatch = '' + prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Realtek rtl88x2bu driver"; - homepage = "https://github.com/cilynx/rtl88x2bu"; + homepage = "https://github.com/morrownr/88x2bu"; license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.ralith ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index bd7c646c92..b7beeb727c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -51,9 +51,9 @@ , iptables , withSelinux ? false , libselinux -, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms +, withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp , libseccomp -, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms +, withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexectools , kexectools , bashInteractive , libmicrohttpd @@ -151,6 +151,12 @@ stdenv.mkDerivation { ./0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch ./0018-logind-seat-debus-show-CanMultiSession-again.patch ./0019-pkg-config-derive-prefix-from-prefix.patch + + # Fix -Werror=format. + (fetchpatch { + url = "https://github.com/systemd/systemd/commit/ab1aa6368a883bce88e3162fee2bea14aacedf23.patch"; + sha256 = "1b280l5jrjsg8qhsang199mpqjhkpix4c8bm3blknjnq9iv43add"; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix index f9196fc168..38bc7c3eaf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix @@ -14,24 +14,27 @@ , libunwind , elfutils , orc -, python3 +, python3Packages , libuuid +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "tiscamera"; - version = "0.11.1"; + version = "0.13.1"; src = fetchFromGitHub { owner = "TheImagingSource"; repo = pname; rev = "v-${pname}-${version}"; - sha256 = "07vp6khgl6qd3a4519dmx1s5bfw7pld793p50pjn29fqh91fm93g"; + sha256 = "0hpy9yhc4mn6w8gvzwif703smmcys0j2jqbz2xfghqxcyb0ykplj"; }; nativeBuildInputs = [ cmake pkg-config + python3Packages.wrapPython + wrapGAppsHook ]; buildInputs = [ @@ -47,33 +50,43 @@ stdenv.mkDerivation rec { libunwind elfutils orc - python3 libuuid + python3Packages.python + python3Packages.pyqt5 ]; + pythonPath = with python3Packages; [ pyqt5 pygobject3 ]; + + propagatedBuildInputs = pythonPath; + cmakeFlags = [ "-DBUILD_ARAVIS=OFF" # For GigE support. Won't need it as our camera is usb. "-DBUILD_GST_1_0=ON" "-DBUILD_TOOLS=ON" "-DBUILD_V4L2=ON" "-DBUILD_LIBUSB=ON" + "-DBUILD_TESTS=ON" "-DTCAM_INSTALL_UDEV=${placeholder "out"}/lib/udev/rules.d" "-DTCAM_INSTALL_UVCDYNCTRL=${placeholder "out"}/share/uvcdynctrl/data/199e" "-DTCAM_INSTALL_GST_1_0=${placeholder "out"}/lib/gstreamer-1.0" "-DTCAM_INSTALL_GIR=${placeholder "out"}/share/gir-1.0" "-DTCAM_INSTALL_TYPELIB=${placeholder "out"}/lib/girepository-1.0" "-DTCAM_INSTALL_SYSTEMD=${placeholder "out"}/etc/systemd/system" + "-DTCAM_INSTALL_PYTHON3_MODULES=${placeholder "out"}/lib/${python3Packages.python.libPrefix}/site-packages" + "-DGSTREAMER_1.0_INCLUDEDIR=${placeholder "out"}/include/gstreamer-1.0" # There are gobject introspection commands launched as part of the build. Those have a runtime # dependency on `libtcam` (which itself is built as part of this build). In order to allow # that, we set the dynamic linker's path to point on the build time location of the library. "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; - postPatch = '' - substituteInPlace ./src/BackendLoader.cpp \ - --replace '"libtcam-v4l2.so"' "\"$out/lib/tcam-0/libtcam-v4l2.so\"" \ - --replace '"libtcam-aravis.so"' "\"$out/lib/tcam-0/libtcam-aravis.so\"" \ - --replace '"libtcam-libusb.so"' "\"$out/lib/tcam-0/libtcam-libusb.so\"" + doCheck = true; + + # gstreamer tests requires, besides gst-plugins-bad, plugins installed by this expression. + checkPhase = "ctest --force-new-ctest-process -E gstreamer"; + + postFixup = '' + wrapPythonPrograms "$out $pythonPath" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index 3187ba6d4d..fabfebfcba 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -1,16 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, kernel, kmod }: +{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders}: stdenv.mkDerivation rec { pname = "tuxedo-keyboard-${kernel.version}"; - version = "2019-08-26"; + version = "3.0.5"; src = fetchFromGitHub { owner = "tuxedocomputers"; repo = "tuxedo-keyboard"; - rev = "d65e76e84cfd8169591fc2a0a7c9219fa19da1b5"; - sha256 = "1s48qpwybwh5pwqas2d1v2a7x4r97sm4hr9i4902r1d7h384bv17"; + rev = "v${version}"; + sha256 = "123ady2bi2dwbajy3pgv10l3g2pyhi5k31c1ii0zcrvl2qqhndck"; }; + buildInputs = [ linuxHeaders ]; + makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; installPhase = '' @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Full color keyboard driver for tuxedo computers laptops"; homepage = "https://github.com/tuxedocomputers/tuxedo-keyboard/"; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.blanky0230 ]; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix index e6b7de29fd..2578d09fc1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20210219"; + version = "1.0.20210424"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "sha256-ZYZBnfX8DP0IV3VEBSzg7wnFCnlCzOT6Ql3kFZ0klfQ="; + sha256 = "sha256-VLtIxYh308X28c9EOeHx0eA7HP2aRlekPXRt015/qAg="; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch new file mode 100644 index 0000000000..d459de8a7f --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch @@ -0,0 +1,130 @@ +From 99ae610f0ae3608a12c864caedf396f14e68327d Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Fri, 19 Feb 2021 19:44:21 +0100 +Subject: [PATCH] Implement read-only mode for ssids + +With this change it's possible to define `network=`-sections in a second +config file specified via `-I` without having changes written to +`/etc/wpa_supplicant.conf`. + +This is helpful on e.g. NixOS to allow both declarative (i.e. read-only) +and imperative (i.e. mutable) networks. +--- + wpa_supplicant/config.h | 2 +- + wpa_supplicant/config_file.c | 5 +++-- + wpa_supplicant/config_none.c | 2 +- + wpa_supplicant/config_ssid.h | 2 ++ + wpa_supplicant/wpa_supplicant.c | 8 ++++---- + 5 files changed, 11 insertions(+), 8 deletions(-) + +diff --git a/wpa_supplicant/config.h b/wpa_supplicant/config.h +index 6a297ecfe..adaf4d398 100644 +--- a/wpa_supplicant/config.h ++++ b/wpa_supplicant/config.h +@@ -1614,7 +1614,7 @@ const char * wpa_config_get_global_field_name(unsigned int i, int *no_var); + * + * Each configuration backend needs to implement this function. + */ +-struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp); ++struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp, int ro); + + /** + * wpa_config_write - Write or update configuration data +diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c +index 77c326df5..d5ed051b9 100644 +--- a/wpa_supplicant/config_file.c ++++ b/wpa_supplicant/config_file.c +@@ -373,7 +373,7 @@ static int wpa_config_process_blob(struct wpa_config *config, FILE *f, + #endif /* CONFIG_NO_CONFIG_BLOBS */ + + +-struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp) ++struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp, int ro) + { + FILE *f; + char buf[512], *pos; +@@ -415,6 +415,7 @@ struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp) + while (wpa_config_get_line(buf, sizeof(buf), f, &line, &pos)) { + if (os_strcmp(pos, "network={") == 0) { + ssid = wpa_config_read_network(f, &line, id++); ++ ssid->ro = ro; + if (ssid == NULL) { + wpa_printf(MSG_ERROR, "Line %d: failed to " + "parse network block.", line); +@@ -1591,7 +1592,7 @@ int wpa_config_write(const char *name, struct wpa_config *config) + } + + for (ssid = config->ssid; ssid; ssid = ssid->next) { +- if (ssid->key_mgmt == WPA_KEY_MGMT_WPS || ssid->temporary) ++ if (ssid->key_mgmt == WPA_KEY_MGMT_WPS || ssid->temporary || ssid->ro) + continue; /* do not save temporary networks */ + if (wpa_key_mgmt_wpa_psk(ssid->key_mgmt) && !ssid->psk_set && + !ssid->passphrase) +diff --git a/wpa_supplicant/config_none.c b/wpa_supplicant/config_none.c +index 2aac28fa3..02191b425 100644 +--- a/wpa_supplicant/config_none.c ++++ b/wpa_supplicant/config_none.c +@@ -17,7 +17,7 @@ + #include "base64.h" + + +-struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp) ++struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp, int ro) + { + struct wpa_config *config; + +diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h +index d5c5c00a9..fd80c079c 100644 +--- a/wpa_supplicant/config_ssid.h ++++ b/wpa_supplicant/config_ssid.h +@@ -93,6 +93,8 @@ struct wpa_ssid { + */ + int id; + ++ int ro; ++ + /** + * priority - Priority group + * +diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c +index 911d79d17..cb0cb99b1 100644 +--- a/wpa_supplicant/wpa_supplicant.c ++++ b/wpa_supplicant/wpa_supplicant.c +@@ -1052,14 +1052,14 @@ int wpa_supplicant_reload_configuration(struct wpa_supplicant *wpa_s) + + if (wpa_s->confname == NULL) + return -1; +- conf = wpa_config_read(wpa_s->confname, NULL); ++ conf = wpa_config_read(wpa_s->confname, NULL, 0); + if (conf == NULL) { + wpa_msg(wpa_s, MSG_ERROR, "Failed to parse the configuration " + "file '%s' - exiting", wpa_s->confname); + return -1; + } + if (wpa_s->confanother && +- !wpa_config_read(wpa_s->confanother, conf)) { ++ !wpa_config_read(wpa_s->confanother, conf, 1)) { + wpa_msg(wpa_s, MSG_ERROR, + "Failed to parse the configuration file '%s' - exiting", + wpa_s->confanother); +@@ -5638,7 +5638,7 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s, + #else /* CONFIG_BACKEND_FILE */ + wpa_s->confname = os_strdup(iface->confname); + #endif /* CONFIG_BACKEND_FILE */ +- wpa_s->conf = wpa_config_read(wpa_s->confname, NULL); ++ wpa_s->conf = wpa_config_read(wpa_s->confname, NULL, 0); + if (wpa_s->conf == NULL) { + wpa_printf(MSG_ERROR, "Failed to read or parse " + "configuration '%s'.", wpa_s->confname); +@@ -5646,7 +5646,7 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s, + } + wpa_s->confanother = os_rel2abs_path(iface->confanother); + if (wpa_s->confanother && +- !wpa_config_read(wpa_s->confanother, wpa_s->conf)) { ++ !wpa_config_read(wpa_s->confanother, wpa_s->conf, 1)) { + wpa_printf(MSG_ERROR, + "Failed to read or parse configuration '%s'.", + wpa_s->confanother); +-- +2.29.2 + diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix index 80eaf04a11..51af6abde8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,5 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, openssl, pkg-config, libnl , dbus, readline ? null, pcsclite ? null + +, readOnlyModeSSIDs ? false }: with lib; @@ -43,6 +45,9 @@ stdenv.mkDerivation rec { url = "https://w1.fi/cgit/hostap/patch/?id=a0541334a6394f8237a4393b7372693cd7e96f15"; sha256 = "1gbhlz41x1ar1hppnb76pqxj6vimiypy7c4kq6h658637s4am3xg"; }) + ] ++ lib.optionals readOnlyModeSSIDs [ + # Allow read-only networks + ./0001-Implement-read-only-mode-for-ssids.patch ]; # TODO: Patch epoll so that the dbus actually responds @@ -134,7 +139,7 @@ stdenv.mkDerivation rec { homepage = "https://w1.fi/wpa_supplicant/"; description = "A tool for connecting to WPA and WPA2-protected wireless networks"; license = licenses.bsd3; - maintainers = with maintainers; [ marcweber ]; + maintainers = with maintainers; [ marcweber ma27 ]; platforms = platforms.linux; }; } 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 adfd0cda81..6db953ae4e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -182,13 +182,9 @@ let license = licenses.cddl; platforms = platforms.linux; maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ]; - broken = if - buildKernel && (kernelCompatible != null) && !kernelCompatible - then builtins.trace '' - Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. - ${lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} - '' true - else false; + # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. + # On NixOS set the option boot.zfs.enableUnstable. + broken = buildKernel && (kernelCompatible != null) && !kernelCompatible; }; }; in { @@ -207,12 +203,12 @@ in { zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12"; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.13"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.1.0-rc4"; + version = "2.1.0-rc5"; - sha256 = "sha256-eakOEA7LCJOYDsZH24Y5JbEd2wh1KfCN+qX3QxQZ4e8="; + sha256 = "sha256-cj0P2bw6sTO+Y74pYn/WEpBuVGMMYCreJQjUdC3DMTE="; isUnstable = true; }; diff --git a/third_party/nixpkgs/pkgs/servers/adminer/default.nix b/third_party/nixpkgs/pkgs/servers/adminer/default.nix index 779f7312ca..8138e6de96 100644 --- a/third_party/nixpkgs/pkgs/servers/adminer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/adminer/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, php }: +{ lib, stdenv, fetchurl, php, nix-update-script }: stdenv.mkDerivation rec { - version = "4.8.0"; + version = "4.8.1"; pname = "adminer"; # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file src = fetchurl { url = "https://github.com/vrana/adminer/releases/download/v${version}/adminer-${version}.tar.gz"; - sha256 = "sha256-T2LEUoIbFrMta+wP7PNci0QkFYrJZmWP3RP/JzgqUoc="; + sha256 = "sha256-2rkNq79sc5RBFxWuiaSlpWr0rwrnEFlnW1WcoxjoP2M="; }; nativeBuildInputs = [ @@ -32,6 +32,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "Database management in a single PHP file"; homepage = "https://www.adminer.org"; diff --git a/third_party/nixpkgs/pkgs/servers/asterisk/sccp/default.nix b/third_party/nixpkgs/pkgs/servers/asterisk/sccp/default.nix index 10b238f887..756699e5ad 100644 --- a/third_party/nixpkgs/pkgs/servers/asterisk/sccp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/asterisk/sccp/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, binutils-unwrapped, patchelf, asterisk }: stdenv.mkDerivation rec { pname = "asterisk-module-sccp"; - version = "4.3.2-epsilon"; + version = "4.3.4"; src = fetchFromGitHub { owner = "chan-sccp"; repo = "chan-sccp"; rev = "v${version}"; - sha256 = "0sp74xvb35m32flsrib0983yn1dyz3qk69vp0gqbx620ycbz19gd"; + sha256 = "sha256-YGHK4A03Ba/tnVTnu9VuhIy/xQ5C/7ZX8h9mxqKsnZI="; }; nativeBuildInputs = [ patchelf ]; diff --git a/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix b/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix index a7c9464fca..61b664d570 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.10.1"; + version = "7.11.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-ScE0UXmoxHb7HOJhSfOLXj3Wb3/XitFuOR36Iktmgxk="; + sha256 = "sha256-/D/fMg+WRkGGV4NG73gvVDZwwi/8BB0w6IWK/OQ3caA="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix b/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix index 995ff86259..608326117f 100644 --- a/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix +++ b/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.14.0"; + version = "8.16.1"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "12dm0sasw98ywd074rjd9hnbymvy8z16bicjxfxqz91n1y13732i"; + sha256 = "sha256-0J+P4E9hYPbYBb6qvtBjH1jhKrDW187+309YBHORNZA="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix index 24da18c4a8..7e73494088 100644 --- a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz"; - sha256 = "1qnzjqpwsvanfhd1yn5789yx4d3ijk9983llm0w5xnjz6rmcxrw5"; + sha256 = "sha256-N0HoZgAtWPgYPU9OWpMEXO2qUoNIGCsFn9vll0hLal0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/beanstalkd/default.nix b/third_party/nixpkgs/pkgs/servers/beanstalkd/default.nix index 01af8a4d5b..9bfe3182d6 100644 --- a/third_party/nixpkgs/pkgs/servers/beanstalkd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/beanstalkd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, installShellFiles }: +{ lib, stdenv, fetchurl, installShellFiles, nixosTests }: stdenv.mkDerivation rec { version = "1.12"; @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { installManPage doc/beanstalkd.1 ''; + passthru.tests = { + smoke-test = nixosTests.beanstalkd; + }; + meta = with lib; { homepage = "http://kr.github.io/beanstalkd/"; description = "A simple, fast work queue"; diff --git a/third_party/nixpkgs/pkgs/servers/blockbook/default.nix b/third_party/nixpkgs/pkgs/servers/blockbook/default.nix index 2394ef258a..8d75b89d0d 100644 --- a/third_party/nixpkgs/pkgs/servers/blockbook/default.nix +++ b/third_party/nixpkgs/pkgs/servers/blockbook/default.nix @@ -9,6 +9,7 @@ , snappy , zeromq , zlib +, nixosTests }: buildGoModule rec { @@ -54,11 +55,18 @@ buildGoModule rec { cp -r $src/static/css/ $out/share/ ''; + passthru.tests = { + smoke-test = nixosTests.blockbook-frontend; + }; + meta = with lib; { description = "Trezor address/account balance backend"; homepage = "https://github.com/trezor/blockbook"; license = licenses.agpl3; maintainers = with maintainers; [ mmahut _1000101 ]; platforms = platforms.unix; + # go dependency tecbot/gorocksdb requires rocksdb 5.x but nixpkgs has only rocksdb 6.x + # issue in upstream can be tracked here: https://github.com/trezor/blockbook/issues/617 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/servers/caddy/default.nix b/third_party/nixpkgs/pkgs/servers/caddy/default.nix index 3e6641b8d2..a2cd3c7eb0 100644 --- a/third_party/nixpkgs/pkgs/servers/caddy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "caddy"; - version = "2.3.0"; + version = "2.4.1"; subPackages = [ "cmd/caddy" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "03cbbr8z9g156lgx7pyn1p1i4mh8ayhhhv24r1z3h1vgq6y4ka7r"; + sha256 = "sha256-Wc7eNw5FZWoUT6IP84NhROC59bf4/RCw/gOWLuYI2dc="; }; - vendorSha256 = "0gpzxjiyv7l1nibh1gas4mvinamiyyfgidd8cy4abz95v6z437lp"; + vendorSha256 = "sha256-ZOrhR03m+cs+mTQio3qEIf+1B0IP0i2+x+vcml5AMco="; passthru.tests = { inherit (nixosTests) caddy; }; diff --git a/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix b/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix index 53db5f7ed0..32868886af 100644 --- a/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix +++ b/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix @@ -18,7 +18,9 @@ python3.pkgs.buildPythonApplication rec { prePatch = '' substituteInPlace setup.cfg \ + --replace "singledispatch>=3.4.0.0,<3.5.0.0" "" \ --replace "requests>=2.11.1,<2.25.0" "requests>=2.11.1,<2.26.0" \ + --replace "unidecode>=0.04.19,<1.2.0" "unidecode>=0.04.19" \ --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" ''; diff --git a/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix b/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix index 02c0b4aa5e..51d091f0ad 100644 --- a/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, libtool, lldClang, ninja +{ lib, stdenv, fetchFromGitHub, cmake, libtool, lldClang, ninja , boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion , icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl, perl , poco, protobuf, python3, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC @@ -7,14 +7,16 @@ stdenv.mkDerivation rec { pname = "clickhouse"; - version = "20.11.4.13"; + version = "21.3.11.5"; + + broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685 src = fetchFromGitHub { owner = "ClickHouse"; repo = "ClickHouse"; - rev = "v${version}-stable"; + rev = "v${version}-lts"; fetchSubmodules = true; - sha256 = "0c87k0xqwj9sc3xy2f3ngfszgjiz4rzd787bdg6fxp94w1adjhny"; + sha256 = "sha256-V62Z82p21qtvSOsoXM225/Wkc9F+dvVMz0xpVjhgZVo="; }; nativeBuildInputs = [ cmake libtool lldClang.bintools ninja ]; @@ -25,20 +27,9 @@ stdenv.mkDerivation rec { xxHash zstd ]; - patches = [ - # This patch is only required for 20.11.4.13 - it should be included in the - # next stable release from upstream by default - (fetchpatch { - url = "https://github.com/ClickHouse/ClickHouse/commit/e31753b4db7aa0a72a85757dc11fc403962e30db.patch"; - sha256 = "12ax02dh9y9k8smkj6v50yfr46iprscbrvd4bb9vfbx8xqgw7grb"; - }) - ]; - postPatch = '' patchShebangs src/ - substituteInPlace contrib/openssl-cmake/CMakeLists.txt \ - --replace '/usr/bin/env perl' perl substituteInPlace src/Storages/System/StorageSystemLicenses.sh \ --replace 'git rev-parse --show-toplevel' '$src' substituteInPlace utils/check-style/check-duplicate-includes.sh \ diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix index 721bbc4735..843b7c3400 100644 --- a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "20.11.6.1"; + version = "20.11.7.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "1c2dqqddw5bfb27smq7rqa7v1wymdj155ky50rbyvl36pmhc9djp"; + sha256 = "0ril6k4dj96qhx5x7r4nc2ghp7n9700808731v4qn9yvcslqzg9a"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-dendrite/default.nix b/third_party/nixpkgs/pkgs/servers/dendrite/default.nix similarity index 83% rename from third_party/nixpkgs/pkgs/servers/matrix-dendrite/default.nix rename to third_party/nixpkgs/pkgs/servers/dendrite/default.nix index 708a1e6f65..5f070aa398 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-dendrite/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dendrite/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub}: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "matrix-dendrite"; @@ -13,6 +13,10 @@ buildGoModule rec { vendorSha256 = "1l1wydvi0yalas79cvhrqg563cvs57hg9rv6qnkw879r6smb2x1n"; + passthru.tests = { + inherit (nixosTests) dendrite; + }; + meta = with lib; { homepage = "https://matrix.org"; description = "Dendrite is a second-generation Matrix homeserver written in Go!"; diff --git a/third_party/nixpkgs/pkgs/servers/dex/default.nix b/third_party/nixpkgs/pkgs/servers/dex/default.nix index 677c50010a..9d577047ee 100644 --- a/third_party/nixpkgs/pkgs/servers/dex/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dex"; - version = "2.27.0"; + version = "2.28.1"; src = fetchFromGitHub { owner = "dexidp"; repo = pname; rev = "v${version}"; - sha256 = "0n66nm91qcmm00mz8f8x39xqr3y05qxk34fvka53s6xax1gxvxxi"; + sha256 = "sha256-MdrkQ4qclylkan8y845BjLiL+W16iqRuNMmvWsKo+zw="; }; - vendorSha256 = "1k87q3ic02n2b632y3lmnclac1iaidmsl3f9py61myi5r02p03lp"; + vendorSha256 = "sha256-rAqqvnP72BQY/qbSvqNzxh2ZUlF/rP0MR/+yqJai+KY="; subPackages = [ "cmd/dex" diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix index 99366d2443..6fd7eb42c9 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.16.15"; + version = "9.16.16"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "0fbqisrh84f8wszm94cqp7v8q9r7pql3qyzbay7vz9vqv0rg9dlq"; + sha256 = "sha256-bJE5Aq34eOfcXiKc6pT678nUD0R3WjAhPt0Ihg92HXs="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix b/third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix index a6a365c13d..0424880c08 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "dnsdist"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; - sha256 = "1wgv19b6y4fp5x1z54psaaialji2rckl5vdh156kyw47k9r5krya"; + sha256 = "sha256-K9e1M9Lae7RWY8amLkftDS8Zigd/WNxzDEY7eXNjZ0k="; }; nativeBuildInputs = [ pkg-config protobuf ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix index 2b407074ca..11adceb0f7 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "695e7d7a0abefc5a8fd01f3b3080f030f33b0948215f84cd4892c6d904390802"; + sha256 = "63756ac5a00c3e4a066ed231a287faef5963a9183d77326e30bf0644cdf74f86"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix index 8d89352b90..791de67e52 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl # native deps. , runCommand, pkg-config, meson, ninja, makeWrapper # build+runtime deps. @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "9d4d6b7bcdf114acc948e5ee68c83fcbb3944f48a13b9751dbbbc190cdd729c9"; + sha256 = "8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix index e6468ef550..fa8723ea96 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.4.3"; + version = "4.5.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "01dypbqq6ynrdr3dqwbz8dzpkd2ykgaz9mqhaz3i1hqc21c14hgq"; + sha256 = "0yaf25jg3gfsi9c9rnxz1ywy3b563plv33aibxrq79iqwk8a289p"; }; nativeBuildInputs = [ pkg-config ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.tests = { - nixos = nixosTests.pdns-recursor; + inherit (nixosTests) pdns-recursor ncdns; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix b/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix index f533b4537a..76fcac91f9 100644 --- a/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix +++ b/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix @@ -2,10 +2,10 @@ buildGoModule rec { pname = "etcd"; - version = "3.4.15"; + version = "3.4.16"; deleteVendor = true; - vendorSha256 = "sha256-1q5tYNDmlgHdPgL2Pn5BS8z3SwW2E3OaZkKPAtnhJZY="; + vendorSha256 = null; doCheck = false; @@ -13,7 +13,7 @@ buildGoModule rec { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "sha256-jJC2+zv0io0ZulLVaPMrDD7qkOxGfGtFyZvJ2hTmU24="; + sha256 = "sha256-mTQwa9dYc0U0tjum1vR8Dbe/xLRHFUthcklA+Ye6/jw="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/fcgiwrap/default.nix b/third_party/nixpkgs/pkgs/servers/fcgiwrap/default.nix index ee3f02d042..3e0a4e5d99 100644 --- a/third_party/nixpkgs/pkgs/servers/fcgiwrap/default.nix +++ b/third_party/nixpkgs/pkgs/servers/fcgiwrap/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://nginx.localdomain.pl/wiki/FcgiWrap"; description = "Simple server for running CGI applications over FastCGI"; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; license = licenses.mit; }; diff --git a/third_party/nixpkgs/pkgs/servers/firebird/default.nix b/third_party/nixpkgs/pkgs/servers/firebird/default.nix index 2d4e22ba24..fa3a8d0229 100644 --- a/third_party/nixpkgs/pkgs/servers/firebird/default.nix +++ b/third_party/nixpkgs/pkgs/servers/firebird/default.nix @@ -1,91 +1,84 @@ -{lib, stdenv, fetchurl, libedit, automake, autoconf, libtool -, - # icu = null: use icu which comes with firebird +{ lib, stdenv, fetchFromGitHub, libedit, autoreconfHook, zlib, unzip, libtommath, libtomcrypt, icu, superServer ? false }: - # icu = pkgs.icu => you may have trouble sharing database files with windows - # users if "Collation unicode" columns are being used - # windows icu version is *30.dll, however neither the icu 3.0 nor the 3.6 - # sources look close to what ships with this package. - # Thus I think its best to trust firebird devs and use their version - - # icu version missmatch may cause such error when selecting from a table: - # "Collation unicode for character set utf8 is not installed" - - # icu 3.0 can still be built easily by nix (by dropping the #elif case and - # make | make) - icu ? null - -, superServer ? false -, port ? 3050 -, serviceName ? "gds_db" -}: - -/* - there are 3 ways to use firebird: - a) superserver - - one process, one thread for each connection - b) classic - - is built by default - - one process for each connection - - on linux direct io operations (?) - c) embedded. - - manual says that you usually don't notice the difference between a and b. - - I'm only interested in the embedder shared libary for now. - So everything isn't tested yet - -*/ - -stdenv.mkDerivation rec { - version = "2.5.7.27050-0"; +let base = { pname = "firebird"; - # enableParallelBuilding = false; build fails + meta = with lib; { + description = "SQL relational database management system"; + homepage = "https://firebirdsql.org/"; + changelog = "https://github.com/FirebirdSQL/firebird/blob/master/CHANGELOG.md"; + license = [ "IDPL" "Interbase-1.0" ]; + platforms = platforms.linux; + maintainers = with maintainers; [ marcweber ]; + }; - # http://tracker.firebirdsql.org/browse/CORE-3246 - preConfigure = '' - makeFlags="$makeFlags CPU=$NIX_BUILD_CORES" + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ libedit icu ]; + + LD_LIBRARY_PATH = lib.makeLibraryPath [ icu ]; + + configureFlags = [ + "--with-system-editline" + ] ++ (lib.optional superServer "--enable-superserver"); + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r gen/Release/firebird/* $out + runHook postInstall ''; - configureFlags = - [ "--with-serivec-port=${builtins.toString port}" - "--with-service-name=${serviceName}" - "--with-system-editline" - "--with-fblog=/var/log/firebird" - "--with-fbconf=/etc/firebird" - "--with-fbsecure-db=/var/db/firebird/system" - ] - ++ (lib.optional (icu != null) "--with-system-icu") - ++ (lib.optional superServer "--enable-superserver"); +}; in { - src = fetchurl { - url = "mirror://sourceforge/firebird/Firebird-${version}.tar.bz2"; - sha256 = "06hp6bq5irqvm3h03s79qjgcc3jsjpq150y9aq7anklx9v4nhfqa"; - }; + firebird_2_5 = stdenv.mkDerivation (base // rec { + version = "2.5.9"; - hardeningDisable = [ "format" ]; + src = fetchFromGitHub { + owner = "FirebirdSQL"; + repo = "firebird"; + rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "sha256-YyvlMeBux80OpVhsCv+6IVxKXFRsgdr+1siupMR13JM="; + }; - # configurePhase = '' - # sed -i 's@cp /usr/share/automake-.*@@' autogen.sh - # sh autogen.sh $configureFlags --prefix=$out - # ''; - buildInputs = [libedit icu automake autoconf libtool]; + configureFlags = base.configureFlags ++ [ "--with-system-icu" ]; - # TODO: Probably this hase to be tidied up.. - # make install requires beeing. disabling the root checks - # dosen't work. Copying the files manually which can be found - # in ubuntu -dev -classic, -example packages: - # maybe some of those files can be removed again - installPhase = "cp -r gen/firebird $out"; + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r gen/firebird/* $out + runHook postInstall + ''; - meta = { - description = "SQL relational database management system"; - homepage = "https://www.firebirdnews.org"; - license = ["IDPL" "Interbase-1.0"]; - maintainers = [lib.maintainers.marcweber]; - platforms = lib.platforms.linux; - broken = true; - }; + meta = base.meta // { platforms = [ "x86_64-linux" ]; }; + }); + + firebird_3 = stdenv.mkDerivation (base // rec { + version = "3.0.7"; + + src = fetchFromGitHub { + owner = "FirebirdSQL"; + repo = "firebird"; + rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "sha256-8nGan10qjW8dFF89BL/tUWtwMGhahBiODbOqRrHSrbs="; + }; + + buildInputs = base.buildInputs ++ [ zlib libtommath ]; + + meta = base.meta // { platforms = [ "x86_64-linux" ]; }; + }); + + firebird_4 = stdenv.mkDerivation (base // rec { + version = "4.0.0-rc1"; + + src = fetchFromGitHub { + owner = "FirebirdSQL"; + repo = "firebird"; + rev = "T4_0_0_RC1"; + sha256 = "sha256-FLaRePosF5dtJ+fmrfvzkE6wawC9Z9YLhT/ZWkwWXb4="; + }; + + buildInputs = base.buildInputs ++ [ zlib unzip libtommath libtomcrypt ]; + }); } diff --git a/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix b/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix index e6454ced2a..b92975149d 100644 --- a/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "5.6"; + version = "5.7"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz"; - sha256 = "18ksld775balh0yx2icj7fya9fvjkfgvwznvccdlmhi3zidg550h"; + sha256 = "sha256-pUPOYqgJKntQZRRodcyYeFNLCdxKhT8sK1bi3jl6b0s="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix b/third_party/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix index 731d2c9e19..3ea0304406 100644 --- a/third_party/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "A free, secure, production-quality and standard-conformant FTP server"; homepage = "https://www.pureftpd.org"; license = licenses.isc; # with some parts covered by BSD3(?) - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/servers/ftp/vsftpd/default.nix b/third_party/nixpkgs/pkgs/servers/ftp/vsftpd/default.nix index 1a5bd4370d..b87d11809b 100644 --- a/third_party/nixpkgs/pkgs/servers/ftp/vsftpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ftp/vsftpd/default.nix @@ -24,7 +24,11 @@ stdenv.mkDerivation rec { ''; NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap"; - NIX_CFLAGS_COMPILE = "-Wno-error=enum-conversion"; + + # On gcc9, this would produce + # error: '-Werror=enum-conversion': no option -Wenum-conversion + NIX_CFLAGS_COMPILE = lib.optionalString (lib.versionAtLeast stdenv.cc.version "10") + "-Wno-error=enum-conversion"; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix b/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix index b41153caeb..9530877216 100644 --- a/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "agate"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-EOxklOiazxhhIIv6c+N4uuItY/oFMAG0r/ATZ3Anlko="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; checkFlags = [ # Username and Password use the same ports and causes collision diff --git a/third_party/nixpkgs/pkgs/servers/gerbera/default.nix b/third_party/nixpkgs/pkgs/servers/gerbera/default.nix index c7e560f9e6..35290de6b2 100644 --- a/third_party/nixpkgs/pkgs/servers/gerbera/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gerbera/default.nix @@ -1,66 +1,102 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, pkg-config -# required -, libupnp, libuuid, pugixml, libiconv, sqlite, zlib, spdlog, fmt -# options -, enableDuktape ? true, duktape -, enableCurl ? true, curl -, enableTaglib ? true, taglib -, enableLibmagic ? true, file -, enableLibmatroska ? true, libmatroska, libebml -, enableAvcodec ? false, ffmpeg -, enableLibexif ? true, libexif -, enableExiv2 ? false, exiv2 -, enableFFmpegThumbnailer ? false, ffmpegthumbnailer -, enableInotifyTools ? true, inotify-tools +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config + # required +, fmt +, libiconv +, libupnp +, libuuid +, pugixml +, spdlog +, sqlite +, zlib + # options +, enableMysql ? false +, libmysqlclient +, enableDuktape ? true +, duktape +, enableCurl ? true +, curl +, enableTaglib ? true +, taglib +, enableLibmagic ? true +, file +, enableLibmatroska ? true +, libmatroska +, libebml +, enableAvcodec ? false +, ffmpeg +, enableLibexif ? true +, libexif +, enableExiv2 ? false +, exiv2 +, enableFFmpegThumbnailer ? false +, ffmpegthumbnailer +, enableInotifyTools ? true +, inotify-tools }: -with lib; let - optionOnOff = option: if option then "on" else "off"; -in stdenv.mkDerivation rec { + libupnp' = libupnp.overrideAttrs (super: rec { + cmakeFlags = super.cmakeFlags or [ ] ++ [ + "-Dblocking_tcp_connections=OFF" + "-Dreuseaddr=ON" + ]; + }); + + options = [ + { name = "AVCODEC"; enable = enableAvcodec; packages = [ ffmpeg ]; } + { name = "CURL"; enable = enableCurl; packages = [ curl ]; } + { name = "EXIF"; enable = enableLibexif; packages = [ libexif ]; } + { name = "EXIV2"; enable = enableExiv2; packages = [ exiv2 ]; } + { name = "FFMPEGTHUMBNAILER"; enable = enableFFmpegThumbnailer; packages = [ ffmpegthumbnailer ]; } + { name = "INOTIFY"; enable = enableInotifyTools; packages = [ inotify-tools ]; } + { name = "JS"; enable = enableDuktape; packages = [ duktape ]; } + { name = "MAGIC"; enable = enableLibmagic; packages = [ file ]; } + { name = "MATROSKA"; enable = enableLibmatroska; packages = [ libmatroska libebml ]; } + { name = "MYSQL"; enable = enableMysql; packages = [ libmysqlclient ]; } + { name = "TAGLIB"; enable = enableTaglib; packages = [ taglib ]; } + ]; + + inherit (lib) flatten optionals; + +in +stdenv.mkDerivation rec { pname = "gerbera"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { repo = "gerbera"; owner = "gerbera"; rev = "v${version}"; - sha256 = "sha256-unBToiLSpTtnung77z65iuUqiQHwfMVgmFZMUtKU7fQ="; + sha256 = "sha256-bJIT/qQOKTy2l0wsumlGNvaGqzb2mK0hHKG0S6mEG3o="; }; + postPatch = lib.optionalString enableMysql '' + substituteInPlace cmake/FindMySQL.cmake \ + --replace /usr/include/mysql ${lib.getDev libmysqlclient}/include/mariadb \ + --replace /usr/lib/mysql ${lib.getLib libmysqlclient}/lib/mariadb + ''; + 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" - ]; + ] ++ map (e: "-DWITH_${e.name}=${if e.enable then "ON" else "OFF"}") options; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - libupnp libuuid pugixml libiconv sqlite zlib fmt.dev + fmt + libiconv + libupnp' + libuuid + pugixml spdlog - ] - ++ optionals enableDuktape [ duktape ] - ++ optionals enableCurl [ curl ] - ++ optionals enableTaglib [ taglib ] - ++ optionals enableLibmagic [ file ] - ++ optionals enableLibmatroska [ libmatroska libebml ] - ++ optionals enableAvcodec [ ffmpeg.dev ] - ++ optionals enableLibexif [ libexif ] - ++ optionals enableExiv2 [ exiv2 ] - ++ optionals enableInotifyTools [ inotify-tools ] - ++ optionals enableFFmpegThumbnailer [ ffmpegthumbnailer ]; - + sqlite + zlib + ] ++ flatten (builtins.catAttrs "packages" (builtins.filter (e: e.enable) options)); meta = with lib; { homepage = "https://docs.gerbera.io/"; @@ -70,8 +106,8 @@ in stdenv.mkDerivation rec { 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 ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ ardumont ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/servers/gonic/default.nix b/third_party/nixpkgs/pkgs/servers/gonic/default.nix index fbefca063a..4be2bdfb5b 100644 --- a/third_party/nixpkgs/pkgs/servers/gonic/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gonic/default.nix @@ -1,5 +1,6 @@ { lib, buildGoModule, fetchFromGitHub , pkg-config, taglib, alsaLib +, zlib # Disable on-the-fly transcoding, # removing the dependency on ffmpeg. @@ -20,9 +21,19 @@ buildGoModule rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ taglib alsaLib ] ++ lib.optionals transcodingSupport [ ffmpeg ]; + buildInputs = [ taglib alsaLib zlib ]; vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9"; + # TODO(Profpatsch): write a test for transcoding support, + # since it is prone to break + postPatch = lib.optionalString transcodingSupport '' + substituteInPlace \ + server/encode/encode.go \ + --replace \ + '"ffmpeg"' \ + '"${lib.getBin ffmpeg}/bin/ffmpeg"' + ''; + meta = { homepage = "https://github.com/sentriz/gonic"; description = "Music streaming server / subsonic server API implementation"; 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 b6e8dedf2e..afdf3be0ac 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.4.6"; + version = "2021.5.5"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -40,7 +40,7 @@ "apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess "api" = ps: with ps; [ aiohttp-cors ]; "apns" = ps: with ps; [ ]; # missing inputs: apns2 - "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ]; + "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv pyroute2 zeroconf ]; "apprise" = ps: with ps; [ apprise ]; "aprs" = ps: with ps; [ geopy ]; # missing inputs: aprslib "aqualogic" = ps: with ps; [ aqualogic ]; @@ -89,7 +89,7 @@ "bloomsky" = ps: with ps; [ ]; "blueprint" = ps: with ps; [ ]; "bluesound" = ps: with ps; [ xmltodict ]; - "bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL] + "bluetooth_le_tracker" = ps: with ps; [ pygatt ]; "bluetooth_tracker" = ps: with ps; [ bt_proximity pybluez ]; "bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense "bme680" = ps: with ps; [ bme680 smbus-cffi ]; @@ -109,8 +109,8 @@ "caldav" = ps: with ps; [ caldav ]; "calendar" = ps: with ps; [ aiohttp-cors ]; "camera" = ps: with ps; [ aiohttp-cors ]; - "canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary - "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ]; + "canary" = ps: with ps; [ ha-ffmpeg py-canary ]; + "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast pyroute2 zeroconf ]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ pychannels ]; "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook @@ -133,6 +133,7 @@ "comed_hourly_pricing" = ps: with ps; [ ]; "comfoconnect" = ps: with ps; [ pycomfoconnect ]; "command_line" = ps: with ps; [ ]; + "compensation" = ps: with ps; [ numpy ]; "concord232" = ps: with ps; [ ]; # missing inputs: concord232 "config" = ps: with ps; [ aiohttp-cors ]; "configurator" = ps: with ps; [ ]; @@ -155,28 +156,28 @@ "deconz" = ps: with ps; [ pydeconz ]; "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa netdisco pillow scapy sqlalchemy zeroconf ]; - "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn + "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa netdisco pillow pyroute2 scapy sqlalchemy zeroconf ]; + "delijn" = ps: with ps; [ pydelijn ]; "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors ]; "denon" = ps: with ps; [ ]; - "denonavr" = ps: with ps; [ denonavr getmac ]; + "denonavr" = ps: with ps; [ denonavr ]; "derivative" = ps: with ps; [ ]; "deutsche_bahn" = ps: with ps; [ schiene ]; "device_automation" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ aiohttp-cors pillow ]; "device_tracker" = ps: with ps; [ ]; - "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api zeroconf ]; + "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api pyroute2 zeroconf ]; "dexcom" = ps: with ps; [ pydexcom ]; "dhcp" = ps: with ps; [ aiodiscover scapy ]; - "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT + "dht" = ps: with ps; [ ]; # missing inputs: adafruit-circuitpython-dht "dialogflow" = ps: with ps; [ aiohttp-cors ]; "digital_ocean" = ps: with ps; [ digital-ocean ]; "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower "directv" = ps: with ps; [ ]; # missing inputs: directv "discogs" = ps: with ps; [ discogs_client ]; "discord" = ps: with ps; [ discordpy ]; - "discovery" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; + "discovery" = ps: with ps; [ aiohttp-cors netdisco pyroute2 zeroconf ]; "dlib_face_detect" = ps: with ps; [ face_recognition ]; "dlib_face_identify" = ps: with ps; [ face_recognition ]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 @@ -196,7 +197,7 @@ "dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ]; "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices - "dyson" = ps: with ps; [ aiohttp-cors libpurecool zeroconf ]; + "dyson" = ps: with ps; [ aiohttp-cors libpurecool pyroute2 zeroconf ]; "eafm" = ps: with ps; [ aioeafm ]; "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy @@ -218,6 +219,7 @@ "emby" = ps: with ps; [ pyemby ]; "emoncms" = ps: with ps; [ ]; "emoncms_history" = ps: with ps; [ ]; + "emonitor" = ps: with ps; [ aioemonitor ]; "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 @@ -232,13 +234,13 @@ "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 aiohttp-cors zeroconf ]; + "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors pyroute2 zeroconf ]; "essent" = ps: with ps; [ ]; # missing inputs: PyEssent "etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api "eufy" = ps: with ps; [ ]; # missing inputs: lakeside "everlights" = ps: with ps; [ pyeverlights ]; "evohome" = ps: with ps; [ evohome-async ]; - "ezviz" = ps: with ps; [ pyezviz ]; + "ezviz" = ps: with ps; [ ha-ffmpeg pyezviz ]; "faa_delays" = ps: with ps; [ faadelays ]; "facebook" = ps: with ps; [ ]; "facebox" = ps: with ps; [ ]; @@ -280,7 +282,7 @@ "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms "freebox" = ps: with ps; [ freebox-api ]; "freedns" = ps: with ps; [ ]; - "fritz" = ps: with ps; [ fritzconnection ]; + "fritz" = ps: with ps; [ fritzconnection xmltodict ]; "fritzbox" = ps: with ps; [ pyfritzhome ]; "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; @@ -292,7 +294,6 @@ "garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 "gdacs" = ps: with ps; [ ]; # missing inputs: aio_georss_gdacs - "geizhals" = ps: with ps; [ ]; # missing inputs: geizhals "generic" = ps: with ps; [ ]; "generic_thermostat" = ps: with ps; [ ]; "geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client @@ -315,7 +316,7 @@ "google_assistant" = ps: with ps; [ aiohttp-cors ]; "google_cloud" = ps: with ps; [ google-cloud-texttospeech ]; "google_domains" = ps: with ps; [ ]; - "google_maps" = ps: with ps; [ ]; # missing inputs: locationsharinglib + "google_maps" = ps: with ps; [ locationsharinglib ]; "google_pubsub" = ps: with ps; [ google-cloud-pubsub ]; "google_translate" = ps: with ps; [ gtts ]; "google_travel_time" = ps: with ps; [ googlemaps ]; @@ -354,8 +355,8 @@ "home_connect" = ps: with ps; [ aiohttp-cors homeconnect ]; "home_plus_control" = ps: with ps; [ aiohttp-cors homepluscontrol ]; "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg zeroconf ]; - "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors zeroconf ]; + "homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg pyroute2 zeroconf ]; + "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors pyroute2 zeroconf ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ homematicip ]; "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks @@ -374,6 +375,7 @@ "hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti "hydrawise" = ps: with ps; [ hydrawiser ]; "hyperion" = ps: with ps; [ hyperion-py ]; + "ialarm" = ps: with ps; [ pyialarm ]; "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter "iaqualink" = ps: with ps; [ iaqualink ]; "icloud" = ps: with ps; [ pyicloud ]; @@ -398,20 +400,20 @@ "intent" = ps: with ps; [ aiohttp-cors ]; "intent_script" = ps: with ps; [ ]; "intesishome" = ps: with ps; [ pyintesishome ]; - "ios" = ps: with ps; [ aiohttp-cors zeroconf ]; + "ios" = ps: with ps; [ aiohttp-cors pyroute2 zeroconf ]; "iota" = ps: with ps; [ ]; # missing inputs: pyota "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 "ipma" = ps: with ps; [ ]; # missing inputs: pyipma "ipp" = ps: with ps; [ pyipp ]; "iqvia" = ps: with ps; [ numpy pyiqvia ]; "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail - "islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer_times_calculator + "islamic_prayer_times" = ps: with ps; [ prayer-times-calculator ]; "iss" = ps: with ps; [ ]; # missing inputs: pyiss "isy994" = ps: with ps; [ ]; # missing inputs: pyisy "itach" = ps: with ps; [ ]; # missing inputs: pyitachip2ir "itunes" = ps: with ps; [ ]; "izone" = ps: with ps; [ ]; # missing inputs: python-izone - "jewish_calendar" = ps: with ps; [ ]; # missing inputs: hdate + "jewish_calendar" = ps: with ps; [ hdate ]; "joaoapps_join" = ps: with ps; [ ]; # missing inputs: python-join-api "juicenet" = ps: with ps; [ ]; # missing inputs: python-juicenet "kaiterra" = ps: with ps; [ ]; # missing inputs: kaiterra-async-client @@ -427,6 +429,7 @@ "knx" = ps: with ps; [ xknx ]; "kodi" = ps: with ps; [ pykodi ]; "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected + "kostal_plenticore" = ps: with ps; [ ]; # missing inputs: kostal_plenticore "kulersky" = ps: with ps; [ ]; # missing inputs: pykulersky "kwb" = ps: with ps; [ ]; # missing inputs: pykwb "lacrosse" = ps: with ps; [ pylacrosse ]; @@ -492,6 +495,7 @@ "meraki" = ps: with ps; [ aiohttp-cors ]; "message_bird" = ps: with ps; [ ]; # missing inputs: messagebird "met" = ps: with ps; [ pymetno ]; + "met_eireann" = ps: with ps; [ pymeteireann ]; "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance-api "meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint @@ -517,6 +521,7 @@ "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; "motion_blinds" = ps: with ps; [ ]; # missing inputs: motionblinds + "motioneye" = ps: with ps; [ motioneye-client ]; "mpchc" = ps: with ps; [ ]; "mpd" = ps: with ps; [ mpd2 ]; "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; @@ -526,6 +531,7 @@ "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "msteams" = ps: with ps; [ pymsteams ]; "mullvad" = ps: with ps; [ mullvad-api ]; + "mutesync" = ps: with ps; [ mutesync ]; "mvglive" = ps: with ps; [ PyMVGLive ]; "my" = ps: with ps; [ aiohttp-cors pillow ]; "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy @@ -576,8 +582,8 @@ "nx584" = ps: with ps; [ pynx584 ]; "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics - "obihai" = ps: with ps; [ ]; # missing inputs: pyobihai - "octoprint" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; + "obihai" = ps: with ps; [ pyobihai ]; + "octoprint" = ps: with ps; [ aiohttp-cors netdisco pyroute2 zeroconf ]; "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat "ohmconnect" = ps: with ps; [ defusedxml ]; "ombi" = ps: with ps; [ ]; # missing inputs: pyombi @@ -608,7 +614,7 @@ "orvibo" = ps: with ps; [ orvibo ]; "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otp" = ps: with ps; [ pyotp ]; - "ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy + "ovo_energy" = ps: with ps; [ ovoenergy ]; "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ]; "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ]; "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta @@ -620,9 +626,10 @@ "pencom" = ps: with ps; [ ]; # missing inputs: pencompy "persistent_notification" = ps: with ps; [ ]; "person" = ps: with ps; [ aiohttp-cors pillow ]; - "philips_js" = ps: with ps; [ ]; # missing inputs: ha-philipsjs + "philips_js" = ps: with ps; [ ha-philipsjs ]; "pi4ioe5v9xxxx" = ps: with ps; [ ]; # missing inputs: pi4ioe5v9xxxx "pi_hole" = ps: with ps; [ hole ]; + "picnic" = ps: with ps; [ python-picnic-api ]; "picotts" = ps: with ps; [ ]; "piglow" = ps: with ps; [ ]; # missing inputs: piglow "pilight" = ps: with ps; [ ]; # missing inputs: pilight @@ -653,7 +660,7 @@ "pushover" = ps: with ps; [ pushover-complete ]; "pushsafer" = ps: with ps; [ ]; "pvoutput" = ps: with ps; [ jsonpath xmltodict ]; - "pvpc_hourly_pricing" = ps: with ps; [ ]; # missing inputs: aiopvpc + "pvpc_hourly_pricing" = ps: with ps; [ aiopvpc ]; "pyload" = ps: with ps; [ ]; "python_script" = ps: with ps; [ restrictedpython ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent @@ -708,7 +715,7 @@ "ruckus_unleashed" = ps: with ps; [ pyruckus ]; "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 + "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco pyroute2 zeroconf ]; # missing inputs: pysabnzbd "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa pillow ]; "saj" = ps: with ps; [ ]; # missing inputs: pysaj "samsungtv" = ps: with ps; [ samsungctl samsungtvws ]; @@ -748,7 +755,7 @@ "sinch" = ps: with ps; [ ]; # missing inputs: clx-sdk-xms "sisyphus" = ps: with ps; [ ]; # missing inputs: sisyphus-control "sky_hub" = ps: with ps; [ ]; # missing inputs: pyskyqhub - "skybeacon" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL] + "skybeacon" = ps: with ps; [ pygatt ]; "skybell" = ps: with ps; [ skybellpy ]; "slack" = ps: with ps; [ slackclient ]; "sleepiq" = ps: with ps; [ sleepyq ]; @@ -767,7 +774,6 @@ "snips" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "snmp" = ps: with ps; [ pysnmp ]; "sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api - "socialblade" = ps: with ps; [ ]; # missing inputs: socialbladeclient "solaredge" = ps: with ps; [ solaredge stringcase ]; "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local "solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher @@ -779,7 +785,7 @@ "songpal" = ps: with ps; [ ]; # missing inputs: python-songpal "sonos" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ]; "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp - "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch zeroconf ]; + "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch pyroute2 zeroconf ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; "spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw "speedtestdotnet" = ps: with ps; [ speedtest-cli ]; @@ -790,7 +796,7 @@ "sql" = ps: with ps; [ sqlalchemy ]; "squeezebox" = ps: with ps; [ pysqueezebox ]; "srp_energy" = ps: with ps; [ ]; # missing inputs: srpenergy - "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml netdisco zeroconf ]; + "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml netdisco pyroute2 zeroconf ]; "starline" = ps: with ps; [ ]; # missing inputs: starline "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank "startca" = ps: with ps; [ xmltodict ]; @@ -840,7 +846,7 @@ "telnet" = ps: with ps; [ ]; "temper" = ps: with ps; [ ]; # missing inputs: temperusb "template" = ps: with ps; [ ]; - "tensorflow" = ps: with ps; [ numpy pillow tensorflow ]; # missing inputs: pycocotools tf-models-official + "tensorflow" = ps: with ps; [ numpy pillow pycocotools tensorflow ]; # missing inputs: tf-models-official "tesla" = ps: with ps; [ teslajsonpy ]; "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac "thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke @@ -958,7 +964,7 @@ "xbox_live" = ps: with ps; [ xboxapi ]; "xeoma" = ps: with ps; [ pyxeoma ]; "xiaomi" = ps: with ps; [ ha-ffmpeg ]; - "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors netdisco zeroconf ]; + "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors netdisco pyroute2 zeroconf ]; "xiaomi_miio" = ps: with ps; [ construct python-miio ]; "xiaomi_tv" = ps: with ps; [ pymitv ]; "xmpp" = ps: with ps; [ slixmpp ]; @@ -966,7 +972,7 @@ "yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ]; "yamaha" = ps: with ps; [ rxv ]; "yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast - "yandex_transport" = ps: with ps; [ ]; # missing inputs: aioymaps + "yandex_transport" = ps: with ps; [ aioymaps ]; "yandextts" = ps: with ps; [ ]; "yeelight" = ps: with ps; [ yeelight ]; "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower @@ -974,10 +980,10 @@ "zabbix" = ps: with ps; [ ]; # missing inputs: py-zabbix "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge - "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; + "zeroconf" = ps: with ps; [ aiohttp-cors pyroute2 zeroconf ]; "zerproc" = ps: with ps; [ pyzerproc ]; "zestimate" = ps: with ps; [ xmltodict ]; - "zha" = ps: with ps; [ aiohttp-cors bellows pyserial-asyncio pyserial zeroconf zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ]; + "zha" = ps: with ps; [ aiohttp-cors bellows pyroute2 pyserial-asyncio pyserial zeroconf zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ]; "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl "zodiac" = 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 c836d85ac9..194569924c 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , python3 +, inetutils , nixosTests # Look up dependencies of specified components in component-packages.nix @@ -22,24 +23,6 @@ let defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py - # Pinned due to API changes in astral>=2.0, required by the sun/moon plugins - # https://github.com/home-assistant/core/pull/48573; Remove >= 2021.5 - (mkOverride "astral" "1.10.1" - "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") - - # Pinned due to API changes in brother>=1.0, remove >= 2021.5 - (self: super: { - brother = super.brother.overridePythonAttrs (oldAttrs: rec { - version = "0.2.2"; - src = fetchFromGitHub { - owner = "bieniu"; - repo = "brother"; - rev = version; - sha256 = "sha256-vIefcL3K3ZbAUxMFM7gbbTFdrnmufWZHcq4OA19SYXE="; - }; - }); - }) - # Pinned due to API changes in iaqualink>=2.0, remove after # https://github.com/home-assistant/core/pull/48137 was merged (self: super: { @@ -56,26 +39,15 @@ let }) # Pinned due to API changes in pyjwt>=2.0 - (mkOverride "pyjwt" "1.7.1" - "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd") - - # Pinned due to API changes in pykmtronic>=0.2.0 - (mkOverride "pykmtronic" "0.0.3" - "sha256-8bxn27DU1XUQUxQFJklEge29DHx1DMu7pJG4hVE1jDU=") - - # Pinned due to API changes in pylilterbot>=2021.3.0 - # https://github.com/home-assistant/core/pull/48300; Remove >= 2021.5 (self: super: { - pylitterbot = super.pylitterbot.overridePythonAttrs (oldAttrs: rec { - version = "2021.2.8"; - src = fetchFromGitHub { - owner = "natekspencer"; - repo = "pylitterbot"; - rev = version; - sha256 = "142lhijm51v11cd0lhcfdnjdd143jxi2hjsrqdq0rrbbnmj6mymp"; + pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec { + version = "1.7.1"; + src = oldAttrs.src.override { + sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd"; }; - # had no tests before 2021.3.0 - doCheck = false; + disabledTests = [ + "test_ec_verify_should_return_false_if_signature_invalid" + ]; }); }) @@ -84,6 +56,46 @@ let (mkOverride "ring-doorbell" "0.6.2" "fbd537722a27b3b854c26506d894b7399bb8dc57ff36083285971227a2d46560") + # Pinned due to API changes in pyflunearyou>=2.0 + (self: super: { + pyflunearyou = super.pyflunearyou.overridePythonAttrs (oldAttrs: rec { + version = "1.0.7"; + src = fetchFromGitHub { + owner = "bachya"; + repo = "pyflunearyou"; + rev = version; + sha256 = "0hq55k298m9a90qb3lasw9bi093hzndrah00rfq94bp53aq0is99"; + }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry.masonry.api" "poetry.core.masonry.api" \ + --replace 'msgpack = "^0.6.2"' 'msgpack = "*"' \ + --replace 'ujson = "^1.35"' 'ujson = "*"' + ''; + }); + }) + + # Pinned due to API changes in pylast 4.2.1 + (mkOverride "pylast" "4.2.0" + "0zd0dn2l738ndz62vpa751z0ldnm91dcz9zzbvxv53r08l0s9yf3") + + # Pinned due to API changes in pyopenuv>=1.1.0 + (self: super: { + pyopenuv = super.pyopenuv.overridePythonAttrs (oldAttrs: rec { + version = "1.0.13"; + src = fetchFromGitHub { + owner = "bachya"; + repo = "pyopenuv"; + rev = version; + sha256 = "1gx9xjkyvqqy8410lnbshq1j5y4cb0cdc4m505g17rwdzdwb01y8"; + }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry.masonry.api" "poetry.core.masonry.api" + ''; + }); + }) + # Pinned due to API changes in pyruckus>0.12 (self: super: { pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec { @@ -97,6 +109,19 @@ let }); }) + # Remove after https://github.com/NixOS/nixpkgs/pull/121854 has passed staging-next + (self: super: { + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.4.13"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0npsg38d11skv04zvsi90j93f6jdgm8666ds2ri7shr1pz1732hx"; + }; + patches = []; + propagatedBuildInputs = [ python3.pkgs.greenlet ]; + }); + }) + # hass-frontend does not exist in python3.pkgs (self: super: { hass-frontend = self.callPackage ./frontend.nix { }; @@ -130,7 +155,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.4.6"; + hassVersion = "2021.5.5"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -149,7 +174,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1s1slwcqls2prz9kgyhggs8xi3x7ghwdi33j983kvpg0gva7d2f0"; + sha256 = "1vdxygjik1ay58xgyr1rk12cgy63raqi4fldnd4mlhs4i21c7ff8"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -162,8 +187,6 @@ in with py.pkgs; buildPythonApplication rec { --replace "bcrypt==3.1.7" "bcrypt" \ --replace "cryptography==3.3.2" "cryptography" \ --replace "pip>=8.0.3,<20.3" "pip" \ - --replace "pytz>=2021.1" "pytz" \ - --replace "pyyaml==5.4.1" "pyyaml" \ --replace "ruamel.yaml==0.15.100" "ruamel.yaml" substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; @@ -200,70 +223,132 @@ in with py.pkgs; buildPythonApplication rec { doCheck = stdenv.isLinux; checkInputs = [ - # test infrastructure - asynctest + # test infrastructure (selectively from requirement_test.txt) pytest-aiohttp + pytest-mock pytest-rerunfailures pytest-xdist pytestCheckHook requests-mock - # component dependencies - pyotp + jsonpickle respx + # required by tests/auth/mfa_modules + pyotp ] ++ lib.concatMap (component: getPackages component py.pkgs) componentTests; # We can reasonably test components that don't communicate with any network # services. Before adding new components to this list make sure we have all # its dependencies packaged and listed in ./component-packages.nix. componentTests = [ + "abode" "accuweather" + "acmeda" + "adguard" + "advantage_air" + "agent_dvr" + "air_quality" "airly" - "analytics" + "airnow" + "airvisual" + "alarm_control_panel" + "alarmdecoder" "alert" + "alexa" + "almond" + "ambiclimate" + "ambient_station" + "analytics" + "androidtv" + "apache_kafka" "api" + "apple_tv" + "apprise" + "arlo" + "asuswrt" + "august" + "aurora" "auth" "automation" + "awair" + "aws" "axis" "bayesian" "binary_sensor" + "blackbird" + "blueprint" + "bluetooth_le_tracker" + "braviatv" + "broadlink" "brother" + "bsblan" "caldav" "calendar" "camera" + "canary" "cast" + "cert_expiry" + "climacell" "climate" "cloud" + "cloudflare" "comfoconnect" "command_line" + "compensation" "config" "configurator" "conversation" + "coronavirus" "counter" "cover" + "daikin" + "darksky" + "datadog" "deconz" "default_config" "demo" + "denonavr" "derivative" "device_automation" "device_sun_light_trigger" "device_tracker" "devolo_home_control" + "dexcom" "dhcp" + "dialogflow" "discovery" "dsmr" + "dte_energy_bridge" + "duckdns" + "dyson" + "eafm" "econet" + "efergy" + "emonitor" "emulated_hue" "esphome" - "fan" + "everlights" + "ezviz" "faa_delays" + "facebook" + "facebox" + "fail2ban" + "fan" + "feedreader" "ffmpeg" + "fido" "file" "filesize" "filter" + "firmata" + "flo" + "flume" + "flunearyou" "flux" "folder" "folder_watcher" "freebox" + "freedns" + "fritz" "fritzbox" "fritzbox_callmonitor" "frontend" @@ -271,164 +356,329 @@ in with py.pkgs; buildPythonApplication rec { "generic_thermostat" "geo_json_events" "geo_location" + "geofency" + "glances" + "google" + "google_assistant" + "google_domains" + "google_pubsub" + "google_translate" + "google_travel_time" + "google_wifi" + "gpslogger" + "graphite" "group" + "guardian" + "harmony" + "hassio" "hddtemp" "history" "history_stats" "home_connect" "home_plus_control" + "homeassistant" "homekit" "homekit_controller" - "homeassistant" "homematic" "homematicip_cloud" "html5" "http" "hue" + "humidifier" "hyperion" + "ialarm" "iaqualink" + "icloud" "ifttt" "image" "image_processing" + "imap_email_content" "influxdb" "input_boolean" "input_datetime" - "input_text" "input_number" "input_select" + "input_text" + "insteon" + "integration" "intent" "intent_script" + "ios" "ipp" + "iqvia" + "islamic_prayer_times" + "jewish_calendar" + "kira" "kmtronic" "knx" "kodi" + "lastfm" + "lcn" "light" "litterrobot" "local_file" "local_ip" + "locative" "lock" "logbook" "logentries" "logger" + "london_air" "lovelace" + "luftdaten" "lutron_caseta" + "lyric" + "mailbox" "manual" "manual_mqtt" "mazda" "media_player" "media_source" + "meraki" "met" + "met_eireann" + "microsoft_face" + "microsoft_face_detect" + "microsoft_face_identify" + "mikrotik" + "min_max" "minecraft_server" + "minio" "mobile_app" "modbus" + "mold_indicator" "moon" + "motioneye" "mqtt" "mqtt_eventstream" "mqtt_json" "mqtt_room" "mqtt_statestream" "mullvad" + "mutesync" + "my" + "myq" + "mysensors" + "namecheapdns" + "neato" + "netatmo" "nexia" + "no_ip" "notify" "notion" + "nuki" "number" + "nws" "nx584" "omnilogic" + "onboarding" "ondilo_ico" + "openalpr_cloud" + "openalpr_local" "openerz" + "openhardwaremonitor" "opentherm_gw" + "openuv" + "openweathermap" + "opnsense" + "ovo_energy" + "owntracks" "ozw" "panel_custom" "panel_iframe" "persistent_notification" "person" + "philips_js" + "pi_hole" + "picnic" + "ping" "plaato" + "plant" + "plex" + "plugwise" + "poolsense" + "profiler" "prometheus" "proximity" "push" + "pushbullet" + "pvpc_hourly_pricing" "python_script" + "rachio" + "radarr" + "rainmachine" "random" + "recollect_waste" "recorder" + "reddit" + "remote" "rest" "rest_command" + "ring" + "risco" "rituals_perfume_genie" "rmvtransport" "roku" + "roomba" "rss_feed_template" "ruckus_unleashed" "safe_mode" + "samsungtv" "scene" "screenlogic" "script" "search" + "season" + "sensor" + "sentry" + "sharkiq" "shell_command" + "shelly" "shopping_list" + "sigfox" + "sighthound" "simplisafe" "simulated" + "slack" "sleepiq" "sma" - "smhi" - "sensor" - "slack" + "smappee" "smartthings" "smarttub" + "smhi" "smtp" - "smappee" + "snips" "solaredge" + "soma" + "somfy" "sonos" + "soundtouch" + "spaceapi" + "speedtestdotnet" "spotify" "sql" + "squeezebox" "ssdp" + "startca" + "statistics" + "statsd" "stream" + "stt" "subaru" "sun" + "surepetcare" "switch" + "switcher_kis" "system_health" "system_log" + "tado" "tag" "tasmota" "tcp" + "telegram" + "tellduslive" "template" "tesla" "threshold" + "tile" "time_date" "timer" "tod" + "tomato" + "toon" + "tplink" "trace" + "transmission" + "trend" "tts" + "tuya" + "twentemilieu" + "twilio" + "twinkly" + "twitch" + "uk_transport" + "unifi" + "unifi_direct" "universal" "updater" "upnp" "uptime" + "usgs_earthquakes_feed" + "utility_meter" + "uvc" "vacuum" + "velbus" + "vera" "verisure" + "version" + "vesync" + "vizio" + "voicerss" + "volumio" + "vultr" + "wake_on_lan" + "water_heater" + "waze_travel_time" "weather" "webhook" + "webostv" "websocket_api" "wemo" + "wiffi" + "wilight" "wled" "workday" "worldclock" + "wsdot" + "wunderground" + "xiaomi" + "xiaomi_aqara" + "xiaomi_miio" + "yamaha" + "yandex_transport" + "yandextts" "yeelight" "zeroconf" + "zerproc" "zha" + "zodiac" "zone" "zwave" "zwave_js" + ] ++ lib.optionals (builtins.any (s: s == stdenv.hostPlatform.system) debugpy.meta.platforms) [ + "debugpy" ]; pytestFlagsArray = [ - # limit amout of runners to reduce race conditions - "-n auto" + # parallelize test run + "--numprocesses auto" + # assign tests grouped by file to workers + "--dist loadfile" # retry racy tests that end in "RuntimeError: Event loop is closed" "--reruns 3" "--only-rerun RuntimeError" - # assign tests grouped by file to workers - "--dist loadfile" - # tests are located in tests/ - "tests" + # enable full variable printing on error + "--showlocals" # screenlogic/test_config_flow.py: Tries to send out UDP broadcasts "--deselect tests/components/screenlogic/test_config_flow.py::test_form_cannot_connect" + # asuswrt/test_config_flow.py: Sandbox network limitations, fails with unexpected error + "--deselect tests/components/asuswrt/test_config_flow.py::test_on_connect_failed" + # shelly/test_config_flow.py: Tries to join multicast group + "--deselect tests/components/shelly/test_config_flow.py::test_form" + "--deselect tests/components/shelly/test_config_flow.py::test_title_without_name" + "--deselect tests/components/shelly/test_config_flow.py::test_form_auth" + "--deselect tests/components/shelly/test_config_flow.py::test_form_errors_test_connection" + "--deselect tests/components/shelly/test_config_flow.py::test_user_setup_ignored_device" + "--deselect tests/components/shelly/test_config_flow.py::test_form_auth_errors_test_connection" + "--deselect tests/components/shelly/test_config_flow.py::test_form_auth_errors_test_connection" + "--deselect tests/components/shelly/test_config_flow.py::test_form_auth_errors_test_connection" + "--deselect tests/components/shelly/test_config_flow.py::test_zeroconf" + "--deselect tests/components/shelly/test_config_flow.py::test_zeroconf_sleeping_device" + "--deselect tests/components/shelly/test_config_flow.py::test_zeroconf_sleeping_device_error" + "--deselect tests/components/shelly/test_config_flow.py::test_zeroconf_sleeping_device_error" + "--deselect tests/components/shelly/test_config_flow.py::test_zeroconf_require_auth" + # tests are located in tests/ + "tests" # dynamically add packages required for component tests ] ++ map (component: "tests/components/" + component) componentTests; @@ -453,6 +703,13 @@ in with py.pkgs; buildPythonApplication rec { "test_fetching_url_with_verify_ssl" # util/test_package.py: AssertionError on package.is_installed('homeassistant>=999.999.999') "test_check_package_version_does_not_match" + # homeassistant/util/thread.py:51: SystemError + "test_executor_shutdown_can_interrupt_threads" + # {'theme_color': '#03A9F4'} != {'theme_color': 'blue'} + "test_webhook_handle_get_config" + # onboarding tests rpi_power component, for which we are lacking rpi_bad_power library + "test_onboarding_core_sets_up_rpi_power" + "test_onboarding_core_no_rpi_power" ]; preCheck = '' @@ -461,6 +718,9 @@ in with py.pkgs; buildPythonApplication rec { # the tests require the existance of a media dir mkdir /build/media + # put ping binary into PATH, e.g. for wake_on_lan tests + export PATH=${inetutils}/bin:$PATH + # error out when component test directory is missing, otherwise hidden by xdist execution :( for component in ${lib.concatStringsSep " " (map lib.escapeShellArg componentTests)}; do test -d "tests/components/$component" || { diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 83af5b85c8..bd49065442 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 = "20210407.3"; + version = "20210504.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ucewS193kbvlk4Q+5IEYT6sfJ/H006uy0iIi8UHOzPo="; + sha256 = "sha256-rNdqflWT8bmGHtAGGfq4xVxDcnK+EZU9qejRWQPJmUI="; }; # there is nothing to strip in this package diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix index 46e1d7643d..3fff2ac9fc 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv, lynx +, nixosTests , proxySupport ? true , sslSupport ? true, openssl , http2Support ? true, nghttp2 @@ -16,12 +17,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.46"; + version = "2.4.47"; pname = "apache-httpd"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "1sj1rwgbcjgkzac3ybjy7j68c9b3dv3ap71m48mrjhf6w7vds3kl"; + sha256 = "sha256-I9AG28jleBFqETj6RX7qgkBIRY6JyECHIZ8DcogMA8o="; }; # FIXME: -dev depends on -doc @@ -85,6 +86,9 @@ stdenv.mkDerivation rec { passthru = { inherit apr aprutil sslSupport proxySupport ldapSupport luaSupport lua5; + tests = { + acme-integration = nixosTests.acme; + }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index da1b4e456b..773136a020 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "Provide Zeroconf support via DNS-SD using Avahi"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix index 3d9d4b21c4..1b8ef94fae 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -1,10 +1,11 @@ -{ lib, stdenv, fetchurl, apacheHttpd, python2 }: +{ lib, stdenv, fetchurl, apacheHttpd, python2, libintl }: stdenv.mkDerivation rec { - name = "mod_python-3.5.0"; + pname = "mod_python"; + version = "3.5.0"; src = fetchurl { - url = "http://dist.modpython.org/dist/${name}.tgz"; + url = "http://dist.modpython.org/dist/${pname}-${version}.tgz"; sha256 = "146apll3yfqk05s8fkf4acmxzqncl08bgn4rv0c1rd4qxmc91w0f"; }; @@ -24,7 +25,8 @@ stdenv.mkDerivation rec { passthru = { inherit apacheHttpd; }; - buildInputs = [ apacheHttpd python2 ]; + buildInputs = [ apacheHttpd python2 ] + ++ lib.optional stdenv.isDarwin libintl; meta = { homepage = "http://modpython.org/"; diff --git a/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix b/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix index c79a9fe3fd..9e40bb648e 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "apt-cacher-ng"; - version = "3.6.1"; + version = "3.6.3"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "sha256-avyjp4KH7l6OZxnMVDv1U/MIWcadqyPPtnLYzEYkqlA="; + sha256 = "sha256-P4ArWpxjOjBi9EiDp/ord17GfUOFwpiTKGvSEuZljGA="; }; nativeBuildInputs = [ cmake doxygen pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/http/couchdb/2.0.0.nix b/third_party/nixpkgs/pkgs/servers/http/couchdb/2.0.0.nix deleted file mode 100644 index 2881a3dc19..0000000000 --- a/third_party/nixpkgs/pkgs/servers/http/couchdb/2.0.0.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5 -, coreutils, bash, makeWrapper, python3 }: - -stdenv.mkDerivation rec { - pname = "couchdb"; - version = "2.3.1"; - - - # when updating this, please consider bumping the OTP version - # in all-packages.nix - src = fetchurl { - url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; - sha256 = "0z926hjqyhxhyr65kqxwpmp80nyfqbig6d9dy8dqflpb87n8rss3"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ erlang icu openssl spidermonkey_1_8_5 (python3.withPackages(ps: with ps; [ requests ]))]; - - patches = [ ./jsapi.patch ]; - postPatch = '' - substituteInPlace src/couch/rebar.config.script --replace '-DHAVE_CURL -I/usr/local/include' "-DHAVE_CURL -I/usr/local/include $NIX_CFLAGS_COMPILE" - - patch bin/rebar < #!${coreutils}/bin/env escript - EOF - - ''; - - # Configure a username. The build system would use "couchdb" as - # default if none is provided. Note that it is unclear where this - # username is actually used in the build, as any choice seems to be - # working. - configurePhase = '' - ./configure -u nobody - ''; - - buildPhase = '' - make release - ''; - - installPhase = '' - mkdir -p $out - cp -r rel/couchdb/* $out - wrapProgram $out/bin/couchdb --suffix PATH : ${bash}/bin - ''; - - meta = with lib; { - description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; - homepage = "http://couchdb.apache.org"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/http/couchdb/default.nix b/third_party/nixpkgs/pkgs/servers/http/couchdb/default.nix deleted file mode 100644 index 45023e800a..0000000000 --- a/third_party/nixpkgs/pkgs/servers/http/couchdb/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5, curl, help2man -, sphinx, which, file, pkg-config, getopt }: - -stdenv.mkDerivation rec { - pname = "couchdb"; - version = "1.7.1"; - - src = fetchurl { - url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; - sha256 = "1b9cbdrmh1i71mrwvhm17v4cf7lckpil1vvq7lpmxyn6zfk0l84i"; - }; - - nativeBuildInputs = [ help2man which file pkg-config sphinx ]; - buildInputs = [ erlang icu openssl spidermonkey_1_8_5 curl ]; - - postInstall = '' - substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt" - ''; - - /* - Versions of SpiderMonkey after the js185-1.0.0 release remove the optional - enforcement of preventing anonymous functions in a statement context. This - will most likely break your existing JavaScript code as well as render all - example code invalid. - - If you wish to ignore this error pass --enable-js-trunk to ./configure. - */ - configureFlags = [ - "--enable-js-trunk" - ]; - - meta = with lib; { - description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; - homepage = "http://couchdb.apache.org"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/http/couchdb/jsapi.patch b/third_party/nixpkgs/pkgs/servers/http/couchdb/jsapi.patch deleted file mode 100644 index bb7d4ca610..0000000000 --- a/third_party/nixpkgs/pkgs/servers/http/couchdb/jsapi.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -ru couch_js/http.c couch_js-patched/http.c ---- apache-couchdb-2.0.0/src/couch/priv/couch_js/http.c 2016-09-12 11:28:51.000000000 +0200 -+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/http.c 2017-02-10 10:52:33.025854045 +0100 -@@ -15,7 +15,7 @@ - #include - #include - #include --#include -+#include - #include "config.h" - #include "utf8.h" - #include "util.h" -diff -ru couch_js/main.c couch_js-patched/main.c ---- apache-couchdb-2.0.0/src/couch/priv/couch_js/main.c 2016-09-12 11:28:51.000000000 +0200 -+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/main.c 2017-02-10 10:52:33.001854154 +0100 -@@ -20,7 +20,7 @@ - #include - #endif - --#include -+#include - #include "config.h" - #include "http.h" - #include "utf8.h" -diff -ru couch_js/utf8.c couch_js-patched/utf8.c ---- apache-couchdb-2.0.0/src/couch/priv/couch_js/utf8.c 2016-09-12 11:28:51.000000000 +0200 -+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/utf8.c 2017-02-10 10:52:33.009854117 +0100 -@@ -10,7 +10,7 @@ - // License for the specific language governing permissions and limitations under - // the License. - --#include -+#include - #include "config.h" - - static int -diff -ru couch_js/util.c couch_js-patched/util.c ---- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.c 2016-09-12 11:28:51.000000000 +0200 -+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.c 2017-02-10 10:52:33.017854081 +0100 -@@ -13,7 +13,7 @@ - #include - #include - --#include -+#include - - #include "help.h" - #include "util.h" -diff -ru couch_js/util.h couch_js-patched/util.h ---- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.h 2016-09-12 11:28:51.000000000 +0200 -+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.h 2017-02-10 10:52:32.988854212 +0100 -@@ -13,7 +13,7 @@ - #ifndef COUCHJS_UTIL_H - #define COUCHJS_UTIL_H - --#include -+#include - - typedef struct { - int no_eval; diff --git a/third_party/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix b/third_party/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix index 33c556fb54..a26dd47e02 100644 --- a/third_party/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.38.0"; + version = "1.39.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-QaqZGTkNAzQEqlwccAWPDP91BSc9vRDEsCBca/lEXW4="; + sha256 = "sha256-eyg2o/5k7/zagYjkYJOnJrHeoszbRkmdl7UgO+rmKyc="; }; - vendorSha256 = "sha256-uuwuiGQWLIQ5UJuCKDBEvCPo2+AXtJ54ARK431qiakc="; + vendorSha256 = "sha256-aedJ7vsv70aybjqBfUnSr4qhlFdY7jUUOSas3vXskpM="; subPackages = [ "." ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/http/jboss/default.nix b/third_party/nixpkgs/pkgs/servers/http/jboss/default.nix index fda57cb9a5..162d018e72 100644 --- a/third_party/nixpkgs/pkgs/servers/http/jboss/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/jboss/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, jdk }: +{ lib, stdenv, fetchurl, jdk }: stdenv.mkDerivation { name = "jboss-as-7.1.1.Final"; @@ -7,8 +7,6 @@ stdenv.mkDerivation { sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8"; }; - nativeBuildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix index 663193789a..e13c0b4e92 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix @@ -145,6 +145,7 @@ stdenv.mkDerivation { tests = { inherit (nixosTests) nginx nginx-auth nginx-etag nginx-pubhtml nginx-sandbox nginx-sso; variants = lib.recurseIntoAttrs nixosTests.nginx-variants; + acme-integration = nixosTests.acme; }; }; diff --git a/third_party/nixpkgs/pkgs/servers/http/trafficserver/default.nix b/third_party/nixpkgs/pkgs/servers/http/trafficserver/default.nix index 05eb9a17c8..4a7f9854d1 100644 --- a/third_party/nixpkgs/pkgs/servers/http/trafficserver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/trafficserver/default.nix @@ -201,7 +201,7 @@ stdenv.mkDerivation rec { large intranets by maximizing existing and available bandwidth. ''; license = licenses.asl20; - maintainers = with maintainers; [ midchildan joaquinito2051 ]; + maintainers = with maintainers; [ midchildan ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix b/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix index fc75003f39..e8bf832a15 100644 --- a/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix @@ -67,6 +67,9 @@ stdenv.mkDerivation { url = "mirror://sourceforge/hylafax/hylafax-${version}.tar.gz"; inherit sha256; }; + patches = [ + ./libtiff-4.2.patch # adjust configure check to work with libtiff > 4.1 + ]; # Note that `configure` (and maybe `faxsetup`) are looking # for a couple of standard binaries in the `PATH` and # hardcode their absolute paths in the new package. diff --git a/third_party/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.2.patch b/third_party/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.2.patch new file mode 100644 index 0000000000..5da106565f --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.2.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 7456dcb..90f0e8d 100755 +--- a/configure ++++ b/configure +@@ -2583,7 +2583,7 @@ EOF + echo '#define TIFFSTRIPBYTECOUNTS uint32' + echo '#define TIFFVERSION TIFF_VERSION' + echo '#define TIFFHEADER TIFFHeader';; +- 4.[01]) tiff_runlen_t="uint32" ++ 4.[012]) tiff_runlen_t="uint32" + tiff_offset_t="uint64" + echo '#define TIFFSTRIPBYTECOUNTS uint64' + echo '#define TIFFVERSION TIFF_VERSION_CLASSIC' diff --git a/third_party/nixpkgs/pkgs/servers/irc/inspircd/default.nix b/third_party/nixpkgs/pkgs/servers/irc/inspircd/default.nix index f907e337ce..561151bfa7 100644 --- a/third_party/nixpkgs/pkgs/servers/irc/inspircd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/irc/inspircd/default.nix @@ -142,13 +142,13 @@ in stdenv.mkDerivation rec { pname = "inspircd"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0x3paasf4ynx4ddky2nq613vyirbhfnxzkjq148k7154pz3q426s"; + sha256 = "1817gmxk4v7k5398d2fb6qkwadg0fd980gqmr80wdnppx450ikn7"; }; outputs = [ "bin" "lib" "man" "doc" "out" ]; @@ -160,6 +160,8 @@ stdenv.mkDerivation rec { buildInputs = extraInputs; configurePhase = '' + runHook preConfigure + patchShebangs configure make/*.pl # configure is executed twice, once to set the extras @@ -183,6 +185,8 @@ stdenv.mkDerivation rec { --module-dir ${placeholder "lib"}/lib/inspircd \ --runtime-dir /var/run \ --script-dir ${placeholder "bin"}/share/inspircd \ + + runHook postConfigure ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/servers/irc/solanum/bandb.patch b/third_party/nixpkgs/pkgs/servers/irc/solanum/bandb.patch new file mode 100644 index 0000000000..7d204398b9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/irc/solanum/bandb.patch @@ -0,0 +1,12 @@ +diff --git a/ircd/bandbi.c b/ircd/bandbi.c +index 29a3bfa2..16a40f17 100644 +--- a/ircd/bandbi.c ++++ b/ircd/bandbi.c +@@ -83,7 +83,6 @@ start_bandb(void) + const char *suffix = ""; + #endif + +- rb_setenv("BANDB_DBPATH", ircd_paths[IRCD_PATH_BANDB], 1); + if(bandb_path == NULL) + { + snprintf(fullpath, sizeof(fullpath), "%s%cbandb%s", ircd_paths[IRCD_PATH_LIBEXEC], RB_PATH_SEPARATOR, suffix); diff --git a/third_party/nixpkgs/pkgs/servers/irc/solanum/default.nix b/third_party/nixpkgs/pkgs/servers/irc/solanum/default.nix index 1d39526ed1..2d9035259a 100644 --- a/third_party/nixpkgs/pkgs/servers/irc/solanum/default.nix +++ b/third_party/nixpkgs/pkgs/servers/irc/solanum/default.nix @@ -1,27 +1,29 @@ { lib, stdenv -, fetchFromGitHub , autoreconfHook -, pkg-config , bison +, fetchFromGitHub , flex -, openssl -, sqlite , lksctp-tools +, openssl +, pkg-config +, sqlite +, util-linux }: stdenv.mkDerivation rec { pname = "solanum"; - version = "unstable-2020-12-14"; + version = "unstable-2021-04-27"; src = fetchFromGitHub { owner = "solanum-ircd"; repo = pname; - rev = "551e5a146eab4948ce4a57d87a7f671f2d7cc02d"; - sha256 = "14cd2cb04w6nwck7q49jw5zvifkzhkmblwhjfskc2nxcdb5x3l96"; + rev = "3ff5a12e75662e9a642f2a4364797bd361eb0925"; + sha256 = "14ywmfdv8cncbyg08y2qdis00kwg8lvhkcgj185is67smh0qf88f"; }; patches = [ ./dont-create-logdir.patch + ./bandb.patch # https://github.com/solanum-ircd/solanum/issues/156 ]; configureFlags = [ @@ -29,9 +31,9 @@ stdenv.mkDerivation rec { "--enable-ipv6" "--enable-openssl=${openssl.dev}" "--with-program-prefix=solanum-" - "--localstatedir=/var/lib/solanum" - "--with-rundir=/run/solanum" - "--with-logdir=/var/log/solanum" + "--localstatedir=/var/lib" + "--with-rundir=/run" + "--with-logdir=/var/log" ] ++ lib.optionals (stdenv.isLinux) [ "--enable-sctp=${lksctp-tools.out}/lib" ]; @@ -41,6 +43,7 @@ stdenv.mkDerivation rec { bison flex pkg-config + util-linux ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index 0c91226d0c..b9c73e6028 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.17.865"; + version = "0.18.95"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-kjrch++WncedVkRm05RifUGEYlc5NFAss/E6fgPZWyQ="; + sha256 = "sha256-8TkIixPot4V0h4MBh/+WdrWhjgsqyq9wHQyGyfxqZ6s="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix b/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix index 77406c4641..636a1b6d02 100644 --- a/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix @@ -1,7 +1,26 @@ -{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnetCorePackages, ffmpeg, - fontconfig, freetype, nixosTests }: +{ lib +, fetchFromGitHub +, fetchurl +, linkFarmFromDrvs +, makeWrapper +, nixosTests +, stdenv +, dotnetCorePackages +, dotnetPackages +, ffmpeg +, fontconfig +, freetype +, jellyfin-web +, sqlite +}: let + runtimeDeps = [ + ffmpeg + fontconfig + freetype + ]; + os = if stdenv.isDarwin then "osx" else "linux"; arch = with stdenv.hostPlatform; @@ -13,39 +32,82 @@ let musl = lib.optionalString stdenv.hostPlatform.isMusl (lib.warnIf (arch != "x64") "Some image processing features might be unavailable for non x86-64 with Musl" "musl-"); - runtimeDir = "${os}-${musl}${arch}"; + # https://docs.microsoft.com/en-us/dotnet/core/rid-catalog#using-rids + runtimeId = "${os}-${musl}${arch}"; -in stdenv.mkDerivation rec { + dotnet-sdk = dotnetCorePackages.sdk_5_0; + dotnet-net = dotnetCorePackages.net_5_0; + dotnet-aspnetcore = dotnetCorePackages.aspnetcore_5_0; +in +stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.7.2"; + version = "10.7.5"; # ensure that jellyfin-web has matching version - # Impossible to build anything offline with dotnet - src = fetchurl { - url = "https://repo.jellyfin.org/releases/server/portable/versions/stable/combined/${version}/jellyfin_${version}.tar.gz"; - sha256 = "sha256-l2tQmKez06cekq/QLper+OrcSU/0lWpZ85xY2wZcK1s="; + src = fetchFromGitHub { + owner = "jellyfin"; + repo = "jellyfin"; + rev = "v${version}"; + sha256 = "DlbNZpomNki9zrfG0C7He0Xrq79vx4Rn8ixpekvk34E="; }; nativeBuildInputs = [ - unzip + dotnet-sdk + dotnetPackages.Nuget makeWrapper ]; propagatedBuildInputs = [ - dotnetCorePackages.aspnetcore_5_0 + dotnet-aspnetcore sqlite ]; - preferLocalBuild = true; + nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./nuget-deps.nix { + fetchNuGet = { name, version, sha256 }: fetchurl { + name = "nuget-${name}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + inherit sha256; + }; + }); + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_NOLOGO=1 + + nuget sources Add -Name nixos -Source "$PWD/nixos" + nuget init "$nugetDeps" "$PWD/nixos" + + # FIXME: https://github.com/NuGet/Home/issues/4413 + mkdir -p $HOME/.nuget/NuGet + cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + dotnet publish Jellyfin.Server \ + --configuration Release \ + --runtime ${runtimeId} \ + --no-self-contained \ + --output $out/opt/jellyfin + + runHook postBuild + ''; installPhase = '' runHook preInstall - install -dm 755 "$out/opt/jellyfin" - cp -r * "$out/opt/jellyfin" - makeWrapper "${dotnetCorePackages.aspnetcore_5_0}/bin/dotnet" $out/bin/jellyfin \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ - sqlite fontconfig freetype stdenv.cc.cc.lib - ]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \ - --add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg" + + makeWrapper ${dotnet-aspnetcore}/bin/dotnet $out/bin/jellyfin \ + --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \ + --add-flags "$out/opt/jellyfin/jellyfin.dll" \ + --add-flags "--ffmpeg ${ffmpeg}/bin/ffmpeg" \ + --add-flags "--webdir ${jellyfin-web}/share/jellyfin-web" + runHook postInstall ''; @@ -53,11 +115,13 @@ in stdenv.mkDerivation rec { smoke-test = nixosTests.jellyfin; }; - meta = with lib; { + passthru.updateScript = ./update.sh; + + meta = with lib; { description = "The Free Software Media System"; homepage = "https://jellyfin.org/"; # https://github.com/jellyfin/jellyfin/issues/610#issuecomment-537625510 license = licenses.gpl2Plus; - maintainers = with maintainers; [ nyanloutre minijackson purcell ]; + maintainers = with maintainers; [ nyanloutre minijackson purcell jojosch ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/node-composition.nix b/third_party/nixpkgs/pkgs/servers/jellyfin/node-composition.nix new file mode 100644 index 0000000000..d0c72d2e85 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/jellyfin/node-composition.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-deps.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit nodeEnv; +} diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/node-deps.nix b/third_party/nixpkgs/pkgs/servers/jellyfin/node-deps.nix new file mode 100644 index 0000000000..3a55fcbe88 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/jellyfin/node-deps.nix @@ -0,0 +1,13659 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: + +let + sources = { + "@babel/code-frame-7.12.11" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.12.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz"; + sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; + }; + }; + "@babel/code-frame-7.12.13" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz"; + sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g=="; + }; + }; + "@babel/compat-data-7.14.0" = { + name = "_at_babel_slash_compat-data"; + packageName = "@babel/compat-data"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz"; + sha512 = "vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q=="; + }; + }; + "@babel/core-7.14.0" = { + name = "_at_babel_slash_core"; + packageName = "@babel/core"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/core/-/core-7.14.0.tgz"; + sha512 = "8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw=="; + }; + }; + "@babel/eslint-parser-7.13.14" = { + name = "_at_babel_slash_eslint-parser"; + packageName = "@babel/eslint-parser"; + version = "7.13.14"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.13.14.tgz"; + sha512 = "I0HweR36D73Ibn/FfrRDMKlMqJHFwidIUgYdMpH+aXYuQC+waq59YaJ6t9e9N36axJ82v1jR041wwqDrDXEwRA=="; + }; + }; + "@babel/eslint-plugin-7.13.16" = { + name = "_at_babel_slash_eslint-plugin"; + packageName = "@babel/eslint-plugin"; + version = "7.13.16"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/eslint-plugin/-/eslint-plugin-7.13.16.tgz"; + sha512 = "RNL0dLHBvjXW857JwzToTHxtbOZfGcvdSegcgXC1c1PqfE+o/QN8MugkgKj2vXFxCcMByfxJrmpCbLzVBVlgIA=="; + }; + }; + "@babel/generator-7.14.1" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.1.tgz"; + sha512 = "TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ=="; + }; + }; + "@babel/helper-annotate-as-pure-7.12.13" = { + name = "_at_babel_slash_helper-annotate-as-pure"; + packageName = "@babel/helper-annotate-as-pure"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz"; + sha512 = "7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw=="; + }; + }; + "@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" = { + name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; + packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz"; + sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA=="; + }; + }; + "@babel/helper-compilation-targets-7.13.16" = { + name = "_at_babel_slash_helper-compilation-targets"; + packageName = "@babel/helper-compilation-targets"; + version = "7.13.16"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz"; + sha512 = "3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA=="; + }; + }; + "@babel/helper-create-class-features-plugin-7.14.1" = { + name = "_at_babel_slash_helper-create-class-features-plugin"; + packageName = "@babel/helper-create-class-features-plugin"; + version = "7.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.1.tgz"; + sha512 = "r8rsUahG4ywm0QpGcCrLaUSOuNAISR3IZCg4Fx05Ozq31aCUrQsTLH6KPxy0N5ULoQ4Sn9qjNdGNtbPWAC6hYg=="; + }; + }; + "@babel/helper-create-regexp-features-plugin-7.12.17" = { + name = "_at_babel_slash_helper-create-regexp-features-plugin"; + packageName = "@babel/helper-create-regexp-features-plugin"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz"; + sha512 = "p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg=="; + }; + }; + "@babel/helper-define-polyfill-provider-0.2.0" = { + name = "_at_babel_slash_helper-define-polyfill-provider"; + packageName = "@babel/helper-define-polyfill-provider"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz"; + sha512 = "JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw=="; + }; + }; + "@babel/helper-explode-assignable-expression-7.13.0" = { + name = "_at_babel_slash_helper-explode-assignable-expression"; + packageName = "@babel/helper-explode-assignable-expression"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz"; + sha512 = "qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA=="; + }; + }; + "@babel/helper-function-name-7.12.13" = { + name = "_at_babel_slash_helper-function-name"; + packageName = "@babel/helper-function-name"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; + sha512 = "TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA=="; + }; + }; + "@babel/helper-get-function-arity-7.12.13" = { + name = "_at_babel_slash_helper-get-function-arity"; + packageName = "@babel/helper-get-function-arity"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; + sha512 = "DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg=="; + }; + }; + "@babel/helper-hoist-variables-7.13.16" = { + name = "_at_babel_slash_helper-hoist-variables"; + packageName = "@babel/helper-hoist-variables"; + version = "7.13.16"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz"; + sha512 = "1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg=="; + }; + }; + "@babel/helper-member-expression-to-functions-7.13.12" = { + name = "_at_babel_slash_helper-member-expression-to-functions"; + packageName = "@babel/helper-member-expression-to-functions"; + version = "7.13.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz"; + sha512 = "48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw=="; + }; + }; + "@babel/helper-module-imports-7.13.12" = { + name = "_at_babel_slash_helper-module-imports"; + packageName = "@babel/helper-module-imports"; + version = "7.13.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; + sha512 = "4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA=="; + }; + }; + "@babel/helper-module-transforms-7.14.0" = { + name = "_at_babel_slash_helper-module-transforms"; + packageName = "@babel/helper-module-transforms"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz"; + sha512 = "L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw=="; + }; + }; + "@babel/helper-optimise-call-expression-7.12.13" = { + name = "_at_babel_slash_helper-optimise-call-expression"; + packageName = "@babel/helper-optimise-call-expression"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; + sha512 = "BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA=="; + }; + }; + "@babel/helper-plugin-utils-7.13.0" = { + name = "_at_babel_slash_helper-plugin-utils"; + packageName = "@babel/helper-plugin-utils"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; + sha512 = "ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ=="; + }; + }; + "@babel/helper-remap-async-to-generator-7.13.0" = { + name = "_at_babel_slash_helper-remap-async-to-generator"; + packageName = "@babel/helper-remap-async-to-generator"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz"; + sha512 = "pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg=="; + }; + }; + "@babel/helper-replace-supers-7.13.12" = { + name = "_at_babel_slash_helper-replace-supers"; + packageName = "@babel/helper-replace-supers"; + version = "7.13.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz"; + sha512 = "Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw=="; + }; + }; + "@babel/helper-simple-access-7.13.12" = { + name = "_at_babel_slash_helper-simple-access"; + packageName = "@babel/helper-simple-access"; + version = "7.13.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; + sha512 = "7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA=="; + }; + }; + "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = { + name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; + packageName = "@babel/helper-skip-transparent-expression-wrappers"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; + sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA=="; + }; + }; + "@babel/helper-split-export-declaration-7.12.13" = { + name = "_at_babel_slash_helper-split-export-declaration"; + packageName = "@babel/helper-split-export-declaration"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; + sha512 = "tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg=="; + }; + }; + "@babel/helper-validator-identifier-7.14.0" = { + name = "_at_babel_slash_helper-validator-identifier"; + packageName = "@babel/helper-validator-identifier"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; + sha512 = "V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A=="; + }; + }; + "@babel/helper-validator-option-7.12.17" = { + name = "_at_babel_slash_helper-validator-option"; + packageName = "@babel/helper-validator-option"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; + sha512 = "TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw=="; + }; + }; + "@babel/helper-wrap-function-7.13.0" = { + name = "_at_babel_slash_helper-wrap-function"; + packageName = "@babel/helper-wrap-function"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz"; + sha512 = "1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA=="; + }; + }; + "@babel/helpers-7.14.0" = { + name = "_at_babel_slash_helpers"; + packageName = "@babel/helpers"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz"; + sha512 = "+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg=="; + }; + }; + "@babel/highlight-7.14.0" = { + name = "_at_babel_slash_highlight"; + packageName = "@babel/highlight"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz"; + sha512 = "YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg=="; + }; + }; + "@babel/parser-7.14.1" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.1.tgz"; + sha512 = "muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q=="; + }; + }; + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" = { + name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; + packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; + version = "7.13.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz"; + sha512 = "d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ=="; + }; + }; + "@babel/plugin-proposal-async-generator-functions-7.13.15" = { + name = "_at_babel_slash_plugin-proposal-async-generator-functions"; + packageName = "@babel/plugin-proposal-async-generator-functions"; + version = "7.13.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz"; + sha512 = "VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA=="; + }; + }; + "@babel/plugin-proposal-class-properties-7.13.0" = { + name = "_at_babel_slash_plugin-proposal-class-properties"; + packageName = "@babel/plugin-proposal-class-properties"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz"; + sha512 = "KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg=="; + }; + }; + "@babel/plugin-proposal-class-static-block-7.13.11" = { + name = "_at_babel_slash_plugin-proposal-class-static-block"; + packageName = "@babel/plugin-proposal-class-static-block"; + version = "7.13.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.13.11.tgz"; + sha512 = "fJTdFI4bfnMjvxJyNuaf8i9mVcZ0UhetaGEUHaHV9KEnibLugJkZAtXikR8KcYj+NYmI4DZMS8yQAyg+hvfSqg=="; + }; + }; + "@babel/plugin-proposal-dynamic-import-7.13.8" = { + name = "_at_babel_slash_plugin-proposal-dynamic-import"; + packageName = "@babel/plugin-proposal-dynamic-import"; + version = "7.13.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz"; + sha512 = "ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ=="; + }; + }; + "@babel/plugin-proposal-export-namespace-from-7.12.13" = { + name = "_at_babel_slash_plugin-proposal-export-namespace-from"; + packageName = "@babel/plugin-proposal-export-namespace-from"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz"; + sha512 = "INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw=="; + }; + }; + "@babel/plugin-proposal-json-strings-7.13.8" = { + name = "_at_babel_slash_plugin-proposal-json-strings"; + packageName = "@babel/plugin-proposal-json-strings"; + version = "7.13.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz"; + sha512 = "w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q=="; + }; + }; + "@babel/plugin-proposal-logical-assignment-operators-7.13.8" = { + name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; + packageName = "@babel/plugin-proposal-logical-assignment-operators"; + version = "7.13.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz"; + sha512 = "aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A=="; + }; + }; + "@babel/plugin-proposal-nullish-coalescing-operator-7.13.8" = { + name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; + packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; + version = "7.13.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz"; + sha512 = "iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A=="; + }; + }; + "@babel/plugin-proposal-numeric-separator-7.12.13" = { + name = "_at_babel_slash_plugin-proposal-numeric-separator"; + packageName = "@babel/plugin-proposal-numeric-separator"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz"; + sha512 = "O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w=="; + }; + }; + "@babel/plugin-proposal-object-rest-spread-7.13.8" = { + name = "_at_babel_slash_plugin-proposal-object-rest-spread"; + packageName = "@babel/plugin-proposal-object-rest-spread"; + version = "7.13.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz"; + sha512 = "DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g=="; + }; + }; + "@babel/plugin-proposal-optional-catch-binding-7.13.8" = { + name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; + packageName = "@babel/plugin-proposal-optional-catch-binding"; + version = "7.13.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz"; + sha512 = "0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA=="; + }; + }; + "@babel/plugin-proposal-optional-chaining-7.13.12" = { + name = "_at_babel_slash_plugin-proposal-optional-chaining"; + packageName = "@babel/plugin-proposal-optional-chaining"; + version = "7.13.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz"; + sha512 = "fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ=="; + }; + }; + "@babel/plugin-proposal-private-methods-7.13.0" = { + name = "_at_babel_slash_plugin-proposal-private-methods"; + packageName = "@babel/plugin-proposal-private-methods"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz"; + sha512 = "MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q=="; + }; + }; + "@babel/plugin-proposal-private-property-in-object-7.14.0" = { + name = "_at_babel_slash_plugin-proposal-private-property-in-object"; + packageName = "@babel/plugin-proposal-private-property-in-object"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz"; + sha512 = "59ANdmEwwRUkLjB7CRtwJxxwtjESw+X2IePItA+RGQh+oy5RmpCh/EvVVvh5XQc3yxsm5gtv0+i9oBZhaDNVTg=="; + }; + }; + "@babel/plugin-proposal-unicode-property-regex-7.12.13" = { + name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; + packageName = "@babel/plugin-proposal-unicode-property-regex"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz"; + sha512 = "XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg=="; + }; + }; + "@babel/plugin-syntax-async-generators-7.8.4" = { + name = "_at_babel_slash_plugin-syntax-async-generators"; + packageName = "@babel/plugin-syntax-async-generators"; + version = "7.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; + sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; + }; + }; + "@babel/plugin-syntax-class-properties-7.12.13" = { + name = "_at_babel_slash_plugin-syntax-class-properties"; + packageName = "@babel/plugin-syntax-class-properties"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; + sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; + }; + }; + "@babel/plugin-syntax-class-static-block-7.12.13" = { + name = "_at_babel_slash_plugin-syntax-class-static-block"; + packageName = "@babel/plugin-syntax-class-static-block"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz"; + sha512 = "ZmKQ0ZXR0nYpHZIIuj9zE7oIqCx2hw9TKi+lIo73NNrMPAZGHfS92/VRV0ZmPj6H2ffBgyFHXvJ5NYsNeEaP2A=="; + }; + }; + "@babel/plugin-syntax-dynamic-import-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-dynamic-import"; + packageName = "@babel/plugin-syntax-dynamic-import"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; + 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"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; + 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"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; + sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; + }; + }; + "@babel/plugin-syntax-numeric-separator-7.10.4" = { + name = "_at_babel_slash_plugin-syntax-numeric-separator"; + packageName = "@babel/plugin-syntax-numeric-separator"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; + sha512 = "9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug=="; + }; + }; + "@babel/plugin-syntax-object-rest-spread-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-object-rest-spread"; + packageName = "@babel/plugin-syntax-object-rest-spread"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; + sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="; + }; + }; + "@babel/plugin-syntax-optional-catch-binding-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-optional-catch-binding"; + packageName = "@babel/plugin-syntax-optional-catch-binding"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; + sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="; + }; + }; + "@babel/plugin-syntax-optional-chaining-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-optional-chaining"; + packageName = "@babel/plugin-syntax-optional-chaining"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; + sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; + }; + }; + "@babel/plugin-syntax-private-property-in-object-7.14.0" = { + name = "_at_babel_slash_plugin-syntax-private-property-in-object"; + packageName = "@babel/plugin-syntax-private-property-in-object"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz"; + sha512 = "bda3xF8wGl5/5btF794utNOL0Jw+9jE5C1sLZcoK7c4uonE/y3iQiyG+KbkF3WBV/paX58VCpjhxLPkdj5Fe4w=="; + }; + }; + "@babel/plugin-syntax-top-level-await-7.12.13" = { + name = "_at_babel_slash_plugin-syntax-top-level-await"; + packageName = "@babel/plugin-syntax-top-level-await"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; + sha512 = "A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ=="; + }; + }; + "@babel/plugin-transform-arrow-functions-7.13.0" = { + name = "_at_babel_slash_plugin-transform-arrow-functions"; + packageName = "@babel/plugin-transform-arrow-functions"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz"; + sha512 = "96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg=="; + }; + }; + "@babel/plugin-transform-async-to-generator-7.13.0" = { + name = "_at_babel_slash_plugin-transform-async-to-generator"; + packageName = "@babel/plugin-transform-async-to-generator"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz"; + sha512 = "3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg=="; + }; + }; + "@babel/plugin-transform-block-scoped-functions-7.12.13" = { + name = "_at_babel_slash_plugin-transform-block-scoped-functions"; + packageName = "@babel/plugin-transform-block-scoped-functions"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz"; + sha512 = "zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg=="; + }; + }; + "@babel/plugin-transform-block-scoping-7.14.1" = { + name = "_at_babel_slash_plugin-transform-block-scoping"; + packageName = "@babel/plugin-transform-block-scoping"; + version = "7.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.1.tgz"; + sha512 = "2mQXd0zBrwfp0O1moWIhPpEeTKDvxyHcnma3JATVP1l+CctWBuot6OJG8LQ4DnBj4ZZPSmlb/fm4mu47EOAnVA=="; + }; + }; + "@babel/plugin-transform-classes-7.13.0" = { + name = "_at_babel_slash_plugin-transform-classes"; + packageName = "@babel/plugin-transform-classes"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz"; + sha512 = "9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g=="; + }; + }; + "@babel/plugin-transform-computed-properties-7.13.0" = { + name = "_at_babel_slash_plugin-transform-computed-properties"; + packageName = "@babel/plugin-transform-computed-properties"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz"; + sha512 = "RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg=="; + }; + }; + "@babel/plugin-transform-destructuring-7.13.17" = { + name = "_at_babel_slash_plugin-transform-destructuring"; + packageName = "@babel/plugin-transform-destructuring"; + version = "7.13.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz"; + sha512 = "UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA=="; + }; + }; + "@babel/plugin-transform-dotall-regex-7.12.13" = { + name = "_at_babel_slash_plugin-transform-dotall-regex"; + packageName = "@babel/plugin-transform-dotall-regex"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz"; + sha512 = "foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ=="; + }; + }; + "@babel/plugin-transform-duplicate-keys-7.12.13" = { + name = "_at_babel_slash_plugin-transform-duplicate-keys"; + packageName = "@babel/plugin-transform-duplicate-keys"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz"; + sha512 = "NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ=="; + }; + }; + "@babel/plugin-transform-exponentiation-operator-7.12.13" = { + name = "_at_babel_slash_plugin-transform-exponentiation-operator"; + packageName = "@babel/plugin-transform-exponentiation-operator"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz"; + sha512 = "fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA=="; + }; + }; + "@babel/plugin-transform-for-of-7.13.0" = { + name = "_at_babel_slash_plugin-transform-for-of"; + packageName = "@babel/plugin-transform-for-of"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz"; + sha512 = "IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg=="; + }; + }; + "@babel/plugin-transform-function-name-7.12.13" = { + name = "_at_babel_slash_plugin-transform-function-name"; + packageName = "@babel/plugin-transform-function-name"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz"; + sha512 = "6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ=="; + }; + }; + "@babel/plugin-transform-literals-7.12.13" = { + name = "_at_babel_slash_plugin-transform-literals"; + packageName = "@babel/plugin-transform-literals"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz"; + sha512 = "FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ=="; + }; + }; + "@babel/plugin-transform-member-expression-literals-7.12.13" = { + name = "_at_babel_slash_plugin-transform-member-expression-literals"; + packageName = "@babel/plugin-transform-member-expression-literals"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz"; + sha512 = "kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg=="; + }; + }; + "@babel/plugin-transform-modules-amd-7.14.0" = { + name = "_at_babel_slash_plugin-transform-modules-amd"; + packageName = "@babel/plugin-transform-modules-amd"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.0.tgz"; + sha512 = "CF4c5LX4LQ03LebQxJ5JZes2OYjzBuk1TdiF7cG7d5dK4lAdw9NZmaxq5K/mouUdNeqwz3TNjnW6v01UqUNgpQ=="; + }; + }; + "@babel/plugin-transform-modules-commonjs-7.14.0" = { + name = "_at_babel_slash_plugin-transform-modules-commonjs"; + packageName = "@babel/plugin-transform-modules-commonjs"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz"; + sha512 = "EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ=="; + }; + }; + "@babel/plugin-transform-modules-systemjs-7.13.8" = { + name = "_at_babel_slash_plugin-transform-modules-systemjs"; + packageName = "@babel/plugin-transform-modules-systemjs"; + version = "7.13.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz"; + sha512 = "hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A=="; + }; + }; + "@babel/plugin-transform-modules-umd-7.14.0" = { + name = "_at_babel_slash_plugin-transform-modules-umd"; + packageName = "@babel/plugin-transform-modules-umd"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz"; + sha512 = "nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw=="; + }; + }; + "@babel/plugin-transform-named-capturing-groups-regex-7.12.13" = { + name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; + packageName = "@babel/plugin-transform-named-capturing-groups-regex"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz"; + sha512 = "Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA=="; + }; + }; + "@babel/plugin-transform-new-target-7.12.13" = { + name = "_at_babel_slash_plugin-transform-new-target"; + packageName = "@babel/plugin-transform-new-target"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz"; + sha512 = "/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ=="; + }; + }; + "@babel/plugin-transform-object-super-7.12.13" = { + name = "_at_babel_slash_plugin-transform-object-super"; + packageName = "@babel/plugin-transform-object-super"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz"; + sha512 = "JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ=="; + }; + }; + "@babel/plugin-transform-parameters-7.13.0" = { + name = "_at_babel_slash_plugin-transform-parameters"; + packageName = "@babel/plugin-transform-parameters"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz"; + sha512 = "Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw=="; + }; + }; + "@babel/plugin-transform-property-literals-7.12.13" = { + name = "_at_babel_slash_plugin-transform-property-literals"; + packageName = "@babel/plugin-transform-property-literals"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz"; + sha512 = "nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A=="; + }; + }; + "@babel/plugin-transform-regenerator-7.13.15" = { + name = "_at_babel_slash_plugin-transform-regenerator"; + packageName = "@babel/plugin-transform-regenerator"; + version = "7.13.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz"; + sha512 = "Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ=="; + }; + }; + "@babel/plugin-transform-reserved-words-7.12.13" = { + name = "_at_babel_slash_plugin-transform-reserved-words"; + packageName = "@babel/plugin-transform-reserved-words"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz"; + sha512 = "xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg=="; + }; + }; + "@babel/plugin-transform-shorthand-properties-7.12.13" = { + name = "_at_babel_slash_plugin-transform-shorthand-properties"; + packageName = "@babel/plugin-transform-shorthand-properties"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz"; + sha512 = "xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw=="; + }; + }; + "@babel/plugin-transform-spread-7.13.0" = { + name = "_at_babel_slash_plugin-transform-spread"; + packageName = "@babel/plugin-transform-spread"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz"; + sha512 = "V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg=="; + }; + }; + "@babel/plugin-transform-sticky-regex-7.12.13" = { + name = "_at_babel_slash_plugin-transform-sticky-regex"; + packageName = "@babel/plugin-transform-sticky-regex"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz"; + sha512 = "Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg=="; + }; + }; + "@babel/plugin-transform-template-literals-7.13.0" = { + name = "_at_babel_slash_plugin-transform-template-literals"; + packageName = "@babel/plugin-transform-template-literals"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz"; + sha512 = "d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw=="; + }; + }; + "@babel/plugin-transform-typeof-symbol-7.12.13" = { + name = "_at_babel_slash_plugin-transform-typeof-symbol"; + packageName = "@babel/plugin-transform-typeof-symbol"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz"; + sha512 = "eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ=="; + }; + }; + "@babel/plugin-transform-unicode-escapes-7.12.13" = { + name = "_at_babel_slash_plugin-transform-unicode-escapes"; + packageName = "@babel/plugin-transform-unicode-escapes"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz"; + sha512 = "0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw=="; + }; + }; + "@babel/plugin-transform-unicode-regex-7.12.13" = { + name = "_at_babel_slash_plugin-transform-unicode-regex"; + packageName = "@babel/plugin-transform-unicode-regex"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz"; + sha512 = "mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA=="; + }; + }; + "@babel/preset-env-7.14.1" = { + name = "_at_babel_slash_preset-env"; + packageName = "@babel/preset-env"; + version = "7.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.1.tgz"; + sha512 = "0M4yL1l7V4l+j/UHvxcdvNfLB9pPtIooHTbEhgD/6UGyh8Hy3Bm1Mj0buzjDXATCSz3JFibVdnoJZCrlUCanrQ=="; + }; + }; + "@babel/preset-modules-0.1.4" = { + name = "_at_babel_slash_preset-modules"; + packageName = "@babel/preset-modules"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; + sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; + }; + }; + "@babel/runtime-7.14.0" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz"; + sha512 = "JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA=="; + }; + }; + "@babel/template-7.12.13" = { + name = "_at_babel_slash_template"; + packageName = "@babel/template"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz"; + sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA=="; + }; + }; + "@babel/traverse-7.14.0" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz"; + sha512 = "dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA=="; + }; + }; + "@babel/types-7.14.1" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz"; + sha512 = "S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA=="; + }; + }; + "@csstools/convert-colors-1.4.0" = { + name = "_at_csstools_slash_convert-colors"; + packageName = "@csstools/convert-colors"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz"; + sha512 = "5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw=="; + }; + }; + "@discoveryjs/json-ext-0.5.2" = { + name = "_at_discoveryjs_slash_json-ext"; + packageName = "@discoveryjs/json-ext"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz"; + sha512 = "HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg=="; + }; + }; + "@eslint/eslintrc-0.4.0" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; + sha512 = "2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog=="; + }; + }; + "@hapi/address-2.1.4" = { + name = "_at_hapi_slash_address"; + packageName = "@hapi/address"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz"; + sha512 = "QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="; + }; + }; + "@hapi/bourne-1.3.2" = { + name = "_at_hapi_slash_bourne"; + packageName = "@hapi/bourne"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz"; + sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="; + }; + }; + "@hapi/hoek-8.5.1" = { + name = "_at_hapi_slash_hoek"; + packageName = "@hapi/hoek"; + version = "8.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz"; + sha512 = "yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="; + }; + }; + "@hapi/joi-15.1.1" = { + name = "_at_hapi_slash_joi"; + packageName = "@hapi/joi"; + version = "15.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz"; + sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ=="; + }; + }; + "@hapi/topo-3.1.6" = { + name = "_at_hapi_slash_topo"; + packageName = "@hapi/topo"; + version = "3.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz"; + sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; + }; + }; + "@mdn/browser-compat-data-2.0.7" = { + name = "_at_mdn_slash_browser-compat-data"; + packageName = "@mdn/browser-compat-data"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-2.0.7.tgz"; + sha512 = "GeeM827DlzFFidn1eKkMBiqXFD2oLsnZbaiGhByPl0vcapsRzUL+t9hDoov1swc9rB2jw64R+ihtzC8qOE9wXw=="; + }; + }; + "@mrmlnc/readdir-enhanced-2.2.1" = { + name = "_at_mrmlnc_slash_readdir-enhanced"; + packageName = "@mrmlnc/readdir-enhanced"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz"; + sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; + }; + }; + "@nodelib/fs.scandir-2.1.4" = { + name = "_at_nodelib_slash_fs.scandir"; + packageName = "@nodelib/fs.scandir"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; + sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; + }; + }; + "@nodelib/fs.stat-1.1.3" = { + name = "_at_nodelib_slash_fs.stat"; + packageName = "@nodelib/fs.stat"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz"; + sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; + }; + }; + "@nodelib/fs.stat-2.0.4" = { + name = "_at_nodelib_slash_fs.stat"; + packageName = "@nodelib/fs.stat"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; + sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; + }; + }; + "@nodelib/fs.walk-1.2.6" = { + name = "_at_nodelib_slash_fs.walk"; + packageName = "@nodelib/fs.walk"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; + sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; + }; + }; + "@npmcli/move-file-1.1.2" = { + name = "_at_npmcli_slash_move-file"; + packageName = "@npmcli/move-file"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz"; + sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; + }; + }; + "@rollup/plugin-node-resolve-7.1.3" = { + name = "_at_rollup_slash_plugin-node-resolve"; + packageName = "@rollup/plugin-node-resolve"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz"; + sha512 = "RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q=="; + }; + }; + "@rollup/plugin-replace-2.4.2" = { + name = "_at_rollup_slash_plugin-replace"; + packageName = "@rollup/plugin-replace"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz"; + sha512 = "IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg=="; + }; + }; + "@rollup/pluginutils-3.1.0" = { + name = "_at_rollup_slash_pluginutils"; + packageName = "@rollup/pluginutils"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz"; + sha512 = "GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg=="; + }; + }; + "@stylelint/postcss-css-in-js-0.37.2" = { + name = "_at_stylelint_slash_postcss-css-in-js"; + packageName = "@stylelint/postcss-css-in-js"; + version = "0.37.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz"; + sha512 = "nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA=="; + }; + }; + "@stylelint/postcss-markdown-0.36.2" = { + name = "_at_stylelint_slash_postcss-markdown"; + packageName = "@stylelint/postcss-markdown"; + version = "0.36.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz"; + sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ=="; + }; + }; + "@surma/rollup-plugin-off-main-thread-1.4.2" = { + name = "_at_surma_slash_rollup-plugin-off-main-thread"; + packageName = "@surma/rollup-plugin-off-main-thread"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-1.4.2.tgz"; + sha512 = "yBMPqmd1yEJo/280PAMkychuaALyQ9Lkb5q1ck3mjJrFuEobIfhnQ4J3mbvBoISmR3SWMWV+cGB/I0lCQee79A=="; + }; + }; + "@types/anymatch-1.3.1" = { + name = "_at_types_slash_anymatch"; + packageName = "@types/anymatch"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz"; + sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="; + }; + }; + "@types/eslint-7.2.10" = { + name = "_at_types_slash_eslint"; + packageName = "@types/eslint"; + version = "7.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz"; + sha512 = "kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ=="; + }; + }; + "@types/eslint-scope-3.7.0" = { + name = "_at_types_slash_eslint-scope"; + packageName = "@types/eslint-scope"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz"; + sha512 = "O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw=="; + }; + }; + "@types/estree-0.0.39" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "0.0.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz"; + sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; + }; + }; + "@types/estree-0.0.47" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "0.0.47"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz"; + sha512 = "c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg=="; + }; + }; + "@types/glob-7.1.3" = { + name = "_at_types_slash_glob"; + packageName = "@types/glob"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz"; + sha512 = "SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w=="; + }; + }; + "@types/html-minifier-terser-5.1.1" = { + name = "_at_types_slash_html-minifier-terser"; + packageName = "@types/html-minifier-terser"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; + sha512 = "giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA=="; + }; + }; + "@types/json-schema-7.0.7" = { + name = "_at_types_slash_json-schema"; + packageName = "@types/json-schema"; + version = "7.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz"; + sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA=="; + }; + }; + "@types/json5-0.0.29" = { + name = "_at_types_slash_json5"; + packageName = "@types/json5"; + version = "0.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"; + sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; + }; + }; + "@types/localforage-0.0.34" = { + name = "_at_types_slash_localforage"; + packageName = "@types/localforage"; + version = "0.0.34"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/localforage/-/localforage-0.0.34.tgz"; + sha1 = "5e31c32dd8791ec4b9ff3ef47c9cb55b2d0d9438"; + }; + }; + "@types/mdast-3.0.3" = { + name = "_at_types_slash_mdast"; + packageName = "@types/mdast"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz"; + sha512 = "SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw=="; + }; + }; + "@types/minimatch-3.0.4" = { + name = "_at_types_slash_minimatch"; + packageName = "@types/minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA=="; + }; + }; + "@types/minimist-1.2.1" = { + name = "_at_types_slash_minimist"; + packageName = "@types/minimist"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz"; + sha512 = "fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg=="; + }; + }; + "@types/node-15.0.2" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "15.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz"; + sha512 = "p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA=="; + }; + }; + "@types/normalize-package-data-2.4.0" = { + name = "_at_types_slash_normalize-package-data"; + packageName = "@types/normalize-package-data"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="; + }; + }; + "@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" = { + name = "_at_types_slash_q"; + packageName = "@types/q"; + version = "1.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz"; + sha512 = "1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="; + }; + }; + "@types/resolve-0.0.8" = { + name = "_at_types_slash_resolve"; + packageName = "@types/resolve"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz"; + sha512 = "auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ=="; + }; + }; + "@types/source-list-map-0.1.2" = { + name = "_at_types_slash_source-list-map"; + packageName = "@types/source-list-map"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz"; + sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; + }; + }; + "@types/tapable-1.0.7" = { + name = "_at_types_slash_tapable"; + packageName = "@types/tapable"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.7.tgz"; + sha512 = "0VBprVqfgFD7Ehb2vd8Lh9TG3jP98gvr8rgehQqzztZNI7o8zS8Ad4jyZneKELphpuE212D8J70LnSNQSyO6bQ=="; + }; + }; + "@types/uglify-js-3.13.0" = { + name = "_at_types_slash_uglify-js"; + packageName = "@types/uglify-js"; + version = "3.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.0.tgz"; + sha512 = "EGkrJD5Uy+Pg0NUR8uA4bJ5WMfljyad0G+784vLCNUkD+QwOJXUbBYExXfVGf7YtyzdQp3L/XMYcliB987kL5Q=="; + }; + }; + "@types/unist-2.0.3" = { + name = "_at_types_slash_unist"; + packageName = "@types/unist"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz"; + sha512 = "FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ=="; + }; + }; + "@types/vfile-3.0.2" = { + name = "_at_types_slash_vfile"; + packageName = "@types/vfile"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/vfile/-/vfile-3.0.2.tgz"; + sha512 = "b3nLFGaGkJ9rzOcuXRfHkZMdjsawuDD0ENL9fzTophtBg8FJHSGbH7daXkEpcwy3v7Xol3pAvsmlYyFhR4pqJw=="; + }; + }; + "@types/vfile-message-2.0.0" = { + name = "_at_types_slash_vfile-message"; + packageName = "@types/vfile-message"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/vfile-message/-/vfile-message-2.0.0.tgz"; + sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; + }; + }; + "@types/webpack-4.41.28" = { + name = "_at_types_slash_webpack"; + packageName = "@types/webpack"; + version = "4.41.28"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.28.tgz"; + sha512 = "Nn84RAiJjKRfPFFCVR8LC4ueTtTdfWAMZ03THIzZWRJB+rX24BD3LqPSFnbMscWauEsT4segAsylPDIaZyZyLQ=="; + }; + }; + "@types/webpack-sources-2.1.0" = { + name = "_at_types_slash_webpack-sources"; + packageName = "@types/webpack-sources"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.0.tgz"; + sha512 = "LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg=="; + }; + }; + "@uupaa/dynamic-import-polyfill-1.0.2" = { + name = "_at_uupaa_slash_dynamic-import-polyfill"; + packageName = "@uupaa/dynamic-import-polyfill"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@uupaa/dynamic-import-polyfill/-/dynamic-import-polyfill-1.0.2.tgz"; + sha512 = "V3vzdXunOKKob1F+2ldv/4iGQoQA/iyqtW8PVlr1v16xCCKL831pGUubT+vs5/9wxTE/zBKEhjIjmmpK6nqw2A=="; + }; + }; + "@webassemblyjs/ast-1.11.0" = { + name = "_at_webassemblyjs_slash_ast"; + packageName = "@webassemblyjs/ast"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz"; + sha512 = "kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg=="; + }; + }; + "@webassemblyjs/floating-point-hex-parser-1.11.0" = { + name = "_at_webassemblyjs_slash_floating-point-hex-parser"; + packageName = "@webassemblyjs/floating-point-hex-parser"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz"; + sha512 = "Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA=="; + }; + }; + "@webassemblyjs/helper-api-error-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-api-error"; + packageName = "@webassemblyjs/helper-api-error"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz"; + sha512 = "baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w=="; + }; + }; + "@webassemblyjs/helper-buffer-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-buffer"; + packageName = "@webassemblyjs/helper-buffer"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz"; + sha512 = "u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA=="; + }; + }; + "@webassemblyjs/helper-numbers-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-numbers"; + packageName = "@webassemblyjs/helper-numbers"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz"; + sha512 = "DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ=="; + }; + }; + "@webassemblyjs/helper-wasm-bytecode-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; + packageName = "@webassemblyjs/helper-wasm-bytecode"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz"; + sha512 = "MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA=="; + }; + }; + "@webassemblyjs/helper-wasm-section-1.11.0" = { + name = "_at_webassemblyjs_slash_helper-wasm-section"; + packageName = "@webassemblyjs/helper-wasm-section"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz"; + sha512 = "3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew=="; + }; + }; + "@webassemblyjs/ieee754-1.11.0" = { + name = "_at_webassemblyjs_slash_ieee754"; + packageName = "@webassemblyjs/ieee754"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz"; + sha512 = "KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA=="; + }; + }; + "@webassemblyjs/leb128-1.11.0" = { + name = "_at_webassemblyjs_slash_leb128"; + packageName = "@webassemblyjs/leb128"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz"; + sha512 = "aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g=="; + }; + }; + "@webassemblyjs/utf8-1.11.0" = { + name = "_at_webassemblyjs_slash_utf8"; + packageName = "@webassemblyjs/utf8"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz"; + sha512 = "A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw=="; + }; + }; + "@webassemblyjs/wasm-edit-1.11.0" = { + name = "_at_webassemblyjs_slash_wasm-edit"; + packageName = "@webassemblyjs/wasm-edit"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz"; + sha512 = "JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ=="; + }; + }; + "@webassemblyjs/wasm-gen-1.11.0" = { + name = "_at_webassemblyjs_slash_wasm-gen"; + packageName = "@webassemblyjs/wasm-gen"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz"; + sha512 = "BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ=="; + }; + }; + "@webassemblyjs/wasm-opt-1.11.0" = { + name = "_at_webassemblyjs_slash_wasm-opt"; + packageName = "@webassemblyjs/wasm-opt"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz"; + sha512 = "tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg=="; + }; + }; + "@webassemblyjs/wasm-parser-1.11.0" = { + name = "_at_webassemblyjs_slash_wasm-parser"; + packageName = "@webassemblyjs/wasm-parser"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz"; + sha512 = "6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw=="; + }; + }; + "@webassemblyjs/wast-printer-1.11.0" = { + name = "_at_webassemblyjs_slash_wast-printer"; + packageName = "@webassemblyjs/wast-printer"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz"; + sha512 = "Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ=="; + }; + }; + "@webpack-cli/configtest-1.0.2" = { + name = "_at_webpack-cli_slash_configtest"; + packageName = "@webpack-cli/configtest"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.2.tgz"; + sha512 = "3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA=="; + }; + }; + "@webpack-cli/info-1.2.3" = { + name = "_at_webpack-cli_slash_info"; + packageName = "@webpack-cli/info"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.3.tgz"; + sha512 = "lLek3/T7u40lTqzCGpC6CAbY6+vXhdhmwFRxZLMnRm6/sIF/7qMpT8MocXCRQfz0JAh63wpbXLMnsQ5162WS7Q=="; + }; + }; + "@webpack-cli/serve-1.3.1" = { + name = "_at_webpack-cli_slash_serve"; + packageName = "@webpack-cli/serve"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.3.1.tgz"; + sha512 = "0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw=="; + }; + }; + "@xtuc/ieee754-1.2.0" = { + name = "_at_xtuc_slash_ieee754"; + packageName = "@xtuc/ieee754"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; + sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; + }; + }; + "@xtuc/long-4.2.2" = { + name = "_at_xtuc_slash_long"; + packageName = "@xtuc/long"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"; + sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; + }; + }; + "abab-2.0.5" = { + name = "abab"; + packageName = "abab"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz"; + sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="; + }; + }; + "accepts-1.3.7" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + }; + }; + "acorn-7.4.1" = { + name = "acorn"; + packageName = "acorn"; + version = "7.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; + sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; + }; + }; + "acorn-8.2.4" = { + name = "acorn"; + packageName = "acorn"; + version = "8.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz"; + sha512 = "Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg=="; + }; + }; + "acorn-jsx-5.3.1" = { + name = "acorn-jsx"; + packageName = "acorn-jsx"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha512 = "K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng=="; + }; + }; + "aggregate-error-3.1.0" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; + }; + }; + "ajv-6.12.6" = { + name = "ajv"; + packageName = "ajv"; + version = "6.12.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; + }; + }; + "ajv-8.2.0" = { + name = "ajv"; + packageName = "ajv"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz"; + sha512 = "WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA=="; + }; + }; + "ajv-errors-1.0.1" = { + name = "ajv-errors"; + packageName = "ajv-errors"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz"; + sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="; + }; + }; + "ajv-keywords-3.5.2" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "3.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; + }; + }; + "alphanum-sort-1.0.2" = { + name = "alphanum-sort"; + packageName = "alphanum-sort"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz"; + sha1 = "97a1119649b211ad33691d9f9f486a8ec9fbe0a3"; + }; + }; + "ansi-colors-3.2.4" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "3.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz"; + sha512 = "hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA=="; + }; + }; + "ansi-colors-4.1.1" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; + }; + }; + "ansi-html-0.0.7" = { + name = "ansi-html"; + packageName = "ansi-html"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz"; + sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e"; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "ansi-regex-4.1.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; + }; + }; + "ansi-regex-5.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + }; + }; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + }; + "ansi-styles-4.3.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; + }; + }; + "anymatch-2.0.0" = { + name = "anymatch"; + packageName = "anymatch"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"; + sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; + }; + }; + "anymatch-3.1.2" = { + name = "anymatch"; + packageName = "anymatch"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"; + sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; + }; + }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + }; + }; + "arr-diff-4.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + }; + "arr-flatten-1.1.0" = { + name = "arr-flatten"; + packageName = "arr-flatten"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; + }; + }; + "arr-union-3.1.0" = { + name = "arr-union"; + packageName = "arr-union"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + }; + "array-find-index-1.0.2" = { + name = "array-find-index"; + packageName = "array-find-index"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; + sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; + }; + }; + "array-flatten-1.1.1" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + }; + "array-flatten-2.1.2" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"; + sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; + }; + }; + "array-includes-3.1.3" = { + name = "array-includes"; + packageName = "array-includes"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz"; + sha512 = "gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A=="; + }; + }; + "array-union-1.0.2" = { + name = "array-union"; + packageName = "array-union"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"; + sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; + }; + }; + "array-union-2.1.0" = { + name = "array-union"; + packageName = "array-union"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; + sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; + }; + }; + "array-uniq-1.0.3" = { + name = "array-uniq"; + packageName = "array-uniq"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; + sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + }; + }; + "array-unique-0.3.2" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + }; + "array.prototype.flat-1.2.4" = { + name = "array.prototype.flat"; + packageName = "array.prototype.flat"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz"; + sha512 = "4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg=="; + }; + }; + "arrify-1.0.1" = { + name = "arrify"; + packageName = "arrify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; + sha1 = "898508da2226f380df904728456849c1501a4b0d"; + }; + }; + "assign-symbols-1.0.0" = { + name = "assign-symbols"; + packageName = "assign-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + }; + "ast-metadata-inferer-0.4.0" = { + name = "ast-metadata-inferer"; + packageName = "ast-metadata-inferer"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-metadata-inferer/-/ast-metadata-inferer-0.4.0.tgz"; + sha512 = "tKHdBe8N/Vq2nLAm4YPBVREVZjMux6KrqyPfNQgIbDl0t7HaNSmy8w4OyVHYg/cvyn5BW7o7pVwpjPte89Zhcg=="; + }; + }; + "astral-regex-1.0.0" = { + name = "astral-regex"; + packageName = "astral-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"; + sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; + }; + }; + "astral-regex-2.0.0" = { + name = "astral-regex"; + packageName = "astral-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; + }; + }; + "async-2.6.3" = { + name = "async"; + packageName = "async"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz"; + sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; + }; + }; + "async-each-1.0.3" = { + name = "async-each"; + packageName = "async-each"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz"; + sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; + }; + }; + "async-limiter-1.0.1" = { + name = "async-limiter"; + packageName = "async-limiter"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; + sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; + }; + }; + "atob-2.1.2" = { + name = "atob"; + packageName = "atob"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"; + sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; + }; + }; + "autoprefixer-9.8.6" = { + name = "autoprefixer"; + packageName = "autoprefixer"; + version = "9.8.6"; + src = fetchurl { + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz"; + sha512 = "XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg=="; + }; + }; + "babel-extract-comments-1.0.0" = { + name = "babel-extract-comments"; + packageName = "babel-extract-comments"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz"; + sha512 = "qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ=="; + }; + }; + "babel-loader-8.2.2" = { + name = "babel-loader"; + packageName = "babel-loader"; + version = "8.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz"; + sha512 = "JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g=="; + }; + }; + "babel-plugin-dynamic-import-node-2.3.3" = { + name = "babel-plugin-dynamic-import-node"; + packageName = "babel-plugin-dynamic-import-node"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; + }; + }; + "babel-plugin-dynamic-import-polyfill-1.0.0" = { + name = "babel-plugin-dynamic-import-polyfill"; + packageName = "babel-plugin-dynamic-import-polyfill"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-dynamic-import-polyfill/-/babel-plugin-dynamic-import-polyfill-1.0.0.tgz"; + sha512 = "fqdut9hGeaAgdX3sbAY25TkqA7LPmZB+Hf1XI67AppvhUw1cBST58BPwl5kPwDZYIvmqRwnsVKM0lppsQAsxhg=="; + }; + }; + "babel-plugin-polyfill-corejs2-0.2.0" = { + name = "babel-plugin-polyfill-corejs2"; + packageName = "babel-plugin-polyfill-corejs2"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz"; + sha512 = "9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg=="; + }; + }; + "babel-plugin-polyfill-corejs3-0.2.0" = { + name = "babel-plugin-polyfill-corejs3"; + packageName = "babel-plugin-polyfill-corejs3"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz"; + sha512 = "zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg=="; + }; + }; + "babel-plugin-polyfill-regenerator-0.2.0" = { + name = "babel-plugin-polyfill-regenerator"; + packageName = "babel-plugin-polyfill-regenerator"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz"; + sha512 = "J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg=="; + }; + }; + "babel-plugin-syntax-object-rest-spread-6.13.0" = { + name = "babel-plugin-syntax-object-rest-spread"; + packageName = "babel-plugin-syntax-object-rest-spread"; + version = "6.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz"; + sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5"; + }; + }; + "babel-plugin-transform-object-rest-spread-6.26.0" = { + name = "babel-plugin-transform-object-rest-spread"; + packageName = "babel-plugin-transform-object-rest-spread"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz"; + sha1 = "0f36692d50fef6b7e2d4b3ac1478137a963b7b06"; + }; + }; + "babel-runtime-6.26.0" = { + name = "babel-runtime"; + packageName = "babel-runtime"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + }; + }; + "babylon-6.18.0" = { + name = "babylon"; + packageName = "babylon"; + version = "6.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"; + sha512 = "q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="; + }; + }; + "bail-1.0.5" = { + name = "bail"; + packageName = "bail"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz"; + sha512 = "xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ=="; + }; + }; + "balanced-match-1.0.2" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; + }; + }; + "balanced-match-2.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz"; + sha512 = "1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA=="; + }; + }; + "base-0.11.2" = { + name = "base"; + packageName = "base"; + version = "0.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; + sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; + }; + }; + "batch-0.6.1" = { + name = "batch"; + packageName = "batch"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"; + sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; + }; + }; + "big.js-5.2.2" = { + name = "big.js"; + packageName = "big.js"; + version = "5.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"; + sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; + }; + }; + "binary-extensions-1.13.1" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "1.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz"; + sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; + }; + }; + "binary-extensions-2.2.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; + }; + }; + "bindings-1.5.0" = { + name = "bindings"; + packageName = "bindings"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; + }; + }; + "blurhash-1.1.3" = { + name = "blurhash"; + packageName = "blurhash"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/blurhash/-/blurhash-1.1.3.tgz"; + sha512 = "yUhPJvXexbqbyijCIE/T2NCXcj9iNPhWmOKbPTuR/cm7Q5snXYIfnVnz6m7MWOXxODMz/Cr3UcVkRdHiuDVRDw=="; + }; + }; + "body-parser-1.19.0" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; + }; + }; + "bonjour-3.5.0" = { + name = "bonjour"; + packageName = "bonjour"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz"; + sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"; + }; + }; + "boolbase-1.0.0" = { + name = "boolbase"; + packageName = "boolbase"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"; + sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "braces-2.3.2" = { + name = "braces"; + packageName = "braces"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; + sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; + }; + }; + "braces-3.0.2" = { + name = "braces"; + packageName = "braces"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + }; + }; + "browserslist-1.7.7" = { + name = "browserslist"; + packageName = "browserslist"; + version = "1.7.7"; + src = fetchurl { + url = "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz"; + sha1 = "0bd76704258be829b2398bb50e4b62d1a166b0b9"; + }; + }; + "browserslist-4.16.6" = { + name = "browserslist"; + packageName = "browserslist"; + version = "4.16.6"; + src = fetchurl { + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz"; + sha512 = "Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ=="; + }; + }; + "buffer-from-1.1.1" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + }; + }; + "buffer-indexof-1.1.1" = { + name = "buffer-indexof"; + packageName = "buffer-indexof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; + sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; + }; + }; + "builtin-modules-3.2.0" = { + name = "builtin-modules"; + packageName = "builtin-modules"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz"; + sha512 = "lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA=="; + }; + }; + "bytes-3.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + }; + "bytes-3.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; + }; + }; + "cacache-15.0.6" = { + name = "cacache"; + packageName = "cacache"; + version = "15.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-15.0.6.tgz"; + sha512 = "g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w=="; + }; + }; + "cache-base-1.0.1" = { + name = "cache-base"; + packageName = "cache-base"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; + sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; + }; + }; + "call-bind-1.0.2" = { + name = "call-bind"; + packageName = "call-bind"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; + }; + }; + "call-me-maybe-1.0.1" = { + name = "call-me-maybe"; + packageName = "call-me-maybe"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz"; + sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; + }; + }; + "caller-callsite-2.0.0" = { + name = "caller-callsite"; + packageName = "caller-callsite"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz"; + sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; + }; + }; + "caller-path-2.0.0" = { + name = "caller-path"; + packageName = "caller-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz"; + sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; + }; + }; + "callsites-2.0.0" = { + name = "callsites"; + packageName = "callsites"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz"; + 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.2" = { + name = "camel-case"; + packageName = "camel-case"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz"; + sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; + }; + }; + "camelcase-4.1.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + }; + "camelcase-5.3.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; + }; + }; + "camelcase-6.2.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"; + sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; + }; + }; + "camelcase-keys-4.2.0" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz"; + sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; + }; + }; + "camelcase-keys-6.2.2" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "6.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz"; + sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg=="; + }; + }; + "caniuse-api-3.0.0" = { + name = "caniuse-api"; + packageName = "caniuse-api"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz"; + sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; + }; + }; + "caniuse-db-1.0.30001222" = { + name = "caniuse-db"; + packageName = "caniuse-db"; + version = "1.0.30001222"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001222.tgz"; + sha512 = "ZLsTZ9Rqz407NLdjwqDnTq9SahH+eCu+qCXh91M+fK+7CgbNrz510I7RYCiG11SIklDxvvmD9BqvdPOA//y9Rg=="; + }; + }; + "caniuse-lite-1.0.30001222" = { + name = "caniuse-lite"; + packageName = "caniuse-lite"; + version = "1.0.30001222"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001222.tgz"; + sha512 = "rPmwUK0YMjfMlZVmH6nVB5U3YJ5Wnx3vmT5lnRO3nIKO8bJ+TRWMbGuuiSugDJqESy/lz+1hSrlQEagCtoOAWQ=="; + }; + }; + "ccount-1.1.0" = { + name = "ccount"; + packageName = "ccount"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz"; + sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; + }; + }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; + "chalk-2.4.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + }; + "chalk-4.1.1" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz"; + sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; + }; + }; + "character-entities-1.2.4" = { + name = "character-entities"; + packageName = "character-entities"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz"; + sha512 = "iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw=="; + }; + }; + "character-entities-html4-1.1.4" = { + name = "character-entities-html4"; + packageName = "character-entities-html4"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz"; + sha512 = "HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g=="; + }; + }; + "character-entities-legacy-1.1.4" = { + name = "character-entities-legacy"; + packageName = "character-entities-legacy"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz"; + sha512 = "3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA=="; + }; + }; + "character-reference-invalid-1.1.4" = { + name = "character-reference-invalid"; + packageName = "character-reference-invalid"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz"; + sha512 = "mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg=="; + }; + }; + "chokidar-2.1.8" = { + name = "chokidar"; + packageName = "chokidar"; + version = "2.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz"; + sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg=="; + }; + }; + "chokidar-3.5.1" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz"; + sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="; + }; + }; + "chownr-2.0.0" = { + name = "chownr"; + packageName = "chownr"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; + }; + }; + "chrome-trace-event-1.0.3" = { + name = "chrome-trace-event"; + packageName = "chrome-trace-event"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; + sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; + }; + }; + "class-utils-0.3.6" = { + name = "class-utils"; + packageName = "class-utils"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; + sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; + }; + }; + "classlist.js-https://github.com/eligrey/classList.js/archive/1.2.20180112.tar.gz" = { + name = "classlist.js"; + packageName = "classlist.js"; + version = "1.2.20180112"; + src = fetchurl { + name = "classlist.js-1.2.20180112.tar.gz"; + url = "https://codeload.github.com/eligrey/classList.js/tar.gz/1.2.20180112"; + sha256 = "b9a185ff3f7263f0f251af30f187ba19d2d6d141071efdfd4bd717e190599191"; + }; + }; + "clean-css-4.2.3" = { + name = "clean-css"; + packageName = "clean-css"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz"; + sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; + }; + }; + "clean-stack-2.2.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"; + sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; + }; + }; + "clean-webpack-plugin-3.0.0" = { + name = "clean-webpack-plugin"; + packageName = "clean-webpack-plugin"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz"; + sha512 = "MciirUH5r+cYLGCOL5JX/ZLzOZbVr1ot3Fw+KcvbhUb6PM+yycqd9ZhIlcigQ5gl+XhppNmw3bEFuaaMNyLj3A=="; + }; + }; + "cliui-5.0.0" = { + name = "cliui"; + packageName = "cliui"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; + sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; + }; + }; + "clone-deep-4.0.1" = { + name = "clone-deep"; + packageName = "clone-deep"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz"; + sha512 = "neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ=="; + }; + }; + "clone-regexp-1.0.1" = { + name = "clone-regexp"; + packageName = "clone-regexp"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.1.tgz"; + sha512 = "Fcij9IwRW27XedRIJnSOEupS7RVcXtObJXbcUOX93UCLqqOdRpkvzKywOOSizmEK/Is3S/RHX9dLdfo6R1Q1mw=="; + }; + }; + "clone-regexp-2.2.0" = { + name = "clone-regexp"; + packageName = "clone-regexp"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz"; + sha512 = "beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q=="; + }; + }; + "coa-2.0.2" = { + name = "coa"; + packageName = "coa"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz"; + sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA=="; + }; + }; + "collapse-white-space-1.0.6" = { + name = "collapse-white-space"; + packageName = "collapse-white-space"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz"; + sha512 = "jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ=="; + }; + }; + "collection-visit-1.0.0" = { + name = "collection-visit"; + packageName = "collection-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + }; + "color-3.1.3" = { + name = "color"; + packageName = "color"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color/-/color-3.1.3.tgz"; + sha512 = "xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ=="; + }; + }; + "color-convert-1.9.3" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + }; + "color-convert-2.0.1" = { + name = "color-convert"; + packageName = "color-convert"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + }; + "color-name-1.1.4" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + }; + }; + "color-string-1.5.5" = { + name = "color-string"; + packageName = "color-string"; + version = "1.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz"; + sha512 = "jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg=="; + }; + }; + "colorette-1.2.2" = { + name = "colorette"; + packageName = "colorette"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz"; + sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="; + }; + }; + "commander-2.20.3" = { + name = "commander"; + packageName = "commander"; + version = "2.20.3"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; + }; + }; + "commander-4.1.1" = { + name = "commander"; + packageName = "commander"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz"; + sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; + }; + }; + "commander-7.2.0" = { + name = "commander"; + packageName = "commander"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"; + sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; + }; + }; + "common-tags-1.8.0" = { + name = "common-tags"; + packageName = "common-tags"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz"; + sha512 = "6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="; + }; + }; + "commondir-1.0.1" = { + name = "commondir"; + packageName = "commondir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"; + sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; + }; + }; + "component-emitter-1.3.0" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"; + sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; + }; + }; + "compressible-2.0.18" = { + name = "compressible"; + packageName = "compressible"; + version = "2.0.18"; + src = fetchurl { + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"; + sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; + }; + }; + "compression-1.7.4" = { + name = "compression"; + packageName = "compression"; + version = "1.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; + sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "confusing-browser-globals-1.0.10" = { + name = "confusing-browser-globals"; + packageName = "confusing-browser-globals"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz"; + sha512 = "gNld/3lySHwuhaVluJUKLePYirM3QNCKzVxqAdhJII9/WXKVX5PURzMVJspS1jTslSqjeuG4KMVTSouit5YPHA=="; + }; + }; + "connect-history-api-fallback-1.6.0" = { + name = "connect-history-api-fallback"; + packageName = "connect-history-api-fallback"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; + sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; + }; + }; + "contains-path-0.1.0" = { + name = "contains-path"; + packageName = "contains-path"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz"; + sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a"; + }; + }; + "content-disposition-0.5.3" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; + sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; + }; + }; + "content-type-1.0.4" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; + }; + }; + "convert-source-map-1.7.0" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz"; + sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA=="; + }; + }; + "cookie-0.4.0" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; + sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; + }; + }; + "cookie-signature-1.0.6" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + }; + "copy-descriptor-0.1.1" = { + name = "copy-descriptor"; + packageName = "copy-descriptor"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + }; + "copy-webpack-plugin-6.4.1" = { + name = "copy-webpack-plugin"; + packageName = "copy-webpack-plugin"; + version = "6.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.4.1.tgz"; + sha512 = "MXyPCjdPVx5iiWyl40Va3JGh27bKzOTNY3NjUTrosD2q7dR/cLD0013uqJ3BpFbUjyONINjb6qI7nDIJujrMbA=="; + }; + }; + "core-js-2.6.12" = { + name = "core-js"; + packageName = "core-js"; + version = "2.6.12"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"; + sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; + }; + }; + "core-js-3.11.2" = { + name = "core-js"; + packageName = "core-js"; + version = "3.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-3.11.2.tgz"; + sha512 = "3tfrrO1JpJSYGKnd9LKTBPqgUES/UYiCzMKeqwR1+jF16q4kD1BY2NvqkfuzXwQ6+CIWm55V9cjD7PQd+hijdw=="; + }; + }; + "core-js-compat-3.11.2" = { + name = "core-js-compat"; + packageName = "core-js-compat"; + version = "3.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.11.2.tgz"; + sha512 = "gYhNwu7AJjecNtRrIfyoBabQ3ZG+llfPmg9BifIX8yxIpDyfNLRM73zIjINSm6z3dMdI1nwNC9C7uiy4pIC6cw=="; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "cosmiconfig-5.2.1" = { + name = "cosmiconfig"; + packageName = "cosmiconfig"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; + 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=="; + }; + }; + "cross-spawn-6.0.5" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "6.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; + }; + }; + "cross-spawn-7.0.3" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; + }; + }; + "crypto-random-string-1.0.0" = { + name = "crypto-random-string"; + packageName = "crypto-random-string"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; + sha1 = "a230f64f568310e1498009940790ec99545bca7e"; + }; + }; + "css-blank-pseudo-0.1.4" = { + name = "css-blank-pseudo"; + packageName = "css-blank-pseudo"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz"; + sha512 = "LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w=="; + }; + }; + "css-color-names-0.0.4" = { + name = "css-color-names"; + packageName = "css-color-names"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz"; + sha1 = "808adc2e79cf84738069b646cb20ec27beb629e0"; + }; + }; + "css-declaration-sorter-4.0.1" = { + name = "css-declaration-sorter"; + packageName = "css-declaration-sorter"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz"; + sha512 = "BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA=="; + }; + }; + "css-has-pseudo-0.10.0" = { + name = "css-has-pseudo"; + packageName = "css-has-pseudo"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz"; + sha512 = "Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ=="; + }; + }; + "css-loader-5.2.4" = { + name = "css-loader"; + packageName = "css-loader"; + version = "5.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/css-loader/-/css-loader-5.2.4.tgz"; + sha512 = "OFYGyINCKkdQsTrSYxzGSFnGS4gNjcXkKkQgWxK138jgnPt+lepxdjSZNc8sHAl5vP3DhsJUxufWIjOwI8PMMw=="; + }; + }; + "css-prefers-color-scheme-3.1.1" = { + name = "css-prefers-color-scheme"; + packageName = "css-prefers-color-scheme"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz"; + sha512 = "MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg=="; + }; + }; + "css-select-2.1.0" = { + name = "css-select"; + packageName = "css-select"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz"; + sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; + }; + }; + "css-select-base-adapter-0.1.1" = { + name = "css-select-base-adapter"; + packageName = "css-select-base-adapter"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz"; + sha512 = "jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="; + }; + }; + "css-tree-1.0.0-alpha.37" = { + name = "css-tree"; + packageName = "css-tree"; + version = "1.0.0-alpha.37"; + src = fetchurl { + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; + sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; + }; + }; + "css-tree-1.1.3" = { + name = "css-tree"; + packageName = "css-tree"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz"; + sha512 = "tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q=="; + }; + }; + "css-what-3.4.2" = { + name = "css-what"; + packageName = "css-what"; + version = "3.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz"; + sha512 = "ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="; + }; + }; + "cssdb-4.4.0" = { + name = "cssdb"; + packageName = "cssdb"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz"; + sha512 = "LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ=="; + }; + }; + "cssesc-2.0.0" = { + name = "cssesc"; + packageName = "cssesc"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz"; + sha512 = "MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="; + }; + }; + "cssesc-3.0.0" = { + name = "cssesc"; + packageName = "cssesc"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"; + sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; + }; + }; + "cssnano-4.1.11" = { + name = "cssnano"; + packageName = "cssnano"; + version = "4.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz"; + sha512 = "6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g=="; + }; + }; + "cssnano-preset-default-4.0.8" = { + name = "cssnano-preset-default"; + packageName = "cssnano-preset-default"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz"; + sha512 = "LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ=="; + }; + }; + "cssnano-util-get-arguments-4.0.0" = { + name = "cssnano-util-get-arguments"; + packageName = "cssnano-util-get-arguments"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz"; + sha1 = "ed3a08299f21d75741b20f3b81f194ed49cc150f"; + }; + }; + "cssnano-util-get-match-4.0.0" = { + name = "cssnano-util-get-match"; + packageName = "cssnano-util-get-match"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz"; + sha1 = "c0e4ca07f5386bb17ec5e52250b4f5961365156d"; + }; + }; + "cssnano-util-raw-cache-4.0.1" = { + name = "cssnano-util-raw-cache"; + packageName = "cssnano-util-raw-cache"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz"; + sha512 = "qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA=="; + }; + }; + "cssnano-util-same-parent-4.0.1" = { + name = "cssnano-util-same-parent"; + packageName = "cssnano-util-same-parent"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz"; + sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="; + }; + }; + "csso-4.2.0" = { + name = "csso"; + packageName = "csso"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz"; + sha512 = "wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA=="; + }; + }; + "currently-unhandled-0.4.1" = { + name = "currently-unhandled"; + packageName = "currently-unhandled"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; + sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; + }; + }; + "d-1.0.1" = { + name = "d"; + packageName = "d"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz"; + sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; + }; + }; + "date-fns-2.21.1" = { + name = "date-fns"; + packageName = "date-fns"; + version = "2.21.1"; + src = fetchurl { + url = "https://registry.npmjs.org/date-fns/-/date-fns-2.21.1.tgz"; + sha512 = "m1WR0xGiC6j6jNFAyW4Nvh4WxAi4JF4w9jRJwSI8nBmNcyZXPcP9VUQG+6gHQXAmqaGEKDKhOqAtENDC941UkA=="; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + }; + "debug-3.2.7" = { + name = "debug"; + packageName = "debug"; + version = "3.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; + sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; + }; + }; + "debug-4.3.2" = { + name = "debug"; + packageName = "debug"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "decamelize-keys-1.1.0" = { + name = "decamelize-keys"; + packageName = "decamelize-keys"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz"; + sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; + }; + }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + }; + "deep-equal-1.1.1" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz"; + sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; + }; + }; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + }; + "default-gateway-4.2.0" = { + name = "default-gateway"; + packageName = "default-gateway"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz"; + sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; + }; + }; + "define-properties-1.1.3" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + }; + }; + "define-property-0.2.5" = { + name = "define-property"; + packageName = "define-property"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + }; + "define-property-1.0.0" = { + name = "define-property"; + packageName = "define-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + }; + "define-property-2.0.2" = { + name = "define-property"; + packageName = "define-property"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; + sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; + }; + }; + "del-4.1.1" = { + name = "del"; + packageName = "del"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/del/-/del-4.1.1.tgz"; + sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; + }; + }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; + "detect-node-2.0.5" = { + name = "detect-node"; + packageName = "detect-node"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.5.tgz"; + sha512 = "qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw=="; + }; + }; + "dir-glob-2.2.2" = { + name = "dir-glob"; + packageName = "dir-glob"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz"; + sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw=="; + }; + }; + "dir-glob-3.0.1" = { + name = "dir-glob"; + packageName = "dir-glob"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; + sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; + }; + }; + "dns-equal-1.0.0" = { + name = "dns-equal"; + packageName = "dns-equal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"; + sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; + }; + }; + "dns-packet-1.3.1" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; + sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg=="; + }; + }; + "dns-txt-2.0.2" = { + name = "dns-txt"; + packageName = "dns-txt"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz"; + sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; + }; + }; + "doctrine-1.5.0" = { + name = "doctrine"; + packageName = "doctrine"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz"; + sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; + }; + }; + "doctrine-3.0.0" = { + name = "doctrine"; + packageName = "doctrine"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"; + sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; + }; + }; + "dom-converter-0.2.0" = { + name = "dom-converter"; + packageName = "dom-converter"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz"; + sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA=="; + }; + }; + "dom-serializer-0.2.2" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz"; + sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; + }; + }; + "dom-serializer-1.3.1" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.1.tgz"; + sha512 = "Pv2ZluG5ife96udGgEDovOOOA5UELkltfJpnIExPrAk1LTvecolUGn6lIaoLh86d83GiB86CjzciMd9BuRB71Q=="; + }; + }; + "dom7-3.0.0" = { + name = "dom7"; + packageName = "dom7"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dom7/-/dom7-3.0.0.tgz"; + sha512 = "oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g=="; + }; + }; + "domelementtype-1.3.1" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"; + sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; + }; + }; + "domelementtype-2.2.0" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz"; + sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; + }; + }; + "domhandler-2.4.2" = { + name = "domhandler"; + packageName = "domhandler"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz"; + sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; + }; + }; + "domhandler-3.3.0" = { + name = "domhandler"; + packageName = "domhandler"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz"; + sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; + }; + }; + "domhandler-4.2.0" = { + name = "domhandler"; + packageName = "domhandler"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz"; + sha512 = "zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA=="; + }; + }; + "domutils-1.7.0" = { + name = "domutils"; + packageName = "domutils"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"; + sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; + }; + }; + "domutils-2.6.0" = { + name = "domutils"; + packageName = "domutils"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-2.6.0.tgz"; + sha512 = "y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA=="; + }; + }; + "dot-case-3.0.4" = { + name = "dot-case"; + packageName = "dot-case"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz"; + sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; + }; + }; + "dot-prop-5.3.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz"; + sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "ejs-2.7.4" = { + name = "ejs"; + packageName = "ejs"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz"; + sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; + }; + }; + "electron-to-chromium-1.3.726" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.3.726"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.726.tgz"; + sha512 = "dw7WmrSu/JwtACiBzth8cuKf62NKL1xVJuNvyOg0jvruN/n4NLtGYoTzciQquCPNaS2eR+BT5GrxHbslfc/w1w=="; + }; + }; + "emoji-regex-7.0.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; + }; + }; + "emoji-regex-8.0.0" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; + }; + }; + "emojis-list-3.0.0" = { + name = "emojis-list"; + packageName = "emojis-list"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"; + sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; + }; + }; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + }; + "end-of-stream-1.4.4" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; + }; + }; + "enhanced-resolve-5.8.0" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "5.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.0.tgz"; + sha512 = "Sl3KRpJA8OpprrtaIswVki3cWPiPKxXuFxJXBp+zNb6s6VwNWwFRUdtmzd2ReUut8n+sCPx7QCtQ7w5wfJhSgQ=="; + }; + }; + "enquirer-2.3.6" = { + name = "enquirer"; + packageName = "enquirer"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"; + sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; + }; + }; + "entities-1.1.2" = { + name = "entities"; + packageName = "entities"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz"; + sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; + }; + }; + "entities-2.2.0" = { + name = "entities"; + packageName = "entities"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; + sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; + }; + }; + "envinfo-7.8.1" = { + name = "envinfo"; + packageName = "envinfo"; + version = "7.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz"; + sha512 = "/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw=="; + }; + }; + "epubjs-0.3.88" = { + name = "epubjs"; + packageName = "epubjs"; + version = "0.3.88"; + src = fetchurl { + url = "https://registry.npmjs.org/epubjs/-/epubjs-0.3.88.tgz"; + sha512 = "VRumULpUELYmYwzypyfbDwoSIqDp2LXOXCtY3o55o3YDW5Zm32UjtZuX/xaWFGqyZORNNMWWQ8VlMaY1djnDYg=="; + }; + }; + "errno-0.1.8" = { + name = "errno"; + packageName = "errno"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz"; + sha512 = "dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A=="; + }; + }; + "error-ex-1.3.2" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + }; + "es-abstract-1.18.0" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz"; + sha512 = "LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw=="; + }; + }; + "es-module-lexer-0.4.1" = { + name = "es-module-lexer"; + packageName = "es-module-lexer"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.1.tgz"; + sha512 = "ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA=="; + }; + }; + "es-to-primitive-1.2.1" = { + name = "es-to-primitive"; + packageName = "es-to-primitive"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; + }; + }; + "es5-ext-0.10.53" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.10.53"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz"; + sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q=="; + }; + }; + "es6-iterator-2.0.3" = { + name = "es6-iterator"; + packageName = "es6-iterator"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; + sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; + }; + }; + "es6-promise-4.2.8" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "4.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz"; + sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="; + }; + }; + "es6-symbol-3.1.3" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz"; + sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; + }; + }; + "escalade-3.1.1" = { + name = "escalade"; + packageName = "escalade"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "eslint-7.25.0" = { + name = "eslint"; + packageName = "eslint"; + version = "7.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz"; + sha512 = "TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw=="; + }; + }; + "eslint-import-resolver-node-0.3.4" = { + name = "eslint-import-resolver-node"; + packageName = "eslint-import-resolver-node"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; + sha512 = "ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA=="; + }; + }; + "eslint-module-utils-2.6.0" = { + name = "eslint-module-utils"; + packageName = "eslint-module-utils"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; + sha512 = "6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA=="; + }; + }; + "eslint-plugin-compat-3.9.0" = { + name = "eslint-plugin-compat"; + packageName = "eslint-plugin-compat"; + version = "3.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-3.9.0.tgz"; + sha512 = "lt3l5PHFHVEYSZ5zijcoYvtQJPsBifRiH5N0Et57KwVu7l/yxmHhSG6VJiLMa/lXrg93Qu8049RNQOMn0+yJBg=="; + }; + }; + "eslint-plugin-eslint-comments-3.2.0" = { + name = "eslint-plugin-eslint-comments"; + packageName = "eslint-plugin-eslint-comments"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.2.0.tgz"; + sha512 = "0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ=="; + }; + }; + "eslint-plugin-import-2.22.1" = { + name = "eslint-plugin-import"; + packageName = "eslint-plugin-import"; + version = "2.22.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz"; + sha512 = "8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw=="; + }; + }; + "eslint-plugin-promise-4.3.1" = { + name = "eslint-plugin-promise"; + packageName = "eslint-plugin-promise"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.3.1.tgz"; + sha512 = "bY2sGqyptzFBDLh/GMbAxfdJC+b0f23ME63FOE4+Jao0oZ3E1LEwFtWJX/1pGMJLiTtrSSern2CRM/g+dfc0eQ=="; + }; + }; + "eslint-rule-composer-0.3.0" = { + name = "eslint-rule-composer"; + packageName = "eslint-rule-composer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz"; + sha512 = "bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg=="; + }; + }; + "eslint-scope-5.1.1" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; + }; + }; + "eslint-utils-2.1.0" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; + }; + }; + "eslint-visitor-keys-1.3.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; + }; + }; + "eslint-visitor-keys-2.1.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; + }; + }; + "espree-7.3.1" = { + name = "espree"; + packageName = "espree"; + version = "7.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz"; + sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; + }; + }; + "esprima-4.0.1" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; + }; + }; + "esquery-1.4.0" = { + name = "esquery"; + packageName = "esquery"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"; + sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; + }; + }; + "esrecurse-4.3.0" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; + }; + }; + "estraverse-4.3.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; + 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=="; + }; + }; + "estree-walker-0.6.1" = { + name = "estree-walker"; + packageName = "estree-walker"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz"; + sha512 = "SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w=="; + }; + }; + "estree-walker-1.0.1" = { + name = "estree-walker"; + packageName = "estree-walker"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"; + sha512 = "1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="; + }; + }; + "esutils-2.0.3" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; + }; + }; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + }; + "event-emitter-0.3.5" = { + name = "event-emitter"; + packageName = "event-emitter"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; + sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; + }; + }; + "eventemitter3-4.0.7" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "4.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; + }; + }; + "events-3.3.0" = { + name = "events"; + packageName = "events"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/events/-/events-3.3.0.tgz"; + sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; + }; + }; + "eventsource-1.1.0" = { + name = "eventsource"; + packageName = "eventsource"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz"; + sha512 = "VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg=="; + }; + }; + "execa-1.0.0" = { + name = "execa"; + packageName = "execa"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; + }; + }; + "execa-5.0.0" = { + name = "execa"; + packageName = "execa"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz"; + sha512 = "ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ=="; + }; + }; + "execall-1.0.0" = { + name = "execall"; + packageName = "execall"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz"; + sha1 = "73d0904e395b3cab0658b08d09ec25307f29bb73"; + }; + }; + "execall-2.0.0" = { + name = "execall"; + packageName = "execall"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz"; + sha512 = "0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow=="; + }; + }; + "expand-brackets-2.1.4" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + }; + "expose-loader-1.0.3" = { + name = "expose-loader"; + packageName = "expose-loader"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/expose-loader/-/expose-loader-1.0.3.tgz"; + sha512 = "gP6hs3vYeWIqyoVfsApGQcgCEpbcI1xe+celwI31zeDhXz2q03ycBC1+75IlQUGaYvj6rAloFIe/NIBnEElLsQ=="; + }; + }; + "express-4.17.1" = { + name = "express"; + packageName = "express"; + version = "4.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; + sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; + }; + }; + "ext-1.4.0" = { + name = "ext"; + packageName = "ext"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz"; + sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A=="; + }; + }; + "extend-3.0.2" = { + name = "extend"; + packageName = "extend"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; + "extend-shallow-2.0.1" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + }; + "extend-shallow-3.0.2" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + }; + "extglob-2.0.4" = { + name = "extglob"; + packageName = "extglob"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; + sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; + }; + }; + "fast-deep-equal-3.1.3" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; + }; + }; + "fast-glob-2.2.7" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "2.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz"; + sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; + }; + }; + "fast-glob-3.2.5" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; + sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; + }; + }; + "fast-json-stable-stringify-2.1.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; + }; + }; + "fast-levenshtein-2.0.6" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + }; + "fast-text-encoding-1.0.3" = { + name = "fast-text-encoding"; + packageName = "fast-text-encoding"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz"; + sha512 = "dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig=="; + }; + }; + "fastest-levenshtein-1.0.12" = { + name = "fastest-levenshtein"; + packageName = "fastest-levenshtein"; + version = "1.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz"; + sha512 = "On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="; + }; + }; + "fastq-1.11.0" = { + name = "fastq"; + packageName = "fastq"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz"; + sha512 = "7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g=="; + }; + }; + "faye-websocket-0.11.3" = { + name = "faye-websocket"; + packageName = "faye-websocket"; + version = "0.11.3"; + src = fetchurl { + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz"; + sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA=="; + }; + }; + "file-entry-cache-4.0.0" = { + name = "file-entry-cache"; + packageName = "file-entry-cache"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-4.0.0.tgz"; + sha512 = "AVSwsnbV8vH/UVbvgEhf3saVQXORNv0ZzSkvkhQIaia5Tia+JhGTaa/ePUSVoPHQyGayQNmYfkzFi3WZV5zcpA=="; + }; + }; + "file-entry-cache-6.0.1" = { + name = "file-entry-cache"; + packageName = "file-entry-cache"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; + }; + }; + "file-loader-6.2.0" = { + name = "file-loader"; + packageName = "file-loader"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz"; + sha512 = "qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw=="; + }; + }; + "file-uri-to-path-1.0.0" = { + name = "file-uri-to-path"; + packageName = "file-uri-to-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; + }; + }; + "fill-range-4.0.0" = { + name = "fill-range"; + packageName = "fill-range"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + }; + "fill-range-7.0.1" = { + name = "fill-range"; + packageName = "fill-range"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + }; + }; + "finalhandler-1.1.2" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; + }; + }; + "find-cache-dir-3.3.1" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; + sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ=="; + }; + }; + "find-up-2.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + }; + "find-up-3.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; + }; + }; + "find-up-4.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; + }; + }; + "flat-cache-2.0.1" = { + name = "flat-cache"; + packageName = "flat-cache"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz"; + sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="; + }; + }; + "flat-cache-3.0.4" = { + name = "flat-cache"; + packageName = "flat-cache"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"; + sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; + }; + }; + "flatted-2.0.2" = { + name = "flatted"; + packageName = "flatted"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"; + sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; + }; + }; + "flatted-3.1.1" = { + name = "flatted"; + packageName = "flatted"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz"; + sha512 = "zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA=="; + }; + }; + "flatten-1.0.3" = { + name = "flatten"; + packageName = "flatten"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz"; + sha512 = "dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg=="; + }; + }; + "flv.js-1.5.0" = { + name = "flv.js"; + packageName = "flv.js"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flv.js/-/flv.js-1.5.0.tgz"; + sha512 = "7tFwccqkFXpA7RIED0KvuNny2qVnpuGc5nTGsRpzrCT+qtwIaZyciK5UgyvgtlAMYaPFzYS0wdI92JiSBKOyXw=="; + }; + }; + "follow-redirects-1.14.0" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.0.tgz"; + sha512 = "0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg=="; + }; + }; + "fontsource-noto-sans-3.1.5" = { + name = "fontsource-noto-sans"; + packageName = "fontsource-noto-sans"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fontsource-noto-sans/-/fontsource-noto-sans-3.1.5.tgz"; + sha512 = "HtnF1LBkz1kW/7KYSbV4UB9+0Ogyik0qoyki6nWqb6ob319WCurxjZQlZn3e/szosPaWmF4L9UASACXQ1U6ZJQ=="; + }; + }; + "fontsource-noto-sans-hk-3.1.5" = { + name = "fontsource-noto-sans-hk"; + packageName = "fontsource-noto-sans-hk"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fontsource-noto-sans-hk/-/fontsource-noto-sans-hk-3.1.5.tgz"; + sha512 = "TVmCd5MVyfh7yk/q5eBcMU5+IzzK3GBIxGGmdMZIf6cL52KAJajoXNxh7avMXj0PUE0o0LgpjnJgRu867T4qEQ=="; + }; + }; + "fontsource-noto-sans-jp-3.1.5" = { + name = "fontsource-noto-sans-jp"; + packageName = "fontsource-noto-sans-jp"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fontsource-noto-sans-jp/-/fontsource-noto-sans-jp-3.1.5.tgz"; + sha512 = "+B/Jul/9jx0Oh6AVIvAcT7ztLP3dffNhvtCCVDXyyGGlpkH1KyFdwUnRsqL+py6qsOFE626wIUK2EOaA25RQkA=="; + }; + }; + "fontsource-noto-sans-kr-3.1.5" = { + name = "fontsource-noto-sans-kr"; + packageName = "fontsource-noto-sans-kr"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fontsource-noto-sans-kr/-/fontsource-noto-sans-kr-3.1.5.tgz"; + sha512 = "NKYWuGPk5Q/vPXu2dTt5CTXUD4daaiV7H/WD+zQt005rGFdhZ3Hu75sb6x9NfzZYgWNlZH4Rf32gIyEOhJKmoQ=="; + }; + }; + "fontsource-noto-sans-sc-3.1.5" = { + name = "fontsource-noto-sans-sc"; + packageName = "fontsource-noto-sans-sc"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fontsource-noto-sans-sc/-/fontsource-noto-sans-sc-3.1.5.tgz"; + sha512 = "4uX6tkvtxWMxiNQp1sf/uKrLm22dQx9jfN8TxL4XCVSIerYQ1mgZFXyGgNjub19DtuIHFI/cxALNhOeCq5RwPg=="; + }; + }; + "for-in-1.0.2" = { + name = "for-in"; + packageName = "for-in"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + }; + "forwarded-0.1.2" = { + name = "forwarded"; + packageName = "forwarded"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; + sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + }; + }; + "fragment-cache-0.2.1" = { + name = "fragment-cache"; + packageName = "fragment-cache"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + }; + "fs-extra-8.1.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"; + sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; + }; + }; + "fs-minipass-2.1.0" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "fsevents-1.2.13" = { + name = "fsevents"; + packageName = "fsevents"; + version = "1.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz"; + sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw=="; + }; + }; + "fsevents-2.3.2" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"; + sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; + "functional-red-black-tree-1.0.1" = { + name = "functional-red-black-tree"; + packageName = "functional-red-black-tree"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + }; + "gather-stream-1.0.0" = { + name = "gather-stream"; + packageName = "gather-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz"; + sha1 = "b33994af457a8115700d410f317733cbe7a0904b"; + }; + }; + "gensync-1.0.0-beta.2" = { + name = "gensync"; + packageName = "gensync"; + version = "1.0.0-beta.2"; + src = fetchurl { + url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"; + sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; + }; + }; + "get-caller-file-2.0.5" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; + }; + }; + "get-intrinsic-1.1.1" = { + name = "get-intrinsic"; + packageName = "get-intrinsic"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; + }; + }; + "get-own-enumerable-property-symbols-3.0.2" = { + name = "get-own-enumerable-property-symbols"; + packageName = "get-own-enumerable-property-symbols"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; + sha512 = "I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="; + }; + }; + "get-stdin-6.0.0" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz"; + sha512 = "jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="; + }; + }; + "get-stdin-8.0.0" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz"; + sha512 = "sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg=="; + }; + }; + "get-stream-4.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; + }; + }; + "get-stream-6.0.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"; + sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; + }; + }; + "get-value-2.0.6" = { + name = "get-value"; + packageName = "get-value"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + }; + "glob-7.1.6" = { + name = "glob"; + packageName = "glob"; + version = "7.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + }; + }; + "glob-parent-3.1.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + }; + }; + "glob-parent-5.1.2" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; + sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; + }; + }; + "glob-to-regexp-0.3.0" = { + name = "glob-to-regexp"; + packageName = "glob-to-regexp"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz"; + sha1 = "8c5a1494d2066c570cc3bfe4496175acc4d502ab"; + }; + }; + "glob-to-regexp-0.4.1" = { + name = "glob-to-regexp"; + packageName = "glob-to-regexp"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; + sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; + }; + }; + "global-modules-2.0.0" = { + name = "global-modules"; + packageName = "global-modules"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz"; + sha512 = "NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A=="; + }; + }; + "global-prefix-3.0.0" = { + name = "global-prefix"; + packageName = "global-prefix"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz"; + sha512 = "awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg=="; + }; + }; + "globals-11.12.0" = { + name = "globals"; + packageName = "globals"; + version = "11.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; + }; + }; + "globals-12.4.0" = { + name = "globals"; + packageName = "globals"; + version = "12.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"; + sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; + }; + }; + "globals-13.8.0" = { + name = "globals"; + packageName = "globals"; + version = "13.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz"; + sha512 = "rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q=="; + }; + }; + "globby-11.0.3" = { + name = "globby"; + packageName = "globby"; + version = "11.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz"; + sha512 = "ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg=="; + }; + }; + "globby-6.1.0" = { + name = "globby"; + packageName = "globby"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + }; + }; + "globby-9.2.0" = { + name = "globby"; + packageName = "globby"; + version = "9.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz"; + sha512 = "ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg=="; + }; + }; + "globjoin-0.1.4" = { + name = "globjoin"; + packageName = "globjoin"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz"; + sha1 = "2f4494ac8919e3767c5cbb691e9f463324285d43"; + }; + }; + "gonzales-pe-4.3.0" = { + name = "gonzales-pe"; + packageName = "gonzales-pe"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz"; + sha512 = "otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ=="; + }; + }; + "graceful-fs-4.2.6" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz"; + sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="; + }; + }; + "handle-thing-2.0.1" = { + name = "handle-thing"; + packageName = "handle-thing"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz"; + sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="; + }; + }; + "hard-rejection-2.1.0" = { + name = "hard-rejection"; + packageName = "hard-rejection"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz"; + sha512 = "VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA=="; + }; + }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "has-bigints-1.0.1" = { + name = "has-bigints"; + packageName = "has-bigints"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz"; + sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="; + }; + }; + "has-flag-1.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; + sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; + }; + }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + }; + "has-flag-4.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + }; + }; + "has-symbols-1.0.2" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; + sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + }; + }; + "has-value-0.3.1" = { + name = "has-value"; + packageName = "has-value"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + }; + "has-value-1.0.0" = { + name = "has-value"; + packageName = "has-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + }; + "has-values-0.1.4" = { + name = "has-values"; + packageName = "has-values"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + }; + "has-values-1.0.0" = { + name = "has-values"; + packageName = "has-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + }; + "he-1.2.0" = { + name = "he"; + packageName = "he"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; + }; + }; + "headroom.js-0.12.0" = { + name = "headroom.js"; + packageName = "headroom.js"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/headroom.js/-/headroom.js-0.12.0.tgz"; + sha512 = "iXnAafUm3FdzfJ91uixLws2hkKI1jC8bAKK/pt7XYr8Ie1jO7xbK48Ycpl9tUPyBgkzuj1p/PhJS0fy4E/5anA=="; + }; + }; + "hex-color-regex-1.1.0" = { + name = "hex-color-regex"; + packageName = "hex-color-regex"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz"; + sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="; + }; + }; + "hls.js-0.14.17" = { + name = "hls.js"; + packageName = "hls.js"; + version = "0.14.17"; + src = fetchurl { + url = "https://registry.npmjs.org/hls.js/-/hls.js-0.14.17.tgz"; + sha512 = "25A7+m6qqp6UVkuzUQ//VVh2EEOPYlOBg32ypr34bcPO7liBMOkKFvbjbCBfiPAOTA/7BSx1Dujft3Th57WyFg=="; + }; + }; + "hosted-git-info-2.8.9" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="; + }; + }; + "hosted-git-info-4.0.2" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; + sha512 = "c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg=="; + }; + }; + "hpack.js-2.1.6" = { + name = "hpack.js"; + packageName = "hpack.js"; + version = "2.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz"; + sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2"; + }; + }; + "hsl-regex-1.0.0" = { + name = "hsl-regex"; + packageName = "hsl-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz"; + sha1 = "d49330c789ed819e276a4c0d272dffa30b18fe6e"; + }; + }; + "hsla-regex-1.0.0" = { + name = "hsla-regex"; + packageName = "hsla-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz"; + sha1 = "c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"; + }; + }; + "html-entities-1.4.0" = { + name = "html-entities"; + packageName = "html-entities"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz"; + sha512 = "8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA=="; + }; + }; + "html-loader-1.3.2" = { + name = "html-loader"; + packageName = "html-loader"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/html-loader/-/html-loader-1.3.2.tgz"; + sha512 = "DEkUwSd0sijK5PF3kRWspYi56XP7bTNkyg5YWSzBdjaSDmvCufep5c4Vpb3PBf6lUL0YPtLwBfy9fL0t5hBAGA=="; + }; + }; + "html-minifier-terser-5.1.1" = { + name = "html-minifier-terser"; + packageName = "html-minifier-terser"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; + sha512 = "ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg=="; + }; + }; + "html-tags-2.0.0" = { + name = "html-tags"; + packageName = "html-tags"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz"; + sha1 = "10b30a386085f43cede353cc8fa7cb0deeea668b"; + }; + }; + "html-tags-3.1.0" = { + name = "html-tags"; + packageName = "html-tags"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz"; + sha512 = "1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg=="; + }; + }; + "html-webpack-plugin-4.5.2" = { + name = "html-webpack-plugin"; + packageName = "html-webpack-plugin"; + version = "4.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz"; + sha512 = "q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A=="; + }; + }; + "htmlparser2-3.10.1" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "3.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz"; + sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="; + }; + }; + "htmlparser2-4.1.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz"; + sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q=="; + }; + }; + "http-deceiver-1.2.7" = { + name = "http-deceiver"; + packageName = "http-deceiver"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz"; + sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87"; + }; + }; + "http-errors-1.6.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; + sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + }; + }; + "http-errors-1.7.2" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; + }; + }; + "http-parser-js-0.5.3" = { + name = "http-parser-js"; + packageName = "http-parser-js"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz"; + sha512 = "t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg=="; + }; + }; + "http-proxy-1.18.1" = { + name = "http-proxy"; + packageName = "http-proxy"; + version = "1.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz"; + sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; + }; + }; + "http-proxy-middleware-0.19.1" = { + name = "http-proxy-middleware"; + packageName = "http-proxy-middleware"; + version = "0.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"; + sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; + }; + }; + "human-signals-2.1.0" = { + name = "human-signals"; + packageName = "human-signals"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz"; + sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; + }; + }; + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "iconv-lite-0.6.2" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz"; + sha512 = "2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ=="; + }; + }; + "icss-utils-5.1.0" = { + name = "icss-utils"; + packageName = "icss-utils"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"; + sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="; + }; + }; + "ignore-4.0.6" = { + name = "ignore"; + packageName = "ignore"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz"; + sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; + }; + }; + "ignore-5.1.8" = { + name = "ignore"; + packageName = "ignore"; + version = "5.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"; + sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; + }; + }; + "immediate-3.0.6" = { + name = "immediate"; + packageName = "immediate"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz"; + sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"; + }; + }; + "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"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz"; + sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; + }; + }; + "import-fresh-3.3.0" = { + name = "import-fresh"; + packageName = "import-fresh"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"; + sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; + }; + }; + "import-from-2.1.0" = { + name = "import-from"; + packageName = "import-from"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz"; + sha1 = "335db7f2a7affd53aaa471d4b8021dee36b7f3b1"; + }; + }; + "import-lazy-3.1.0" = { + name = "import-lazy"; + packageName = "import-lazy"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-lazy/-/import-lazy-3.1.0.tgz"; + sha512 = "8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ=="; + }; + }; + "import-lazy-4.0.0" = { + name = "import-lazy"; + packageName = "import-lazy"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz"; + sha512 = "rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw=="; + }; + }; + "import-local-2.0.0" = { + name = "import-local"; + packageName = "import-local"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz"; + sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ=="; + }; + }; + "import-local-3.0.2" = { + name = "import-local"; + packageName = "import-local"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz"; + sha512 = "vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "indent-string-3.2.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz"; + sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; + }; + }; + "indent-string-4.0.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; + }; + }; + "indexes-of-1.0.1" = { + name = "indexes-of"; + packageName = "indexes-of"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz"; + sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607"; + }; + }; + "infer-owner-1.0.4" = { + name = "infer-owner"; + packageName = "infer-owner"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"; + sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "ini-1.3.8" = { + name = "ini"; + packageName = "ini"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; + }; + }; + "internal-ip-4.3.0" = { + name = "internal-ip"; + packageName = "internal-ip"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz"; + sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; + }; + }; + "interpret-2.2.0" = { + name = "interpret"; + packageName = "interpret"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz"; + sha512 = "Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw=="; + }; + }; + "intersection-observer-0.12.0" = { + name = "intersection-observer"; + packageName = "intersection-observer"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/intersection-observer/-/intersection-observer-0.12.0.tgz"; + sha512 = "2Vkz8z46Dv401zTWudDGwO7KiGHNDkMv417T5ItcNYfmvHR/1qCTVBO9vwH8zZmQ0WkA/1ARwpysR9bsnop4NQ=="; + }; + }; + "ip-1.1.5" = { + name = "ip"; + packageName = "ip"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + }; + }; + "ip-regex-2.1.0" = { + name = "ip-regex"; + packageName = "ip-regex"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz"; + sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + }; + }; + "ipaddr.js-1.9.1" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; + }; + }; + "irregular-plurals-1.4.0" = { + name = "irregular-plurals"; + packageName = "irregular-plurals"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz"; + sha1 = "2ca9b033651111855412f16be5d77c62a458a766"; + }; + }; + "is-absolute-url-2.1.0" = { + name = "is-absolute-url"; + packageName = "is-absolute-url"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz"; + sha1 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"; + }; + }; + "is-absolute-url-3.0.3" = { + name = "is-absolute-url"; + packageName = "is-absolute-url"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; + sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="; + }; + }; + "is-accessor-descriptor-0.1.6" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + }; + "is-accessor-descriptor-1.0.0" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; + }; + }; + "is-alphabetical-1.0.4" = { + name = "is-alphabetical"; + packageName = "is-alphabetical"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz"; + sha512 = "DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg=="; + }; + }; + "is-alphanumeric-1.0.0" = { + name = "is-alphanumeric"; + packageName = "is-alphanumeric"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz"; + sha1 = "4a9cef71daf4c001c1d81d63d140cf53fd6889f4"; + }; + }; + "is-alphanumerical-1.0.4" = { + name = "is-alphanumerical"; + packageName = "is-alphanumerical"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz"; + sha512 = "UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A=="; + }; + }; + "is-arguments-1.1.0" = { + name = "is-arguments"; + packageName = "is-arguments"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz"; + sha512 = "1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg=="; + }; + }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; + "is-arrayish-0.3.2" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"; + sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; + }; + }; + "is-bigint-1.0.2" = { + name = "is-bigint"; + packageName = "is-bigint"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz"; + sha512 = "0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA=="; + }; + }; + "is-binary-path-1.0.1" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + }; + }; + "is-binary-path-2.1.0" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; + }; + }; + "is-boolean-object-1.1.0" = { + name = "is-boolean-object"; + packageName = "is-boolean-object"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz"; + sha512 = "a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA=="; + }; + }; + "is-buffer-1.1.6" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; + }; + }; + "is-buffer-2.0.5" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz"; + sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="; + }; + }; + "is-callable-1.2.3" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz"; + sha512 = "J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="; + }; + }; + "is-color-stop-1.1.0" = { + name = "is-color-stop"; + packageName = "is-color-stop"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz"; + sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; + }; + }; + "is-core-module-2.3.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.3.0.tgz"; + sha512 = "xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw=="; + }; + }; + "is-data-descriptor-0.1.4" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + }; + "is-data-descriptor-1.0.0" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; + }; + }; + "is-date-object-1.0.2" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; + sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; + }; + }; + "is-decimal-1.0.4" = { + name = "is-decimal"; + packageName = "is-decimal"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz"; + sha512 = "RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw=="; + }; + }; + "is-descriptor-0.1.6" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; + }; + }; + "is-descriptor-1.0.2" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; + }; + }; + "is-directory-0.3.1" = { + name = "is-directory"; + packageName = "is-directory"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz"; + sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; + }; + }; + "is-extendable-0.1.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + }; + "is-extendable-1.0.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; + sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; + "is-fullwidth-code-point-3.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; + }; + }; + "is-glob-3.1.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + }; + "is-glob-4.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + }; + "is-hexadecimal-1.0.4" = { + name = "is-hexadecimal"; + packageName = "is-hexadecimal"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz"; + sha512 = "gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw=="; + }; + }; + "is-module-1.0.0" = { + name = "is-module"; + packageName = "is-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz"; + sha1 = "3258fb69f78c14d5b815d664336b4cffb6441591"; + }; + }; + "is-negative-zero-2.0.1" = { + name = "is-negative-zero"; + packageName = "is-negative-zero"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; + sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="; + }; + }; + "is-number-3.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + }; + "is-number-7.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + }; + }; + "is-number-object-1.0.4" = { + name = "is-number-object"; + packageName = "is-number-object"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz"; + sha512 = "zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw=="; + }; + }; + "is-obj-1.0.1" = { + name = "is-obj"; + packageName = "is-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; + sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + }; + }; + "is-obj-2.0.0" = { + name = "is-obj"; + packageName = "is-obj"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz"; + sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; + }; + }; + "is-path-cwd-2.2.0" = { + name = "is-path-cwd"; + packageName = "is-path-cwd"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; + sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="; + }; + }; + "is-path-in-cwd-2.1.0" = { + name = "is-path-in-cwd"; + packageName = "is-path-in-cwd"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; + sha512 = "rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ=="; + }; + }; + "is-path-inside-2.1.0" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz"; + 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-obj-2.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz"; + sha512 = "YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="; + }; + }; + "is-plain-object-2.0.4" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; + }; + }; + "is-regex-1.1.2" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz"; + sha512 = "axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg=="; + }; + }; + "is-regexp-1.0.0" = { + name = "is-regexp"; + packageName = "is-regexp"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz"; + sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069"; + }; + }; + "is-regexp-2.1.0" = { + name = "is-regexp"; + packageName = "is-regexp"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz"; + sha512 = "OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA=="; + }; + }; + "is-resolvable-1.1.0" = { + name = "is-resolvable"; + packageName = "is-resolvable"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz"; + sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "is-stream-2.0.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; + sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + }; + }; + "is-string-1.0.5" = { + name = "is-string"; + packageName = "is-string"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz"; + sha512 = "buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="; + }; + }; + "is-supported-regexp-flag-1.0.1" = { + name = "is-supported-regexp-flag"; + packageName = "is-supported-regexp-flag"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.1.tgz"; + sha512 = "3vcJecUUrpgCqc/ca0aWeNu64UGgxcvO60K/Fkr1N6RSvfGCTU60UKN68JDmKokgba0rFFJs12EnzOQa14ubKQ=="; + }; + }; + "is-symbol-1.0.3" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; + sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "is-unicode-supported-0.1.0" = { + name = "is-unicode-supported"; + packageName = "is-unicode-supported"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; + sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; + }; + }; + "is-whitespace-character-1.0.4" = { + name = "is-whitespace-character"; + packageName = "is-whitespace-character"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz"; + sha512 = "SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w=="; + }; + }; + "is-windows-1.0.2" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; + sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; + }; + }; + "is-word-character-1.0.4" = { + name = "is-word-character"; + packageName = "is-word-character"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz"; + sha512 = "5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA=="; + }; + }; + "is-wsl-1.1.0" = { + name = "is-wsl"; + packageName = "is-wsl"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz"; + sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; + }; + }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + }; + "isobject-2.1.0" = { + name = "isobject"; + packageName = "isobject"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + }; + "isobject-3.0.1" = { + name = "isobject"; + packageName = "isobject"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + }; + "jellyfin-apiclient-1.8.0" = { + name = "jellyfin-apiclient"; + packageName = "jellyfin-apiclient"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jellyfin-apiclient/-/jellyfin-apiclient-1.8.0.tgz"; + sha512 = "fwAF1G89amm3uO2Yw0E26fW5X6JoyRUnOdBEeuSN04/NpdKKVHD4u53dgqF0jHzXNuKdn5eh0AuV37cMKzBanA=="; + }; + }; + "jest-worker-24.9.0" = { + name = "jest-worker"; + packageName = "jest-worker"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz"; + sha512 = "51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw=="; + }; + }; + "jest-worker-26.6.2" = { + name = "jest-worker"; + packageName = "jest-worker"; + version = "26.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz"; + sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; + }; + }; + "jquery-3.6.0" = { + name = "jquery"; + packageName = "jquery"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz"; + sha512 = "JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="; + }; + }; + "js-base64-2.6.4" = { + name = "js-base64"; + packageName = "js-base64"; + version = "2.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz"; + sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="; + }; + }; + "js-tokens-4.0.0" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; + }; + }; + "js-yaml-3.14.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"; + sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; + }; + }; + "jsesc-0.5.0" = { + name = "jsesc"; + packageName = "jsesc"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"; + sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + }; + }; + "jsesc-2.5.2" = { + name = "jsesc"; + packageName = "jsesc"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; + sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; + }; + }; + "json-parse-better-errors-1.0.2" = { + name = "json-parse-better-errors"; + packageName = "json-parse-better-errors"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + 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-traverse-0.4.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + }; + "json-schema-traverse-1.0.0" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; + }; + }; + "json-stable-stringify-without-jsonify-1.0.1" = { + name = "json-stable-stringify-without-jsonify"; + packageName = "json-stable-stringify-without-jsonify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + }; + "json3-3.3.3" = { + name = "json3"; + packageName = "json3"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz"; + sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="; + }; + }; + "json5-1.0.1" = { + name = "json5"; + packageName = "json5"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; + sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; + }; + }; + "json5-2.2.0" = { + name = "json5"; + packageName = "json5"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz"; + sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; + }; + }; + "jsonfile-4.0.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + }; + "jstree-3.3.11" = { + name = "jstree"; + packageName = "jstree"; + version = "3.3.11"; + src = fetchurl { + url = "https://registry.npmjs.org/jstree/-/jstree-3.3.11.tgz"; + sha512 = "9ZJKroPjCyjb6JLPuAbBrLJKT6pS1f4m5gkwoEagG5oQWtvzm0IiDsntXTxeFtz7AmqrKfij+gLfF9MgWriNxg=="; + }; + }; + "jszip-3.6.0" = { + name = "jszip"; + packageName = "jszip"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jszip/-/jszip-3.6.0.tgz"; + sha512 = "jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ=="; + }; + }; + "killable-1.0.1" = { + name = "killable"; + packageName = "killable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz"; + sha512 = "LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="; + }; + }; + "kind-of-3.2.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + }; + "kind-of-4.0.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + }; + "kind-of-5.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; + sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; + }; + }; + "kind-of-6.0.3" = { + name = "kind-of"; + packageName = "kind-of"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"; + sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; + }; + }; + "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=="; + }; + }; + "known-css-properties-0.11.0" = { + name = "known-css-properties"; + packageName = "known-css-properties"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.11.0.tgz"; + sha512 = "bEZlJzXo5V/ApNNa5z375mJC6Nrz4vG43UgcSCrg2OHC+yuB6j0iDSrY7RQ/+PRofFB03wNIIt9iXIVLr4wc7w=="; + }; + }; + "known-css-properties-0.21.0" = { + name = "known-css-properties"; + packageName = "known-css-properties"; + version = "0.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz"; + sha512 = "sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw=="; + }; + }; + "leven-2.1.0" = { + name = "leven"; + packageName = "leven"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; + sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; + }; + }; + "levn-0.4.1" = { + name = "levn"; + packageName = "levn"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"; + sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; + }; + }; + "libarchive.js-1.3.0" = { + name = "libarchive.js"; + packageName = "libarchive.js"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libarchive.js/-/libarchive.js-1.3.0.tgz"; + sha512 = "EkQfRXt9DhWwj6BnEA2TNpOf4jTnzSTUPGgE+iFxcdNqjktY8GitbDeHnx8qZA0/IukNyyBUR3oQKRdYkO+HFg=="; + }; + }; + "libass-wasm-https://github.com/jellyfin/JavascriptSubtitlesOctopus/archive/refs/tags/4.0.0-jf-smarttv.tar.gz" = { + name = "libass-wasm"; + packageName = "libass-wasm"; + version = "4.0.0"; + src = fetchurl { + name = "libass-wasm-4.0.0.tar.gz"; + url = "https://codeload.github.com/jellyfin/JavascriptSubtitlesOctopus/tar.gz/refs/tags/4.0.0-jf-smarttv"; + sha256 = "0acf200b93ed99c2e22a86c1c96442ea5a3159e0a7f5de9f028053c86b065197"; + }; + }; + "lie-3.1.1" = { + name = "lie"; + packageName = "lie"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz"; + sha1 = "9a436b2cc7746ca59de7a41fa469b3efb76bd87e"; + }; + }; + "lie-3.3.0" = { + name = "lie"; + packageName = "lie"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz"; + sha512 = "UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ=="; + }; + }; + "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-2.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + }; + }; + "load-json-file-4.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz"; + sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; + }; + }; + "loader-runner-4.2.0" = { + name = "loader-runner"; + packageName = "loader-runner"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz"; + sha512 = "92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw=="; + }; + }; + "loader-utils-1.4.0" = { + name = "loader-utils"; + packageName = "loader-utils"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz"; + 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=="; + }; + }; + "localforage-1.9.0" = { + name = "localforage"; + packageName = "localforage"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/localforage/-/localforage-1.9.0.tgz"; + sha512 = "rR1oyNrKulpe+VM9cYmcFn6tsHuokyVHFaCM3+osEmxaHTbEk8oQu6eGDfS6DQLWi/N67XRmB8ECG37OES368g=="; + }; + }; + "locate-path-2.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + }; + "locate-path-3.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; + }; + }; + "locate-path-5.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; + }; + }; + "lodash-4.17.21" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.21"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; + }; + }; + "lodash._reinterpolate-3.0.0" = { + name = "lodash._reinterpolate"; + packageName = "lodash._reinterpolate"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"; + sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; + }; + }; + "lodash.clonedeep-4.5.0" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + }; + "lodash.debounce-4.0.8" = { + name = "lodash.debounce"; + packageName = "lodash.debounce"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + }; + }; + "lodash.flatten-4.4.0" = { + name = "lodash.flatten"; + packageName = "lodash.flatten"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; + sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; + }; + }; + "lodash.memoize-4.1.2" = { + name = "lodash.memoize"; + packageName = "lodash.memoize"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; + sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; + }; + }; + "lodash.template-4.5.0" = { + name = "lodash.template"; + packageName = "lodash.template"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz"; + sha512 = "84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A=="; + }; + }; + "lodash.templatesettings-4.2.0" = { + name = "lodash.templatesettings"; + packageName = "lodash.templatesettings"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz"; + sha512 = "stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ=="; + }; + }; + "lodash.truncate-4.4.2" = { + name = "lodash.truncate"; + packageName = "lodash.truncate"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + }; + }; + "lodash.uniq-4.5.0" = { + name = "lodash.uniq"; + packageName = "lodash.uniq"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + }; + }; + "log-symbols-1.0.2" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"; + sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; + }; + }; + "log-symbols-2.2.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; + sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; + }; + }; + "log-symbols-4.1.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"; + sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; + }; + }; + "loglevel-1.7.1" = { + name = "loglevel"; + packageName = "loglevel"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz"; + sha512 = "Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw=="; + }; + }; + "longest-streak-2.0.4" = { + name = "longest-streak"; + packageName = "longest-streak"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz"; + sha512 = "vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg=="; + }; + }; + "loud-rejection-1.6.0" = { + name = "loud-rejection"; + packageName = "loud-rejection"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; + sha1 = "5b46f80147edee578870f086d04821cf998e551f"; + }; + }; + "lower-case-2.0.2" = { + name = "lower-case"; + packageName = "lower-case"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz"; + sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="; + }; + }; + "lru-cache-6.0.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; + }; + }; + "magic-string-0.25.7" = { + name = "magic-string"; + packageName = "magic-string"; + version = "0.25.7"; + src = fetchurl { + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz"; + sha512 = "4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA=="; + }; + }; + "make-dir-3.1.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; + }; + }; + "map-cache-0.2.2" = { + name = "map-cache"; + packageName = "map-cache"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + }; + "map-obj-1.0.1" = { + name = "map-obj"; + packageName = "map-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + }; + "map-obj-2.0.0" = { + name = "map-obj"; + packageName = "map-obj"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz"; + sha1 = "a65cd29087a92598b8791257a523e021222ac1f9"; + }; + }; + "map-obj-4.2.1" = { + name = "map-obj"; + packageName = "map-obj"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz"; + sha512 = "+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ=="; + }; + }; + "map-visit-1.0.0" = { + name = "map-visit"; + packageName = "map-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + }; + "markdown-escapes-1.0.4" = { + name = "markdown-escapes"; + packageName = "markdown-escapes"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz"; + sha512 = "8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg=="; + }; + }; + "markdown-table-1.1.3" = { + name = "markdown-table"; + packageName = "markdown-table"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.3.tgz"; + sha512 = "1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q=="; + }; + }; + "marks-pane-1.0.9" = { + name = "marks-pane"; + packageName = "marks-pane"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/marks-pane/-/marks-pane-1.0.9.tgz"; + sha512 = "Ahs4oeG90tbdPWwAJkAAoHg2lRR8lAs9mZXETNPO9hYg3AkjUJBKi1NQ4aaIQZVGrig7c/3NUV1jANl8rFTeMg=="; + }; + }; + "material-design-icons-iconfont-6.1.0" = { + name = "material-design-icons-iconfont"; + packageName = "material-design-icons-iconfont"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-6.1.0.tgz"; + sha512 = "wRJtOo1v1ch+gN8PRsj0IGJznk+kQ8mz13ds/nuhLI+Qyf/931ZlRpd92oq0IRPpZIb+bhX8pRjzIVdcPDKmiQ=="; + }; + }; + "mathml-tag-names-2.1.3" = { + name = "mathml-tag-names"; + packageName = "mathml-tag-names"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz"; + sha512 = "APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg=="; + }; + }; + "mdast-util-compact-1.0.4" = { + name = "mdast-util-compact"; + packageName = "mdast-util-compact"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.4.tgz"; + sha512 = "3YDMQHI5vRiS2uygEFYaqckibpJtKq5Sj2c8JioeOQBU6INpKbdWzfyLqFFnDwEcEnRFIdMsguzs5pC1Jp4Isg=="; + }; + }; + "mdast-util-from-markdown-0.8.5" = { + name = "mdast-util-from-markdown"; + packageName = "mdast-util-from-markdown"; + version = "0.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz"; + sha512 = "2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ=="; + }; + }; + "mdast-util-to-markdown-0.6.5" = { + name = "mdast-util-to-markdown"; + packageName = "mdast-util-to-markdown"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz"; + sha512 = "XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ=="; + }; + }; + "mdast-util-to-string-2.0.0" = { + name = "mdast-util-to-string"; + packageName = "mdast-util-to-string"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz"; + sha512 = "AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w=="; + }; + }; + "mdn-data-2.0.14" = { + name = "mdn-data"; + packageName = "mdn-data"; + version = "2.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz"; + sha512 = "dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="; + }; + }; + "mdn-data-2.0.4" = { + name = "mdn-data"; + packageName = "mdn-data"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz"; + sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; + }; + }; + "media-typer-0.3.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + }; + "memory-fs-0.4.1" = { + name = "memory-fs"; + packageName = "memory-fs"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz"; + sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; + }; + }; + "meow-5.0.0" = { + name = "meow"; + packageName = "meow"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz"; + sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; + }; + }; + "meow-9.0.0" = { + name = "meow"; + packageName = "meow"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz"; + sha512 = "+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ=="; + }; + }; + "merge-descriptors-1.0.1" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + }; + "merge-stream-2.0.0" = { + name = "merge-stream"; + packageName = "merge-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"; + sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; + }; + }; + "merge2-1.4.1" = { + name = "merge2"; + packageName = "merge2"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; + sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; + }; + }; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + }; + "micromark-2.11.4" = { + name = "micromark"; + packageName = "micromark"; + version = "2.11.4"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz"; + sha512 = "+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA=="; + }; + }; + "micromatch-3.1.10" = { + name = "micromatch"; + packageName = "micromatch"; + version = "3.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; + sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; + }; + }; + "micromatch-4.0.4" = { + name = "micromatch"; + packageName = "micromatch"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"; + sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; + }; + }; + "mime-1.6.0" = { + name = "mime"; + packageName = "mime"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; + }; + }; + "mime-2.5.2" = { + name = "mime"; + packageName = "mime"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz"; + sha512 = "tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="; + }; + }; + "mime-db-1.47.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.47.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz"; + sha512 = "QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw=="; + }; + }; + "mime-types-2.1.30" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.30"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz"; + sha512 = "crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg=="; + }; + }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; + }; + }; + "min-indent-1.0.1" = { + name = "min-indent"; + packageName = "min-indent"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz"; + sha512 = "I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="; + }; + }; + "minimalistic-assert-1.0.1" = { + name = "minimalistic-assert"; + packageName = "minimalistic-assert"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-1.2.5" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + }; + }; + "minimist-options-3.0.2" = { + name = "minimist-options"; + packageName = "minimist-options"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz"; + sha512 = "FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ=="; + }; + }; + "minimist-options-4.1.0" = { + name = "minimist-options"; + packageName = "minimist-options"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz"; + sha512 = "Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A=="; + }; + }; + "minipass-3.1.3" = { + name = "minipass"; + packageName = "minipass"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz"; + sha512 = "Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg=="; + }; + }; + "minipass-collect-1.0.2" = { + name = "minipass-collect"; + packageName = "minipass-collect"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; + }; + }; + "minipass-flush-1.0.5" = { + name = "minipass-flush"; + packageName = "minipass-flush"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; + }; + }; + "minipass-pipeline-1.2.4" = { + name = "minipass-pipeline"; + packageName = "minipass-pipeline"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha512 = "xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="; + }; + }; + "minizlib-2.1.2" = { + name = "minizlib"; + packageName = "minizlib"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; + }; + }; + "mixin-deep-1.3.2" = { + name = "mixin-deep"; + packageName = "mixin-deep"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz"; + sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; + }; + }; + "mkdirp-0.5.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + }; + }; + "mkdirp-1.0.4" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "ms-2.1.1" = { + name = "ms"; + packageName = "ms"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "multicast-dns-6.2.3" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "6.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"; + sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; + }; + }; + "multicast-dns-service-types-1.1.0" = { + name = "multicast-dns-service-types"; + packageName = "multicast-dns-service-types"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"; + sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; + }; + }; + "nan-2.14.2" = { + name = "nan"; + packageName = "nan"; + version = "2.14.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz"; + sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="; + }; + }; + "nanoid-3.1.22" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.1.22"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.22.tgz"; + sha512 = "/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ=="; + }; + }; + "nanomatch-1.2.13" = { + name = "nanomatch"; + packageName = "nanomatch"; + version = "1.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"; + sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; + }; + }; + "native-promise-only-0.8.1" = { + name = "native-promise-only"; + packageName = "native-promise-only"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz"; + sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; + }; + }; + "natural-compare-1.4.0" = { + name = "natural-compare"; + packageName = "natural-compare"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + }; + "negotiator-0.6.2" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + }; + }; + "neo-async-2.6.2" = { + name = "neo-async"; + packageName = "neo-async"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"; + sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; + }; + }; + "next-tick-1.0.0" = { + name = "next-tick"; + packageName = "next-tick"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; + sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; + }; + }; + "nice-try-1.0.5" = { + name = "nice-try"; + packageName = "nice-try"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; + }; + }; + "no-case-3.0.4" = { + name = "no-case"; + packageName = "no-case"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz"; + sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; + }; + }; + "node-forge-0.10.0" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz"; + sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="; + }; + }; + "node-releases-1.1.71" = { + name = "node-releases"; + packageName = "node-releases"; + version = "1.1.71"; + src = fetchurl { + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz"; + sha512 = "zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg=="; + }; + }; + "normalize-package-data-2.5.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; + }; + }; + "normalize-package-data-3.0.2" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz"; + sha512 = "6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg=="; + }; + }; + "normalize-path-2.1.1" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + }; + "normalize-path-3.0.0" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; + }; + }; + "normalize-range-0.1.2" = { + name = "normalize-range"; + packageName = "normalize-range"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"; + sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942"; + }; + }; + "normalize-selector-0.2.0" = { + name = "normalize-selector"; + packageName = "normalize-selector"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz"; + sha1 = "d0b145eb691189c63a78d201dc4fdb1293ef0c03"; + }; + }; + "normalize-url-3.3.0" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz"; + sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="; + }; + }; + "npm-run-path-2.0.2" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + }; + "npm-run-path-4.0.1" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"; + sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; + }; + }; + "nth-check-1.0.2" = { + name = "nth-check"; + packageName = "nth-check"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz"; + sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; + }; + }; + "num2fraction-1.2.2" = { + name = "num2fraction"; + packageName = "num2fraction"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz"; + sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "object-copy-0.1.0" = { + name = "object-copy"; + packageName = "object-copy"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + }; + "object-inspect-1.10.2" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz"; + sha512 = "gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA=="; + }; + }; + "object-is-1.1.5" = { + name = "object-is"; + packageName = "object-is"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"; + sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; + }; + }; + "object-keys-1.1.1" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; + }; + }; + "object-visit-1.0.1" = { + name = "object-visit"; + packageName = "object-visit"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + }; + "object.assign-4.1.2" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; + sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; + }; + }; + "object.getownpropertydescriptors-2.1.2" = { + name = "object.getownpropertydescriptors"; + packageName = "object.getownpropertydescriptors"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz"; + sha512 = "WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ=="; + }; + }; + "object.pick-1.3.0" = { + name = "object.pick"; + packageName = "object.pick"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + }; + "object.values-1.1.3" = { + name = "object.values"; + packageName = "object.values"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz"; + sha512 = "nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw=="; + }; + }; + "obuf-1.1.2" = { + name = "obuf"; + packageName = "obuf"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz"; + sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="; + }; + }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; + "on-headers-1.0.2" = { + name = "on-headers"; + packageName = "on-headers"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "onetime-5.1.2" = { + name = "onetime"; + packageName = "onetime"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"; + sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; + }; + }; + "opn-5.5.0" = { + name = "opn"; + packageName = "opn"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz"; + sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA=="; + }; + }; + "optionator-0.9.1" = { + name = "optionator"; + packageName = "optionator"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"; + sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; + }; + }; + "original-1.0.2" = { + name = "original"; + packageName = "original"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/original/-/original-1.0.2.tgz"; + sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg=="; + }; + }; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "p-limit-1.3.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; + sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; + }; + }; + "p-limit-2.3.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; + }; + }; + "p-limit-3.1.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"; + sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; + }; + }; + "p-locate-2.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; + sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + }; + }; + "p-locate-3.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; + }; + }; + "p-locate-4.1.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; + }; + }; + "p-map-2.1.0" = { + name = "p-map"; + packageName = "p-map"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz"; + sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; + }; + }; + "p-map-4.0.0" = { + name = "p-map"; + packageName = "p-map"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"; + sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; + }; + }; + "p-retry-3.0.1" = { + name = "p-retry"; + packageName = "p-retry"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz"; + sha512 = "XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w=="; + }; + }; + "p-try-1.0.0" = { + name = "p-try"; + packageName = "p-try"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + }; + "p-try-2.2.0" = { + name = "p-try"; + packageName = "p-try"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + }; + "page-1.11.6" = { + name = "page"; + packageName = "page"; + version = "1.11.6"; + src = fetchurl { + url = "https://registry.npmjs.org/page/-/page-1.11.6.tgz"; + sha512 = "P6e2JfzkBrPeFCIPplLP7vDDiU84RUUZMrWdsH4ZBGJ8OosnwFkcUkBHp1DTIjuipLliw9yQn/ZJsXZvarsO+g=="; + }; + }; + "pako-1.0.11" = { + name = "pako"; + packageName = "pako"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"; + sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; + }; + }; + "param-case-3.0.4" = { + name = "param-case"; + packageName = "param-case"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz"; + sha512 = "RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="; + }; + }; + "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-entities-1.2.2" = { + name = "parse-entities"; + packageName = "parse-entities"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz"; + sha512 = "NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg=="; + }; + }; + "parse-entities-2.0.0" = { + name = "parse-entities"; + packageName = "parse-entities"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz"; + sha512 = "kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ=="; + }; + }; + "parse-json-2.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + }; + "parse-json-4.0.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + }; + }; + "parse-json-5.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"; + sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; + }; + }; + "parseurl-1.3.3" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; + }; + }; + "pascal-case-3.1.2" = { + name = "pascal-case"; + packageName = "pascal-case"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz"; + sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="; + }; + }; + "pascalcase-0.1.1" = { + name = "pascalcase"; + packageName = "pascalcase"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + }; + "path-dirname-1.0.2" = { + name = "path-dirname"; + packageName = "path-dirname"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"; + sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + }; + }; + "path-exists-3.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + }; + "path-exists-4.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "path-is-inside-1.0.2" = { + name = "path-is-inside"; + packageName = "path-is-inside"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + }; + }; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + }; + "path-key-3.1.1" = { + name = "path-key"; + packageName = "path-key"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; + }; + }; + "path-parse-1.0.6" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + }; + }; + "path-to-regexp-0.1.7" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + }; + "path-to-regexp-1.2.1" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.2.1.tgz"; + sha1 = "b33705c140234d873c8721c7b9fd8b541ed3aff9"; + }; + }; + "path-type-2.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + }; + }; + "path-type-3.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"; + sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg=="; + }; + }; + "path-type-4.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; + }; + }; + "path-webpack-0.0.3" = { + name = "path-webpack"; + packageName = "path-webpack"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/path-webpack/-/path-webpack-0.0.3.tgz"; + sha1 = "ff6dec749eec5a94605c04d5f63fc55607a03a16"; + }; + }; + "pdfjs-dist-2.5.207" = { + name = "pdfjs-dist"; + packageName = "pdfjs-dist"; + version = "2.5.207"; + src = fetchurl { + url = "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.5.207.tgz"; + sha512 = "xGDUhnCYPfHy+unMXCLCJtlpZaaZ17Ew3WIL0tnSgKFUZXHAPD49GO9xScyszSsQMoutNDgRb+rfBXIaX/lJbw=="; + }; + }; + "picomatch-2.2.3" = { + name = "picomatch"; + packageName = "picomatch"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz"; + sha512 = "KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg=="; + }; + }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; + "pify-3.0.0" = { + name = "pify"; + packageName = "pify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + }; + "pify-4.0.1" = { + name = "pify"; + packageName = "pify"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"; + sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; + }; + }; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + }; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + }; + "pkg-dir-2.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz"; + sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; + }; + }; + "pkg-dir-3.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz"; + sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="; + }; + }; + "pkg-dir-4.2.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; + }; + }; + "plur-2.1.2" = { + name = "plur"; + packageName = "plur"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz"; + sha1 = "7482452c1a0f508e3e344eaec312c91c29dc655a"; + }; + }; + "portfinder-1.0.28" = { + name = "portfinder"; + packageName = "portfinder"; + version = "1.0.28"; + src = fetchurl { + url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz"; + sha512 = "Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA=="; + }; + }; + "posix-character-classes-0.1.1" = { + name = "posix-character-classes"; + packageName = "posix-character-classes"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + }; + "postcss-5.2.18" = { + name = "postcss"; + packageName = "postcss"; + version = "5.2.18"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz"; + sha512 = "zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg=="; + }; + }; + "postcss-7.0.35" = { + name = "postcss"; + packageName = "postcss"; + version = "7.0.35"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz"; + sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; + }; + }; + "postcss-8.2.13" = { + name = "postcss"; + packageName = "postcss"; + version = "8.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.2.13.tgz"; + sha512 = "FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ=="; + }; + }; + "postcss-attribute-case-insensitive-4.0.2" = { + name = "postcss-attribute-case-insensitive"; + packageName = "postcss-attribute-case-insensitive"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz"; + sha512 = "clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA=="; + }; + }; + "postcss-calc-7.0.5" = { + name = "postcss-calc"; + packageName = "postcss-calc"; + version = "7.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz"; + sha512 = "1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg=="; + }; + }; + "postcss-color-functional-notation-2.0.1" = { + name = "postcss-color-functional-notation"; + packageName = "postcss-color-functional-notation"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz"; + sha512 = "ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g=="; + }; + }; + "postcss-color-gray-5.0.0" = { + name = "postcss-color-gray"; + packageName = "postcss-color-gray"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz"; + sha512 = "q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw=="; + }; + }; + "postcss-color-hex-alpha-5.0.3" = { + name = "postcss-color-hex-alpha"; + packageName = "postcss-color-hex-alpha"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz"; + sha512 = "PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw=="; + }; + }; + "postcss-color-mod-function-3.0.3" = { + name = "postcss-color-mod-function"; + packageName = "postcss-color-mod-function"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz"; + sha512 = "YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ=="; + }; + }; + "postcss-color-rebeccapurple-4.0.1" = { + name = "postcss-color-rebeccapurple"; + packageName = "postcss-color-rebeccapurple"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz"; + sha512 = "aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g=="; + }; + }; + "postcss-colormin-4.0.3" = { + name = "postcss-colormin"; + packageName = "postcss-colormin"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz"; + sha512 = "WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw=="; + }; + }; + "postcss-convert-values-4.0.1" = { + name = "postcss-convert-values"; + packageName = "postcss-convert-values"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz"; + sha512 = "Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ=="; + }; + }; + "postcss-custom-media-7.0.8" = { + name = "postcss-custom-media"; + packageName = "postcss-custom-media"; + version = "7.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz"; + sha512 = "c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg=="; + }; + }; + "postcss-custom-properties-8.0.11" = { + name = "postcss-custom-properties"; + packageName = "postcss-custom-properties"; + version = "8.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz"; + sha512 = "nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA=="; + }; + }; + "postcss-custom-selectors-5.1.2" = { + name = "postcss-custom-selectors"; + packageName = "postcss-custom-selectors"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz"; + sha512 = "DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w=="; + }; + }; + "postcss-dir-pseudo-class-5.0.0" = { + name = "postcss-dir-pseudo-class"; + packageName = "postcss-dir-pseudo-class"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz"; + sha512 = "3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw=="; + }; + }; + "postcss-discard-comments-4.0.2" = { + name = "postcss-discard-comments"; + packageName = "postcss-discard-comments"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz"; + sha512 = "RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg=="; + }; + }; + "postcss-discard-duplicates-4.0.2" = { + name = "postcss-discard-duplicates"; + packageName = "postcss-discard-duplicates"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz"; + sha512 = "ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ=="; + }; + }; + "postcss-discard-empty-4.0.1" = { + name = "postcss-discard-empty"; + packageName = "postcss-discard-empty"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz"; + sha512 = "B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w=="; + }; + }; + "postcss-discard-overridden-4.0.1" = { + name = "postcss-discard-overridden"; + packageName = "postcss-discard-overridden"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz"; + sha512 = "IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg=="; + }; + }; + "postcss-double-position-gradients-1.0.0" = { + name = "postcss-double-position-gradients"; + packageName = "postcss-double-position-gradients"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz"; + sha512 = "G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA=="; + }; + }; + "postcss-env-function-2.0.2" = { + name = "postcss-env-function"; + packageName = "postcss-env-function"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-2.0.2.tgz"; + sha512 = "rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw=="; + }; + }; + "postcss-focus-visible-4.0.0" = { + name = "postcss-focus-visible"; + packageName = "postcss-focus-visible"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz"; + sha512 = "Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g=="; + }; + }; + "postcss-focus-within-3.0.0" = { + name = "postcss-focus-within"; + packageName = "postcss-focus-within"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz"; + sha512 = "W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w=="; + }; + }; + "postcss-font-variant-4.0.1" = { + name = "postcss-font-variant"; + packageName = "postcss-font-variant"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz"; + sha512 = "I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA=="; + }; + }; + "postcss-gap-properties-2.0.0" = { + name = "postcss-gap-properties"; + packageName = "postcss-gap-properties"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz"; + sha512 = "QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg=="; + }; + }; + "postcss-html-0.36.0" = { + name = "postcss-html"; + packageName = "postcss-html"; + version = "0.36.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz"; + sha512 = "HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw=="; + }; + }; + "postcss-image-set-function-3.0.1" = { + name = "postcss-image-set-function"; + packageName = "postcss-image-set-function"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz"; + sha512 = "oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw=="; + }; + }; + "postcss-initial-3.0.4" = { + name = "postcss-initial"; + packageName = "postcss-initial"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.4.tgz"; + sha512 = "3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg=="; + }; + }; + "postcss-jsx-0.36.4" = { + name = "postcss-jsx"; + packageName = "postcss-jsx"; + version = "0.36.4"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-jsx/-/postcss-jsx-0.36.4.tgz"; + sha512 = "jwO/7qWUvYuWYnpOb0+4bIIgJt7003pgU3P6nETBLaOyBXuTD55ho21xnals5nBrlpTIFodyd3/jBi6UO3dHvA=="; + }; + }; + "postcss-lab-function-2.0.1" = { + name = "postcss-lab-function"; + packageName = "postcss-lab-function"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz"; + sha512 = "whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg=="; + }; + }; + "postcss-less-3.1.4" = { + name = "postcss-less"; + packageName = "postcss-less"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz"; + sha512 = "7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA=="; + }; + }; + "postcss-load-config-2.1.2" = { + name = "postcss-load-config"; + packageName = "postcss-load-config"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz"; + sha512 = "/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw=="; + }; + }; + "postcss-loader-3.0.0" = { + name = "postcss-loader"; + packageName = "postcss-loader"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz"; + sha512 = "cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA=="; + }; + }; + "postcss-logical-3.0.0" = { + name = "postcss-logical"; + packageName = "postcss-logical"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-logical/-/postcss-logical-3.0.0.tgz"; + sha512 = "1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA=="; + }; + }; + "postcss-markdown-0.36.0" = { + name = "postcss-markdown"; + packageName = "postcss-markdown"; + version = "0.36.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-markdown/-/postcss-markdown-0.36.0.tgz"; + sha512 = "rl7fs1r/LNSB2bWRhyZ+lM/0bwKv9fhl38/06gF6mKMo/NPnp55+K1dSTosSVjFZc0e1ppBlu+WT91ba0PMBfQ=="; + }; + }; + "postcss-media-minmax-4.0.0" = { + name = "postcss-media-minmax"; + packageName = "postcss-media-minmax"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz"; + sha512 = "fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw=="; + }; + }; + "postcss-media-query-parser-0.2.3" = { + name = "postcss-media-query-parser"; + packageName = "postcss-media-query-parser"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz"; + sha1 = "27b39c6f4d94f81b1a73b8f76351c609e5cef244"; + }; + }; + "postcss-merge-longhand-4.0.11" = { + name = "postcss-merge-longhand"; + packageName = "postcss-merge-longhand"; + version = "4.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz"; + sha512 = "alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw=="; + }; + }; + "postcss-merge-rules-4.0.3" = { + name = "postcss-merge-rules"; + packageName = "postcss-merge-rules"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz"; + sha512 = "U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ=="; + }; + }; + "postcss-minify-font-values-4.0.2" = { + name = "postcss-minify-font-values"; + packageName = "postcss-minify-font-values"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz"; + sha512 = "j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg=="; + }; + }; + "postcss-minify-gradients-4.0.2" = { + name = "postcss-minify-gradients"; + packageName = "postcss-minify-gradients"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz"; + sha512 = "qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q=="; + }; + }; + "postcss-minify-params-4.0.2" = { + name = "postcss-minify-params"; + packageName = "postcss-minify-params"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz"; + sha512 = "G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg=="; + }; + }; + "postcss-minify-selectors-4.0.2" = { + name = "postcss-minify-selectors"; + packageName = "postcss-minify-selectors"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz"; + sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="; + }; + }; + "postcss-modules-extract-imports-3.0.0" = { + name = "postcss-modules-extract-imports"; + packageName = "postcss-modules-extract-imports"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; + sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw=="; + }; + }; + "postcss-modules-local-by-default-4.0.0" = { + name = "postcss-modules-local-by-default"; + packageName = "postcss-modules-local-by-default"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; + sha512 = "sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ=="; + }; + }; + "postcss-modules-scope-3.0.0" = { + name = "postcss-modules-scope"; + packageName = "postcss-modules-scope"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; + sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg=="; + }; + }; + "postcss-modules-values-4.0.0" = { + name = "postcss-modules-values"; + packageName = "postcss-modules-values"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; + sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="; + }; + }; + "postcss-nesting-7.0.1" = { + name = "postcss-nesting"; + packageName = "postcss-nesting"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-7.0.1.tgz"; + sha512 = "FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg=="; + }; + }; + "postcss-normalize-charset-4.0.1" = { + name = "postcss-normalize-charset"; + packageName = "postcss-normalize-charset"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz"; + sha512 = "gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g=="; + }; + }; + "postcss-normalize-display-values-4.0.2" = { + name = "postcss-normalize-display-values"; + packageName = "postcss-normalize-display-values"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz"; + sha512 = "3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ=="; + }; + }; + "postcss-normalize-positions-4.0.2" = { + name = "postcss-normalize-positions"; + packageName = "postcss-normalize-positions"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz"; + sha512 = "Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA=="; + }; + }; + "postcss-normalize-repeat-style-4.0.2" = { + name = "postcss-normalize-repeat-style"; + packageName = "postcss-normalize-repeat-style"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz"; + sha512 = "qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q=="; + }; + }; + "postcss-normalize-string-4.0.2" = { + name = "postcss-normalize-string"; + packageName = "postcss-normalize-string"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz"; + sha512 = "RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA=="; + }; + }; + "postcss-normalize-timing-functions-4.0.2" = { + name = "postcss-normalize-timing-functions"; + packageName = "postcss-normalize-timing-functions"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz"; + sha512 = "acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A=="; + }; + }; + "postcss-normalize-unicode-4.0.1" = { + name = "postcss-normalize-unicode"; + packageName = "postcss-normalize-unicode"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz"; + sha512 = "od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg=="; + }; + }; + "postcss-normalize-url-4.0.1" = { + name = "postcss-normalize-url"; + packageName = "postcss-normalize-url"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz"; + sha512 = "p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA=="; + }; + }; + "postcss-normalize-whitespace-4.0.2" = { + name = "postcss-normalize-whitespace"; + packageName = "postcss-normalize-whitespace"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz"; + sha512 = "tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA=="; + }; + }; + "postcss-ordered-values-4.1.2" = { + name = "postcss-ordered-values"; + packageName = "postcss-ordered-values"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz"; + sha512 = "2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw=="; + }; + }; + "postcss-overflow-shorthand-2.0.0" = { + name = "postcss-overflow-shorthand"; + packageName = "postcss-overflow-shorthand"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz"; + sha512 = "aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g=="; + }; + }; + "postcss-page-break-2.0.0" = { + name = "postcss-page-break"; + packageName = "postcss-page-break"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-2.0.0.tgz"; + sha512 = "tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ=="; + }; + }; + "postcss-place-4.0.1" = { + name = "postcss-place"; + packageName = "postcss-place"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-place/-/postcss-place-4.0.1.tgz"; + sha512 = "Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg=="; + }; + }; + "postcss-preset-env-6.7.0" = { + name = "postcss-preset-env"; + packageName = "postcss-preset-env"; + version = "6.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz"; + sha512 = "eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg=="; + }; + }; + "postcss-pseudo-class-any-link-6.0.0" = { + name = "postcss-pseudo-class-any-link"; + packageName = "postcss-pseudo-class-any-link"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz"; + sha512 = "lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew=="; + }; + }; + "postcss-reduce-initial-4.0.3" = { + name = "postcss-reduce-initial"; + packageName = "postcss-reduce-initial"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz"; + sha512 = "gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA=="; + }; + }; + "postcss-reduce-transforms-4.0.2" = { + name = "postcss-reduce-transforms"; + packageName = "postcss-reduce-transforms"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz"; + sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="; + }; + }; + "postcss-replace-overflow-wrap-3.0.0" = { + name = "postcss-replace-overflow-wrap"; + packageName = "postcss-replace-overflow-wrap"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz"; + sha512 = "2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw=="; + }; + }; + "postcss-reporter-1.4.1" = { + name = "postcss-reporter"; + packageName = "postcss-reporter"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.4.1.tgz"; + sha1 = "c136f0a5b161915f379dd3765c61075f7e7b9af2"; + }; + }; + "postcss-reporter-6.0.1" = { + name = "postcss-reporter"; + packageName = "postcss-reporter"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-6.0.1.tgz"; + sha512 = "LpmQjfRWyabc+fRygxZjpRxfhRf9u/fdlKf4VHG4TSPbV2XNsuISzYW1KL+1aQzx53CAppa1bKG4APIB/DOXXw=="; + }; + }; + "postcss-resolve-nested-selector-0.1.1" = { + name = "postcss-resolve-nested-selector"; + packageName = "postcss-resolve-nested-selector"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz"; + sha1 = "29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"; + }; + }; + "postcss-safe-parser-4.0.2" = { + name = "postcss-safe-parser"; + packageName = "postcss-safe-parser"; + version = "4.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=="; + }; + }; + "postcss-sass-0.3.5" = { + name = "postcss-sass"; + packageName = "postcss-sass"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.3.5.tgz"; + sha512 = "B5z2Kob4xBxFjcufFnhQ2HqJQ2y/Zs/ic5EZbCywCkxKd756Q40cIQ/veRDwSrw1BF6+4wUgmpm0sBASqVi65A=="; + }; + }; + "postcss-sass-0.4.4" = { + name = "postcss-sass"; + packageName = "postcss-sass"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz"; + sha512 = "BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg=="; + }; + }; + "postcss-scss-2.1.1" = { + name = "postcss-scss"; + packageName = "postcss-scss"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz"; + sha512 = "jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA=="; + }; + }; + "postcss-selector-matches-4.0.0" = { + name = "postcss-selector-matches"; + packageName = "postcss-selector-matches"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz"; + sha512 = "LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww=="; + }; + }; + "postcss-selector-not-4.0.1" = { + name = "postcss-selector-not"; + packageName = "postcss-selector-not"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz"; + sha512 = "YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ=="; + }; + }; + "postcss-selector-parser-2.2.3" = { + name = "postcss-selector-parser"; + packageName = "postcss-selector-parser"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz"; + sha1 = "f9437788606c3c9acee16ffe8d8b16297f27bb90"; + }; + }; + "postcss-selector-parser-3.1.2" = { + name = "postcss-selector-parser"; + packageName = "postcss-selector-parser"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; + sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; + }; + }; + "postcss-selector-parser-5.0.0" = { + name = "postcss-selector-parser"; + packageName = "postcss-selector-parser"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz"; + sha512 = "w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ=="; + }; + }; + "postcss-selector-parser-6.0.5" = { + name = "postcss-selector-parser"; + packageName = "postcss-selector-parser"; + version = "6.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz"; + sha512 = "aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg=="; + }; + }; + "postcss-sorting-4.1.0" = { + name = "postcss-sorting"; + packageName = "postcss-sorting"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-4.1.0.tgz"; + sha512 = "r4T2oQd1giURJdHQ/RMb72dKZCuLOdWx2B/XhXN1Y1ZdnwXsKH896Qz6vD4tFy9xSjpKNYhlZoJmWyhH/7JUQw=="; + }; + }; + "postcss-sorting-5.0.1" = { + name = "postcss-sorting"; + packageName = "postcss-sorting"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-5.0.1.tgz"; + sha512 = "Y9fUFkIhfrm6i0Ta3n+89j56EFqaNRdUKqXyRp6kvTcSXnmgEjaVowCXH+JBe9+YKWqd4nc28r2sgwnzJalccA=="; + }; + }; + "postcss-svgo-4.0.3" = { + name = "postcss-svgo"; + packageName = "postcss-svgo"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz"; + sha512 = "NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw=="; + }; + }; + "postcss-syntax-0.36.2" = { + name = "postcss-syntax"; + packageName = "postcss-syntax"; + version = "0.36.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz"; + sha512 = "nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w=="; + }; + }; + "postcss-unique-selectors-4.0.1" = { + name = "postcss-unique-selectors"; + packageName = "postcss-unique-selectors"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz"; + sha512 = "+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg=="; + }; + }; + "postcss-value-parser-3.3.1" = { + name = "postcss-value-parser"; + packageName = "postcss-value-parser"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"; + sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; + }; + }; + "postcss-value-parser-4.1.0" = { + name = "postcss-value-parser"; + packageName = "postcss-value-parser"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; + }; + }; + "postcss-values-parser-2.0.1" = { + name = "postcss-values-parser"; + packageName = "postcss-values-parser"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz"; + sha512 = "2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg=="; + }; + }; + "prelude-ls-1.2.1" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"; + sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; + }; + }; + "pretty-bytes-5.6.0" = { + name = "pretty-bytes"; + packageName = "pretty-bytes"; + version = "5.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"; + sha512 = "FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="; + }; + }; + "pretty-error-2.1.2" = { + name = "pretty-error"; + packageName = "pretty-error"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz"; + sha512 = "EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw=="; + }; + }; + "process-nextick-args-2.0.1" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + }; + "progress-2.0.3" = { + name = "progress"; + packageName = "progress"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; + }; + }; + "promise-inflight-1.0.1" = { + name = "promise-inflight"; + packageName = "promise-inflight"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; + }; + }; + "proxy-addr-2.0.6" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; + sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; + }; + }; + "prr-1.0.1" = { + name = "prr"; + packageName = "prr"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"; + sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; + }; + }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + }; + "punycode-1.3.2" = { + name = "punycode"; + packageName = "punycode"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; + "q-1.5.1" = { + name = "q"; + packageName = "q"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; + sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + }; + }; + "qs-6.7.0" = { + name = "qs"; + packageName = "qs"; + version = "6.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; + }; + }; + "querystring-0.2.0" = { + name = "querystring"; + packageName = "querystring"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + }; + "querystringify-2.2.0" = { + name = "querystringify"; + packageName = "querystringify"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz"; + sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="; + }; + }; + "queue-microtask-1.2.3" = { + name = "queue-microtask"; + packageName = "queue-microtask"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; + }; + }; + "quick-lru-1.1.0" = { + name = "quick-lru"; + packageName = "quick-lru"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz"; + sha1 = "4360b17c61136ad38078397ff11416e186dcfbb8"; + }; + }; + "quick-lru-4.0.1" = { + name = "quick-lru"; + packageName = "quick-lru"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz"; + sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="; + }; + }; + "randombytes-2.1.0" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; + }; + }; + "range-parser-1.2.1" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; + }; + }; + "raw-body-2.4.0" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; + sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; + }; + }; + "read-file-stdin-0.2.1" = { + name = "read-file-stdin"; + packageName = "read-file-stdin"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-file-stdin/-/read-file-stdin-0.2.1.tgz"; + sha1 = "25eccff3a153b6809afacb23ee15387db9e0ee61"; + }; + }; + "read-pkg-2.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + }; + }; + "read-pkg-3.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz"; + sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; + }; + }; + "read-pkg-5.2.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz"; + sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; + }; + }; + "read-pkg-up-2.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + }; + }; + "read-pkg-up-3.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz"; + sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07"; + }; + }; + "read-pkg-up-7.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; + sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg=="; + }; + }; + "readable-stream-2.3.7" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + }; + }; + "readable-stream-3.6.0" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + }; + }; + "readdirp-2.2.1" = { + name = "readdirp"; + packageName = "readdirp"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz"; + sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; + }; + }; + "readdirp-3.5.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz"; + sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; + }; + }; + "rechoir-0.7.0" = { + name = "rechoir"; + packageName = "rechoir"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz"; + sha512 = "ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q=="; + }; + }; + "redent-2.0.0" = { + name = "redent"; + packageName = "redent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz"; + sha1 = "c1b2007b42d57eb1389079b3c8333639d5e1ccaa"; + }; + }; + "redent-3.0.0" = { + name = "redent"; + packageName = "redent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz"; + sha512 = "6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg=="; + }; + }; + "regenerate-1.4.2" = { + name = "regenerate"; + packageName = "regenerate"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"; + sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; + }; + }; + "regenerate-unicode-properties-8.2.0" = { + name = "regenerate-unicode-properties"; + packageName = "regenerate-unicode-properties"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; + sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; + }; + }; + "regenerator-runtime-0.11.1" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; + }; + }; + "regenerator-runtime-0.13.8" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.13.8"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.8.tgz"; + sha512 = "o/ASGwgZ6UiVjspr4YnzHKF1NbBdX+mCPkSeymofk/d7I+csCYn3ZgZMMVtXeecpT8DBiI2nAlYkHd+xNCqu4A=="; + }; + }; + "regenerator-transform-0.14.5" = { + name = "regenerator-transform"; + packageName = "regenerator-transform"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; + sha512 = "eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw=="; + }; + }; + "regex-not-1.0.2" = { + name = "regex-not"; + packageName = "regex-not"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; + sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; + }; + }; + "regexp.prototype.flags-1.3.1" = { + name = "regexp.prototype.flags"; + packageName = "regexp.prototype.flags"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz"; + sha512 = "JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA=="; + }; + }; + "regexpp-3.1.0" = { + name = "regexpp"; + packageName = "regexpp"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz"; + sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; + }; + }; + "regexpu-core-4.7.1" = { + name = "regexpu-core"; + packageName = "regexpu-core"; + version = "4.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz"; + sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ=="; + }; + }; + "regjsgen-0.5.2" = { + name = "regjsgen"; + packageName = "regjsgen"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz"; + sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; + }; + }; + "regjsparser-0.6.9" = { + name = "regjsparser"; + packageName = "regjsparser"; + version = "0.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz"; + sha512 = "ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ=="; + }; + }; + "relateurl-0.2.7" = { + name = "relateurl"; + packageName = "relateurl"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"; + sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; + }; + }; + "remark-10.0.1" = { + name = "remark"; + packageName = "remark"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark/-/remark-10.0.1.tgz"; + sha512 = "E6lMuoLIy2TyiokHprMjcWNJ5UxfGQjaMSMhV+f4idM625UjjK4j798+gPs5mfjzDE6vL0oFKVeZM6gZVSVrzQ=="; + }; + }; + "remark-13.0.0" = { + name = "remark"; + packageName = "remark"; + version = "13.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz"; + sha512 = "HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA=="; + }; + }; + "remark-parse-6.0.3" = { + name = "remark-parse"; + packageName = "remark-parse"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-parse/-/remark-parse-6.0.3.tgz"; + sha512 = "QbDXWN4HfKTUC0hHa4teU463KclLAnwpn/FBn87j9cKYJWWawbiLgMfP2Q4XwhxxuuuOxHlw+pSN0OKuJwyVvg=="; + }; + }; + "remark-parse-9.0.0" = { + name = "remark-parse"; + packageName = "remark-parse"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz"; + sha512 = "geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw=="; + }; + }; + "remark-stringify-6.0.4" = { + name = "remark-stringify"; + packageName = "remark-stringify"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-6.0.4.tgz"; + sha512 = "eRWGdEPMVudijE/psbIDNcnJLRVx3xhfuEsTDGgH4GsFF91dVhw5nhmnBppafJ7+NWINW6C7ZwWbi30ImJzqWg=="; + }; + }; + "remark-stringify-9.0.1" = { + name = "remark-stringify"; + packageName = "remark-stringify"; + version = "9.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz"; + sha512 = "mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg=="; + }; + }; + "remove-trailing-separator-1.1.0" = { + name = "remove-trailing-separator"; + packageName = "remove-trailing-separator"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + }; + "renderkid-2.0.5" = { + name = "renderkid"; + packageName = "renderkid"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.5.tgz"; + sha512 = "ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ=="; + }; + }; + "repeat-element-1.1.4" = { + name = "repeat-element"; + packageName = "repeat-element"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz"; + sha512 = "LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ=="; + }; + }; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; + "replace-ext-1.0.0" = { + name = "replace-ext"; + packageName = "replace-ext"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz"; + sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; + }; + }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-from-string-2.0.2" = { + name = "require-from-string"; + packageName = "require-from-string"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"; + sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; + }; + }; + "require-main-filename-2.0.0" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; + }; + }; + "requires-port-1.0.0" = { + name = "requires-port"; + packageName = "requires-port"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; + sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + }; + }; + "resize-observer-polyfill-1.5.1" = { + name = "resize-observer-polyfill"; + packageName = "resize-observer-polyfill"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz"; + sha512 = "LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="; + }; + }; + "resolve-1.20.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"; + sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; + }; + }; + "resolve-cwd-2.0.0" = { + name = "resolve-cwd"; + packageName = "resolve-cwd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz"; + sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; + }; + }; + "resolve-cwd-3.0.0" = { + name = "resolve-cwd"; + packageName = "resolve-cwd"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz"; + sha512 = "OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg=="; + }; + }; + "resolve-from-3.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"; + 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-from-5.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz"; + sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="; + }; + }; + "resolve-url-0.2.1" = { + name = "resolve-url"; + packageName = "resolve-url"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + }; + "ret-0.1.15" = { + name = "ret"; + packageName = "ret"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; + sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; + }; + }; + "retry-0.12.0" = { + name = "retry"; + packageName = "retry"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + }; + "reusify-1.0.4" = { + name = "reusify"; + packageName = "reusify"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; + }; + }; + "rgb-regex-1.0.1" = { + name = "rgb-regex"; + packageName = "rgb-regex"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz"; + sha1 = "c0e0d6882df0e23be254a475e8edd41915feaeb1"; + }; + }; + "rgba-regex-1.0.0" = { + name = "rgba-regex"; + packageName = "rgba-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz"; + sha1 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3"; + }; + }; + "rimraf-2.6.3" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"; + sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; + }; + }; + "rimraf-2.7.1" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + }; + }; + "rimraf-3.0.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; + }; + }; + "rollup-1.32.1" = { + name = "rollup"; + packageName = "rollup"; + version = "1.32.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup/-/rollup-1.32.1.tgz"; + sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; + }; + }; + "rollup-plugin-babel-4.4.0" = { + name = "rollup-plugin-babel"; + packageName = "rollup-plugin-babel"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.4.0.tgz"; + sha512 = "Lek/TYp1+7g7I+uMfJnnSJ7YWoD58ajo6Oarhlex7lvUce+RCKRuGRSgztDO3/MF/PuGKmUL5iTHKf208UNszw=="; + }; + }; + "rollup-plugin-terser-5.3.1" = { + name = "rollup-plugin-terser"; + packageName = "rollup-plugin-terser"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-5.3.1.tgz"; + sha512 = "1pkwkervMJQGFYvM9nscrUoncPwiKR/K+bHdjv6PFgRo3cgPHoRT83y2Aa3GvINj4539S15t/tpFPb775TDs6w=="; + }; + }; + "rollup-pluginutils-2.8.2" = { + name = "rollup-pluginutils"; + packageName = "rollup-pluginutils"; + version = "2.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz"; + sha512 = "EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ=="; + }; + }; + "run-parallel-1.2.0" = { + name = "run-parallel"; + packageName = "run-parallel"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; + sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safe-regex-1.1.0" = { + name = "safe-regex"; + packageName = "safe-regex"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "sass-1.32.12" = { + name = "sass"; + packageName = "sass"; + version = "1.32.12"; + src = fetchurl { + url = "https://registry.npmjs.org/sass/-/sass-1.32.12.tgz"; + sha512 = "zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA=="; + }; + }; + "sass-loader-10.1.1" = { + name = "sass-loader"; + packageName = "sass-loader"; + version = "10.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sass-loader/-/sass-loader-10.1.1.tgz"; + sha512 = "W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw=="; + }; + }; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + }; + }; + "schema-utils-1.0.0" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz"; + sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="; + }; + }; + "schema-utils-2.7.1" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz"; + sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; + }; + }; + "schema-utils-3.0.0" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz"; + sha512 = "6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA=="; + }; + }; + "screenfull-5.1.0" = { + name = "screenfull"; + packageName = "screenfull"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/screenfull/-/screenfull-5.1.0.tgz"; + sha512 = "dYaNuOdzr+kc6J6CFcBrzkLCfyGcMg+gWkJ8us93IQ7y1cevhQAugFsaCdMHb6lw8KV3xPzSxzH7zM1dQap9mA=="; + }; + }; + "select-hose-2.0.0" = { + name = "select-hose"; + packageName = "select-hose"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz"; + sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; + }; + }; + "selfsigned-1.10.11" = { + name = "selfsigned"; + packageName = "selfsigned"; + version = "1.10.11"; + src = fetchurl { + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz"; + sha512 = "aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA=="; + }; + }; + "semver-5.7.1" = { + name = "semver"; + packageName = "semver"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; + "semver-6.3.0" = { + name = "semver"; + packageName = "semver"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + }; + }; + "semver-7.0.0" = { + name = "semver"; + packageName = "semver"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"; + sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; + }; + }; + "semver-7.3.2" = { + name = "semver"; + packageName = "semver"; + version = "7.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz"; + sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; + }; + }; + "semver-7.3.5" = { + name = "semver"; + packageName = "semver"; + version = "7.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + }; + }; + "send-0.17.1" = { + name = "send"; + packageName = "send"; + version = "0.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; + }; + }; + "serialize-javascript-4.0.0" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz"; + sha512 = "GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw=="; + }; + }; + "serialize-javascript-5.0.1" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; + }; + }; + "serve-index-1.9.1" = { + name = "serve-index"; + packageName = "serve-index"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"; + sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239"; + }; + }; + "serve-static-1.14.1" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "set-immediate-shim-1.0.1" = { + name = "set-immediate-shim"; + packageName = "set-immediate-shim"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"; + sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; + }; + }; + "set-value-2.0.1" = { + name = "set-value"; + packageName = "set-value"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz"; + sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; + }; + }; + "setprototypeof-1.1.0" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; + sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; + }; + }; + "setprototypeof-1.1.1" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + }; + }; + "shallow-clone-3.0.1" = { + name = "shallow-clone"; + packageName = "shallow-clone"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz"; + sha512 = "/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA=="; + }; + }; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-command-2.0.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + }; + "shebang-regex-3.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; + }; + }; + "signal-exit-3.0.3" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; + }; + }; + "simple-swizzle-0.2.2" = { + name = "simple-swizzle"; + packageName = "simple-swizzle"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; + sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; + }; + }; + "slash-2.0.0" = { + name = "slash"; + packageName = "slash"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz"; + sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="; + }; + }; + "slash-3.0.0" = { + name = "slash"; + packageName = "slash"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; + sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; + }; + }; + "slice-ansi-2.1.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz"; + sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; + }; + }; + "slice-ansi-4.0.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz"; + sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="; + }; + }; + "snapdragon-0.8.2" = { + name = "snapdragon"; + packageName = "snapdragon"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; + sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; + }; + }; + "snapdragon-node-2.1.1" = { + name = "snapdragon-node"; + packageName = "snapdragon-node"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; + }; + }; + "snapdragon-util-3.0.1" = { + name = "snapdragon-util"; + packageName = "snapdragon-util"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; + }; + }; + "sockjs-0.3.21" = { + name = "sockjs"; + packageName = "sockjs"; + version = "0.3.21"; + src = fetchurl { + url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz"; + sha512 = "DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw=="; + }; + }; + "sockjs-client-1.5.1" = { + name = "sockjs-client"; + packageName = "sockjs-client"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.1.tgz"; + sha512 = "VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ=="; + }; + }; + "sortablejs-1.13.0" = { + name = "sortablejs"; + packageName = "sortablejs"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sortablejs/-/sortablejs-1.13.0.tgz"; + sha512 = "RBJirPY0spWCrU5yCmWM1eFs/XgX2J5c6b275/YyxFRgnzPhKl/TDeU2hNR8Dt7ITq66NRPM4UlOt+e5O4CFHg=="; + }; + }; + "source-list-map-2.0.1" = { + name = "source-list-map"; + packageName = "source-list-map"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz"; + sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + }; + "source-map-0.7.3" = { + name = "source-map"; + packageName = "source-map"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"; + sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; + }; + }; + "source-map-loader-1.1.3" = { + name = "source-map-loader"; + packageName = "source-map-loader"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-loader/-/source-map-loader-1.1.3.tgz"; + sha512 = "6YHeF+XzDOrT/ycFJNI53cgEsp/tHTMl37hi7uVyqFAlTXW109JazaQCkbc+jjoL2637qkH1amLi+JzrIpt5lA=="; + }; + }; + "source-map-resolve-0.5.3" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; + }; + }; + "source-map-support-0.5.19" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.19"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; + sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; + }; + }; + "source-map-url-0.4.1" = { + name = "source-map-url"; + packageName = "source-map-url"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz"; + sha512 = "cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="; + }; + }; + "sourcemap-codec-1.4.8" = { + name = "sourcemap-codec"; + packageName = "sourcemap-codec"; + version = "1.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"; + sha512 = "9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="; + }; + }; + "spdx-correct-3.1.1" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; + }; + }; + "spdx-exceptions-2.3.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; + }; + }; + "spdx-expression-parse-3.0.1" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; + }; + }; + "spdx-license-ids-3.0.7" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; + sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="; + }; + }; + "spdy-4.0.2" = { + name = "spdy"; + packageName = "spdy"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz"; + sha512 = "r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA=="; + }; + }; + "spdy-transport-3.0.0" = { + name = "spdy-transport"; + packageName = "spdy-transport"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz"; + sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="; + }; + }; + "specificity-0.4.1" = { + name = "specificity"; + packageName = "specificity"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz"; + sha512 = "1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg=="; + }; + }; + "split-string-3.1.0" = { + name = "split-string"; + packageName = "split-string"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; + sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "ssr-window-3.0.0" = { + name = "ssr-window"; + packageName = "ssr-window"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssr-window/-/ssr-window-3.0.0.tgz"; + sha512 = "q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA=="; + }; + }; + "ssri-8.0.1" = { + name = "ssri"; + packageName = "ssri"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz"; + sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="; + }; + }; + "stable-0.1.8" = { + name = "stable"; + packageName = "stable"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz"; + sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; + }; + }; + "state-toggle-1.0.3" = { + name = "state-toggle"; + packageName = "state-toggle"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz"; + sha512 = "d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ=="; + }; + }; + "static-extend-0.1.2" = { + name = "static-extend"; + packageName = "static-extend"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + }; + "statuses-1.5.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + }; + "string-width-3.1.0" = { + name = "string-width"; + packageName = "string-width"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; + }; + }; + "string-width-4.2.2" = { + name = "string-width"; + packageName = "string-width"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz"; + sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="; + }; + }; + "string.prototype.trimend-1.0.4" = { + name = "string.prototype.trimend"; + packageName = "string.prototype.trimend"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; + sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A=="; + }; + }; + "string.prototype.trimstart-1.0.4" = { + name = "string.prototype.trimstart"; + packageName = "string.prototype.trimstart"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; + sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "stringify-entities-1.3.2" = { + name = "stringify-entities"; + packageName = "stringify-entities"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz"; + sha512 = "nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A=="; + }; + }; + "stringify-object-3.3.0" = { + name = "stringify-object"; + packageName = "stringify-object"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"; + sha512 = "rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw=="; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-ansi-5.2.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; + }; + }; + "strip-ansi-6.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; + }; + }; + "strip-bom-3.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + }; + "strip-comments-1.0.2" = { + name = "strip-comments"; + packageName = "strip-comments"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-comments/-/strip-comments-1.0.2.tgz"; + sha512 = "kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw=="; + }; + }; + "strip-eof-1.0.0" = { + name = "strip-eof"; + packageName = "strip-eof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + }; + "strip-final-newline-2.0.0" = { + name = "strip-final-newline"; + packageName = "strip-final-newline"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; + sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; + }; + }; + "strip-indent-2.0.0" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz"; + sha1 = "5ef8db295d01e6ed6cbf7aab96998d7822527b68"; + }; + }; + "strip-indent-3.0.0" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz"; + sha512 = "laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ=="; + }; + }; + "strip-json-comments-3.1.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; + }; + }; + "style-loader-2.0.0" = { + name = "style-loader"; + packageName = "style-loader"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/style-loader/-/style-loader-2.0.0.tgz"; + sha512 = "Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ=="; + }; + }; + "style-search-0.1.0" = { + name = "style-search"; + packageName = "style-search"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz"; + sha1 = "7958c793e47e32e07d2b5cafe5c0bf8e12e77902"; + }; + }; + "stylehacks-2.3.2" = { + name = "stylehacks"; + packageName = "stylehacks"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stylehacks/-/stylehacks-2.3.2.tgz"; + sha1 = "64c83e0438a68c9edf449e8c552a7d9ab6009b0b"; + }; + }; + "stylehacks-4.0.3" = { + name = "stylehacks"; + packageName = "stylehacks"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz"; + sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; + }; + }; + "stylelint-13.13.1" = { + name = "stylelint"; + packageName = "stylelint"; + version = "13.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.13.1.tgz"; + sha512 = "Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ=="; + }; + }; + "stylelint-9.10.1" = { + name = "stylelint"; + packageName = "stylelint"; + version = "9.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stylelint/-/stylelint-9.10.1.tgz"; + sha512 = "9UiHxZhOAHEgeQ7oLGwrwoDR8vclBKlSX7r4fH0iuu0SfPwFaLkb1c7Q2j1cqg9P7IDXeAV2TvQML/fRQzGBBQ=="; + }; + }; + "stylelint-config-rational-order-0.1.2" = { + name = "stylelint-config-rational-order"; + packageName = "stylelint-config-rational-order"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stylelint-config-rational-order/-/stylelint-config-rational-order-0.1.2.tgz"; + sha512 = "Qo7ZQaihCwTqijfZg4sbdQQHtugOX/B1/fYh018EiDZHW+lkqH9uHOnsDwDPGZrYJuB6CoyI7MZh2ecw2dOkew=="; + }; + }; + "stylelint-no-browser-hacks-1.2.1" = { + name = "stylelint-no-browser-hacks"; + packageName = "stylelint-no-browser-hacks"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stylelint-no-browser-hacks/-/stylelint-no-browser-hacks-1.2.1.tgz"; + sha512 = "lPcqHx3e/WnrXdw0wdnKtcjcSCAYEXjwSitXRw0OQ2qPF+iLyDFoarbn4qcw38Uuu7q29fhj+w2mECLM0fUOlw=="; + }; + }; + "stylelint-order-2.2.1" = { + name = "stylelint-order"; + packageName = "stylelint-order"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stylelint-order/-/stylelint-order-2.2.1.tgz"; + sha512 = "019KBV9j8qp1MfBjJuotse6MgaZqGVtXMc91GU9MsS9Feb+jYUvUU3Z8XiClqPdqJZQ0ryXQJGg3U3PcEjXwfg=="; + }; + }; + "stylelint-order-4.1.0" = { + name = "stylelint-order"; + packageName = "stylelint-order"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stylelint-order/-/stylelint-order-4.1.0.tgz"; + sha512 = "sVTikaDvMqg2aJjh4r48jsdfmqLT+nqB1MOsaBnvM3OwLx4S+WXcsxsgk5w18h/OZoxZCxuyXMh61iBHcj9Qiw=="; + }; + }; + "stylelint-scss-3.19.0" = { + name = "stylelint-scss"; + packageName = "stylelint-scss"; + version = "3.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.19.0.tgz"; + sha512 = "Ic5bsmpS4wVucOw44doC1Yi9f5qbeVL4wPFiEOaUElgsOuLEN6Ofn/krKI8BeNL2gAn53Zu+IcVV4E345r6rBw=="; + }; + }; + "sugarss-2.0.0" = { + name = "sugarss"; + packageName = "sugarss"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz"; + sha512 = "WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ=="; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; + "supports-color-3.2.3" = { + name = "supports-color"; + packageName = "supports-color"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz"; + sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; + }; + }; + "supports-color-5.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + }; + "supports-color-6.1.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz"; + sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; + }; + }; + "supports-color-7.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; + }; + }; + "svg-tags-1.0.0" = { + name = "svg-tags"; + packageName = "svg-tags"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz"; + sha1 = "58f71cee3bd519b59d4b2a843b6c7de64ac04764"; + }; + }; + "svgo-1.3.2" = { + name = "svgo"; + packageName = "svgo"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz"; + sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; + }; + }; + "swiper-6.5.9" = { + name = "swiper"; + packageName = "swiper"; + version = "6.5.9"; + src = fetchurl { + url = "https://registry.npmjs.org/swiper/-/swiper-6.5.9.tgz"; + sha512 = "zO3UCLVEiOXZontAQWBNpWFZGV3WaXwHSgvng0qIGLVMyxYGD6w78S7YkGAu/XBam1SBQNZzxqfFc/LDjNdq/A=="; + }; + }; + "table-5.4.6" = { + name = "table"; + packageName = "table"; + version = "5.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz"; + sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; + }; + }; + "table-6.6.0" = { + name = "table"; + packageName = "table"; + version = "6.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-6.6.0.tgz"; + sha512 = "iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg=="; + }; + }; + "tapable-1.1.3" = { + name = "tapable"; + packageName = "tapable"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz"; + sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="; + }; + }; + "tapable-2.2.0" = { + name = "tapable"; + packageName = "tapable"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz"; + sha512 = "FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw=="; + }; + }; + "tar-6.1.0" = { + name = "tar"; + packageName = "tar"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz"; + sha512 = "DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA=="; + }; + }; + "temp-dir-1.0.0" = { + name = "temp-dir"; + packageName = "temp-dir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz"; + sha1 = "0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"; + }; + }; + "tempy-0.3.0" = { + name = "tempy"; + packageName = "tempy"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tempy/-/tempy-0.3.0.tgz"; + sha512 = "WrH/pui8YCwmeiAoxV+lpRH9HpRtgBhSR2ViBPgpGb/wnYDzp21R4MN45fsCGvLROvY67o3byhJRYRONJyImVQ=="; + }; + }; + "terser-4.8.0" = { + name = "terser"; + packageName = "terser"; + version = "4.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz"; + sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; + }; + }; + "terser-5.7.0" = { + name = "terser"; + packageName = "terser"; + version = "5.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-5.7.0.tgz"; + sha512 = "HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g=="; + }; + }; + "terser-webpack-plugin-5.1.1" = { + name = "terser-webpack-plugin"; + packageName = "terser-webpack-plugin"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz"; + sha512 = "5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q=="; + }; + }; + "text-table-0.2.0" = { + name = "text-table"; + packageName = "text-table"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + }; + "thunky-1.1.0" = { + name = "thunky"; + packageName = "thunky"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"; + sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; + }; + }; + "timsort-0.3.0" = { + name = "timsort"; + packageName = "timsort"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz"; + sha1 = "405411a8e7e6339fe64db9a234de11dc31e02bd4"; + }; + }; + "to-fast-properties-2.0.0" = { + name = "to-fast-properties"; + packageName = "to-fast-properties"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + }; + "to-object-path-0.3.0" = { + name = "to-object-path"; + packageName = "to-object-path"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + }; + "to-regex-3.0.2" = { + name = "to-regex"; + packageName = "to-regex"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; + sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; + }; + }; + "to-regex-range-2.1.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + }; + "to-regex-range-5.0.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; + }; + }; + "toidentifier-1.0.0" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + }; + }; + "trim-0.0.1" = { + name = "trim"; + packageName = "trim"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz"; + sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; + }; + }; + "trim-newlines-2.0.0" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz"; + sha1 = "b403d0b91be50c331dfc4b82eeceb22c3de16d20"; + }; + }; + "trim-newlines-3.0.0" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz"; + sha512 = "C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA=="; + }; + }; + "trim-trailing-lines-1.1.4" = { + name = "trim-trailing-lines"; + packageName = "trim-trailing-lines"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz"; + sha512 = "rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ=="; + }; + }; + "trough-1.0.5" = { + name = "trough"; + packageName = "trough"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz"; + sha512 = "rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA=="; + }; + }; + "tsconfig-paths-3.9.0" = { + name = "tsconfig-paths"; + packageName = "tsconfig-paths"; + version = "3.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; + sha512 = "dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw=="; + }; + }; + "tslib-2.2.0" = { + name = "tslib"; + packageName = "tslib"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz"; + sha512 = "gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="; + }; + }; + "type-1.2.0" = { + name = "type"; + packageName = "type"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz"; + sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; + }; + }; + "type-2.5.0" = { + name = "type"; + packageName = "type"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type/-/type-2.5.0.tgz"; + sha512 = "180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw=="; + }; + }; + "type-check-0.4.0" = { + name = "type-check"; + packageName = "type-check"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"; + sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; + }; + }; + "type-fest-0.18.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz"; + sha512 = "OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw=="; + }; + }; + "type-fest-0.20.2" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.20.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"; + sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; + }; + }; + "type-fest-0.3.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz"; + sha512 = "cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="; + }; + }; + "type-fest-0.6.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz"; + sha512 = "q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="; + }; + }; + "type-fest-0.8.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"; + sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; + }; + }; + "type-is-1.6.18" = { + name = "type-is"; + packageName = "type-is"; + version = "1.6.18"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; + }; + }; + "typedarray-to-buffer-3.1.5" = { + name = "typedarray-to-buffer"; + packageName = "typedarray-to-buffer"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; + }; + }; + "unbox-primitive-1.0.1" = { + name = "unbox-primitive"; + packageName = "unbox-primitive"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; + sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="; + }; + }; + "unherit-1.1.3" = { + name = "unherit"; + packageName = "unherit"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz"; + sha512 = "Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ=="; + }; + }; + "unicode-canonical-property-names-ecmascript-1.0.4" = { + name = "unicode-canonical-property-names-ecmascript"; + packageName = "unicode-canonical-property-names-ecmascript"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; + sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="; + }; + }; + "unicode-match-property-ecmascript-1.0.4" = { + name = "unicode-match-property-ecmascript"; + packageName = "unicode-match-property-ecmascript"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; + sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="; + }; + }; + "unicode-match-property-value-ecmascript-1.2.0" = { + name = "unicode-match-property-value-ecmascript"; + packageName = "unicode-match-property-value-ecmascript"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; + sha512 = "wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ=="; + }; + }; + "unicode-property-aliases-ecmascript-1.1.0" = { + name = "unicode-property-aliases-ecmascript"; + packageName = "unicode-property-aliases-ecmascript"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; + sha512 = "PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="; + }; + }; + "unified-7.1.0" = { + name = "unified"; + packageName = "unified"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unified/-/unified-7.1.0.tgz"; + sha512 = "lbk82UOIGuCEsZhPj8rNAkXSDXd6p0QLzIuSsCdxrqnqU56St4eyOB+AlXsVgVeRmetPTYydIuvFfpDIed8mqw=="; + }; + }; + "unified-9.2.1" = { + name = "unified"; + packageName = "unified"; + version = "9.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz"; + sha512 = "juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA=="; + }; + }; + "union-value-1.0.1" = { + name = "union-value"; + packageName = "union-value"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz"; + sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="; + }; + }; + "uniq-1.0.1" = { + name = "uniq"; + packageName = "uniq"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"; + sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; + }; + }; + "uniqs-2.0.0" = { + name = "uniqs"; + packageName = "uniqs"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz"; + sha1 = "ffede4b36b25290696e6e165d4a59edb998e6b02"; + }; + }; + "unique-filename-1.1.1" = { + name = "unique-filename"; + packageName = "unique-filename"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"; + sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; + }; + }; + "unique-slug-2.0.2" = { + name = "unique-slug"; + packageName = "unique-slug"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz"; + sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; + }; + }; + "unique-string-1.0.0" = { + name = "unique-string"; + packageName = "unique-string"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz"; + sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; + }; + }; + "unist-util-find-all-after-1.0.5" = { + name = "unist-util-find-all-after"; + packageName = "unist-util-find-all-after"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-1.0.5.tgz"; + sha512 = "lWgIc3rrTMTlK1Y0hEuL+k+ApzFk78h+lsaa2gHf63Gp5Ww+mt11huDniuaoq1H+XMK2lIIjjPkncxXcDp3QDw=="; + }; + }; + "unist-util-find-all-after-3.0.2" = { + name = "unist-util-find-all-after"; + packageName = "unist-util-find-all-after"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz"; + sha512 = "xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ=="; + }; + }; + "unist-util-is-3.0.0" = { + name = "unist-util-is"; + packageName = "unist-util-is"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz"; + sha512 = "sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A=="; + }; + }; + "unist-util-is-4.1.0" = { + name = "unist-util-is"; + packageName = "unist-util-is"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz"; + sha512 = "ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg=="; + }; + }; + "unist-util-remove-position-1.1.4" = { + name = "unist-util-remove-position"; + packageName = "unist-util-remove-position"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz"; + sha512 = "tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A=="; + }; + }; + "unist-util-stringify-position-1.1.2" = { + name = "unist-util-stringify-position"; + packageName = "unist-util-stringify-position"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz"; + sha512 = "pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ=="; + }; + }; + "unist-util-stringify-position-2.0.3" = { + name = "unist-util-stringify-position"; + packageName = "unist-util-stringify-position"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz"; + sha512 = "3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g=="; + }; + }; + "unist-util-visit-1.4.1" = { + name = "unist-util-visit"; + packageName = "unist-util-visit"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz"; + sha512 = "AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw=="; + }; + }; + "unist-util-visit-parents-2.1.2" = { + name = "unist-util-visit-parents"; + packageName = "unist-util-visit-parents"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz"; + sha512 = "DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g=="; + }; + }; + "universalify-0.1.2" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; + }; + }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; + "unquote-1.1.1" = { + name = "unquote"; + packageName = "unquote"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz"; + sha1 = "8fded7324ec6e88a0ff8b905e7c098cdc086d544"; + }; + }; + "unset-value-1.0.0" = { + name = "unset-value"; + packageName = "unset-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + }; + "upath-1.2.0" = { + name = "upath"; + packageName = "upath"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz"; + sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; + }; + }; + "uri-js-4.4.1" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; + }; + }; + "urix-0.1.0" = { + name = "urix"; + packageName = "urix"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + }; + "url-0.11.0" = { + name = "url"; + packageName = "url"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + }; + "url-parse-1.5.1" = { + name = "url-parse"; + packageName = "url-parse"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz"; + sha512 = "HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q=="; + }; + }; + "url-toolkit-2.2.2" = { + name = "url-toolkit"; + packageName = "url-toolkit"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.2.tgz"; + sha512 = "l25w6Sy+Iy3/IbogunxhWwljPaDnqpiKvrQRoLBm6DfISco7NyRIS7Zf6+Oxhy1T8kHxWdwLND7ZZba6NjXMug=="; + }; + }; + "use-3.1.1" = { + name = "use"; + packageName = "use"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "util.promisify-1.0.0" = { + name = "util.promisify"; + packageName = "util.promisify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; + sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="; + }; + }; + "util.promisify-1.0.1" = { + name = "util.promisify"; + packageName = "util.promisify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz"; + sha512 = "g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA=="; + }; + }; + "utila-0.4.0" = { + name = "utila"; + packageName = "utila"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz"; + sha1 = "8a16a05d445657a3aea5eecc5b12a4fa5379772c"; + }; + }; + "utils-merge-1.0.1" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + }; + "uuid-3.4.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; + }; + }; + "v8-compile-cache-2.3.0" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; + }; + }; + "validate-npm-package-license-3.0.4" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + }; + }; + "vary-1.1.2" = { + name = "vary"; + packageName = "vary"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + }; + "vendors-1.0.4" = { + name = "vendors"; + packageName = "vendors"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz"; + sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; + }; + }; + "vfile-3.0.1" = { + name = "vfile"; + packageName = "vfile"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile/-/vfile-3.0.1.tgz"; + sha512 = "y7Y3gH9BsUSdD4KzHsuMaCzRjglXN0W2EcMf0gpvu6+SbsGhMje7xDc8AEoeXy6mIwCKMI6BkjMsRjzQbhMEjQ=="; + }; + }; + "vfile-4.2.1" = { + name = "vfile"; + packageName = "vfile"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz"; + sha512 = "O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA=="; + }; + }; + "vfile-location-2.0.6" = { + name = "vfile-location"; + packageName = "vfile-location"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.6.tgz"; + sha512 = "sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA=="; + }; + }; + "vfile-message-1.1.1" = { + name = "vfile-message"; + packageName = "vfile-message"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz"; + sha512 = "1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA=="; + }; + }; + "vfile-message-2.0.4" = { + name = "vfile-message"; + packageName = "vfile-message"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz"; + sha512 = "DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ=="; + }; + }; + "watchpack-2.1.1" = { + name = "watchpack"; + packageName = "watchpack"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz"; + sha512 = "Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw=="; + }; + }; + "wbuf-1.7.3" = { + name = "wbuf"; + packageName = "wbuf"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz"; + sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; + }; + }; + "webcomponents.js-0.7.24" = { + name = "webcomponents.js"; + packageName = "webcomponents.js"; + version = "0.7.24"; + src = fetchurl { + url = "https://registry.npmjs.org/webcomponents.js/-/webcomponents.js-0.7.24.tgz"; + sha1 = "2116fbfa1468ec416a7befdaa333e1d118f69c04"; + }; + }; + "webpack-5.36.2" = { + name = "webpack"; + packageName = "webpack"; + version = "5.36.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-5.36.2.tgz"; + sha512 = "XJumVnnGoH2dV+Pk1VwgY4YT6AiMKpVoudUFCNOXMIVrEKPUgEwdIfWPjIuGLESAiS8EdIHX5+TiJz/5JccmRg=="; + }; + }; + "webpack-cli-4.6.0" = { + name = "webpack-cli"; + packageName = "webpack-cli"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.6.0.tgz"; + sha512 = "9YV+qTcGMjQFiY7Nb1kmnupvb1x40lfpj8pwdO/bom+sQiP4OBMKjHq29YQrlDWDPZO9r/qWaRRywKaRDKqBTA=="; + }; + }; + "webpack-dev-middleware-3.7.3" = { + name = "webpack-dev-middleware"; + packageName = "webpack-dev-middleware"; + version = "3.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz"; + sha512 = "djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ=="; + }; + }; + "webpack-dev-server-3.11.2" = { + name = "webpack-dev-server"; + packageName = "webpack-dev-server"; + version = "3.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz"; + sha512 = "A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ=="; + }; + }; + "webpack-log-2.0.0" = { + name = "webpack-log"; + packageName = "webpack-log"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz"; + sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="; + }; + }; + "webpack-merge-4.2.2" = { + name = "webpack-merge"; + packageName = "webpack-merge"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz"; + sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g=="; + }; + }; + "webpack-merge-5.7.3" = { + name = "webpack-merge"; + packageName = "webpack-merge"; + version = "5.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz"; + sha512 = "6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA=="; + }; + }; + "webpack-sources-1.4.3" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz"; + sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; + }; + }; + "webpack-sources-2.2.0" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz"; + sha512 = "bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w=="; + }; + }; + "websocket-driver-0.7.4" = { + name = "websocket-driver"; + packageName = "websocket-driver"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"; + sha512 = "b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="; + }; + }; + "websocket-extensions-0.1.4" = { + name = "websocket-extensions"; + packageName = "websocket-extensions"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; + sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; + }; + }; + "webworkify-1.5.0" = { + name = "webworkify"; + packageName = "webworkify"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webworkify/-/webworkify-1.5.0.tgz"; + sha512 = "AMcUeyXAhbACL8S2hqqdqOLqvJ8ylmIbNwUIqQujRSouf4+eUFaXbG6F1Rbu+srlJMmxQWsiU7mOJi0nMBfM1g=="; + }; + }; + "whatwg-fetch-3.6.2" = { + name = "whatwg-fetch"; + packageName = "whatwg-fetch"; + version = "3.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz"; + sha512 = "bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="; + }; + }; + "whatwg-mimetype-2.3.0" = { + name = "whatwg-mimetype"; + packageName = "whatwg-mimetype"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; + sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; + }; + }; + "which-1.3.1" = { + name = "which"; + packageName = "which"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + }; + }; + "which-2.0.2" = { + name = "which"; + packageName = "which"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; + }; + }; + "which-boxed-primitive-1.0.2" = { + name = "which-boxed-primitive"; + packageName = "which-boxed-primitive"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; + sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; + }; + }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + }; + "wildcard-2.0.0" = { + name = "wildcard"; + packageName = "wildcard"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz"; + sha512 = "JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="; + }; + }; + "word-wrap-1.2.3" = { + name = "word-wrap"; + packageName = "word-wrap"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; + }; + }; + "workbox-background-sync-5.1.4" = { + name = "workbox-background-sync"; + packageName = "workbox-background-sync"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-5.1.4.tgz"; + sha512 = "AH6x5pYq4vwQvfRDWH+vfOePfPIYQ00nCEB7dJRU1e0n9+9HMRyvI63FlDvtFT2AvXVRsXvUt7DNMEToyJLpSA=="; + }; + }; + "workbox-broadcast-update-5.1.4" = { + name = "workbox-broadcast-update"; + packageName = "workbox-broadcast-update"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-5.1.4.tgz"; + sha512 = "HTyTWkqXvHRuqY73XrwvXPud/FN6x3ROzkfFPsRjtw/kGZuZkPzfeH531qdUGfhtwjmtO/ZzXcWErqVzJNdXaA=="; + }; + }; + "workbox-build-5.1.4" = { + name = "workbox-build"; + packageName = "workbox-build"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-build/-/workbox-build-5.1.4.tgz"; + sha512 = "xUcZn6SYU8usjOlfLb9Y2/f86Gdo+fy1fXgH8tJHjxgpo53VVsqRX0lUDw8/JuyzNmXuo8vXX14pXX2oIm9Bow=="; + }; + }; + "workbox-cacheable-response-5.1.4" = { + name = "workbox-cacheable-response"; + packageName = "workbox-cacheable-response"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-5.1.4.tgz"; + sha512 = "0bfvMZs0Of1S5cdswfQK0BXt6ulU5kVD4lwer2CeI+03czHprXR3V4Y8lPTooamn7eHP8Iywi5QjyAMjw0qauA=="; + }; + }; + "workbox-core-5.1.4" = { + name = "workbox-core"; + packageName = "workbox-core"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-core/-/workbox-core-5.1.4.tgz"; + sha512 = "+4iRQan/1D8I81nR2L5vcbaaFskZC2CL17TLbvWVzQ4qiF/ytOGF6XeV54pVxAvKUtkLANhk8TyIUMtiMw2oDg=="; + }; + }; + "workbox-expiration-5.1.4" = { + name = "workbox-expiration"; + packageName = "workbox-expiration"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-5.1.4.tgz"; + sha512 = "oDO/5iC65h2Eq7jctAv858W2+CeRW5e0jZBMNRXpzp0ZPvuT6GblUiHnAsC5W5lANs1QS9atVOm4ifrBiYY7AQ=="; + }; + }; + "workbox-google-analytics-5.1.4" = { + name = "workbox-google-analytics"; + packageName = "workbox-google-analytics"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-5.1.4.tgz"; + sha512 = "0IFhKoEVrreHpKgcOoddV+oIaVXBFKXUzJVBI+nb0bxmcwYuZMdteBTp8AEDJacENtc9xbR0wa9RDCnYsCDLjA=="; + }; + }; + "workbox-navigation-preload-5.1.4" = { + name = "workbox-navigation-preload"; + packageName = "workbox-navigation-preload"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-5.1.4.tgz"; + sha512 = "Wf03osvK0wTflAfKXba//QmWC5BIaIZARU03JIhAEO2wSB2BDROWI8Q/zmianf54kdV7e1eLaIEZhth4K4MyfQ=="; + }; + }; + "workbox-precaching-5.1.4" = { + name = "workbox-precaching"; + packageName = "workbox-precaching"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-5.1.4.tgz"; + sha512 = "gCIFrBXmVQLFwvAzuGLCmkUYGVhBb7D1k/IL7pUJUO5xacjLcFUaLnnsoVepBGAiKw34HU1y/YuqvTKim9qAZA=="; + }; + }; + "workbox-range-requests-5.1.4" = { + name = "workbox-range-requests"; + packageName = "workbox-range-requests"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-5.1.4.tgz"; + sha512 = "1HSujLjgTeoxHrMR2muDW2dKdxqCGMc1KbeyGcmjZZAizJTFwu7CWLDmLv6O1ceWYrhfuLFJO+umYMddk2XMhw=="; + }; + }; + "workbox-routing-5.1.4" = { + name = "workbox-routing"; + packageName = "workbox-routing"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-routing/-/workbox-routing-5.1.4.tgz"; + sha512 = "8ljknRfqE1vEQtnMtzfksL+UXO822jJlHTIR7+BtJuxQ17+WPZfsHqvk1ynR/v0EHik4x2+826Hkwpgh4GKDCw=="; + }; + }; + "workbox-strategies-5.1.4" = { + name = "workbox-strategies"; + packageName = "workbox-strategies"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-5.1.4.tgz"; + sha512 = "VVS57LpaJTdjW3RgZvPwX0NlhNmscR7OQ9bP+N/34cYMDzXLyA6kqWffP6QKXSkca1OFo/v6v7hW7zrrguo6EA=="; + }; + }; + "workbox-streams-5.1.4" = { + name = "workbox-streams"; + packageName = "workbox-streams"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-streams/-/workbox-streams-5.1.4.tgz"; + sha512 = "xU8yuF1hI/XcVhJUAfbQLa1guQUhdLMPQJkdT0kn6HP5CwiPOGiXnSFq80rAG4b1kJUChQQIGPrq439FQUNVrw=="; + }; + }; + "workbox-sw-5.1.4" = { + name = "workbox-sw"; + packageName = "workbox-sw"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-sw/-/workbox-sw-5.1.4.tgz"; + sha512 = "9xKnKw95aXwSNc8kk8gki4HU0g0W6KXu+xks7wFuC7h0sembFnTrKtckqZxbSod41TDaGh+gWUA5IRXrL0ECRA=="; + }; + }; + "workbox-webpack-plugin-5.1.4" = { + name = "workbox-webpack-plugin"; + packageName = "workbox-webpack-plugin"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-5.1.4.tgz"; + sha512 = "PZafF4HpugZndqISi3rZ4ZK4A4DxO8rAqt2FwRptgsDx7NF8TVKP86/huHquUsRjMGQllsNdn4FNl8CD/UvKmQ=="; + }; + }; + "workbox-window-5.1.4" = { + name = "workbox-window"; + packageName = "workbox-window"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-window/-/workbox-window-5.1.4.tgz"; + sha512 = "vXQtgTeMCUq/4pBWMfQX8Ee7N2wVC4Q7XYFqLnfbXJ2hqew/cU1uMTD2KqGEgEpE4/30luxIxgE+LkIa8glBYw=="; + }; + }; + "worker-plugin-5.0.0" = { + name = "worker-plugin"; + packageName = "worker-plugin"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/worker-plugin/-/worker-plugin-5.0.0.tgz"; + sha512 = "AXMUstURCxDD6yGam2r4E34aJg6kW85IiaeX72hi+I1cxyaMUtrvVY6sbfpGKAj5e7f68Acl62BjQF5aOOx2IQ=="; + }; + }; + "wrap-ansi-5.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "write-1.0.3" = { + name = "write"; + packageName = "write"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/write/-/write-1.0.3.tgz"; + sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="; + }; + }; + "write-file-atomic-3.0.3" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; + sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; + }; + }; + "write-file-stdout-0.0.2" = { + name = "write-file-stdout"; + packageName = "write-file-stdout"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-stdout/-/write-file-stdout-0.0.2.tgz"; + sha1 = "c252d7c7c5b1b402897630e3453c7bfe690d9ca1"; + }; + }; + "ws-6.2.1" = { + name = "ws"; + packageName = "ws"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz"; + sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; + }; + }; + "x-is-string-0.1.0" = { + name = "x-is-string"; + packageName = "x-is-string"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz"; + sha1 = "474b50865af3a49a9c4657f05acd145458f77d82"; + }; + }; + "xmldom-0.3.0" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.3.0.tgz"; + sha512 = "z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g=="; + }; + }; + "xtend-4.0.2" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; + }; + }; + "y18n-4.0.3" = { + name = "y18n"; + packageName = "y18n"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz"; + sha512 = "JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="; + }; + }; + "yallist-4.0.0" = { + name = "yallist"; + packageName = "yallist"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; + }; + }; + "yaml-1.10.2" = { + name = "yaml"; + packageName = "yaml"; + version = "1.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"; + sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; + }; + }; + "yargs-13.3.2" = { + name = "yargs"; + packageName = "yargs"; + version = "13.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz"; + sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; + }; + }; + "yargs-parser-10.1.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "10.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz"; + sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ=="; + }; + }; + "yargs-parser-13.1.2" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "13.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; + }; + }; + "yargs-parser-20.2.7" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "20.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz"; + sha512 = "FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw=="; + }; + }; + "yocto-queue-0.1.0" = { + name = "yocto-queue"; + packageName = "yocto-queue"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; + }; + }; + "zwitch-1.0.5" = { + name = "zwitch"; + packageName = "zwitch"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz"; + sha512 = "V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw=="; + }; + }; + }; + args = { + name = "jellyfin-web"; + packageName = "jellyfin-web"; + version = "0.0.0"; + src = ../../../../../../../nix/store/ply469lh4lhgpa5j6ak4yss0sgprqzqy-source; + dependencies = [ + sources."@babel/code-frame-7.12.13" + sources."@babel/compat-data-7.14.0" + sources."@babel/core-7.14.0" + sources."@babel/eslint-parser-7.13.14" + sources."@babel/eslint-plugin-7.13.16" + sources."@babel/generator-7.14.1" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" + sources."@babel/helper-compilation-targets-7.13.16" + sources."@babel/helper-create-class-features-plugin-7.14.1" + sources."@babel/helper-create-regexp-features-plugin-7.12.17" + sources."@babel/helper-define-polyfill-provider-0.2.0" + sources."@babel/helper-explode-assignable-expression-7.13.0" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-hoist-variables-7.13.16" + sources."@babel/helper-member-expression-to-functions-7.13.12" + sources."@babel/helper-module-imports-7.13.12" + sources."@babel/helper-module-transforms-7.14.0" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-plugin-utils-7.13.0" + sources."@babel/helper-remap-async-to-generator-7.13.0" + sources."@babel/helper-replace-supers-7.13.12" + sources."@babel/helper-simple-access-7.13.12" + sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" + sources."@babel/helper-split-export-declaration-7.12.13" + sources."@babel/helper-validator-identifier-7.14.0" + sources."@babel/helper-validator-option-7.12.17" + sources."@babel/helper-wrap-function-7.13.0" + sources."@babel/helpers-7.14.0" + sources."@babel/highlight-7.14.0" + sources."@babel/parser-7.14.1" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" + sources."@babel/plugin-proposal-async-generator-functions-7.13.15" + sources."@babel/plugin-proposal-class-properties-7.13.0" + sources."@babel/plugin-proposal-class-static-block-7.13.11" + sources."@babel/plugin-proposal-dynamic-import-7.13.8" + sources."@babel/plugin-proposal-export-namespace-from-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.13.8" + sources."@babel/plugin-proposal-logical-assignment-operators-7.13.8" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.13.8" + sources."@babel/plugin-proposal-numeric-separator-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.13.8" + sources."@babel/plugin-proposal-optional-catch-binding-7.13.8" + sources."@babel/plugin-proposal-optional-chaining-7.13.12" + sources."@babel/plugin-proposal-private-methods-7.13.0" + sources."@babel/plugin-proposal-private-property-in-object-7.14.0" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" + sources."@babel/plugin-syntax-async-generators-7.8.4" + sources."@babel/plugin-syntax-class-properties-7.12.13" + sources."@babel/plugin-syntax-class-static-block-7.12.13" + sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-export-namespace-from-7.8.3" + sources."@babel/plugin-syntax-json-strings-7.8.3" + sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" + sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.10.4" + sources."@babel/plugin-syntax-object-rest-spread-7.8.3" + sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" + sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-private-property-in-object-7.14.0" + sources."@babel/plugin-syntax-top-level-await-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.13.0" + sources."@babel/plugin-transform-async-to-generator-7.13.0" + sources."@babel/plugin-transform-block-scoped-functions-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.14.1" + sources."@babel/plugin-transform-classes-7.13.0" + sources."@babel/plugin-transform-computed-properties-7.13.0" + sources."@babel/plugin-transform-destructuring-7.13.17" + sources."@babel/plugin-transform-dotall-regex-7.12.13" + sources."@babel/plugin-transform-duplicate-keys-7.12.13" + sources."@babel/plugin-transform-exponentiation-operator-7.12.13" + sources."@babel/plugin-transform-for-of-7.13.0" + sources."@babel/plugin-transform-function-name-7.12.13" + sources."@babel/plugin-transform-literals-7.12.13" + sources."@babel/plugin-transform-member-expression-literals-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.14.0" + sources."@babel/plugin-transform-modules-commonjs-7.14.0" + sources."@babel/plugin-transform-modules-systemjs-7.13.8" + sources."@babel/plugin-transform-modules-umd-7.14.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" + sources."@babel/plugin-transform-new-target-7.12.13" + sources."@babel/plugin-transform-object-super-7.12.13" + sources."@babel/plugin-transform-parameters-7.13.0" + sources."@babel/plugin-transform-property-literals-7.12.13" + sources."@babel/plugin-transform-regenerator-7.13.15" + sources."@babel/plugin-transform-reserved-words-7.12.13" + sources."@babel/plugin-transform-shorthand-properties-7.12.13" + sources."@babel/plugin-transform-spread-7.13.0" + sources."@babel/plugin-transform-sticky-regex-7.12.13" + sources."@babel/plugin-transform-template-literals-7.13.0" + sources."@babel/plugin-transform-typeof-symbol-7.12.13" + sources."@babel/plugin-transform-unicode-escapes-7.12.13" + sources."@babel/plugin-transform-unicode-regex-7.12.13" + sources."@babel/preset-env-7.14.1" + sources."@babel/preset-modules-0.1.4" + sources."@babel/runtime-7.14.0" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.14.0" + sources."@babel/types-7.14.1" + sources."@csstools/convert-colors-1.4.0" + sources."@discoveryjs/json-ext-0.5.2" + (sources."@eslint/eslintrc-0.4.0" // { + dependencies = [ + sources."globals-12.4.0" + sources."ignore-4.0.6" + sources."import-fresh-3.3.0" + sources."resolve-from-4.0.0" + ]; + }) + sources."@hapi/address-2.1.4" + sources."@hapi/bourne-1.3.2" + sources."@hapi/hoek-8.5.1" + sources."@hapi/joi-15.1.1" + sources."@hapi/topo-3.1.6" + sources."@mdn/browser-compat-data-2.0.7" + sources."@mrmlnc/readdir-enhanced-2.2.1" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" + (sources."@npmcli/move-file-1.1.2" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) + sources."@rollup/plugin-node-resolve-7.1.3" + sources."@rollup/plugin-replace-2.4.2" + (sources."@rollup/pluginutils-3.1.0" // { + dependencies = [ + sources."@types/estree-0.0.39" + ]; + }) + sources."@stylelint/postcss-css-in-js-0.37.2" + sources."@stylelint/postcss-markdown-0.36.2" + sources."@surma/rollup-plugin-off-main-thread-1.4.2" + sources."@types/anymatch-1.3.1" + sources."@types/eslint-7.2.10" + sources."@types/eslint-scope-3.7.0" + sources."@types/estree-0.0.47" + sources."@types/glob-7.1.3" + sources."@types/html-minifier-terser-5.1.1" + sources."@types/json-schema-7.0.7" + sources."@types/json5-0.0.29" + sources."@types/localforage-0.0.34" + sources."@types/mdast-3.0.3" + sources."@types/minimatch-3.0.4" + sources."@types/minimist-1.2.1" + sources."@types/node-15.0.2" + sources."@types/normalize-package-data-2.4.0" + sources."@types/parse-json-4.0.0" + sources."@types/q-1.5.4" + sources."@types/resolve-0.0.8" + sources."@types/source-list-map-0.1.2" + sources."@types/tapable-1.0.7" + (sources."@types/uglify-js-3.13.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."@types/unist-2.0.3" + sources."@types/vfile-3.0.2" + sources."@types/vfile-message-2.0.0" + (sources."@types/webpack-4.41.28" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."@types/webpack-sources-2.1.0" // { + dependencies = [ + sources."source-map-0.7.3" + ]; + }) + sources."@uupaa/dynamic-import-polyfill-1.0.2" + sources."@webassemblyjs/ast-1.11.0" + sources."@webassemblyjs/floating-point-hex-parser-1.11.0" + sources."@webassemblyjs/helper-api-error-1.11.0" + sources."@webassemblyjs/helper-buffer-1.11.0" + sources."@webassemblyjs/helper-numbers-1.11.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.0" + sources."@webassemblyjs/helper-wasm-section-1.11.0" + sources."@webassemblyjs/ieee754-1.11.0" + sources."@webassemblyjs/leb128-1.11.0" + sources."@webassemblyjs/utf8-1.11.0" + sources."@webassemblyjs/wasm-edit-1.11.0" + sources."@webassemblyjs/wasm-gen-1.11.0" + sources."@webassemblyjs/wasm-opt-1.11.0" + sources."@webassemblyjs/wasm-parser-1.11.0" + sources."@webassemblyjs/wast-printer-1.11.0" + sources."@webpack-cli/configtest-1.0.2" + sources."@webpack-cli/info-1.2.3" + sources."@webpack-cli/serve-1.3.1" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.2" + sources."abab-2.0.5" + sources."accepts-1.3.7" + sources."acorn-7.4.1" + sources."acorn-jsx-5.3.1" + sources."aggregate-error-3.1.0" + sources."ajv-6.12.6" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.5.2" + sources."alphanum-sort-1.0.2" + sources."ansi-colors-4.1.1" + sources."ansi-html-0.0.7" + sources."ansi-regex-5.0.0" + sources."ansi-styles-3.2.1" + sources."anymatch-3.1.2" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-find-index-1.0.2" + sources."array-flatten-2.1.2" + sources."array-includes-3.1.3" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" + sources."array.prototype.flat-1.2.4" + sources."arrify-1.0.1" + sources."assign-symbols-1.0.0" + sources."ast-metadata-inferer-0.4.0" + sources."astral-regex-2.0.0" + sources."async-2.6.3" + sources."async-each-1.0.3" + sources."async-limiter-1.0.1" + sources."atob-2.1.2" + sources."autoprefixer-9.8.6" + sources."babel-extract-comments-1.0.0" + sources."babel-loader-8.2.2" + sources."babel-plugin-dynamic-import-node-2.3.3" + sources."babel-plugin-dynamic-import-polyfill-1.0.0" + sources."babel-plugin-polyfill-corejs2-0.2.0" + sources."babel-plugin-polyfill-corejs3-0.2.0" + sources."babel-plugin-polyfill-regenerator-0.2.0" + sources."babel-plugin-syntax-object-rest-spread-6.13.0" + sources."babel-plugin-transform-object-rest-spread-6.26.0" + (sources."babel-runtime-6.26.0" // { + dependencies = [ + sources."core-js-2.6.12" + sources."regenerator-runtime-0.11.1" + ]; + }) + sources."babylon-6.18.0" + sources."bail-1.0.5" + sources."balanced-match-1.0.2" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."batch-0.6.1" + sources."big.js-5.2.2" + sources."binary-extensions-2.2.0" + sources."bindings-1.5.0" + sources."blurhash-1.1.3" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."bytes-3.1.0" + sources."debug-2.6.9" + sources."iconv-lite-0.4.24" + sources."ms-2.0.0" + ]; + }) + sources."bonjour-3.5.0" + sources."boolbase-1.0.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."browserslist-4.16.6" + sources."buffer-from-1.1.1" + sources."buffer-indexof-1.1.1" + sources."builtin-modules-3.2.0" + sources."bytes-3.0.0" + (sources."cacache-15.0.6" // { + dependencies = [ + sources."p-map-4.0.0" + sources."rimraf-3.0.2" + ]; + }) + sources."cache-base-1.0.1" + sources."call-bind-1.0.2" + sources."call-me-maybe-1.0.1" + sources."caller-callsite-2.0.0" + sources."caller-path-2.0.0" + sources."callsites-2.0.0" + sources."camel-case-4.1.2" + sources."camelcase-6.2.0" + (sources."camelcase-keys-6.2.2" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) + sources."caniuse-api-3.0.0" + sources."caniuse-db-1.0.30001222" + sources."caniuse-lite-1.0.30001222" + sources."ccount-1.1.0" + sources."chalk-2.4.2" + sources."character-entities-1.2.4" + sources."character-entities-html4-1.1.4" + sources."character-entities-legacy-1.1.4" + sources."character-reference-invalid-1.1.4" + sources."chokidar-3.5.1" + sources."chownr-2.0.0" + sources."chrome-trace-event-1.0.3" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."classlist.js-https://github.com/eligrey/classList.js/archive/1.2.20180112.tar.gz" + (sources."clean-css-4.2.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."clean-stack-2.2.0" + sources."clean-webpack-plugin-3.0.0" + (sources."cliui-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."clone-deep-4.0.1" + sources."clone-regexp-2.2.0" + sources."coa-2.0.2" + sources."collapse-white-space-1.0.6" + sources."collection-visit-1.0.0" + sources."color-3.1.3" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-string-1.5.5" + sources."colorette-1.2.2" + sources."commander-4.1.1" + sources."common-tags-1.8.0" + sources."commondir-1.0.1" + sources."component-emitter-1.3.0" + sources."compressible-2.0.18" + (sources."compression-1.7.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."concat-map-0.0.1" + sources."confusing-browser-globals-1.0.10" + sources."connect-history-api-fallback-1.6.0" + sources."contains-path-0.1.0" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."convert-source-map-1.7.0" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."copy-descriptor-0.1.1" + (sources."copy-webpack-plugin-6.4.1" // { + dependencies = [ + sources."array-union-2.1.0" + sources."globby-11.0.3" + sources."loader-utils-2.0.0" + sources."p-limit-3.1.0" + sources."schema-utils-3.0.0" + ]; + }) + sources."core-js-3.11.2" + (sources."core-js-compat-3.11.2" // { + dependencies = [ + sources."semver-7.0.0" + ]; + }) + sources."core-util-is-1.0.2" + sources."cosmiconfig-5.2.1" + sources."cross-spawn-7.0.3" + sources."crypto-random-string-1.0.0" + sources."css-blank-pseudo-0.1.4" + sources."css-color-names-0.0.4" + sources."css-declaration-sorter-4.0.1" + (sources."css-has-pseudo-0.10.0" // { + dependencies = [ + sources."cssesc-2.0.0" + sources."postcss-selector-parser-5.0.0" + ]; + }) + (sources."css-loader-5.2.4" // { + dependencies = [ + sources."loader-utils-2.0.0" + sources."postcss-8.2.13" + sources."schema-utils-3.0.0" + sources."semver-7.3.5" + sources."source-map-0.6.1" + ]; + }) + sources."css-prefers-color-scheme-3.1.1" + sources."css-select-2.1.0" + sources."css-select-base-adapter-0.1.1" + (sources."css-tree-1.0.0-alpha.37" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."css-what-3.4.2" + sources."cssdb-4.4.0" + sources."cssesc-3.0.0" + sources."cssnano-4.1.11" + sources."cssnano-preset-default-4.0.8" + sources."cssnano-util-get-arguments-4.0.0" + sources."cssnano-util-get-match-4.0.0" + sources."cssnano-util-raw-cache-4.0.1" + sources."cssnano-util-same-parent-4.0.1" + (sources."csso-4.2.0" // { + dependencies = [ + sources."css-tree-1.1.3" + sources."mdn-data-2.0.14" + sources."source-map-0.6.1" + ]; + }) + sources."currently-unhandled-0.4.1" + (sources."d-1.0.1" // { + dependencies = [ + sources."type-1.2.0" + ]; + }) + sources."date-fns-2.21.1" + sources."debug-4.3.2" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."decode-uri-component-0.2.0" + sources."deep-equal-1.1.1" + sources."deep-is-0.1.3" + (sources."default-gateway-4.2.0" // { + dependencies = [ + sources."cross-spawn-6.0.5" + sources."execa-1.0.0" + sources."get-stream-4.1.0" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."path-key-2.0.1" + sources."semver-5.7.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" + ]; + }) + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + sources."del-4.1.1" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."detect-node-2.0.5" + sources."dir-glob-3.0.1" + sources."dns-equal-1.0.0" + sources."dns-packet-1.3.1" + sources."dns-txt-2.0.2" + sources."doctrine-3.0.0" + sources."dom-converter-0.2.0" + (sources."dom-serializer-0.2.2" // { + dependencies = [ + sources."domelementtype-2.2.0" + ]; + }) + sources."dom7-3.0.0" + sources."domelementtype-1.3.1" + (sources."domhandler-3.3.0" // { + dependencies = [ + sources."domelementtype-2.2.0" + ]; + }) + sources."domutils-1.7.0" + sources."dot-case-3.0.4" + sources."dot-prop-5.3.0" + sources."ee-first-1.1.1" + sources."ejs-2.7.4" + sources."electron-to-chromium-1.3.726" + sources."emoji-regex-8.0.0" + sources."emojis-list-3.0.0" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + (sources."enhanced-resolve-5.8.0" // { + dependencies = [ + sources."tapable-2.2.0" + ]; + }) + sources."enquirer-2.3.6" + sources."entities-2.2.0" + sources."envinfo-7.8.1" + sources."epubjs-0.3.88" + sources."errno-0.1.8" + sources."error-ex-1.3.2" + sources."es-abstract-1.18.0" + sources."es-module-lexer-0.4.1" + sources."es-to-primitive-1.2.1" + sources."es5-ext-0.10.53" + sources."es6-iterator-2.0.3" + sources."es6-promise-4.2.8" + sources."es6-symbol-3.1.3" + sources."escalade-3.1.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + (sources."eslint-7.25.0" // { + dependencies = [ + sources."@babel/code-frame-7.12.11" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."eslint-visitor-keys-2.1.0" + sources."globals-13.8.0" + sources."has-flag-4.0.0" + sources."ignore-4.0.6" + sources."import-fresh-3.3.0" + sources."resolve-from-4.0.0" + sources."semver-7.3.5" + sources."supports-color-7.2.0" + sources."type-fest-0.20.2" + ]; + }) + (sources."eslint-import-resolver-node-0.3.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + (sources."eslint-module-utils-2.6.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."find-up-2.1.0" + sources."locate-path-2.0.0" + sources."ms-2.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."path-exists-3.0.0" + sources."pkg-dir-2.0.0" + ]; + }) + (sources."eslint-plugin-compat-3.9.0" // { + dependencies = [ + sources."semver-7.3.2" + ]; + }) + sources."eslint-plugin-eslint-comments-3.2.0" + (sources."eslint-plugin-import-2.22.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."doctrine-1.5.0" + sources."ms-2.0.0" + ]; + }) + sources."eslint-plugin-promise-4.3.1" + sources."eslint-rule-composer-0.3.0" + sources."eslint-scope-5.1.1" + sources."eslint-utils-2.1.0" + sources."eslint-visitor-keys-1.3.0" + sources."espree-7.3.1" + sources."esprima-4.0.1" + (sources."esquery-1.4.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) + sources."estraverse-4.3.0" + sources."estree-walker-1.0.1" + sources."esutils-2.0.3" + sources."etag-1.8.1" + sources."event-emitter-0.3.5" + sources."eventemitter3-4.0.7" + sources."events-3.3.0" + sources."eventsource-1.1.0" + sources."execa-5.0.0" + sources."execall-2.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."expose-loader-1.0.3" // { + dependencies = [ + sources."loader-utils-2.0.0" + sources."schema-utils-3.0.0" + ]; + }) + (sources."express-4.17.1" // { + dependencies = [ + sources."array-flatten-1.1.1" + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."path-to-regexp-0.1.7" + ]; + }) + sources."ext-1.4.0" + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.5" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."fast-text-encoding-1.0.3" + sources."fastest-levenshtein-1.0.12" + sources."fastq-1.11.0" + sources."faye-websocket-0.11.3" + sources."file-entry-cache-6.0.1" + (sources."file-loader-6.2.0" // { + dependencies = [ + sources."loader-utils-2.0.0" + sources."schema-utils-3.0.0" + ]; + }) + sources."file-uri-to-path-1.0.0" + sources."fill-range-7.0.1" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."find-cache-dir-3.3.1" + sources."find-up-4.1.0" + (sources."flat-cache-3.0.4" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) + sources."flatted-3.1.1" + sources."flatten-1.0.3" + sources."flv.js-1.5.0" + sources."follow-redirects-1.14.0" + sources."fontsource-noto-sans-3.1.5" + sources."fontsource-noto-sans-hk-3.1.5" + sources."fontsource-noto-sans-jp-3.1.5" + sources."fontsource-noto-sans-kr-3.1.5" + sources."fontsource-noto-sans-sc-3.1.5" + sources."for-in-1.0.2" + sources."forwarded-0.1.2" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."fs-extra-8.1.0" + sources."fs-minipass-2.1.0" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" + sources."function-bind-1.1.1" + sources."functional-red-black-tree-1.0.1" + sources."gather-stream-1.0.0" + sources."gensync-1.0.0-beta.2" + sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.1.1" + sources."get-own-enumerable-property-symbols-3.0.2" + sources."get-stdin-8.0.0" + sources."get-stream-6.0.1" + sources."get-value-2.0.6" + sources."glob-7.1.6" + sources."glob-parent-5.1.2" + sources."glob-to-regexp-0.3.0" + sources."global-modules-2.0.0" + (sources."global-prefix-3.0.0" // { + dependencies = [ + sources."which-1.3.1" + ]; + }) + sources."globals-11.12.0" + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + sources."globjoin-0.1.4" + sources."gonzales-pe-4.3.0" + sources."graceful-fs-4.2.6" + sources."handle-thing-2.0.1" + sources."hard-rejection-2.1.0" + sources."has-1.0.3" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."has-bigints-1.0.1" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.2" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."is-buffer-1.1.6" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + sources."he-1.2.0" + sources."headroom.js-0.12.0" + sources."hex-color-regex-1.1.0" + sources."hls.js-0.14.17" + sources."hosted-git-info-2.8.9" + sources."hpack.js-2.1.6" + sources."hsl-regex-1.0.0" + sources."hsla-regex-1.0.0" + sources."html-entities-1.4.0" + (sources."html-loader-1.3.2" // { + dependencies = [ + sources."loader-utils-2.0.0" + sources."schema-utils-3.0.0" + ]; + }) + sources."html-minifier-terser-5.1.1" + sources."html-tags-3.1.0" + (sources."html-webpack-plugin-4.5.2" // { + dependencies = [ + sources."util.promisify-1.0.0" + ]; + }) + (sources."htmlparser2-4.1.0" // { + dependencies = [ + (sources."dom-serializer-1.3.1" // { + dependencies = [ + sources."domhandler-4.2.0" + ]; + }) + sources."domelementtype-2.2.0" + (sources."domutils-2.6.0" // { + dependencies = [ + sources."domhandler-4.2.0" + ]; + }) + ]; + }) + sources."http-deceiver-1.2.7" + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."http-parser-js-0.5.3" + sources."http-proxy-1.18.1" + (sources."http-proxy-middleware-0.19.1" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-buffer-1.1.6" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) + sources."human-signals-2.1.0" + sources."iconv-lite-0.6.2" + sources."icss-utils-5.1.0" + sources."ignore-5.1.8" + sources."immediate-3.0.6" + sources."import-cwd-2.1.0" + sources."import-fresh-2.0.0" + sources."import-from-2.1.0" + sources."import-lazy-4.0.0" + sources."import-local-3.0.2" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."indexes-of-1.0.1" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."internal-ip-4.3.0" + sources."interpret-2.2.0" + sources."intersection-observer-0.12.0" + sources."ip-1.1.5" + sources."ip-regex-2.1.0" + sources."ipaddr.js-1.9.1" + sources."irregular-plurals-1.4.0" + sources."is-absolute-url-2.1.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-alphabetical-1.0.4" + sources."is-alphanumeric-1.0.0" + sources."is-alphanumerical-1.0.4" + sources."is-arguments-1.1.0" + sources."is-arrayish-0.2.1" + sources."is-bigint-1.0.2" + sources."is-binary-path-2.1.0" + sources."is-boolean-object-1.1.0" + sources."is-buffer-2.0.5" + sources."is-callable-1.2.3" + sources."is-color-stop-1.1.0" + sources."is-core-module-2.3.0" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.2" + sources."is-decimal-1.0.4" + sources."is-descriptor-1.0.2" + sources."is-directory-0.3.1" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-hexadecimal-1.0.4" + sources."is-module-1.0.0" + sources."is-negative-zero-2.0.1" + sources."is-number-7.0.0" + sources."is-number-object-1.0.4" + sources."is-obj-2.0.0" + 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-2.1.0" + sources."is-plain-object-2.0.4" + sources."is-regex-1.1.2" + sources."is-regexp-2.1.0" + sources."is-resolvable-1.1.0" + sources."is-stream-2.0.0" + sources."is-string-1.0.5" + sources."is-supported-regexp-flag-1.0.1" + sources."is-symbol-1.0.3" + sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" + sources."is-whitespace-character-1.0.4" + sources."is-windows-1.0.2" + sources."is-word-character-1.0.4" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."jellyfin-apiclient-1.8.0" + (sources."jest-worker-26.6.2" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."jquery-3.6.0" + sources."js-base64-2.6.4" + sources."js-tokens-4.0.0" + sources."js-yaml-3.14.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-traverse-0.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json3-3.3.3" + sources."json5-2.2.0" + sources."jsonfile-4.0.0" + sources."jstree-3.3.11" + sources."jszip-3.6.0" + sources."killable-1.0.1" + sources."kind-of-6.0.3" + sources."klona-2.0.4" + sources."known-css-properties-0.21.0" + sources."leven-2.1.0" + sources."levn-0.4.1" + sources."libarchive.js-1.3.0" + sources."libass-wasm-https://github.com/jellyfin/JavascriptSubtitlesOctopus/archive/refs/tags/4.0.0-jf-smarttv.tar.gz" + sources."lie-3.3.0" + sources."lines-and-columns-1.1.6" + (sources."load-json-file-2.0.0" // { + dependencies = [ + sources."parse-json-2.2.0" + sources."pify-2.3.0" + ]; + }) + sources."loader-runner-4.2.0" + (sources."loader-utils-1.4.0" // { + dependencies = [ + sources."json5-1.0.1" + ]; + }) + (sources."localforage-1.9.0" // { + dependencies = [ + sources."lie-3.1.1" + ]; + }) + sources."locate-path-5.0.0" + sources."lodash-4.17.21" + sources."lodash._reinterpolate-3.0.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.debounce-4.0.8" + sources."lodash.flatten-4.4.0" + sources."lodash.memoize-4.1.2" + sources."lodash.template-4.5.0" + sources."lodash.templatesettings-4.2.0" + sources."lodash.truncate-4.4.2" + sources."lodash.uniq-4.5.0" + (sources."log-symbols-4.1.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."loglevel-1.7.1" + sources."longest-streak-2.0.4" + sources."loud-rejection-1.6.0" + sources."lower-case-2.0.2" + sources."lru-cache-6.0.0" + sources."magic-string-0.25.7" + sources."make-dir-3.1.0" + sources."map-cache-0.2.2" + sources."map-obj-4.2.1" + sources."map-visit-1.0.0" + sources."markdown-escapes-1.0.4" + sources."markdown-table-1.1.3" + sources."marks-pane-1.0.9" + sources."material-design-icons-iconfont-6.1.0" + sources."mathml-tag-names-2.1.3" + sources."mdast-util-compact-1.0.4" + sources."mdast-util-from-markdown-0.8.5" + sources."mdast-util-to-markdown-0.6.5" + sources."mdast-util-to-string-2.0.0" + sources."mdn-data-2.0.4" + sources."media-typer-0.3.0" + sources."memory-fs-0.4.1" + (sources."meow-9.0.0" // { + dependencies = [ + sources."hosted-git-info-4.0.2" + sources."normalize-package-data-3.0.2" + sources."parse-json-5.2.0" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."hosted-git-info-2.8.9" + sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + sources."semver-7.3.5" + sources."type-fest-0.18.1" + ]; + }) + sources."merge-descriptors-1.0.1" + sources."merge-stream-2.0.0" + sources."merge2-1.4.1" + sources."methods-1.1.2" + sources."micromark-2.11.4" + sources."micromatch-4.0.4" + sources."mime-1.6.0" + sources."mime-db-1.47.0" + sources."mime-types-2.1.30" + sources."mimic-fn-2.1.0" + sources."min-indent-1.0.1" + sources."minimalistic-assert-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + (sources."minimist-options-4.1.0" // { + dependencies = [ + sources."is-plain-obj-1.1.0" + ]; + }) + sources."minipass-3.1.3" + sources."minipass-collect-1.0.2" + sources."minipass-flush-1.0.5" + sources."minipass-pipeline-1.2.4" + sources."minizlib-2.1.2" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-1.0.4" + sources."ms-2.1.2" + sources."multicast-dns-6.2.3" + sources."multicast-dns-service-types-1.1.0" + sources."nan-2.14.2" + sources."nanoid-3.1.22" + sources."nanomatch-1.2.13" + sources."native-promise-only-0.8.1" + sources."natural-compare-1.4.0" + sources."negotiator-0.6.2" + sources."neo-async-2.6.2" + sources."next-tick-1.0.0" + sources."nice-try-1.0.5" + sources."no-case-3.0.4" + sources."node-forge-0.10.0" + sources."node-releases-1.1.71" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."normalize-path-3.0.0" + sources."normalize-range-0.1.2" + sources."normalize-selector-0.2.0" + sources."normalize-url-3.3.0" + sources."npm-run-path-4.0.1" + sources."nth-check-1.0.2" + sources."num2fraction-1.2.2" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-inspect-1.10.2" + sources."object-is-1.1.5" + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.2" + sources."object.getownpropertydescriptors-2.1.2" + sources."object.pick-1.3.0" + sources."object.values-1.1.3" + sources."obuf-1.1.2" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."onetime-5.1.2" + sources."opn-5.5.0" + sources."optionator-0.9.1" + sources."original-1.0.2" + sources."p-finally-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-map-2.1.0" + sources."p-retry-3.0.1" + sources."p-try-2.2.0" + sources."page-1.11.6" + sources."pako-1.0.11" + sources."param-case-3.0.4" + (sources."parent-module-1.0.1" // { + dependencies = [ + sources."callsites-3.1.0" + ]; + }) + sources."parse-entities-2.0.0" + sources."parse-json-4.0.0" + sources."parseurl-1.3.3" + sources."pascal-case-3.1.2" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-3.1.1" + sources."path-parse-1.0.6" + (sources."path-to-regexp-1.2.1" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + sources."path-type-4.0.0" + sources."path-webpack-0.0.3" + sources."pdfjs-dist-2.5.207" + sources."picomatch-2.2.3" + sources."pify-4.0.1" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pkg-dir-4.2.0" + sources."plur-2.1.2" + (sources."portfinder-1.0.28" // { + dependencies = [ + sources."debug-3.2.7" + sources."mkdirp-0.5.5" + ]; + }) + sources."posix-character-classes-0.1.1" + (sources."postcss-7.0.35" // { + dependencies = [ + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + sources."postcss-attribute-case-insensitive-4.0.2" + sources."postcss-calc-7.0.5" + sources."postcss-color-functional-notation-2.0.1" + sources."postcss-color-gray-5.0.0" + sources."postcss-color-hex-alpha-5.0.3" + sources."postcss-color-mod-function-3.0.3" + sources."postcss-color-rebeccapurple-4.0.1" + (sources."postcss-colormin-4.0.3" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-convert-values-4.0.1" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-custom-media-7.0.8" + sources."postcss-custom-properties-8.0.11" + (sources."postcss-custom-selectors-5.1.2" // { + dependencies = [ + sources."cssesc-2.0.0" + sources."postcss-selector-parser-5.0.0" + ]; + }) + (sources."postcss-dir-pseudo-class-5.0.0" // { + dependencies = [ + sources."cssesc-2.0.0" + sources."postcss-selector-parser-5.0.0" + ]; + }) + 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-double-position-gradients-1.0.0" + sources."postcss-env-function-2.0.2" + sources."postcss-focus-visible-4.0.0" + sources."postcss-focus-within-3.0.0" + sources."postcss-font-variant-4.0.1" + sources."postcss-gap-properties-2.0.0" + (sources."postcss-html-0.36.0" // { + dependencies = [ + sources."domhandler-2.4.2" + sources."entities-1.1.2" + sources."htmlparser2-3.10.1" + sources."readable-stream-3.6.0" + ]; + }) + sources."postcss-image-set-function-3.0.1" + sources."postcss-initial-3.0.4" + sources."postcss-jsx-0.36.4" + sources."postcss-lab-function-2.0.1" + sources."postcss-less-3.1.4" + sources."postcss-load-config-2.1.2" + (sources."postcss-loader-3.0.0" // { + dependencies = [ + sources."schema-utils-1.0.0" + ]; + }) + sources."postcss-logical-3.0.0" + (sources."postcss-markdown-0.36.0" // { + dependencies = [ + sources."is-plain-obj-1.1.0" + sources."parse-entities-1.2.2" + sources."remark-10.0.1" + sources."remark-parse-6.0.3" + sources."remark-stringify-6.0.4" + sources."unified-7.1.0" + sources."unist-util-find-all-after-1.0.5" + sources."unist-util-is-3.0.0" + sources."unist-util-stringify-position-1.1.2" + sources."vfile-3.0.1" + sources."vfile-message-1.1.1" + ]; + }) + sources."postcss-media-minmax-4.0.0" + sources."postcss-media-query-parser-0.2.3" + (sources."postcss-merge-longhand-4.0.11" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-merge-rules-4.0.3" // { + dependencies = [ + sources."postcss-selector-parser-3.1.2" + ]; + }) + (sources."postcss-minify-font-values-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-minify-gradients-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-minify-params-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-minify-selectors-4.0.2" // { + dependencies = [ + sources."postcss-selector-parser-3.1.2" + ]; + }) + sources."postcss-modules-extract-imports-3.0.0" + sources."postcss-modules-local-by-default-4.0.0" + sources."postcss-modules-scope-3.0.0" + sources."postcss-modules-values-4.0.0" + sources."postcss-nesting-7.0.1" + sources."postcss-normalize-charset-4.0.1" + (sources."postcss-normalize-display-values-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-positions-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-repeat-style-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-string-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-timing-functions-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-unicode-4.0.1" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-url-4.0.1" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-whitespace-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-ordered-values-4.1.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-overflow-shorthand-2.0.0" + sources."postcss-page-break-2.0.0" + sources."postcss-place-4.0.1" + sources."postcss-preset-env-6.7.0" + (sources."postcss-pseudo-class-any-link-6.0.0" // { + dependencies = [ + sources."cssesc-2.0.0" + sources."postcss-selector-parser-5.0.0" + ]; + }) + sources."postcss-reduce-initial-4.0.3" + (sources."postcss-reduce-transforms-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-replace-overflow-wrap-3.0.0" + (sources."postcss-reporter-6.0.1" // { + dependencies = [ + sources."log-symbols-2.2.0" + ]; + }) + sources."postcss-resolve-nested-selector-0.1.1" + sources."postcss-safe-parser-4.0.2" + sources."postcss-sass-0.4.4" + sources."postcss-scss-2.1.1" + sources."postcss-selector-matches-4.0.0" + sources."postcss-selector-not-4.0.1" + sources."postcss-selector-parser-6.0.5" + sources."postcss-sorting-4.1.0" + (sources."postcss-svgo-4.0.3" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-syntax-0.36.2" + sources."postcss-unique-selectors-4.0.1" + sources."postcss-value-parser-4.1.0" + sources."postcss-values-parser-2.0.1" + sources."prelude-ls-1.2.1" + sources."pretty-bytes-5.6.0" + sources."pretty-error-2.1.2" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" + sources."promise-inflight-1.0.1" + sources."proxy-addr-2.0.6" + sources."prr-1.0.1" + sources."pump-3.0.0" + sources."punycode-2.1.1" + sources."q-1.5.1" + sources."qs-6.7.0" + sources."querystring-0.2.0" + sources."querystringify-2.2.0" + sources."queue-microtask-1.2.3" + sources."quick-lru-4.0.1" + sources."randombytes-2.1.0" + sources."range-parser-1.2.1" + (sources."raw-body-2.4.0" // { + dependencies = [ + sources."bytes-3.1.0" + sources."iconv-lite-0.4.24" + ]; + }) + sources."read-file-stdin-0.2.1" + (sources."read-pkg-2.0.0" // { + dependencies = [ + sources."path-type-2.0.0" + sources."pify-2.3.0" + ]; + }) + (sources."read-pkg-up-2.0.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."locate-path-2.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."path-exists-3.0.0" + ]; + }) + sources."readable-stream-2.3.7" + sources."readdirp-3.5.0" + sources."rechoir-0.7.0" + sources."redent-3.0.0" + sources."regenerate-1.4.2" + sources."regenerate-unicode-properties-8.2.0" + sources."regenerator-runtime-0.13.8" + sources."regenerator-transform-0.14.5" + sources."regex-not-1.0.2" + sources."regexp.prototype.flags-1.3.1" + sources."regexpp-3.1.0" + sources."regexpu-core-4.7.1" + sources."regjsgen-0.5.2" + (sources."regjsparser-0.6.9" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) + sources."relateurl-0.2.7" + sources."remark-13.0.0" + sources."remark-parse-9.0.0" + sources."remark-stringify-9.0.1" + sources."remove-trailing-separator-1.1.0" + (sources."renderkid-2.0.5" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."domhandler-2.4.2" + sources."entities-1.1.2" + sources."htmlparser2-3.10.1" + sources."readable-stream-3.6.0" + sources."strip-ansi-3.0.1" + ]; + }) + sources."repeat-element-1.1.4" + sources."repeat-string-1.6.1" + sources."replace-ext-1.0.0" + sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" + sources."require-main-filename-2.0.0" + sources."requires-port-1.0.0" + sources."resize-observer-polyfill-1.5.1" + sources."resolve-1.20.0" + (sources."resolve-cwd-3.0.0" // { + dependencies = [ + sources."resolve-from-5.0.0" + ]; + }) + sources."resolve-from-3.0.0" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."retry-0.12.0" + sources."reusify-1.0.4" + sources."rgb-regex-1.0.1" + sources."rgba-regex-1.0.0" + sources."rimraf-2.7.1" + sources."rollup-1.32.1" + sources."rollup-plugin-babel-4.4.0" + (sources."rollup-plugin-terser-5.3.1" // { + dependencies = [ + sources."jest-worker-24.9.0" + sources."serialize-javascript-4.0.0" + sources."supports-color-6.1.0" + ]; + }) + (sources."rollup-pluginutils-2.8.2" // { + dependencies = [ + sources."estree-walker-0.6.1" + ]; + }) + sources."run-parallel-1.2.0" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."sass-1.32.12" + (sources."sass-loader-10.1.1" // { + dependencies = [ + sources."loader-utils-2.0.0" + sources."schema-utils-3.0.0" + sources."semver-7.3.5" + ]; + }) + sources."sax-1.2.4" + sources."schema-utils-2.7.1" + sources."screenfull-5.1.0" + sources."select-hose-2.0.0" + sources."selfsigned-1.10.11" + sources."semver-6.3.0" + (sources."send-0.17.1" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.1" + ]; + }) + sources."serialize-javascript-5.0.1" + (sources."serve-index-1.9.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."http-errors-1.6.3" + sources."inherits-2.0.3" + sources."ms-2.0.0" + sources."setprototypeof-1.1.0" + ]; + }) + sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" + sources."set-immediate-shim-1.0.1" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setprototypeof-1.1.1" + sources."shallow-clone-3.0.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-3.0.3" + (sources."simple-swizzle-0.2.2" // { + dependencies = [ + sources."is-arrayish-0.3.2" + ]; + }) + sources."slash-3.0.0" + (sources."slice-ansi-4.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."is-buffer-1.1.6" + sources."kind-of-3.2.2" + ]; + }) + sources."sockjs-0.3.21" + (sources."sockjs-client-1.5.1" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + sources."sortablejs-1.13.0" + sources."source-list-map-2.0.1" + sources."source-map-0.5.7" + (sources."source-map-loader-1.1.3" // { + dependencies = [ + sources."loader-utils-2.0.0" + sources."schema-utils-3.0.0" + sources."source-map-0.6.1" + ]; + }) + 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.1" + sources."sourcemap-codec-1.4.8" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.7" + sources."spdy-4.0.2" + (sources."spdy-transport-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."specificity-0.4.1" + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + sources."ssr-window-3.0.0" + sources."ssri-8.0.1" + sources."stable-0.1.8" + sources."state-toggle-1.0.3" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."statuses-1.5.0" + sources."string-width-4.2.2" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" + sources."string_decoder-1.1.1" + sources."stringify-entities-1.3.2" + (sources."stringify-object-3.3.0" // { + dependencies = [ + sources."is-obj-1.0.1" + sources."is-regexp-1.0.0" + ]; + }) + sources."strip-ansi-6.0.0" + sources."strip-bom-3.0.0" + sources."strip-comments-1.0.2" + sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" + sources."strip-indent-3.0.0" + sources."strip-json-comments-3.1.1" + (sources."style-loader-2.0.0" // { + dependencies = [ + sources."loader-utils-2.0.0" + sources."schema-utils-3.0.0" + ]; + }) + sources."style-search-0.1.0" + (sources."stylehacks-4.0.3" // { + dependencies = [ + sources."postcss-selector-parser-3.1.2" + ]; + }) + (sources."stylelint-13.13.1" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."array-union-2.1.0" + sources."balanced-match-2.0.0" + sources."chalk-4.1.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."cosmiconfig-7.0.0" + sources."globby-11.0.3" + sources."has-flag-4.0.0" + (sources."import-fresh-3.3.0" // { + dependencies = [ + sources."resolve-from-4.0.0" + ]; + }) + sources."parse-json-5.2.0" + sources."resolve-from-5.0.0" + sources."supports-color-7.2.0" + ]; + }) + (sources."stylelint-config-rational-order-0.1.2" // { + dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."ansi-regex-4.1.0" + sources."astral-regex-1.0.0" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."camelcase-4.1.0" + sources."camelcase-keys-4.2.0" + sources."clone-regexp-1.0.1" + sources."dir-glob-2.2.2" + sources."emoji-regex-7.0.3" + sources."execall-1.0.0" + sources."fast-glob-2.2.7" + sources."file-entry-cache-4.0.0" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."find-up-2.1.0" + sources."flat-cache-2.0.1" + sources."flatted-2.0.2" + sources."get-stdin-6.0.0" + sources."glob-parent-3.1.0" + sources."globby-9.2.0" + sources."html-tags-2.0.0" + sources."ignore-4.0.6" + sources."import-lazy-3.1.0" + sources."indent-string-3.2.0" + sources."is-buffer-1.1.6" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."is-plain-obj-1.1.0" + sources."is-regexp-1.0.0" + sources."kind-of-3.2.2" + sources."known-css-properties-0.11.0" + sources."load-json-file-4.0.0" + sources."locate-path-2.0.0" + sources."log-symbols-2.2.0" + sources."map-obj-2.0.0" + sources."meow-5.0.0" + sources."micromatch-3.1.10" + sources."minimist-options-3.0.2" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."path-exists-3.0.0" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."postcss-sass-0.3.5" + sources."postcss-selector-parser-3.1.2" + sources."postcss-value-parser-3.3.1" + sources."quick-lru-1.1.0" + sources."read-pkg-3.0.0" + sources."read-pkg-up-3.0.0" + sources."redent-2.0.0" + sources."resolve-from-4.0.0" + sources."rimraf-2.6.3" + sources."slash-2.0.0" + sources."slice-ansi-2.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."strip-indent-2.0.0" + sources."stylelint-9.10.1" + sources."stylelint-order-2.2.1" + sources."table-5.4.6" + sources."to-regex-range-2.1.1" + sources."trim-newlines-2.0.0" + sources."yargs-parser-10.1.0" + ]; + }) + (sources."stylelint-no-browser-hacks-1.2.1" // { + dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."astral-regex-1.0.0" + sources."braces-2.3.2" + sources."browserslist-1.7.7" + sources."camelcase-4.1.0" + sources."camelcase-keys-4.2.0" + sources."chalk-1.1.3" + sources."clone-regexp-1.0.1" + sources."dir-glob-2.2.2" + sources."emoji-regex-7.0.3" + sources."execall-1.0.0" + sources."extend-shallow-2.0.1" + sources."fast-glob-2.2.7" + sources."file-entry-cache-4.0.0" + sources."fill-range-4.0.0" + sources."find-up-2.1.0" + sources."flat-cache-2.0.1" + sources."flatted-2.0.2" + sources."get-stdin-6.0.0" + sources."glob-parent-3.1.0" + sources."globby-9.2.0" + sources."has-flag-1.0.0" + sources."html-tags-2.0.0" + sources."ignore-4.0.6" + sources."import-lazy-3.1.0" + sources."indent-string-3.2.0" + sources."is-buffer-1.1.6" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."is-plain-obj-1.1.0" + sources."is-regexp-1.0.0" + sources."kind-of-3.2.2" + sources."known-css-properties-0.11.0" + sources."load-json-file-4.0.0" + sources."locate-path-2.0.0" + sources."log-symbols-1.0.2" + sources."map-obj-2.0.0" + sources."meow-5.0.0" + sources."micromatch-3.1.10" + sources."minimist-options-3.0.2" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."path-exists-3.0.0" + sources."path-type-3.0.0" + sources."pify-3.0.0" + (sources."postcss-5.2.18" // { + dependencies = [ + sources."supports-color-3.2.3" + ]; + }) + sources."postcss-reporter-1.4.1" + (sources."postcss-sass-0.3.5" // { + dependencies = [ + sources."ansi-styles-3.2.1" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + sources."has-flag-3.0.0" + sources."postcss-7.0.35" + sources."supports-color-6.1.0" + ]; + }) + sources."postcss-selector-parser-2.2.3" + sources."postcss-value-parser-3.3.1" + sources."quick-lru-1.1.0" + sources."read-pkg-3.0.0" + sources."read-pkg-up-3.0.0" + sources."redent-2.0.0" + sources."resolve-from-4.0.0" + sources."rimraf-2.6.3" + sources."slash-2.0.0" + (sources."slice-ansi-2.1.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + ]; + }) + sources."source-map-0.6.1" + (sources."string-width-3.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."strip-ansi-3.0.1" + sources."strip-indent-2.0.0" + sources."stylehacks-2.3.2" + (sources."stylelint-9.10.1" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."has-flag-3.0.0" + sources."log-symbols-2.2.0" + (sources."postcss-7.0.35" // { + dependencies = [ + sources."supports-color-6.1.0" + ]; + }) + sources."postcss-reporter-6.0.1" + sources."postcss-selector-parser-3.1.2" + sources."supports-color-5.5.0" + ]; + }) + sources."supports-color-2.0.0" + sources."table-5.4.6" + sources."to-regex-range-2.1.1" + sources."trim-newlines-2.0.0" + sources."yargs-parser-10.1.0" + ]; + }) + (sources."stylelint-order-4.1.0" // { + dependencies = [ + sources."postcss-sorting-5.0.1" + ]; + }) + sources."stylelint-scss-3.19.0" + sources."sugarss-2.0.0" + sources."supports-color-5.5.0" + sources."svg-tags-1.0.0" + (sources."svgo-1.3.2" // { + dependencies = [ + sources."mkdirp-0.5.5" + ]; + }) + sources."swiper-6.5.9" + (sources."table-6.6.0" // { + dependencies = [ + sources."ajv-8.2.0" + sources."json-schema-traverse-1.0.0" + ]; + }) + sources."tapable-1.1.3" + sources."tar-6.1.0" + sources."temp-dir-1.0.0" + (sources."tempy-0.3.0" // { + dependencies = [ + sources."type-fest-0.3.1" + ]; + }) + (sources."terser-4.8.0" // { + dependencies = [ + sources."commander-2.20.3" + sources."source-map-0.6.1" + ]; + }) + (sources."terser-webpack-plugin-5.1.1" // { + dependencies = [ + sources."commander-2.20.3" + sources."p-limit-3.1.0" + sources."schema-utils-3.0.0" + sources."source-map-0.6.1" + (sources."terser-5.7.0" // { + dependencies = [ + sources."source-map-0.7.3" + ]; + }) + ]; + }) + sources."text-table-0.2.0" + sources."thunky-1.1.0" + sources."timsort-0.3.0" + sources."to-fast-properties-2.0.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."is-buffer-1.1.6" + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.0" + sources."trim-0.0.1" + sources."trim-newlines-3.0.0" + sources."trim-trailing-lines-1.1.4" + sources."trough-1.0.5" + (sources."tsconfig-paths-3.9.0" // { + dependencies = [ + sources."json5-1.0.1" + ]; + }) + sources."tslib-2.2.0" + sources."type-2.5.0" + sources."type-check-0.4.0" + sources."type-fest-0.8.1" + sources."type-is-1.6.18" + sources."typedarray-to-buffer-3.1.5" + sources."unbox-primitive-1.0.1" + sources."unherit-1.1.3" + sources."unicode-canonical-property-names-ecmascript-1.0.4" + sources."unicode-match-property-ecmascript-1.0.4" + sources."unicode-match-property-value-ecmascript-1.2.0" + sources."unicode-property-aliases-ecmascript-1.1.0" + sources."unified-9.2.1" + sources."union-value-1.0.1" + sources."uniq-1.0.1" + sources."uniqs-2.0.0" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + sources."unique-string-1.0.0" + sources."unist-util-find-all-after-3.0.2" + sources."unist-util-is-4.1.0" + sources."unist-util-remove-position-1.1.4" + sources."unist-util-stringify-position-2.0.3" + sources."unist-util-visit-1.4.1" + (sources."unist-util-visit-parents-2.1.2" // { + dependencies = [ + sources."unist-util-is-3.0.0" + ]; + }) + sources."universalify-0.1.2" + sources."unpipe-1.0.0" + sources."unquote-1.1.1" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."upath-1.2.0" + sources."uri-js-4.4.1" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."url-parse-1.5.1" + sources."url-toolkit-2.2.2" + sources."use-3.1.1" + sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.1" + sources."utila-0.4.0" + sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."v8-compile-cache-2.3.0" + sources."validate-npm-package-license-3.0.4" + sources."vary-1.1.2" + sources."vendors-1.0.4" + sources."vfile-4.2.1" + sources."vfile-location-2.0.6" + sources."vfile-message-2.0.4" + (sources."watchpack-2.1.1" // { + dependencies = [ + sources."glob-to-regexp-0.4.1" + ]; + }) + sources."wbuf-1.7.3" + sources."webcomponents.js-0.7.24" + (sources."webpack-5.36.2" // { + dependencies = [ + sources."acorn-8.2.4" + sources."glob-to-regexp-0.4.1" + sources."schema-utils-3.0.0" + sources."source-map-0.6.1" + sources."tapable-2.2.0" + sources."webpack-sources-2.2.0" + ]; + }) + (sources."webpack-cli-4.6.0" // { + dependencies = [ + sources."commander-7.2.0" + sources."webpack-merge-5.7.3" + ]; + }) + (sources."webpack-dev-middleware-3.7.3" // { + dependencies = [ + sources."mime-2.5.2" + sources."mkdirp-0.5.5" + ]; + }) + (sources."webpack-dev-server-3.11.2" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."anymatch-2.0.0" + sources."binary-extensions-1.13.1" + sources."braces-2.3.2" + sources."chokidar-2.1.8" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."find-up-3.0.0" + sources."fsevents-1.2.13" + sources."glob-parent-3.1.0" + sources."import-local-2.0.0" + sources."is-absolute-url-3.0.3" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."locate-path-3.0.0" + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."pkg-dir-3.0.0" + sources."readdirp-2.2.1" + sources."resolve-cwd-2.0.0" + sources."schema-utils-1.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-6.1.0" + sources."to-regex-range-2.1.1" + ]; + }) + (sources."webpack-log-2.0.0" // { + dependencies = [ + sources."ansi-colors-3.2.4" + ]; + }) + sources."webpack-merge-4.2.2" + (sources."webpack-sources-1.4.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."websocket-driver-0.7.4" + sources."websocket-extensions-0.1.4" + sources."webworkify-1.5.0" + sources."whatwg-fetch-3.6.2" + sources."whatwg-mimetype-2.3.0" + sources."which-2.0.2" + sources."which-boxed-primitive-1.0.2" + sources."which-module-2.0.0" + sources."wildcard-2.0.0" + sources."word-wrap-1.2.3" + sources."workbox-background-sync-5.1.4" + sources."workbox-broadcast-update-5.1.4" + (sources."workbox-build-5.1.4" // { + dependencies = [ + sources."source-map-0.7.3" + ]; + }) + sources."workbox-cacheable-response-5.1.4" + sources."workbox-core-5.1.4" + sources."workbox-expiration-5.1.4" + sources."workbox-google-analytics-5.1.4" + sources."workbox-navigation-preload-5.1.4" + sources."workbox-precaching-5.1.4" + sources."workbox-range-requests-5.1.4" + sources."workbox-routing-5.1.4" + sources."workbox-strategies-5.1.4" + sources."workbox-streams-5.1.4" + sources."workbox-sw-5.1.4" + sources."workbox-webpack-plugin-5.1.4" + sources."workbox-window-5.1.4" + sources."worker-plugin-5.0.0" + (sources."wrap-ansi-5.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."wrappy-1.0.2" + (sources."write-1.0.3" // { + dependencies = [ + sources."mkdirp-0.5.5" + ]; + }) + sources."write-file-atomic-3.0.3" + sources."write-file-stdout-0.0.2" + sources."ws-6.2.1" + sources."x-is-string-0.1.0" + sources."xmldom-0.3.0" + sources."xtend-4.0.2" + sources."y18n-4.0.3" + sources."yallist-4.0.0" + sources."yaml-1.10.2" + (sources."yargs-13.3.2" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."camelcase-5.3.1" + sources."emoji-regex-7.0.3" + sources."find-up-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."yargs-parser-13.1.2" + ]; + }) + sources."yargs-parser-20.2.7" + sources."yocto-queue-0.1.0" + sources."zwitch-1.0.5" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Web interface for Jellyfin"; + license = "GPL-2.0-or-later"; + }; + production = false; + bypassCache = true; + reconstructLock = true; + }; +in +{ + args = args; + sources = sources; + tarball = nodeEnv.buildNodeSourceDist args; + package = nodeEnv.buildNodePackage args; + shell = nodeEnv.buildNodeShell args; + nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { + src = stdenv.mkDerivation { + name = args.name + "-package-json"; + src = nix-gitignore.gitignoreSourcePure [ + "*" + "!package.json" + "!package-lock.json" + ] args.src; + dontBuild = true; + installPhase = "mkdir -p $out; cp -r ./* $out;"; + }; + }); +} diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/nuget-deps.nix b/third_party/nixpkgs/pkgs/servers/jellyfin/nuget-deps.nix new file mode 100644 index 0000000000..978a2cff61 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/jellyfin/nuget-deps.nix @@ -0,0 +1,2268 @@ +# This file has been generated by the jellyfin updateScript. Do not edit! +{ fetchNuGet }: [ + (fetchNuGet { + name = "BDInfo"; + version = "0.7.6.1"; + sha256 = "06qhssvd4iicssl9wv7921g3ss6y2s6g9zhf1svgcm8ffs52i38i"; + }) + (fetchNuGet { + name = "BlurHashSharp"; + version = "1.1.1"; + sha256 = "1fbpg9935pfpr93vywxjdxqzjv1c7v3z86ylzh5n2krxm5jygzrv"; + }) + (fetchNuGet { + name = "BlurHashSharp.SkiaSharp"; + version = "1.1.1"; + sha256 = "11ljrrph0kkw2qfxyza9xfzmh6aspbx5iv0pvk4ms0hyzxh1mas0"; + }) + (fetchNuGet { + name = "CommandLineParser"; + version = "2.8.0"; + sha256 = "1m32xyilv2b7k55jy8ddg08c20glbcj2yi545kxs9hj2ahanhrbb"; + }) + (fetchNuGet { + name = "DotNet.Glob"; + version = "3.1.0"; + sha256 = "11rvhb7y420yadah3j8by5xc7ad2ks2bqyhn4aa10m3xb6hiza0i"; + }) + (fetchNuGet { + name = "Humanizer.Core"; + version = "2.8.26"; + sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; + }) + (fetchNuGet { + name = "Jellyfin.XmlTv"; + version = "10.6.2"; + sha256 = "0ngxjl6d99hzccdbisgwf84w27j2fvjxr05awkirvm6nzvbgq16a"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Antiforgery"; + version = "2.2.0"; + sha256 = "026wjdwjx0lgccqv0xi5gxylxzgz5ifgxf25p5pqakgrhkz0a59l"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "5.0.5"; + sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Authentication"; + version = "2.2.0"; + sha256 = "0yqfzd0qq5ypmk6b9gnb1yscl75fxx9frq808cxs70ay7y7jqmgn"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Authentication.Abstractions"; + version = "2.2.0"; + sha256 = "0vj7fhpk0d95nkkxz4q0rma6pb4ym96mx6nms4603y0l19h0k5yh"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Authentication.Core"; + version = "2.2.0"; + sha256 = "1wgn45fmdi7dk9cl4cdhzgqc9mdxhfw7zg8zwns3j7qgrhlv6k8h"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Authorization"; + version = "5.0.3"; + sha256 = "0cffsksaaxndmryb3m1bhli1iihq1wc69dinpxzrdwhw8s2bmfxw"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Authorization.Policy"; + version = "2.2.0"; + sha256 = "1d1zh65kfjf81j21ssmhr465vx08bra8424vgnrb22gdx03mhwd2"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Connections.Abstractions"; + version = "2.2.0"; + sha256 = "1rl94r8b0zq14f3dhfnvfjj1ivr81iw9zh5kdgs3zkdv0xc9x21j"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Cors"; + version = "2.2.0"; + sha256 = "0qskbz87i74kfbklxqfyqaccyba21kkx2lcdfa54kxj9r8daq7sc"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Cryptography.Internal"; + version = "2.2.0"; + sha256 = "01lg2fx85b47ldgdrhs6clsivj35x54xwc9r5xk3f1v8rr3gycsv"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.DataProtection"; + version = "2.2.0"; + sha256 = "09lzbp084xxy1xxfbxpqdff8phv2pzd1n5v30xfm03hhl7a038gx"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.DataProtection.Abstractions"; + version = "2.2.0"; + sha256 = "1gi4hpssmrrdf5lm6idkhvqbfy12bx14976y4gbhmx9z8lxaqcfz"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Diagnostics.Abstractions"; + version = "2.2.0"; + sha256 = "061cdhjh5w2f1frhimcgk68vx8p743jb9h4qik3lm1c734r0drm0"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Hosting"; + version = "2.2.7"; + sha256 = "0pr4kmzlj3rmylxqg6dw2ph8a8sl2m2k630z1qy21kddsb4ac849"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Hosting.Abstractions"; + version = "2.2.0"; + sha256 = "043k651vbfshh3s997x42ymj8nb32419m7q3sjw5q2c27anrhfhv"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; + version = "2.2.0"; + sha256 = "0nz73bwrvhc1n7gd7xxm3p5ww2wx9qr9m9i43y20gh0c54adkygh"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Html.Abstractions"; + version = "2.2.0"; + sha256 = "1z5lkzb9h9wprvyxyjw4fj7bjypaibsw0cj4bz769hf0abjz8y1v"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Http"; + version = "2.2.0"; + sha256 = "1fcrafpa57sab3as18idqknzlxkx49n4sxzlzik3sj6pcji5j17q"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Http"; + version = "2.2.2"; + sha256 = "09mgjvpqdyylz9dbngql9arx46lfkiczjdf7aqr9asd5vjqlv2c8"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Http.Abstractions"; + version = "2.2.0"; + sha256 = "13s8cm6jdpydxmr0rgmzrmnp1v2r7i3rs7v9fhabk5spixdgfy6b"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Http.Extensions"; + version = "2.2.0"; + sha256 = "118gp1mfb8ymcvw87fzgjqwlc1d1b0l0sbfki291ydg414cz3dfn"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Http.Features"; + version = "2.2.0"; + sha256 = "0xrlq8i61vzhzzy25n80m7wh2kn593rfaii3aqnxdsxsg6sfgnx1"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.JsonPatch"; + version = "2.2.0"; + sha256 = "07cihb5sqkavg42nvircdwjp0b67mhrla97jgx285zdjphplg4h2"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Localization"; + version = "2.2.0"; + sha256 = "08knc70cy7ycid5sbbbzy6my4b7ddj4j760k5xf1qnfb0njxhfh7"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Metadata"; + version = "5.0.3"; + sha256 = "01v2iaqpzz0h6z3hg1vr67za7d3283gs0wym42zvb9yksg6pf0zi"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc"; + version = "2.2.0"; + sha256 = "16jrikcywkd4r4jh551p8gxxw6hj3aizdzd5i7agb06gwpgqqv9c"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.Abstractions"; + version = "2.2.0"; + sha256 = "09p447ipd19517vy8xx9ykvspn6b4fgbm2rskpmzyw41x9wz4k0b"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.Analyzers"; + version = "2.2.0"; + sha256 = "1b975z00bzgh2z5hina4bzfksvc2vgnbzmi8g3q962hspg6ylh9f"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.ApiExplorer"; + version = "2.2.0"; + sha256 = "1ryhd1md30fgrli74qv45mhldivbasdvydw0lllg6x6jzpyrkwpa"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.Core"; + version = "2.2.0"; + sha256 = "1k6lkgk9zak5sczvyjbwgqnfcwcg9ks74wznqfzck8c6hns1by0m"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.Cors"; + version = "2.2.0"; + sha256 = "077vjxn0k5rr4s675g50rzkns6scgijxxh5iib59k77ldwpdr14q"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.DataAnnotations"; + version = "2.2.0"; + sha256 = "0vdhdjarh4az7g71gkvmhq6xpvwhh8si3sbrpdwb8p60i94cdyl6"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.Formatters.Json"; + version = "2.2.0"; + sha256 = "0421fcf2z8a6z81ql123ili32wbr3x25zpq17xjf4s9fmsr0069a"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.Localization"; + version = "2.2.0"; + sha256 = "0d27xirwsr3j7jacsrz6g2r4py35hgzjyy6ak6gkd07cm707wgc6"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.Razor"; + version = "2.2.0"; + sha256 = "06fqg7rfyvfj3hdppkhy37ddjff2d6pg7khj6lccs9lwc732yr7q"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; + version = "2.2.0"; + sha256 = "04javqbzv7mkakqjl40j429giaagjj7hmwcljrgj8q1jknk0x9xc"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.RazorPages"; + version = "2.2.0"; + sha256 = "0zqyqfxzl3lkqfy9chd0ipani75q3109imlxrnhdfiwmxrd8xqbm"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.TagHelpers"; + version = "2.2.0"; + sha256 = "16aprk81sp2i0n0dmp318cm65mk03i58rhpijm4fz4xz51j7z8li"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.ViewFeatures"; + version = "2.2.0"; + sha256 = "1isflvb0ff5nfqnvdlyvmszkd42axbbz0xmdaf0d7sah0qkvvi7n"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Razor"; + version = "2.2.0"; + sha256 = "02ybprvsi59nwa0fdq99jvx7r26bs2bg3xjxkilc495clgg98zp0"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Razor.Design"; + version = "2.2.0"; + sha256 = "03pcdcbmyw050hag588b7caqilnq3cb6ndq5g6j0r7j7wf3plsn6"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Razor.Language"; + version = "2.2.0"; + sha256 = "0n58qdipwy5wymfhgm3anickwvnf4svb9ipbrby7ksrhhrkqvx4z"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Razor.Runtime"; + version = "2.2.0"; + sha256 = "1n9j5hjinm5gp39nwmcf26dwg1psl7sf7xkxnvfxsnl44mbcy695"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.ResponseCaching.Abstractions"; + version = "2.2.0"; + sha256 = "01sp2i2bgcn6blw1mcvg5nrlc97c9czyawwvgfi6ydzdvs6ang37"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.ResponseCompression"; + version = "2.2.0"; + sha256 = "0madnk92752alpc7cv2bazqlihhzgl3yj1s9ajhi3w09vg8n8pz4"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Routing"; + version = "2.2.0"; + sha256 = "12kv602j2rxp43l1v3618yz3pdd7hqc3r98ya0bqz6y2ppvhbyws"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Routing.Abstractions"; + version = "2.2.0"; + sha256 = "0d9wwz1rsh1fslbv1y72jpkvqv2v9n28rl3vslcg0x74lp2678ly"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Server.Kestrel"; + version = "2.2.0"; + sha256 = "0wh7hf09i9qxs9r0d5xdcx3qingsid9nxlwcyjg2r44pjs6cg1rf"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Server.Kestrel.Core"; + version = "2.2.0"; + sha256 = "075ffds8hwp8ps0zf84bsv9pgiaqry9njc403qack701aybci97r"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Server.Kestrel.Https"; + version = "2.2.0"; + sha256 = "08z447wrbzy3l9lmmas353nr17sg9yccwcg62l9ax9a6n1wvds8c"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions"; + version = "2.2.0"; + sha256 = "08bj95zy4zszyx1rsy8v2ai9kg4120ij6yi0zillwx3ndb3q7vfb"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets"; + version = "2.2.0"; + sha256 = "0vhicfnv12sz2c81czdgdlffcgrhnn1jzz9zwy3a9c2n4rn8k9k5"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.WebSockets"; + version = "2.2.1"; + sha256 = "0gzikr1z2fdz8nzy1m969jsrk2h97ld1hzgmbc6f036qmhiq26hr"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.WebUtilities"; + version = "2.2.0"; + sha256 = "0cs1g4ing4alfbwyngxzgvkrv7z964isv1j9dzflafda4p0wxmsi"; + }) + (fetchNuGet { + name = "Microsoft.Build.Tasks.Git"; + version = "1.0.0"; + sha256 = "0avwja8vk56f2kr2pmrqx3h60bnwbs7ds062lhvhcxv87m5yfqnj"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Analyzers"; + version = "1.1.0"; + sha256 = "08r667hj2259wbim1p3al5qxkshydykmb7nd9ygbjlg4mmydkapc"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Common"; + version = "2.8.0"; + sha256 = "0g4h41fs0r8lqh9pk9s4mc1090kdpa6sbxq4rc866s8hnq9s1h4j"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.CSharp"; + version = "2.8.0"; + sha256 = "0p1xvw1h2fmnxywv1j4x6p3rgarpc8mfwfgn0vflk5xfnc961f6w"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.FxCopAnalyzers"; + version = "2.9.8"; + sha256 = "15zv982rln15ds8z2hkpmx04njdg0cmmf1xnb9v1v7cxxf7yxx27"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Razor"; + version = "2.2.0"; + sha256 = "03cm9danxxnsnmrzfz2swz6zhckkgg6hrz1ycnvnjrbpk3w4v0d6"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.VersionCheckAnalyzer"; + version = "2.9.8"; + sha256 = "19v25694f9l172snrm4qik5gxzlifiyrmf0kk2zasz7hrciw36bl"; + }) + (fetchNuGet { + name = "Microsoft.CodeQuality.Analyzers"; + version = "2.9.8"; + sha256 = "17ld069hlpcv4z4ylx6m4rhd398sxd0qd0msadfm0rljlkj6xg83"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.0.1"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.3.0"; + sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.5.0"; + sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.7.0"; + sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; + }) + (fetchNuGet { + name = "Microsoft.Data.Sqlite.Core"; + version = "5.0.3"; + sha256 = "1msj8zn2yfdn5lcny3msqiry94rhs8lkmx1l4pv29mhxggchvidr"; + }) + (fetchNuGet { + name = "Microsoft.DotNet.PlatformAbstractions"; + version = "2.0.4"; + sha256 = "1fdzln4im9hb55agzwchbfgm3vmngigmbpci5j89b0gqcxixmv8j"; + }) + (fetchNuGet { + name = "Microsoft.DotNet.PlatformAbstractions"; + version = "2.1.0"; + sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; + }) + (fetchNuGet { + name = "Microsoft.DotNet.PlatformAbstractions"; + version = "3.1.6"; + sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore"; + version = "5.0.3"; + sha256 = "1bhkmr15njgyrd57rmvrjdyamj6qm1n8sdrzcgbfyj7wsjav8dmv"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Abstractions"; + version = "5.0.3"; + sha256 = "1h0cxqsmpgd1fc9jd4mm1v89s8zchpmd24ks4j5fjgc3j83nvgg9"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Analyzers"; + version = "5.0.3"; + sha256 = "0mgnw1na94gg4mks7ba9r9cfy3k8vnspi08ryc2i8h91m31dibc2"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Design"; + version = "5.0.3"; + sha256 = "00p9l6ydqg6kmwyqza0dd9q1zfvam7b3hv8b9kafbl590kdxjzl4"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Relational"; + version = "5.0.3"; + sha256 = "11pancjxzx04yvy7h4x4m6hncwl2ijiwsvr9m1sa1cmq53lrrvlk"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Sqlite"; + version = "5.0.3"; + sha256 = "16658n7q2jahk4haljand6j3bmkg718hck4g1piy1j8kx2i6dg7p"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; + version = "5.0.3"; + sha256 = "0ffi0dyrg00891ac15qajrk7mnhwyayi1fdpwjm10zjdxm4nwy26"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Tools"; + version = "5.0.3"; + sha256 = "074v7y4irv34xw16ps8mmjm5pq8gk1fs17kx4sznw9bgkcfrm0hy"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.ApiDescription.Server"; + version = "3.0.0"; + sha256 = "13a47xcqyi5gz85swxd4mgp7ndgl4kknrvv3xwmbn71hsh953hsh"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Abstractions"; + version = "2.2.0"; + sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Abstractions"; + version = "5.0.0"; + sha256 = "0j83zapqhgqb4v5f6kn891km095pfhvsqha357a86ccclmv2czvb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Memory"; + version = "2.2.0"; + sha256 = "0bzrsn5vas86w66bd04xilnlb21nx4l6lz7d3acvy6y8ir2vb5dv"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Memory"; + version = "5.0.0"; + sha256 = "0l8spndl3kvccjlay202msm31iy5iig0i9ddbsdy92wbcjr97lca"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "2.0.0"; + sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "2.2.0"; + sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "3.1.2"; + sha256 = "06diq359ac4bf8jlr9msf8mwalk1a85lskkgcd8mcha56l7l7g0r"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "3.1.6"; + sha256 = "0j0zl05n9vv23m2dg4wy6pc39zy09rvnr0ljwh63sa1gski32fhx"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "5.0.0"; + sha256 = "01m9vzlq0vg0lhckj2dimwq42niwny8g3lm13c9a401hlyg90z1p"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "2.0.0"; + sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "2.1.0"; + sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "2.2.0"; + sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "3.1.2"; + sha256 = "1mfsgiklr4v99bx62z97vnp7y2jbdr9g9gwyyw89xcb67pir0wb9"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "3.1.6"; + sha256 = "1bqp28717rdlygdj7m3srfdbkvx0x6bqs2ply9h2sib87jqxaz9i"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "5.0.0"; + sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "2.0.0"; + sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "2.2.0"; + sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "3.1.2"; + sha256 = "1jksknhlvgxgys51z0j7pi6c4k8m1iqv3ixp8nhrk24bc8hf04br"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "3.1.6"; + sha256 = "0lq35v2zqvs9jl7y347nr8qmdghr6xrymmik3b5kndw1zlrflavn"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "5.0.0"; + sha256 = "0sld0bh2k5kss32i3nf8mwqkjagmw0d1cdfmxm87ckiicwm413a0"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.EnvironmentVariables"; + version = "2.2.4"; + sha256 = "0i5m7ki5jl4q9fbc0capcjakbh2y55g0zhq7cjs9qw38496rb020"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.EnvironmentVariables"; + version = "5.0.0"; + sha256 = "03gvckj10ljk1mir9g8cf3cajsnihhvmh8z8341gkr9h5653qkv0"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.FileExtensions"; + version = "2.2.0"; + sha256 = "0bwk1kh6q259nmnly90j5rbbzi9w5gigq5vyjr31c1br4j8cjmqd"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.FileExtensions"; + version = "5.0.0"; + sha256 = "1wq229r3xcmm9wh9sqdpvmfv4qpbp2zms9x6xk7g7sbb8h32hnz3"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Json"; + version = "5.0.0"; + sha256 = "0hq5i483bjbvprp1la9l3si82x1ydxbvkpfc7r3s7zgxg957fyp9"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "2.2.0"; + sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "3.1.2"; + sha256 = "0z3vdzrnfy838afc2vv4knj2ycab7jni55kdj82p7plfjngv01ic"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "3.1.6"; + sha256 = "0m8b5phfbkx96l92nf0xs3bz6861mhb7i4havxckz7mr81g968l6"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "5.0.0"; + sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "5.0.1"; + sha256 = "06xig49mwyp3b2dvdx98j079ncg6p4c9x8yj4pzs6ppmi3jgaaqk"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "2.0.0"; + sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "2.1.0"; + sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "2.2.0"; + sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "3.1.2"; + sha256 = "0jh1338ai6060k1130by4m0s7jhz8ky7ij9vagrsgnpcl1yc9k70"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "3.1.6"; + sha256 = "18mcv1x6b3qlaksmb8q92r34jrv1841la5lmg21qppmb9qs0z293"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "5.0.0"; + sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyModel"; + version = "2.0.4"; + sha256 = "041i1vlcibpzgalxxzdk81g5pgmqvmz2g61k0rqa2sky0wpvijx9"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyModel"; + version = "2.1.0"; + sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyModel"; + version = "5.0.0"; + sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Diagnostics.HealthChecks"; + version = "5.0.3"; + sha256 = "0hv4l27bp29gy3rh9cssvvc8xwzy8ffwh277dw870zhv5mm2ha29"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions"; + version = "5.0.3"; + sha256 = "1r1xrlgbyfsf0b447lw6lv6jxq339ssrm61klyjmnk1ady05h9di"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore"; + version = "5.0.3"; + sha256 = "0q0j75i289yn3bv09dhzfirpb4glqm35wrv7p2463kmbf3g551rr"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Abstractions"; + version = "2.1.0"; + sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Abstractions"; + version = "2.2.0"; + sha256 = "1f83ffb4xjwljg8dgzdsa3pa0582q6b4zm0si467fgkybqzk3c54"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Abstractions"; + version = "5.0.0"; + sha256 = "01ahgd0b2z2zycrr2lcsq2cl59fn04bh51hdwdp9dcsdkpvnasj1"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Composite"; + version = "2.2.0"; + sha256 = "0k3qfxb0pn9b63grbf9jv7xw40gk6m1djmi3c4inwys7lxcj2k18"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Physical"; + version = "2.2.0"; + sha256 = "0lrq4bxf67pw6n9kzwzqsnxkad2ygh2zn46hjias8j7aqljglh7x"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Physical"; + version = "5.0.0"; + sha256 = "00vii8148a6pk12l9jl0rhjp7apil5q5qcy7v1smnv17lj4p8szd"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileSystemGlobbing"; + version = "2.2.0"; + sha256 = "01jw7s1nb44n65qs3rk7xdzc419qwl0s5c34k031f1cc5ag3jvc2"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileSystemGlobbing"; + version = "5.0.0"; + sha256 = "0lm6n9vbyjh0l17qcc2y9qwn1cns3dyjmkvbxjp0g9sll32kjpmb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Hosting.Abstractions"; + version = "2.1.0"; + sha256 = "04vm9mdjjzg3lpp2rzpgkpn8h5bzdl3bwcr22lshd3kp602ws4k9"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Hosting.Abstractions"; + version = "2.2.0"; + sha256 = "1xc7xr1nq7akfahyl5in9iyxrygap2xi9nxh39rfm37sf8lk55v1"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Hosting.Abstractions"; + version = "5.0.0"; + sha256 = "1k28hndmm8ky7sr2j5agdz9lls25mbb08dkypka0b76x5f4hplb5"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Http"; + version = "3.1.6"; + sha256 = "04ggi7vdx7h5622y1y7xcls6lij880jn9b2xgg73rwrq6bcadj6q"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Http"; + version = "5.0.0"; + sha256 = "1sx2w6s2giavi3i1wbpa64h1v1xhk5afz3whh7rxhb9fmsn9h1bk"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Localization"; + version = "2.2.0"; + sha256 = "1k73kk5qmrvdyd7l8qxp19crw18f2p5dgk3cjx59g7vf3rkgmc6k"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Localization.Abstractions"; + version = "2.2.0"; + sha256 = "1yzqs5x97rj6wlg0rylj0xi3dn1bw4ps26zdqsijx621jl1r97gy"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging"; + version = "2.2.0"; + sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging"; + version = "3.1.2"; + sha256 = "0yh4zbyvm24alrcblcbm0sp7l9ys5ypcxs7l772yj7fdpk0bx3ap"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging"; + version = "3.1.6"; + sha256 = "0brzknkxlalpb1a8m371nmkmpfjf1q3p8x6nls5ylh0w7midxxgp"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging"; + version = "5.0.0"; + sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "2.1.0"; + sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "2.2.0"; + sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "3.1.2"; + sha256 = "0givwc5dnz1wm9aa0sfxi4mjws6v9c8v5i5772yg1r4w1wvn3733"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "3.1.6"; + sha256 = "16pk17a3hh0j431a5f7d663iqk1j6n3wjlzk6chmvnfk3dpwfhww"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "5.0.0"; + sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.ObjectPool"; + version = "2.2.0"; + sha256 = "0n1q9lvc24ii1shzy575xldgmz7imnk4dswwwcgmzz93klri9r1z"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "2.0.0"; + sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "2.2.0"; + sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "3.1.2"; + sha256 = "005f42rq6n2v5cakqi51266g26dkjc6nsqdd6w62pxvv6g6kp9km"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "3.1.6"; + sha256 = "1rdi0pcpcmhvwkn7mxymrpav9q2c4frxhl99ps961mmh1i5738sc"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "5.0.0"; + sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options.ConfigurationExtensions"; + version = "2.0.0"; + sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "2.0.0"; + sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "2.1.0"; + sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "2.2.0"; + sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "3.1.2"; + sha256 = "04hdb7rd59frgb5ym0sfwc5r67jj6vykcbxljzs8909f8hrs98jb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "3.1.6"; + sha256 = "1acl88cph3yqcjz7ami5hzdr69cvxvry24a6r6fmrwnzfcc1i40n"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "5.0.0"; + sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.WebEncoders"; + version = "2.2.0"; + sha256 = "1mhnichccw6mjf37d38q2i1kr7qp485m7apa1b872ji0q16yy1y3"; + }) + (fetchNuGet { + name = "Microsoft.NetCore.Analyzers"; + version = "2.9.8"; + sha256 = "1klybsdy9yw49zlpmix4vjdhmfaibg5h9yx03vszdnijzap7vpsx"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.App.Runtime.linux-x64"; + version = "5.0.5"; + sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.0.1"; + sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.1"; + sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "2.0.0"; + sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "3.1.1"; + sha256 = "05hmaygd5131rnqi6ipv7agsbpi7ka18779vw45iw6b385l7n987"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "5.0.0"; + sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.0.1"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.1.3"; + sha256 = "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq"; + }) + (fetchNuGet { + name = "Microsoft.NetFramework.Analyzers"; + version = "2.9.8"; + sha256 = "0mb3gkqcr13ryphrzax40cf05bz0h269a6zm1hnzzsq7gbd5iipb"; + }) + (fetchNuGet { + name = "Microsoft.Net.Http.Headers"; + version = "2.2.0"; + sha256 = "0w6lrk9z67bcirq2cj2ldfhnizc6id77ba6i30hjzgqjlyhh1gx5"; + }) + (fetchNuGet { + name = "Microsoft.Net.Http.Headers"; + version = "2.2.8"; + sha256 = "1s0n68z6v5mbys4jjrd4jdxrrz81iq4dzmmbmxzmlf59769x8rj9"; + }) + (fetchNuGet { + name = "Microsoft.OpenApi"; + version = "1.2.3"; + sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; + }) + (fetchNuGet { + name = "Microsoft.SourceLink.Common"; + version = "1.0.0"; + sha256 = "1zxkpx01zdv17c39iiy8fx25ran89n14qwddh1f140v1s4dn8z9c"; + }) + (fetchNuGet { + name = "Microsoft.SourceLink.GitHub"; + version = "1.0.0"; + sha256 = "029ixyaqn48cjza87m5qf0g1ynyhlm6irgbx1n09src9g666yhpd"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.0.1"; + sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "4.5.0"; + sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; + }) + (fetchNuGet { + name = "Mono.Nat"; + version = "3.0.1"; + sha256 = "1xy3c9wsiz8k3rx8v60y6gnps337rsb5jpyj0r6g384prg6z4vh0"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "1.6.0"; + sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "1.6.1"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "10.0.1"; + sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "11.0.2"; + sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.2"; + sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.3"; + sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "9.0.1"; + sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; + }) + (fetchNuGet { + name = "Newtonsoft.Json.Bson"; + version = "1.0.1"; + sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; + }) + (fetchNuGet { + name = "OptimizedPriorityQueue"; + version = "5.0.0"; + sha256 = "0a0kn4sr80yx1bm5nngbillfbcafv86hqxwp5kxjgh3wcd01c803"; + }) + (fetchNuGet { + name = "PlaylistsNET"; + version = "1.1.3"; + sha256 = "092lgqvvarx6g8mrhm8rdzcqisklzffa0i3gkpc0zbk7b7b0f8yg"; + }) + (fetchNuGet { + name = "prometheus-net"; + version = "3.1.2"; + sha256 = "1jyxvl9cqxvb71mpaglw8aks27i69hg7yzrdwsjc182nmmhh1p03"; + }) + (fetchNuGet { + name = "prometheus-net"; + version = "4.1.1"; + sha256 = "0n016rxlz00xrw1jrikwr6h221rrw96h13d0823mfb5375rdi8rx"; + }) + (fetchNuGet { + name = "prometheus-net.AspNetCore"; + version = "4.1.1"; + sha256 = "0239i5ga7z3ajq6rvqz2ym3a30b1nbfjn6dnmc1iljd9579flzhs"; + }) + (fetchNuGet { + name = "prometheus-net.DotNetRuntime"; + version = "3.4.1"; + sha256 = "1b4a5yh2s8nji4bvp9fcw03dw0wbx58823b7jfga0vva33am3xx8"; + }) + (fetchNuGet { + name = "runtime.any.System.Collections"; + version = "4.3.0"; + sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; + }) + (fetchNuGet { + name = "runtime.any.System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; + }) + (fetchNuGet { + name = "runtime.any.System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; + }) + (fetchNuGet { + name = "runtime.any.System.Globalization"; + version = "4.3.0"; + sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; + }) + (fetchNuGet { + name = "runtime.any.System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; + }) + (fetchNuGet { + name = "runtime.any.System.IO"; + version = "4.3.0"; + sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; + }) + (fetchNuGet { + name = "runtime.any.System.Reflection"; + version = "4.3.0"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + }) + (fetchNuGet { + name = "runtime.any.System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; + }) + (fetchNuGet { + name = "runtime.any.System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; + }) + (fetchNuGet { + name = "runtime.any.System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; + }) + (fetchNuGet { + name = "runtime.any.System.Runtime"; + version = "4.3.0"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; + }) + (fetchNuGet { + name = "runtime.any.System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; + }) + (fetchNuGet { + name = "runtime.any.System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; + }) + (fetchNuGet { + name = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + }) + (fetchNuGet { + name = "runtime.any.System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; + }) + (fetchNuGet { + name = "runtime.any.System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; + }) + (fetchNuGet { + name = "runtime.any.System.Threading.Timer"; + version = "4.3.0"; + sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; + }) + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }) + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }) + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.1.0"; + sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; + }) + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.3.0"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.0.1"; + sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.3.0"; + sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography"; + version = "4.0.0"; + sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }) + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) + (fetchNuGet { + name = "runtime.unix.Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; + }) + (fetchNuGet { + name = "runtime.unix.System.Console"; + version = "4.3.0"; + sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; + }) + (fetchNuGet { + name = "runtime.unix.System.Console"; + version = "4.3.1"; + sha256 = "15kfi3761mk2i29zg135ipsvavm50nwm4334cy5m5q7iagzsf73p"; + }) + (fetchNuGet { + name = "runtime.unix.System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; + }) + (fetchNuGet { + name = "runtime.unix.System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; + }) + (fetchNuGet { + name = "runtime.unix.System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; + }) + (fetchNuGet { + name = "runtime.unix.System.Net.Sockets"; + version = "4.3.0"; + sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; + }) + (fetchNuGet { + name = "runtime.unix.System.Private.Uri"; + version = "4.3.0"; + sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; + }) + (fetchNuGet { + name = "runtime.unix.System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; + }) + (fetchNuGet { + name = "Serilog"; + version = "2.3.0"; + sha256 = "0y1111y0csfnil901nfahhj3x251nzdam0c4vab3gw5qh8iqs3my"; + }) + (fetchNuGet { + name = "Serilog"; + version = "2.5.0"; + sha256 = "0lq3kpmb83mv9kzr9zshz46bp6mvgx1kfz4dzjgzpasf6llgmrx0"; + }) + (fetchNuGet { + name = "Serilog"; + version = "2.6.0"; + sha256 = "0xzq2szx5yb9xgnkj2zvjil48baald22jm2j39smnac32gid5gm0"; + }) + (fetchNuGet { + name = "Serilog"; + version = "2.8.0"; + sha256 = "0fnrs05yjnni06mbax7ig74wiiqjyyhrxmr1hrhlpwcmc40zs4ih"; + }) + (fetchNuGet { + name = "Serilog"; + version = "2.9.0"; + sha256 = "0z0ib82w9b229a728bbyhzc2hnlbl0ki7nnvmgnv3l741f2vr4i6"; + }) + (fetchNuGet { + name = "SerilogAnalyzer"; + version = "0.15.0.0"; + sha256 = "0k83cyzl9520q282vp07zb8rs16a56axv7a31l3m5fb1afq2hv9l"; + }) + (fetchNuGet { + name = "Serilog.AspNetCore"; + version = "3.4.0"; + sha256 = "1k59zspma8hlka6j6hvflw8i073092qj8kzz52fdkqrck7w7cbag"; + }) + (fetchNuGet { + name = "Serilog.Enrichers.Thread"; + version = "3.1.0"; + sha256 = "1y75aiv2k1sxnh012ixkx92fq1yl8srqggy8l439igg4p223hcqi"; + }) + (fetchNuGet { + name = "Serilog.Extensions.Hosting"; + version = "3.1.0"; + sha256 = "0n01n2kvapl5hkp80fa0ra8zixacfqhrs05ijkh3hj5bvgnscsx5"; + }) + (fetchNuGet { + name = "Serilog.Extensions.Logging"; + version = "3.0.1"; + sha256 = "069qy7dm5nxb372ij112ppa6m99b4iaimj3sji74m659fwrcrl9a"; + }) + (fetchNuGet { + name = "Serilog.Formatting.Compact"; + version = "1.1.0"; + sha256 = "1w3qhj1jrihb20gr9la4r4gcmdyyy6dai2xflwhzvgqrq05wlycy"; + }) + (fetchNuGet { + name = "Serilog.Settings.Configuration"; + version = "3.1.0"; + sha256 = "1cj5am4n073331gbfm2ylqb9cadl4q3ppzgwmm5c8m1drxpiwkb5"; + }) + (fetchNuGet { + name = "Serilog.Sinks.Async"; + version = "1.4.0"; + sha256 = "00kqrn3xmfzg469y155vihsiby8dbbs382fi6qg8p2zg3i5dih1d"; + }) + (fetchNuGet { + name = "Serilog.Sinks.Console"; + version = "3.1.1"; + sha256 = "0j99as641y1k6havwwkhyr0n08vibiblmfjj6nz051mz8g3864fn"; + }) + (fetchNuGet { + name = "Serilog.Sinks.Debug"; + version = "1.0.1"; + sha256 = "0969mb254kr59bgkq01ybyzca89z3f4n9ng5mdj8m53d5653zf22"; + }) + (fetchNuGet { + name = "Serilog.Sinks.File"; + version = "4.1.0"; + sha256 = "1ry7p9hf1zlnai1j5zjhjp4dqm2agsbpq6cvxgpf5l8m26x6mgca"; + }) + (fetchNuGet { + name = "Serilog.Sinks.Graylog"; + version = "2.2.2"; + sha256 = "0cvl9vfd1qx0hdvvylhh9frnxwqdl9yq4vy21fjsr6wdvgflg2hr"; + }) + (fetchNuGet { + name = "ServiceStack.Text.Core"; + version = "5.10.2"; + sha256 = "0hpqfify017gm8nbah2abkk5d4vnsqrgj86i8b5mx3wy54h82pvb"; + }) + (fetchNuGet { + name = "SharpCompress"; + version = "0.26.0"; + sha256 = "03cygf8p44j1bfn6z9cn2xrw6zhvhq17xac1sph5rgq7vq2m5iq5"; + }) + (fetchNuGet { + name = "SkiaSharp"; + version = "2.80.2"; + sha256 = "17n0f4gfxz69fzd7zmgimbxfja15vq902arap2rqjr1hxp8sck7g"; + }) + (fetchNuGet { + name = "SkiaSharp.NativeAssets.Linux"; + version = "2.80.2"; + sha256 = "1951b7rpisaymb37j846jq01pjd05l4fjlnf56blh33ihxyj2jzi"; + }) + (fetchNuGet { + name = "SmartAnalyzers.MultithreadingAnalyzer"; + version = "1.1.31"; + sha256 = "1qk5s4rx5ma7k2kzkn1h94fsrzmwkivj0z1czsjwmr8z7zhngs2h"; + }) + (fetchNuGet { + name = "SQLitePCL.pretty.netstandard"; + version = "2.1.0"; + sha256 = "03vjk8r0dzyiwya6q5p2z2wp9sxj3b7xi72p7wgsy270a2pb3f28"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.bundle_e_sqlite3"; + version = "2.0.4"; + sha256 = "1l3vbkwismsx5jcy3d5bj4bzh8bni8bk2gq4lqplz82pz5phjpxm"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.core"; + version = "1.1.14"; + sha256 = "1najf6ns5b8rqqlmlxjn4wjcgnb5ch9ni7wiq6iip4155d35c519"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.core"; + version = "2.0.2"; + sha256 = "11mnbnsiirpgmilskqh1issvgzgg08ndq3p3nkrw73hyqr7kl958"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.core"; + version = "2.0.4"; + sha256 = "0lb5vwfl1hd24xzzdaj2p4k2hv2k0i3mgdri6fjj0ssb37mcyir1"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.lib.e_sqlite3"; + version = "2.0.4"; + sha256 = "0kmx1w5qllmwxldr8338qxwmpfzc6g2lmyrah7wfaxd3mvfzky5c"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.provider.dynamic_cdecl"; + version = "2.0.4"; + sha256 = "084r98kilpm0q1aw41idq8slncpd7cz65g0m1wr0p8d12x8z5g6j"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.provider.sqlite3.netstandard11"; + version = "1.1.14"; + sha256 = "00jwin9lannq4qla6r85c4f0m1y8g103r02p8cnjhakxz588dm1y"; + }) + (fetchNuGet { + name = "StyleCop.Analyzers"; + version = "1.1.118"; + sha256 = "0hj4ax64cay2lvrh9693m0g4pmis0fi5wpm12xwzvc7lkizvac0a"; + }) + (fetchNuGet { + name = "Swashbuckle.AspNetCore"; + version = "5.6.3"; + sha256 = "1s8jmvssk8g518szi9nijsq73d85fnlzvink2x0ahf2jkvpakn9p"; + }) + (fetchNuGet { + name = "Swashbuckle.AspNetCore.ReDoc"; + version = "5.6.3"; + sha256 = "1kbn77wbcn03pwcynj4n602p4157y1qrfv775clnmzfq7z5nfaw6"; + }) + (fetchNuGet { + name = "Swashbuckle.AspNetCore.Swagger"; + version = "5.6.3"; + sha256 = "0yg27nlndaiaa6sv7xkcysdpmq1dzf24xjz6xq0vwn51mn84vsg9"; + }) + (fetchNuGet { + name = "Swashbuckle.AspNetCore.SwaggerGen"; + version = "5.6.3"; + sha256 = "15h31wq9n9zcpalb3k1pzgcsafn1mz397mb9bnl55621p6zxrlz2"; + }) + (fetchNuGet { + name = "Swashbuckle.AspNetCore.SwaggerUI"; + version = "5.6.3"; + sha256 = "0vbq3xycsixnpsqw2pphzw77w1liyz8hi1sl4hy9bpgpa18p2sfj"; + }) + (fetchNuGet { + name = "System.AppContext"; + version = "4.1.0"; + sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; + }) + (fetchNuGet { + name = "System.AppContext"; + version = "4.3.0"; + sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.0.0"; + sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.3.0"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.5.0"; + sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.3.0"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }) + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.3.1"; + sha256 = "17615br2x5riyx8ivf1dcqwj6q3ipq1bi5hqhw54yfyxmx38ddva"; + }) + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "5.0.0"; + sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; + }) + (fetchNuGet { + name = "System.Collections.NonGeneric"; + version = "4.0.1"; + sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; + }) + (fetchNuGet { + name = "System.Collections.NonGeneric"; + version = "4.3.0"; + sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; + }) + (fetchNuGet { + name = "System.Collections.Specialized"; + version = "4.3.0"; + sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; + }) + (fetchNuGet { + name = "System.ComponentModel"; + version = "4.3.0"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + }) + (fetchNuGet { + name = "System.ComponentModel.Annotations"; + version = "4.5.0"; + sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; + }) + (fetchNuGet { + name = "System.ComponentModel.Annotations"; + version = "5.0.0"; + sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; + }) + (fetchNuGet { + name = "System.ComponentModel.Primitives"; + version = "4.3.0"; + sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; + }) + (fetchNuGet { + name = "System.ComponentModel.TypeConverter"; + version = "4.3.0"; + sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; + }) + (fetchNuGet { + name = "System.Console"; + version = "4.0.0"; + sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; + }) + (fetchNuGet { + name = "System.Console"; + version = "4.3.0"; + sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.0.11"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.0.0"; + sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.3.0"; + sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.5.0"; + sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.5.1"; + sha256 = "1j8dgilsgd0n7y87wq1cdlnwck96wijhbyhdp4d01l1gzm3074c1"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "5.0.1"; + sha256 = "0mzw44wsm87vpslb9sn7rirxynpq9m3b00l7gl0q71m8shfh66qs"; + }) + (fetchNuGet { + name = "System.Diagnostics.FileVersionInfo"; + version = "4.3.0"; + sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7"; + }) + (fetchNuGet { + name = "System.Diagnostics.StackTrace"; + version = "4.3.0"; + sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.0.1"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.1.0"; + sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.0.11"; + sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.3.0"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.0.1"; + sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.0.1"; + sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; + }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.3.0"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + name = "System.IO.Compression"; + version = "4.1.0"; + sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; + }) + (fetchNuGet { + name = "System.IO.Compression"; + version = "4.3.0"; + sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; + }) + (fetchNuGet { + name = "System.IO.Compression.ZipFile"; + version = "4.0.1"; + sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; + }) + (fetchNuGet { + name = "System.IO.Compression.ZipFile"; + version = "4.3.0"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) + (fetchNuGet { + name = "System.IO.Pipelines"; + version = "4.5.2"; + sha256 = "045sn3vyk5xysjjm19q4dj5c1g1rf8l98n4qsl9pl9id4fn08yq1"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) + (fetchNuGet { + name = "System.Linq.Async"; + version = "5.0.0"; + sha256 = "1bc1bfnahyk6y31mrxn7nd071436m94p4r9b2j835pghcqawqfbc"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.3.0"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.0"; + sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.1"; + sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.3"; + sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.4"; + sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; + }) + (fetchNuGet { + name = "System.Net.Http"; + version = "4.1.0"; + sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; + }) + (fetchNuGet { + name = "System.Net.Http"; + version = "4.3.0"; + sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; + }) + (fetchNuGet { + name = "System.Net.NameResolution"; + version = "4.3.0"; + sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.0.11"; + sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; + }) + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.1.0"; + sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; + }) + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.3.0"; + sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; + }) + (fetchNuGet { + name = "System.Net.WebSockets.WebSocketProtocol"; + version = "4.5.3"; + sha256 = "0z9ccndkkq6gpsh35q3pjm4zya47p6vakcyj8nc352g4wiizqc8c"; + }) + (fetchNuGet { + name = "System.Numerics.Vectors"; + version = "4.5.0"; + sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }) + (fetchNuGet { + name = "System.Private.Uri"; + version = "4.3.0"; + sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.0.1"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.0.1"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + (fetchNuGet { + name = "System.Reflection.Metadata"; + version = "1.4.2"; + sha256 = "08b7b43vczlliv8k7q43jinjfrxwpljsglw7sxmc6sd7d54pd1vi"; + }) + (fetchNuGet { + name = "System.Reflection.Metadata"; + version = "1.6.0"; + sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.0.1"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.1.0"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.0.1"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.1"; + sha256 = "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.4.0"; + sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.0"; + sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.1"; + sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.1.0"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.0.1"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.0.0"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.3.0"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.0.1"; + sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Formatters"; + version = "4.3.0"; + sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.1.1"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.3.0"; + sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; + }) + (fetchNuGet { + name = "System.Security.AccessControl"; + version = "4.5.0"; + sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; + }) + (fetchNuGet { + name = "System.Security.Claims"; + version = "4.3.0"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.2.0"; + sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.3.0"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.2.0"; + sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.3.0"; + sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.5.0"; + sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.0.0"; + sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.3.0"; + sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.0.0"; + sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.3.0"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.0.0"; + sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Pkcs"; + version = "4.5.0"; + sha256 = "16dhiz2qypk289dxiqa9rb7jmslnami6bykalv5dvbd8j91zikpy"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.0.0"; + sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.3.0"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.1.0"; + sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.3.0"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Xml"; + version = "4.5.0"; + sha256 = "1rk40x0msf9k7sxnjyizagjns1z25dh3cf22bx6hsx6vhf0sk08l"; + }) + (fetchNuGet { + name = "System.Security.Permissions"; + version = "4.5.0"; + sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; + }) + (fetchNuGet { + name = "System.Security.Principal"; + version = "4.3.0"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.3.0"; + sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.5.0"; + sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { + name = "System.Text.Encoding.CodePages"; + version = "4.3.0"; + sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv"; + }) + (fetchNuGet { + name = "System.Text.Encoding.CodePages"; + version = "4.7.1"; + sha256 = "1y1hdap9qbl7vp74j8s9zcbh3v1rnrrvcc55wj1hl6has2v3qh1r"; + }) + (fetchNuGet { + name = "System.Text.Encoding.CodePages"; + version = "5.0.0"; + sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + (fetchNuGet { + name = "System.Text.Encodings.Web"; + version = "4.5.0"; + sha256 = "0srd5bva52n92i90wd88pzrqjsxnfgka3ilybwh7s6sf469y5s53"; + }) + (fetchNuGet { + name = "System.Text.Json"; + version = "5.0.1"; + sha256 = "1j7via4spxy73ipng754wdz1nb882gsb9qh26jqlql66vzbbm3j3"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Dataflow"; + version = "5.0.0"; + sha256 = "028fimgwn5j9fv6m547c975a8b90d9qcnb89k5crjyspsnjcqbhy"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.5.1"; + sha256 = "1ikrplvw4m6pzjbq3bfbpr572n4i9mni577zvmrkaygvx85q3myw"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Parallel"; + version = "4.3.0"; + sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh"; + }) + (fetchNuGet { + name = "System.Threading.Thread"; + version = "4.3.0"; + sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; + }) + (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.3.0"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }) + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.0.1"; + sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; + }) + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.3.0"; + sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; + }) + (fetchNuGet { + name = "System.ValueTuple"; + version = "4.3.0"; + sha256 = "1227k7fxbxapq7dms4lvwwjdf3pr1jcsmhy2nzzhj6g6hs530hxn"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.0.11"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.0.11"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.3.0"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) + (fetchNuGet { + name = "System.Xml.XPath"; + version = "4.3.0"; + sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; + }) + (fetchNuGet { + name = "System.Xml.XPath.XDocument"; + version = "4.3.0"; + sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn"; + }) + (fetchNuGet { + name = "TagLibSharp"; + version = "2.2.0"; + sha256 = "0jb0f84p4jd59ha36spyk9q08g6fjap3xywq32rcs2xwzhhqiq0y"; + }) + (fetchNuGet { + name = "TMDbLib"; + version = "1.7.3-alpha"; + sha256 = "1dfk646w1mn2yj0ali7dcanxqs8q3njprzpw0n2v8wgd53jpava1"; + }) + (fetchNuGet { + name = "TvDbSharper"; + version = "3.2.2"; + sha256 = "0dkxcb7745y7wy8sdg7xic5idwwdmnp7k0x8v05f6s075a8m7nqz"; + }) + (fetchNuGet { + name = "UTF.Unknown"; + version = "2.3.0"; + sha256 = "067hw460y36sfcpdfaw8lirn1hn2g4fvkpnih41nighzvmq1ixzf"; + }) +] diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/update.sh b/third_party/nixpkgs/pkgs/servers/jellyfin/update.sh new file mode 100755 index 0000000000..09bcfecc01 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/jellyfin/update.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts dotnetCorePackages.sdk_5_0 gnused nix coreutils findutils + +set -euo pipefail + +export DOTNET_CLI_TELEMETRY_OPTOUT=1 +export DOTNET_NOLOGO=1 + +latestVersion="$(curl -s "https://api.github.com/repos/jellyfin/jellyfin/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')" +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; jellyfin.version or (lib.getVersion jellyfin)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "jellyfin is up-to-date: $currentVersion" + exit 0 +fi + +pushd "$(dirname "${BASH_SOURCE[0]}")" +nugetDepsFile=$(realpath ./nuget-deps.nix) +popd + +update-source-version jellyfin "$latestVersion" + +store_src="$(nix-build . -A jellyfin.src --no-out-link)" +src="$(mktemp -d /tmp/jellyfin-src.XXX)" +echo "Temp src dir: $src" +cp -rT "$store_src" "$src" +chmod -R +w "$src" + +pushd "$src" + +mkdir ./nuget_tmp.packages +dotnet restore Jellyfin.Server --packages ./nuget_tmp.packages --runtime linux-x64 + +echo "# This file has been generated by the jellyfin updateScript. Do not edit!" >"$nugetDepsFile" +echo "{ fetchNuGet }: [" >>"$nugetDepsFile" +while read -r pkg_spec; do + { read -r pkg_name; read -r pkg_version; } < <( + # Build version part should be ignored: `3.0.0-beta2.20059.3+77df2220` -> `3.0.0-beta2.20059.3` + sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkg_spec") + pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)" + cat >>"$nugetDepsFile" <>"$nugetDepsFile" + +popd +rm -r "$src" diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/web-update.sh b/third_party/nixpkgs/pkgs/servers/jellyfin/web-update.sh new file mode 100755 index 0000000000..87b05efc2d --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/jellyfin/web-update.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts nodePackages.node2nix gnused nix coreutils jq + +set -euo pipefail + +latestVersion="$(curl -s "https://api.github.com/repos/jellyfin/jellyfin-web/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')" +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; jellyfin-web.version or (lib.getVersion jellyfin-web)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "jellyfin-web is up-to-date: $currentVersion" + exit 0 +fi + +update-source-version jellyfin-web 0 0000000000000000000000000000000000000000000000000000000000000000 +update-source-version jellyfin-web "$latestVersion" + +# use patched source +store_src="$(nix-build . -A jellyfin-web.src --no-out-link)" + +cd "$(dirname "${BASH_SOURCE[0]}")" + +# TODO: use package-lock.json on the next major release +# https://github.com/jellyfin/jellyfin-web/commit/6efef9680d55a93f4333ef8bfb65a8a650c99a49 +node2nix \ + --nodejs-12 \ + --development \ + --node-env ../../development/node-packages/node-env.nix \ + --output ./node-deps.nix \ + --input "$store_src/package.json" \ + --composition ./node-composition.nix diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/web.nix b/third_party/nixpkgs/pkgs/servers/jellyfin/web.nix new file mode 100644 index 0000000000..1bd4a305a7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/jellyfin/web.nix @@ -0,0 +1,81 @@ +{ lib +, fetchFromGitHub +, pkgs +, stdenv +, nodejs +}: + +stdenv.mkDerivation rec { + pname = "jellyfin-web"; + version = "10.7.5"; + # TODO: on the next major release remove src.postFetch + # and use the lock file in web-update.sh: + # https://github.com/jellyfin/jellyfin-web/commit/6efef9680d55a93f4333ef8bfb65a8a650c99a49 + + src = fetchFromGitHub { + owner = "jellyfin"; + repo = "jellyfin-web"; + rev = "v${version}"; + sha256 = "5y6hWEDxY5WbOUdjujmuMV3bQVvYU2J9oIANBVN5XOc="; + postFetch = '' + mkdir -p $out + cd $out + tar -xzf $downloadedFile --strip-components=1 + + # replace unsupported dependency url + # https://github.com/svanderburg/node2nix/issues/163 + substituteInPlace package.json \ + --replace \ + "https://github.com/jellyfin/JavascriptSubtitlesOctopus#4.0.0-jf-smarttv" \ + "https://github.com/jellyfin/JavascriptSubtitlesOctopus/archive/refs/tags/4.0.0-jf-smarttv.tar.gz" + ''; + }; + + nativeBuildInputs = [ + nodejs + ]; + + buildPhase = + let + nodeDependencies = ((import ./node-composition.nix { + inherit pkgs nodejs; + inherit (stdenv.hostPlatform) system; + }).nodeDependencies.override (old: { + # access to path '/nix/store/...-source' is forbidden in restricted mode + src = src; + + # dont run the prepare script: + # Error: Cannot find module '/nix/store/...-node-dependencies-jellyfin-web-.../jellyfin-web/scripts/prepare.js + # npm run build:production runs the same command + dontNpmInstall = true; + })); + in + '' + runHook preBuild + + ln -s ${nodeDependencies}/lib/node_modules ./node_modules + export PATH="${nodeDependencies}/bin:$PATH" + + npm run build:production + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + cp -a dist $out/share/jellyfin-web + + runHook postInstall + ''; + + passthru.updateScript = ./web-update.sh; + + meta = with lib; { + description = "Web Client for Jellyfin"; + homepage = "https://jellyfin.org/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ nyanloutre minijackson purcell jojosch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/jetbrains/youtrack.nix b/third_party/nixpkgs/pkgs/servers/jetbrains/youtrack.nix index c3680d76b9..cba162fd26 100644 --- a/third_party/nixpkgs/pkgs/servers/jetbrains/youtrack.nix +++ b/third_party/nixpkgs/pkgs/servers/jetbrains/youtrack.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "youtrack"; - version = "2018.2.44329"; + version = "2021.1.13597"; jar = fetchurl { url = "https://download.jetbrains.com/charisma/${pname}-${version}.jar"; - sha256 = "1fnnpyikr1x443vxy6f7vlv550sbahpps8awyn13jpg7kpgfm7lk"; + sha256 = "0lc0ra95ix5bs1spfjnx5akh8jm754v8lc3yja8dc438zi221qhh"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Issue tracking and project management tool for developers"; - maintainers = with maintainers; [ yorickvp ]; + maintainers = teams.serokell.members; # https://www.jetbrains.com/youtrack/buy/license.html license = licenses.unfree; }; diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix index 3726facd58..3138a68a9b 100644 --- a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix +++ b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "12.0.4"; + version = "13.0.0"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "sha256-7DKKpuKPoSKIpfvhCvLzuyepbmixgq0+o+83FKi6Dwc="; + sha256 = "sha256-jpjAPldmJkyXGsokw9MO1u0VysYBXeQ8MamEPWvBGvs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/lidarr/default.nix b/third_party/nixpkgs/pkgs/servers/lidarr/default.nix index 60c2027e55..9bd998cd85 100644 --- a/third_party/nixpkgs/pkgs/servers/lidarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/lidarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lidarr"; - version = "0.7.2.1878"; + version = "0.8.1.2135"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.linux.tar.gz"; - sha256 = "0kv0x3vvv4rp3i5k5985zp95mm8ca7gpm7kr82l11v3hm3n6yvqn"; + sha256 = "sha256-eJX6t19D2slX68fXSMd/Vix3XSgCVylK+Wd8VH9jsuI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix b/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix index 6c1e05bbdb..122d00c5f0 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1: s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: - s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/: + s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient.dev}/include/mysql/: ''} ${lib.optionalString enableAuthDovecot '' s:^# \(AUTH_DOVECOT\)=.*:\1=yes: diff --git a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix index 6a9fc815fd..72d4ca760e 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix @@ -62,5 +62,6 @@ stdenv.mkDerivation rec { }; passthru.tests = { basic-functionality-and-dovecot-interaction = nixosTests.opensmtpd; + rspamd-integration = nixosTests.opensmtpd-rspamd; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/filter-rspamd.nix b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/filter-rspamd.nix new file mode 100644 index 0000000000..62b01cf926 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/filter-rspamd.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nixosTests +}: + +buildGoModule rec { + pname = "opensmtpd-filter-rspamd"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "poolpOrg"; + repo = "filter-rspamd"; + rev = "v${version}"; + sha256 = "pcHj4utpf/AIUv8/7mE8BLbE8LYkzNKfc4T4hIHgGeI="; + }; + + vendorSha256 = "sNF2c+22FMvKoROkA/3KtSnRdJh4YZLaIx35HD896HI="; + + passthru.tests = { + opensmtpd-rspamd-integration = nixosTests.opensmtpd-rspamd; + }; + + meta = with lib; { + homepage = "https://github.com/poolpOrg/filter-rspamd"; + description = "OpenSMTPD filter integration for the Rspamd daemon"; + license = licenses.isc; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index b54ad76e8f..c1444ecb6b 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.32.2"; + version = "1.34.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Biwj/zORBsU8XvpMMlSjR3Nqx0q1LqaSX/vX+UDeXI8="; + sha256 = "sha256-lXVJfhcH9lKOCHn5f4Lc/OjgEYa5IpauKRhBsFXNWLw="; }; patches = [ @@ -24,6 +24,8 @@ buildPythonApplication rec { ./homeserver-script.patch ]; + buildInputs = [ openssl ]; + propagatedBuildInputs = [ setuptools bcrypt diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index 62a7324615..9d21065dc0 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix @@ -3,8 +3,8 @@ let src = fetchFromGitHub { owner = "matrix-org"; repo = "matrix-appservice-slack"; - rev = "1.7.0"; - sha256 = "sha256-0BcnG/DGvc3uh/eP0KIB5gPSpXNPlaAl78D4bVCnLHg="; + rev = "1.8.0"; + sha256 = "sha256-FA6SMivMnloeZmnUhGx6N+ZLDTZFO3y17xJYclkp5w0="; }; nodePackages = import ./node-composition.nix { diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh index 6e622bdd75..9fab488917 100755 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh @@ -1,9 +1,9 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -# Download package.json and package-lock.json from the v1.7.0 release -curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.7.0/package.json -o package.json -curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.7.0/package-lock.json -o package-lock.json +# Download package.json and package-lock.json from the v1.8.0 release +curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.8.0/package.json -o package.json +curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.8.0/package-lock.json -o package-lock.json node2nix \ --nodejs-12 \ diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix index 90e9d67f9d..bc5bc8cf1c 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix @@ -22,22 +22,22 @@ let sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="; }; }; - "@babel/highlight-7.10.4" = { + "@babel/highlight-7.13.10" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.10.4"; + version = "7.13.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz"; - sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz"; + sha512 = "5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg=="; }; }; - "@babel/runtime-7.12.13" = { + "@babel/runtime-7.13.10" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.12.13"; + version = "7.13.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.13.tgz"; - sha512 = "8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz"; + sha512 = "4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw=="; }; }; "@dabh/diagnostics-2.0.2" = { @@ -49,13 +49,13 @@ let sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; }; - "@eslint/eslintrc-0.2.2" = { + "@eslint/eslintrc-0.4.0" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "0.2.2"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.2.tgz"; - sha512 = "EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; + sha512 = "2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog=="; }; }; "@nodelib/fs.scandir-2.1.4" = { @@ -130,13 +130,13 @@ let sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; }; }; - "@types/chai-4.2.14" = { + "@types/chai-4.2.16" = { name = "_at_types_slash_chai"; packageName = "@types/chai"; - version = "4.2.14"; + version = "4.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.14.tgz"; - sha512 = "G+ITQPXkwTrslfG5L/BksmbLUA0M1iybEsmCWPqzSxsRRhJZimBKJkoMi8fr/CPygPTj4zO5pJH7I2/cm9M7SQ=="; + url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.16.tgz"; + sha512 = "vI5iOAsez9+roLS3M3+Xx7w+WRuDtSmF8bQkrbcIJ2sC1PcDgVoA0WGpa+bIrJ+y8zqY2oi//fUctkxtIcXJCw=="; }; }; "@types/connect-3.4.34" = { @@ -148,22 +148,22 @@ let sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ=="; }; }; - "@types/express-4.17.10" = { + "@types/express-4.17.11" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.10"; + version = "4.17.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.10.tgz"; - sha512 = "GRwKdE+iV6mA8glCvQ7W5iaoIhd6u1HDsNTF76UPRi7T89SLjOfeCLShVmQSgpXzcpf3zgcz2SbMiCcjnYRRxQ=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz"; + sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg=="; }; }; - "@types/express-serve-static-core-4.17.18" = { + "@types/express-serve-static-core-4.17.19" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.18"; + version = "4.17.19"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz"; - sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz"; + sha512 = "DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA=="; }; }; "@types/is-stream-1.1.0" = { @@ -175,31 +175,40 @@ let sha512 = "jkZatu4QVbR60mpIzjINmtS1ZF4a/FqdTUTBeQDVOQ2PYyidtwFKr0B5G6ERukKwliq+7mIXvxyppwzG5EgRYg=="; }; }; - "@types/json-schema-7.0.6" = { + "@types/js-yaml-4.0.0" = { + name = "_at_types_slash_js-yaml"; + packageName = "@types/js-yaml"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.0.tgz"; + sha512 = "4vlpCM5KPCL5CfGmTbpjwVKbISRYhduEJvvUWsH5EB7QInhEj94XPZ3ts/9FPiLZFqYO0xoW4ZL8z2AabTGgJA=="; + }; + }; + "@types/json-schema-7.0.7" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.6"; + version = "7.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz"; - sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz"; + sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA=="; }; }; - "@types/mime-2.0.3" = { + "@types/mime-1.3.2" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "2.0.3"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz"; - sha512 = "Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz"; + sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/mocha-8.2.0" = { + "@types/mocha-8.2.2" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; - version = "8.2.0"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.0.tgz"; - sha512 = "/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ=="; + url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.2.tgz"; + sha512 = "Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw=="; }; }; "@types/nedb-1.8.11" = { @@ -211,13 +220,13 @@ let sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw=="; }; }; - "@types/node-14.14.20" = { + "@types/node-14.14.41" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.20"; + version = "14.14.41"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz"; - sha512 = "Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz"; + sha512 = "dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g=="; }; }; "@types/node-emoji-1.8.1" = { @@ -229,13 +238,13 @@ let sha512 = "0fRfA90FWm6KJfw6P9QGyo0HDTCmthZ7cWaBQndITlaWLTZ6njRyKwrwpzpg+n6kBXBIGKeUHEQuBx7bphGJkA=="; }; }; - "@types/nunjucks-3.1.3" = { + "@types/nunjucks-3.1.4" = { name = "_at_types_slash_nunjucks"; packageName = "@types/nunjucks"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/nunjucks/-/nunjucks-3.1.3.tgz"; - sha512 = "42IiIIBdoB7ZDwCVhCWYT4fMCj+4TeacuVgh7xyT2du5EhkpA+OFeeDdYTFCUt1MrHb8Aw7ZqFvr8s1bwP9l8w=="; + url = "https://registry.npmjs.org/@types/nunjucks/-/nunjucks-3.1.4.tgz"; + sha512 = "cR65PLlHKW/qxxj840dbNb3ICO+iAVQzaNKJ8TcKOVKFi+QcAkhw9SCY8VFAyU41SmJMs+2nrIN2JGhX+jYb7A=="; }; }; "@types/p-queue-2.3.2" = { @@ -247,13 +256,13 @@ let sha512 = "eKAv5Ql6k78dh3ULCsSBxX6bFNuGjTmof5Q/T6PiECDq0Yf8IIn46jCyp3RJvCi8owaEmm3DZH1PEImjBMd/vQ=="; }; }; - "@types/qs-6.9.5" = { + "@types/qs-6.9.6" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.5"; + version = "6.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz"; - sha512 = "/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.6.tgz"; + sha512 = "0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA=="; }; }; "@types/randomstring-1.1.6" = { @@ -283,13 +292,13 @@ let sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; }; }; - "@types/serve-static-1.13.8" = { + "@types/serve-static-1.13.9" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.8"; + version = "1.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.8.tgz"; - sha512 = "MoJhSQreaVoL+/hurAZzIm8wafFR6ajiTM1m4A0kv6AGeVBl4r4pOV8bGFrjjq1sGxDTnCoF8i22o0/aE5XCyA=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz"; + sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA=="; }; }; "@types/uuid-8.3.0" = { @@ -310,13 +319,13 @@ let sha512 = "Q07IrQUSNpr+cXU4E4LtkSIBPie5GLZyyMC1QtQYRLWz701+XcoVygGUZgvLqElq1nU4ICldMYPnexlBsg3dqQ=="; }; }; - "@types/yargs-15.0.12" = { + "@types/yargs-15.0.13" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.12"; + version = "15.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.12.tgz"; - sha512 = "f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz"; + sha512 = "kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ=="; }; }; "@types/yargs-parser-15.0.0" = { @@ -328,76 +337,76 @@ let sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; }; }; - "@typescript-eslint/eslint-plugin-4.13.0" = { + "@typescript-eslint/eslint-plugin-4.22.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.13.0"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.13.0.tgz"; - sha512 = "ygqDUm+BUPvrr0jrXqoteMqmIaZ/bixYOc3A4BRwzEPTZPi6E+n44rzNZWaB0YvtukgP+aoj0i/fyx7FkM2p1w=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz"; + sha512 = "U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA=="; }; }; - "@typescript-eslint/eslint-plugin-tslint-4.13.0" = { + "@typescript-eslint/eslint-plugin-tslint-4.22.0" = { name = "_at_typescript-eslint_slash_eslint-plugin-tslint"; packageName = "@typescript-eslint/eslint-plugin-tslint"; - version = "4.13.0"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.13.0.tgz"; - sha512 = "r6n4irL74bOx4z2f0WxnwG6MY67EESvjvK/VMoIlDelW3Q6cwunCH8ug3l8hkPtgJ7iObmUjpAWKxyF4ZdvEcw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.22.0.tgz"; + sha512 = "r4lhAPmd69ohf5grgDALtekETv4WVCpvfXtT3Nf3UUO/88sn4HB4h8xN1afwL48BprQ4TxH7ZUv7Ou6xgRlkAA=="; }; }; - "@typescript-eslint/experimental-utils-4.13.0" = { + "@typescript-eslint/experimental-utils-4.22.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.13.0"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.13.0.tgz"; - sha512 = "/ZsuWmqagOzNkx30VWYV3MNB/Re/CGv/7EzlqZo5RegBN8tMuPaBgNK6vPBCQA8tcYrbsrTdbx3ixMRRKEEGVw=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz"; + sha512 = "xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg=="; }; }; - "@typescript-eslint/parser-4.13.0" = { + "@typescript-eslint/parser-4.22.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.13.0"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.13.0.tgz"; - sha512 = "KO0J5SRF08pMXzq9+abyHnaGQgUJZ3Z3ax+pmqz9vl81JxmTTOUfQmq7/4awVfq09b6C4owNlOgOwp61pYRBSg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.22.0.tgz"; + sha512 = "z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q=="; }; }; - "@typescript-eslint/scope-manager-4.13.0" = { + "@typescript-eslint/scope-manager-4.22.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.13.0"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.13.0.tgz"; - sha512 = "UpK7YLG2JlTp/9G4CHe7GxOwd93RBf3aHO5L+pfjIrhtBvZjHKbMhBXTIQNkbz7HZ9XOe++yKrXutYm5KmjWgQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz"; + sha512 = "OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q=="; }; }; - "@typescript-eslint/types-4.13.0" = { + "@typescript-eslint/types-4.22.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.13.0"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.13.0.tgz"; - sha512 = "/+aPaq163oX+ObOG00M0t9tKkOgdv9lq0IQv/y4SqGkAXmhFmCfgsELV7kOCTb2vVU5VOmVwXBXJTDr353C1rQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz"; + sha512 = "sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA=="; }; }; - "@typescript-eslint/typescript-estree-4.13.0" = { + "@typescript-eslint/typescript-estree-4.22.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.13.0"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.13.0.tgz"; - sha512 = "9A0/DFZZLlGXn5XA349dWQFwPZxcyYyCFX5X88nWs2uachRDwGeyPz46oTsm9ZJE66EALvEns1lvBwa4d9QxMg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz"; + sha512 = "TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg=="; }; }; - "@typescript-eslint/visitor-keys-4.13.0" = { + "@typescript-eslint/visitor-keys-4.22.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.13.0"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.13.0.tgz"; - sha512 = "6RoxWK05PAibukE7jElqAtNMq+RWZyqJ6Q/GdIxaiUj2Ept8jh8+FUVlbq9WxMYxkmEOPvCE5cRSyupMpwW31g=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz"; + sha512 = "nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw=="; }; }; "@ungap/promise-all-settled-1.1.2" = { @@ -473,13 +482,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "ajv-7.0.3" = { + "ajv-8.1.0" = { name = "ajv"; packageName = "ajv"; - version = "7.0.3"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-7.0.3.tgz"; - sha512 = "R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.1.0.tgz"; + sha512 = "B/Sk2Ix7A36fs/ZkuGLIR86EdjbgR6fsAcbx9lOP/QBSXujDNbVmIS/U4Itz5k8fPFDeVZl/zQ/gJW4Jrq6XjQ=="; }; }; "another-json-0.2.0" = { @@ -509,15 +518,6 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; - "ansi-regex-4.1.0" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; - }; - }; "ansi-regex-5.0.0" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -545,13 +545,13 @@ let sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; - "anymatch-3.1.1" = { + "anymatch-3.1.2" = { name = "anymatch"; packageName = "anymatch"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"; - sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"; + sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; }; }; "arg-4.1.3" = { @@ -725,13 +725,13 @@ let sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA=="; }; }; - "balanced-match-1.0.0" = { + "balanced-match-1.0.2" = { name = "balanced-match"; packageName = "balanced-match"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; }; "base-x-3.0.8" = { @@ -761,13 +761,13 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; - "binary-extensions-2.1.0" = { + "binary-extensions-2.2.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz"; - sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; }; }; "binary-search-tree-0.2.5" = { @@ -869,6 +869,15 @@ let sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; + "call-bind-1.0.2" = { + name = "call-bind"; + packageName = "call-bind"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; + }; + }; "callsites-3.1.0" = { name = "callsites"; packageName = "callsites"; @@ -878,15 +887,6 @@ let sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; }; }; - "camelcase-5.3.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "5.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; - sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; - }; - }; "camelcase-6.2.0" = { name = "camelcase"; packageName = "camelcase"; @@ -905,13 +905,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "chai-4.2.0" = { + "chai-4.3.4" = { name = "chai"; packageName = "chai"; - version = "4.2.0"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz"; - sha512 = "XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw=="; + url = "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz"; + sha512 = "yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA=="; }; }; "chalk-2.4.2" = { @@ -941,31 +941,13 @@ let sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82"; }; }; - "chokidar-3.4.1" = { + "chokidar-3.5.1" = { name = "chokidar"; packageName = "chokidar"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.1.tgz"; - sha512 = "TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g=="; - }; - }; - "chokidar-3.4.3" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz"; - sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ=="; - }; - }; - "cliui-5.0.0" = { - name = "cliui"; - packageName = "cliui"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; - sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz"; + sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="; }; }; "cliui-7.0.4" = { @@ -1166,15 +1148,6 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; - "debug-4.2.0" = { - name = "debug"; - packageName = "debug"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; - sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; - }; - }; "debug-4.3.1" = { name = "debug"; packageName = "debug"; @@ -1184,15 +1157,6 @@ let sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; }; }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; "decamelize-4.0.0" = { name = "decamelize"; packageName = "decamelize"; @@ -1265,6 +1229,15 @@ let sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; }; }; + "diff-5.0.0" = { + name = "diff"; + packageName = "diff"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz"; + sha512 = "/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="; + }; + }; "dir-glob-3.0.1" = { name = "dir-glob"; packageName = "dir-glob"; @@ -1301,15 +1274,6 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "emoji-regex-7.0.3" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; - sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; - }; - }; "emoji-regex-8.0.0" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -1382,13 +1346,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-7.17.0" = { + "eslint-7.24.0" = { name = "eslint"; packageName = "eslint"; - version = "7.17.0"; + version = "7.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.17.0.tgz"; - sha512 = "zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.24.0.tgz"; + sha512 = "k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ=="; }; }; "eslint-plugin-jsdoc-30.7.13" = { @@ -1400,13 +1364,13 @@ let sha512 = "YM4WIsmurrp0rHX6XiXQppqKB8Ne5ATiZLJe2+/fkp9l9ExXFr43BbAbjZaVrpCT+tuPYOZ8k1MICARHnURUNQ=="; }; }; - "eslint-plugin-prefer-arrow-1.2.2" = { + "eslint-plugin-prefer-arrow-1.2.3" = { name = "eslint-plugin-prefer-arrow"; packageName = "eslint-plugin-prefer-arrow"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.2.tgz"; - sha512 = "C8YMhL+r8RMeMdYAw/rQtE6xNdMulj+zGWud/qIGnlmomiPRaLDGLMeskZ3alN6uMBojmooRimtdrXebLN4svQ=="; + url = "https://registry.npmjs.org/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz"; + sha512 = "J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ=="; }; }; "eslint-scope-5.1.1" = { @@ -1463,13 +1427,13 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; - "esquery-1.3.1" = { + "esquery-1.4.0" = { name = "esquery"; packageName = "esquery"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz"; - sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"; + sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; }; }; "esrecurse-4.3.0" = { @@ -1571,13 +1535,13 @@ let sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; - "fast-glob-3.2.4" = { + "fast-glob-3.2.5" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz"; - sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; + sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -1607,13 +1571,13 @@ let sha512 = "q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg=="; }; }; - "fastq-1.10.0" = { + "fastq-1.11.0" = { name = "fastq"; packageName = "fastq"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz"; - sha512 = "NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz"; + sha512 = "7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g=="; }; }; "fecha-4.2.0" = { @@ -1625,13 +1589,13 @@ let sha512 = "aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg=="; }; }; - "file-entry-cache-6.0.0" = { + "file-entry-cache-6.0.1" = { name = "file-entry-cache"; packageName = "file-entry-cache"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz"; - sha512 = "fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA=="; + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; }; }; "file-stream-rotator-0.5.7" = { @@ -1661,15 +1625,6 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; - "find-up-3.0.0" = { - name = "find-up"; - packageName = "find-up"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; - sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; - }; - }; "find-up-5.0.0" = { name = "find-up"; packageName = "find-up"; @@ -1706,13 +1661,13 @@ let sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; }; }; - "flatted-3.1.0" = { + "flatted-3.1.1" = { name = "flatted"; packageName = "flatted"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz"; - sha512 = "tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz"; + sha512 = "zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA=="; }; }; "fn.name-1.1.0" = { @@ -1787,13 +1742,22 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fsevents-2.1.3" = { + "fsevents-2.3.2" = { name = "fsevents"; packageName = "fsevents"; - version = "2.1.3"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; - sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"; + sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; "functional-red-black-tree-1.0.1" = { @@ -1841,6 +1805,15 @@ let sha1 = "ead774abee72e20409433a066366023dd6887a41"; }; }; + "get-intrinsic-1.1.1" = { + name = "get-intrinsic"; + packageName = "get-intrinsic"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; + }; + }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -1859,13 +1832,13 @@ let sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; }; - "glob-parent-5.1.1" = { + "glob-parent-5.1.2" = { name = "glob-parent"; packageName = "glob-parent"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; - sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; + sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; }; }; "globals-12.4.0" = { @@ -1877,13 +1850,22 @@ let sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; }; }; - "globby-11.0.2" = { + "globals-13.8.0" = { + name = "globals"; + packageName = "globals"; + version = "13.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz"; + sha512 = "rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q=="; + }; + }; + "globby-11.0.3" = { name = "globby"; packageName = "globby"; - version = "11.0.2"; + version = "11.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz"; - sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og=="; + url = "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz"; + sha512 = "ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg=="; }; }; "growl-1.10.5" = { @@ -1913,6 +1895,15 @@ let sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; }; }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + }; "has-flag-3.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -1931,6 +1922,15 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; + "has-symbols-1.0.2" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; + sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + }; + }; "he-1.2.0" = { name = "he"; packageName = "he"; @@ -2057,6 +2057,15 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; + "is-boolean-object-1.1.0" = { + name = "is-boolean-object"; + packageName = "is-boolean-object"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz"; + sha512 = "a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA=="; + }; + }; "is-extglob-2.1.1" = { name = "is-extglob"; packageName = "is-extglob"; @@ -2120,6 +2129,15 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; + "is-number-object-1.0.4" = { + name = "is-number-object"; + packageName = "is-number-object"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz"; + sha512 = "zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw=="; + }; + }; "is-plain-obj-2.1.0" = { name = "is-plain-obj"; packageName = "is-plain-obj"; @@ -2156,6 +2174,15 @@ let sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; }; }; + "is-string-1.0.5" = { + name = "is-string"; + packageName = "is-string"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz"; + sha512 = "buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="; + }; + }; "is-typedarray-1.0.0" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -2201,13 +2228,13 @@ let sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; - "js-yaml-3.14.0" = { + "js-yaml-3.14.1" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.14.0"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz"; - sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"; + sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; }; "js-yaml-4.0.0" = { @@ -2219,6 +2246,15 @@ let sha512 = "pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q=="; }; }; + "js-yaml-4.1.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"; + sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; + }; + }; "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; @@ -2336,15 +2372,6 @@ let sha512 = "1TulyYfc4udS7ECSBT2vwJksWbkwwTX8BzeUIiq8Y07Riy7bDAAnxDaPU/tWyOVmQAcWJIEIFP9lPfBGqVoPgQ=="; }; }; - "locate-path-3.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; - sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; - }; - }; "locate-path-6.0.0" = { name = "locate-path"; packageName = "locate-path"; @@ -2363,6 +2390,33 @@ let sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; }; }; + "lodash-4.17.21" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.21"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; + }; + }; + "lodash.clonedeep-4.5.0" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + }; + "lodash.flatten-4.4.0" = { + name = "lodash.flatten"; + packageName = "lodash.flatten"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; + sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; + }; + }; "lodash.toarray-4.4.0" = { name = "lodash.toarray"; packageName = "lodash.toarray"; @@ -2372,6 +2426,15 @@ let sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; }; }; + "lodash.truncate-4.4.2" = { + name = "lodash.truncate"; + packageName = "lodash.truncate"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + }; + }; "log-symbols-4.0.0" = { name = "log-symbols"; packageName = "log-symbols"; @@ -2417,31 +2480,31 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; - "matrix-appservice-0.7.1" = { + "matrix-appservice-0.8.0" = { name = "matrix-appservice"; packageName = "matrix-appservice"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-appservice/-/matrix-appservice-0.7.1.tgz"; - sha512 = "oUjEz+eKfBw66FnQ3/D7PWcq+/oq9gzJVlNOMQUSGXgK70o8JT3toeFMYsJChaIimU5fIsHbTVyHC+eVGb7MSQ=="; + url = "https://registry.npmjs.org/matrix-appservice/-/matrix-appservice-0.8.0.tgz"; + sha512 = "mfgMpmV3dWLtzrd4V/3XtqUD0P44I/mTgsRreW5jMhSaUnnRGZbpptBw2q4/axbLjw2FarlWtOVgertDGMtccA=="; }; }; - "matrix-appservice-bridge-2.5.0" = { + "matrix-appservice-bridge-2.6.0" = { name = "matrix-appservice-bridge"; packageName = "matrix-appservice-bridge"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-2.5.0.tgz"; - sha512 = "L5Ddb78pqqfO6xM4SYM+Hv6N5VjmLF3D24h4g5ze5+xRfEFmfvmLdVu6rvIExawvk9i+LA0fZ95Qi3hc7SkgAQ=="; + url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-2.6.0.tgz"; + sha512 = "o1KHQHG1GdfUhTFBXVLztwbTowuCFO9/h8n2zdkRK/bZsdcXSFQVfUwDtRULcyinD4N7r0Lrwlg1LyR0pg2WSw=="; }; }; - "matrix-js-sdk-9.6.0" = { + "matrix-js-sdk-9.11.0" = { name = "matrix-js-sdk"; packageName = "matrix-js-sdk"; - version = "9.6.0"; + version = "9.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-9.6.0.tgz"; - sha512 = "zoNqB7z0C0QDncN7yD1K50c4C88VPofWaCQ0gNXqO/Ac1dr/xLF/46iNF9Y+dBwq7siBO9wEh20WFHMaRpeLOg=="; + url = "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-9.11.0.tgz"; + sha512 = "wP28ybOxyQ7lbC48QddRORYr8atEwbTqDOsu8H6u9jTTgB2qqczI/bkSoXHtutODuSeLY5x0UuwLcxVCy4yxVQ=="; }; }; "media-typer-0.3.0" = { @@ -2480,13 +2543,13 @@ let sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; }; - "micromatch-4.0.2" = { + "micromatch-4.0.4" = { name = "micromatch"; packageName = "micromatch"; - version = "4.0.2"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; - sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"; + sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; }; }; "mime-1.6.0" = { @@ -2543,22 +2606,22 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mocha-8.2.1" = { + "mocha-8.3.2" = { name = "mocha"; packageName = "mocha"; - version = "8.2.1"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz"; - sha512 = "cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.3.2.tgz"; + sha512 = "UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg=="; }; }; - "moment-2.24.0" = { + "moment-2.29.1" = { name = "moment"; packageName = "moment"; - version = "2.24.0"; + version = "2.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; - sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; + url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"; + sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; }; }; "morgan-1.10.0" = { @@ -2597,13 +2660,22 @@ let sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; - "nanoid-3.1.12" = { + "ms-2.1.3" = { + name = "ms"; + packageName = "ms"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + }; + }; + "nanoid-3.1.20" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.12"; + version = "3.1.20"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz"; - sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz"; + sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="; }; }; "natural-compare-1.4.0" = { @@ -2660,13 +2732,13 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; - "nunjucks-3.2.2" = { + "nunjucks-3.2.3" = { name = "nunjucks"; packageName = "nunjucks"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.2.tgz"; - sha512 = "KUi85OoF2NMygwODAy28Lh9qHmq5hO3rBlbkYoC8v377h4l8Pt5qFjILl0LWpMbOrZ18CzfVVUvIHUIrtED3sA=="; + url = "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.3.tgz"; + sha512 = "psb6xjLj47+fE76JdZwskvwG4MYsQKXUtMsPh6U0YMvmyjRtKRFcxnlXGWglNybtNTNVmGdp94K62/+NjF5FDQ=="; }; }; "oauth-sign-0.9.0" = { @@ -2678,13 +2750,22 @@ let sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; - "object-hash-2.0.3" = { + "object-hash-2.1.1" = { name = "object-hash"; packageName = "object-hash"; - version = "2.0.3"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-hash/-/object-hash-2.0.3.tgz"; - sha512 = "JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg=="; + url = "https://registry.npmjs.org/object-hash/-/object-hash-2.1.1.tgz"; + sha512 = "VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ=="; + }; + }; + "object-inspect-1.9.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz"; + sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw=="; }; }; "on-finished-2.3.0" = { @@ -2750,15 +2831,6 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "p-limit-2.3.0" = { - name = "p-limit"; - packageName = "p-limit"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; - sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; - }; - }; "p-limit-3.1.0" = { name = "p-limit"; packageName = "p-limit"; @@ -2768,15 +2840,6 @@ let sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; }; }; - "p-locate-3.0.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; - sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; - }; - }; "p-locate-5.0.0" = { name = "p-locate"; packageName = "p-locate"; @@ -2822,15 +2885,6 @@ let sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; }; }; - "p-try-2.2.0" = { - name = "p-try"; - packageName = "p-try"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; - sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; - }; - }; "packet-reader-1.0.0" = { name = "packet-reader"; packageName = "packet-reader"; @@ -2858,15 +2912,6 @@ let sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; }; - "path-exists-3.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; - sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; - }; - }; "path-exists-4.0.0" = { name = "path-exists"; packageName = "path-exists"; @@ -2912,13 +2957,13 @@ let sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; - "pathval-1.1.0" = { + "pathval-1.1.1" = { name = "pathval"; packageName = "pathval"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz"; - sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0"; + url = "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz"; + sha512 = "Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ=="; }; }; "performance-now-2.1.0" = { @@ -2939,13 +2984,13 @@ let sha512 = "9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw=="; }; }; - "pg-connection-string-2.4.0" = { + "pg-connection-string-2.5.0" = { name = "pg-connection-string"; packageName = "pg-connection-string"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.4.0.tgz"; - sha512 = "3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ=="; + url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz"; + sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; }; }; "pg-int8-1.0.1" = { @@ -2966,31 +3011,31 @@ let sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg=="; }; }; - "pg-pool-3.2.2" = { + "pg-pool-3.3.0" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz"; - sha512 = "ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.3.0.tgz"; + sha512 = "0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg=="; }; }; - "pg-promise-10.8.7" = { + "pg-promise-10.10.1" = { name = "pg-promise"; packageName = "pg-promise"; - version = "10.8.7"; + version = "10.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.8.7.tgz"; - sha512 = "gSbH+NYWD4pVOpacP9uS2xH84N7nb7K4ubKlcZchhDr8ixnIURPnNJmNLJcRgtOocpjzsKymYSm6rCFZVOngSA=="; + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.10.1.tgz"; + sha512 = "sopmuOr2PrUNh3XI0Y15ssmjcwhZnGHyGYwuDDmWFnBydq7lvrhTMBI3hefAp3YMx07+HSXfSpJse9z5vC4bsw=="; }; }; - "pg-protocol-1.4.0" = { + "pg-protocol-1.5.0" = { name = "pg-protocol"; packageName = "pg-protocol"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz"; - sha512 = "El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA=="; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz"; + sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; }; }; "pg-types-2.2.0" = { @@ -3011,13 +3056,13 @@ let sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; }; }; - "picomatch-2.2.2" = { + "picomatch-2.2.3" = { name = "picomatch"; packageName = "picomatch"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; - sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz"; + sha512 = "KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg=="; }; }; "postgres-array-2.0.0" = { @@ -3119,6 +3164,15 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; + "qs-6.10.1" = { + name = "qs"; + packageName = "qs"; + version = "6.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz"; + sha512 = "M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg=="; + }; + }; "qs-6.5.2" = { name = "qs"; packageName = "qs"; @@ -3137,13 +3191,13 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "qs-6.9.6" = { - name = "qs"; - packageName = "qs"; - version = "6.9.6"; + "queue-microtask-1.2.3" = { + name = "queue-microtask"; + packageName = "queue-microtask"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz"; - sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; + url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; "quick-lru-5.1.1" = { @@ -3191,15 +3245,6 @@ let sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; - "readable-stream-2.3.6" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; - sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; - }; - }; "readable-stream-2.3.7" = { name = "readable-stream"; packageName = "readable-stream"; @@ -3218,15 +3263,6 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; - "readdirp-3.4.0" = { - name = "readdirp"; - packageName = "readdirp"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; - sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; - }; - }; "readdirp-3.5.0" = { name = "readdirp"; packageName = "readdirp"; @@ -3290,15 +3326,6 @@ let sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; }; - "require-main-filename-2.0.0" = { - name = "require-main-filename"; - packageName = "require-main-filename"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; - sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; - }; - }; "resolve-from-4.0.0" = { name = "resolve-from"; packageName = "resolve-from"; @@ -3335,13 +3362,13 @@ let sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; }; - "run-parallel-1.1.10" = { + "run-parallel-1.2.0" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.10"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz"; - sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw=="; + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; + sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; }; }; "safe-buffer-5.1.2" = { @@ -3407,15 +3434,6 @@ let sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; - "set-blocking-2.0.0" = { - name = "set-blocking"; - packageName = "set-blocking"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; - }; - }; "setprototypeof-1.1.1" = { name = "setprototypeof"; packageName = "setprototypeof"; @@ -3443,6 +3461,15 @@ let sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; + "side-channel-1.0.4" = { + name = "side-channel"; + packageName = "side-channel"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; + sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; + }; + }; "simple-swizzle-0.2.2" = { name = "simple-swizzle"; packageName = "simple-swizzle"; @@ -3578,15 +3605,6 @@ let sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; }; - "string-width-3.1.0" = { - name = "string-width"; - packageName = "string-width"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; - sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; - }; - }; "string-width-4.2.0" = { name = "string-width"; packageName = "string-width"; @@ -3623,15 +3641,6 @@ let sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; }; }; - "strip-ansi-5.2.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; - }; - }; "strip-ansi-6.0.0" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -3668,13 +3677,22 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; - "table-6.0.7" = { + "supports-color-8.1.1" = { + name = "supports-color"; + packageName = "supports-color"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"; + sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; + }; + }; + "table-6.2.0" = { name = "table"; packageName = "table"; - version = "6.0.7"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.0.7.tgz"; - sha512 = "rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g=="; + url = "https://registry.npmjs.org/table/-/table-6.2.0.tgz"; + sha512 = "WMBBLuauiLXJjth35K4vOnd/xkaZ/dxEcyoZ+YhxSwfxFqvh+av06+oRqIwbR14m1lENB1egSWOFv/bNEt2D8A=="; }; }; "tdigest-0.1.1" = { @@ -3758,13 +3776,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tsutils-3.19.1" = { + "tsutils-3.21.0" = { name = "tsutils"; packageName = "tsutils"; - version = "3.19.1"; + version = "3.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsutils/-/tsutils-3.19.1.tgz"; - sha512 = "GEdoBf5XI324lu7ycad7s6laADfnAqCw6wLGI+knxvw9vsIYBaJfYdmeCEG3FMMUiSm3OGgNb+m6utsWf5h9Vw=="; + url = "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"; + sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="; }; }; "tunnel-agent-0.6.0" = { @@ -3803,6 +3821,15 @@ let sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; }; + "type-fest-0.20.2" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.20.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"; + sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; + }; + }; "type-fest-0.8.1" = { name = "type-fest"; packageName = "type-fest"; @@ -3821,13 +3848,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typescript-4.1.3" = { + "typescript-4.2.4" = { name = "typescript"; packageName = "typescript"; - version = "4.1.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz"; - sha512 = "B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz"; + sha512 = "V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg=="; }; }; "underscore-1.4.4" = { @@ -3902,13 +3929,13 @@ let sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; }; }; - "v8-compile-cache-2.2.0" = { + "v8-compile-cache-2.3.0" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; - sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q=="; + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; }; }; "vary-1.1.2" = { @@ -3938,15 +3965,6 @@ let sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; - "which-module-2.0.0" = { - name = "which-module"; - packageName = "which-module"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; - sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; - }; - }; "wide-align-1.1.3" = { name = "wide-align"; packageName = "wide-align"; @@ -3965,22 +3983,13 @@ let sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; }; }; - "winston-daily-rotate-file-4.5.0" = { + "winston-daily-rotate-file-4.5.2" = { name = "winston-daily-rotate-file"; packageName = "winston-daily-rotate-file"; - version = "4.5.0"; + version = "4.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.5.0.tgz"; - sha512 = "/HqeWiU48dzGqcrABRlxYWVMdL6l3uKCtFSJyrqK+E2rLnSFNsgYpvwx15EgTitBLNzH69lQd/+z2ASryV2aqw=="; - }; - }; - "winston-transport-4.3.0" = { - name = "winston-transport"; - packageName = "winston-transport"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz"; - sha512 = "B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A=="; + url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.5.2.tgz"; + sha512 = "DpAz9djExzFGVGRIKCKzsjOQaIINbjOUJ8CRsZGz0SQOMMcO1kM7jqTdzQAM9CRTEksZV9bBw9TT0ddQBGxs9g=="; }; }; "winston-transport-4.4.0" = { @@ -4001,22 +4010,13 @@ let sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; }; }; - "workerpool-6.0.2" = { + "workerpool-6.1.0" = { name = "workerpool"; packageName = "workerpool"; - version = "6.0.2"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz"; - sha512 = "DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q=="; - }; - }; - "wrap-ansi-5.1.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; - sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz"; + sha512 = "toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg=="; }; }; "wrap-ansi-7.0.0" = { @@ -4055,15 +4055,6 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "y18n-4.0.1" = { - name = "y18n"; - packageName = "y18n"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz"; - sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ=="; - }; - }; "y18n-5.0.5" = { name = "y18n"; packageName = "y18n"; @@ -4082,15 +4073,6 @@ let sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; }; - "yargs-13.3.2" = { - name = "yargs"; - packageName = "yargs"; - version = "13.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz"; - sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; - }; - }; "yargs-16.2.0" = { name = "yargs"; packageName = "yargs"; @@ -4100,15 +4082,6 @@ let sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; }; - "yargs-parser-13.1.2" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "13.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz"; - sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; - }; - }; "yargs-parser-20.2.4" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -4149,23 +4122,25 @@ let args = { name = "matrix-appservice-slack"; packageName = "matrix-appservice-slack"; - version = "1.7.0"; + version = "1.8.0"; src = ./.; dependencies = [ sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.13.10" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" ]; }) - sources."@babel/runtime-7.12.13" + sources."@babel/runtime-7.13.10" sources."@dabh/diagnostics-2.0.2" - (sources."@eslint/eslintrc-0.2.2" // { + (sources."@eslint/eslintrc-0.4.0" // { dependencies = [ sources."debug-4.3.1" + sources."globals-12.4.0" sources."ignore-4.0.6" + sources."js-yaml-3.14.1" sources."ms-2.1.2" ]; }) @@ -4185,51 +4160,52 @@ let ]; }) sources."@types/body-parser-1.19.0" - sources."@types/chai-4.2.14" + sources."@types/chai-4.2.16" sources."@types/connect-3.4.34" - sources."@types/express-4.17.10" - sources."@types/express-serve-static-core-4.17.18" + sources."@types/express-4.17.11" + sources."@types/express-serve-static-core-4.17.19" sources."@types/is-stream-1.1.0" - sources."@types/json-schema-7.0.6" - sources."@types/mime-2.0.3" - sources."@types/mocha-8.2.0" + sources."@types/js-yaml-4.0.0" + sources."@types/json-schema-7.0.7" + sources."@types/mime-1.3.2" + sources."@types/mocha-8.2.2" sources."@types/nedb-1.8.11" - sources."@types/node-14.14.20" + sources."@types/node-14.14.41" sources."@types/node-emoji-1.8.1" - sources."@types/nunjucks-3.1.3" + sources."@types/nunjucks-3.1.4" sources."@types/p-queue-2.3.2" - sources."@types/qs-6.9.5" + sources."@types/qs-6.9.6" sources."@types/randomstring-1.1.6" sources."@types/range-parser-1.2.3" sources."@types/retry-0.12.0" - sources."@types/serve-static-1.13.8" + sources."@types/serve-static-1.13.9" sources."@types/uuid-8.3.0" sources."@types/ws-7.2.6" - sources."@types/yargs-15.0.12" + sources."@types/yargs-15.0.13" sources."@types/yargs-parser-15.0.0" - (sources."@typescript-eslint/eslint-plugin-4.13.0" // { + (sources."@typescript-eslint/eslint-plugin-4.22.0" // { dependencies = [ sources."debug-4.3.1" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/eslint-plugin-tslint-4.13.0" - sources."@typescript-eslint/experimental-utils-4.13.0" - (sources."@typescript-eslint/parser-4.13.0" // { + sources."@typescript-eslint/eslint-plugin-tslint-4.22.0" + sources."@typescript-eslint/experimental-utils-4.22.0" + (sources."@typescript-eslint/parser-4.22.0" // { dependencies = [ sources."debug-4.3.1" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/scope-manager-4.13.0" - sources."@typescript-eslint/types-4.13.0" - (sources."@typescript-eslint/typescript-estree-4.13.0" // { + sources."@typescript-eslint/scope-manager-4.22.0" + sources."@typescript-eslint/types-4.22.0" + (sources."@typescript-eslint/typescript-estree-4.22.0" // { dependencies = [ sources."debug-4.3.1" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/visitor-keys-4.13.0" + sources."@typescript-eslint/visitor-keys-4.22.0" sources."@ungap/promise-all-settled-1.1.2" sources."Slackdown-git://github.com/half-shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" sources."a-sync-waterfall-1.0.1" @@ -4242,7 +4218,7 @@ let sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" - sources."anymatch-3.1.1" + sources."anymatch-3.1.2" sources."arg-4.1.3" sources."argparse-1.0.10" sources."array-flatten-1.1.1" @@ -4260,11 +4236,11 @@ let sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."axios-0.21.1" - sources."balanced-match-1.0.0" + sources."balanced-match-1.0.2" sources."base-x-3.0.8" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."binary-search-tree-0.2.5" sources."bintrees-1.0.1" sources."body-parser-1.19.0" @@ -4276,10 +4252,11 @@ let sources."buffer-from-1.1.1" sources."buffer-writer-2.0.0" sources."bytes-3.1.0" + sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."camelcase-5.3.1" + sources."camelcase-6.2.0" sources."caseless-0.12.0" - sources."chai-4.2.0" + sources."chai-4.3.4" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -4290,16 +4267,7 @@ let ]; }) sources."check-error-1.0.2" - sources."chokidar-3.4.1" - (sources."cliui-5.0.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) + sources."chokidar-3.5.1" sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -4307,6 +4275,7 @@ let sources."colors-1.3.3" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" + sources."commander-5.1.0" sources."comment-parser-0.7.6" sources."concat-map-0.0.1" sources."content-disposition-0.5.3" @@ -4318,7 +4287,7 @@ let sources."cross-spawn-7.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" - sources."decamelize-1.2.0" + sources."decamelize-4.0.0" sources."deep-eql-3.0.1" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" @@ -4336,10 +4305,12 @@ let sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.17.0" // { + (sources."eslint-7.24.0" // { dependencies = [ sources."debug-4.3.1" sources."ignore-4.0.6" + sources."js-yaml-3.14.1" + sources."lodash-4.17.21" sources."ms-2.1.2" ]; }) @@ -4349,7 +4320,7 @@ let sources."ms-2.1.2" ]; }) - sources."eslint-plugin-prefer-arrow-1.2.2" + sources."eslint-plugin-prefer-arrow-1.2.3" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -4363,7 +4334,7 @@ let ]; }) sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -4381,12 +4352,12 @@ let sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.6" - sources."fastq-1.10.0" - sources."file-entry-cache-6.0.0" + sources."fastq-1.11.0" + sources."file-entry-cache-6.0.1" sources."file-stream-rotator-0.5.7" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" @@ -4394,7 +4365,7 @@ let sources."finity-0.5.4" sources."flat-5.0.2" sources."flat-cache-3.0.4" - sources."flatted-3.1.0" + sources."flatted-3.1.1" sources."fn.name-1.1.0" sources."follow-redirects-1.13.1" sources."forever-agent-0.6.1" @@ -4402,21 +4373,29 @@ let sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" + sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-2.0.5" sources."get-func-name-2.0.0" + sources."get-intrinsic-1.1.1" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."glob-parent-5.1.1" - sources."globals-12.4.0" - sources."globby-11.0.2" + sources."glob-parent-5.1.2" + (sources."globals-13.8.0" // { + dependencies = [ + sources."type-fest-0.20.2" + ]; + }) + sources."globby-11.0.3" sources."growl-1.10.5" sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-symbols-1.0.2" sources."he-1.2.0" sources."http-errors-1.7.2" sources."http-signature-1.2.0" @@ -4430,21 +4409,28 @@ let sources."ipaddr.js-1.9.1" sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" + sources."is-boolean-object-1.1.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" sources."is-number-7.0.0" + sources."is-number-object-1.0.4" sources."is-plain-obj-2.1.0" sources."is-property-1.0.2" sources."is-stream-1.1.0" + sources."is-string-1.0.5" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + (sources."js-yaml-4.1.0" // { + dependencies = [ + sources."argparse-2.0.1" + ]; + }) sources."jsbn-0.1.1" sources."jsdoctypeparser-9.0.0" sources."json-schema-0.2.3" @@ -4459,7 +4445,10 @@ let sources."localforage-1.7.3" sources."locate-path-6.0.0" sources."lodash-4.17.20" + sources."lodash.clonedeep-4.5.0" + sources."lodash.flatten-4.4.0" sources."lodash.toarray-4.4.0" + sources."lodash.truncate-4.4.2" sources."log-symbols-4.0.0" (sources."logform-2.2.0" // { dependencies = [ @@ -4470,74 +4459,62 @@ let sources."loglevel-1.7.1" sources."lru-cache-6.0.0" sources."make-error-1.3.6" - sources."matrix-appservice-0.7.1" - (sources."matrix-appservice-bridge-2.5.0" // { + (sources."matrix-appservice-0.8.0" // { dependencies = [ - sources."argparse-2.0.1" - sources."js-yaml-4.0.0" + sources."argparse-1.0.10" + sources."js-yaml-3.14.1" ]; }) - (sources."matrix-js-sdk-9.6.0" // { + sources."matrix-appservice-bridge-2.6.0" + (sources."matrix-js-sdk-9.11.0" // { dependencies = [ - sources."qs-6.9.6" + sources."qs-6.10.1" ]; }) sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.2" + sources."micromatch-4.0.4" sources."mime-1.6.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-8.2.1" // { + (sources."mocha-8.3.2" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."chokidar-3.4.3" - sources."debug-4.2.0" - sources."emoji-regex-7.0.3" - sources."has-flag-4.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."locate-path-3.0.0" - sources."ms-2.1.2" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."readdirp-3.5.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."supports-color-7.2.0" - (sources."yargs-13.3.2" // { + sources."argparse-2.0.1" + (sources."debug-4.3.1" // { dependencies = [ - sources."find-up-3.0.0" + sources."ms-2.1.2" ]; }) + sources."diff-5.0.0" + sources."has-flag-4.0.0" + sources."js-yaml-4.0.0" + sources."ms-2.1.3" + sources."supports-color-8.1.1" ]; }) - sources."moment-2.24.0" + sources."moment-2.29.1" (sources."morgan-1.10.0" // { dependencies = [ sources."depd-2.0.0" ]; }) sources."ms-2.0.0" - sources."nanoid-3.1.12" + sources."nanoid-3.1.20" sources."natural-compare-1.4.0" sources."nedb-1.8.0" sources."negotiator-0.6.2" sources."node-emoji-1.10.0" sources."nopt-5.0.0" sources."normalize-path-3.0.0" - (sources."nunjucks-3.2.2" // { - dependencies = [ - sources."commander-5.1.0" - ]; - }) + sources."nunjucks-3.2.3" sources."oauth-sign-0.9.0" - sources."object-hash-2.0.3" + sources."object-hash-2.1.1" + sources."object-inspect-1.9.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -4554,7 +4531,6 @@ let }) sources."p-retry-4.2.0" sources."p-timeout-3.2.0" - sources."p-try-2.2.0" sources."packet-reader-1.0.0" sources."parent-module-1.0.1" sources."parseurl-1.3.3" @@ -4563,18 +4539,18 @@ let sources."path-key-3.1.1" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" - sources."pathval-1.1.0" + sources."pathval-1.1.1" sources."performance-now-2.1.0" sources."pg-8.5.1" - sources."pg-connection-string-2.4.0" + sources."pg-connection-string-2.5.0" sources."pg-int8-1.0.1" sources."pg-minify-1.6.2" - sources."pg-pool-3.2.2" - sources."pg-promise-10.8.7" - sources."pg-protocol-1.4.0" + sources."pg-pool-3.3.0" + sources."pg-promise-10.10.1" + sources."pg-protocol-1.5.0" sources."pg-types-2.2.0" sources."pgpass-1.0.4" - sources."picomatch-2.2.2" + sources."picomatch-2.2.3" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" @@ -4587,13 +4563,14 @@ let sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.7.0" + sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."randombytes-2.1.0" sources."randomstring-1.1.5" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."readable-stream-3.6.0" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."regenerator-runtime-0.13.7" sources."regexpp-3.1.0" sources."regextras-0.7.1" @@ -4606,12 +4583,11 @@ let }) sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."require-main-filename-2.0.0" sources."resolve-from-4.0.0" sources."retry-0.12.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-7.3.4" @@ -4622,10 +4598,10 @@ let }) sources."serialize-javascript-5.0.1" sources."serve-static-1.14.1" - sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" + sources."side-channel-1.0.4" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -4655,9 +4631,9 @@ let sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - (sources."table-6.0.7" // { + (sources."table-6.2.0" // { dependencies = [ - sources."ajv-7.0.3" + sources."ajv-8.1.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -4670,14 +4646,14 @@ let sources."triple-beam-1.3.0" sources."ts-node-9.1.1" sources."tslib-1.14.1" - sources."tsutils-3.19.1" + sources."tsutils-3.21.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.4.0" sources."type-detect-4.0.8" sources."type-fest-0.8.1" sources."type-is-1.6.18" - sources."typescript-4.1.3" + sources."typescript-4.2.4" sources."underscore-1.4.4" sources."unhomoglyph-1.0.6" sources."unpipe-1.0.0" @@ -4685,11 +4661,10 @@ let sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-8.3.2" - sources."v8-compile-cache-2.2.0" + sources."v8-compile-cache-2.3.0" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-2.0.2" - sources."which-module-2.0.0" (sources."wide-align-1.1.3" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -4710,28 +4685,18 @@ let }) ]; }) - sources."winston-daily-rotate-file-4.5.0" - (sources."winston-transport-4.3.0" // { + sources."winston-daily-rotate-file-4.5.2" + (sources."winston-transport-4.4.0" // { dependencies = [ - sources."readable-stream-2.3.6" + sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" ]; }) sources."word-wrap-1.2.3" - sources."workerpool-6.0.2" - (sources."wrap-ansi-5.1.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) + sources."workerpool-6.1.0" sources."wrappy-1.0.2" sources."ws-5.2.2" sources."xtend-4.0.2" - sources."y18n-4.0.1" sources."yallist-4.0.0" (sources."yargs-16.2.0" // { dependencies = [ @@ -4744,13 +4709,8 @@ let sources."yargs-parser-20.2.4" ]; }) - sources."yargs-parser-13.1.2" - (sources."yargs-unparser-2.0.0" // { - dependencies = [ - sources."camelcase-6.2.0" - sources."decamelize-4.0.0" - ]; - }) + sources."yargs-parser-20.2.4" + sources."yargs-unparser-2.0.0" sources."yn-3.1.1" sources."yocto-queue-0.1.0" ]; diff --git a/third_party/nixpkgs/pkgs/servers/mbtileserver/default.nix b/third_party/nixpkgs/pkgs/servers/mbtileserver/default.nix index 56309f6f1b..0168a98ca7 100644 --- a/third_party/nixpkgs/pkgs/servers/mbtileserver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mbtileserver/default.nix @@ -2,20 +2,21 @@ buildGoModule rec { pname = "mbtileserver"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "consbio"; repo = pname; rev = "v${version}"; - sha256 = "0b0982rn5jsv8zxfkrcmhys764nim6136hafc8ccj0mwdyvwafxd"; + sha256 = "sha256-QdirExVv7p7Mnhp8EGdTVRlmEiYpzoXVQbtO8aS9Kas="; }; - vendorSha256 = null; + vendorSha256 = "sha256-mUUxUZn8out6WNvKJKHoz+R44RDB0oWJb+57w72+E5w="; meta = with lib; { description = "A simple Go-based server for map tiles stored in mbtiles format"; homepage = "https://github.com/consbio/mbtileserver"; + changelog = "https://github.com/consbio/mbtileserver/blob/v${version}/CHANGELOG.md"; license = licenses.isc; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index b0d7f1048b..d244abf2e6 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -1,43 +1,49 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: +let + # The web client verifies, that the server version is a valid datetime string: + # https://github.com/minio/minio/blob/3a0e7347cad25c60b2e51ff3194588b34d9e424c/browser/app/js/web.js#L51-L53 + # + # Example: + # versionToTimestamp "2021-04-22T15-44-28Z" + # => "2021-04-22T15:44:28Z" + versionToTimestamp = version: + let + splitTS = builtins.elemAt (builtins.split "(.*)(T.*)" version) 1; + in + builtins.concatStringsSep "" [ (builtins.elemAt splitTS 0) (builtins.replaceStrings [ "-" ] [ ":" ] (builtins.elemAt splitTS 1)) ]; +in buildGoModule rec { pname = "minio"; - version = "2021-04-22T15-44-28Z"; + version = "2021-05-16T05-32-34Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "147a4vgf2hdpbndska443axzvxx56bmc0011m3cq4ca1vm783k8q"; + sha256 = "sha256-+zanqJMYNg/1c20cMm+bqVsW8VquucxEK5NiFAqOmS0="; }; - vendorSha256 = "0qj1zab97q8s5gy7a304wqi832y8m083cnk8hllz8lz9yjcw6q92"; + vendorSha256 = "sha256-5aDD68nugFyWsySLEj7LXAdtFXFKWnqfz+5zF5wC2qw="; doCheck = false; subPackages = [ "." ]; - patchPhase = '' - sed -i "s/Version.*/Version = \"${version}\"/g" cmd/build-constants.go - sed -i "s/ReleaseTag.*/ReleaseTag = \"RELEASE.${version}\"/g" cmd/build-constants.go - sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go - ''; - - postConfigure = '' - export CGO_ENABLED=0 - ''; - - buildFlagsArray = [ - "-tags=kqueue" - ]; + preBuild = let t = "github.com/minio/minio/cmd"; in + '' + export CGO_ENABLED=0 + buildFlagsArray+=("-tags" "kqueue" "-ldflags" "-s -w -X ${t}.Version=${versionToTimestamp version} -X ${t}.ReleaseTag=RELEASE.${version} -X ${t}.CommitID=${src.rev}") + ''; passthru.tests.minio = nixosTests.minio; meta = with lib; { homepage = "https://www.minio.io/"; description = "An S3-compatible object storage server"; + changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${version}"; maintainers = with maintainers; [ eelco bachp ]; platforms = platforms.unix; - license = licenses.asl20; + license = licenses.agpl3Plus; }; } diff --git a/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix b/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix index 71f370a1a9..c747e5266a 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgpd"; - version = "2.26.0"; + version = "2.27.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "10fq74hv3vmcq58i3w67ic370925vl9wl6khcmy3f2vg60i962di"; + sha256 = "sha256-Ofg+z8wUttqM1THatPFi0cuyLSEryhTmg3JC1o+16eA="; }; - vendorSha256 = "0dmd4r6x76jn8pyvp47x4llzc2wij5m9lchgyaagcb5sfdgbns9x"; + vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; postConfigure = '' export CGO_ENABLED=0 diff --git a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix b/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix index b4dfc4791b..532f7734ac 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix @@ -4,11 +4,11 @@ with lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.40.0"; + version = "0.42.1"; src = fetchurl { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "sha256-sBITCHyji55OnopNlDCNypSf/j8LKtarSGPYz5fQZys="; + sha256 = "1bndqs689rc7pf1l08rlph8h3f86kr1c7i96szs4wkycfy9w8vsv"; }; nativeBuildInputs = [ makeWrapper ]; @@ -18,8 +18,12 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp navidrome $out/bin + + runHook postInstall ''; postFixup = '' @@ -30,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Navidrome Music Server and Streamer compatible with Subsonic/Airsonic"; homepage = "https://www.navidrome.org/"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ aciceri ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix index 9a172120da..d6e3accdf4 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "do-agent"; - version = "3.9.4"; + version = "3.10.0"; src = fetchFromGitHub { owner = "digitalocean"; repo = "do-agent"; rev = version; - sha256 = "sha256-h5Bv6Us1NrxhUWBckUcGzh3qDk8yDbkmLnV6ZYDdClU="; + sha256 = "sha256-boEgCC3uWvJvb6VKpNhh6vHCfeE7oun5oneI2ITKh9g="; }; buildFlagsArray = '' diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 8d4d37304f..27013c2a77 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -10,13 +10,13 @@ mkYarnPackage rec { name = "grafana-image-renderer"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - sha256 = "sha256-3zvtlBjg+Yv5XDWdIN9HHLf+/Gv06ctbBaFhCgHeAMU="; + sha256 = "sha256-loWLbeu8h0fhMcUzmeYVSw4x6R0GVfqwb/vHwCNT/fM="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json index 6da9178aa8..36f9a32976 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -25,22 +25,21 @@ "express": "^4.16.3", "express-prom-bundle": "^5.1.5", "google-protobuf": "3.5.0", - "lodash": "^4.17.19", + "lodash": "^4.17.21", "minimist": "^1.2.0", "morgan": "^1.9.0", - "mz": "^2.7.0", "prom-client": "^11.5.3", - "puppeteer": "^2.0.0", - "puppeteer-cluster": "^0.18.0", + "puppeteer": "^3.3.0", + "puppeteer-cluster": "^0.22.0", "unique-filename": "^1.1.0", "winston": "^3.2.1" }, "devDependencies": { "@types/express": "^4.11.1", - "@types/node": "^10.0.9", - "husky": "^3.1.0", + "@types/node": "^14.14.41", + "husky": "^4.3.8", "lint-staged": "^9.5.0", - "pkg": "4.4.8", + "pkg": "^5.1.0", "prettier": "^1.19.1", "tsc-watch": "^4.2.3", "typescript": "^3.8.3" @@ -61,9 +60,9 @@ }, "bin": "build/app.js", "engines": { - "node": ">=12 <13" + "node": ">=14 <15" }, "volta": { - "node": "12.19.0" + "node": "14.16.1" } } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock index ca08234354..cf769ed592 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock @@ -2,43 +2,61 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0": +"@babel/code-frame@7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== dependencies: "@babel/highlight" "^7.10.4" -"@babel/helper-validator-identifier@^7.10.4": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" - integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== - -"@babel/highlight@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" - integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== +"@babel/code-frame@^7.0.0": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" + integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== dependencies: - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/highlight" "^7.12.13" + +"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288" + integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A== + +"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf" + integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg== + dependencies: + "@babel/helper-validator-identifier" "^7.14.0" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.9.4": - version "7.9.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7" - integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q== +"@babel/parser@7.13.13": + version "7.13.13" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df" + integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw== -"@babel/runtime@^7.9.2": - version "7.9.6" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f" - integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ== +"@babel/types@7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.12.tgz#edbf99208ef48852acdff1c8a681a1e4ade580cd" + integrity sha512-K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA== dependencies: - regenerator-runtime "^0.13.4" + "@babel/helper-validator-identifier" "^7.12.11" + lodash "^4.17.19" + to-fast-properties "^2.0.0" -"@eslint/eslintrc@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz#d736d6963d7003b6514e6324bec9c602ac340318" - integrity sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg== +"@dabh/diagnostics@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz#290d08f7b381b8f94607dc8f471a12c675f9db31" + integrity sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q== + dependencies: + colorspace "1.1.x" + enabled "2.0.x" + kuler "^2.0.0" + +"@eslint/eslintrc@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547" + integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog== dependencies: ajv "^6.12.4" debug "^4.1.1" @@ -47,56 +65,55 @@ ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" - lodash "^4.17.20" minimatch "^3.0.4" strip-json-comments "^3.1.1" "@grpc/grpc-js@^1.0": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.0.3.tgz#7fa2ba293ccc1e91b24074c2628c8c68336e18c4" - integrity sha512-JKV3f5Bv2TZxK6eJSB9EarsZrnLxrvcFNwI9goq0YRXa3S6NNoCSnI3cG3lkXVIJ03Wng1WXe76kc2JQtRe7AQ== + version "1.3.0" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.3.0.tgz#c6febaaf00ce7f53b5ec52c7cf3e2a4725b82bcb" + integrity sha512-fiL7ZaGg2HBiFtmv6m34d5jEgEtNXfctjzB3f7b3iuT7olBX4mHLMOqOBmGTTSOTfNRQJH5+vsyk6mEz3I0Q7Q== dependencies: - semver "^6.2.0" + "@types/node" ">=12.12.47" "@grpc/proto-loader@^0.5.4": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.4.tgz#038a3820540f621eeb1b05d81fbedfb045e14de0" - integrity sha512-HTM4QpI9B2XFkPz7pjwMyMgZchJ93TVkL3kWPW8GDMDKYxsMnmf4w2TNMJK7+KNiYHS5cJrCEAFlF+AwtXWVPA== + version "0.5.6" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.6.tgz#1dea4b8a6412b05e2d58514d507137b63a52a98d" + integrity sha512-DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ== dependencies: lodash.camelcase "^4.3.0" protobufjs "^6.8.6" "@hapi/boom@^9.1.0": - version "9.1.0" - resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.0.tgz#0d9517657a56ff1e0b42d0aca9da1b37706fec56" - integrity sha512-4nZmpp4tXbm162LaZT45P7F7sgiem8dwAh2vHWT6XX24dozNjGMg6BvKCRvtCUcmcXqeMIUqWN8Rc5X8yKuROQ== + version "9.1.2" + resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.2.tgz#48bd41d67437164a2d636e3b5bc954f8c8dc5e38" + integrity sha512-uJEJtiNHzKw80JpngDGBCGAmWjBtzxDCz17A9NO2zCi8LLBlb5Frpq4pXwyN+2JQMod4pKz5BALwyneCgDg89Q== dependencies: "@hapi/hoek" "9.x.x" "@hapi/hoek@9.x.x": - version "9.1.0" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.1.0.tgz#6c9eafc78c1529248f8f4d92b0799a712b6052c6" - integrity sha512-i9YbZPN3QgfighY/1X1Pu118VUz2Fmmhd6b2n0/O8YVgGGfw0FbUYoA97k7FkpGJ+pLCFEDLUmAPPV4D1kpeFw== + version "9.2.0" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.0.tgz#f3933a44e365864f4dad5db94158106d511e8131" + integrity sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug== -"@nodelib/fs.scandir@2.1.3": - version "2.1.3" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b" - integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw== +"@nodelib/fs.scandir@2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" + integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA== dependencies: - "@nodelib/fs.stat" "2.0.3" + "@nodelib/fs.stat" "2.0.4" run-parallel "^1.1.9" -"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3" - integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA== +"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655" + integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q== "@nodelib/fs.walk@^1.2.3": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976" - integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ== + version "1.2.6" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063" + integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== dependencies: - "@nodelib/fs.scandir" "2.1.3" + "@nodelib/fs.scandir" "2.1.4" fastq "^1.6.0" "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": @@ -153,87 +170,88 @@ integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= "@samverschueren/stream-to-observable@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" - integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg== + version "0.3.1" + resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz#a21117b19ee9be70c379ec1877537ef2e1c63301" + integrity sha512-c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ== dependencies: any-observable "^0.3.0" "@types/body-parser@*": - version "1.17.1" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.1.tgz#18fcf61768fb5c30ccc508c21d6fd2e8b3bf7897" - integrity sha512-RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w== + version "1.19.0" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f" + integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ== dependencies: "@types/connect" "*" "@types/node" "*" "@types/connect@*": - version "3.4.33" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546" - integrity sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A== + version "3.4.34" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901" + integrity sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ== dependencies: "@types/node" "*" -"@types/events@*": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" - integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g== - -"@types/express-serve-static-core@*": - version "4.17.1" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.1.tgz#82be64a77211b205641e0209096fd3afb62481d3" - integrity sha512-9e7jj549ZI+RxY21Cl0t8uBnWyb22HzILupyHZjYEVK//5TT/1bZodU+yUbLnPdoYViBBnNWbxp4zYjGV0zUGw== +"@types/express-serve-static-core@^4.17.18": + version "4.17.19" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz#00acfc1632e729acac4f1530e9e16f6dd1508a1d" + integrity sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA== dependencies: "@types/node" "*" + "@types/qs" "*" "@types/range-parser" "*" "@types/express@^4.11.1": - version "4.17.2" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.2.tgz#a0fb7a23d8855bac31bc01d5a58cadd9b2173e6c" - integrity sha512-5mHFNyavtLoJmnusB8OKJ5bshSzw+qkMIBAobLrIM48HJvunFva9mOa6aBwh64lBFyNwBbs0xiEFuj4eU/NjCA== + version "4.17.11" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545" + integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg== dependencies: "@types/body-parser" "*" - "@types/express-serve-static-core" "*" + "@types/express-serve-static-core" "^4.17.18" + "@types/qs" "*" "@types/serve-static" "*" "@types/glob@^7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575" - integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w== + version "7.1.3" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" + integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w== dependencies: - "@types/events" "*" "@types/minimatch" "*" "@types/node" "*" -"@types/long@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.0.tgz#719551d2352d301ac8b81db732acb6bdc28dbdef" - integrity sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q== +"@types/long@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" + integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== -"@types/mime@*": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d" - integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw== +"@types/mime@^1": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" + integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== "@types/minimatch@*": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" - integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21" + integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== -"@types/node@*": - version "13.1.8" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.1.8.tgz#1d590429fe8187a02707720ecf38a6fe46ce294b" - integrity sha512-6XzyyNM9EKQW4HKuzbo/CkOIjn/evtCmsU+MUM1xDfJ+3/rNjBttM1NgN7AOQvN6tP1Sl1D1PIKMreTArnxM9A== +"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0": + version "15.0.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67" + integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA== -"@types/node@^10.0.9", "@types/node@^10.1.0": - version "10.17.13" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.13.tgz#ccebcdb990bd6139cd16e84c39dc2fb1023ca90c" - integrity sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg== +"@types/node@^14.14.41": + version "14.14.44" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz#df7503e6002847b834371c004b372529f3f85215" + integrity sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA== -"@types/normalize-package-data@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" - integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== +"@types/parse-json@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" + integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + +"@types/qs@*": + version "6.9.6" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1" + integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA== "@types/range-parser@*": version "1.2.3" @@ -241,12 +259,19 @@ integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== "@types/serve-static@*": - version "1.13.3" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.3.tgz#eb7e1c41c4468272557e897e9171ded5e2ded9d1" - integrity sha512-oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g== + version "1.13.9" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e" + integrity sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA== dependencies: - "@types/express-serve-static-core" "*" - "@types/mime" "*" + "@types/mime" "^1" + "@types/node" "*" + +"@types/yauzl@^2.9.1": + version "2.9.1" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz#d10f69f9f522eef3cf98e30afb684a1e1ec923af" + integrity sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA== + dependencies: + "@types/node" "*" accepts@~1.3.7: version "1.3.7" @@ -266,17 +291,15 @@ acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -agent-base@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" - integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== - dependencies: - es6-promisify "^5.0.0" +agent-base@5: + version "5.1.1" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c" + integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g== aggregate-error@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0" - integrity sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== dependencies: clean-stack "^2.0.0" indent-string "^4.0.0" @@ -291,20 +314,10 @@ ajv@^6.10.0, ajv@^6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^6.5.5: - version "6.11.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9" - integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@^7.0.2: - version "7.0.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.3.tgz#13ae747eff125cafb230ac504b2406cf371eece2" - integrity sha512-R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ== +ajv@^8.0.1: + version "8.2.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602" + integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -360,10 +373,18 @@ any-observable@^0.3.0: resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b" integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog== -any-promise@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" - integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== + +are-we-there-yet@~1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" argparse@^1.0.7: version "1.0.10" @@ -382,74 +403,59 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -asn1@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== - dependencies: - safer-buffer "~2.1.0" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= - astral-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== -async-limiter@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" - integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== +async@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" + integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== -async@^2.6.1: - version "2.6.3" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" - integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== +at-least-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== + +axios@^0.21.1: + version "0.21.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" + integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== dependencies: - lodash "^4.17.14" - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= - -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= - -aws4@^1.8.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e" - integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== + follow-redirects "^1.10.0" balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -basic-auth@~2.0.0: +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +basic-auth@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== dependencies: safe-buffer "5.1.2" -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= - dependencies: - tweetnacl "^0.14.3" - bintrees@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.1.tgz#0e655c9b9c2435eaab68bf4027226d2b55a34524" integrity sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ= +bl@^4.0.3: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + body-parser@1.19.0: version "1.19.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" @@ -481,15 +487,18 @@ braces@^3.0.1: dependencies: fill-range "^7.0.1" -buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= -byline@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1" - integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE= +buffer@^5.2.1, buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" bytes@3.1.0: version "3.1.0" @@ -520,11 +529,6 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= - chalk@^1.0.0, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -545,21 +549,18 @@ chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== +chalk@^4.0.0, chalk@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" + integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" +chownr@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== ci-info@^2.0.0: version "2.0.0" @@ -586,6 +587,15 @@ cli-truncate@^0.2.1: slice-ansi "0.0.4" string-width "^1.0.1" +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" @@ -616,9 +626,9 @@ color-name@^1.0.0, color-name@~1.1.4: integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== color-string@^1.5.2: - version "1.5.3" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc" - integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw== + version "1.5.5" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014" + integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg== dependencies: color-name "^1.0.0" simple-swizzle "^0.2.2" @@ -631,11 +641,6 @@ color@3.0.x: color-convert "^1.9.1" color-string "^1.5.2" -colornames@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96" - integrity sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y= - colors@^1.2.1: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" @@ -649,32 +654,25 @@ colorspace@1.1.x: color "3.0.x" text-hex "1.0.x" -combined-stream@^1.0.6, combined-stream@~1.0.6: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== +compare-versions@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" + integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA== + concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-stream@1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" - integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== - dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= content-disposition@0.5.3: version "0.5.3" @@ -698,7 +696,7 @@ cookie@0.4.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== -core-util-is@1.0.2, core-util-is@~1.0.0: +core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= @@ -713,36 +711,18 @@ cosmiconfig@^5.2.1: js-yaml "^3.13.1" parse-json "^4.0.0" -cross-spawn@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= +cosmiconfig@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3" + integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA== dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" + "@types/parse-json" "^4.0.0" + import-fresh "^3.2.1" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.10.0" -cross-spawn@^6.0.0: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - -cross-spawn@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14" - integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -cross-spawn@^7.0.2: +cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -751,13 +731,6 @@ cross-spawn@^7.0.2: shebang-command "^2.0.0" which "^2.0.1" -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= - dependencies: - assert-plus "^1.0.0" - date-fns@^1.27.2: version "1.30.1" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c" @@ -770,32 +743,30 @@ debug@2.6.9: dependencies: ms "2.0.0" -debug@^3.1.0: - version "3.2.6" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" - integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== - dependencies: - ms "^2.1.1" - -debug@^4.0.1, debug@^4.1.1: +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== dependencies: ms "2.1.2" -debug@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== +decompress-response@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" + integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== dependencies: - ms "^2.1.1" + mimic-response "^2.0.0" dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -815,29 +786,30 @@ del@^5.0.0: rimraf "^3.0.0" slash "^3.0.0" -delayed-stream@~1.0.0: +delegates@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= +depd@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + destroy@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= -diagnostics@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a" - integrity sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ== - dependencies: - colorspace "1.1.x" - enabled "1.0.x" - kuler "1.0.x" +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= dir-glob@^3.0.1: version "3.0.1" @@ -854,17 +826,9 @@ doctrine@^3.0.0: esutils "^2.0.2" duplexer@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" - integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= - -ecc-jsbn@~0.1.1: version "0.1.2" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" + resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" + integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== ee-first@1.1.1: version "1.1.1" @@ -881,19 +845,17 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -enabled@1.0.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93" - integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M= - dependencies: - env-variable "0.0.x" +enabled@2.0.x: + version "2.0.0" + resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" + integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -end-of-stream@^1.1.0: +end-of-stream@^1.1.0, end-of-stream@^1.4.1: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== @@ -907,11 +869,6 @@ enquirer@^2.3.5: dependencies: ansi-colors "^4.1.1" -env-variable@0.0.x: - version "0.0.5" - resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.5.tgz#913dd830bef11e96a039c038d4130604eba37f88" - integrity sha512-zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA== - error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -919,17 +876,10 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es6-promise@^4.0.3: - version "4.2.8" - resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" - integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== - -es6-promisify@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203" - integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM= - dependencies: - es6-promise "^4.0.3" +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== escape-html@~1.0.3: version "1.0.3" @@ -941,13 +891,13 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -escodegen@^1.14.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457" - integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ== +escodegen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" + integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== dependencies: esprima "^4.0.1" - estraverse "^4.2.0" + estraverse "^5.2.0" esutils "^2.0.2" optionator "^0.8.1" optionalDependencies: @@ -974,17 +924,17 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== eslint-visitor-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" - integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== eslint@^7.13.0: - version "7.18.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz#7fdcd2f3715a41fe6295a16234bd69aed2c75e67" - integrity sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ== + version "7.25.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67" + integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw== dependencies: - "@babel/code-frame" "^7.0.0" - "@eslint/eslintrc" "^0.3.0" + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.0" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -995,12 +945,12 @@ eslint@^7.13.0: eslint-utils "^2.1.0" eslint-visitor-keys "^2.0.0" espree "^7.3.1" - esquery "^1.2.0" + esquery "^1.4.0" esutils "^2.0.2" - file-entry-cache "^6.0.0" + file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" glob-parent "^5.0.0" - globals "^12.1.0" + globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -1008,7 +958,7 @@ eslint@^7.13.0: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.20" + lodash "^4.17.21" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" @@ -1035,10 +985,10 @@ esprima@^4.0.0, esprima@^4.0.1: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" - integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== +esquery@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== dependencies: estraverse "^5.1.0" @@ -1049,7 +999,7 @@ esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.1.1: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== @@ -1082,19 +1032,6 @@ event-stream@=3.3.4: stream-combiner "~0.0.4" through "~2.3.1" -execa@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" - integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== - dependencies: - cross-spawn "^6.0.0" - get-stream "^4.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - execa@^2.0.3: version "2.1.0" resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99" @@ -1159,51 +1096,26 @@ express@^4.16.3: utils-merge "1.0.1" vary "~1.1.2" -extend@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== - -extract-zip@^1.6.6: - version "1.6.7" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9" - integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k= +extract-zip@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" + integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== dependencies: - concat-stream "1.6.2" - debug "2.6.9" - mkdirp "0.5.1" - yauzl "2.4.1" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + debug "^4.1.1" + get-stream "^5.1.0" + yauzl "^2.10.0" + optionalDependencies: + "@types/yauzl" "^2.9.1" fast-deep-equal@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.1.1.tgz#87ee30e9e9f3eb40d6f254a7997655da753d7c82" - integrity sha512-nTCREpBY8w8r+boyFYAx21iL6faSsQynliPHM4Uf56SbkyohCNxpVPEH9xrF5TXKy+IsjkPUHDKiUkzBVRXn9g== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.0" - merge2 "^1.3.0" - micromatch "^4.0.2" - -fast-glob@^3.1.1: - version "3.2.2" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz#ade1a9d91148965d4bf7c51f72e1ca662d32e63d" - integrity sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A== +fast-glob@^3.0.3, fast-glob@^3.1.1: + version "3.2.5" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" + integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -1228,23 +1140,23 @@ fast-safe-stringify@^2.0.4: integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== fastq@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.6.0.tgz#4ec8a38f4ac25f21492673adb7eae9cfef47d1c2" - integrity sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA== + version "1.11.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858" + integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g== dependencies: - reusify "^1.0.0" + reusify "^1.0.4" -fd-slicer@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" - integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU= +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= dependencies: pend "~1.2.0" -fecha@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd" - integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg== +fecha@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.1.tgz#0a83ad8f86ef62a091e22bb5a039cd03d23eecce" + integrity sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q== figures@^1.7.0: version "1.7.0" @@ -1261,10 +1173,10 @@ figures@^2.0.0: dependencies: escape-string-regexp "^1.0.5" -file-entry-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a" - integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA== +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== dependencies: flat-cache "^3.0.4" @@ -1288,14 +1200,21 @@ finalhandler@~1.1.2: statuses "~1.5.0" unpipe "~1.0.0" -find-up@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== +find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== dependencies: - locate-path "^5.0.0" + locate-path "^6.0.0" path-exists "^4.0.0" +find-versions@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz#3c57e573bf97769b8cb8df16934b627915da4965" + integrity sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ== + dependencies: + semver-regex "^3.1.2" + flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" @@ -1305,23 +1224,19 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067" - integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA== + version "3.1.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" + integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= +fn.name@1.x.x: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" + integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== -form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" +follow-redirects@^1.10.0: + version "1.14.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz#f5d260f95c5f8c105894491feee5dc8993b402fe" + integrity sha512-0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg== forwarded@~0.1.2: version "0.1.2" @@ -1346,67 +1261,76 @@ from@~0: resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= -fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + +fs-extra@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== dependencies: + at-least-node "^1.0.0" graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" + jsonfile "^6.0.1" + universalify "^2.0.0" fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + get-own-enumerable-property-symbols@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== -get-stdin@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6" - integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ== - -get-stream@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== +get-stream@^5.0.0, get-stream@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== dependencies: pump "^3.0.0" -get-stream@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9" - integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw== - dependencies: - pump "^3.0.0" +github-from-package@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" + integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= - dependencies: - assert-plus "^1.0.0" - -glob-parent@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" - integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== - dependencies: - is-glob "^4.0.1" - -glob-parent@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2" - integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw== +glob-parent@^5.0.0, glob-parent@^5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" @@ -1429,6 +1353,13 @@ globals@^12.1.0: dependencies: type-fest "^0.8.1" +globals@^13.6.0: + version "13.8.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3" + integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q== + dependencies: + type-fest "^0.20.2" + globby@^10.0.1: version "10.0.2" resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543" @@ -1443,10 +1374,10 @@ globby@^10.0.1: merge2 "^1.2.3" slash "^3.0.0" -globby@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.0.tgz#56fd0e9f0d4f8fb0c456f1ab0dee96e1380bc154" - integrity sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg== +globby@^11.0.3: + version "11.0.3" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb" + integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg== dependencies: array-union "^2.1.0" dir-glob "^3.0.1" @@ -1460,28 +1391,10 @@ google-protobuf@3.5.0: resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.5.0.tgz#b8cc63c74d83457bd8a9a904503c8efb26bca339" integrity sha1-uMxjx02DRXvYqakEUDyO+ya8ozk= -graceful-fs@^4.1.6, graceful-fs@^4.2.2: - version "4.2.3" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" - integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== - -graceful-fs@^4.2.0: - version "4.2.4" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" - integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== - -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= - -har-validator@~5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" - integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== - dependencies: - ajv "^6.5.5" - har-schema "^2.0.0" +graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2: + version "4.2.6" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" + integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== has-ansi@^2.0.0: version "2.0.0" @@ -1500,10 +1413,17 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -hosted-git-info@^2.1.4: - version "2.8.5" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c" - integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg== +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" http-errors@1.7.2: version "1.7.2" @@ -1527,39 +1447,29 @@ http-errors@~1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= +https-proxy-agent@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b" + integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg== dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" + agent-base "5" + debug "4" -https-proxy-agent@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz#b8c286433e87602311b01c8ea34413d856a4af81" - integrity sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg== +husky@^4.3.8: + version "4.3.8" + resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d" + integrity sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow== dependencies: - agent-base "^4.3.0" - debug "^3.1.0" - -husky@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/husky/-/husky-3.1.0.tgz#5faad520ab860582ed94f0c1a77f0f04c90b57c0" - integrity sha512-FJkPoHHB+6s4a+jwPqBudBDvYZsoQW5/HBuMSehC8qDiCe50kpcxeqFoDSlow+9I6wg47YxBoT3WxaURlrDIIQ== - dependencies: - chalk "^2.4.2" + chalk "^4.0.0" ci-info "^2.0.0" - cosmiconfig "^5.2.1" - execa "^1.0.0" - get-stdin "^7.0.0" + compare-versions "^3.6.0" + cosmiconfig "^7.0.0" + find-versions "^4.0.0" opencollective-postinstall "^2.0.2" - pkg-dir "^4.2.0" + pkg-dir "^5.0.0" please-upgrade-node "^3.2.0" - read-pkg "^5.2.0" - run-node "^1.0.0" slash "^3.0.0" + which-pm-runs "^1.0.0" iconv-lite@0.4.24: version "0.4.24" @@ -1568,15 +1478,20 @@ iconv-lite@0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== ignore@^5.1.1, ignore@^5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" - integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== + version "5.1.8" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" + integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== import-fresh@^2.0.0: version "2.0.0" @@ -1617,7 +1532,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -1627,18 +1542,23 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -into-stream@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-5.1.1.tgz#f9a20a348a11f3c13face22763f2d02e127f4db8" - integrity sha512-krrAJ7McQxGGmvaYbB7Q1mcA+cRwg9Ij2RfWIeVesNBgVDZmzY/Fa4IpZUT3bmdRzMzdf/mzltCG2Dq99IZGBA== +ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +into-stream@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-6.0.0.tgz#4bfc1244c0128224e18b8870e85b2de8e66c6702" + integrity sha512-XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA== dependencies: from2 "^2.3.0" p-is-promise "^3.0.0" -ipaddr.js@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65" - integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA== +ipaddr.js@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== is-arrayish@^0.2.1: version "0.2.1" @@ -1650,6 +1570,13 @@ is-arrayish@^0.3.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== +is-core-module@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887" + integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw== + dependencies: + has "^1.0.3" + is-directory@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" @@ -1707,14 +1634,14 @@ is-path-cwd@^2.2.0: integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== is-path-inside@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017" - integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg== + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== is-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" - integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= + version "2.2.2" + resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" + integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== is-regexp@^1.0.0: version "1.0.0" @@ -1731,11 +1658,6 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= - isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -1746,11 +1668,6 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= - js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -1764,16 +1681,16 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= - json-parse-better-errors@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== +json-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -1784,44 +1701,24 @@ json-schema-traverse@^1.0.0: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= - json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= +jsonfile@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + dependencies: + universalify "^2.0.0" optionalDependencies: graceful-fs "^4.1.6" -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - -kuler@1.0.x: - version "1.0.1" - resolved "https://registry.yarnpkg.com/kuler/-/kuler-1.0.1.tgz#ef7c784f36c9fb6e16dd3150d152677b2b0228a6" - integrity sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ== - dependencies: - colornames "^1.1.1" +kuler@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" + integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== levn@^0.4.1: version "0.4.1" @@ -1908,27 +1805,37 @@ listr@^0.14.3: p-map "^2.0.0" rxjs "^6.3.3" -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== dependencies: - p-locate "^4.1.0" + p-locate "^5.0.0" lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= -lodash@^4.17.14, lodash@^4.17.20: - version "4.17.20" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" - integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== +lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= -lodash@^4.17.19: - version "4.17.19" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" - integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== +lodash.flatten@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" + integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= + +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + +lodash@^4.17.19, lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== log-symbols@^1.0.2: version "1.0.2" @@ -1953,14 +1860,14 @@ log-update@^2.3.0: cli-cursor "^2.0.0" wrap-ansi "^3.0.1" -logform@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.1.2.tgz#957155ebeb67a13164069825ce67ddb5bb2dd360" - integrity sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ== +logform@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz#40f036d19161fc76b68ab50fdc7fe495544492f2" + integrity sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg== dependencies: colors "^1.2.1" fast-safe-stringify "^2.0.4" - fecha "^2.3.3" + fecha "^4.2.0" ms "^2.1.1" triple-beam "^1.3.0" @@ -1969,14 +1876,6 @@ long@^4.0.0: resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== -lru-cache@^4.0.1: - version "4.1.5" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" - integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -2005,9 +1904,9 @@ merge-stream@^2.0.0: integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== merge2@^1.2.3, merge2@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81" - integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw== + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== methods@~1.1.2: version "1.1.2" @@ -2015,24 +1914,24 @@ methods@~1.1.2: integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= micromatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== dependencies: braces "^3.0.1" - picomatch "^2.0.5" + picomatch "^2.2.3" -mime-db@1.43.0: - version "1.43.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" - integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== +mime-db@1.47.0: + version "1.47.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c" + integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw== -mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.26" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" - integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== +mime-types@~2.1.24: + version "2.1.30" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d" + integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg== dependencies: - mime-db "1.43.0" + mime-db "1.47.0" mime@1.6.0: version "1.6.0" @@ -2040,9 +1939,9 @@ mime@1.6.0: integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== mime@^2.0.3: - version "2.4.4" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" - integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== + version "2.5.2" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" + integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== mimic-fn@^1.0.0: version "1.2.0" @@ -2054,6 +1953,11 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +mimic-response@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" + integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== + minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -2061,40 +1965,26 @@ minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= - -minimist@^1.2.0, minimist@^1.2.5: +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -mkdirp@0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= - dependencies: - minimist "0.0.8" - -mkdirp@^0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - dependencies: - minimist "^1.2.5" +mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" + integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== morgan@^1.9.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz#0a8d16734a1d9afbc824b99df87e738e58e2da59" - integrity sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA== + version "1.10.0" + resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" + integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ== dependencies: - basic-auth "~2.0.0" + basic-auth "~2.0.1" debug "2.6.9" - depd "~1.1.2" + depd "~2.0.0" on-finished "~2.3.0" - on-headers "~1.0.1" + on-headers "~1.0.2" ms@2.0.0: version "2.0.0" @@ -2116,22 +2006,18 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -multistream@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/multistream/-/multistream-2.1.1.tgz#629d3a29bd76623489980d04519a2c365948148c" - integrity sha512-xasv76hl6nr1dEy3lPvy7Ej7K/Lx3O/FCvwge8PeVJpciPPoNCbaANcNiBug3IpdvTveZUcAV0DJzdnUDMesNQ== +multistream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/multistream/-/multistream-4.1.0.tgz#7bf00dfd119556fbc153cff3de4c6d477909f5a8" + integrity sha512-J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw== dependencies: - inherits "^2.0.1" - readable-stream "^2.0.5" + once "^1.4.0" + readable-stream "^3.6.0" -mz@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" - integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== - dependencies: - any-promise "^1.0.0" - object-assign "^4.0.1" - thenify-all "^1.0.0" +napi-build-utils@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" + integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== natural-compare@^1.4.0: version "1.4.0" @@ -2143,38 +2029,28 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +node-abi@^2.7.0: + version "2.26.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.26.0.tgz#355d5d4bc603e856f74197adbf3f5117a396ba40" + integrity sha512-ag/Vos/mXXpWLLAYWsAoQdgS+gW7IwvgMLOgqopm/DbzAjazLltzgzpVMsFlgmo9TzG5hGXeaBZx2AI731RIsQ== + dependencies: + semver "^5.4.1" node-cleanup@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/node-cleanup/-/node-cleanup-2.1.2.tgz#7ac19abd297e09a7f72a71545d951b517e4dde2c" integrity sha1-esGavSl+Caf3KnFUXZUbUX5N3iw= -normalize-package-data@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" - integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== - dependencies: - hosted-git-info "^2.1.4" - resolve "^1.10.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" +noop-logger@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" + integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= normalize-path@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= - dependencies: - path-key "^2.0.0" - npm-run-path@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5" @@ -2182,17 +2058,22 @@ npm-run-path@^3.0.0: dependencies: path-key "^3.0.0" +npmlog@^4.0.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= -oauth-sign@~0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" - integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== - -object-assign@^4.0.1, object-assign@^4.1.0: +object-assign@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -2204,7 +2085,7 @@ on-finished@^2.3.0, on-finished@~2.3.0: dependencies: ee-first "1.1.1" -on-headers@~1.0.1: +on-headers@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== @@ -2216,10 +2097,12 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -one-time@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e" - integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4= +one-time@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45" + integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== + dependencies: + fn.name "1.x.x" onetime@^2.0.0: version "2.0.1" @@ -2229,16 +2112,16 @@ onetime@^2.0.0: mimic-fn "^1.0.0" onetime@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5" - integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q== + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== dependencies: mimic-fn "^2.1.0" opencollective-postinstall@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89" - integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw== + version "2.0.3" + resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259" + integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q== optionator@^0.8.1: version "0.8.3" @@ -2264,16 +2147,6 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" -os-tmpdir@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= - p-finally@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" @@ -2284,19 +2157,19 @@ p-is-promise@^3.0.0: resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-3.0.0.tgz#58e78c7dfe2e163cf2a04ff869e7c1dba64a5971" integrity sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ== -p-limit@^2.2.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" - integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== +p-limit@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== dependencies: - p-try "^2.0.0" + yocto-queue "^0.1.0" -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== dependencies: - p-limit "^2.2.0" + p-limit "^3.0.2" p-map@^2.0.0: version "2.1.0" @@ -2310,11 +2183,6 @@ p-map@^3.0.0: dependencies: aggregate-error "^3.0.0" -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -2331,13 +2199,13 @@ parse-json@^4.0.0: json-parse-better-errors "^1.0.1" parse-json@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" - integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw== + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== dependencies: "@babel/code-frame" "^7.0.0" error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" + json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" parseurl@~1.3.3: @@ -2355,11 +2223,6 @@ path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= -path-key@^2.0.0, path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= - path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" @@ -2392,63 +2255,50 @@ pend@~1.2.0: resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= +picomatch@^2.2.1, picomatch@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d" + integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== -picomatch@^2.0.5: - version "2.2.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a" - integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA== - -picomatch@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== - -pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== +pkg-dir@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760" + integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA== dependencies: - find-up "^4.0.0" + find-up "^5.0.0" -pkg-fetch@^2.6.7: - version "2.6.8" - resolved "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-2.6.8.tgz#458ba6b9c936de1b0f3f9c830f389888561e630f" - integrity sha512-CFG7jOeVD38lltLGA7xCJxYsD//GKLjl1P9tc/n9By2a4WEHQjfkBMrYdMS8WOHVP+r9L20fsZNbaKcubDAiQg== +pkg-fetch@3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.0.4.tgz#8321eff936bf4eb088a333cf23494be0ded173b7" + integrity sha512-XgMXcco5hy0/Q7OXfQ/FbBnPvS4e7gWB9BCcUWUgaHYo3JretihmJjr62EZWmxAjvodoWLGMZ3E7XHf8Q2LfBg== dependencies: - "@babel/runtime" "^7.9.2" - byline "^5.0.0" - chalk "^3.0.0" - expand-template "^2.0.3" - fs-extra "^8.1.0" - minimist "^1.2.5" + axios "^0.21.1" + chalk "^4.1.0" + fs-extra "^9.1.0" progress "^2.0.3" - request "^2.88.0" - request-progress "^3.0.0" - semver "^6.3.0" - unique-temp-dir "^1.0.0" + semver "^7.3.5" + yargs "^16.2.0" -pkg@4.4.8: - version "4.4.8" - resolved "https://registry.yarnpkg.com/pkg/-/pkg-4.4.8.tgz#145fb81f31eebfb90d2010dd2c4b663ca0db4009" - integrity sha512-Fqqv0iaX48U3CFZxd6Dq6JKe7BrAWbgRAqMJkz/m8W3H5cqJ6suvsUWe5AJPRlN/AhbBYXBJ0XG9QlYPTXcVFA== +pkg@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/pkg/-/pkg-5.1.0.tgz#25f92666a4164bbc5495c862de9370ed48788667" + integrity sha512-rWTwvLJakQnEVg03s97KNtGkhM3pPfxk7XinjR7H1bToMZQMNpBTwahrAPoFHdQyfn6odI76DP6vX3Br9VubNQ== dependencies: - "@babel/parser" "^7.9.4" - "@babel/runtime" "^7.9.2" - chalk "^3.0.0" - escodegen "^1.14.1" - fs-extra "^8.1.0" - globby "^11.0.0" - into-stream "^5.1.1" + "@babel/parser" "7.13.13" + "@babel/types" "7.13.12" + chalk "^4.1.0" + escodegen "^2.0.0" + fs-extra "^9.1.0" + globby "^11.0.3" + into-stream "^6.0.0" minimist "^1.2.5" - multistream "^2.1.1" - pkg-fetch "^2.6.7" + multistream "^4.1.0" + pkg-fetch "3.0.4" + prebuild-install "6.0.1" progress "^2.0.3" - resolve "^1.15.1" + resolve "^1.20.0" stream-meter "^1.0.4" + tslib "2.1.0" please-upgrade-node@^3.1.1, please-upgrade-node@^3.2.0: version "3.2.0" @@ -2457,6 +2307,27 @@ please-upgrade-node@^3.1.1, please-upgrade-node@^3.2.0: dependencies: semver-compare "^1.0.0" +prebuild-install@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.0.1.tgz#5902172f7a40eb67305b96c2a695db32636ee26d" + integrity sha512-7GOJrLuow8yeiyv75rmvZyeMGzl8mdEX5gY69d6a6bHWmiPevwqFw+tQavhK0EYMaSg3/KD24cWqeQv1EWsqDQ== + dependencies: + detect-libc "^1.0.3" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^2.7.0" + noop-logger "^0.1.1" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^3.0.3" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + which-pm-runs "^1.0.0" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" @@ -2490,9 +2361,9 @@ prom-client@^11.5.3: tdigest "^0.1.1" protobufjs@^6.8.6: - version "6.8.8" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.8.8.tgz#c8b4f1282fd7a90e6f5b109ed11c84af82908e7c" - integrity sha512-AAmHtD5pXgZfi7GMpllpO3q1Xw1OYldr+dMUlAnffGTAhqkg72WdmSY71uKBF/JuyiKs8psYbtKrhi0ASCD8qw== + version "6.11.2" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b" + integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -2504,22 +2375,22 @@ protobufjs@^6.8.6: "@protobufjs/path" "^1.1.2" "@protobufjs/pool" "^1.1.0" "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.0" - "@types/node" "^10.1.0" + "@types/long" "^4.0.1" + "@types/node" ">=13.7.0" long "^4.0.0" proxy-addr@~2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34" - integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ== + version "2.0.6" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" + integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== dependencies: forwarded "~0.1.2" - ipaddr.js "1.9.0" + ipaddr.js "1.9.1" proxy-from-env@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee" - integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4= + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== ps-tree@^1.2.0: version "1.2.0" @@ -2528,16 +2399,6 @@ ps-tree@^1.2.0: dependencies: event-stream "=3.3.4" -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= - -psl@^1.1.28: - version "1.7.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c" - integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ== - pump@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" @@ -2546,41 +2407,43 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -punycode@^2.1.0, punycode@^2.1.1: +punycode@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -puppeteer-cluster@^0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/puppeteer-cluster/-/puppeteer-cluster-0.18.0.tgz#189ef1cea474590aa4d42c9a665dc319689e8fad" - integrity sha512-sMhK7foa+gq8khtgvKar6xwIjmPFS92ZrDsnpMHcQMX2Q8hWmVSViHG7RhuAOmbfIbS7Ya+lViXlx1xtgUjarQ== +puppeteer-cluster@^0.22.0: + version "0.22.0" + resolved "https://registry.yarnpkg.com/puppeteer-cluster/-/puppeteer-cluster-0.22.0.tgz#4ab214671f414f15ad6a94a4b61ed0b4172e86e6" + integrity sha512-hmydtMwfVM+idFIDzS8OXetnujHGre7RY3BGL+3njy9+r8Dcu3VALkZHfuBEPf6byKssTCgzxU1BvLczifXd5w== dependencies: debug "^4.1.1" -puppeteer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-2.0.0.tgz#0612992e29ec418e0a62c8bebe61af1a64d7ec01" - integrity sha512-t3MmTWzQxPRP71teU6l0jX47PHXlc4Z52sQv4LJQSZLq1ttkKS2yGM3gaI57uQwZkNaoGd0+HPPMELZkcyhlqA== +puppeteer@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.3.0.tgz#95839af9fdc0aa4de7e5ee073a4c0adeb9e2d3d7" + integrity sha512-23zNqRltZ1PPoK28uRefWJ/zKb5Jhnzbbwbpcna2o5+QMn17F0khq5s1bdH3vPlyj+J36pubccR8wiNA/VE0Vw== dependencies: debug "^4.1.0" - extract-zip "^1.6.6" - https-proxy-agent "^3.0.0" + extract-zip "^2.0.0" + https-proxy-agent "^4.0.0" mime "^2.0.3" progress "^2.0.1" proxy-from-env "^1.0.0" - rimraf "^2.6.1" - ws "^6.1.0" + rimraf "^3.0.2" + tar-fs "^2.0.0" + unbzip2-stream "^1.3.3" + ws "^7.2.3" qs@6.7.0: version "6.7.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== -qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== range-parser@~1.2.1: version "1.2.1" @@ -2597,17 +2460,17 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -read-pkg@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" - integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== +rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== dependencies: - "@types/normalize-package-data" "^2.4.0" - normalize-package-data "^2.5.0" - parse-json "^5.0.0" - type-fest "^0.6.0" + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" -readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.3.6: +readable-stream@^2.0.0, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.3.7: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -2620,57 +2483,24 @@ readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.1.4, readable string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.1.1: - version "3.5.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.5.0.tgz#465d70e6d1087f6162d079cd0b5db7fbebfd1606" - integrity sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA== +readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== dependencies: inherits "^2.0.3" string_decoder "^1.1.1" util-deprecate "^1.0.1" -regenerator-runtime@^0.13.4: - version "0.13.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" - integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== - regexpp@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== -request-progress@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe" - integrity sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4= - dependencies: - throttleit "^1.0.0" - -request@^2.88.0: - version "2.88.2" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" - integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.3" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.5.0" - tunnel-agent "^0.6.0" - uuid "^3.3.2" +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= require-from-string@^2.0.2: version "2.0.2" @@ -2687,18 +2517,12 @@ resolve-from@^4.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve@^1.10.0: - version "1.14.2" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.2.tgz#dbf31d0fa98b1f29aa5169783b9c290cb865fea2" - integrity sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ== - dependencies: - path-parse "^1.0.6" - -resolve@^1.15.1: - version "1.17.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" - integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== +resolve@^1.20.0: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== dependencies: + is-core-module "^2.2.0" path-parse "^1.0.6" restore-cursor@^2.0.0: @@ -2709,46 +2533,29 @@ restore-cursor@^2.0.0: onetime "^2.0.0" signal-exit "^3.0.2" -reusify@^1.0.0: +reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rimraf@^2.6.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - -rimraf@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b" - integrity sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg== - dependencies: - glob "^7.1.3" - -rimraf@^3.0.2: +rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== dependencies: glob "^7.1.3" -run-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e" - integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A== - run-parallel@^1.1.9: - version "1.1.9" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679" - integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q== + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" rxjs@^6.3.3: - version "6.5.4" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c" - integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q== + version "6.6.7" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" + integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== dependencies: tslib "^1.9.0" @@ -2757,12 +2564,12 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" - integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== +safe-buffer@^5.0.1, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -2772,20 +2579,20 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= -"semver@2 || 3 || 4 || 5", semver@^5.5.0: +semver-regex@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.2.tgz#34b4c0d361eef262e07199dbef316d0f2ab11807" + integrity sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA== + +semver@^5.4.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^6.2.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.2.1: - version "7.3.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" - integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== +semver@^7.2.1, semver@^7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" @@ -2818,18 +2625,16 @@ serve-static@1.14.1: parseurl "~1.3.3" send "0.17.1" +set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + setprototypeof@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= - dependencies: - shebang-regex "^1.0.0" - shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" @@ -2837,20 +2642,29 @@ shebang-command@^2.0.0: dependencies: shebang-regex "^3.0.0" -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= - shebang-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + +simple-concat@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" + integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== + +simple-get@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" + integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== + dependencies: + decompress-response "^4.2.0" + once "^1.3.1" + simple-concat "^1.0.0" simple-swizzle@^0.2.2: version "0.2.2" @@ -2883,32 +2697,6 @@ source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -spdx-correct@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" - integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q== - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977" - integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA== - -spdx-expression-parse@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" - integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.5" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654" - integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q== - split@0.3: version "0.3.3" resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" @@ -2921,21 +2709,6 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= -sshpk@^1.7.0: - version "1.16.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" - integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - stack-trace@0.0.x: version "0.0.10" resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" @@ -2979,7 +2752,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -string-width@^2.1.1: +"string-width@^1.0.2 || 2", string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -2987,10 +2760,10 @@ string-width@^2.1.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string-width@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" - integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== +string-width@^4.1.0, string-width@^4.2.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" @@ -3040,11 +2813,6 @@ strip-ansi@^6.0.0: dependencies: ansi-regex "^5.0.0" -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= - strip-final-newline@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" @@ -3055,6 +2823,11 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -3080,14 +2853,38 @@ symbol-observable@^1.1.0: integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== table@^6.0.4: - version "6.0.7" - resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34" - integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g== + version "6.6.0" + resolved "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz#905654b79df98d9e9a973de1dd58682532c40e8e" + integrity sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg== dependencies: - ajv "^7.0.2" - lodash "^4.17.20" + ajv "^8.0.1" + lodash.clonedeep "^4.5.0" + lodash.flatten "^4.4.0" + lodash.truncate "^4.4.2" slice-ansi "^4.0.0" string-width "^4.2.0" + strip-ansi "^6.0.0" + +tar-fs@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" + integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== + dependencies: + chownr "^1.1.1" + mkdirp-classic "^0.5.2" + pump "^3.0.0" + tar-stream "^2.1.4" + +tar-stream@^2.1.4: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" + integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== + dependencies: + bl "^4.0.3" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" tdigest@^0.1.1: version "0.1.1" @@ -3106,30 +2903,16 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= -thenify-all@^1.0.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" - integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY= - dependencies: - thenify ">= 3.1.0 < 4" - -"thenify@>= 3.1.0 < 4": - version "3.3.0" - resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839" - integrity sha1-5p44obq+lpsBCCB5eLn2K4hgSDk= - dependencies: - any-promise "^1.0.0" - -throttleit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" - integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= - -through@2, through@~2.3, through@~2.3.1: +through@2, through@^2.3.8, through@~2.3, through@~2.3.1: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" @@ -3142,34 +2925,31 @@ toidentifier@1.0.0: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== -tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - triple-beam@^1.2.0, triple-beam@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== tsc-watch@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.2.3.tgz#630aaf1ed8bbfb6fbcbddb9bef96054bed217c4b" - integrity sha512-M1Lo37+ggVfavGX3ObUVMz9QBH7moqq2RlmBdxnz6a6etwecetznZ/ZgYOi2c9HQ4Ki2qStj7V9J/gSf0rThig== + version "4.2.9" + resolved "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.2.9.tgz#d93fc74233ca4ef7ee6b12d08c0fe6aca3e19044" + integrity sha512-DlTaoDs74+KUpyWr7dCGhuscAUKCz6CiFduBN7R9RbLJSSN1moWdwoCLASE7+zLgGvV5AwXfYDiEMAsPGaO+Vw== dependencies: - cross-spawn "^5.1.0" + cross-spawn "^7.0.3" node-cleanup "^2.1.2" ps-tree "^1.2.0" string-argv "^0.1.1" - strip-ansi "^4.0.0" + strip-ansi "^6.0.0" + +tslib@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" + integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== tslib@^1.9.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" - integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tunnel-agent@^0.6.0: version "0.6.0" @@ -3178,11 +2958,6 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= - type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" @@ -3197,10 +2972,10 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-fest@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" - integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== type-fest@^0.8.1: version "0.8.1" @@ -3215,20 +2990,18 @@ type-is@~1.6.17, type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -typedarray@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= - typescript@^3.8.3: - version "3.8.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061" - integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w== + version "3.9.9" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.9.tgz#e69905c54bc0681d0518bd4d587cc6f2d0b1a674" + integrity sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w== -uid2@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82" - integrity sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I= +unbzip2-stream@^1.3.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" + integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== + dependencies: + buffer "^5.2.1" + through "^2.3.8" unique-filename@^1.1.0: version "1.1.1" @@ -3244,19 +3017,10 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" -unique-temp-dir@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unique-temp-dir/-/unique-temp-dir-1.0.0.tgz#6dce95b2681ca003eebfb304a415f9cbabcc5385" - integrity sha1-bc6VsmgcoAPuv7MEpBX5y6vMU4U= - dependencies: - mkdirp "^0.5.1" - os-tmpdir "^1.0.1" - uid2 "0.0.3" - -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" @@ -3271,9 +3035,9 @@ uri-js@^4.2.2: punycode "^2.1.0" url-value-parser@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.0.1.tgz#c8179a095ab9ec1f5aa17ca36af5af396b4e95ed" - integrity sha512-bexECeREBIueboLGM3Y1WaAzQkIn+Tca/Xjmjmfd0S/hFHSCEoFkNh0/D0l9G4K74MkEP/lLFRlYnxX3d68Qgw== + version "2.0.3" + resolved "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.0.3.tgz#cd4b8d6754e458d65e8125260c09718d926e6e21" + integrity sha512-FjIX+Q9lYmDM9uYIGdMYfQW0uLbWVwN2NrL2ayAI7BTOvEwzH+VoDdNquwB9h4dFAx+u6mb0ONLa3sHD5DvyvA== util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" @@ -3285,44 +3049,20 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@^3.3.2: - version "3.4.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== - v8-compile-cache@^2.0.3: - version "2.2.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132" - integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== - -validate-npm-package-license@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -which@^1.2.9: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" +which-pm-runs@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" + integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= which@^2.0.1: version "2.0.2" @@ -3331,28 +3071,35 @@ which@^2.0.1: dependencies: isexe "^2.0.0" -winston-transport@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.3.0.tgz#df68c0c202482c448d9b47313c07304c2d7c2c66" - integrity sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A== +wide-align@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== dependencies: - readable-stream "^2.3.6" + string-width "^1.0.2 || 2" + +winston-transport@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz#17af518daa690d5b2ecccaa7acf7b20ca7925e59" + integrity sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw== + dependencies: + readable-stream "^2.3.7" triple-beam "^1.2.0" winston@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.2.1.tgz#63061377976c73584028be2490a1846055f77f07" - integrity sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw== + version "3.3.3" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz#ae6172042cafb29786afa3d09c8ff833ab7c9170" + integrity sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw== dependencies: - async "^2.6.1" - diagnostics "^1.1.1" - is-stream "^1.1.0" - logform "^2.1.1" - one-time "0.0.4" - readable-stream "^3.1.1" + "@dabh/diagnostics" "^2.0.2" + async "^3.1.0" + is-stream "^2.0.0" + logform "^2.2.0" + one-time "^1.0.0" + readable-stream "^3.4.0" stack-trace "0.0.x" triple-beam "^1.3.0" - winston-transport "^4.3.0" + winston-transport "^4.4.0" word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" @@ -3367,31 +3114,67 @@ wrap-ansi@^3.0.1: string-width "^2.1.1" strip-ansi "^4.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -ws@^6.1.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" - integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== - dependencies: - async-limiter "~1.0.0" +ws@^7.2.3: + version "7.4.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" + integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yauzl@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005" - integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU= +yaml@^1.10.0: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== + +yargs-parser@^20.2.2: + version "20.2.7" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" + integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== + +yargs@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== dependencies: - fd-slicer "~1.0.1" + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix index 8b4c1ec31e..53fbca36c2 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix @@ -10,99 +10,115 @@ }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; + name = "_babel_code_frame___code_frame_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; - sha1 = "c9a1f021917dcb5ccf0d4e453e399022981fc9ed"; + name = "_babel_code_frame___code_frame_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; + sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; }; } { - name = "_babel_highlight___highlight_7.10.4.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; - sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; + sha1 = "d26cad8a47c65286b15df1547319a5d0bcf27288"; }; } { - name = "_babel_parser___parser_7.9.6.tgz"; + name = "_babel_highlight___highlight_7.14.0.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz"; - sha1 = "3b1bbb30dabe600cd72db58720998376ff653bc7"; + name = "_babel_highlight___highlight_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz"; + sha1 = "3197e375711ef6bf834e67d0daec88e4f46113cf"; }; } { - name = "_babel_runtime___runtime_7.9.6.tgz"; + name = "_babel_parser___parser_7.13.13.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz"; - sha1 = "a9102eb5cadedf3f31d08a9ecf294af7827ea29f"; + name = "_babel_parser___parser_7.13.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz"; + sha1 = "42f03862f4aed50461e543270916b47dd501f0df"; }; } { - name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; + name = "_babel_types___types_7.13.12.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz"; - sha1 = "d736d6963d7003b6514e6324bec9c602ac340318"; + name = "_babel_types___types_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.13.12.tgz"; + sha1 = "edbf99208ef48852acdff1c8a681a1e4ade580cd"; }; } { - name = "_grpc_grpc_js___grpc_js_1.0.3.tgz"; + name = "_dabh_diagnostics___diagnostics_2.0.2.tgz"; path = fetchurl { - name = "_grpc_grpc_js___grpc_js_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.0.3.tgz"; - sha1 = "7fa2ba293ccc1e91b24074c2628c8c68336e18c4"; + name = "_dabh_diagnostics___diagnostics_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; + sha1 = "290d08f7b381b8f94607dc8f471a12c675f9db31"; }; } { - name = "_grpc_proto_loader___proto_loader_0.5.4.tgz"; + name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; path = fetchurl { - name = "_grpc_proto_loader___proto_loader_0.5.4.tgz"; - url = "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.4.tgz"; - sha1 = "038a3820540f621eeb1b05d81fbedfb045e14de0"; + name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; + sha1 = "99cc0a0584d72f1df38b900fb062ba995f395547"; }; } { - name = "_hapi_boom___boom_9.1.0.tgz"; + name = "_grpc_grpc_js___grpc_js_1.3.0.tgz"; path = fetchurl { - name = "_hapi_boom___boom_9.1.0.tgz"; - url = "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.0.tgz"; - sha1 = "0d9517657a56ff1e0b42d0aca9da1b37706fec56"; + name = "_grpc_grpc_js___grpc_js_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.3.0.tgz"; + sha1 = "c6febaaf00ce7f53b5ec52c7cf3e2a4725b82bcb"; }; } { - name = "_hapi_hoek___hoek_9.1.0.tgz"; + name = "_grpc_proto_loader___proto_loader_0.5.6.tgz"; path = fetchurl { - name = "_hapi_hoek___hoek_9.1.0.tgz"; - url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.1.0.tgz"; - sha1 = "6c9eafc78c1529248f8f4d92b0799a712b6052c6"; + name = "_grpc_proto_loader___proto_loader_0.5.6.tgz"; + url = "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.6.tgz"; + sha1 = "1dea4b8a6412b05e2d58514d507137b63a52a98d"; }; } { - name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz"; + name = "_hapi_boom___boom_9.1.2.tgz"; path = fetchurl { - name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; - sha1 = "3a582bdb53804c6ba6d146579c46e52130cf4a3b"; + name = "_hapi_boom___boom_9.1.2.tgz"; + url = "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.2.tgz"; + sha1 = "48bd41d67437164a2d636e3b5bc954f8c8dc5e38"; }; } { - name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz"; + name = "_hapi_hoek___hoek_9.2.0.tgz"; path = fetchurl { - name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; - sha1 = "34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"; + name = "_hapi_hoek___hoek_9.2.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.0.tgz"; + sha1 = "f3933a44e365864f4dad5db94158106d511e8131"; }; } { - name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz"; + name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; path = fetchurl { - name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; - sha1 = "011b9202a70a6366e436ca5c065844528ab04976"; + name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; + sha1 = "d4b3549a5db5de2683e0c1071ab4f140904bbf69"; + }; + } + { + name = "_nodelib_fs.stat___fs.stat_2.0.4.tgz"; + path = fetchurl { + name = "_nodelib_fs.stat___fs.stat_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; + sha1 = "a3f2dd61bab43b8db8fa108a121cfffe4c676655"; + }; + } + { + name = "_nodelib_fs.walk___fs.walk_1.2.6.tgz"; + path = fetchurl { + name = "_nodelib_fs.walk___fs.walk_1.2.6.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; + sha1 = "cce9396b30aa5afe9e3756608f5831adcb53d063"; }; } { @@ -186,107 +202,107 @@ }; } { - name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.0.tgz"; + name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.1.tgz"; path = fetchurl { - name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz"; - sha1 = "ecdf48d532c58ea477acfcab80348424f8d0662f"; + name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz"; + sha1 = "a21117b19ee9be70c379ec1877537ef2e1c63301"; }; } { - name = "_types_body_parser___body_parser_1.17.1.tgz"; + name = "_types_body_parser___body_parser_1.19.0.tgz"; path = fetchurl { - name = "_types_body_parser___body_parser_1.17.1.tgz"; - url = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.1.tgz"; - sha1 = "18fcf61768fb5c30ccc508c21d6fd2e8b3bf7897"; + name = "_types_body_parser___body_parser_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz"; + sha1 = "0685b3c47eb3006ffed117cdd55164b61f80538f"; }; } { - name = "_types_connect___connect_3.4.33.tgz"; + name = "_types_connect___connect_3.4.34.tgz"; path = fetchurl { - name = "_types_connect___connect_3.4.33.tgz"; - url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz"; - sha1 = "31610c901eca573b8713c3330abc6e6b9f588546"; + name = "_types_connect___connect_3.4.34.tgz"; + url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz"; + sha1 = "170a40223a6d666006d93ca128af2beb1d9b1901"; }; } { - name = "_types_events___events_3.0.0.tgz"; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.19.tgz"; path = fetchurl { - name = "_types_events___events_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz"; - sha1 = "2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.19.tgz"; + url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz"; + sha1 = "00acfc1632e729acac4f1530e9e16f6dd1508a1d"; }; } { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.1.tgz"; + name = "_types_express___express_4.17.11.tgz"; path = fetchurl { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.1.tgz"; - url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.1.tgz"; - sha1 = "82be64a77211b205641e0209096fd3afb62481d3"; + name = "_types_express___express_4.17.11.tgz"; + url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz"; + sha1 = "debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"; }; } { - name = "_types_express___express_4.17.2.tgz"; + name = "_types_glob___glob_7.1.3.tgz"; path = fetchurl { - name = "_types_express___express_4.17.2.tgz"; - url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.2.tgz"; - sha1 = "a0fb7a23d8855bac31bc01d5a58cadd9b2173e6c"; + name = "_types_glob___glob_7.1.3.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz"; + sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183"; }; } { - name = "_types_glob___glob_7.1.1.tgz"; + name = "_types_long___long_4.0.1.tgz"; path = fetchurl { - name = "_types_glob___glob_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz"; - sha1 = "aa59a1c6e3fbc421e07ccd31a944c30eba521575"; + name = "_types_long___long_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz"; + sha1 = "459c65fa1867dafe6a8f322c4c51695663cc55e9"; }; } { - name = "_types_long___long_4.0.0.tgz"; + name = "_types_mime___mime_1.3.2.tgz"; path = fetchurl { - name = "_types_long___long_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/long/-/long-4.0.0.tgz"; - sha1 = "719551d2352d301ac8b81db732acb6bdc28dbdef"; + name = "_types_mime___mime_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz"; + sha1 = "93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"; }; } { - name = "_types_mime___mime_2.0.1.tgz"; + name = "_types_minimatch___minimatch_3.0.4.tgz"; path = fetchurl { - name = "_types_mime___mime_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz"; - sha1 = "dc488842312a7f075149312905b5e3c0b054c79d"; + name = "_types_minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "f0ec25dbf2f0e4b18647313ac031134ca5b24b21"; }; } { - name = "_types_minimatch___minimatch_3.0.3.tgz"; + name = "_types_node___node_15.0.2.tgz"; path = fetchurl { - name = "_types_minimatch___minimatch_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"; + name = "_types_node___node_15.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz"; + sha1 = "51e9c0920d1b45936ea04341aa3e2e58d339fb67"; }; } { - name = "_types_node___node_13.1.8.tgz"; + name = "_types_node___node_14.14.44.tgz"; path = fetchurl { - name = "_types_node___node_13.1.8.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-13.1.8.tgz"; - sha1 = "1d590429fe8187a02707720ecf38a6fe46ce294b"; + name = "_types_node___node_14.14.44.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz"; + sha1 = "df7503e6002847b834371c004b372529f3f85215"; }; } { - name = "_types_node___node_10.17.13.tgz"; + name = "_types_parse_json___parse_json_4.0.0.tgz"; path = fetchurl { - name = "_types_node___node_10.17.13.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-10.17.13.tgz"; - sha1 = "ccebcdb990bd6139cd16e84c39dc2fb1023ca90c"; + name = "_types_parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; }; } { - name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; + name = "_types_qs___qs_6.9.6.tgz"; path = fetchurl { - name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha1 = "e486d0d97396d79beedd0a6e33f4534ff6b4973e"; + name = "_types_qs___qs_6.9.6.tgz"; + url = "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz"; + sha1 = "df9c3c8b31a247ec315e6996566be3171df4b3b1"; }; } { @@ -298,11 +314,19 @@ }; } { - name = "_types_serve_static___serve_static_1.13.3.tgz"; + name = "_types_serve_static___serve_static_1.13.9.tgz"; path = fetchurl { - name = "_types_serve_static___serve_static_1.13.3.tgz"; - url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.3.tgz"; - sha1 = "eb7e1c41c4468272557e897e9171ded5e2ded9d1"; + name = "_types_serve_static___serve_static_1.13.9.tgz"; + url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz"; + sha1 = "aacf28a85a05ee29a11fb7c3ead935ac56f33e4e"; + }; + } + { + name = "_types_yauzl___yauzl_2.9.1.tgz"; + path = fetchurl { + name = "_types_yauzl___yauzl_2.9.1.tgz"; + url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz"; + sha1 = "d10f69f9f522eef3cf98e30afb684a1e1ec923af"; }; } { @@ -330,19 +354,19 @@ }; } { - name = "agent_base___agent_base_4.3.0.tgz"; + name = "agent_base___agent_base_5.1.1.tgz"; path = fetchurl { - name = "agent_base___agent_base_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz"; - sha1 = "8165f01c436009bccad0b1d122f05ed770efc6ee"; + name = "agent_base___agent_base_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz"; + sha1 = "e8fb3f242959db44d63be665db7a8e739537a32c"; }; } { - name = "aggregate_error___aggregate_error_3.0.1.tgz"; + name = "aggregate_error___aggregate_error_3.1.0.tgz"; path = fetchurl { - name = "aggregate_error___aggregate_error_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz"; - sha1 = "db2fe7246e536f40d9b5442a39e117d7dd6a24e0"; + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha1 = "92670ff50f5359bdb7a3e0d40d0ec30c5737687a"; }; } { @@ -354,19 +378,11 @@ }; } { - name = "ajv___ajv_6.11.0.tgz"; + name = "ajv___ajv_8.2.0.tgz"; path = fetchurl { - name = "ajv___ajv_6.11.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz"; - sha1 = "c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"; - }; - } - { - name = "ajv___ajv_7.0.3.tgz"; - path = fetchurl { - name = "ajv___ajv_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-7.0.3.tgz"; - sha1 = "13ae747eff125cafb230ac504b2406cf371eece2"; + name = "ajv___ajv_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz"; + sha1 = "c89d3380a784ce81b2085f48811c4c101df4c602"; }; } { @@ -442,11 +458,19 @@ }; } { - name = "any_promise___any_promise_1.3.0.tgz"; + name = "aproba___aproba_1.2.0.tgz"; path = fetchurl { - name = "any_promise___any_promise_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz"; - sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; + name = "aproba___aproba_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; + sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; }; } { @@ -473,22 +497,6 @@ sha1 = "b798420adbeb1de828d84acd8a2e23d3efe85e8d"; }; } - { - name = "asn1___asn1_0.2.4.tgz"; - path = fetchurl { - name = "asn1___asn1_0.2.4.tgz"; - url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; - sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; - }; - } - { - name = "assert_plus___assert_plus_1.0.0.tgz"; - path = fetchurl { - name = "assert_plus___assert_plus_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - } { name = "astral_regex___astral_regex_2.0.0.tgz"; path = fetchurl { @@ -498,51 +506,43 @@ }; } { - name = "async_limiter___async_limiter_1.0.1.tgz"; + name = "async___async_3.2.0.tgz"; path = fetchurl { - name = "async_limiter___async_limiter_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz"; - sha1 = "dd379e94f0db8310b08291f9d64c3209766617fd"; + name = "async___async_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz"; + sha1 = "b3a2685c5ebb641d3de02d161002c60fc9f85720"; }; } { - name = "async___async_2.6.3.tgz"; + name = "at_least_node___at_least_node_1.0.0.tgz"; path = fetchurl { - name = "async___async_2.6.3.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; - sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff"; + name = "at_least_node___at_least_node_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; + sha1 = "602cd4b46e844ad4effc92a8011a3c46e0238dc2"; }; } { - name = "asynckit___asynckit_0.4.0.tgz"; + name = "axios___axios_0.21.1.tgz"; path = fetchurl { - name = "asynckit___asynckit_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + name = "axios___axios_0.21.1.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz"; + sha1 = "22563481962f4d6bde9a76d516ef0e5d3c09b2b8"; }; } { - name = "aws_sign2___aws_sign2_0.7.0.tgz"; + name = "balanced_match___balanced_match_1.0.2.tgz"; path = fetchurl { - name = "aws_sign2___aws_sign2_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; }; } { - name = "aws4___aws4_1.9.1.tgz"; + name = "base64_js___base64_js_1.5.1.tgz"; path = fetchurl { - name = "aws4___aws4_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz"; - sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e"; - }; - } - { - name = "balanced_match___balanced_match_1.0.0.tgz"; - path = fetchurl { - name = "balanced_match___balanced_match_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + name = "base64_js___base64_js_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; + sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; }; } { @@ -553,14 +553,6 @@ sha1 = "b998279bf47ce38344b4f3cf916d4679bbf51e3a"; }; } - { - name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; - path = fetchurl { - name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; - sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; - }; - } { name = "bintrees___bintrees_1.0.1.tgz"; path = fetchurl { @@ -569,6 +561,14 @@ sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524"; }; } + { + name = "bl___bl_4.1.0.tgz"; + path = fetchurl { + name = "bl___bl_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz"; + sha1 = "451535264182bec2fbbc83a62ab98cf11d9f7b3a"; + }; + } { name = "body_parser___body_parser_1.19.0.tgz"; path = fetchurl { @@ -594,19 +594,19 @@ }; } { - name = "buffer_from___buffer_from_1.1.1.tgz"; + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; path = fetchurl { - name = "buffer_from___buffer_from_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; - sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; }; } { - name = "byline___byline_5.0.0.tgz"; + name = "buffer___buffer_5.7.1.tgz"; path = fetchurl { - name = "byline___byline_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz"; - sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; + name = "buffer___buffer_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; + sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; }; } { @@ -649,14 +649,6 @@ sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; }; } - { - name = "caseless___caseless_0.12.0.tgz"; - path = fetchurl { - name = "caseless___caseless_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; - }; - } { name = "chalk___chalk_1.1.3.tgz"; path = fetchurl { @@ -674,19 +666,19 @@ }; } { - name = "chalk___chalk_3.0.0.tgz"; + name = "chalk___chalk_4.1.1.tgz"; path = fetchurl { - name = "chalk___chalk_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; - sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; + name = "chalk___chalk_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; + sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; }; } { - name = "chalk___chalk_4.1.0.tgz"; + name = "chownr___chownr_1.1.4.tgz"; path = fetchurl { - name = "chalk___chalk_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; - sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; + name = "chownr___chownr_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; + sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; }; } { @@ -721,6 +713,14 @@ sha1 = "9f15cfbb0705005369216c626ac7d05ab90dd574"; }; } + { + name = "cliui___cliui_7.0.4.tgz"; + path = fetchurl { + name = "cliui___cliui_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; + sha1 = "a0265ee655476fc807aea9df3df8df7783808b4f"; + }; + } { name = "code_point_at___code_point_at_1.1.0.tgz"; path = fetchurl { @@ -762,11 +762,11 @@ }; } { - name = "color_string___color_string_1.5.3.tgz"; + name = "color_string___color_string_1.5.5.tgz"; path = fetchurl { - name = "color_string___color_string_1.5.3.tgz"; - url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz"; - sha1 = "c9bbc5f01b58b5492f3d6857459cb6590ce204cc"; + name = "color_string___color_string_1.5.5.tgz"; + url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz"; + sha1 = "65474a8f0e7439625f3d27a6a19d89fc45223014"; }; } { @@ -777,14 +777,6 @@ sha1 = "d920b4328d534a3ac8295d68f7bd4ba6c427be9a"; }; } - { - name = "colornames___colornames_1.1.1.tgz"; - path = fetchurl { - name = "colornames___colornames_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz"; - sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96"; - }; - } { name = "colors___colors_1.4.0.tgz"; path = fetchurl { @@ -801,14 +793,6 @@ sha1 = "e0128950d082b86a2168580796a0aa5d6c68d8c5"; }; } - { - name = "combined_stream___combined_stream_1.0.8.tgz"; - path = fetchurl { - name = "combined_stream___combined_stream_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; - sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; - }; - } { name = "commander___commander_2.20.3.tgz"; path = fetchurl { @@ -817,6 +801,14 @@ sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; }; } + { + name = "compare_versions___compare_versions_3.6.0.tgz"; + path = fetchurl { + name = "compare_versions___compare_versions_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz"; + sha1 = "1a5689913685e5a87637b8d3ffca75514ec41d62"; + }; + } { name = "concat_map___concat_map_0.0.1.tgz"; path = fetchurl { @@ -826,11 +818,11 @@ }; } { - name = "concat_stream___concat_stream_1.6.2.tgz"; + name = "console_control_strings___console_control_strings_1.1.0.tgz"; path = fetchurl { - name = "concat_stream___concat_stream_1.6.2.tgz"; - url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; - sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; } { @@ -882,27 +874,11 @@ }; } { - name = "cross_spawn___cross_spawn_5.1.0.tgz"; + name = "cosmiconfig___cosmiconfig_7.0.0.tgz"; path = fetchurl { - name = "cross_spawn___cross_spawn_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; - }; - } - { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; - }; - } - { - name = "cross_spawn___cross_spawn_7.0.1.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz"; - sha1 = "0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"; + name = "cosmiconfig___cosmiconfig_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz"; + sha1 = "ef9b44d773959cae63ddecd122de23853b60f8d3"; }; } { @@ -913,14 +889,6 @@ sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; }; } - { - name = "dashdash___dashdash_1.14.1.tgz"; - path = fetchurl { - name = "dashdash___dashdash_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; - }; - } { name = "date_fns___date_fns_1.30.1.tgz"; path = fetchurl { @@ -937,14 +905,6 @@ sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; }; } - { - name = "debug___debug_3.2.6.tgz"; - path = fetchurl { - name = "debug___debug_3.2.6.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz"; - sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b"; - }; - } { name = "debug___debug_4.3.1.tgz"; path = fetchurl { @@ -954,11 +914,11 @@ }; } { - name = "debug___debug_4.1.1.tgz"; + name = "decompress_response___decompress_response_4.2.1.tgz"; path = fetchurl { - name = "debug___debug_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; - sha1 = "3b72260255109c6b589cee050f1d516139664791"; + name = "decompress_response___decompress_response_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz"; + sha1 = "414023cc7a302da25ce2ec82d0d5238ccafd8986"; }; } { @@ -969,6 +929,14 @@ sha1 = "2495ddbaf6eb874abb0e1be9df22d2e5a544326c"; }; } + { + name = "deep_extend___deep_extend_0.6.0.tgz"; + path = fetchurl { + name = "deep_extend___deep_extend_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; + sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + }; + } { name = "deep_is___deep_is_0.1.3.tgz"; path = fetchurl { @@ -986,11 +954,11 @@ }; } { - name = "delayed_stream___delayed_stream_1.0.0.tgz"; + name = "delegates___delegates_1.0.0.tgz"; path = fetchurl { - name = "delayed_stream___delayed_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + name = "delegates___delegates_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; } { @@ -1001,6 +969,14 @@ sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; }; } + { + name = "depd___depd_2.0.0.tgz"; + path = fetchurl { + name = "depd___depd_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz"; + sha1 = "b696163cc757560d09cf22cc8fad1571b79e76df"; + }; + } { name = "destroy___destroy_1.0.4.tgz"; path = fetchurl { @@ -1010,11 +986,11 @@ }; } { - name = "diagnostics___diagnostics_1.1.1.tgz"; + name = "detect_libc___detect_libc_1.0.3.tgz"; path = fetchurl { - name = "diagnostics___diagnostics_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz"; - sha1 = "cab6ac33df70c9d9a727490ae43ac995a769b22a"; + name = "detect_libc___detect_libc_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; }; } { @@ -1034,19 +1010,11 @@ }; } { - name = "duplexer___duplexer_0.1.1.tgz"; + name = "duplexer___duplexer_0.1.2.tgz"; path = fetchurl { - name = "duplexer___duplexer_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz"; - sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; - }; - } - { - name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; - path = fetchurl { - name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + name = "duplexer___duplexer_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz"; + sha1 = "3abe43aef3835f8ae077d136ddce0f276b0400e6"; }; } { @@ -1074,11 +1042,11 @@ }; } { - name = "enabled___enabled_1.0.2.tgz"; + name = "enabled___enabled_2.0.0.tgz"; path = fetchurl { - name = "enabled___enabled_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz"; - sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93"; + name = "enabled___enabled_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz"; + sha1 = "f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"; }; } { @@ -1105,14 +1073,6 @@ sha1 = "2a7fe5dd634a1e4125a975ec994ff5456dc3734d"; }; } - { - name = "env_variable___env_variable_0.0.5.tgz"; - path = fetchurl { - name = "env_variable___env_variable_0.0.5.tgz"; - url = "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.5.tgz"; - sha1 = "913dd830bef11e96a039c038d4130604eba37f88"; - }; - } { name = "error_ex___error_ex_1.3.2.tgz"; path = fetchurl { @@ -1122,19 +1082,11 @@ }; } { - name = "es6_promise___es6_promise_4.2.8.tgz"; + name = "escalade___escalade_3.1.1.tgz"; path = fetchurl { - name = "es6_promise___es6_promise_4.2.8.tgz"; - url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz"; - sha1 = "4eb21594c972bc40553d276e510539143db53e0a"; - }; - } - { - name = "es6_promisify___es6_promisify_5.0.0.tgz"; - path = fetchurl { - name = "es6_promisify___es6_promisify_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz"; - sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; }; } { @@ -1154,11 +1106,11 @@ }; } { - name = "escodegen___escodegen_1.14.1.tgz"; + name = "escodegen___escodegen_2.0.0.tgz"; path = fetchurl { - name = "escodegen___escodegen_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz"; - sha1 = "ba01d0c8278b5e95a9a45350142026659027a457"; + name = "escodegen___escodegen_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz"; + sha1 = "5e32b12833e8aa8fa35e1bf0befa89380484c7dd"; }; } { @@ -1186,19 +1138,19 @@ }; } { - name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; - sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303"; }; } { - name = "eslint___eslint_7.18.0.tgz"; + name = "eslint___eslint_7.25.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.18.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz"; - sha1 = "7fdcd2f3715a41fe6295a16234bd69aed2c75e67"; + name = "eslint___eslint_7.25.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz"; + sha1 = "1309e4404d94e676e3e831b3a3ad2b050031eb67"; }; } { @@ -1218,11 +1170,11 @@ }; } { - name = "esquery___esquery_1.3.1.tgz"; + name = "esquery___esquery_1.4.0.tgz"; path = fetchurl { - name = "esquery___esquery_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; - sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; + name = "esquery___esquery_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; + sha1 = "2148ffc38b82e8c7057dfed48425b3e61f0f24a5"; }; } { @@ -1273,14 +1225,6 @@ sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; }; } - { - name = "execa___execa_1.0.0.tgz"; - path = fetchurl { - name = "execa___execa_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; - sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; - }; - } { name = "execa___execa_2.1.0.tgz"; path = fetchurl { @@ -1314,35 +1258,11 @@ }; } { - name = "extend___extend_3.0.2.tgz"; + name = "extract_zip___extract_zip_2.0.1.tgz"; path = fetchurl { - name = "extend___extend_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; - sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; - }; - } - { - name = "extract_zip___extract_zip_1.6.7.tgz"; - path = fetchurl { - name = "extract_zip___extract_zip_1.6.7.tgz"; - url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz"; - sha1 = "a840b4b8af6403264c8db57f4f1a74333ef81fe9"; - }; - } - { - name = "extsprintf___extsprintf_1.3.0.tgz"; - path = fetchurl { - name = "extsprintf___extsprintf_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; - }; - } - { - name = "extsprintf___extsprintf_1.4.0.tgz"; - path = fetchurl { - name = "extsprintf___extsprintf_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; - sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + name = "extract_zip___extract_zip_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz"; + sha1 = "663dca56fe46df890d5f131ef4a06d22bb8ba13a"; }; } { @@ -1354,19 +1274,11 @@ }; } { - name = "fast_glob___fast_glob_3.1.1.tgz"; + name = "fast_glob___fast_glob_3.2.5.tgz"; path = fetchurl { - name = "fast_glob___fast_glob_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.1.1.tgz"; - sha1 = "87ee30e9e9f3eb40d6f254a7997655da753d7c82"; - }; - } - { - name = "fast_glob___fast_glob_3.2.2.tgz"; - path = fetchurl { - name = "fast_glob___fast_glob_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz"; - sha1 = "ade1a9d91148965d4bf7c51f72e1ca662d32e63d"; + name = "fast_glob___fast_glob_3.2.5.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz"; + sha1 = "7939af2a656de79a4f1901903ee8adcaa7cb9661"; }; } { @@ -1394,27 +1306,27 @@ }; } { - name = "fastq___fastq_1.6.0.tgz"; + name = "fastq___fastq_1.11.0.tgz"; path = fetchurl { - name = "fastq___fastq_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/fastq/-/fastq-1.6.0.tgz"; - sha1 = "4ec8a38f4ac25f21492673adb7eae9cfef47d1c2"; + name = "fastq___fastq_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz"; + sha1 = "bb9fb955a07130a918eb63c1f5161cc32a5d0858"; }; } { - name = "fd_slicer___fd_slicer_1.0.1.tgz"; + name = "fd_slicer___fd_slicer_1.1.0.tgz"; path = fetchurl { - name = "fd_slicer___fd_slicer_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz"; - sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; }; } { - name = "fecha___fecha_2.3.3.tgz"; + name = "fecha___fecha_4.2.1.tgz"; path = fetchurl { - name = "fecha___fecha_2.3.3.tgz"; - url = "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz"; - sha1 = "948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"; + name = "fecha___fecha_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/fecha/-/fecha-4.2.1.tgz"; + sha1 = "0a83ad8f86ef62a091e22bb5a039cd03d23eecce"; }; } { @@ -1434,11 +1346,11 @@ }; } { - name = "file_entry_cache___file_entry_cache_6.0.0.tgz"; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; path = fetchurl { - name = "file_entry_cache___file_entry_cache_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz"; - sha1 = "7921a89c391c6d93efec2169ac6bf300c527ea0a"; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027"; }; } { @@ -1458,11 +1370,19 @@ }; } { - name = "find_up___find_up_4.1.0.tgz"; + name = "find_up___find_up_5.0.0.tgz"; path = fetchurl { - name = "find_up___find_up_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; - sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + name = "find_up___find_up_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz"; + sha1 = "4c92819ecb7083561e4f4a240a86be5198f536fc"; + }; + } + { + name = "find_versions___find_versions_4.0.0.tgz"; + path = fetchurl { + name = "find_versions___find_versions_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz"; + sha1 = "3c57e573bf97769b8cb8df16934b627915da4965"; }; } { @@ -1474,27 +1394,27 @@ }; } { - name = "flatted___flatted_3.1.0.tgz"; + name = "flatted___flatted_3.1.1.tgz"; path = fetchurl { - name = "flatted___flatted_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz"; - sha1 = "a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"; + name = "flatted___flatted_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; + sha1 = "c4b489e80096d9df1dfc97c79871aea7c617c469"; }; } { - name = "forever_agent___forever_agent_0.6.1.tgz"; + name = "fn.name___fn.name_1.1.0.tgz"; path = fetchurl { - name = "forever_agent___forever_agent_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + name = "fn.name___fn.name_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz"; + sha1 = "26cad8017967aea8731bc42961d04a3d5988accc"; }; } { - name = "form_data___form_data_2.3.3.tgz"; + name = "follow_redirects___follow_redirects_1.14.0.tgz"; path = fetchurl { - name = "form_data___form_data_2.3.3.tgz"; - url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; - sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + name = "follow_redirects___follow_redirects_1.14.0.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz"; + sha1 = "f5d260f95c5f8c105894491feee5dc8993b402fe"; }; } { @@ -1530,11 +1450,19 @@ }; } { - name = "fs_extra___fs_extra_8.1.0.tgz"; + name = "fs_constants___fs_constants_1.0.0.tgz"; path = fetchurl { - name = "fs_extra___fs_extra_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; - sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; + name = "fs_constants___fs_constants_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; + sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; + }; + } + { + name = "fs_extra___fs_extra_9.1.0.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"; + sha1 = "5954460c764a8da2094ba3554bf839e6b9a7c86d"; }; } { @@ -1545,6 +1473,14 @@ sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; } + { + name = "function_bind___function_bind_1.1.1.tgz"; + path = fetchurl { + name = "function_bind___function_bind_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + }; + } { name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; path = fetchurl { @@ -1553,6 +1489,22 @@ sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; } + { + name = "gauge___gauge_2.7.4.tgz"; + path = fetchurl { + name = "gauge___gauge_2.7.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } { name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; path = fetchurl { @@ -1562,51 +1514,27 @@ }; } { - name = "get_stdin___get_stdin_7.0.0.tgz"; + name = "get_stream___get_stream_5.2.0.tgz"; path = fetchurl { - name = "get_stdin___get_stdin_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz"; - sha1 = "8d5de98f15171a125c5e516643c7a6d0ea8a96f6"; + name = "get_stream___get_stream_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; + sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; }; } { - name = "get_stream___get_stream_4.1.0.tgz"; + name = "github_from_package___github_from_package_0.0.0.tgz"; path = fetchurl { - name = "get_stream___get_stream_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; - sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; + name = "github_from_package___github_from_package_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz"; + sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce"; }; } { - name = "get_stream___get_stream_5.1.0.tgz"; + name = "glob_parent___glob_parent_5.1.2.tgz"; path = fetchurl { - name = "get_stream___get_stream_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz"; - sha1 = "01203cdc92597f9b909067c3e656cc1f4d3c4dc9"; - }; - } - { - name = "getpass___getpass_0.1.7.tgz"; - path = fetchurl { - name = "getpass___getpass_0.1.7.tgz"; - url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; - }; - } - { - name = "glob_parent___glob_parent_5.1.1.tgz"; - path = fetchurl { - name = "glob_parent___glob_parent_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; - sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; - }; - } - { - name = "glob_parent___glob_parent_5.1.0.tgz"; - path = fetchurl { - name = "glob_parent___glob_parent_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz"; - sha1 = "5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"; + name = "glob_parent___glob_parent_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; + sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; }; } { @@ -1625,6 +1553,14 @@ sha1 = "a18813576a41b00a24a97e7f815918c2e19925f8"; }; } + { + name = "globals___globals_13.8.0.tgz"; + path = fetchurl { + name = "globals___globals_13.8.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz"; + sha1 = "3e20f504810ce87a8d72e55aecf8435b50f4c1b3"; + }; + } { name = "globby___globby_10.0.2.tgz"; path = fetchurl { @@ -1634,11 +1570,11 @@ }; } { - name = "globby___globby_11.0.0.tgz"; + name = "globby___globby_11.0.3.tgz"; path = fetchurl { - name = "globby___globby_11.0.0.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-11.0.0.tgz"; - sha1 = "56fd0e9f0d4f8fb0c456f1ab0dee96e1380bc154"; + name = "globby___globby_11.0.3.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz"; + sha1 = "9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"; }; } { @@ -1650,35 +1586,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.3.tgz"; + name = "graceful_fs___graceful_fs_4.2.6.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha1 = "4a12ff1b60376ef09862c2093edd908328be8423"; - }; - } - { - name = "graceful_fs___graceful_fs_4.2.4.tgz"; - path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.4.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; - }; - } - { - name = "har_schema___har_schema_2.0.0.tgz"; - path = fetchurl { - name = "har_schema___har_schema_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; - }; - } - { - name = "har_validator___har_validator_5.1.3.tgz"; - path = fetchurl { - name = "har_validator___har_validator_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz"; - sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080"; + name = "graceful_fs___graceful_fs_4.2.6.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz"; + sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee"; }; } { @@ -1706,11 +1618,19 @@ }; } { - name = "hosted_git_info___hosted_git_info_2.8.5.tgz"; + name = "has_unicode___has_unicode_2.0.1.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.8.5.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz"; - sha1 = "759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"; + name = "has_unicode___has_unicode_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + } + { + name = "has___has_1.0.3.tgz"; + path = fetchurl { + name = "has___has_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; }; } { @@ -1730,27 +1650,19 @@ }; } { - name = "http_signature___http_signature_1.2.0.tgz"; + name = "https_proxy_agent___https_proxy_agent_4.0.0.tgz"; path = fetchurl { - name = "http_signature___http_signature_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + name = "https_proxy_agent___https_proxy_agent_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz"; + sha1 = "702b71fb5520a132a66de1f67541d9e62154d82b"; }; } { - name = "https_proxy_agent___https_proxy_agent_3.0.1.tgz"; + name = "husky___husky_4.3.8.tgz"; path = fetchurl { - name = "https_proxy_agent___https_proxy_agent_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz"; - sha1 = "b8c286433e87602311b01c8ea34413d856a4af81"; - }; - } - { - name = "husky___husky_3.1.0.tgz"; - path = fetchurl { - name = "husky___husky_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/husky/-/husky-3.1.0.tgz"; - sha1 = "5faad520ab860582ed94f0c1a77f0f04c90b57c0"; + name = "husky___husky_4.3.8.tgz"; + url = "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz"; + sha1 = "31144060be963fd6850e5cc8f019a1dfe194296d"; }; } { @@ -1761,6 +1673,14 @@ sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; }; } + { + name = "ieee754___ieee754_1.2.1.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; + sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; + }; + } { name = "ignore___ignore_4.0.6.tgz"; path = fetchurl { @@ -1770,11 +1690,11 @@ }; } { - name = "ignore___ignore_5.1.4.tgz"; + name = "ignore___ignore_5.1.8.tgz"; path = fetchurl { - name = "ignore___ignore_5.1.4.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz"; - sha1 = "84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"; + name = "ignore___ignore_5.1.8.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz"; + sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57"; }; } { @@ -1842,19 +1762,27 @@ }; } { - name = "into_stream___into_stream_5.1.1.tgz"; + name = "ini___ini_1.3.8.tgz"; path = fetchurl { - name = "into_stream___into_stream_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/into-stream/-/into-stream-5.1.1.tgz"; - sha1 = "f9a20a348a11f3c13face22763f2d02e127f4db8"; + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; }; } { - name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; + name = "into_stream___into_stream_6.0.0.tgz"; path = fetchurl { - name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; - sha1 = "37df74e430a0e47550fe54a2defe30d8acd95f65"; + name = "into_stream___into_stream_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/into-stream/-/into-stream-6.0.0.tgz"; + sha1 = "4bfc1244c0128224e18b8870e85b2de8e66c6702"; + }; + } + { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + path = fetchurl { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3"; }; } { @@ -1873,6 +1801,14 @@ sha1 = "4574a2ae56f7ab206896fb431eaeed066fdf8f03"; }; } + { + name = "is_core_module___is_core_module_2.3.0.tgz"; + path = fetchurl { + name = "is_core_module___is_core_module_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz"; + sha1 = "d341652e3408bca69c4671b79a0954a3d349f887"; + }; + } { name = "is_directory___is_directory_0.3.1.tgz"; path = fetchurl { @@ -1954,19 +1890,19 @@ }; } { - name = "is_path_inside___is_path_inside_3.0.2.tgz"; + name = "is_path_inside___is_path_inside_3.0.3.tgz"; path = fetchurl { - name = "is_path_inside___is_path_inside_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz"; - sha1 = "f5220fc82a3e233757291dddc9c5877f2a1f3017"; + name = "is_path_inside___is_path_inside_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; + sha1 = "d231362e53a07ff2b0e0ea7fed049161ffd16283"; }; } { - name = "is_promise___is_promise_2.1.0.tgz"; + name = "is_promise___is_promise_2.2.2.tgz"; path = fetchurl { - name = "is_promise___is_promise_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + name = "is_promise___is_promise_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz"; + sha1 = "39ab959ccbf9a774cf079f7b40c7a26f763135f1"; }; } { @@ -1993,14 +1929,6 @@ sha1 = "bde9c32680d6fae04129d6ac9d921ce7815f78e3"; }; } - { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - path = fetchurl { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; - }; - } { name = "isarray___isarray_1.0.0.tgz"; path = fetchurl { @@ -2017,14 +1945,6 @@ sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; } - { - name = "isstream___isstream_0.1.2.tgz"; - path = fetchurl { - name = "isstream___isstream_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - } { name = "js_tokens___js_tokens_4.0.0.tgz"; path = fetchurl { @@ -2041,14 +1961,6 @@ sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; }; } - { - name = "jsbn___jsbn_0.1.1.tgz"; - path = fetchurl { - name = "jsbn___jsbn_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; - }; - } { name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; path = fetchurl { @@ -2057,6 +1969,14 @@ sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; }; } + { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + path = fetchurl { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha1 = "7c47805a94319928e05777405dc12e1f7a4ee02d"; + }; + } { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; path = fetchurl { @@ -2073,14 +1993,6 @@ sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"; }; } - { - name = "json_schema___json_schema_0.2.3.tgz"; - path = fetchurl { - name = "json_schema___json_schema_0.2.3.tgz"; - url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; - }; - } { name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; path = fetchurl { @@ -2090,35 +2002,19 @@ }; } { - name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + name = "jsonfile___jsonfile_6.1.0.tgz"; path = fetchurl { - name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + name = "jsonfile___jsonfile_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; + sha1 = "bc55b2634793c679ec6403094eb13698a6ec0aae"; }; } { - name = "jsonfile___jsonfile_4.0.0.tgz"; + name = "kuler___kuler_2.0.0.tgz"; path = fetchurl { - name = "jsonfile___jsonfile_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; - }; - } - { - name = "jsprim___jsprim_1.4.1.tgz"; - path = fetchurl { - name = "jsprim___jsprim_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; - }; - } - { - name = "kuler___kuler_1.0.1.tgz"; - path = fetchurl { - name = "kuler___kuler_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/kuler/-/kuler-1.0.1.tgz"; - sha1 = "ef7c784f36c9fb6e16dd3150d152677b2b0228a6"; + name = "kuler___kuler_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz"; + sha1 = "e2c570a3800388fb44407e851531c1d670b061b3"; }; } { @@ -2186,11 +2082,11 @@ }; } { - name = "locate_path___locate_path_5.0.0.tgz"; + name = "locate_path___locate_path_6.0.0.tgz"; path = fetchurl { - name = "locate_path___locate_path_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; - sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + name = "locate_path___locate_path_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz"; + sha1 = "55321eb309febbc59c4801d931a72452a681d286"; }; } { @@ -2202,19 +2098,35 @@ }; } { - name = "lodash___lodash_4.17.20.tgz"; + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.20.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; - sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; } { - name = "lodash___lodash_4.17.19.tgz"; + name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.19.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz"; - sha1 = "e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"; + name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; + sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; + }; + } + { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + path = fetchurl { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + }; + } + { + name = "lodash___lodash_4.17.21.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; }; } { @@ -2242,11 +2154,11 @@ }; } { - name = "logform___logform_2.1.2.tgz"; + name = "logform___logform_2.2.0.tgz"; path = fetchurl { - name = "logform___logform_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/logform/-/logform-2.1.2.tgz"; - sha1 = "957155ebeb67a13164069825ce67ddb5bb2dd360"; + name = "logform___logform_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz"; + sha1 = "40f036d19161fc76b68ab50fdc7fe495544492f2"; }; } { @@ -2257,14 +2169,6 @@ sha1 = "9a7b71cfb7d361a194ea555241c92f7468d5bf28"; }; } - { - name = "lru_cache___lru_cache_4.1.5.tgz"; - path = fetchurl { - name = "lru_cache___lru_cache_4.1.5.tgz"; - url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz"; - sha1 = "8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"; - }; - } { name = "lru_cache___lru_cache_6.0.0.tgz"; path = fetchurl { @@ -2306,11 +2210,11 @@ }; } { - name = "merge2___merge2_1.3.0.tgz"; + name = "merge2___merge2_1.4.1.tgz"; path = fetchurl { - name = "merge2___merge2_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz"; - sha1 = "5b366ee83b2f1582c48f87e47cf1a9352103ca81"; + name = "merge2___merge2_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; + sha1 = "4368892f885e907455a6fd7dc55c0c9d404990ae"; }; } { @@ -2322,27 +2226,27 @@ }; } { - name = "micromatch___micromatch_4.0.2.tgz"; + name = "micromatch___micromatch_4.0.4.tgz"; path = fetchurl { - name = "micromatch___micromatch_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz"; - sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"; + name = "micromatch___micromatch_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; + sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9"; }; } { - name = "mime_db___mime_db_1.43.0.tgz"; + name = "mime_db___mime_db_1.47.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.43.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz"; - sha1 = "0a12e0502650e473d735535050e7c8f4eb4fae58"; + name = "mime_db___mime_db_1.47.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz"; + sha1 = "8cb313e59965d3c05cfbf898915a267af46a335c"; }; } { - name = "mime_types___mime_types_2.1.26.tgz"; + name = "mime_types___mime_types_2.1.30.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.26.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz"; - sha1 = "9c921fc09b7e149a65dfdc0da4d20997200b0a06"; + name = "mime_types___mime_types_2.1.30.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz"; + sha1 = "6e7be8b4c479825f85ed6326695db73f9305d62d"; }; } { @@ -2354,11 +2258,11 @@ }; } { - name = "mime___mime_2.4.4.tgz"; + name = "mime___mime_2.5.2.tgz"; path = fetchurl { - name = "mime___mime_2.4.4.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz"; - sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5"; + name = "mime___mime_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz"; + sha1 = "6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"; }; } { @@ -2377,6 +2281,14 @@ sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; }; } + { + name = "mimic_response___mimic_response_2.1.0.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz"; + sha1 = "d13763d35f613d09ec37ebb30bac0469c0ee8f43"; + }; + } { name = "minimatch___minimatch_3.0.4.tgz"; path = fetchurl { @@ -2385,14 +2297,6 @@ sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; }; } - { - name = "minimist___minimist_0.0.8.tgz"; - path = fetchurl { - name = "minimist___minimist_0.0.8.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - } { name = "minimist___minimist_1.2.5.tgz"; path = fetchurl { @@ -2402,27 +2306,19 @@ }; } { - name = "mkdirp___mkdirp_0.5.1.tgz"; + name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; path = fetchurl { - name = "mkdirp___mkdirp_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha1 = "fa10c9115cc6d8865be221ba47ee9bed78601113"; }; } { - name = "mkdirp___mkdirp_0.5.5.tgz"; + name = "morgan___morgan_1.10.0.tgz"; path = fetchurl { - name = "mkdirp___mkdirp_0.5.5.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; - }; - } - { - name = "morgan___morgan_1.9.1.tgz"; - path = fetchurl { - name = "morgan___morgan_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz"; - sha1 = "0a8d16734a1d9afbc824b99df87e738e58e2da59"; + name = "morgan___morgan_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz"; + sha1 = "091778abc1fc47cd3509824653dae1faab6b17d7"; }; } { @@ -2458,19 +2354,19 @@ }; } { - name = "multistream___multistream_2.1.1.tgz"; + name = "multistream___multistream_4.1.0.tgz"; path = fetchurl { - name = "multistream___multistream_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/multistream/-/multistream-2.1.1.tgz"; - sha1 = "629d3a29bd76623489980d04519a2c365948148c"; + name = "multistream___multistream_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/multistream/-/multistream-4.1.0.tgz"; + sha1 = "7bf00dfd119556fbc153cff3de4c6d477909f5a8"; }; } { - name = "mz___mz_2.7.0.tgz"; + name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; path = fetchurl { - name = "mz___mz_2.7.0.tgz"; - url = "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz"; - sha1 = "95008057a56cafadc2bc63dde7f9ff6955948e32"; + name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz"; + sha1 = "b1fddc0b2c46e380a0b7a76f984dd47c41a13806"; }; } { @@ -2490,11 +2386,11 @@ }; } { - name = "nice_try___nice_try_1.0.5.tgz"; + name = "node_abi___node_abi_2.26.0.tgz"; path = fetchurl { - name = "nice_try___nice_try_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; - sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; + name = "node_abi___node_abi_2.26.0.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-2.26.0.tgz"; + sha1 = "355d5d4bc603e856f74197adbf3f5117a396ba40"; }; } { @@ -2506,11 +2402,11 @@ }; } { - name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + name = "noop_logger___noop_logger_0.1.1.tgz"; path = fetchurl { - name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; - sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; + name = "noop_logger___noop_logger_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz"; + sha1 = "94a2b1633c4f1317553007d8966fd0e841b6a4c2"; }; } { @@ -2521,14 +2417,6 @@ sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; }; } - { - name = "npm_run_path___npm_run_path_2.0.2.tgz"; - path = fetchurl { - name = "npm_run_path___npm_run_path_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; - }; - } { name = "npm_run_path___npm_run_path_3.1.0.tgz"; path = fetchurl { @@ -2537,6 +2425,14 @@ sha1 = "7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5"; }; } + { + name = "npmlog___npmlog_4.1.2.tgz"; + path = fetchurl { + name = "npmlog___npmlog_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; + sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; + }; + } { name = "number_is_nan___number_is_nan_1.0.1.tgz"; path = fetchurl { @@ -2545,14 +2441,6 @@ sha1 = "097b602b53422a522c1afb8790318336941a011d"; }; } - { - name = "oauth_sign___oauth_sign_0.9.0.tgz"; - path = fetchurl { - name = "oauth_sign___oauth_sign_0.9.0.tgz"; - url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; - }; - } { name = "object_assign___object_assign_4.1.1.tgz"; path = fetchurl { @@ -2586,11 +2474,11 @@ }; } { - name = "one_time___one_time_0.0.4.tgz"; + name = "one_time___one_time_1.0.0.tgz"; path = fetchurl { - name = "one_time___one_time_0.0.4.tgz"; - url = "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz"; - sha1 = "f8cdf77884826fe4dff93e3a9cc37b1e4480742e"; + name = "one_time___one_time_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz"; + sha1 = "e06bc174aed214ed58edede573b433bbf827cb45"; }; } { @@ -2602,19 +2490,19 @@ }; } { - name = "onetime___onetime_5.1.0.tgz"; + name = "onetime___onetime_5.1.2.tgz"; path = fetchurl { - name = "onetime___onetime_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz"; - sha1 = "fff0f3c91617fe62bb50189636e99ac8a6df7be5"; + name = "onetime___onetime_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; + sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; }; } { - name = "opencollective_postinstall___opencollective_postinstall_2.0.2.tgz"; + name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; path = fetchurl { - name = "opencollective_postinstall___opencollective_postinstall_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz"; - sha1 = "5657f1bede69b6e33a45939b061eb53d3c6c3a89"; + name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz"; + sha1 = "7a0fff978f6dbfa4d006238fbac98ed4198c3259"; }; } { @@ -2633,22 +2521,6 @@ sha1 = "4f236a6373dae0566a6d43e1326674f50c291499"; }; } - { - name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; - path = fetchurl { - name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; - }; - } - { - name = "p_finally___p_finally_1.0.0.tgz"; - path = fetchurl { - name = "p_finally___p_finally_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; - }; - } { name = "p_finally___p_finally_2.0.1.tgz"; path = fetchurl { @@ -2666,19 +2538,19 @@ }; } { - name = "p_limit___p_limit_2.2.2.tgz"; + name = "p_limit___p_limit_3.1.0.tgz"; path = fetchurl { - name = "p_limit___p_limit_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz"; - sha1 = "61279b67721f5287aa1c13a9a7fbbc48c9291b1e"; + name = "p_limit___p_limit_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; + sha1 = "e1daccbe78d0d1388ca18c64fea38e3e57e3706b"; }; } { - name = "p_locate___p_locate_4.1.0.tgz"; + name = "p_locate___p_locate_5.0.0.tgz"; path = fetchurl { - name = "p_locate___p_locate_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; - sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + name = "p_locate___p_locate_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz"; + sha1 = "83c8315c6785005e3bd021839411c9e110e6d834"; }; } { @@ -2697,14 +2569,6 @@ sha1 = "d704d9af8a2ba684e2600d9a215983d4141a979d"; }; } - { - name = "p_try___p_try_2.2.0.tgz"; - path = fetchurl { - name = "p_try___p_try_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; - sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; - }; - } { name = "parent_module___parent_module_1.0.1.tgz"; path = fetchurl { @@ -2722,11 +2586,11 @@ }; } { - name = "parse_json___parse_json_5.0.0.tgz"; + name = "parse_json___parse_json_5.2.0.tgz"; path = fetchurl { - name = "parse_json___parse_json_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz"; - sha1 = "73e5114c986d143efa3712d4ea24db9a4266f60f"; + name = "parse_json___parse_json_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; + sha1 = "c76fc66dee54231c962b22bcc8a72cf2f99753cd"; }; } { @@ -2753,14 +2617,6 @@ sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; } - { - name = "path_key___path_key_2.0.1.tgz"; - path = fetchurl { - name = "path_key___path_key_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; - sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; - }; - } { name = "path_key___path_key_3.1.1.tgz"; path = fetchurl { @@ -2810,51 +2666,35 @@ }; } { - name = "performance_now___performance_now_2.1.0.tgz"; + name = "picomatch___picomatch_2.2.3.tgz"; path = fetchurl { - name = "performance_now___performance_now_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + name = "picomatch___picomatch_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz"; + sha1 = "465547f359ccc206d3c48e46a1bcb89bf7ee619d"; }; } { - name = "picomatch___picomatch_2.2.1.tgz"; + name = "pkg_dir___pkg_dir_5.0.0.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz"; - sha1 = "21bac888b6ed8601f831ce7816e335bc779f0a4a"; + name = "pkg_dir___pkg_dir_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz"; + sha1 = "a02d6aebe6ba133a928f74aec20bafdfe6b8e760"; }; } { - name = "picomatch___picomatch_2.2.2.tgz"; + name = "pkg_fetch___pkg_fetch_3.0.4.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; - sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; + name = "pkg_fetch___pkg_fetch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.0.4.tgz"; + sha1 = "8321eff936bf4eb088a333cf23494be0ded173b7"; }; } { - name = "pkg_dir___pkg_dir_4.2.0.tgz"; + name = "pkg___pkg_5.1.0.tgz"; path = fetchurl { - name = "pkg_dir___pkg_dir_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; - sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; - }; - } - { - name = "pkg_fetch___pkg_fetch_2.6.8.tgz"; - path = fetchurl { - name = "pkg_fetch___pkg_fetch_2.6.8.tgz"; - url = "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-2.6.8.tgz"; - sha1 = "458ba6b9c936de1b0f3f9c830f389888561e630f"; - }; - } - { - name = "pkg___pkg_4.4.8.tgz"; - path = fetchurl { - name = "pkg___pkg_4.4.8.tgz"; - url = "https://registry.yarnpkg.com/pkg/-/pkg-4.4.8.tgz"; - sha1 = "145fb81f31eebfb90d2010dd2c4b663ca0db4009"; + name = "pkg___pkg_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/pkg/-/pkg-5.1.0.tgz"; + sha1 = "25f92666a4164bbc5495c862de9370ed48788667"; }; } { @@ -2865,6 +2705,14 @@ sha1 = "aeddd3f994c933e4ad98b99d9a556efa0e2fe942"; }; } + { + name = "prebuild_install___prebuild_install_6.0.1.tgz"; + path = fetchurl { + name = "prebuild_install___prebuild_install_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.0.1.tgz"; + sha1 = "5902172f7a40eb67305b96c2a695db32636ee26d"; + }; + } { name = "prelude_ls___prelude_ls_1.2.1.tgz"; path = fetchurl { @@ -2914,27 +2762,27 @@ }; } { - name = "protobufjs___protobufjs_6.8.8.tgz"; + name = "protobufjs___protobufjs_6.11.2.tgz"; path = fetchurl { - name = "protobufjs___protobufjs_6.8.8.tgz"; - url = "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.8.8.tgz"; - sha1 = "c8b4f1282fd7a90e6f5b109ed11c84af82908e7c"; + name = "protobufjs___protobufjs_6.11.2.tgz"; + url = "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz"; + sha1 = "de39fabd4ed32beaa08e9bb1e30d08544c1edf8b"; }; } { - name = "proxy_addr___proxy_addr_2.0.5.tgz"; + name = "proxy_addr___proxy_addr_2.0.6.tgz"; path = fetchurl { - name = "proxy_addr___proxy_addr_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz"; - sha1 = "34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"; + name = "proxy_addr___proxy_addr_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz"; + sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf"; }; } { - name = "proxy_from_env___proxy_from_env_1.0.0.tgz"; + name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; path = fetchurl { - name = "proxy_from_env___proxy_from_env_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz"; - sha1 = "33c50398f70ea7eb96d21f7b817630a55791c7ee"; + name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; + sha1 = "e102f16ca355424865755d2c9e8ea4f24d58c3e2"; }; } { @@ -2945,22 +2793,6 @@ sha1 = "5e7425b89508736cdd4f2224d028f7bb3f722ebd"; }; } - { - name = "pseudomap___pseudomap_1.0.2.tgz"; - path = fetchurl { - name = "pseudomap___pseudomap_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz"; - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; - }; - } - { - name = "psl___psl_1.7.0.tgz"; - path = fetchurl { - name = "psl___psl_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz"; - sha1 = "f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"; - }; - } { name = "pump___pump_3.0.0.tgz"; path = fetchurl { @@ -2978,19 +2810,19 @@ }; } { - name = "puppeteer_cluster___puppeteer_cluster_0.18.0.tgz"; + name = "puppeteer_cluster___puppeteer_cluster_0.22.0.tgz"; path = fetchurl { - name = "puppeteer_cluster___puppeteer_cluster_0.18.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer-cluster/-/puppeteer-cluster-0.18.0.tgz"; - sha1 = "189ef1cea474590aa4d42c9a665dc319689e8fad"; + name = "puppeteer_cluster___puppeteer_cluster_0.22.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer-cluster/-/puppeteer-cluster-0.22.0.tgz"; + sha1 = "4ab214671f414f15ad6a94a4b61ed0b4172e86e6"; }; } { - name = "puppeteer___puppeteer_2.0.0.tgz"; + name = "puppeteer___puppeteer_3.3.0.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-2.0.0.tgz"; - sha1 = "0612992e29ec418e0a62c8bebe61af1a64d7ec01"; + name = "puppeteer___puppeteer_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.3.0.tgz"; + sha1 = "95839af9fdc0aa4de7e5ee073a4c0adeb9e2d3d7"; }; } { @@ -3002,11 +2834,11 @@ }; } { - name = "qs___qs_6.5.2.tgz"; + name = "queue_microtask___queue_microtask_1.2.3.tgz"; path = fetchurl { - name = "qs___qs_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; - sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha1 = "4929228bbc724dfac43e0efb058caf7b6cfb6243"; }; } { @@ -3026,11 +2858,11 @@ }; } { - name = "read_pkg___read_pkg_5.2.0.tgz"; + name = "rc___rc_1.2.8.tgz"; path = fetchurl { - name = "read_pkg___read_pkg_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz"; - sha1 = "7bf295438ca5a33e56cd30e053b34ee7250c93cc"; + name = "rc___rc_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; + sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; }; } { @@ -3042,19 +2874,11 @@ }; } { - name = "readable_stream___readable_stream_3.5.0.tgz"; + name = "readable_stream___readable_stream_3.6.0.tgz"; path = fetchurl { - name = "readable_stream___readable_stream_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.5.0.tgz"; - sha1 = "465d70e6d1087f6162d079cd0b5db7fbebfd1606"; - }; - } - { - name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; - path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; - sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; }; } { @@ -3066,19 +2890,11 @@ }; } { - name = "request_progress___request_progress_3.0.0.tgz"; + name = "require_directory___require_directory_2.1.1.tgz"; path = fetchurl { - name = "request_progress___request_progress_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz"; - sha1 = "4ca754081c7fec63f505e4faa825aa06cd669dbe"; - }; - } - { - name = "request___request_2.88.2.tgz"; - path = fetchurl { - name = "request___request_2.88.2.tgz"; - url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; - sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; } { @@ -3106,19 +2922,11 @@ }; } { - name = "resolve___resolve_1.14.2.tgz"; + name = "resolve___resolve_1.20.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.14.2.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.14.2.tgz"; - sha1 = "dbf31d0fa98b1f29aa5169783b9c290cb865fea2"; - }; - } - { - name = "resolve___resolve_1.17.0.tgz"; - path = fetchurl { - name = "resolve___resolve_1.17.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz"; - sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; + name = "resolve___resolve_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; + sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; }; } { @@ -3137,22 +2945,6 @@ sha1 = "90da382b1e126efc02146e90845a88db12925d76"; }; } - { - name = "rimraf___rimraf_2.7.1.tgz"; - path = fetchurl { - name = "rimraf___rimraf_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; - sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; - }; - } - { - name = "rimraf___rimraf_3.0.0.tgz"; - path = fetchurl { - name = "rimraf___rimraf_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz"; - sha1 = "614176d4b3010b75e5c390eb0ee96f6dc0cebb9b"; - }; - } { name = "rimraf___rimraf_3.0.2.tgz"; path = fetchurl { @@ -3162,27 +2954,19 @@ }; } { - name = "run_node___run_node_1.0.0.tgz"; + name = "run_parallel___run_parallel_1.2.0.tgz"; path = fetchurl { - name = "run_node___run_node_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz"; - sha1 = "46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"; + name = "run_parallel___run_parallel_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz"; + sha1 = "66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"; }; } { - name = "run_parallel___run_parallel_1.1.9.tgz"; + name = "rxjs___rxjs_6.6.7.tgz"; path = fetchurl { - name = "run_parallel___run_parallel_1.1.9.tgz"; - url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz"; - sha1 = "c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"; - }; - } - { - name = "rxjs___rxjs_6.5.4.tgz"; - path = fetchurl { - name = "rxjs___rxjs_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz"; - sha1 = "e0777fe0d184cec7872df147f303572d414e211c"; + name = "rxjs___rxjs_6.6.7.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz"; + sha1 = "90ac018acabf491bf65044235d5863c4dab804c9"; }; } { @@ -3194,11 +2978,11 @@ }; } { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; + name = "safe_buffer___safe_buffer_5.2.1.tgz"; path = fetchurl { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519"; + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; }; } { @@ -3217,6 +3001,14 @@ sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; }; } + { + name = "semver_regex___semver_regex_3.1.2.tgz"; + path = fetchurl { + name = "semver_regex___semver_regex_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.2.tgz"; + sha1 = "34b4c0d361eef262e07199dbef316d0f2ab11807"; + }; + } { name = "semver___semver_5.7.1.tgz"; path = fetchurl { @@ -3226,19 +3018,11 @@ }; } { - name = "semver___semver_6.3.0.tgz"; + name = "semver___semver_7.3.5.tgz"; path = fetchurl { - name = "semver___semver_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; - sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; - }; - } - { - name = "semver___semver_7.3.4.tgz"; - path = fetchurl { - name = "semver___semver_7.3.4.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz"; - sha1 = "27aaa7d2e4ca76452f98d3add093a72c943edc97"; + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; }; } { @@ -3257,6 +3041,14 @@ sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9"; }; } + { + name = "set_blocking___set_blocking_2.0.0.tgz"; + path = fetchurl { + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + } { name = "setprototypeof___setprototypeof_1.1.1.tgz"; path = fetchurl { @@ -3265,14 +3057,6 @@ sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; }; } - { - name = "shebang_command___shebang_command_1.2.0.tgz"; - path = fetchurl { - name = "shebang_command___shebang_command_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; - }; - } { name = "shebang_command___shebang_command_2.0.0.tgz"; path = fetchurl { @@ -3281,14 +3065,6 @@ sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; }; } - { - name = "shebang_regex___shebang_regex_1.0.0.tgz"; - path = fetchurl { - name = "shebang_regex___shebang_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; - }; - } { name = "shebang_regex___shebang_regex_3.0.0.tgz"; path = fetchurl { @@ -3298,11 +3074,27 @@ }; } { - name = "signal_exit___signal_exit_3.0.2.tgz"; + name = "signal_exit___signal_exit_3.0.3.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; + }; + } + { + name = "simple_concat___simple_concat_1.0.1.tgz"; + path = fetchurl { + name = "simple_concat___simple_concat_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz"; + sha1 = "f46976082ba35c2263f1c8ab5edfe26c41c9552f"; + }; + } + { + name = "simple_get___simple_get_3.1.0.tgz"; + path = fetchurl { + name = "simple_get___simple_get_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz"; + sha1 = "b45be062435e50d159540b576202ceec40b9c6b3"; }; } { @@ -3345,38 +3137,6 @@ sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; }; } - { - name = "spdx_correct___spdx_correct_3.1.0.tgz"; - path = fetchurl { - name = "spdx_correct___spdx_correct_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz"; - sha1 = "fb83e504445268f154b074e218c87c003cd31df4"; - }; - } - { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; - path = fetchurl { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha1 = "2ea450aee74f2a89bfb94519c07fcd6f41322977"; - }; - } - { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; - path = fetchurl { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; - sha1 = "99e119b7a5da00e05491c9fa338b7904823b41d0"; - }; - } - { - name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; - path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha1 = "3694b5804567a458d3c8045842a6358632f62654"; - }; - } { name = "split___split_0.3.3.tgz"; path = fetchurl { @@ -3393,14 +3153,6 @@ sha1 = "04e6926f662895354f3dd015203633b857297e2c"; }; } - { - name = "sshpk___sshpk_1.16.1.tgz"; - path = fetchurl { - name = "sshpk___sshpk_1.16.1.tgz"; - url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; - sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; - }; - } { name = "stack_trace___stack_trace_0.0.10.tgz"; path = fetchurl { @@ -3466,11 +3218,11 @@ }; } { - name = "string_width___string_width_4.2.0.tgz"; + name = "string_width___string_width_4.2.2.tgz"; path = fetchurl { - name = "string_width___string_width_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; - sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; + name = "string_width___string_width_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; + sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; }; } { @@ -3521,14 +3273,6 @@ sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; }; } - { - name = "strip_eof___strip_eof_1.0.0.tgz"; - path = fetchurl { - name = "strip_eof___strip_eof_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; - }; - } { name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; path = fetchurl { @@ -3545,6 +3289,14 @@ sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; }; } + { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + } { name = "supports_color___supports_color_2.0.0.tgz"; path = fetchurl { @@ -3578,11 +3330,27 @@ }; } { - name = "table___table_6.0.7.tgz"; + name = "table___table_6.6.0.tgz"; path = fetchurl { - name = "table___table_6.0.7.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz"; - sha1 = "e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"; + name = "table___table_6.6.0.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz"; + sha1 = "905654b79df98d9e9a973de1dd58682532c40e8e"; + }; + } + { + name = "tar_fs___tar_fs_2.1.1.tgz"; + path = fetchurl { + name = "tar_fs___tar_fs_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz"; + sha1 = "489a15ab85f1f0befabb370b7de4f9eb5cbe8784"; + }; + } + { + name = "tar_stream___tar_stream_2.2.0.tgz"; + path = fetchurl { + name = "tar_stream___tar_stream_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz"; + sha1 = "acad84c284136b060dc3faa64474aa9aebd77287"; }; } { @@ -3609,30 +3377,6 @@ sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; }; } - { - name = "thenify_all___thenify_all_1.6.0.tgz"; - path = fetchurl { - name = "thenify_all___thenify_all_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz"; - sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; - }; - } - { - name = "thenify___thenify_3.3.0.tgz"; - path = fetchurl { - name = "thenify___thenify_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz"; - sha1 = "e69e38a1babe969b0108207978b9f62b88604839"; - }; - } - { - name = "throttleit___throttleit_1.0.0.tgz"; - path = fetchurl { - name = "throttleit___throttleit_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz"; - sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; - }; - } { name = "through___through_2.3.8.tgz"; path = fetchurl { @@ -3641,6 +3385,14 @@ sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; }; } + { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + path = fetchurl { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + } { name = "to_regex_range___to_regex_range_5.0.1.tgz"; path = fetchurl { @@ -3657,14 +3409,6 @@ sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; }; } - { - name = "tough_cookie___tough_cookie_2.5.0.tgz"; - path = fetchurl { - name = "tough_cookie___tough_cookie_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; - }; - } { name = "triple_beam___triple_beam_1.3.0.tgz"; path = fetchurl { @@ -3674,19 +3418,27 @@ }; } { - name = "tsc_watch___tsc_watch_4.2.3.tgz"; + name = "tsc_watch___tsc_watch_4.2.9.tgz"; path = fetchurl { - name = "tsc_watch___tsc_watch_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.2.3.tgz"; - sha1 = "630aaf1ed8bbfb6fbcbddb9bef96054bed217c4b"; + name = "tsc_watch___tsc_watch_4.2.9.tgz"; + url = "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.2.9.tgz"; + sha1 = "d93fc74233ca4ef7ee6b12d08c0fe6aca3e19044"; }; } { - name = "tslib___tslib_1.10.0.tgz"; + name = "tslib___tslib_2.1.0.tgz"; path = fetchurl { - name = "tslib___tslib_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz"; - sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a"; + name = "tslib___tslib_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz"; + sha1 = "da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"; + }; + } + { + name = "tslib___tslib_1.14.1.tgz"; + path = fetchurl { + name = "tslib___tslib_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; + sha1 = "cf2d38bdc34a134bcaf1091c41f6619e2f672d00"; }; } { @@ -3697,14 +3449,6 @@ sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; } - { - name = "tweetnacl___tweetnacl_0.14.5.tgz"; - path = fetchurl { - name = "tweetnacl___tweetnacl_0.14.5.tgz"; - url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; - }; - } { name = "type_check___type_check_0.4.0.tgz"; path = fetchurl { @@ -3722,11 +3466,11 @@ }; } { - name = "type_fest___type_fest_0.6.0.tgz"; + name = "type_fest___type_fest_0.20.2.tgz"; path = fetchurl { - name = "type_fest___type_fest_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz"; - sha1 = "8d2a2370d3df886eb5c90ada1c5bf6188acf838b"; + name = "type_fest___type_fest_0.20.2.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; + sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; }; } { @@ -3746,27 +3490,19 @@ }; } { - name = "typedarray___typedarray_0.0.6.tgz"; + name = "typescript___typescript_3.9.9.tgz"; path = fetchurl { - name = "typedarray___typedarray_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + name = "typescript___typescript_3.9.9.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.9.tgz"; + sha1 = "e69905c54bc0681d0518bd4d587cc6f2d0b1a674"; }; } { - name = "typescript___typescript_3.8.3.tgz"; + name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; path = fetchurl { - name = "typescript___typescript_3.8.3.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz"; - sha1 = "409eb8544ea0335711205869ec458ab109ee1061"; - }; - } - { - name = "uid2___uid2_0.0.3.tgz"; - path = fetchurl { - name = "uid2___uid2_0.0.3.tgz"; - url = "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz"; - sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; + name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz"; + sha1 = "b0da04c4371311df771cdc215e87f2130991ace7"; }; } { @@ -3786,19 +3522,11 @@ }; } { - name = "unique_temp_dir___unique_temp_dir_1.0.0.tgz"; + name = "universalify___universalify_2.0.0.tgz"; path = fetchurl { - name = "unique_temp_dir___unique_temp_dir_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/unique-temp-dir/-/unique-temp-dir-1.0.0.tgz"; - sha1 = "6dce95b2681ca003eebfb304a415f9cbabcc5385"; - }; - } - { - name = "universalify___universalify_0.1.2.tgz"; - path = fetchurl { - name = "universalify___universalify_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; - sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + name = "universalify___universalify_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; + sha1 = "75a4984efedc4b08975c5aeb73f530d02df25717"; }; } { @@ -3818,11 +3546,11 @@ }; } { - name = "url_value_parser___url_value_parser_2.0.1.tgz"; + name = "url_value_parser___url_value_parser_2.0.3.tgz"; path = fetchurl { - name = "url_value_parser___url_value_parser_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.0.1.tgz"; - sha1 = "c8179a095ab9ec1f5aa17ca36af5af396b4e95ed"; + name = "url_value_parser___url_value_parser_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.0.3.tgz"; + sha1 = "cd4b8d6754e458d65e8125260c09718d926e6e21"; }; } { @@ -3842,27 +3570,11 @@ }; } { - name = "uuid___uuid_3.4.0.tgz"; + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; path = fetchurl { - name = "uuid___uuid_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; - sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; - }; - } - { - name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; - path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; - sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"; - }; - } - { - name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; - path = fetchurl { - name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; - sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha1 = "2de19618c66dc247dcfb6f99338035d8245a2cee"; }; } { @@ -3874,19 +3586,11 @@ }; } { - name = "verror___verror_1.10.0.tgz"; + name = "which_pm_runs___which_pm_runs_1.0.0.tgz"; path = fetchurl { - name = "verror___verror_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; - }; - } - { - name = "which___which_1.3.1.tgz"; - path = fetchurl { - name = "which___which_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; - sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + name = "which_pm_runs___which_pm_runs_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz"; + sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb"; }; } { @@ -3898,19 +3602,27 @@ }; } { - name = "winston_transport___winston_transport_4.3.0.tgz"; + name = "wide_align___wide_align_1.1.3.tgz"; path = fetchurl { - name = "winston_transport___winston_transport_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.3.0.tgz"; - sha1 = "df68c0c202482c448d9b47313c07304c2d7c2c66"; + name = "wide_align___wide_align_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; + sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; }; } { - name = "winston___winston_3.2.1.tgz"; + name = "winston_transport___winston_transport_4.4.0.tgz"; path = fetchurl { - name = "winston___winston_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/winston/-/winston-3.2.1.tgz"; - sha1 = "63061377976c73584028be2490a1846055f77f07"; + name = "winston_transport___winston_transport_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz"; + sha1 = "17af518daa690d5b2ecccaa7acf7b20ca7925e59"; + }; + } + { + name = "winston___winston_3.3.3.tgz"; + path = fetchurl { + name = "winston___winston_3.3.3.tgz"; + url = "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz"; + sha1 = "ae6172042cafb29786afa3d09c8ff833ab7c9170"; }; } { @@ -3929,6 +3641,14 @@ sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; }; } + { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + }; + } { name = "wrappy___wrappy_1.0.2.tgz"; path = fetchurl { @@ -3938,19 +3658,19 @@ }; } { - name = "ws___ws_6.2.1.tgz"; + name = "ws___ws_7.4.5.tgz"; path = fetchurl { - name = "ws___ws_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz"; - sha1 = "442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"; + name = "ws___ws_7.4.5.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz"; + sha1 = "a484dd851e9beb6fdb420027e3885e8ce48986c1"; }; } { - name = "yallist___yallist_2.1.2.tgz"; + name = "y18n___y18n_5.0.8.tgz"; path = fetchurl { - name = "yallist___yallist_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz"; - sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + name = "y18n___y18n_5.0.8.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; + sha1 = "7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"; }; } { @@ -3962,11 +3682,43 @@ }; } { - name = "yauzl___yauzl_2.4.1.tgz"; + name = "yaml___yaml_1.10.2.tgz"; path = fetchurl { - name = "yauzl___yauzl_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz"; - sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; + name = "yaml___yaml_1.10.2.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz"; + sha1 = "2301c5ffbf12b467de8da2333a459e29e7920e4b"; + }; + } + { + name = "yargs_parser___yargs_parser_20.2.7.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.7.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz"; + sha1 = "61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"; + }; + } + { + name = "yargs___yargs_16.2.0.tgz"; + path = fetchurl { + name = "yargs___yargs_16.2.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz"; + sha1 = "1c82bf0f6b6a66eafce7ef30e376f49a12477f66"; + }; + } + { + name = "yauzl___yauzl_2.10.0.tgz"; + path = fetchurl { + name = "yauzl___yauzl_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + }; + } + { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + path = fetchurl { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha1 = "0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"; }; } ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 364d2e4435..4c3246754f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.5.2"; + version = "7.5.6"; excludedPackages = [ "release_publisher" ]; @@ -10,17 +10,24 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-8Qy5YgJZpvaAjeBAi092Jxg4yAD1fYmMteTRm5b0Q+g="; + sha256 = "1683as90p4zkzhaj52vy60bcmpr77zynys87mjzh3s6ks3xfxn2x"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-yVswMNOLX/AFtv45TXm8WcHEytyYgtjvi7V0dRewDdc="; + sha256 = "1mywvm4d116y56rffiywk1hx6wxj1418gf7q0v0hfdlwk1lqi9nz"; }; - vendorSha256 = "sha256-oh3GB6Iaqy05IS2MU5LJqTXnlr0vtkACZA6wpmW7W2Q="; + vendorSha256 = "01a5v292x59fmayjkqnf4c8k8viasxr2s2khs4yrv6p829lx3hq2"; + # grafana-aws-sdk is specified with two versions which causes a problem later: + # go: inconsistent vendoring in /build/source: + # github.com/grafana/grafana-aws-sdk@v0.3.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + # Remove the older one here to fix this. postPatch = '' + substituteInPlace go.mod \ + --replace 'github.com/grafana/grafana-aws-sdk v0.3.0' "" + substituteInPlace pkg/cmd/grafana-server/main.go \ --replace 'var version = "5.0.0"' 'var version = "${version}"' ''; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/default.nix new file mode 100644 index 0000000000..e3ea1a8025 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/default.nix @@ -0,0 +1,101 @@ +{ stdenv, lib, fetchFromGitHub, cmake, flex, bison, systemd +, boost, openssl, patchelf, mariadb-connector-c, postgresql, zlib +# Databases +, withMysql ? true, withPostgresql ? false +# Features +, withChecker ? true, withCompat ? false, withLivestatus ? false +, withNotification ? true, withPerfdata ? true, withIcingadb ? true +, nameSuffix ? "" }: + +stdenv.mkDerivation rec { + pname = "icinga2${nameSuffix}"; + version = "2.12.3"; + + src = fetchFromGitHub { + owner = "icinga"; + repo = "icinga2"; + rev = "v${version}"; + sha256 = "0pq6ixv7d9bqys8qjxqq0jki3zncj8jdfavkp7qw125iyfjq48xk"; + }; + + patches = [ + ./etc-icinga2.patch # Makes /etc/icinga2 relative to / instead of the store path + ./no-systemd-service.patch # Prevent systemd service from being written to /usr + ./no-var-directories.patch # Prevent /var directories from being created + ]; + + cmakeFlags = let + mkFeatureFlag = label: value: "-DICINGA2_WITH_${label}=${if value then "ON" else "OFF"}"; + in [ + # Paths + "-DCMAKE_INSTALL_SYSCONFDIR=etc" + "-DCMAKE_INSTALL_LOCALSTATEDIR=/var" + "-DCMAKE_INSTALL_FULL_SBINDIR=bin" + "-DICINGA2_RUNDIR=/run" + "-DMYSQL_INCLUDE_DIR=${mariadb-connector-c.dev}/include/mariadb" + "-DMYSQL_LIB=${mariadb-connector-c.out}/lib/mariadb/libmysqlclient.a" + "-DICINGA2_PLUGINDIR=bin" + "-DICINGA2_UNITY_BUILD=no" + # Features + (mkFeatureFlag "MYSQL" withMysql) + (mkFeatureFlag "PGSQL" withPostgresql) + (mkFeatureFlag "CHECKER" withChecker) + (mkFeatureFlag "COMPAT" withCompat) + (mkFeatureFlag "LIVESTATUS" withLivestatus) + (mkFeatureFlag "NOTIFICATION" withNotification) + (mkFeatureFlag "PERFDATA" withPerfdata) + (mkFeatureFlag "ICINGADB" withIcingadb) + # Misc. + "-DICINGA2_USER=icinga2" + "-DICINGA2_GROUP=icinga2" + "-DICINGA2_GIT_VERSION_INFO=OFF" + "-DICINGA2_WITH_TESTS=OFF" + "-DUSE_SYSTEMD=ON" + ]; + + buildInputs = [ boost openssl systemd ] + ++ lib.optional withPostgresql postgresql; + + nativeBuildInputs = [ cmake flex bison patchelf ]; + + postFixup = '' + rm -r $out/etc/logrotate.d $out/etc/sysconfig $out/lib/icinga2/prepare-dirs + + # Fix hardcoded paths + sed -i 's:/usr/bin/::g' $out/etc/icinga2/scripts/* + + # Cleanup sbin + sed -i 's/sbin/bin/g' $out/lib/icinga2/safe-reload + rm $out/sbin + + ${lib.optionalString withMysql '' + # Add dependencies of the MySQL shim to the shared library + patchelf --add-needed ${zlib.out}/lib/libz.so $(readlink -f $out/lib/icinga2/libmysql_shim.so) + + # Make Icinga find the MySQL shim + icinga2Bin=$out/lib/icinga2/sbin/icinga2 + patchelf --set-rpath $out/lib/icinga2:$(patchelf --print-rpath $icinga2Bin) $icinga2Bin + ''} + ''; + + vim = stdenv.mkDerivation { + pname = "vim-icinga2"; + inherit version src; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/vim-plugins + cp -r tools/syntax/vim $out/share/vim-plugins/icinga2 + ''; + }; + + meta = { + description = "Open source monitoring system"; + homepage = "https://www.icinga.com"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ das_j ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/etc-icinga2.patch b/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/etc-icinga2.patch new file mode 100644 index 0000000000..a08f7ba979 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/etc-icinga2.patch @@ -0,0 +1,13 @@ +diff --git a/config.h.cmake b/config.h.cmake +index 16fa190..152bf43 100644 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -13,7 +13,7 @@ + + #cmakedefine ICINGA2_UNITY_BUILD + +-#define ICINGA_CONFIGDIR "${ICINGA2_FULL_CONFIGDIR}" ++#define ICINGA_CONFIGDIR "/etc/icinga2" + #define ICINGA_DATADIR "${ICINGA2_FULL_DATADIR}" + #define ICINGA_LOGDIR "${ICINGA2_FULL_LOGDIR}" + #define ICINGA_CACHEDIR "${ICINGA2_FULL_CACHEDIR}" diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/no-systemd-service.patch b/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/no-systemd-service.patch new file mode 100644 index 0000000000..a032a90647 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/no-systemd-service.patch @@ -0,0 +1,15 @@ +diff --git a/etc/initsystem/CMakeLists.txt b/etc/initsystem/CMakeLists.txt +index e702c83..c23cabb 100644 +--- a/etc/initsystem/CMakeLists.txt ++++ b/etc/initsystem/CMakeLists.txt +@@ -50,10 +50,5 @@ if(NOT WIN32) + + if (USE_SYSTEMD OR INSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT) + configure_file(icinga2.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/initsystem/icinga2.service @ONLY) +- install( +- FILES ${CMAKE_CURRENT_BINARY_DIR}/initsystem/icinga2.service +- DESTINATION ${DESTDIR}/usr/lib/systemd/system +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- ) + endif() + endif() diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/no-var-directories.patch b/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/no-var-directories.patch new file mode 100644 index 0000000000..3a1d480558 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/no-var-directories.patch @@ -0,0 +1,66 @@ +diff --git a/icinga-app/CMakeLists.txt b/icinga-app/CMakeLists.txt +index 87993df..819c87b 100644 +--- a/icinga-app/CMakeLists.txt ++++ b/icinga-app/CMakeLists.txt +@@ -106,7 +106,3 @@ install( + TARGETS icinga-app + RUNTIME DESTINATION ${InstallPath} + ) +- +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}\")") +diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt +index 5dda179..22cf69f 100644 +--- a/lib/base/CMakeLists.txt ++++ b/lib/base/CMakeLists.txt +@@ -125,7 +125,4 @@ set_target_properties ( + FOLDER Lib + ) + +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_CACHEDIR}\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/crash\")") +- + set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE) +diff --git a/lib/perfdata/CMakeLists.txt b/lib/perfdata/CMakeLists.txt +index ab963f7..3d9d506 100644 +--- a/lib/perfdata/CMakeLists.txt ++++ b/lib/perfdata/CMakeLists.txt +@@ -74,7 +74,4 @@ install_if_not_exists( + ${ICINGA2_CONFIGDIR}/features-available + ) + +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_SPOOLDIR}/perfdata\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_SPOOLDIR}/tmp\")") +- + set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE) +diff --git a/lib/remote/CMakeLists.txt b/lib/remote/CMakeLists.txt +index 65113d2..5e4398f 100644 +--- a/lib/remote/CMakeLists.txt ++++ b/lib/remote/CMakeLists.txt +@@ -55,12 +55,3 @@ set_target_properties ( + remote PROPERTIES + FOLDER Lib + ) +- +-#install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/log\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones-stage\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certs\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certificate-requests\")") +- +- +diff --git a/lib/compat/CMakeLists.txt b/lib/compat/CMakeLists.txt +index 1438626..d882ae2 100644 +--- a/lib/compat/CMakeLists.txt ++++ b/lib/compat/CMakeLists.txt +@@ -55,8 +55,4 @@ install_if_not_exists( + ${ICINGA2_CONFIGDIR}/features-available + ) + +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/compat/archives\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_SPOOLDIR}\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}/cmd\")") +- + set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE) diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index 3aa1e18a9f..5e7d386d7e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "artifactory_exporter"; - version = "1.9.0"; + version = "1.9.1"; rev = "v${version}"; src = fetchFromGitHub { owner = "peimanja"; repo = pname; rev = rev; - sha256 = "1zmkajg48i40jm624p2h03bwg7w28682yfcgk42ig3d50p8xwqc3"; + sha256 = "1m68isplrs3zvkg0mans9bgablsif6264x3w475bpnhf68r87v1q"; }; - vendorSha256 = "1594bpfwhbjgayf4aacs7rfjxm4cnqz8iak8kpm1xzsm1cx1il17"; + vendorSha256 = "0acwgb0h89parkx75jp057m2hrqyd95vr2zcfqnxbnyy98gxip73"; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix index af58a6ebe9..e93db30255 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "aws-s3-exporter"; - version = "0.3.0"; + version = "0.4.1"; goPackagePath = "github.com/ribbybibby/s3_exporter"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ribbybibby"; repo = "s3_exporter"; rev = "v${version}"; - sha256 = "062qi4rfqkxwknncwcvx4g132bxhkn2bhbxi4l90wl93v6sdp9l2"; + sha256 = "01g4k5wrbc2ggxkn4yqd2v0amw8yl5dbcfwi4jm3kqkihrf0rbiq"; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix index 5cfdf61583..74b7c2112f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -1,19 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "bind_exporter"; - version = "20161221-${lib.strings.substring 0 7 rev}"; - rev = "4e1717c7cd5f31c47d0c37274464cbaabdd462ba"; - - goPackagePath = "github.com/digitalocean/bind_exporter"; + version = "0.4.0"; src = fetchFromGitHub { - inherit rev; - owner = "digitalocean"; + rev = "v${version}"; + owner = "prometheus-community"; repo = "bind_exporter"; - sha256 = "1nd6pc1z627w4x55vd42zfhlqxxjmfsa9lyn0g6qq19k4l85v1qm"; + sha256 = "152xi6kf1wzb7663ixv27hsdbf1x6s51fdp85zhghg1y700ln63v"; }; + vendorSha256 = "172aqrckkhlyhpkanrcs66m13p5qp4fd2w8xv02j2kqq13klwm1a"; + passthru.tests = { inherit (nixosTests.prometheus-exporters) bind; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/bird-exporter.nix index 3cb04304e2..67ec88332b 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/bird-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/bird-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bird-exporter"; - version = "1.3.5-git"; + version = "1.2.5"; src = fetchFromGitHub { owner = "czerwonk"; repo = "bird_exporter"; - rev = "019fc09804625658d452a8e043cc16559c3b5b84"; - sha256 = "1iym46368k8zzy4djx511m926dg8x5mg3xi91f65sknqv26zfggb"; + rev = version; + sha256 = "06rlmmvr79db3lh54938yxi0ixcfb8fni0vgcv3nafqnlr2zbs58"; }; - vendorSha256 = null; + vendorSha256 = "14bjdfqvxvb9gs1nm0nnlib52vd0dbvjll22x7d2cc721cbd0hj0"; passthru.tests = { inherit (nixosTests.prometheus-exporters) bird; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 88ef3f0260..da235ff96f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -1,19 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "blackbox_exporter"; - version = "0.18.0"; - rev = version; - - goPackagePath = "github.com/prometheus/blackbox_exporter"; + version = "0.19.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "1h4s0ww1drh14slrj9m7mx224qx9c6hyjav8sj959r75902i9491"; + sha256 = "1lrabbp6nsd9h3hs3y5a37yl4g8zzkv0m3vhz2vrir3wmfn07n4g"; }; + vendorSha256 = "1wi9dmbxb6i1qglnp1v0lkqpp7l29lrbsg4lvx052nkcwkgq8g1y"; + # dns-lookup is performed for the tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index b3b61567d4..d089a3877c 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -2,16 +2,16 @@ buildGoPackage rec { pname = "collectd-exporter"; - version = "0.3.1"; + version = "0.5.0"; rev = version; goPackagePath = "github.com/prometheus/collectd_exporter"; - src= fetchFromGitHub { - inherit rev; + src = fetchFromGitHub { + rev = "v${version}"; owner = "prometheus"; repo = "collectd_exporter"; - sha256 = "1p0kb7c8g0r0sp5a6xrx8vnwbw14hhwlqzk4n2xx2y8pvnbivajz"; + sha256 = "0vb6vnd2j87iqxdl86j30dk65vrv4scprv200xb83203aprngqgh"; }; passthru.tests = { inherit (nixosTests.prometheus-exporters) collectd; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix index 2852fb2afc..b87817af43 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix @@ -1,17 +1,19 @@ -{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests +{ stdenv, lib, go, buildGoModule, fetchFromGitHub, mkYarnPackage, nixosTests , fetchpatch }: let - version = "2.23.0"; + version = "2.27.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "sha256-UQ1r8271EiZDU/h2zta6toMRfk2GjXol8GexYL9n+BE="; + sha256 = "0836ygyvld5skjycd7366i6vyf451s6cay5ng6c2fwq0skvp2gj2"; }; + goPackagePath = "github.com/prometheus/prometheus"; + webui = mkYarnPackage { src = "${src}/web/ui/react-app"; packageJSON = ./webui-package.json; @@ -25,19 +27,13 @@ let installPhase = "mv build $out"; distPhase = "true"; }; -in buildGoPackage rec { +in buildGoModule rec { pname = "prometheus"; inherit src version; - goPackagePath = "github.com/prometheus/prometheus"; + vendorSha256 = "0dq3p7hga7m1aq78har5rr136hlb0kp8zhh2wzqlkxrk1f33w54p"; - patches = [ - # Fix https://github.com/prometheus/prometheus/issues/8144 - (fetchpatch { - url = "https://github.com/prometheus/prometheus/commit/8b64b70fe4a5aa2877c95aa12c6798b12d3ff7ec.patch"; - sha256 = "sha256-RuXT5pBXv8z6WoE59KNGh+OXr1KGLGWs/n0Hjf4BuH8="; - }) - ]; + excludedPackages = [ "documentation/prometheus-mixin" ]; postPatch = '' ln -s ${webui.node_modules} web/ui/react-app/node_modules @@ -59,8 +55,10 @@ in buildGoPackage rec { '' ]; + # only run this in the real build, not during the vendor build + # this should probably be fixed in buildGoModule preBuild = '' - make -C go/src/${goPackagePath} assets + if [ -d vendor ]; then make assets; fi ''; preInstall = '' diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/domain-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/domain-exporter.nix index a0bc409a7f..78c35d8cf1 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/domain-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/domain-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "domain-exporter"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "caarlos0"; repo = "domain_exporter"; rev = "v${version}"; - sha256 = "0pvz5vx9jvxdrkmzqzh7dfi09sb55j6zpx5728m5v38p8cl8vyh6"; + sha256 = "018y0xwdn2f2shhwaa0hqm4y8xsbqwif0733qb0377wpjbj4v137"; }; - vendorSha256 = "02m2mnx93xq6cl54waazgxq6vqbswfn9aafz0h694n6rskvdn784"; + vendorSha256 = "0s1hs8byba9y57abg386n09wfg1wcqpzs164ap0km8ap2i96bdlb"; doCheck = false; # needs internet connection diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index 18055f9b06..38976521c0 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -1,20 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gitlab-ci-pipelines-exporter"; - version = "0.2.5"; - - goPackagePath = "github.com/mvisonneau/gitlab-ci-pipelines-exporter"; - - goDeps = ./gitlab-ci-pipelines-exporter_deps.nix; + version = "0.4.9"; src = fetchFromGitHub { owner = "mvisonneau"; repo = pname; - rev = version; - sha256 = "0qmy6pqfhx9bphgh1zqi68kp0nscwy1x7z13lfiaaz8pgsjh95yy"; + rev = "v${version}"; + sha256 = "13zs8140n4z56i0xkl6jvvmwy80l07dxyb23wxzd5avbdm8knypz"; }; + vendorSha256 = "1k620r3d1swhj7cfmqjh5n08da2a6w87fwrsajl0y324iyw2chsa"; + doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix deleted file mode 100644 index d439c9aab1..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix +++ /dev/null @@ -1,390 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "v0.34.0"; - sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.0"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.4.0"; - sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.2"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.3.0"; - sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "v1.0.0"; - sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; - }; - } - { - goPackagePath = "github.com/heptiolabs/healthcheck"; - fetch = { - type = "git"; - url = "https://github.com/heptiolabs/healthcheck"; - rev = "6ff867650f40"; - sha256 = "17aqrqhx2ibv6mcxsmli6m3hmvwi06cnpaly05daimay3cys5q0l"; - }; - } - { - goPackagePath = "github.com/jpillora/backoff"; - fetch = { - type = "git"; - url = "https://github.com/jpillora/backoff"; - rev = "3050d21c67d7"; - sha256 = "1nxapdx9xg5gwiscfhq7m0w14hj4gaxb4avmgf1mx9zd3jnw9jxv"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.6"; - sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.2"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "v1.0.1"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v1.0.0"; - sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fd36f4220a90"; - sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.6.0"; - sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "v0.0.3"; - sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.4.2"; - sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "github.com/xanzy/go-gitlab"; - fetch = { - type = "git"; - url = "https://github.com/xanzy/go-gitlab"; - rev = "v0.19.0"; - sha256 = "0xbn94rb9ihpw1g698xbz9vdl7393z9zbb0lck52nxs838gkr4mb"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "f99c8df09eb5"; - sha256 = "0jwi6c6366999mnpzwx3a2kr7hzvdx97qfwiphx0r7cy0mpf28hf"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "ca1201d0de80"; - sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "0f29369cfe45"; - sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "fc99dfbffb4e"; - sha256 = "186x8bg926qb9sprs5zpd97xzvvhc2si7q1nhvyg12r5cd6v7zjd"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "d0a3d012864b"; - sha256 = "1s2jbb94hbcb01hgkd9kzb9js13grj80a72il7467pm57b3rnggg"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.6.1"; - sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index 6a42297d50..6af1dbffbc 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -2,16 +2,15 @@ buildGoPackage rec { pname = "haproxy_exporter"; - version = "0.8.0"; - rev = "v${version}"; + version = "0.12.0"; goPackagePath = "github.com/prometheus/haproxy_exporter"; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "prometheus"; repo = "haproxy_exporter"; - sha256 = "0gx8pq67w71ch3g3c77xaz39msrd9graizc6d3shwabdjx35yc6q"; + sha256 = "09aqm2zqimn6w10p1nhnpjcigm299b31xfrq8ma0d7z4v9p2y9dn"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix index e6505857bf..2c08374ec7 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: let - version = "0.10"; + version = "0.15.0"; jarName = "jmx_prometheus_httpserver-${version}-jar-with-dependencies.jar"; mavenUrl = "mirror://maven/io/prometheus/jmx/jmx_prometheus_httpserver/${version}/${jarName}"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ in stdenv.mkDerivation { src = fetchurl { url = mavenUrl; - sha256 = "1pvqphrirq48xhmx0aa6vkxz6qy1cx2q6jxsh7rin432iap7j62f"; + sha256 = "0fr3svn8kjp7bq1wzbkvv5awylwn8b01bngj04zvk7fpzqpgs7mz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter.nix index 796eb065e6..268cdff934 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prometheus-json-exporter"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "json_exporter"; rev = "v${version}"; - sha256 = "1aabvd75a2223x5wnbyryigj7grw6l05jhr3g3s97b1f1hfigz6d"; + sha256 = "0nhww7pbyqpiikcli1ysqa15d4y76h3jaij1j0sj8i3mhv1nsjz9"; }; - vendorSha256 = "03kb0gklq08krl7qnvs7267siw1pkyy346b42dsk1d9gr5302wsw"; + vendorSha256 = "1fiy6x06mqxbv9c4rxfl4q7hvblbzhknkpcp0alz61f3fk5wxsgp"; passthru.tests = { inherit (nixosTests.prometheus-exporters) json; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/kea-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/kea-exporter.nix new file mode 100644 index 0000000000..1f5ff7c022 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/kea-exporter.nix @@ -0,0 +1,33 @@ +{ lib, python3Packages, nixosTests }: + +python3Packages.buildPythonApplication rec { + pname = "kea-exporter"; + version = "0.4.2"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0dpzicv0ksyda2lprldkj452c23qycl5c9avca6x7f7rbqry9pnd"; + }; + + propagatedBuildInputs = with python3Packages; [ + click + prometheus_client + ]; + + checkPhase = '' + $out/bin/kea-exporter --help > /dev/null + $out/bin/kea-exporter --version | grep -q ${version} + ''; + + passthru.tests = { + inherit (nixosTests.prometheus-exporters) kea; + }; + + meta = with lib; { + description = "Export Kea Metrics in the Prometheus Exposition Format"; + homepage = "https://github.com/mweinelt/kea-exporter"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index 0fa2bced12..289b8f2403 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -2,20 +2,17 @@ buildGoPackage rec { pname = "mesos_exporter"; - version = "0.1.0"; - rev = version; + version = "1.1.2"; goPackagePath = "github.com/prometheus/mesos_exporter"; src = fetchFromGitHub { - inherit rev; - owner = "prometheus"; + rev = "v${version}"; + owner = "mesos"; repo = "mesos_exporter"; - sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; + sha256 = "0nvjlpxdhh60wcdw2fdc8h0vn6fxkz0nh7zrx43hjxymvc15ixza"; }; - goDeps = ./mesos-exporter_deps.nix; - meta = with lib; { description = "Export Mesos metrics to Prometheus"; homepage = "https://github.com/prometheus/mesos_exporter"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix deleted file mode 100644 index e8fdcc95da..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; - sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; - sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; - sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "fca8c8854093a154ff1eb580aae10276ad6b1b5f"; - sha256 = "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"; - }; - } - { - goPackagePath = "bitbucket.org/ww/goautoneg"; - fetch = { - type = "hg"; - url = "bitbucket.org/ww/goautoneg"; - rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } - { - goPackagePath = "github.com/antonlindstrom/mesos_stats"; - fetch = { - type = "git"; - url = "https://github.com/antonlindstrom/mesos_stats"; - rev = "0c6ea494c19bedc67ebb85ce3d187ec21050e920"; - sha256 = "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index ee5bafbc7c..6520625619 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "nginx_exporter"; - version = "0.8.0"; + version = "0.9.0"; goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter"; @@ -14,7 +14,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "nginxinc"; repo = "nginx-prometheus-exporter"; - sha256 = "sha256-fFzwJXTwtI0NXZYwORRZomj/wADqxW+wvDH49QK0IZw="; + sha256 = "04y5vpj2kv2ygdzxy3crpnx4mhpkm1ns2995kxgvjlhnyck7a5rf"; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix index fad49d2757..359349c14f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nginxlog_exporter"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "martin-helmich"; repo = "prometheus-nginxlog-exporter"; rev = "v${version}"; - sha256 = "1kqyjw5yqgjb8xa5irdhpqvwp1qhba6igpc23n2qljhbh0aybkbq"; + sha256 = "0kcwhaf9k7c1xsz78064qz5zb4x3xgi1ifi49qkwiaqrzx2xy26p"; }; - vendorSha256 = "130hq19y890amxhjywg5blassl8br2p9d62aai8fj839p3p2a7zp"; + vendorSha256 = "05hisrhlklbs26cgblzfjh6mhaih5asvbll54jngnmwylwjd1mmc"; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix index 42ccb91017..ea351db83f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,23 +1,27 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "node_exporter"; - version = "1.0.1"; + version = "1.1.2"; rev = "v${version}"; - goPackagePath = "github.com/prometheus/node_exporter"; - src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "1r0xx81r9v019fl0iv078yl21ndhb356y7s7zx171zi02k7a4p2l"; + sha256 = "1kz52zhsm0xx63vczzplj15hli4i22qfxl08grb7m50bqk651j1n"; }; + vendorSha256 = "05lr2ln87902bwamw4l3rrk2j9sdgv1pcvxyvzbga64rymi9dmjb"; + # FIXME: tests fail due to read-only nix store doCheck = false; - buildFlagsArray = '' + excludedPackages = [ "docs/node-mixin" ]; + + buildFlagsArray = let + goPackagePath = "github.com/prometheus/node_exporter"; + in '' -ldflags= -X ${goPackagePath}/vendor/github.com/prometheus/common/version.Version=${version} -X ${goPackagePath}/vendor/github.com/prometheus/common/version.Revision=${rev} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix deleted file mode 100644 index 93aae1b867..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix +++ /dev/null @@ -1,66 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "748d386b5c1ea99658fd69fe9f03991ce86a90c1"; - sha256 = "0xm0is6sj6r634vrfx85ir0gd9h1xxk25fgc5z07zrjp19f5wqp5"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "94ff84a9a6ebb5e6eb9172897c221a64df3443bc"; - sha256 = "188xwc13ml51i29fhp8bz4a7ncmk0lvdw3nnwr56k2l36pp1swil"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "6f3806018612930941127f2a7c6c453ba2c527d2"; - sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "3e6a7635bac6573d43f49f97b47eb9bda195dba8"; - sha256 = "1q4nwm9lf4jd90z08s6gz8j1zzrk2jn9vpw49xdb8mwxmhv13xgm"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2"; - sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index 021905ba9e..42a8187214 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -1,20 +1,17 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "openvpn_exporter-unstable"; - version = "2017-05-15"; - rev = "a2a179a222144fa9a10030367045f075375a2803"; - - goPackagePath = "github.com/kumina/openvpn_exporter"; + version = "0.3.0"; src = fetchFromGitHub { owner = "kumina"; repo = "openvpn_exporter"; - inherit rev; - sha256 = "1cjx7ascf532a20wwzrsx3qqs6dr04jyf700s3jvlvhhhx43l8m4"; + rev = "v${version}"; + sha256 = "14m4n5918zimdnyf0yg2948jb1hp1bdf27k07j07x3yrx357i05l"; }; - goDeps = ./openvpn-exporter-deps.nix; + vendorSha256 = "1jgw0nnibydhcd83kp6jqkf41mhwldp8wdhqk0yjw18v9m0p7g5s"; meta = with lib; { inherit (src.meta) homepage; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix index a147a3c290..048a3ff264 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix @@ -1,18 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "process-exporter"; - version = "0.7.1"; - - goPackagePath = "github.com/ncabatoff/process-exporter"; + version = "0.7.5"; src = fetchFromGitHub { owner = "ncabatoff"; repo = pname; rev = "v${version}"; - sha256 = "0jkh4xzjlrlabpll3igpyhqs35f1dxifjkbfxvijjcq9yahxfj0x"; + sha256 = "0v1q8mi8p01smzfxaf52kbqnjz9fx4rp64jqhgbcx0s45q3bph9l"; }; + vendorSha256 = "19y2w1vplf7qqkzcpi01ssawv9badhwpglh2gz69fgl6xc3mxfmp"; + postPatch = '' substituteInPlace proc/read_test.go --replace /bin/cat cat ''; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix index a370bf1f24..c029431937 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -1,20 +1,17 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "prom2json"; - version = "0.1.0"; - rev = version; - - goPackagePath = "github.com/prometheus/prom2json"; + version = "1.3.0"; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "prometheus"; repo = "prom2json"; - sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl"; + sha256 = "09glf7br1a9k6j2hs94l2k4mlmlckdz5c9v6qg618c2nd4rk1mz6"; }; - goDeps = ./prom2json_deps.nix; + vendorSha256 = null; meta = with lib; { description = "Tool to scrape a Prometheus client and dump the result as JSON"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json_deps.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json_deps.nix deleted file mode 100644 index 20cabe3d38..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json_deps.nix +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; - sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index b7832395f6..ff89469c2e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -1,19 +1,17 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "rabbitmq_exporter"; - version = "1.0.0-RC7.1"; - - goPackagePath = "github.com/kbudde/rabbitmq_exporter"; + version = "1.0.0-RC8"; src = fetchFromGitHub { owner = "kbudde"; repo = "rabbitmq_exporter"; rev = "v${version}"; - sha256 = "5Agg99yHBMgpWGD6Nk+WvAorRc7j2PGD+3z7nO3N/5s="; + sha256 = "162rjp1j56kcq0vdi0ch09ka101zslxp684x6jvw0jq0aix4zj3r"; }; - goDeps = ./rabbitmq-exporter_deps.nix; + vendorSha256 = "1cvdqf5pdwczhqz6xb6w86h7gdr0l8fc3lav88xq26r4x75cm6v0"; meta = with lib; { description = "Prometheus exporter for RabbitMQ"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix deleted file mode 100644 index 901edfaf6d..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix +++ /dev/null @@ -1,793 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/nix-community/vgo2nix) -[ - { - goPackagePath = "bazil.org/fuse"; - fetch = { - type = "git"; - url = "https://github.com/bazil/fuse"; - rev = "371fbbdaa898"; - sha256 = "1x5p301py7mcxgwklfm6pqqkzssln0nfzllng49pnk60m03ilp4w"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/Azure/go-ansiterm"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-ansiterm"; - rev = "d6e3b3328b78"; - sha256 = "010khrkhkf9cxlvvb6ncqv4c1qcdmpbz9jn38g4fxf4xsma8xx1q"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/Microsoft/go-winio"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/go-winio"; - rev = "v0.4.14"; - sha256 = "0n34wi9l9ks2z3cz97j30ljfmqppwf1zxr16hwbnswyrk54fcxm3"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/Nvveen/Gotty"; - fetch = { - type = "git"; - url = "https://github.com/Nvveen/Gotty"; - rev = "cd527374f1e5"; - sha256 = "1ylvr1p6p036ns3g3wdz8f92f69symshkc8j54fa6gpg4hyk0k6q"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "fb15b899a751"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "c3de453c63f4"; - sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.1"; - sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "v2.2.1"; - sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff/v3"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "v3.2.2"; - sha256 = "01h52k1sl6drabm3fgd4yy1iwbz06wcbbh16zd6v4wi7slabma9m"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/cespare/xxhash/v2"; - fetch = { - type = "git"; - url = "https://github.com/cespare/xxhash"; - rev = "v2.1.1"; - sha256 = "0rl5rs8546zj1vzggv38w93wx0b5dvav7yy5hzxa8kw7iikv1cgr"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/containerd/continuity"; - fetch = { - type = "git"; - url = "https://github.com/containerd/continuity"; - rev = "d3ef23f19fbb"; - sha256 = "0k5838j54ymqpg0dffr8k4vh992my9zlqrplx4syms09r9z9vap9"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "v0.4.0"; - sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "v0.4.0"; - sha256 = "0k8gja8ql4pqg5rzmqvka42vjfs6rzablak87whcnqba6qxpimvz"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "bb3d318650d4"; - sha256 = "1lqd8ix3cb164j5iazjby2jpa6bdsflhy0h9mi4yldvvcvrc194c"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "v1.0.0"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.9.0"; - sha256 = "09038mnw705h7isbjp8dzgp2i04bp5rqkmifxvwc5xkh75s00qpw"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.4.0"; - sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.4.0"; - sha256 = "1fjvl5n77abxz5qsd4mgyvjq19x43c5bfvmq62mq3m5plx6zksc8"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.4.0"; - sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "v1.0.0"; - sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/gotestyourself/gotestyourself"; - fetch = { - type = "git"; - url = "https://github.com/gotestyourself/gotestyourself"; - rev = "v2.2.0"; - sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "v1.0.0"; - sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.9"; - sha256 = "0pkn2maymgl9v6vmq9q1si8xr5bbl88n6981y0lx09px6qxb29qx"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/kbudde/gobert"; - fetch = { - type = "git"; - url = "https://github.com/kbudde/gobert"; - rev = "77f4c9cb2e7e"; - sha256 = "1d2m4b0pxswqhkjpbql3kbb9fjvyys4b9cpmhb9iwkcmnq3n8x91"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.2"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/kylelemons/godebug"; - fetch = { - type = "git"; - url = "https://github.com/kylelemons/godebug"; - rev = "v1.1.0"; - sha256 = "0dkk3friykg8p6wgqryx6745ahhb9z1j740k7px9dac6v5xjp78c"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "v1.0.0"; - sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "v1.0.1"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "v1.10.1"; - sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "v1.7.0"; - sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/opencontainers/go-digest"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/go-digest"; - rev = "v1.0.0-rc1"; - sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/opencontainers/image-spec"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/image-spec"; - rev = "v1.0.1"; - sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/opencontainers/runc"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/runc"; - rev = "v1.0.0-rc9"; - sha256 = "1ss5b46cbbckyqlwgj8dbd5l59c5y0kp679hcpc0ybaj53pmwxj7"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/ory/dockertest"; - fetch = { - type = "git"; - url = "https://github.com/ory/dockertest"; - rev = "v3.3.5"; - sha256 = "0fgj60l82sl6chd7i4s7lxqjr9hxkzmkaxnc8h6qbvn42246sy68"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/ory/dockertest/v3"; - fetch = { - type = "git"; - url = "https://github.com/ory/dockertest"; - rev = "v3.6.0"; - sha256 = "1l4czdb532rl1qjjh1ad00h1686dz9h9bg1kmmpyjfm4ggckndyw"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.9.1"; - sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v1.5.1"; - sha256 = "0nkhjpwpqr3iz2jsqrl37qkj1g4i8jvi5smgbvhxcpyinjj00067"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "v0.2.0"; - sha256 = "0jffnz94d6ff39fr96b5w8i8yk26pwnrfggzz8jhi8k0yihg2c9d"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.9.1"; - sha256 = "12pyywb02p7d30ccm41mwn69qsgqnsgv1w9jlqrrln2f1svnbqch"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "v0.0.11"; - sha256 = "1msc8bfywsmrgr2ryqjdqwkxiz1ll08r3qgvaka2507z1wpcpj2c"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.5.0"; - sha256 = "02s74gxzlzr982avw7vbfjkj696hyhklx1ikmmjiqp3z1l8hkghk"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "2da4a54c5cee"; - sha256 = "18qbrp774fx6dyibjcy9snld705gslq6z2sql1biyjahxkm1vpfy"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.3"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/streadway/amqp"; - fetch = { - type = "git"; - url = "https://github.com/streadway/amqp"; - rev = "1c71cc93ed71"; - sha256 = "0k740vmzkdv9il201x4mj0md73w30jqlmn1q7m1ng3dmi635qrlr"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.4.0"; - sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/tkanos/gonfig"; - fetch = { - type = "git"; - url = "https://github.com/tkanos/gonfig"; - rev = "896f3d81fadf"; - sha256 = "1wcyq3vlfp12zsnnv1gpycqgzvq3nk8pvcabni6wxxyk3350d43m"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d3edc9973b7e"; - sha256 = "12zbjwcsh9b0lwycqlkrnbyg5a6a9dzgj8hhgq399bdda5bd97y7"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "cd5d95a43a6e"; - sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "1957bb5e6d1f"; - sha256 = "0imqk4l9785rw7ddvywyf8zn7k3ga6f17ky8rmf8wrri7nknr03f"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "a101b041ded4"; - sha256 = "1pm50dybm5wixjjspvfpafjmiy81b1zp08h13gxc5cylrfgncrfl"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - moduleDir = ""; - }; - } - { - goPackagePath = "google.golang.org/protobuf"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/protobuf"; - rev = "v1.21.0"; - sha256 = "12bwln8z1lf9105gdp6ip0rx741i4yfz1520gxnp8861lh9wcl63"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/airbrake/gobrake.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/airbrake/gobrake.v2"; - rev = "v2.0.9"; - sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "41f04d3bba15"; - sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2"; - rev = "v2.1.2"; - sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/ory-am/dockertest.v3"; - fetch = { - type = "git"; - url = "https://gopkg.in/ory-am/dockertest.v3"; - rev = "v3.3.5"; - sha256 = "0fgj60l82sl6chd7i4s7lxqjr9hxkzmkaxnc8h6qbvn42246sy68"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v1"; - rev = "dd632973f1e7"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.8"; - sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; - moduleDir = ""; - }; - } - { - goPackagePath = "gotest.tools"; - fetch = { - type = "git"; - url = "https://github.com/gotestyourself/gotest.tools"; - rev = "v2.2.0"; - sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; - moduleDir = ""; - }; - } - { - goPackagePath = "gotest.tools/v3"; - fetch = { - type = "git"; - url = "https://github.com/gotestyourself/gotest.tools"; - rev = "v3.0.2"; - sha256 = "0cap2aq2wphnbkkzkck5zdjxb64q3jqxfwpkgqys7279rbr8cvjm"; - moduleDir = ""; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 34c058d5d6..a2636d9f71 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -1,19 +1,17 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "redis_exporter"; - version = "1.7.0"; - - goPackagePath = "github.com/oliver006/redis_exporter"; + version = "1.23.1"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "0rwaxpylividyxz0snfgck32kvpgjkhg20bmdnlp35cdzxcxi8m1"; + sha256 = "0hlzxmc3jnmbym7by89bb73nlr0gw1xj8d88x10zx55kry7p0jfn"; }; - goDeps = ./redis-exporter-deps.nix; + vendorSha256 = "11237959ikd7l5glkhfz0g55mbld2hq985b5crwb9bnimaly5lga"; buildFlagsArray = '' -ldflags= @@ -22,6 +20,9 @@ buildGoPackage rec { -X main.BuildDate=unknown ''; + # needs a redis server + doCheck = false; + passthru.tests = { inherit (nixosTests.prometheus-exporters) redis; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index d21ddcf564..b998e1d24c 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -1,8 +1,8 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: let - baseVersion = "0.3.1"; - commit = "9ba85274dcc21bf8132cbe3b3dccfcb4aab57d9f"; + baseVersion = "0.4.2"; + commit = "722200c4adbd6d1e5d847dfbbd9dec07aa4ca38d"; in buildGoModule rec { pname = "smokeping_prober"; @@ -24,9 +24,9 @@ buildGoModule rec { rev = commit; owner = "SuperQ"; repo = "smokeping_prober"; - sha256 = "sha256:19596di2gzcvlcwiypsncq4zwbyb6d1r6wxsfi59wax3423i7ndg"; + sha256 = "1lpcjip6qxhalldgm6i2kgbajfqy3vwfyv9jy0jdpii13lv6mzlz"; }; - vendorSha256 = "sha256:1b2v3v3kn0m7dvjxbs8q0gw6zingksdqhm5g1frx0mymqk0lg889"; + vendorSha256 = "0p2jmlxpvpaqc445j39b4z4i3mnjrm25khv3sq6ylldcgfd31vz8"; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index ece22e496d..effb2ab907 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,18 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub, net-snmp, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, net-snmp, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "snmp_exporter"; - version = "0.19.0"; - - goPackagePath = "github.com/prometheus/snmp_exporter"; + version = "0.20.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "snmp_exporter"; rev = "v${version}"; - sha256 = "1ppi5lmc2lryawpw1b3kpg3qxr7v62zbiwg2v1d8sq1y5b2xdza6"; + sha256 = "0qwbnx3l25460qbah4ik9mlcyrm31rwm51451gh0jprii80cf16x"; }; + vendorSha256 = "1rivil3hwk269ikrwc4i22k2y5c9zs5ac058y7llz8ivrrjr2w4h"; + buildInputs = [ net-snmp ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index 31bd583280..51fb56382d 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -1,19 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "statsd_exporter"; - version = "0.9.0"; - rev = version; - - goPackagePath = "github.com/prometheus/statsd_exporter"; + version = "0.20.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "statsd_exporter"; - sha256 = "0bgi00005j41p650rb6n1iz2w9m4p22d1w91f2hwlh5bqxf55al3"; + sha256 = "1k98dmjn2mfwg36khpbxg7yk6rn4sk4v264i4rmqs4v8gss2h3kn"; }; + vendorSha256 = "1fihbchl5g5z9xrca68kaq26l674chcby634k8iz5h31dai8hpyh"; + meta = with lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; homepage = "https://github.com/prometheus/statsd_exporter"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/unbound-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/unbound-exporter.nix index 6b26379bf2..1c1997e43e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/unbound-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/unbound-exporter.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, nixosTests }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, nixosTests, Security }: rustPlatform.buildRustPackage rec { pname = "unbound-telemetry"; @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] + ++ lib.optional stdenv.isDarwin Security; passthru.tests = { inherit (nixosTests.prometheus-exporters) unbound; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index c94be3490f..27eb3721c9 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prometheus_varnish_exporter"; - version = "unstable-2020-03-26"; + version = "1.6"; src = fetchFromGitHub { owner = "jonnenauha"; repo = "prometheus_varnish_exporter"; - rev = "f0f90fc69723de8b716cda16cb419e8a025130ff"; - sha256 = "1viiiyvhpr7cnf8ykaaq4fzgg9xvn4hnlhv7cagy3jkjlmz60947"; + rev = version; + sha256 = "1cp7c1w237r271m8b1y8pj5jy7j2iadp4vbislxfyp4kga9i4dcc"; }; - vendorSha256 = "1h9iz3sbz02hb8827hcssqlfg2ag3ymq38siffw9wzajslzhp9sx"; + vendorSha256 = "1cslg29l9mmyhpdz14ca9m18iaz4hhznplz8fmi3wa3l8r7ih751"; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json index 3c4c3eb856..d46aeaa5dc 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json @@ -3,27 +3,30 @@ "version": "0.1.0", "private": true, "dependencies": { + "@codemirror/autocomplete": "^0.18.3", + "@codemirror/closebrackets": "^0.18.0", + "@codemirror/commands": "^0.18.0", + "@codemirror/comment": "^0.18.0", + "@codemirror/highlight": "^0.18.3", + "@codemirror/history": "^0.18.0", + "@codemirror/language": "^0.18.0", + "@codemirror/lint": "^0.18.1", + "@codemirror/matchbrackets": "^0.18.0", + "@codemirror/search": "^0.18.2", + "@codemirror/state": "^0.18.2", + "@codemirror/view": "^0.18.3", + "@forevolve/bootstrap-dark": "^1.0.0", "@fortawesome/fontawesome-svg-core": "^1.2.14", "@fortawesome/free-solid-svg-icons": "^5.7.1", "@fortawesome/react-fontawesome": "^0.1.4", "@reach/router": "^1.2.1", - "@testing-library/react-hooks": "^3.1.1", - "@types/jest": "^26.0.10", - "@types/jquery": "^3.5.1", - "@types/node": "^12.11.1", - "@types/reach__router": "^1.2.6", - "@types/react": "^16.8.2", - "@types/react-copy-to-clipboard": "^4.3.0", - "@types/react-dom": "^16.8.0", - "@types/react-resize-detector": "^4.2.0", - "@types/sanitize-html": "^1.20.2", - "bootstrap": "^4.2.1", + "bootstrap": "^4.6.0", + "codemirror-promql": "^0.15.0", "css.escape": "^1.5.1", "downshift": "^3.4.8", "enzyme-to-json": "^3.4.3", "fuzzy": "^0.1.3", "i": "^0.3.6", - "jest-fetch-mock": "^3.0.3", "jquery": "^3.5.1", "jquery.flot.tooltip": "^0.9.0", "jsdom": "^16.4.0", @@ -34,13 +37,15 @@ "react-copy-to-clipboard": "^5.0.1", "react-dom": "^16.7.0", "react-resize-detector": "^5.0.7", - "react-scripts": "3.4.3", + "react-scripts": "3.4.4", "react-test-renderer": "^16.9.0", - "reactstrap": "^8.0.1", - "sanitize-html": "^1.20.1", + "reactstrap": "^8.9.0", + "sanitize-html": "^2.3.3", + "sass": "1.32.10", "tempusdominus-bootstrap-4": "^5.1.2", "tempusdominus-core": "^5.0.3", - "typescript": "^3.3.3" + "typescript": "^3.3.3", + "use-media": "^1.4.0" }, "scripts": { "start": "react-scripts start", @@ -63,11 +68,21 @@ "not op_mini all" ], "devDependencies": { + "@testing-library/react-hooks": "^3.1.1", "@types/enzyme": "^3.10.3", "@types/enzyme-adapter-react-16": "^1.0.5", "@types/flot": "0.0.31", + "@types/jest": "^26.0.10", + "@types/jquery": "^3.5.1", "@types/moment-timezone": "^0.5.10", - "@types/reactstrap": "^8.0.5", + "@types/node": "^12.11.1", + "@types/reach__router": "^1.2.6", + "@types/react": "^16.8.2", + "@types/react-copy-to-clipboard": "^5.0.0", + "@types/react-dom": "^16.8.0", + "@types/react-resize-detector": "^5.0.0", + "@types/reactstrap": "^8.7.2", + "@types/sanitize-html": "^1.20.2", "@types/sinon": "^9.0.4", "@typescript-eslint/eslint-plugin": "2.x", "@typescript-eslint/parser": "2.x", @@ -83,6 +98,7 @@ "eslint-plugin-react": "7.x", "eslint-plugin-react-hooks": "2.x", "jest-fetch-mock": "^3.0.3", + "mutationobserver-shim": "^0.3.7", "prettier": "^1.18.2", "sinon": "^9.0.3" }, @@ -90,6 +106,9 @@ "jest": { "snapshotSerializers": [ "enzyme-to-json/serializer" + ], + "transformIgnorePatterns": [ + "/node_modules/(?!codemirror-promql).+(js|jsx)$" ] } } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix index 8475e7533b..496d2fff4a 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix @@ -10,19 +10,19 @@ }; } { - name = "_babel_code_frame___code_frame_7.10.4.tgz"; + name = "_babel_code_frame___code_frame_7.12.13.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz"; - sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a"; + name = "_babel_code_frame___code_frame_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; + sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; }; } { - name = "_babel_compat_data___compat_data_7.12.5.tgz"; + name = "_babel_compat_data___compat_data_7.14.0.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.5.tgz"; - sha1 = "f56db0c4bb1bbbf221b4e81345aab4141e7cb0e9"; + name = "_babel_compat_data___compat_data_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz"; + sha1 = "a901128bce2ad02565df95e6ecbf195cf9465919"; }; } { @@ -34,187 +34,163 @@ }; } { - name = "_babel_core___core_7.12.3.tgz"; + name = "_babel_core___core_7.14.0.tgz"; path = fetchurl { - name = "_babel_core___core_7.12.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz"; - sha1 = "1b436884e1e3bff6fb1328dc02b208759de92ad8"; + name = "_babel_core___core_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.0.tgz"; + sha1 = "47299ff3ec8d111b493f1a9d04bf88c04e728d88"; }; } { - name = "_babel_generator___generator_7.12.5.tgz"; + name = "_babel_generator___generator_7.14.1.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz"; - sha1 = "a2c50de5c8b6d708ab95be5e6053936c1884a4de"; + name = "_babel_generator___generator_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.1.tgz"; + sha1 = "1f99331babd65700183628da186f36f63d615c93"; }; } { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz"; - sha1 = "5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz"; + sha1 = "0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"; }; } { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.4.tgz"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz"; - sha1 = "bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz"; + sha1 = "6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"; }; } { - name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.12.4.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.12.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz"; - sha1 = "55fc1ead5242caa0ca2875dcb8eed6d311e50f48"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz"; + sha1 = "6e91dccf15e3f43e5556dffe32d860109887563c"; }; } { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.10.4.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.1.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz"; - sha1 = "8095cddbff858e6fa9c326daee54a2f2732c1d5d"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.1.tgz"; + sha1 = "1fe11b376f3c41650ad9fedc665b0068722ea76c"; }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.12.5.tgz"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.17.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz"; - sha1 = "cb470c76198db6a24e9dbc8987275631e5d29831"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz"; + sha1 = "a2ac87e9e319269ac655b8d4415e94d38d663cb7"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.12.1.tgz"; + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.0.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz"; - sha1 = "3c45998f431edd4a9214c5f1d3ad1448a6137f6e"; + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz"; + sha1 = "a640051772045fedaaecc6f0c6c69f02bdd34bf1"; }; } { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.1.tgz"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.13.0.tgz"; path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz"; - sha1 = "18b1302d4677f9dc4740fe8c9ed96680e29d37e8"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz"; + sha1 = "17b5c59ff473d9f956f40ef570cf3a76ca12657f"; }; } { - name = "_babel_helper_define_map___helper_define_map_7.10.5.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_define_map___helper_define_map_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz"; - sha1 = "b53c10db78a640800152692b13393147acb9bb30"; + name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; + sha1 = "93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"; }; } { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.12.1.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz"; - sha1 = "8006a466695c4ad86a2a5f2fb15b5f2c31ad5633"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; + sha1 = "bc63451d403a3b3082b97e1d8b3fe5bd4091e583"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.13.16.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; - sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.13.16.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz"; + sha1 = "1b1651249e94b51f8f0d33439843e33e39775b30"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; - sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz"; + sha1 = "dfe368f26d426a07299d8d6513821768216e6d72"; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.4.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz"; - sha1 = "d49b001d1d5a68ca5e6604dda01a6297f7c9381e"; + name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; + sha1 = "c6a369a6f3621cb25da014078684da9196b61977"; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.1.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.0.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz"; - sha1 = "fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz"; + sha1 = "8fcf78be220156f22633ee204ea81f73f826a8ad"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; - sha1 = "1bfc0229f794988f76ed0a4d4e90860850b54dfb"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; + sha1 = "5c02d171b4c8615b1e7163f888c1c81c30a2aaea"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"; - sha1 = "7954fec71f5b32c48e4b303b437c34453fd7247c"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; + sha1 = "806526ce125aed03373bc416a828321e3a6a33af"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.13.0.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz"; - sha1 = "50dc96413d594f995a77905905b05893cd779673"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz"; + sha1 = "376a760d9f7b4b2077a9dd05aa9c3927cadb2209"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.13.12.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; - sha1 = "2f75a831269d4f677de49986dff59927533cf375"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz"; + sha1 = "6442f4c1ad912502481a564a7386de0c77ff3804"; }; } { - name = "_babel_helper_regex___helper_regex_7.10.5.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; path = fetchurl { - name = "_babel_helper_regex___helper_regex_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz"; - sha1 = "32dfbb79899073c415557053a19bd055aae50ae0"; - }; - } - { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.12.1.tgz"; - path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz"; - sha1 = "8c4dbbf916314f6047dc05e6a2217074238347fd"; - }; - } - { - name = "_babel_helper_replace_supers___helper_replace_supers_7.12.5.tgz"; - path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz"; - sha1 = "f009a17543bbbbce16b06206ae73b63d3fca68d9"; - }; - } - { - name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz"; - path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"; - sha1 = "32427e5aa61547d38eb1e6eaf5fd1426fdad9136"; + name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; + sha1 = "dd6c538afb61819d205a012c31792a39c7a5eaf6"; }; } { @@ -226,67 +202,75 @@ }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; - sha1 = "f8a491244acf6a676158ac42072911ba83ad099f"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; + sha1 = "e9430be00baf3e88b0e13e6f9d4eaf2136372b05"; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; - sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; + sha1 = "d26cad8a47c65286b15df1547319a5d0bcf27288"; }; } { - name = "_babel_helper_validator_option___helper_validator_option_7.12.1.tgz"; + name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; path = fetchurl { - name = "_babel_helper_validator_option___helper_validator_option_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz"; - sha1 = "175567380c3e77d60ff98a54bb015fe78f2178d9"; + name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; + sha1 = "d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"; }; } { - name = "_babel_helper_wrap_function___helper_wrap_function_7.12.3.tgz"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.13.0.tgz"; path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.12.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz"; - sha1 = "3332339fc4d1fbbf1c27d7958c27d34708e990d9"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz"; + sha1 = "bdb5c66fda8526ec235ab894ad53a1235c79fcc4"; }; } { - name = "_babel_helpers___helpers_7.12.5.tgz"; + name = "_babel_helpers___helpers_7.14.0.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz"; - sha1 = "1a1ba4a768d9b58310eda516c449913fe647116e"; + name = "_babel_helpers___helpers_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz"; + sha1 = "ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"; }; } { - name = "_babel_highlight___highlight_7.10.4.tgz"; + name = "_babel_highlight___highlight_7.14.0.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; - sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; + name = "_babel_highlight___highlight_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz"; + sha1 = "3197e375711ef6bf834e67d0daec88e4f46113cf"; }; } { - name = "_babel_parser___parser_7.12.5.tgz"; + name = "_babel_parser___parser_7.14.1.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz"; - sha1 = "b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"; + name = "_babel_parser___parser_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.1.tgz"; + sha1 = "1bd644b5db3f5797c4479d89ec1817fe02b84c47"; }; } { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.12.1.tgz"; + name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.13.12.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz"; - sha1 = "dc6c1170e27d8aca99ff65f4925bd06b1c90550e"; + name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz"; + sha1 = "a3484d84d0b549f3fc916b99ee4783f26fabad2a"; + }; + } + { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.13.15.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.13.15.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz"; + sha1 = "80e549df273a3b3050431b148c892491df1bcc5b"; }; } { @@ -298,11 +282,19 @@ }; } { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.12.1.tgz"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz"; - sha1 = "a082ff541f2a29a4821065b8add9346c0c16e5de"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz"; + sha1 = "146376000b94efd001e57a40a88a525afaab9f37"; + }; + } + { + name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.13.11.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.13.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.13.11.tgz"; + sha1 = "6fcbba4a962702c17e5371a0c7b39afde186d703"; }; } { @@ -314,35 +306,35 @@ }; } { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.12.1.tgz"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.13.8.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz"; - sha1 = "43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz"; + sha1 = "876a1f6966e1dec332e8c9451afda3bebcdf2e1d"; }; } { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.1.tgz"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz"; - sha1 = "8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz"; + sha1 = "393be47a4acd03fa2af6e3cde9b06e33de1b446d"; }; } { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.12.1.tgz"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.13.8.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz"; - sha1 = "d45423b517714eedd5621a9dfdc03fa9f4eb241c"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz"; + sha1 = "bf1fb362547075afda3634ed31571c5901afef7b"; }; } { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.12.1.tgz"; + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.13.8.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz"; - sha1 = "f2c490d36e1b3c9659241034a5d2cd50263a2751"; + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz"; + sha1 = "93fa78d63857c40ce3c8c3315220fd00bfbb4e1a"; }; } { @@ -354,11 +346,11 @@ }; } { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.12.1.tgz"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.13.8.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz"; - sha1 = "3ed4fff31c015e7f3f1467f190dbe545cd7b046c"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz"; + sha1 = "3730a31dafd3c10d8ccd10648ed80a2ac5472ef3"; }; } { @@ -370,27 +362,27 @@ }; } { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.5.tgz"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz"; - sha1 = "b1ce757156d40ed79d59d467cb2b154a5c4149ba"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz"; + sha1 = "bd9da3188e787b5120b4f9d465a8261ce67ed1db"; }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.12.1.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.13.8.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz"; - sha1 = "def9bd03cea0f9b72283dac0ec22d289c7691069"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz"; + sha1 = "5d210a4d727d6ce3b18f9de82cc99a3964eed60a"; }; } { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.12.1.tgz"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.13.8.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz"; - sha1 = "ccc2421af64d3aae50b558a71cede929a5ab2942"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz"; + sha1 = "3ad6bd5901506ea996fc31bdcf3ccfa2bed71107"; }; } { @@ -402,27 +394,35 @@ }; } { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.1.tgz"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.13.12.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz"; - sha1 = "cce122203fc8a32794296fc377c6dedaf4363797"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz"; + sha1 = "ba9feb601d422e0adea6760c2bd6bbb7bfec4866"; }; } { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.12.1.tgz"; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz"; - sha1 = "86814f6e7a21374c980c10d38b4493e703f4a389"; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz"; + sha1 = "04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787"; }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.1.tgz"; + name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.14.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz"; - sha1 = "2a183958d417765b9eae334f47758e5d6a82e072"; + name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz"; + sha1 = "b1a1f2030586b9d3489cc26179d2eb5883277636"; + }; + } + { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz"; + sha1 = "bebde51339be829c17aaaaced18641deb62b39ba"; }; } { @@ -434,19 +434,27 @@ }; } { - name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz"; + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz"; - sha1 = "bcb297c5366e79bebadef509549cd93b04f19978"; + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; + sha1 = "b5c987274c4a3a82b89714796931a6b53544ae10"; }; } { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.1.tgz"; + name = "_babel_plugin_syntax_class_static_block___plugin_syntax_class_static_block_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz"; - sha1 = "81a8b535b284476c41be6de06853a8802b98c5dd"; + name = "_babel_plugin_syntax_class_static_block___plugin_syntax_class_static_block_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz"; + sha1 = "8e3d674b0613e67975ceac2776c97b60cafc5c9c"; + }; + } + { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz"; + sha1 = "fac829bf3c7ef4a1bc916257b403e58c6bdaf648"; }; } { @@ -466,11 +474,11 @@ }; } { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.12.1.tgz"; + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.1.tgz"; - sha1 = "a77670d9abe6d63e8acadf4c31bb1eb5a506bbdd"; + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.13.tgz"; + sha1 = "5df9962503c0a9c918381c929d51d4d6949e7e86"; }; } { @@ -482,11 +490,11 @@ }; } { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.1.tgz"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz"; - sha1 = "9d9d357cc818aa7ae7935917c1257f67677a0926"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz"; + sha1 = "044fb81ebad6698fe62c478875575bcbb9b70f15"; }; } { @@ -538,99 +546,107 @@ }; } { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz"; + name = "_babel_plugin_syntax_private_property_in_object___plugin_syntax_private_property_in_object_7.14.0.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz"; - sha1 = "dd6c0b357ac1bb142d98537450a319625d13d2a0"; + name = "_babel_plugin_syntax_private_property_in_object___plugin_syntax_private_property_in_object_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz"; + sha1 = "762a4babec61176fec6c88480dec40372b140c0b"; }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.1.tgz"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz"; - sha1 = "460ba9d77077653803c3dd2e673f76d66b4029e5"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; + sha1 = "c5f0fa6e249f5b739727f923540cf7a806130178"; }; } { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.12.1.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz"; - sha1 = "8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz"; + sha1 = "9dff111ca64154cef0f4dc52cf843d9f12ce4474"; }; } { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.12.1.tgz"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz"; - sha1 = "3849a49cc2a22e9743cbd6b52926d30337229af1"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz"; + sha1 = "10a59bebad52d637a027afa692e8d5ceff5e3dae"; }; } { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.1.tgz"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz"; - sha1 = "f2a1a365bde2b7112e0a6ded9067fdd7c07905d9"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz"; + sha1 = "8e112bf6771b82bf1e974e5e26806c5c99aa516f"; }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.1.tgz"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz"; - sha1 = "f0ee727874b42a208a48a586b84c3d222c2bbef1"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz"; + sha1 = "a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"; }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.12.1.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz"; - sha1 = "65e650fcaddd3d88ddce67c0f834a3d436a32db6"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.1.tgz"; + sha1 = "ac1b3a8e3d8cbb31efc6b9be2f74eb9823b74ab2"; }; } { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.12.1.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz"; - sha1 = "d68cf6c9b7f838a8a4144badbe97541ea0904852"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz"; + sha1 = "0265155075c42918bf4d3a4053134176ad9b533b"; }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.12.1.tgz"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz"; - sha1 = "b9a570fe0d0a8d460116413cb4f97e8e08b2f847"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz"; + sha1 = "845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"; }; } { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.1.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.17.tgz"; path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz"; - sha1 = "a1d16c14862817b6409c0a678d6f9373ca9cd975"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz"; + sha1 = "678d96576638c19d5b36b332504d3fd6e06dea27"; }; } { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.1.tgz"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz"; - sha1 = "745661baba295ac06e686822797a69fbaa2ca228"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz"; + sha1 = "3f1601cc29905bfcb67f53910f197aeafebb25ad"; }; } { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.1.tgz"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz"; - sha1 = "b0f2ed356ba1be1428ecaf128ff8a24f02830ae0"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz"; + sha1 = "6f06b87a8b803fd928e54b81c258f0a0033904de"; + }; + } + { + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz"; + sha1 = "4d52390b9a273e651e4aba6aee49ef40e80cd0a1"; }; } { @@ -642,115 +658,115 @@ }; } { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.12.1.tgz"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz"; - sha1 = "07640f28867ed16f9511c99c888291f560921cfa"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz"; + sha1 = "c799f881a8091ac26b54867a845c3e97d2696062"; }; } { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.1.tgz"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz"; - sha1 = "2ec76258c70fe08c6d7da154003a480620eba667"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz"; + sha1 = "bb024452f9aaed861d374c8e7a24252ce3a50051"; }; } { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.1.tgz"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz"; - sha1 = "d73b803a26b37017ddf9d3bb8f4dc58bfb806f57"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz"; + sha1 = "2ca45bafe4a820197cf315794a4d26560fe4bdb9"; }; } { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.1.tgz"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz"; - sha1 = "496038602daf1514a64d43d8e17cbb2755e0c3ad"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz"; + sha1 = "5ffa66cd59b9e191314c9f1f803b938e8c081e40"; }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.12.1.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz"; - sha1 = "3154300b026185666eebb0c0ed7f8415fefcf6f9"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.0.tgz"; + sha1 = "589494b5b290ff76cf7f59c798011f6d77026553"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.12.1.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.14.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz"; - sha1 = "fa403124542636c786cf9b460a0ffbb48a86e648"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz"; + sha1 = "52bc199cb581e0992edba0f0f80356467587f161"; }; } { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.12.1.tgz"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.13.8.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz"; - sha1 = "663fea620d593c93f214a464cd399bf6dc683086"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz"; + sha1 = "6d066ee2bff3c7b3d60bf28dec169ad993831ae3"; }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.12.1.tgz"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.14.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz"; - sha1 = "eb5a218d6b1c68f3d6217b8fa2cc82fec6547902"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz"; + sha1 = "2f8179d1bbc9263665ce4a65f305526b2ea8ac34"; }; } { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.1.tgz"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz"; - sha1 = "b407f5c96be0d9f5f88467497fa82b30ac3e8753"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz"; + sha1 = "2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"; }; } { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.1.tgz"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz"; - sha1 = "80073f02ee1bb2d365c3416490e085c95759dec0"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz"; + sha1 = "e22d8c3af24b150dd528cbd6e685e799bf1c351c"; }; } { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.1.tgz"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz"; - sha1 = "4ea08696b8d2e65841d0c7706482b048bed1066e"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz"; + sha1 = "b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"; }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.12.1.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz"; - sha1 = "d2e963b038771650c922eff593799c96d853255d"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz"; + sha1 = "8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007"; }; } { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.1.tgz"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz"; - sha1 = "41bc81200d730abb4456ab8b3fbd5537b59adecd"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz"; + sha1 = "4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"; }; } { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.12.1.tgz"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.13.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.12.1.tgz"; - sha1 = "4471f0851feec3231cc9aaa0dccde39947c1ac1e"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.13.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.13.13.tgz"; + sha1 = "0208b1d942bf939cd4f7aa5b255d42602aa4a920"; }; } { @@ -762,43 +778,43 @@ }; } { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.1.tgz"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz"; - sha1 = "1cbcd0c3b1d6648c55374a22fc9b6b7e5341c00d"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz"; + sha1 = "c28effd771b276f4647411c9733dbb2d2da954bd"; }; } { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.5.tgz"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.17.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.5.tgz"; - sha1 = "677de5b96da310430d6cfb7fee16a1603afa3d56"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz"; + sha1 = "f510c0fa7cd7234153539f9a362ced41a5ca1447"; }; } { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.1.tgz"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz"; - sha1 = "ef43cbca2a14f1bd17807dbe4376ff89d714cf28"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.13.tgz"; + sha1 = "422d99d122d592acab9c35ea22a6cfd9bf189f60"; }; } { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.1.tgz"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz"; - sha1 = "d07de6863f468da0809edcf79a1aa8ce2a82a26b"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.13.tgz"; + sha1 = "051d76126bee5c9a6aa3ba37be2f6c1698856bcb"; }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.12.5.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.13.12.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.5.tgz"; - sha1 = "39ede0e30159770561b6963be143e40af3bde00c"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.13.12.tgz"; + sha1 = "1df5dfaf0f4b784b43e96da6f28d630e775f68b3"; }; } { @@ -810,19 +826,19 @@ }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.12.1.tgz"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.13.15.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz"; - sha1 = "5f0a28d842f6462281f06a964e88ba8d7ab49753"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.13.15.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz"; + sha1 = "e5eb28945bf8b6563e7f818945f966a8d2997f39"; }; } { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.1.tgz"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz"; - sha1 = "6fdfc8cc7edcc42b36a7c12188c6787c873adcd8"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz"; + sha1 = "7d9988d4f06e0fe697ea1d9803188aa18b472695"; }; } { @@ -834,67 +850,67 @@ }; } { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.1.tgz"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz"; - sha1 = "0bf9cac5550fce0cfdf043420f661d645fdc75e3"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz"; + sha1 = "db755732b70c539d504c6390d9ce90fe64aff7ad"; }; } { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.12.1.tgz"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz"; - sha1 = "527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz"; + sha1 = "84887710e273c1815ace7ae459f6f42a5d31d5fd"; }; } { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.1.tgz"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz"; - sha1 = "5c24cf50de396d30e99afc8d1c700e8bce0f5caf"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz"; + sha1 = "760ffd936face73f860ae646fb86ee82f3d06d1f"; }; } { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.12.1.tgz"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz"; - sha1 = "b43ece6ed9a79c0c71119f576d299ef09d942843"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz"; + sha1 = "a36049127977ad94438dee7443598d1cefdf409d"; }; } { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.1.tgz"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz"; - sha1 = "9ca6be343d42512fbc2e68236a82ae64bc7af78a"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz"; + sha1 = "785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"; }; } { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.12.1.tgz"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz"; - sha1 = "d92cc0af504d510e26a754a7dbc2e5c8cd9c7ab4"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz"; + sha1 = "4a498e1f3600342d2a9e61f60131018f55774853"; }; } { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.1.tgz"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz"; - sha1 = "5232b9f81ccb07070b7c3c36c67a1b78f1845709"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz"; + sha1 = "840ced3b816d3b5127dd1d12dcedc5dead1a5e74"; }; } { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.1.tgz"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz"; - sha1 = "cc9661f61390db5c65e3febaccefd5c6ac3faecb"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz"; + sha1 = "b52521685804e155b1202e83fc188d34bb70f5ac"; }; } { @@ -906,11 +922,11 @@ }; } { - name = "_babel_preset_env___preset_env_7.12.1.tgz"; + name = "_babel_preset_env___preset_env_7.14.1.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz"; - sha1 = "9c7e5ca82a19efc865384bb4989148d2ee5d7ac2"; + name = "_babel_preset_env___preset_env_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.1.tgz"; + sha1 = "b55914e2e68885ea03f69600b2d3537e54574a93"; }; } { @@ -930,11 +946,11 @@ }; } { - name = "_babel_preset_react___preset_react_7.12.5.tgz"; + name = "_babel_preset_react___preset_react_7.13.13.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.5.tgz"; - sha1 = "d45625f65d53612078a43867c5c6750e78772c56"; + name = "_babel_preset_react___preset_react_7.13.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.13.13.tgz"; + sha1 = "fa6895a96c50763fe693f9148568458d5a839761"; }; } { @@ -946,11 +962,11 @@ }; } { - name = "_babel_runtime_corejs3___runtime_corejs3_7.12.5.tgz"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.14.0.tgz"; path = fetchurl { - name = "_babel_runtime_corejs3___runtime_corejs3_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz"; - sha1 = "ffee91da0eb4c6dae080774e94ba606368e414f4"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.14.0.tgz"; + sha1 = "6bf5fbc0b961f8e3202888cb2cd0fb7a0a9a3f66"; }; } { @@ -962,35 +978,35 @@ }; } { - name = "_babel_runtime___runtime_7.12.5.tgz"; + name = "_babel_runtime___runtime_7.14.0.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz"; - sha1 = "410e7e487441e1b360c29be715d870d9b985882e"; + name = "_babel_runtime___runtime_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz"; + sha1 = "46794bc20b612c5f75e62dd071e24dfd95f1cbe6"; }; } { - name = "_babel_template___template_7.10.4.tgz"; + name = "_babel_template___template_7.12.13.tgz"; path = fetchurl { - name = "_babel_template___template_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz"; - sha1 = "3251996c4200ebc71d1a8fc405fba940f36ba278"; + name = "_babel_template___template_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz"; + sha1 = "530265be8a2589dbb37523844c5bcb55947fb327"; }; } { - name = "_babel_traverse___traverse_7.12.5.tgz"; + name = "_babel_traverse___traverse_7.14.0.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.5.tgz"; - sha1 = "78a0c68c8e8a35e4cacfd31db8bb303d5606f095"; + name = "_babel_traverse___traverse_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.0.tgz"; + sha1 = "cea0dc8ae7e2b1dec65f512f39f3483e8cc95aef"; }; } { - name = "_babel_types___types_7.12.6.tgz"; + name = "_babel_types___types_7.14.1.tgz"; path = fetchurl { - name = "_babel_types___types_7.12.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz"; - sha1 = "ae0e55ef1cce1fbc881cd26f8234eb3e657edc96"; + name = "_babel_types___types_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz"; + sha1 = "095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db"; }; } { @@ -1001,6 +1017,134 @@ sha1 = "f864ae85004d0fcab6f50be9141c4da368d1656a"; }; } + { + name = "_codemirror_autocomplete___autocomplete_0.18.5.tgz"; + path = fetchurl { + name = "_codemirror_autocomplete___autocomplete_0.18.5.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-0.18.5.tgz"; + sha1 = "5c25ddbef858503920fa4912b48bf78be93ee462"; + }; + } + { + name = "_codemirror_closebrackets___closebrackets_0.18.0.tgz"; + path = fetchurl { + name = "_codemirror_closebrackets___closebrackets_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/closebrackets/-/closebrackets-0.18.0.tgz"; + sha1 = "4bd7e9227ed6e90e590fa6d289d34b0c065cb8cf"; + }; + } + { + name = "_codemirror_commands___commands_0.18.2.tgz"; + path = fetchurl { + name = "_codemirror_commands___commands_0.18.2.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/commands/-/commands-0.18.2.tgz"; + sha1 = "a90067b1e3127ffe2c1be2daa68c0f4aeda59308"; + }; + } + { + name = "_codemirror_comment___comment_0.18.0.tgz"; + path = fetchurl { + name = "_codemirror_comment___comment_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/comment/-/comment-0.18.0.tgz"; + sha1 = "f42e3baaacbeb57f22f4a3eabe5738b3d2bca1f7"; + }; + } + { + name = "_codemirror_highlight___highlight_0.18.3.tgz"; + path = fetchurl { + name = "_codemirror_highlight___highlight_0.18.3.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/highlight/-/highlight-0.18.3.tgz"; + sha1 = "50e268630f113c322a2dc97c9f68d71934fffcb0"; + }; + } + { + name = "_codemirror_history___history_0.18.1.tgz"; + path = fetchurl { + name = "_codemirror_history___history_0.18.1.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/history/-/history-0.18.1.tgz"; + sha1 = "853cde4b138b172235d58f945871f0fc08b7310a"; + }; + } + { + name = "_codemirror_language___language_0.18.1.tgz"; + path = fetchurl { + name = "_codemirror_language___language_0.18.1.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/language/-/language-0.18.1.tgz"; + sha1 = "23682324228606c4ae5b6a9f7cd0a4b9fdff83dd"; + }; + } + { + name = "_codemirror_lint___lint_0.18.2.tgz"; + path = fetchurl { + name = "_codemirror_lint___lint_0.18.2.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/lint/-/lint-0.18.2.tgz"; + sha1 = "d80adb1767b486894e921785b5e82fa435d28ecf"; + }; + } + { + name = "_codemirror_matchbrackets___matchbrackets_0.18.0.tgz"; + path = fetchurl { + name = "_codemirror_matchbrackets___matchbrackets_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/matchbrackets/-/matchbrackets-0.18.0.tgz"; + sha1 = "64a493090d942de19f15a9ed3cb0fa19ed55f18b"; + }; + } + { + name = "_codemirror_panel___panel_0.18.1.tgz"; + path = fetchurl { + name = "_codemirror_panel___panel_0.18.1.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/panel/-/panel-0.18.1.tgz"; + sha1 = "b2179cdfb7d7c2913ba682d61d00edff160cfad0"; + }; + } + { + name = "_codemirror_rangeset___rangeset_0.18.1.tgz"; + path = fetchurl { + name = "_codemirror_rangeset___rangeset_0.18.1.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/rangeset/-/rangeset-0.18.1.tgz"; + sha1 = "0e51e1117fa5aae0134073735a07c659f334a699"; + }; + } + { + name = "_codemirror_search___search_0.18.2.tgz"; + path = fetchurl { + name = "_codemirror_search___search_0.18.2.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/search/-/search-0.18.2.tgz"; + sha1 = "7f6311ce4d5749d92aefb41b2f8628d28d90918c"; + }; + } + { + name = "_codemirror_state___state_0.18.7.tgz"; + path = fetchurl { + name = "_codemirror_state___state_0.18.7.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/state/-/state-0.18.7.tgz"; + sha1 = "3339a732387bb2c034987c57ccf0649ef2f7c4c1"; + }; + } + { + name = "_codemirror_text___text_0.18.0.tgz"; + path = fetchurl { + name = "_codemirror_text___text_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/text/-/text-0.18.0.tgz"; + sha1 = "a4a98862989ccef5545e730b269136d524c6a7c7"; + }; + } + { + name = "_codemirror_tooltip___tooltip_0.18.4.tgz"; + path = fetchurl { + name = "_codemirror_tooltip___tooltip_0.18.4.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/tooltip/-/tooltip-0.18.4.tgz"; + sha1 = "981bc0ced792c6754148edbc1f60092f3fa54207"; + }; + } + { + name = "_codemirror_view___view_0.18.11.tgz"; + path = fetchurl { + name = "_codemirror_view___view_0.18.11.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/view/-/view-0.18.11.tgz"; + sha1 = "3a9655758f0743cc57d718723b57ea49a72cdfa7"; + }; + } { name = "_csstools_convert_colors___convert_colors_1.4.0.tgz"; path = fetchurl { @@ -1018,35 +1162,43 @@ }; } { - name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.32.tgz"; + name = "_forevolve_bootstrap_dark___bootstrap_dark_1.0.0.tgz"; path = fetchurl { - name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.32.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.32.tgz"; - sha1 = "3436795d5684f22742989bfa08f46f50f516f259"; + name = "_forevolve_bootstrap_dark___bootstrap_dark_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@forevolve/bootstrap-dark/-/bootstrap-dark-1.0.0.tgz"; + sha1 = "05fb14e73fbf5ce159a5ba5d1aee151a57c79bca"; }; } { - name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.32.tgz"; + name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.35.tgz"; path = fetchurl { - name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.32.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.32.tgz"; - sha1 = "da092bfc7266aa274be8604de610d7115f9ba6cf"; + name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.35.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.35.tgz"; + sha1 = "01dd3d054da07a00b764d78748df20daf2b317e9"; }; } { - name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.15.1.tgz"; + name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.35.tgz"; path = fetchurl { - name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.15.1.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.1.tgz"; - sha1 = "e1432676ddd43108b41197fee9f86d910ad458ef"; + name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.35.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.35.tgz"; + sha1 = "85aea8c25645fcec88d35f2eb1045c38d3e65cff"; }; } { - name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.12.tgz"; + name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.15.3.tgz"; path = fetchurl { - name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.12.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.12.tgz"; - sha1 = "fbdea86e8b73032895e6ded1ee1dbb1874902d1a"; + name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.15.3.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.3.tgz"; + sha1 = "52eebe354f60dc77e0bde934ffc5c75ffd04f9d8"; + }; + } + { + name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.14.tgz"; + path = fetchurl { + name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.14.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.14.tgz"; + sha1 = "bf28875c3935b69ce2dc620e1060b217a47f64ca"; }; } { @@ -1089,6 +1241,14 @@ sha1 = "68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29"; }; } + { + name = "_hypnosphi_create_react_context___create_react_context_0.3.1.tgz"; + path = fetchurl { + name = "_hypnosphi_create_react_context___create_react_context_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/@hypnosphi/create-react-context/-/create-react-context-0.3.1.tgz"; + sha1 = "f8bfebdc7665f5d426cba3753e0e9c7d3154d7c6"; + }; + } { name = "_jest_console___console_24.9.0.tgz"; path = fetchurl { @@ -1202,11 +1362,11 @@ }; } { - name = "_sinonjs_commons___commons_1.8.1.tgz"; + name = "_sinonjs_commons___commons_1.8.3.tgz"; path = fetchurl { - name = "_sinonjs_commons___commons_1.8.1.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz"; - sha1 = "e7df00f98a203324f6dc7cc606cad9d4a8ab2217"; + name = "_sinonjs_commons___commons_1.8.3.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz"; + sha1 = "3802ddd21a50a949b6721ddd72da36e67e7f1b2d"; }; } { @@ -1218,19 +1378,11 @@ }; } { - name = "_sinonjs_formatio___formatio_5.0.1.tgz"; + name = "_sinonjs_samsam___samsam_5.3.1.tgz"; path = fetchurl { - name = "_sinonjs_formatio___formatio_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-5.0.1.tgz"; - sha1 = "f13e713cb3313b1ab965901b01b0828ea6b77089"; - }; - } - { - name = "_sinonjs_samsam___samsam_5.3.0.tgz"; - path = fetchurl { - name = "_sinonjs_samsam___samsam_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.0.tgz"; - sha1 = "1d2f0743dc54bf13fe9d508baefacdffa25d4329"; + name = "_sinonjs_samsam___samsam_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.1.tgz"; + sha1 = "375a45fe6ed4e92fca2fb920e007c48232a6507f"; }; } { @@ -1354,19 +1506,19 @@ }; } { - name = "_testing_library_react_hooks___react_hooks_3.4.2.tgz"; + name = "_testing_library_react_hooks___react_hooks_3.7.0.tgz"; path = fetchurl { - name = "_testing_library_react_hooks___react_hooks_3.4.2.tgz"; - url = "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-3.4.2.tgz"; - sha1 = "8deb94f7684e0d896edd84a4c90e5b79a0810bc2"; + name = "_testing_library_react_hooks___react_hooks_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-3.7.0.tgz"; + sha1 = "6d75c5255ef49bce39b6465bf6b49e2dac84919e"; }; } { - name = "_types_babel__core___babel__core_7.1.12.tgz"; + name = "_types_babel__core___babel__core_7.1.14.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.12.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz"; - sha1 = "4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"; + name = "_types_babel__core___babel__core_7.1.14.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz"; + sha1 = "faaeefc4185ec71c389f4501ee5ec84b170cc402"; }; } { @@ -1386,19 +1538,19 @@ }; } { - name = "_types_babel__traverse___babel__traverse_7.0.15.tgz"; + name = "_types_babel__traverse___babel__traverse_7.11.1.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.0.15.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz"; - sha1 = "db9e4238931eb69ef8aab0ad6523d4d4caa39d03"; + name = "_types_babel__traverse___babel__traverse_7.11.1.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz"; + sha1 = "654f6c4f67568e24c23b367e947098c6206fa639"; }; } { - name = "_types_cheerio___cheerio_0.22.22.tgz"; + name = "_types_cheerio___cheerio_0.22.28.tgz"; path = fetchurl { - name = "_types_cheerio___cheerio_0.22.22.tgz"; - url = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.22.tgz"; - sha1 = "ae71cf4ca59b8bbaf34c99af7a5d6c8894988f5f"; + name = "_types_cheerio___cheerio_0.22.28.tgz"; + url = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.28.tgz"; + sha1 = "90808aabb44fec40fa2950f4c72351e3e4eb065b"; }; } { @@ -1441,14 +1593,6 @@ sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183"; }; } - { - name = "_types_history___history_4.7.8.tgz"; - path = fetchurl { - name = "_types_history___history_4.7.8.tgz"; - url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz"; - sha1 = "49348387983075705fe8f4e02fb67f7daaec4934"; - }; - } { name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; path = fetchurl { @@ -1482,27 +1626,27 @@ }; } { - name = "_types_jest___jest_26.0.15.tgz"; + name = "_types_jest___jest_26.0.23.tgz"; path = fetchurl { - name = "_types_jest___jest_26.0.15.tgz"; - url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.15.tgz"; - sha1 = "12e02c0372ad0548e07b9f4e19132b834cb1effe"; + name = "_types_jest___jest_26.0.23.tgz"; + url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.23.tgz"; + sha1 = "a1b7eab3c503b80451d019efb588ec63522ee4e7"; }; } { - name = "_types_jquery___jquery_3.5.4.tgz"; + name = "_types_jquery___jquery_3.5.5.tgz"; path = fetchurl { - name = "_types_jquery___jquery_3.5.4.tgz"; - url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.4.tgz"; - sha1 = "e923f7d05ca790530f17f80a3b89bc28853fa17f"; + name = "_types_jquery___jquery_3.5.5.tgz"; + url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.5.tgz"; + sha1 = "2c63f47c9c8d96693d272f5453602afd8338c903"; }; } { - name = "_types_json_schema___json_schema_7.0.6.tgz"; + name = "_types_json_schema___json_schema_7.0.7.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.6.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz"; - sha1 = "f4c7ec43e81b319a9815115031709f26987891f0"; + name = "_types_json_schema___json_schema_7.0.7.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz"; + sha1 = "98a993516c859eb0d5c4c8f098317a9ea68db9ad"; }; } { @@ -1514,11 +1658,11 @@ }; } { - name = "_types_minimatch___minimatch_3.0.3.tgz"; + name = "_types_minimatch___minimatch_3.0.4.tgz"; path = fetchurl { - name = "_types_minimatch___minimatch_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"; + name = "_types_minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "f0ec25dbf2f0e4b18647313ac031134ca5b24b21"; }; } { @@ -1530,19 +1674,19 @@ }; } { - name = "_types_node___node_14.14.8.tgz"; + name = "_types_node___node_15.0.2.tgz"; path = fetchurl { - name = "_types_node___node_14.14.8.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.8.tgz"; - sha1 = "2127bd81949a95c8b7d3240f3254352d72563aec"; + name = "_types_node___node_15.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz"; + sha1 = "51e9c0920d1b45936ea04341aa3e2e58d339fb67"; }; } { - name = "_types_node___node_12.19.5.tgz"; + name = "_types_node___node_12.20.12.tgz"; path = fetchurl { - name = "_types_node___node_12.19.5.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.19.5.tgz"; - sha1 = "9be3946136e818597c71c62d04240d0602c645d4"; + name = "_types_node___node_12.20.12.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-12.20.12.tgz"; + sha1 = "fd9c1c2cfab536a2383ed1ef70f94adea743a226"; }; } { @@ -1570,51 +1714,59 @@ }; } { - name = "_types_reach__router___reach__router_1.3.6.tgz"; + name = "_types_reach__router___reach__router_1.3.7.tgz"; path = fetchurl { - name = "_types_reach__router___reach__router_1.3.6.tgz"; - url = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.6.tgz"; - sha1 = "413417ce74caab331c70ce6a03a4c825188e4709"; + name = "_types_reach__router___reach__router_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.7.tgz"; + sha1 = "de8ab374259ae7f7499fc1373b9697a5f3cd6428"; }; } { - name = "_types_react_copy_to_clipboard___react_copy_to_clipboard_4.3.0.tgz"; + name = "_types_react_copy_to_clipboard___react_copy_to_clipboard_5.0.0.tgz"; path = fetchurl { - name = "_types_react_copy_to_clipboard___react_copy_to_clipboard_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/@types/react-copy-to-clipboard/-/react-copy-to-clipboard-4.3.0.tgz"; - sha1 = "8e07becb4f11cfced4bd36038cb5bdf5c2658be5"; + name = "_types_react_copy_to_clipboard___react_copy_to_clipboard_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.0.tgz"; + sha1 = "38b035ca0c28334d3e0efaf3f319b81eea9690cd"; }; } { - name = "_types_react_dom___react_dom_16.9.9.tgz"; + name = "_types_react_dom___react_dom_16.9.12.tgz"; path = fetchurl { - name = "_types_react_dom___react_dom_16.9.9.tgz"; - url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.9.tgz"; - sha1 = "d2d0a6f720a0206369ccbefff752ba37b9583136"; + name = "_types_react_dom___react_dom_16.9.12.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.12.tgz"; + sha1 = "55cd6b17e73922edb9545e5355a0016c1734e6f4"; }; } { - name = "_types_react_resize_detector___react_resize_detector_4.2.0.tgz"; + name = "_types_react_resize_detector___react_resize_detector_5.0.0.tgz"; path = fetchurl { - name = "_types_react_resize_detector___react_resize_detector_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/@types/react-resize-detector/-/react-resize-detector-4.2.0.tgz"; - sha1 = "ee8802e25cfb34439aa7f52626932ea62dc5792e"; + name = "_types_react_resize_detector___react_resize_detector_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/react-resize-detector/-/react-resize-detector-5.0.0.tgz"; + sha1 = "18ac4e6d518581bec6345845b7f08232f4cca8a5"; }; } { - name = "_types_react_test_renderer___react_test_renderer_16.9.3.tgz"; + name = "_types_react_test_renderer___react_test_renderer_17.0.1.tgz"; path = fetchurl { - name = "_types_react_test_renderer___react_test_renderer_16.9.3.tgz"; - url = "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-16.9.3.tgz"; - sha1 = "96bab1860904366f4e848b739ba0e2f67bcae87e"; + name = "_types_react_test_renderer___react_test_renderer_17.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-17.0.1.tgz"; + sha1 = "3120f7d1c157fba9df0118dae20cb0297ee0e06b"; }; } { - name = "_types_react___react_16.9.56.tgz"; + name = "_types_react___react_17.0.5.tgz"; path = fetchurl { - name = "_types_react___react_16.9.56.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.56.tgz"; - sha1 = "ea25847b53c5bec064933095fc366b1462e2adf0"; + name = "_types_react___react_17.0.5.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-17.0.5.tgz"; + sha1 = "3d887570c4489011f75a3fc8f965bf87d09a1bea"; + }; + } + { + name = "_types_react___react_16.14.6.tgz"; + path = fetchurl { + name = "_types_react___react_16.14.6.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.14.6.tgz"; + sha1 = "d933a2a6bc1bfe320a5eea480e8f45ba8126d6ee"; }; } { @@ -1626,19 +1778,27 @@ }; } { - name = "_types_sanitize_html___sanitize_html_1.27.0.tgz"; + name = "_types_sanitize_html___sanitize_html_1.27.2.tgz"; path = fetchurl { - name = "_types_sanitize_html___sanitize_html_1.27.0.tgz"; - url = "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.27.0.tgz"; - sha1 = "77702dc856f16efecc005014c1d2e45b1f2cbc56"; + name = "_types_sanitize_html___sanitize_html_1.27.2.tgz"; + url = "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.27.2.tgz"; + sha1 = "f7bf16ca4b1408278f97ae737f0377a08a10b35c"; }; } { - name = "_types_sinon___sinon_9.0.8.tgz"; + name = "_types_scheduler___scheduler_0.16.1.tgz"; path = fetchurl { - name = "_types_sinon___sinon_9.0.8.tgz"; - url = "https://registry.yarnpkg.com/@types/sinon/-/sinon-9.0.8.tgz"; - sha1 = "1ed0038d356784f75b086104ef83bfd4130bb81b"; + name = "_types_scheduler___scheduler_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz"; + sha1 = "18845205e86ff0038517aab7a18a62a6b9f71275"; + }; + } + { + name = "_types_sinon___sinon_9.0.11.tgz"; + path = fetchurl { + name = "_types_sinon___sinon_9.0.11.tgz"; + url = "https://registry.yarnpkg.com/@types/sinon/-/sinon-9.0.11.tgz"; + sha1 = "7af202dda5253a847b511c929d8b6dda170562eb"; }; } { @@ -1650,11 +1810,11 @@ }; } { - name = "_types_sizzle___sizzle_2.3.2.tgz"; + name = "_types_sizzle___sizzle_2.3.3.tgz"; path = fetchurl { - name = "_types_sizzle___sizzle_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz"; - sha1 = "a811b8c18e2babab7d542b3365887ae2e4d9de47"; + name = "_types_sizzle___sizzle_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.3.tgz"; + sha1 = "ff5e2f1902969d305225a047c8a0fd5c915cebef"; }; } { @@ -1674,11 +1834,11 @@ }; } { - name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; + name = "_types_yargs_parser___yargs_parser_20.2.0.tgz"; path = fetchurl { - name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; - sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d"; + name = "_types_yargs_parser___yargs_parser_20.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz"; + sha1 = "dd3e6699ba3237f0348cd085e4698780204842f9"; }; } { @@ -1690,11 +1850,11 @@ }; } { - name = "_types_yargs___yargs_15.0.10.tgz"; + name = "_types_yargs___yargs_15.0.13.tgz"; path = fetchurl { - name = "_types_yargs___yargs_15.0.10.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.10.tgz"; - sha1 = "0fe3c8173a0d5c3e780b389050140c3f5ea6ea74"; + name = "_types_yargs___yargs_15.0.13.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz"; + sha1 = "34f7fec8b389d7f3c1fd08026a5763e072d3c6dc"; }; } { @@ -1969,6 +2129,14 @@ sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; }; } + { + name = "acorn___acorn_8.2.4.tgz"; + path = fetchurl { + name = "acorn___acorn_8.2.4.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz"; + sha1 = "caba24b08185c3b56e3168e97d15ed17f4d31fd0"; + }; + } { name = "address___address_1.1.2.tgz"; path = fetchurl { @@ -1978,11 +2146,11 @@ }; } { - name = "adjust_sourcemap_loader___adjust_sourcemap_loader_2.0.0.tgz"; + name = "adjust_sourcemap_loader___adjust_sourcemap_loader_3.0.0.tgz"; path = fetchurl { - name = "adjust_sourcemap_loader___adjust_sourcemap_loader_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-2.0.0.tgz"; - sha1 = "6471143af75ec02334b219f54bc7970c52fb29a4"; + name = "adjust_sourcemap_loader___adjust_sourcemap_loader_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz"; + sha1 = "5ae12fb5b7b1c585e80bbb5a63ec163a1a45e61e"; }; } { @@ -2050,11 +2218,11 @@ }; } { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; + name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; path = fetchurl { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; - sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; + name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; + sha1 = "6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"; }; } { @@ -2130,11 +2298,11 @@ }; } { - name = "anymatch___anymatch_3.1.1.tgz"; + name = "anymatch___anymatch_3.1.2.tgz"; path = fetchurl { - name = "anymatch___anymatch_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz"; - sha1 = "c55ecf02185e2469259399310c173ce31233b142"; + name = "anymatch___anymatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; + sha1 = "c0557c096af32f106198f4f4e2a383537e378716"; }; } { @@ -2234,11 +2402,11 @@ }; } { - name = "array_includes___array_includes_3.1.1.tgz"; + name = "array_includes___array_includes_3.1.3.tgz"; path = fetchurl { - name = "array_includes___array_includes_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz"; - sha1 = "cdd67e6852bdf9c1215460786732255ed2459348"; + name = "array_includes___array_includes_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz"; + sha1 = "c7f619b382ad2afaf5326cddfdc0afc61af7690a"; }; } { @@ -2329,14 +2497,6 @@ sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; } - { - name = "assert___assert_1.4.1.tgz"; - path = fetchurl { - name = "assert___assert_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz"; - sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; - }; - } { name = "assert___assert_1.5.0.tgz"; path = fetchurl { @@ -2434,11 +2594,11 @@ }; } { - name = "axe_core___axe_core_4.1.0.tgz"; + name = "axe_core___axe_core_4.2.0.tgz"; path = fetchurl { - name = "axe_core___axe_core_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.0.tgz"; - sha1 = "93d395e6262ecdde5cb52a5d06533d0a0c7bb4cd"; + name = "axe_core___axe_core_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.2.0.tgz"; + sha1 = "6594db4ee62f78be79e32a7295d21b099b60668d"; }; } { @@ -2529,6 +2689,30 @@ sha1 = "156cd55d3f1228a5765774340937afc8398067dd"; }; } + { + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.0.tgz"; + path = fetchurl { + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz"; + sha1 = "686775bf9a5aa757e10520903675e3889caeedc4"; + }; + } + { + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.2.0.tgz"; + path = fetchurl { + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz"; + sha1 = "f4b4bb7b19329827df36ff56f6e6d367026cb7a2"; + }; + } + { + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.0.tgz"; + path = fetchurl { + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz"; + sha1 = "853f5f5716f4691d98c84f8069c7636ea8da7ab8"; + }; + } { name = "babel_plugin_syntax_object_rest_spread___babel_plugin_syntax_object_rest_spread_6.13.0.tgz"; path = fetchurl { @@ -2586,11 +2770,11 @@ }; } { - name = "balanced_match___balanced_match_1.0.0.tgz"; + name = "balanced_match___balanced_match_1.0.2.tgz"; path = fetchurl { - name = "balanced_match___balanced_match_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; }; } { @@ -2642,11 +2826,11 @@ }; } { - name = "binary_extensions___binary_extensions_2.1.0.tgz"; + name = "binary_extensions___binary_extensions_2.2.0.tgz"; path = fetchurl { - name = "binary_extensions___binary_extensions_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz"; - sha1 = "30fa40c9e7fe07dbc895678cd287024dea241dd9"; + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha1 = "75f502eeaf9ffde42fc98829645be4ea76bd9e2d"; }; } { @@ -2666,19 +2850,19 @@ }; } { - name = "bn.js___bn.js_4.11.9.tgz"; + name = "bn.js___bn.js_4.12.0.tgz"; path = fetchurl { - name = "bn.js___bn.js_4.11.9.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz"; - sha1 = "26d556829458f9d1e81fc48952493d0ba3507828"; + name = "bn.js___bn.js_4.12.0.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz"; + sha1 = "775b3f278efbb9718eec7361f483fb36fbbfea88"; }; } { - name = "bn.js___bn.js_5.1.3.tgz"; + name = "bn.js___bn.js_5.2.0.tgz"; path = fetchurl { - name = "bn.js___bn.js_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz"; - sha1 = "beca005408f642ebebea80b042b4d18d2ac0ee6b"; + name = "bn.js___bn.js_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz"; + sha1 = "358860674396c6997771a9d051fcc1b57d4ae002"; }; } { @@ -2706,11 +2890,11 @@ }; } { - name = "bootstrap___bootstrap_4.5.3.tgz"; + name = "bootstrap___bootstrap_4.6.0.tgz"; path = fetchurl { - name = "bootstrap___bootstrap_4.5.3.tgz"; - url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz"; - sha1 = "c6a72b355aaf323920be800246a6e4ef30997fe6"; + name = "bootstrap___bootstrap_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz"; + sha1 = "97b9f29ac98f98dfa43bf7468262d84392552fd7"; }; } { @@ -2818,11 +3002,11 @@ }; } { - name = "browserslist___browserslist_4.14.7.tgz"; + name = "browserslist___browserslist_4.16.6.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.14.7.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz"; - sha1 = "c071c1b3622c1c2e790799a37bb09473a4351cb6"; + name = "browserslist___browserslist_4.16.6.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz"; + sha1 = "d7901277a5a88e554ed305b183ec9b0c08f66fa2"; }; } { @@ -2914,11 +3098,11 @@ }; } { - name = "call_bind___call_bind_1.0.0.tgz"; + name = "call_bind___call_bind_1.0.2.tgz"; path = fetchurl { - name = "call_bind___call_bind_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz"; - sha1 = "24127054bb3f9bdcb4b1fb82418186072f77b8ce"; + name = "call_bind___call_bind_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; + sha1 = "b1d4e89e688119c3c9a903ad30abb2f6a919be3c"; }; } { @@ -2962,19 +3146,11 @@ }; } { - name = "camel_case___camel_case_4.1.1.tgz"; + name = "camel_case___camel_case_4.1.2.tgz"; path = fetchurl { - name = "camel_case___camel_case_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz"; - sha1 = "1fc41c854f00e2f7d0139dfeba1542d6896fe547"; - }; - } - { - name = "camelcase___camelcase_5.0.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz"; - sha1 = "03295527d58bd3cd4aa75363f35b2e8d97be2f42"; + name = "camel_case___camel_case_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz"; + sha1 = "9728072a954f805228225a6deea6b38461e1bd5a"; }; } { @@ -2994,11 +3170,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001159.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001223.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001159.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz"; - sha1 = "bebde28f893fa9594dadcaa7d6b8e2aa0299df20"; + name = "caniuse_lite___caniuse_lite_1.0.30001223.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz"; + sha1 = "39b49ff0bfb3ee3587000d2f66c47addc6e14443"; }; } { @@ -3042,11 +3218,11 @@ }; } { - name = "chalk___chalk_4.1.0.tgz"; + name = "chalk___chalk_4.1.1.tgz"; path = fetchurl { - name = "chalk___chalk_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; - sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; + name = "chalk___chalk_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; + sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; }; } { @@ -3058,11 +3234,27 @@ }; } { - name = "cheerio___cheerio_1.0.0_rc.3.tgz"; + name = "cheerio_select___cheerio_select_1.4.0.tgz"; path = fetchurl { - name = "cheerio___cheerio_1.0.0_rc.3.tgz"; - url = "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz"; - sha1 = "094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"; + name = "cheerio_select___cheerio_select_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.4.0.tgz"; + sha1 = "3a16f21e37a2ef0f211d6d1aa4eff054bb22cdc9"; + }; + } + { + name = "cheerio___cheerio_1.0.0_rc.9.tgz"; + path = fetchurl { + name = "cheerio___cheerio_1.0.0_rc.9.tgz"; + url = "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.9.tgz"; + sha1 = "a3ae6b7ce7af80675302ff836f628e7cb786a67f"; + }; + } + { + name = "chokidar___chokidar_3.5.1.tgz"; + path = fetchurl { + name = "chokidar___chokidar_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz"; + sha1 = "ee9ce7bbebd2b79f49f304799d5468e31e14e68a"; }; } { @@ -3073,14 +3265,6 @@ sha1 = "804b3a7b6a99358c3c5c61e71d8728f041cff917"; }; } - { - name = "chokidar___chokidar_3.4.3.tgz"; - path = fetchurl { - name = "chokidar___chokidar_3.4.3.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz"; - sha1 = "c1df38231448e45ca4ac588e6c79573ba6a57d5b"; - }; - } { name = "chownr___chownr_1.1.4.tgz"; path = fetchurl { @@ -3090,11 +3274,11 @@ }; } { - name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; path = fetchurl { - name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; - sha1 = "234090ee97c7d4ad1a2c4beae27505deffc608a4"; + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; + sha1 = "1015eced4741e15d06664a957dbbf50d041e26ac"; }; } { @@ -3122,11 +3306,11 @@ }; } { - name = "classnames___classnames_2.2.6.tgz"; + name = "classnames___classnames_2.3.1.tgz"; path = fetchurl { - name = "classnames___classnames_2.2.6.tgz"; - url = "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz"; - sha1 = "43935bffdd291f326dad0a205309b38d00f650ce"; + name = "classnames___classnames_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz"; + sha1 = "dfcfa3891e306ec1dad105d0e88f4417b8535e8e"; }; } { @@ -3209,6 +3393,14 @@ sha1 = "43f6c21151b4ef2bf57187db0d73de229e3e7ec3"; }; } + { + name = "codemirror_promql___codemirror_promql_0.15.0.tgz"; + path = fetchurl { + name = "codemirror_promql___codemirror_promql_0.15.0.tgz"; + url = "https://registry.yarnpkg.com/codemirror-promql/-/codemirror-promql-0.15.0.tgz"; + sha1 = "dd6365ea5c2d18421d225cef12b74e64d8cab280"; + }; + } { name = "collection_visit___collection_visit_1.0.0.tgz"; path = fetchurl { @@ -3250,11 +3442,11 @@ }; } { - name = "color_string___color_string_1.5.4.tgz"; + name = "color_string___color_string_1.5.5.tgz"; path = fetchurl { - name = "color_string___color_string_1.5.4.tgz"; - url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz"; - sha1 = "dd51cd25cfee953d138fe4002372cc3d0e504cb6"; + name = "color_string___color_string_1.5.5.tgz"; + url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz"; + sha1 = "65474a8f0e7439625f3d27a6a19d89fc45223014"; }; } { @@ -3266,11 +3458,11 @@ }; } { - name = "colorette___colorette_1.2.1.tgz"; + name = "colorette___colorette_1.2.2.tgz"; path = fetchurl { - name = "colorette___colorette_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz"; - sha1 = "4d0b921325c14faf92633086a536db6e89564b1b"; + name = "colorette___colorette_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz"; + sha1 = "cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"; }; } { @@ -3346,11 +3538,11 @@ }; } { - name = "compute_scroll_into_view___compute_scroll_into_view_1.0.16.tgz"; + name = "compute_scroll_into_view___compute_scroll_into_view_1.0.17.tgz"; path = fetchurl { - name = "compute_scroll_into_view___compute_scroll_into_view_1.0.16.tgz"; - url = "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.16.tgz"; - sha1 = "5b7bf4f7127ea2c19b750353d7ce6776a90ee088"; + name = "compute_scroll_into_view___compute_scroll_into_view_1.0.17.tgz"; + url = "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz"; + sha1 = "6a88f18acd9d42e9cf4baa6bec7e0522607ab7ab"; }; } { @@ -3482,35 +3674,35 @@ }; } { - name = "core_js_compat___core_js_compat_3.7.0.tgz"; + name = "core_js_compat___core_js_compat_3.12.0.tgz"; path = fetchurl { - name = "core_js_compat___core_js_compat_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.7.0.tgz"; - sha1 = "8479c5d3d672d83f1f5ab94cf353e57113e065ed"; + name = "core_js_compat___core_js_compat_3.12.0.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.12.0.tgz"; + sha1 = "a031e51fe411085e33cb629bfee2acaa53bc309a"; }; } { - name = "core_js_pure___core_js_pure_3.7.0.tgz"; + name = "core_js_pure___core_js_pure_3.12.0.tgz"; path = fetchurl { - name = "core_js_pure___core_js_pure_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.7.0.tgz"; - sha1 = "28a57c861d5698e053f0ff36905f7a3301b4191e"; + name = "core_js_pure___core_js_pure_3.12.0.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.12.0.tgz"; + sha1 = "c59d45954a6569232f0704d085916a5e8c3b272f"; }; } { - name = "core_js___core_js_2.6.11.tgz"; + name = "core_js___core_js_2.6.12.tgz"; path = fetchurl { - name = "core_js___core_js_2.6.11.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz"; - sha1 = "38831469f9922bded8ee21c9dc46985e0399308c"; + name = "core_js___core_js_2.6.12.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz"; + sha1 = "d9333dfa7b065e347cc5682219d6f690859cc2ec"; }; } { - name = "core_js___core_js_3.7.0.tgz"; + name = "core_js___core_js_3.12.0.tgz"; path = fetchurl { - name = "core_js___core_js_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.7.0.tgz"; - sha1 = "b0a761a02488577afbf97179e4681bf49568520f"; + name = "core_js___core_js_3.12.0.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.12.0.tgz"; + sha1 = "62bac86f7d7f087d40dba3e90a211c2c3c8559ea"; }; } { @@ -3570,11 +3762,19 @@ }; } { - name = "cross_fetch___cross_fetch_3.0.6.tgz"; + name = "crelt___crelt_1.0.5.tgz"; path = fetchurl { - name = "cross_fetch___cross_fetch_3.0.6.tgz"; - url = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.6.tgz"; - sha1 = "3a4040bc8941e653e0e9cf17f29ebcd177d3365c"; + name = "crelt___crelt_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/crelt/-/crelt-1.0.5.tgz"; + sha1 = "57c0d52af8c859e354bace1883eb2e1eb182bb94"; + }; + } + { + name = "cross_fetch___cross_fetch_3.1.4.tgz"; + path = fetchurl { + name = "cross_fetch___cross_fetch_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz"; + sha1 = "9723f3a3a247bf8b89039f3a380a9244e8fa2f39"; }; } { @@ -3657,14 +3857,6 @@ sha1 = "3b2ff4972cc362ab88561507a95408a1432135d7"; }; } - { - name = "css_select___css_select_1.2.0.tgz"; - path = fetchurl { - name = "css_select___css_select_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz"; - sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; - }; - } { name = "css_select___css_select_2.1.0.tgz"; path = fetchurl { @@ -3673,6 +3865,14 @@ sha1 = "6a34653356635934a81baca68d0255432105dbef"; }; } + { + name = "css_select___css_select_4.1.2.tgz"; + path = fetchurl { + name = "css_select___css_select_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-4.1.2.tgz"; + sha1 = "8b52b6714ed3a80d8221ec971c543f3b12653286"; + }; + } { name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; path = fetchurl { @@ -3682,19 +3882,11 @@ }; } { - name = "css_tree___css_tree_1.1.1.tgz"; + name = "css_tree___css_tree_1.1.3.tgz"; path = fetchurl { - name = "css_tree___css_tree_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.1.tgz"; - sha1 = "30b8c0161d9fb4e9e2141d762589b6ec2faebd2e"; - }; - } - { - name = "css_what___css_what_2.1.3.tgz"; - path = fetchurl { - name = "css_what___css_what_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz"; - sha1 = "a6d7604573365fe74686c3f311c56513d88285f2"; + name = "css_tree___css_tree_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz"; + sha1 = "eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"; }; } { @@ -3705,6 +3897,14 @@ sha1 = "ea7026fcb01777edbde52124e21f327e7ae950e4"; }; } + { + name = "css_what___css_what_5.0.0.tgz"; + path = fetchurl { + name = "css_what___css_what_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-5.0.0.tgz"; + sha1 = "f0bf4f8bac07582722346ab243f6a35b512cfc47"; + }; + } { name = "css.escape___css.escape_1.5.1.tgz"; path = fetchurl { @@ -3746,11 +3946,11 @@ }; } { - name = "cssnano_preset_default___cssnano_preset_default_4.0.7.tgz"; + name = "cssnano_preset_default___cssnano_preset_default_4.0.8.tgz"; path = fetchurl { - name = "cssnano_preset_default___cssnano_preset_default_4.0.7.tgz"; - url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz"; - sha1 = "51ec662ccfca0f88b396dcd9679cdb931be17f76"; + name = "cssnano_preset_default___cssnano_preset_default_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz"; + sha1 = "920622b1fc1e95a34e8838203f1397a504f2d3ff"; }; } { @@ -3786,19 +3986,19 @@ }; } { - name = "cssnano___cssnano_4.1.10.tgz"; + name = "cssnano___cssnano_4.1.11.tgz"; path = fetchurl { - name = "cssnano___cssnano_4.1.10.tgz"; - url = "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz"; - sha1 = "0ac41f0b13d13d465487e111b778d42da631b8b2"; + name = "cssnano___cssnano_4.1.11.tgz"; + url = "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.11.tgz"; + sha1 = "c7b5f5b81da269cb1fd982cb960c1200910c9a99"; }; } { - name = "csso___csso_4.1.1.tgz"; + name = "csso___csso_4.2.0.tgz"; path = fetchurl { - name = "csso___csso_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/csso/-/csso-4.1.1.tgz"; - sha1 = "e0cb02d6eb3af1df719222048e4359efd662af13"; + name = "csso___csso_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz"; + sha1 = "ea3a561346e8dc9f546d6febedd50187cf389529"; }; } { @@ -3834,11 +4034,11 @@ }; } { - name = "csstype___csstype_3.0.5.tgz"; + name = "csstype___csstype_3.0.8.tgz"; path = fetchurl { - name = "csstype___csstype_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.5.tgz"; - sha1 = "7fdec6a28a67ae18647c51668a9ff95bb2fa7bb8"; + name = "csstype___csstype_3.0.8.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz"; + sha1 = "d2266a792729fb227cd216fb572f43728e1ad340"; }; } { @@ -3858,11 +4058,11 @@ }; } { - name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.7.tgz"; path = fetchurl { - name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz"; - sha1 = "143c1641cb3d85c60c32329e26899adea8701791"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz"; + sha1 = "64368003512a1a6992593741a09a9d31a836f55d"; }; } { @@ -3953,6 +4153,14 @@ sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; }; } + { + name = "deepmerge___deepmerge_4.2.2.tgz"; + path = fetchurl { + name = "deepmerge___deepmerge_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz"; + sha1 = "44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"; + }; + } { name = "default_gateway___default_gateway_4.2.0.tgz"; path = fetchurl { @@ -4042,11 +4250,11 @@ }; } { - name = "detect_node___detect_node_2.0.4.tgz"; + name = "detect_node___detect_node_2.0.5.tgz"; path = fetchurl { - name = "detect_node___detect_node_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz"; - sha1 = "014ee8f8f669c5c58023da64b8179c083a28c46c"; + name = "detect_node___detect_node_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.5.tgz"; + sha1 = "9d270aa7eaa5af0b72c4c9d9b814e7f4ce738b79"; }; } { @@ -4178,19 +4386,11 @@ }; } { - name = "dom_serializer___dom_serializer_1.1.0.tgz"; + name = "dom_serializer___dom_serializer_1.3.1.tgz"; path = fetchurl { - name = "dom_serializer___dom_serializer_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.1.0.tgz"; - sha1 = "5f7c828f1bfc44887dc2a315ab5c45691d544b58"; - }; - } - { - name = "dom_serializer___dom_serializer_0.1.1.tgz"; - path = fetchurl { - name = "dom_serializer___dom_serializer_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz"; - sha1 = "1ec4059e284babed36eec2941d4a970a189ce7c0"; + name = "dom_serializer___dom_serializer_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.1.tgz"; + sha1 = "d845a1565d7c041a95e5dab62184ab41e3a519be"; }; } { @@ -4210,11 +4410,11 @@ }; } { - name = "domelementtype___domelementtype_2.0.2.tgz"; + name = "domelementtype___domelementtype_2.2.0.tgz"; path = fetchurl { - name = "domelementtype___domelementtype_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz"; - sha1 = "f3b6e549201e46f588b59463dd77187131fe6971"; + name = "domelementtype___domelementtype_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz"; + sha1 = "9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"; }; } { @@ -4250,11 +4450,11 @@ }; } { - name = "domutils___domutils_1.5.1.tgz"; + name = "domhandler___domhandler_4.2.0.tgz"; path = fetchurl { - name = "domutils___domutils_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz"; - sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; + name = "domhandler___domhandler_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz"; + sha1 = "f9768a5f034be60a89a27c2e4d0f74eba0d8b059"; }; } { @@ -4266,19 +4466,19 @@ }; } { - name = "domutils___domutils_2.4.2.tgz"; + name = "domutils___domutils_2.6.0.tgz"; path = fetchurl { - name = "domutils___domutils_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/domutils/-/domutils-2.4.2.tgz"; - sha1 = "7ee5be261944e1ad487d9aa0616720010123922b"; + name = "domutils___domutils_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-2.6.0.tgz"; + sha1 = "2e15c04185d43fb16ae7057cb76433c6edb938b7"; }; } { - name = "dot_case___dot_case_3.0.3.tgz"; + name = "dot_case___dot_case_3.0.4.tgz"; path = fetchurl { - name = "dot_case___dot_case_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz"; - sha1 = "21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"; + name = "dot_case___dot_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz"; + sha1 = "9b2b670d00a431667a8a75ba29cd1b98809ce751"; }; } { @@ -4346,19 +4546,19 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.601.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.727.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.601.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.601.tgz"; - sha1 = "881824eaef0b2f97c89e1abb5835fdd224997d34"; + name = "electron_to_chromium___electron_to_chromium_1.3.727.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz"; + sha1 = "857e310ca00f0b75da4e1db6ff0e073cc4a91ddf"; }; } { - name = "elliptic___elliptic_6.5.3.tgz"; + name = "elliptic___elliptic_6.5.4.tgz"; path = fetchurl { - name = "elliptic___elliptic_6.5.3.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz"; - sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"; + name = "elliptic___elliptic_6.5.4.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz"; + sha1 = "da37cebd31e79a1367e941b592ed1fbebd58abbb"; }; } { @@ -4378,11 +4578,11 @@ }; } { - name = "emoji_regex___emoji_regex_9.2.0.tgz"; + name = "emoji_regex___emoji_regex_9.2.2.tgz"; path = fetchurl { - name = "emoji_regex___emoji_regex_9.2.0.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.0.tgz"; - sha1 = "a26da8e832b16a9753309f25e35e3c0efb9a066a"; + name = "emoji_regex___emoji_regex_9.2.2.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz"; + sha1 = "840c8803b0d8047f4ff0cf963176b32d4ef3ed72"; }; } { @@ -4418,11 +4618,11 @@ }; } { - name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; + name = "enhanced_resolve___enhanced_resolve_4.5.0.tgz"; path = fetchurl { - name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz"; - sha1 = "3b806f3bfafc1ec7de69551ef93cca46c1704126"; + name = "enhanced_resolve___enhanced_resolve_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz"; + sha1 = "2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"; }; } { @@ -4434,27 +4634,27 @@ }; } { - name = "entities___entities_2.1.0.tgz"; + name = "entities___entities_2.2.0.tgz"; path = fetchurl { - name = "entities___entities_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz"; - sha1 = "992d3129cf7df6870b96c57858c249a120f8b8b5"; + name = "entities___entities_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz"; + sha1 = "098dc90ebb83d8dffa089d55256b351d34c4da55"; }; } { - name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.5.tgz"; + name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.6.tgz"; path = fetchurl { - name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.5.tgz"; - url = "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.5.tgz"; - sha1 = "7a6f0093d3edd2f7025b36e7fbf290695473ee04"; + name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.6.tgz"; + url = "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.6.tgz"; + sha1 = "fd677a658d62661ac5afd7f7f541f141f8085901"; }; } { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.1.tgz"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.14.0.tgz"; path = fetchurl { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.1.tgz"; - url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.1.tgz"; - sha1 = "59c1b734b0927543e3d8dc477299ec957feb312d"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.14.0.tgz"; + url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz"; + sha1 = "afbb0485e8033aa50c744efb5f5711e64fbf1ad0"; }; } { @@ -4466,11 +4666,11 @@ }; } { - name = "enzyme_to_json___enzyme_to_json_3.6.1.tgz"; + name = "enzyme_to_json___enzyme_to_json_3.6.2.tgz"; path = fetchurl { - name = "enzyme_to_json___enzyme_to_json_3.6.1.tgz"; - url = "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.6.1.tgz"; - sha1 = "d60740950bc7ca6384dfe6fe405494ec5df996bc"; + name = "enzyme_to_json___enzyme_to_json_3.6.2.tgz"; + url = "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.6.2.tgz"; + sha1 = "94f85c413bcae8ab67be53b0a94b69a560e27823"; }; } { @@ -4482,11 +4682,11 @@ }; } { - name = "errno___errno_0.1.7.tgz"; + name = "errno___errno_0.1.8.tgz"; path = fetchurl { - name = "errno___errno_0.1.7.tgz"; - url = "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz"; - sha1 = "4684d71779ad39af177e3f007996f7c67c852618"; + name = "errno___errno_0.1.8.tgz"; + url = "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz"; + sha1 = "8bb3e9c7d463be4976ff888f76b4809ebc2e811f"; }; } { @@ -4498,19 +4698,11 @@ }; } { - name = "es_abstract___es_abstract_1.17.7.tgz"; + name = "es_abstract___es_abstract_1.18.0.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.17.7.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz"; - sha1 = "a4de61b2f66989fc7421676c1cb9787573ace54c"; - }; - } - { - name = "es_abstract___es_abstract_1.18.0_next.1.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.18.0_next.1.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz"; - sha1 = "6e3a0a4bda717e5023ab3b8e90bec36108d22c68"; + name = "es_abstract___es_abstract_1.18.0.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz"; + sha1 = "ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"; }; } { @@ -4577,6 +4769,14 @@ sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; } + { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + }; + } { name = "escodegen___escodegen_1.14.3.tgz"; path = fetchurl { @@ -4585,6 +4785,14 @@ sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503"; }; } + { + name = "escodegen___escodegen_2.0.0.tgz"; + path = fetchurl { + name = "escodegen___escodegen_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz"; + sha1 = "5e32b12833e8aa8fa35e1bf0befa89380484c7dd"; + }; + } { name = "eslint_config_prettier___eslint_config_prettier_6.15.0.tgz"; path = fetchurl { @@ -4674,11 +4882,11 @@ }; } { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.4.tgz"; + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.4.0.tgz"; path = fetchurl { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.4.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz"; - sha1 = "168ab43154e2ea57db992a2cd097c828171f75c2"; + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz"; + sha1 = "cdbad3bf1dbd2b177e9825737fe63b476a08f0c7"; }; } { @@ -4706,11 +4914,11 @@ }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.21.5.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.23.2.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.21.5.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.21.5.tgz"; - sha1 = "50b21a412b9574bfe05b21db176e8b7b3b15bff3"; + name = "eslint_plugin_react___eslint_plugin_react_7.23.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz"; + sha1 = "2d2291b0f95c03728b55869f01102290e792d494"; }; } { @@ -4778,11 +4986,11 @@ }; } { - name = "esquery___esquery_1.3.1.tgz"; + name = "esquery___esquery_1.4.0.tgz"; path = fetchurl { - name = "esquery___esquery_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; - sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; + name = "esquery___esquery_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; + sha1 = "2148ffc38b82e8c7057dfed48425b3e61f0f24a5"; }; } { @@ -4834,19 +5042,19 @@ }; } { - name = "events___events_3.2.0.tgz"; + name = "events___events_3.3.0.tgz"; path = fetchurl { - name = "events___events_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz"; - sha1 = "93b87c18f8efcd4202a461aec4dfc0556b639379"; + name = "events___events_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz"; + sha1 = "31a95ad0a924e2d2c419a813aeb2c4e878ea7400"; }; } { - name = "eventsource___eventsource_1.0.7.tgz"; + name = "eventsource___eventsource_1.1.0.tgz"; path = fetchurl { - name = "eventsource___eventsource_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz"; - sha1 = "8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"; + name = "eventsource___eventsource_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz"; + sha1 = "00e8ca7c92109e94b0ddf32dac677d841028cfaf"; }; } { @@ -4858,11 +5066,11 @@ }; } { - name = "exec_sh___exec_sh_0.3.4.tgz"; + name = "exec_sh___exec_sh_0.3.6.tgz"; path = fetchurl { - name = "exec_sh___exec_sh_0.3.4.tgz"; - url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz"; - sha1 = "3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"; + name = "exec_sh___exec_sh_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz"; + sha1 = "ff264f9e325519a60cb5e273692943483cca63bc"; }; } { @@ -5194,11 +5402,19 @@ }; } { - name = "follow_redirects___follow_redirects_1.13.0.tgz"; + name = "follow_redirects___follow_redirects_1.14.0.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz"; - sha1 = "b42e8d93a2a7eea5ed88633676d6597bc8e384db"; + name = "follow_redirects___follow_redirects_1.14.0.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz"; + sha1 = "f5d260f95c5f8c105894491feee5dc8993b402fe"; + }; + } + { + name = "for_each___for_each_0.3.3.tgz"; + path = fetchurl { + name = "for_each___for_each_0.3.3.tgz"; + url = "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz"; + sha1 = "69b447e88a0a5d32c3e7084f3f1710034b21376e"; }; } { @@ -5346,11 +5562,11 @@ }; } { - name = "fsevents___fsevents_2.1.3.tgz"; + name = "fsevents___fsevents_2.3.2.tgz"; path = fetchurl { - name = "fsevents___fsevents_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz"; - sha1 = "fb738703ae8d2f9fe900c33836ddebee8b97f23e"; + name = "fsevents___fsevents_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; + sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; }; } { @@ -5362,11 +5578,11 @@ }; } { - name = "function.prototype.name___function.prototype.name_1.1.2.tgz"; + name = "function.prototype.name___function.prototype.name_1.1.4.tgz"; path = fetchurl { - name = "function.prototype.name___function.prototype.name_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.2.tgz"; - sha1 = "5cdf79d7c05db401591dfde83e3b70c5123e9a45"; + name = "function.prototype.name___function.prototype.name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.4.tgz"; + sha1 = "e4ea839b9d3672ae99d0efd9f38d9191c5eaac83"; }; } { @@ -5378,11 +5594,11 @@ }; } { - name = "functions_have_names___functions_have_names_1.2.1.tgz"; + name = "functions_have_names___functions_have_names_1.2.2.tgz"; path = fetchurl { - name = "functions_have_names___functions_have_names_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.1.tgz"; - sha1 = "a981ac397fa0c9964551402cdc5533d7a4d52f91"; + name = "functions_have_names___functions_have_names_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.2.tgz"; + sha1 = "98d93991c39da9361f8e50b337c4f6e41f120e21"; }; } { @@ -5410,11 +5626,11 @@ }; } { - name = "get_intrinsic___get_intrinsic_1.0.1.tgz"; + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz"; - sha1 = "94a9768fcbdd0595a1c9273aacf4c89d075631be"; + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha1 = "15f59f376f855c446963948f0d24cd3637b4abc6"; }; } { @@ -5466,11 +5682,11 @@ }; } { - name = "glob_parent___glob_parent_5.1.1.tgz"; + name = "glob_parent___glob_parent_5.1.2.tgz"; path = fetchurl { - name = "glob_parent___glob_parent_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; - sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; + name = "glob_parent___glob_parent_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; + sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; }; } { @@ -5538,11 +5754,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.4.tgz"; + name = "graceful_fs___graceful_fs_4.2.6.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.4.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; + name = "graceful_fs___graceful_fs_4.2.6.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz"; + sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee"; }; } { @@ -5594,11 +5810,11 @@ }; } { - name = "harmony_reflect___harmony_reflect_1.6.1.tgz"; + name = "harmony_reflect___harmony_reflect_1.6.2.tgz"; path = fetchurl { - name = "harmony_reflect___harmony_reflect_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.1.tgz"; - sha1 = "c108d4f2bb451efef7a37861fdbdae72c9bdefa9"; + name = "harmony_reflect___harmony_reflect_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz"; + sha1 = "31ecbd32e648a34d030d86adb67d4d47547fe710"; }; } { @@ -5609,6 +5825,14 @@ sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; }; } + { + name = "has_bigints___has_bigints_1.0.1.tgz"; + path = fetchurl { + name = "has_bigints___has_bigints_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz"; + sha1 = "64fe6acb020673e3b78db035a5af69aa9d07b113"; + }; + } { name = "has_flag___has_flag_3.0.0.tgz"; path = fetchurl { @@ -5626,11 +5850,11 @@ }; } { - name = "has_symbols___has_symbols_1.0.1.tgz"; + name = "has_symbols___has_symbols_1.0.2.tgz"; path = fetchurl { - name = "has_symbols___has_symbols_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; - sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; + name = "has_symbols___has_symbols_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz"; + sha1 = "165d3070c00309752a1236a479331e3ac56f1423"; }; } { @@ -5714,11 +5938,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; - sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha1 = "dffc0bf9a21c02209090f2aa69429e1414daf3f9"; }; } { @@ -5746,19 +5970,11 @@ }; } { - name = "html_comment_regex___html_comment_regex_1.1.2.tgz"; + name = "html_element_map___html_element_map_1.3.0.tgz"; path = fetchurl { - name = "html_comment_regex___html_comment_regex_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz"; - sha1 = "97d4688aeb5c81886a364faa0cad1dda14d433a7"; - }; - } - { - name = "html_element_map___html_element_map_1.2.0.tgz"; - path = fetchurl { - name = "html_element_map___html_element_map_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.2.0.tgz"; - sha1 = "dfbb09efe882806af63d990cf6db37993f099f22"; + name = "html_element_map___html_element_map_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.3.0.tgz"; + sha1 = "fcf226985d7111e6c2b958169312ec750d02f0d3"; }; } { @@ -5778,11 +5994,11 @@ }; } { - name = "html_entities___html_entities_1.3.1.tgz"; + name = "html_entities___html_entities_1.4.0.tgz"; path = fetchurl { - name = "html_entities___html_entities_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz"; - sha1 = "fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"; + name = "html_entities___html_entities_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz"; + sha1 = "cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"; }; } { @@ -5825,6 +6041,14 @@ sha1 = "9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78"; }; } + { + name = "htmlparser2___htmlparser2_6.1.0.tgz"; + path = fetchurl { + name = "htmlparser2___htmlparser2_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz"; + sha1 = "c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"; + }; + } { name = "http_deceiver___http_deceiver_1.2.7.tgz"; path = fetchurl { @@ -5858,11 +6082,11 @@ }; } { - name = "http_parser_js___http_parser_js_0.5.2.tgz"; + name = "http_parser_js___http_parser_js_0.5.3.tgz"; path = fetchurl { - name = "http_parser_js___http_parser_js_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.2.tgz"; - sha1 = "da2e31d237b393aae72ace43882dd7e270a8ff77"; + name = "http_parser_js___http_parser_js_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz"; + sha1 = "01d2709c79d41698bb01d4decc5e9da4e4a033d9"; }; } { @@ -5986,11 +6210,11 @@ }; } { - name = "import_fresh___import_fresh_3.2.2.tgz"; + name = "import_fresh___import_fresh_3.3.0.tgz"; path = fetchurl { - name = "import_fresh___import_fresh_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz"; - sha1 = "fc129c160c5d68235507f4331a6baad186bdbc3e"; + name = "import_fresh___import_fresh_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; + sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"; }; } { @@ -6074,11 +6298,11 @@ }; } { - name = "ini___ini_1.3.5.tgz"; + name = "ini___ini_1.3.8.tgz"; path = fetchurl { - name = "ini___ini_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz"; - sha1 = "eee25f56db1c9ec6085e0c22778083f596abf927"; + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; }; } { @@ -6106,11 +6330,11 @@ }; } { - name = "internal_slot___internal_slot_1.0.2.tgz"; + name = "internal_slot___internal_slot_1.0.3.tgz"; path = fetchurl { - name = "internal_slot___internal_slot_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz"; - sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"; + name = "internal_slot___internal_slot_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz"; + sha1 = "7347e307deeea2faac2ac6205d4bc7d34967f59c"; }; } { @@ -6178,11 +6402,11 @@ }; } { - name = "is_arguments___is_arguments_1.0.4.tgz"; + name = "is_arguments___is_arguments_1.1.0.tgz"; path = fetchurl { - name = "is_arguments___is_arguments_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz"; - sha1 = "3faf966c7cba0ff437fb31f6250082fcf0448cf3"; + name = "is_arguments___is_arguments_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz"; + sha1 = "62353031dfbee07ceb34656a6bde59efecae8dd9"; }; } { @@ -6201,6 +6425,14 @@ sha1 = "4574a2ae56f7ab206896fb431eaeed066fdf8f03"; }; } + { + name = "is_bigint___is_bigint_1.0.2.tgz"; + path = fetchurl { + name = "is_bigint___is_bigint_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz"; + sha1 = "ffb381442503235ad245ea89e45b3dbff040ee5a"; + }; + } { name = "is_binary_path___is_binary_path_1.0.1.tgz"; path = fetchurl { @@ -6218,11 +6450,11 @@ }; } { - name = "is_boolean_object___is_boolean_object_1.0.1.tgz"; + name = "is_boolean_object___is_boolean_object_1.1.0.tgz"; path = fetchurl { - name = "is_boolean_object___is_boolean_object_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz"; - sha1 = "10edc0900dd127697a92f6f9807c7617d68ac48e"; + name = "is_boolean_object___is_boolean_object_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz"; + sha1 = "e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"; }; } { @@ -6234,11 +6466,11 @@ }; } { - name = "is_callable___is_callable_1.2.2.tgz"; + name = "is_callable___is_callable_1.2.3.tgz"; path = fetchurl { - name = "is_callable___is_callable_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz"; - sha1 = "c7c6715cd22d4ddb48d3e19970223aceabb080d9"; + name = "is_callable___is_callable_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz"; + sha1 = "8b1e0500b73a1d76c70487636f368e519de8db8e"; }; } { @@ -6258,11 +6490,11 @@ }; } { - name = "is_core_module___is_core_module_2.1.0.tgz"; + name = "is_core_module___is_core_module_2.3.0.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz"; - sha1 = "a4cc031d9b1aca63eecbd18a650e13cb4eeab946"; + name = "is_core_module___is_core_module_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz"; + sha1 = "d341652e3408bca69c4671b79a0954a3d349f887"; }; } { @@ -6282,11 +6514,11 @@ }; } { - name = "is_date_object___is_date_object_1.0.2.tgz"; + name = "is_date_object___is_date_object_1.0.3.tgz"; path = fetchurl { - name = "is_date_object___is_date_object_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz"; - sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"; + name = "is_date_object___is_date_object_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.3.tgz"; + sha1 = "4c0802ae9c8097939ea8001eaae3c502f3dbe72f"; }; } { @@ -6314,11 +6546,11 @@ }; } { - name = "is_docker___is_docker_2.1.1.tgz"; + name = "is_docker___is_docker_2.2.1.tgz"; path = fetchurl { - name = "is_docker___is_docker_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz"; - sha1 = "4125a88e44e450d384e09047ede71adc2d144156"; + name = "is_docker___is_docker_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz"; + sha1 = "33eeabe23cfe86f14bde4408a02c0cfb853acdaa"; }; } { @@ -6386,11 +6618,11 @@ }; } { - name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; path = fetchurl { - name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz"; - sha1 = "9553b121b0fac28869da9ed459e20c7543788461"; + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; + sha1 = "3de746c18dda2319241a53675908d8f766f11c24"; }; } { @@ -6474,19 +6706,27 @@ }; } { - name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; + name = "is_plain_object___is_plain_object_5.0.0.tgz"; path = fetchurl { - name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz"; - sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397"; + name = "is_plain_object___is_plain_object_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz"; + sha1 = "4427f50ab3429e9025ea7d52e9043a9ef4159344"; }; } { - name = "is_regex___is_regex_1.1.1.tgz"; + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; path = fetchurl { - name = "is_regex___is_regex_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz"; - sha1 = "c6f98aacc546f6cec5468a07b7b153ab564a57b9"; + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz"; + sha1 = "171ed6f19e3ac554394edf78caa05784a45bebb5"; + }; + } + { + name = "is_regex___is_regex_1.1.2.tgz"; + path = fetchurl { + name = "is_regex___is_regex_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz"; + sha1 = "81c8ebde4db142f2cf1c53fc86d6a45788266251"; }; } { @@ -6537,14 +6777,6 @@ sha1 = "8a59117d932de1de00f245fcdd39ce43f1e939a6"; }; } - { - name = "is_svg___is_svg_3.0.0.tgz"; - path = fetchurl { - name = "is_svg___is_svg_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz"; - sha1 = "9321dbd29c212e5ca99c4fa9794c714bcafa2f75"; - }; - } { name = "is_symbol___is_symbol_1.0.3.tgz"; path = fetchurl { @@ -6954,11 +7186,11 @@ }; } { - name = "jquery___jquery_3.5.1.tgz"; + name = "jquery___jquery_3.6.0.tgz"; path = fetchurl { - name = "jquery___jquery_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz"; - sha1 = "d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"; + name = "jquery___jquery_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz"; + sha1 = "c72a09f15c1bdce142f49dbf1170bdf8adac2470"; }; } { @@ -6978,11 +7210,11 @@ }; } { - name = "js_yaml___js_yaml_3.14.0.tgz"; + name = "js_yaml___js_yaml_3.14.1.tgz"; path = fetchurl { - name = "js_yaml___js_yaml_3.14.0.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz"; - sha1 = "a7a34170f26a21bb162424d8adacb4113a69e482"; + name = "js_yaml___js_yaml_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; + sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; }; } { @@ -7010,11 +7242,11 @@ }; } { - name = "jsdom___jsdom_16.4.0.tgz"; + name = "jsdom___jsdom_16.5.3.tgz"; path = fetchurl { - name = "jsdom___jsdom_16.4.0.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz"; - sha1 = "36005bde2d136f73eee1a830c6d45e55408edddb"; + name = "jsdom___jsdom_16.5.3.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.3.tgz"; + sha1 = "13a755b3950eb938b4482c407238ddf16f0d2136"; }; } { @@ -7106,11 +7338,11 @@ }; } { - name = "json5___json5_2.1.3.tgz"; + name = "json5___json5_2.2.0.tgz"; path = fetchurl { - name = "json5___json5_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; - sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; + name = "json5___json5_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; + sha1 = "2dfefe720c6ba525d9ebd909950f0515316c89a3"; }; } { @@ -7146,19 +7378,19 @@ }; } { - name = "jsx_ast_utils___jsx_ast_utils_3.1.0.tgz"; + name = "jsx_ast_utils___jsx_ast_utils_3.2.0.tgz"; path = fetchurl { - name = "jsx_ast_utils___jsx_ast_utils_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz"; - sha1 = "642f1d7b88aa6d7eb9d8f2210e166478444fa891"; + name = "jsx_ast_utils___jsx_ast_utils_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz"; + sha1 = "41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82"; }; } { - name = "just_extend___just_extend_4.1.1.tgz"; + name = "just_extend___just_extend_4.2.1.tgz"; path = fetchurl { - name = "just_extend___just_extend_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/just-extend/-/just-extend-4.1.1.tgz"; - sha1 = "158f1fdb01f128c411dc8b286a7b4837b3545282"; + name = "just_extend___just_extend_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz"; + sha1 = "ef5e589afb61e5d66b24eca749409a8939a8c744"; }; } { @@ -7217,6 +7449,14 @@ sha1 = "a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"; }; } + { + name = "klona___klona_2.0.4.tgz"; + path = fetchurl { + name = "klona___klona_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz"; + sha1 = "7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"; + }; + } { name = "language_subtag_registry___language_subtag_registry_0.3.21.tgz"; path = fetchurl { @@ -7289,6 +7529,30 @@ sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; }; } + { + name = "lezer_promql___lezer_promql_0.18.0.tgz"; + path = fetchurl { + name = "lezer_promql___lezer_promql_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/lezer-promql/-/lezer-promql-0.18.0.tgz"; + sha1 = "7eea8cb02f8203043560415d7a436e9903176ab2"; + }; + } + { + name = "lezer_tree___lezer_tree_0.13.2.tgz"; + path = fetchurl { + name = "lezer_tree___lezer_tree_0.13.2.tgz"; + url = "https://registry.yarnpkg.com/lezer-tree/-/lezer-tree-0.13.2.tgz"; + sha1 = "00f4671309b15c27b131f637e430ce2d4d5f7065"; + }; + } + { + name = "lezer___lezer_0.13.4.tgz"; + path = fetchurl { + name = "lezer___lezer_0.13.4.tgz"; + url = "https://registry.yarnpkg.com/lezer/-/lezer-0.13.4.tgz"; + sha1 = "f0396a3447c7a8f40391623f3f47a4d95559c42f"; + }; + } { name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; path = fetchurl { @@ -7345,6 +7609,14 @@ sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; }; } + { + name = "loader_utils___loader_utils_2.0.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz"; + sha1 = "e4cace5b816d425a166b5f097e10cd12b36064b0"; + }; + } { name = "locate_path___locate_path_2.0.0.tgz"; path = fetchurl { @@ -7377,6 +7649,14 @@ sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; }; } + { + name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; + path = fetchurl { + name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + }; + } { name = "lodash.escape___lodash.escape_4.0.1.tgz"; path = fetchurl { @@ -7450,19 +7730,19 @@ }; } { - name = "lodash___lodash_4.17.20.tgz"; + name = "lodash___lodash_4.17.21.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.20.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; - sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; }; } { - name = "loglevel___loglevel_1.7.0.tgz"; + name = "loglevel___loglevel_1.7.1.tgz"; path = fetchurl { - name = "loglevel___loglevel_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz"; - sha1 = "728166855a740d59d38db01cf46f042caa041bb0"; + name = "loglevel___loglevel_1.7.1.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz"; + sha1 = "005fde2f5e6e47068f935ff28573e125ef72f197"; }; } { @@ -7474,11 +7754,11 @@ }; } { - name = "lower_case___lower_case_2.0.1.tgz"; + name = "lower_case___lower_case_2.0.2.tgz"; path = fetchurl { - name = "lower_case___lower_case_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz"; - sha1 = "39eeb36e396115cc05e29422eaea9e692c9408c7"; + name = "lower_case___lower_case_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz"; + sha1 = "6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"; }; } { @@ -7489,6 +7769,14 @@ sha1 = "1da27e6710271947695daf6848e847f01d84b920"; }; } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + }; + } { name = "make_dir___make_dir_2.1.0.tgz"; path = fetchurl { @@ -7586,11 +7874,11 @@ }; } { - name = "merge_deep___merge_deep_3.0.2.tgz"; + name = "merge_deep___merge_deep_3.0.3.tgz"; path = fetchurl { - name = "merge_deep___merge_deep_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/merge-deep/-/merge-deep-3.0.2.tgz"; - sha1 = "f39fa100a4f1bd34ff29f7d2bf4508fbb8d83ad2"; + name = "merge_deep___merge_deep_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/merge-deep/-/merge-deep-3.0.3.tgz"; + sha1 = "1a2b2ae926da8b2ae93a0ac15d90cd1922766003"; }; } { @@ -7650,27 +7938,19 @@ }; } { - name = "mime_db___mime_db_1.44.0.tgz"; + name = "mime_db___mime_db_1.47.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.44.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; - sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; + name = "mime_db___mime_db_1.47.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz"; + sha1 = "8cb313e59965d3c05cfbf898915a267af46a335c"; }; } { - name = "mime_db___mime_db_1.45.0.tgz"; + name = "mime_types___mime_types_2.1.30.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.45.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz"; - sha1 = "cceeda21ccd7c3a745eba2decd55d4b73e7879ea"; - }; - } - { - name = "mime_types___mime_types_2.1.27.tgz"; - path = fetchurl { - name = "mime_types___mime_types_2.1.27.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; - sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; + name = "mime_types___mime_types_2.1.30.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz"; + sha1 = "6e7be8b4c479825f85ed6326695db73f9305d62d"; }; } { @@ -7682,11 +7962,11 @@ }; } { - name = "mime___mime_2.4.6.tgz"; + name = "mime___mime_2.5.2.tgz"; path = fetchurl { - name = "mime___mime_2.4.6.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz"; - sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1"; + name = "mime___mime_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz"; + sha1 = "6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"; }; } { @@ -7802,19 +8082,11 @@ }; } { - name = "moment_timezone___moment_timezone_0.5.32.tgz"; + name = "moment_timezone___moment_timezone_0.5.33.tgz"; path = fetchurl { - name = "moment_timezone___moment_timezone_0.5.32.tgz"; - url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.32.tgz"; - sha1 = "db7677cc3cc680fd30303ebd90b0da1ca0dfecc2"; - }; - } - { - name = "moment_timezone___moment_timezone_0.4.1.tgz"; - path = fetchurl { - name = "moment_timezone___moment_timezone_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.4.1.tgz"; - sha1 = "81f598c3ad5e22cdad796b67ecd8d88d0f5baa06"; + name = "moment_timezone___moment_timezone_0.5.33.tgz"; + url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz"; + sha1 = "b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c"; }; } { @@ -7825,6 +8097,14 @@ sha1 = "b2be769fa31940be9eeea6469c075e35006fa3d3"; }; } + { + name = "moment___moment_2.24.0.tgz"; + path = fetchurl { + name = "moment___moment_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz"; + sha1 = "0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"; + }; + } { name = "moo___moo_0.5.1.tgz"; path = fetchurl { @@ -7865,6 +8145,14 @@ sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; }; } + { + name = "ms___ms_2.1.3.tgz"; + path = fetchurl { + name = "ms___ms_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; + sha1 = "574c8138ce1d2b5861f0b44579dbadd60c6615b2"; + }; + } { name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz"; path = fetchurl { @@ -7881,6 +8169,14 @@ sha1 = "a0ec7bd9055c4282f790c3c82f4e28db3b31b229"; }; } + { + name = "mutationobserver_shim___mutationobserver_shim_0.3.7.tgz"; + path = fetchurl { + name = "mutationobserver_shim___mutationobserver_shim_0.3.7.tgz"; + url = "https://registry.yarnpkg.com/mutationobserver-shim/-/mutationobserver-shim-0.3.7.tgz"; + sha1 = "8bf633b0c0b0291a1107255ed32c13088a8c5bf3"; + }; + } { name = "mute_stream___mute_stream_0.0.8.tgz"; path = fetchurl { @@ -7897,6 +8193,14 @@ sha1 = "f5376400695168f4cc694ac9393d0c9585eeea19"; }; } + { + name = "nanoid___nanoid_3.1.22.tgz"; + path = fetchurl { + name = "nanoid___nanoid_3.1.22.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz"; + sha1 = "b35f8fb7d151990a8aebd5aa5015c03cf726f844"; + }; + } { name = "nanomatch___nanomatch_1.2.13.tgz"; path = fetchurl { @@ -7914,11 +8218,11 @@ }; } { - name = "nearley___nearley_2.19.7.tgz"; + name = "nearley___nearley_2.20.1.tgz"; path = fetchurl { - name = "nearley___nearley_2.19.7.tgz"; - url = "https://registry.yarnpkg.com/nearley/-/nearley-2.19.7.tgz"; - sha1 = "eafbe3e2d8ccfe70adaa5c026ab1f9709c116218"; + name = "nearley___nearley_2.20.1.tgz"; + url = "https://registry.yarnpkg.com/nearley/-/nearley-2.20.1.tgz"; + sha1 = "246cd33eff0d012faf197ff6774d7ac78acdd474"; }; } { @@ -7954,19 +8258,19 @@ }; } { - name = "nise___nise_4.0.4.tgz"; + name = "nise___nise_4.1.0.tgz"; path = fetchurl { - name = "nise___nise_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/nise/-/nise-4.0.4.tgz"; - sha1 = "d73dea3e5731e6561992b8f570be9e363c4512dd"; + name = "nise___nise_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/nise/-/nise-4.1.0.tgz"; + sha1 = "8fb75a26e90b99202fa1e63f448f58efbcdedaf6"; }; } { - name = "no_case___no_case_3.0.3.tgz"; + name = "no_case___no_case_3.0.4.tgz"; path = fetchurl { - name = "no_case___no_case_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz"; - sha1 = "c21b434c1ffe48b39087e86cfb4d2582e9df18f8"; + name = "no_case___no_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz"; + sha1 = "d361fd5c9800f558551a8369fc0dcd4662b6124d"; }; } { @@ -8010,19 +8314,19 @@ }; } { - name = "node_notifier___node_notifier_5.4.3.tgz"; + name = "node_notifier___node_notifier_5.4.5.tgz"; path = fetchurl { - name = "node_notifier___node_notifier_5.4.3.tgz"; - url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.3.tgz"; - sha1 = "cb72daf94c93904098e28b9c590fd866e464bd50"; + name = "node_notifier___node_notifier_5.4.5.tgz"; + url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.5.tgz"; + sha1 = "0cbc1a2b0f658493b4025775a13ad938e96091ef"; }; } { - name = "node_releases___node_releases_1.1.67.tgz"; + name = "node_releases___node_releases_1.1.71.tgz"; path = fetchurl { - name = "node_releases___node_releases_1.1.67.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz"; - sha1 = "28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"; + name = "node_releases___node_releases_1.1.71.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz"; + sha1 = "cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"; }; } { @@ -8089,6 +8393,14 @@ sha1 = "b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"; }; } + { + name = "nth_check___nth_check_2.0.0.tgz"; + path = fetchurl { + name = "nth_check___nth_check_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz"; + sha1 = "1bb4f6dac70072fc313e8c9cd1417b5074c0a125"; + }; + } { name = "num2fraction___num2fraction_1.2.2.tgz"; path = fetchurl { @@ -8130,27 +8442,27 @@ }; } { - name = "object_hash___object_hash_2.0.3.tgz"; + name = "object_hash___object_hash_2.1.1.tgz"; path = fetchurl { - name = "object_hash___object_hash_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz"; - sha1 = "d12db044e03cd2ca3d77c0570d87225b02e1e6ea"; + name = "object_hash___object_hash_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-hash/-/object-hash-2.1.1.tgz"; + sha1 = "9447d0279b4fcf80cff3259bf66a1dc73afabe09"; }; } { - name = "object_inspect___object_inspect_1.8.0.tgz"; + name = "object_inspect___object_inspect_1.10.2.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz"; - sha1 = "df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"; + name = "object_inspect___object_inspect_1.10.2.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz"; + sha1 = "b6385a3e2b7cae0b5eafcf90cddf85d128767f30"; }; } { - name = "object_is___object_is_1.1.3.tgz"; + name = "object_is___object_is_1.1.5.tgz"; path = fetchurl { - name = "object_is___object_is_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz"; - sha1 = "2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"; + name = "object_is___object_is_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz"; + sha1 = "b9deeaa5fc7f1846a0faecdceec138e5778f53ac"; }; } { @@ -8161,14 +8473,6 @@ sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; }; } - { - name = "object_path___object_path_0.11.4.tgz"; - path = fetchurl { - name = "object_path___object_path_0.11.4.tgz"; - url = "https://registry.yarnpkg.com/object-path/-/object-path-0.11.4.tgz"; - sha1 = "370ae752fbf37de3ea70a861c23bba8915691949"; - }; - } { name = "object_visit___object_visit_1.0.1.tgz"; path = fetchurl { @@ -8186,27 +8490,27 @@ }; } { - name = "object.entries___object.entries_1.1.2.tgz"; + name = "object.entries___object.entries_1.1.3.tgz"; path = fetchurl { - name = "object.entries___object.entries_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz"; - sha1 = "bc73f00acb6b6bb16c203434b10f9a7e797d3add"; + name = "object.entries___object.entries_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz"; + sha1 = "c601c7f168b62374541a07ddbd3e2d5e4f7711a6"; }; } { - name = "object.fromentries___object.fromentries_2.0.2.tgz"; + name = "object.fromentries___object.fromentries_2.0.4.tgz"; path = fetchurl { - name = "object.fromentries___object.fromentries_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz"; - sha1 = "4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"; + name = "object.fromentries___object.fromentries_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz"; + sha1 = "26e1ba5c4571c5c6f0890cef4473066456a120b8"; }; } { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.2.tgz"; path = fetchurl { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; - sha1 = "369bf1f9592d8ab89d712dced5cb81c7c5352649"; + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz"; + sha1 = "1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7"; }; } { @@ -8218,11 +8522,11 @@ }; } { - name = "object.values___object.values_1.1.1.tgz"; + name = "object.values___object.values_1.1.3.tgz"; path = fetchurl { - name = "object.values___object.values_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; - sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; + name = "object.values___object.values_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz"; + sha1 = "eaa8b1e17589f02f698db093f7c62ee1699742ee"; }; } { @@ -8266,11 +8570,11 @@ }; } { - name = "open___open_7.3.0.tgz"; + name = "open___open_7.4.2.tgz"; path = fetchurl { - name = "open___open_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz"; - sha1 = "45461fdee46444f3645b6e14eb3ca94b82e1be69"; + name = "open___open_7.4.2.tgz"; + url = "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz"; + sha1 = "b8147e26dcf3e426316c730089fd71edd29c2321"; }; } { @@ -8442,11 +8746,11 @@ }; } { - name = "param_case___param_case_3.0.3.tgz"; + name = "param_case___param_case_3.0.4.tgz"; path = fetchurl { - name = "param_case___param_case_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz"; - sha1 = "4be41f8399eff621c56eebb829a5e451d9801238"; + name = "param_case___param_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz"; + sha1 = "7d17fe4aa12bde34d4a77d91acfb6219caad01c5"; }; } { @@ -8482,11 +8786,11 @@ }; } { - name = "parse_json___parse_json_5.1.0.tgz"; + name = "parse_json___parse_json_5.2.0.tgz"; path = fetchurl { - name = "parse_json___parse_json_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz"; - sha1 = "f96088cdf24a8faa9aea9a009f2d9d942c999646"; + name = "parse_json___parse_json_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; + sha1 = "c76fc66dee54231c962b22bcc8a72cf2f99753cd"; }; } { @@ -8497,6 +8801,14 @@ sha1 = "f2bd221f6cc970a938d88556abc589caaaa2bde1"; }; } + { + name = "parse5_htmlparser2_tree_adapter___parse5_htmlparser2_tree_adapter_6.0.1.tgz"; + path = fetchurl { + name = "parse5_htmlparser2_tree_adapter___parse5_htmlparser2_tree_adapter_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz"; + sha1 = "2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"; + }; + } { name = "parse5___parse5_4.0.0.tgz"; path = fetchurl { @@ -8514,19 +8826,11 @@ }; } { - name = "parse5___parse5_5.1.1.tgz"; + name = "parse5___parse5_6.0.1.tgz"; path = fetchurl { - name = "parse5___parse5_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz"; - sha1 = "f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"; - }; - } - { - name = "parse5___parse5_3.0.3.tgz"; - path = fetchurl { - name = "parse5___parse5_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz"; - sha1 = "042f792ffdd36851551cf4e9e066b3874ab45b5c"; + name = "parse5___parse5_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz"; + sha1 = "e1a1c085c569b3dc08321184f19a39cc27f7c30b"; }; } { @@ -8538,11 +8842,11 @@ }; } { - name = "pascal_case___pascal_case_3.1.1.tgz"; + name = "pascal_case___pascal_case_3.1.2.tgz"; path = fetchurl { - name = "pascal_case___pascal_case_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz"; - sha1 = "5ac1975133ed619281e88920973d2cd1f279de5f"; + name = "pascal_case___pascal_case_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz"; + sha1 = "b48e0ef2b98e205e7c1dae747d0b1508237660eb"; }; } { @@ -8674,11 +8978,11 @@ }; } { - name = "pbkdf2___pbkdf2_3.1.1.tgz"; + name = "pbkdf2___pbkdf2_3.1.2.tgz"; path = fetchurl { - name = "pbkdf2___pbkdf2_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz"; - sha1 = "cb8724b0fada984596856d1a6ebafd3584654b94"; + name = "pbkdf2___pbkdf2_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz"; + sha1 = "dd822aa0887580e52f1a039dc3eda108efae3075"; }; } { @@ -8690,11 +8994,11 @@ }; } { - name = "picomatch___picomatch_2.2.2.tgz"; + name = "picomatch___picomatch_2.2.3.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; - sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; + name = "picomatch___picomatch_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz"; + sha1 = "465547f359ccc206d3c48e46a1bcb89bf7ee619d"; }; } { @@ -9034,11 +9338,11 @@ }; } { - name = "postcss_initial___postcss_initial_3.0.2.tgz"; + name = "postcss_initial___postcss_initial_3.0.4.tgz"; path = fetchurl { - name = "postcss_initial___postcss_initial_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.2.tgz"; - sha1 = "f018563694b3c16ae8eaabe3c585ac6319637b2d"; + name = "postcss_initial___postcss_initial_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.4.tgz"; + sha1 = "9d32069a10531fe2ecafa0b6ac750ee0bc7efc53"; }; } { @@ -9338,11 +9642,11 @@ }; } { - name = "postcss_selector_not___postcss_selector_not_4.0.0.tgz"; + name = "postcss_selector_not___postcss_selector_not_4.0.1.tgz"; path = fetchurl { - name = "postcss_selector_not___postcss_selector_not_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.0.tgz"; - sha1 = "c68ff7ba96527499e832724a2674d65603b645c0"; + name = "postcss_selector_not___postcss_selector_not_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz"; + sha1 = "263016eef1cf219e0ade9a913780fc1f48204cbf"; }; } { @@ -9362,19 +9666,19 @@ }; } { - name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.5.tgz"; path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz"; - sha1 = "56075a1380a04604c38b063ea7767a129af5c2b3"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz"; + sha1 = "042d74e137db83e6f294712096cb413f5aa612c4"; }; } { - name = "postcss_svgo___postcss_svgo_4.0.2.tgz"; + name = "postcss_svgo___postcss_svgo_4.0.3.tgz"; path = fetchurl { - name = "postcss_svgo___postcss_svgo_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz"; - sha1 = "17b997bc711b333bab143aaed3b8d3d6e3d38258"; + name = "postcss_svgo___postcss_svgo_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz"; + sha1 = "343a2cdbac9505d416243d496f724f38894c941e"; }; } { @@ -9425,6 +9729,14 @@ sha1 = "d2be00b998f7f211d8a276974079f2e92b970e24"; }; } + { + name = "postcss___postcss_8.2.14.tgz"; + path = fetchurl { + name = "postcss___postcss_8.2.14.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.2.14.tgz"; + sha1 = "dcf313eb8247b3ce8078d048c0e8262ca565ad2b"; + }; + } { name = "prelude_ls___prelude_ls_1.1.2.tgz"; path = fetchurl { @@ -9458,11 +9770,11 @@ }; } { - name = "pretty_bytes___pretty_bytes_5.4.1.tgz"; + name = "pretty_bytes___pretty_bytes_5.6.0.tgz"; path = fetchurl { - name = "pretty_bytes___pretty_bytes_5.4.1.tgz"; - url = "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.4.1.tgz"; - sha1 = "cd89f79bbcef21e3d21eb0da68ffe93f803e884b"; + name = "pretty_bytes___pretty_bytes_5.6.0.tgz"; + url = "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz"; + sha1 = "356256f643804773c82f64723fe78c92c62beaeb"; }; } { @@ -9538,11 +9850,11 @@ }; } { - name = "prompts___prompts_2.4.0.tgz"; + name = "prompts___prompts_2.4.1.tgz"; path = fetchurl { - name = "prompts___prompts_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz"; - sha1 = "4aa5de0723a231d1ee9121c40fdf663df73f61d7"; + name = "prompts___prompts_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz"; + sha1 = "befd3b1195ba052f9fd2fde8a486c4e82ee77f61"; }; } { @@ -9698,11 +10010,11 @@ }; } { - name = "raf_schd___raf_schd_4.0.2.tgz"; + name = "raf_schd___raf_schd_4.0.3.tgz"; path = fetchurl { - name = "raf_schd___raf_schd_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.2.tgz"; - sha1 = "bd44c708188f2e84c810bf55fcea9231bcaed8a0"; + name = "raf_schd___raf_schd_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.3.tgz"; + sha1 = "5d6c34ef46f8b2a0e880a8fcdb743efc5bfdbc1a"; }; } { @@ -9770,11 +10082,11 @@ }; } { - name = "react_copy_to_clipboard___react_copy_to_clipboard_5.0.2.tgz"; + name = "react_copy_to_clipboard___react_copy_to_clipboard_5.0.3.tgz"; path = fetchurl { - name = "react_copy_to_clipboard___react_copy_to_clipboard_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.2.tgz"; - sha1 = "d82a437e081e68dfca3761fbd57dbf2abdda1316"; + name = "react_copy_to_clipboard___react_copy_to_clipboard_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.3.tgz"; + sha1 = "2a0623b1115a1d8c84144e9434d3342b5af41ab4"; }; } { @@ -9794,11 +10106,11 @@ }; } { - name = "react_error_overlay___react_error_overlay_6.0.8.tgz"; + name = "react_error_overlay___react_error_overlay_6.0.9.tgz"; path = fetchurl { - name = "react_error_overlay___react_error_overlay_6.0.8.tgz"; - url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.8.tgz"; - sha1 = "474ed11d04fc6bda3af643447d85e9127ed6b5de"; + name = "react_error_overlay___react_error_overlay_6.0.9.tgz"; + url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.9.tgz"; + sha1 = "3c743010c9359608c375ecd6bc76f35d93995b0a"; }; } { @@ -9810,11 +10122,11 @@ }; } { - name = "react_is___react_is_17.0.1.tgz"; + name = "react_is___react_is_17.0.2.tgz"; path = fetchurl { - name = "react_is___react_is_17.0.1.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz"; - sha1 = "5b3531bd76a645a4c9fb6e693ed36419e3301339"; + name = "react_is___react_is_17.0.2.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz"; + sha1 = "e691d4a8e9c789365655539ab372762b0efb54f0"; }; } { @@ -9826,11 +10138,11 @@ }; } { - name = "react_popper___react_popper_1.3.7.tgz"; + name = "react_popper___react_popper_1.3.11.tgz"; path = fetchurl { - name = "react_popper___react_popper_1.3.7.tgz"; - url = "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.7.tgz"; - sha1 = "f6a3471362ef1f0d10a4963673789de1baca2324"; + name = "react_popper___react_popper_1.3.11.tgz"; + url = "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.11.tgz"; + sha1 = "a2cc3f0a67b75b66cfa62d2c409f9dd1fcc71ffd"; }; } { @@ -9842,11 +10154,11 @@ }; } { - name = "react_scripts___react_scripts_3.4.3.tgz"; + name = "react_scripts___react_scripts_3.4.4.tgz"; path = fetchurl { - name = "react_scripts___react_scripts_3.4.3.tgz"; - url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.3.tgz"; - sha1 = "21de5eb93de41ee92cd0b85b0e1298d0bb2e6c51"; + name = "react_scripts___react_scripts_3.4.4.tgz"; + url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.4.tgz"; + sha1 = "eef024ed5c566374005e3f509877350ba99d08a7"; }; } { @@ -9874,11 +10186,11 @@ }; } { - name = "reactstrap___reactstrap_8.7.1.tgz"; + name = "reactstrap___reactstrap_8.9.0.tgz"; path = fetchurl { - name = "reactstrap___reactstrap_8.7.1.tgz"; - url = "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.7.1.tgz"; - sha1 = "9631db8460a83a4d40fbee61abdd577b4f1a7069"; + name = "reactstrap___reactstrap_8.9.0.tgz"; + url = "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.9.0.tgz"; + sha1 = "bca4afa3f5cd18899ef9b33d877a141886d5abae"; }; } { @@ -10018,19 +10330,19 @@ }; } { - name = "regex_parser___regex_parser_2.2.10.tgz"; + name = "regex_parser___regex_parser_2.2.11.tgz"; path = fetchurl { - name = "regex_parser___regex_parser_2.2.10.tgz"; - url = "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.10.tgz"; - sha1 = "9e66a8f73d89a107616e63b39d4deddfee912b37"; + name = "regex_parser___regex_parser_2.2.11.tgz"; + url = "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz"; + sha1 = "3b37ec9049e19479806e878cabe7c1ca83ccfe58"; }; } { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; - sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz"; + sha1 = "7ef352ae8d159e758c0eadca6f8fcb4eef07be26"; }; } { @@ -10066,11 +10378,11 @@ }; } { - name = "regjsparser___regjsparser_0.6.4.tgz"; + name = "regjsparser___regjsparser_0.6.9.tgz"; path = fetchurl { - name = "regjsparser___regjsparser_0.6.4.tgz"; - url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz"; - sha1 = "a769f8684308401a66e9b529d2436ff4d0666272"; + name = "regjsparser___regjsparser_0.6.9.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz"; + sha1 = "b489eef7c9a2ce43727627011429cf833a7183e6"; }; } { @@ -10090,19 +10402,19 @@ }; } { - name = "renderkid___renderkid_2.0.4.tgz"; + name = "renderkid___renderkid_2.0.5.tgz"; path = fetchurl { - name = "renderkid___renderkid_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.4.tgz"; - sha1 = "d325e532afb28d3f8796ffee306be8ffd6fc864c"; + name = "renderkid___renderkid_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.5.tgz"; + sha1 = "483b1ac59c6601ab30a7a596a5965cabccfdd0a5"; }; } { - name = "repeat_element___repeat_element_1.1.3.tgz"; + name = "repeat_element___repeat_element_1.1.4.tgz"; path = fetchurl { - name = "repeat_element___repeat_element_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz"; - sha1 = "782e0d825c0c5a3bb39731f84efee6b742e6b1ce"; + name = "repeat_element___repeat_element_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz"; + sha1 = "be681520847ab58c7568ac75fbfad28ed42d39e9"; }; } { @@ -10194,11 +10506,11 @@ }; } { - name = "resolve_url_loader___resolve_url_loader_3.1.1.tgz"; + name = "resolve_url_loader___resolve_url_loader_3.1.2.tgz"; path = fetchurl { - name = "resolve_url_loader___resolve_url_loader_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz"; - sha1 = "28931895fa1eab9be0647d3b2958c100ae3c0bf0"; + name = "resolve_url_loader___resolve_url_loader_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz"; + sha1 = "235e2c28e22e3e432ba7a5d4e305c59a58edfc08"; }; } { @@ -10226,11 +10538,19 @@ }; } { - name = "resolve___resolve_1.19.0.tgz"; + name = "resolve___resolve_1.20.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.19.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz"; - sha1 = "1af5bf630409734a067cae29318aac7fa29a267c"; + name = "resolve___resolve_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; + sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; + }; + } + { + name = "resolve___resolve_2.0.0_next.3.tgz"; + path = fetchurl { + name = "resolve___resolve_2.0.0_next.3.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz"; + sha1 = "d41016293d4a8586a39ca5d9b5f15cbea1f55e46"; }; } { @@ -10346,11 +10666,11 @@ }; } { - name = "rxjs___rxjs_6.6.3.tgz"; + name = "rxjs___rxjs_6.6.7.tgz"; path = fetchurl { - name = "rxjs___rxjs_6.6.3.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz"; - sha1 = "8ca84635c4daa900c0d3967a6ee7ac60271ee552"; + name = "rxjs___rxjs_6.6.7.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz"; + sha1 = "90ac018acabf491bf65044235d5863c4dab804c9"; }; } { @@ -10394,11 +10714,11 @@ }; } { - name = "sanitize_html___sanitize_html_1.27.5.tgz"; + name = "sanitize_html___sanitize_html_2.3.3.tgz"; path = fetchurl { - name = "sanitize_html___sanitize_html_1.27.5.tgz"; - url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.27.5.tgz"; - sha1 = "6c8149462adb23e360e1bb71cc0bae7f08c823c7"; + name = "sanitize_html___sanitize_html_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.3.3.tgz"; + sha1 = "3db382c9a621cce4c46d90f10c64f1e9da9e8353"; }; } { @@ -10417,6 +10737,14 @@ sha1 = "debecd8c3ce243c76454f2e8290482150380090d"; }; } + { + name = "sass___sass_1.32.10.tgz"; + path = fetchurl { + name = "sass___sass_1.32.10.tgz"; + url = "https://registry.yarnpkg.com/sass/-/sass-1.32.10.tgz"; + sha1 = "d40da4e20031b450359ee1c7e69bc8cc89569241"; + }; + } { name = "sax___sax_1.2.4.tgz"; path = fetchurl { @@ -10474,11 +10802,11 @@ }; } { - name = "selfsigned___selfsigned_1.10.8.tgz"; + name = "selfsigned___selfsigned_1.10.11.tgz"; path = fetchurl { - name = "selfsigned___selfsigned_1.10.8.tgz"; - url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz"; - sha1 = "0d17208b7d12c33f8eac85c41835f27fc3d81a30"; + name = "selfsigned___selfsigned_1.10.11.tgz"; + url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz"; + sha1 = "24929cd906fe0f44b6d01fb23999a739537acbe9"; }; } { @@ -10506,11 +10834,11 @@ }; } { - name = "semver___semver_7.3.2.tgz"; + name = "semver___semver_7.3.5.tgz"; path = fetchurl { - name = "semver___semver_7.3.2.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz"; - sha1 = "604962b052b81ed0786aae84389ffba70ffd3938"; + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; }; } { @@ -10658,11 +10986,11 @@ }; } { - name = "side_channel___side_channel_1.0.3.tgz"; + name = "side_channel___side_channel_1.0.4.tgz"; path = fetchurl { - name = "side_channel___side_channel_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz"; - sha1 = "cdc46b057550bbab63706210838df5d4c19519c3"; + name = "side_channel___side_channel_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz"; + sha1 = "efce5c8fdc104ee751b25c58d4290011fa5ea2cf"; }; } { @@ -10682,11 +11010,11 @@ }; } { - name = "sinon___sinon_9.2.1.tgz"; + name = "sinon___sinon_9.2.4.tgz"; path = fetchurl { - name = "sinon___sinon_9.2.1.tgz"; - url = "https://registry.yarnpkg.com/sinon/-/sinon-9.2.1.tgz"; - sha1 = "64cc88beac718557055bd8caa526b34a2231be6d"; + name = "sinon___sinon_9.2.4.tgz"; + url = "https://registry.yarnpkg.com/sinon/-/sinon-9.2.4.tgz"; + sha1 = "e55af4d3b174a4443a8762fa8421c2976683752b"; }; } { @@ -10802,11 +11130,11 @@ }; } { - name = "source_map_url___source_map_url_0.4.0.tgz"; + name = "source_map_url___source_map_url_0.4.1.tgz"; path = fetchurl { - name = "source_map_url___source_map_url_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz"; - sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + name = "source_map_url___source_map_url_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz"; + sha1 = "0af66605a745a5a2f91cf1bbf8a7afbc283dec56"; }; } { @@ -10850,11 +11178,11 @@ }; } { - name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; + name = "spdx_license_ids___spdx_license_ids_3.0.7.tgz"; path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; - sha1 = "c80757383c28abf7296744998cbc106ae8b854ce"; + name = "spdx_license_ids___spdx_license_ids_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; + sha1 = "e9c18a410e5ed7e12442a549fbd8afa767038d65"; }; } { @@ -10898,11 +11226,11 @@ }; } { - name = "ssri___ssri_6.0.1.tgz"; + name = "ssri___ssri_6.0.2.tgz"; path = fetchurl { - name = "ssri___ssri_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz"; - sha1 = "2a3c41b28dd45b62b63676ecb74001265ae9edd8"; + name = "ssri___ssri_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz"; + sha1 = "157939134f20464e7301ddba3e90ffa8f7728ac5"; }; } { @@ -10922,11 +11250,11 @@ }; } { - name = "stack_utils___stack_utils_1.0.3.tgz"; + name = "stack_utils___stack_utils_1.0.5.tgz"; path = fetchurl { - name = "stack_utils___stack_utils_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.3.tgz"; - sha1 = "db7a475733b5b8bf6521907b18891d29006f7751"; + name = "stack_utils___stack_utils_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.5.tgz"; + sha1 = "a19b0b01947e0029c8e451d5d61a498f5bb1471b"; }; } { @@ -11018,43 +11346,43 @@ }; } { - name = "string_width___string_width_4.2.0.tgz"; + name = "string_width___string_width_4.2.2.tgz"; path = fetchurl { - name = "string_width___string_width_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; - sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; + name = "string_width___string_width_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; + sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; }; } { - name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; + name = "string.prototype.matchall___string.prototype.matchall_4.0.4.tgz"; path = fetchurl { - name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz"; - sha1 = "48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"; + name = "string.prototype.matchall___string.prototype.matchall_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz"; + sha1 = "608f255e93e072107f5de066f81a2dfb78cf6b29"; }; } { - name = "string.prototype.trim___string.prototype.trim_1.2.2.tgz"; + name = "string.prototype.trim___string.prototype.trim_1.2.4.tgz"; path = fetchurl { - name = "string.prototype.trim___string.prototype.trim_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.2.tgz"; - sha1 = "f538d0bacd98fc4297f0bef645226d5aaebf59f3"; + name = "string.prototype.trim___string.prototype.trim_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz"; + sha1 = "6014689baf5efaf106ad031a5fa45157666ed1bd"; }; } { - name = "string.prototype.trimend___string.prototype.trimend_1.0.2.tgz"; + name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; path = fetchurl { - name = "string.prototype.trimend___string.prototype.trimend_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz"; - sha1 = "6ddd9a8796bc714b489a3ae22246a208f37bfa46"; + name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; + sha1 = "e75ae90c2942c63504686c18b287b4a0b1a45f80"; }; } { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.2.tgz"; + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; path = fetchurl { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz"; - sha1 = "22d45da81015309cd0cdd79787e8919fc5c613e7"; + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; + sha1 = "b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"; }; } { @@ -11153,6 +11481,14 @@ sha1 = "cb9154606f3e771ab6c4ab637026a1049174d925"; }; } + { + name = "style_mod___style_mod_4.0.0.tgz"; + path = fetchurl { + name = "style_mod___style_mod_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/style-mod/-/style-mod-4.0.0.tgz"; + sha1 = "97e7c2d68b592975f2ca7a63d0dd6fcacfe35a01"; + }; + } { name = "stylehacks___stylehacks_4.0.3.tgz"; path = fetchurl { @@ -11234,19 +11570,19 @@ }; } { - name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.1.2.tgz"; + name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.39.0.tgz"; path = fetchurl { - name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/tempusdominus-bootstrap-4/-/tempusdominus-bootstrap-4-5.1.2.tgz"; - sha1 = "3c9906ca6e5d563faa0b81b2fdc6aa79cad9c0be"; + name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.39.0.tgz"; + url = "https://registry.yarnpkg.com/tempusdominus-bootstrap-4/-/tempusdominus-bootstrap-4-5.39.0.tgz"; + sha1 = "f13dcfec6c41b37c5fe509f08bd513590c64411f"; }; } { - name = "tempusdominus_core___tempusdominus_core_5.0.3.tgz"; + name = "tempusdominus_core___tempusdominus_core_5.19.0.tgz"; path = fetchurl { - name = "tempusdominus_core___tempusdominus_core_5.0.3.tgz"; - url = "https://registry.yarnpkg.com/tempusdominus-core/-/tempusdominus-core-5.0.3.tgz"; - sha1 = "808642e47a83f45d7ef18c1597fd7b1d413d69e5"; + name = "tempusdominus_core___tempusdominus_core_5.19.0.tgz"; + url = "https://registry.yarnpkg.com/tempusdominus-core/-/tempusdominus-core-5.19.0.tgz"; + sha1 = "ccbd2c35109b0a4b96c61513e53e0175ec4896bd"; }; } { @@ -11426,11 +11762,11 @@ }; } { - name = "tough_cookie___tough_cookie_3.0.1.tgz"; + name = "tough_cookie___tough_cookie_4.0.0.tgz"; path = fetchurl { - name = "tough_cookie___tough_cookie_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz"; - sha1 = "9df4f57e739c26930a018184887f4adb7dca73b2"; + name = "tough_cookie___tough_cookie_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz"; + sha1 = "d822234eeca882f991f0f908824ad2622ddbece4"; }; } { @@ -11482,11 +11818,19 @@ }; } { - name = "tsutils___tsutils_3.17.1.tgz"; + name = "tslib___tslib_2.2.0.tgz"; path = fetchurl { - name = "tsutils___tsutils_3.17.1.tgz"; - url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz"; - sha1 = "ed719917f11ca0dee586272b2ac49e015a2dd759"; + name = "tslib___tslib_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz"; + sha1 = "fb2c475977e35e241311ede2693cee1ec6698f5c"; + }; + } + { + name = "tsutils___tsutils_3.21.0.tgz"; + path = fetchurl { + name = "tsutils___tsutils_3.21.0.tgz"; + url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz"; + sha1 = "b48717d394cea6c1e096983eed58e9d61715b623"; }; } { @@ -11530,11 +11874,11 @@ }; } { - name = "type_fest___type_fest_0.11.0.tgz"; + name = "type_fest___type_fest_0.21.3.tgz"; path = fetchurl { - name = "type_fest___type_fest_0.11.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; - sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; + name = "type_fest___type_fest_0.21.3.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz"; + sha1 = "d260a24b0198436e133fa26a524a6d65fa3b2e37"; }; } { @@ -11562,11 +11906,11 @@ }; } { - name = "type___type_2.1.0.tgz"; + name = "type___type_2.5.0.tgz"; path = fetchurl { - name = "type___type_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz"; - sha1 = "9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"; + name = "type___type_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz"; + sha1 = "0a2e78c2e77907b252abe5f298c1b01c63f0db3d"; }; } { @@ -11586,11 +11930,19 @@ }; } { - name = "typescript___typescript_3.9.7.tgz"; + name = "typescript___typescript_3.9.9.tgz"; path = fetchurl { - name = "typescript___typescript_3.9.7.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz"; - sha1 = "98d600a5ebdc38f40cb277522f12dc800e9e25fa"; + name = "typescript___typescript_3.9.9.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.9.tgz"; + sha1 = "e69905c54bc0681d0518bd4d587cc6f2d0b1a674"; + }; + } + { + name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; + path = fetchurl { + name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; + sha1 = "085e215625ec3162574dc8859abee78a59b14471"; }; } { @@ -11706,11 +12058,11 @@ }; } { - name = "uri_js___uri_js_4.4.0.tgz"; + name = "uri_js___uri_js_4.4.1.tgz"; path = fetchurl { - name = "uri_js___uri_js_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz"; - sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602"; + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; }; } { @@ -11730,11 +12082,11 @@ }; } { - name = "url_parse___url_parse_1.4.7.tgz"; + name = "url_parse___url_parse_1.5.1.tgz"; path = fetchurl { - name = "url_parse___url_parse_1.4.7.tgz"; - url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz"; - sha1 = "a8a83535e8c00a316e403a5db4ac1b9b853ae278"; + name = "url_parse___url_parse_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz"; + sha1 = "d5fa9890af8a5e1f274a2c98376510f6425f6e3b"; }; } { @@ -11745,6 +12097,14 @@ sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; }; } + { + name = "use_media___use_media_1.4.0.tgz"; + path = fetchurl { + name = "use_media___use_media_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/use-media/-/use-media-1.4.0.tgz"; + sha1 = "e777bf1f382a7aacabbd1f9ce3da2b62e58b2a98"; + }; + } { name = "use___use_3.1.1.tgz"; path = fetchurl { @@ -11769,6 +12129,14 @@ sha1 = "440f7165a459c9a16dc145eb8e72f35687097030"; }; } + { + name = "util.promisify___util.promisify_1.1.1.tgz"; + path = fetchurl { + name = "util.promisify___util.promisify_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.1.tgz"; + sha1 = "77832f57ced2c9478174149cae9b96e9918cd54b"; + }; + } { name = "util.promisify___util.promisify_1.0.1.tgz"; path = fetchurl { @@ -11818,11 +12186,11 @@ }; } { - name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; - sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"; + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha1 = "2de19618c66dc247dcfb6f99338035d8245a2cee"; }; } { @@ -11873,6 +12241,14 @@ sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd"; }; } + { + name = "w3c_keyname___w3c_keyname_2.2.4.tgz"; + path = fetchurl { + name = "w3c_keyname___w3c_keyname_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.4.tgz"; + sha1 = "4ade6916f6290224cdbd1db8ac49eab03d0eef6b"; + }; + } { name = "w3c_xmlserializer___w3c_xmlserializer_1.1.2.tgz"; path = fetchurl { @@ -11954,11 +12330,11 @@ }; } { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.3.tgz"; path = fetchurl { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; - sha1 = "0019c3db716e3fa5cecbf64f2ab88a74bab331f3"; + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.3.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz"; + sha1 = "0639372b143262e2b84ab95d3b91a7597061c2c5"; }; } { @@ -12034,11 +12410,11 @@ }; } { - name = "whatwg_fetch___whatwg_fetch_3.5.0.tgz"; + name = "whatwg_fetch___whatwg_fetch_3.6.2.tgz"; path = fetchurl { - name = "whatwg_fetch___whatwg_fetch_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz"; - sha1 = "605a2cd0a7146e5db141e29d1c62ab84c0c4c868"; + name = "whatwg_fetch___whatwg_fetch_3.6.2.tgz"; + url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz"; + sha1 = "dced24f37f2624ed0281725d51d0e2e3fe677f8c"; }; } { @@ -12066,11 +12442,19 @@ }; } { - name = "whatwg_url___whatwg_url_8.4.0.tgz"; + name = "whatwg_url___whatwg_url_8.5.0.tgz"; path = fetchurl { - name = "whatwg_url___whatwg_url_8.4.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz"; - sha1 = "50fb9615b05469591d2b2bd6dfaed2942ed72837"; + name = "whatwg_url___whatwg_url_8.5.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz"; + sha1 = "7752b8464fc0903fec89aa9846fc9efe07351fd3"; + }; + } + { + name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; + path = fetchurl { + name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; + sha1 = "13757bc89b209b049fe5d86430e21cf40a89a8e6"; }; } { @@ -12298,11 +12682,11 @@ }; } { - name = "ws___ws_7.4.0.tgz"; + name = "ws___ws_7.4.5.tgz"; path = fetchurl { - name = "ws___ws_7.4.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz"; - sha1 = "a5dd76a24197940d4a8bb9e0e152bb4503764da7"; + name = "ws___ws_7.4.5.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz"; + sha1 = "a484dd851e9beb6fdb420027e3885e8ce48986c1"; }; } { @@ -12322,11 +12706,11 @@ }; } { - name = "xregexp___xregexp_4.4.0.tgz"; + name = "xregexp___xregexp_4.4.1.tgz"; path = fetchurl { - name = "xregexp___xregexp_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.4.0.tgz"; - sha1 = "29660f5d6567cd2ef981dd4a50cb05d22c10719d"; + name = "xregexp___xregexp_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.4.1.tgz"; + sha1 = "c84a88fa79e9ab18ca543959712094492185fe65"; }; } { @@ -12338,11 +12722,11 @@ }; } { - name = "y18n___y18n_4.0.0.tgz"; + name = "y18n___y18n_4.0.3.tgz"; path = fetchurl { - name = "y18n___y18n_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz"; - sha1 = "95ef94f85ecc81d007c264e190a120f0a3c8566b"; + name = "y18n___y18n_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz"; + sha1 = "b5f259c82cd6e336921efd7bfd8bf560de9eeedf"; }; } { @@ -12362,11 +12746,11 @@ }; } { - name = "yaml___yaml_1.10.0.tgz"; + name = "yaml___yaml_1.10.2.tgz"; path = fetchurl { - name = "yaml___yaml_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz"; - sha1 = "3b593add944876077d4d683fee01081bd9fff31e"; + name = "yaml___yaml_1.10.2.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz"; + sha1 = "2301c5ffbf12b467de8da2333a459e29e7920e4b"; }; } { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 0cbfc89bd5..1dbb317962 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -1,19 +1,19 @@ -{ stdenv, rustPlatform, fetchFromGitHub, lib, Security, nixosTests }: +{ stdenv, rustPlatform, fetchFromGitHub, lib, libiconv, Security, nixosTests }: rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; - version = "3.4.2"; + version = "3.5.0"; src = fetchFromGitHub { owner = "MindFlavor"; repo = "prometheus_wireguard_exporter"; rev = version; - sha256 = "sha256-nzY+pCkj0/m7cWPq5+xvQ1b1/PqdI6QuxNdTRT030tY="; + sha256 = "sha256-LHhqQ0p2qt6ZAdkpY1SEAcGXH47TPhHvlDv+eL8GC58="; }; - cargoSha256 = "sha256-L2ohowt5+F3XJSzoihtJ2prW2bzZiNMUL9vqHIZBy1M="; + cargoSha256 = "sha256-lNFsO7FSmH1+DLM7ID0vn6234qTdtUoaLSnqKcbHoXE="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) wireguard; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix index 93e6f1767a..ddffc9c55d 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix @@ -1,17 +1,36 @@ -{ lib, fetchFromGitHub, pythonPackages }: +{ lib +, fetchFromGitHub +, python3Packages +, prometheus-alertmanager +}: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "prometheus-xmpp-alerts"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "jelmer"; repo = pname; - rev = version; - sha256 = "17aq6v4ahnga82r350kx1y8i7zgikpzmwzaacj7a339kh8hxkh63"; + rev = "v${version}"; + sha256 = "0qmmmlcanbrhyyxi32gy3gibgvj7jdjwpa8cf5ci9czvbyxg4rld"; }; - propagatedBuildInputs = with pythonPackages; [ slixmpp prometheus_client pyyaml ]; + propagatedBuildInputs = [ + prometheus-alertmanager + ] ++ (with python3Packages; [ + aiohttp + slixmpp + prometheus_client + pyyaml + ]); + + checkInputs = with python3Packages; [ + pytz + ]; + + checkPhase = '' + ${python3Packages.python.interpreter} -m unittest discover + ''; meta = { description = "XMPP Web hook for Prometheus"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix index b9f5ad1be2..64698415e5 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,7 @@ generic: { v50 = generic { - version = "5.0.10"; - sha256 = "15kbbj1vclsys1z3ghcz9j5faz67k3z8yl81bn7bhmqaflavgicb"; + version = "5.0.11"; + sha256 = "0xrh0l8wr0q903a1swz9anvzkb5hlbl2win5xns55cmbw0ygbwfa"; }; v40 = generic { diff --git a/third_party/nixpkgs/pkgs/servers/nas/default.nix b/third_party/nixpkgs/pkgs/servers/nas/default.nix index 319bee115c..4732368ac8 100644 --- a/third_party/nixpkgs/pkgs/servers/nas/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nas/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { description = "A network transparent, client/server audio transport system"; homepage = "http://radscan.com/nas.html"; license = licenses.mit; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix index bace331e05..1e65689444 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix @@ -7,21 +7,23 @@ , mkYarnPackage , pkg-config , rustPlatform +, stdenv +, libiconv }: # Note for maintainers: use ./update-influxdb2.sh to update the Yarn # dependencies nix expression. let - version = "2.0.2"; - shorthash = "84496e507a"; # git rev-parse HEAD with 2.0.2 checked out - libflux_version = "0.95.0"; + version = "2.0.6"; + shorthash = "4db98b4c9a"; # git rev-parse HEAD with 2.0.6 checked out + libflux_version = "0.115.0"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb"; rev = "v${version}"; - sha256 = "05s09crqgbyfdck33zwax5l47jpc4wh04yd8zsm658iksdgzpmnn"; + sha256 = "1x74p87csx4m4cgijk57xs75nikv3bnh7skgnzk30ab1ar13iirw"; }; ui = mkYarnPackage { @@ -31,7 +33,7 @@ let yarnNix = ./influx-ui-yarndeps.nix; configurePhase = '' cp -r $node_modules ui/node_modules - rsync -r $node_modules/../deps/chronograf-ui/node_modules/ ui/node_modules + rsync -r $node_modules/../deps/influxdb-ui/node_modules/ ui/node_modules ''; INFLUXDB_SHA = shorthash; buildPhase = '' @@ -52,12 +54,13 @@ let owner = "influxdata"; repo = "flux"; rev = "v${libflux_version}"; - sha256 = "07jz2nw3zswg9f4p5sb5r4hpg3n4qibjcgs9sk9csns70h5rp9j3"; + sha256 = "0zplwsk9xidv8l9sqbxqivy6q20ryd31fhrzspn1mjn4i45kkwz1"; }; sourceRoot = "source/libflux"; - cargoSha256 = "0y5xjkqpaxp9qq1qj39zw3mnvkbbb9g4fa5cli77nhfwz288xx6h"; + cargoSha256 = "06gh466q7qkid0vs5scic0qqlz3h81yb00nwn8nwq8ppr5z2ijyq"; nativeBuildInputs = [ llvmPackages.libclang ]; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + buildInputs = lib.optional stdenv.isDarwin libiconv; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; pkgcfg = '' Name: flux Version: ${libflux_version} @@ -71,6 +74,8 @@ let cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include substitute $pkgcfgPath $out/pkgconfig/flux.pc \ --replace /out $out + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib ''; }; in buildGoModule { @@ -80,7 +85,7 @@ in buildGoModule { nativeBuildInputs = [ go-bindata pkg-config ]; - vendorSha256 = "0lviz7l5zbghyfkp0lvlv8ykpak5hhkfal8d7xwvpsm8q3sghc8a"; + vendorSha256 = "03pabm0h9q0v5dfdq9by2l2n32bz9imwalz0aw897vsrfhci0ldf"; subPackages = [ "cmd/influxd" "cmd/influx" ]; PKG_CONFIG_PATH = "${flux}/pkgconfig"; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/influx-ui-package.json b/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/influx-ui-package.json index d57813bf2a..1a3840f154 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/influx-ui-package.json +++ b/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/influx-ui-package.json @@ -1,12 +1,12 @@ { - "name": "chronograf-ui", - "version": "2.0.2", + "name": "influxdb-ui", + "version": "2.0.5", "private": false, - "license": "AGPL-3.0", + "license": "MIT", "description": "", "repository": { "type": "git", - "url": "github:influxdata/chronograf" + "url": "github:influxdata/ui" }, "engines": { "node": ">=10.5.0", @@ -40,6 +40,7 @@ "eslint:circleci": "eslint", "eslint:fix": "eslint --fix '{src,cypress}/**/*.{ts,tsx}'", "prettier": "prettier --config .prettierrc.json --check '{src,cypress}/**/*.{ts,tsx}'", + "prettier:circleci": "prettier --config .prettierrc.json --check", "prettier:fix": "prettier --config .prettierrc.json --write '{src,cypress}/**/*.{ts,tsx}'", "tsc": "tsc -p ./tsconfig.json --noEmit --pretty --skipLibCheck", "tsc:cypress": "tsc -p ./cypress/tsconfig.json --noEmit --pretty --skipLibCheck", @@ -134,7 +135,7 @@ "dependencies": { "@influxdata/clockface": "2.3.4", "@influxdata/flux": "^0.5.1", - "@influxdata/flux-lsp-browser": "^0.5.23", + "@influxdata/flux-lsp-browser": "^0.5.41", "@influxdata/giraffe": "0.29.0", "@influxdata/influx": "0.5.5", "@influxdata/influxdb-templates": "0.9.0", diff --git a/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix b/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix index 1779d270cf..53795e7632 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix @@ -666,11 +666,11 @@ }; } { - name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.23.tgz"; + name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.41.tgz"; path = fetchurl { - name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.23.tgz"; - url = "https://registry.yarnpkg.com/@influxdata/flux-lsp-browser/-/flux-lsp-browser-0.5.23.tgz"; - sha1 = "b3d1579e26ff21a11771003cbcaebe5fef82d73c"; + name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.41.tgz"; + url = "https://registry.yarnpkg.com/@influxdata/flux-lsp-browser/-/flux-lsp-browser-0.5.41.tgz"; + sha1 = "abf6c5ad253317f34a9217ecfd250d78fe625a83"; }; } { diff --git a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix index d7612d3076..12ad703751 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.54.1"; + version = "1.59.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-nZSNn1vLk3y6s4ie1AkSkGmKUiIrcBr3yKW5uAEtRt0="; + sha256 = "sha256-2i9rmk9aAnjTJY+w/NKJOaLX+tpkt3vG07iLCsSGzdU="; }; vendorSha256 = null; @@ -22,5 +22,7 @@ buildGoModule rec { description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus"; license = licenses.asl20; maintainers = [ maintainers.yorickvp ]; + changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}"; + platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/nzbhydra2/default.nix b/third_party/nixpkgs/pkgs/servers/nzbhydra2/default.nix index 3aef89ecd8..12d2c0b707 100644 --- a/third_party/nixpkgs/pkgs/servers/nzbhydra2/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nzbhydra2/default.nix @@ -2,17 +2,19 @@ stdenv.mkDerivation rec { pname = "nzbhydra2"; - version = "3.13.2"; + version = "3.14.1"; src = fetchzip { url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-linux.zip"; - sha512 = "2pi91y966qnq6q9qqnhglmbj4610jxyyqxiwa8zfmb8r48mzwzy3q5ga00h9qbhi6a8ghrfh1yvj4h9m17gk7l3rc5fw0r3mrk437nj"; + sha512 = "2mfrqqwrfjvr48vm4r0spda3vlg1h511r6hrlv7k9233ps97bjjir6hms82lgqnlirsixayxs47cldjy8amdn3vc6kxsifmbd6a924p"; stripRoot = false; }; nativeBuildInputs = [ jre makeWrapper unzip ]; installPhase = '' + runHook preInstall + install -d -m 755 "$out/lib/${pname}" cp -dpr --no-preserve=ownership "lib" "readme.md" "$out/lib/nzbhydra2" install -D -m 755 "nzbhydra2wrapperPy3.py" "$out/lib/nzbhydra2/nzbhydra2wrapperPy3.py" @@ -20,6 +22,8 @@ stdenv.mkDerivation rec { makeWrapper ${python3}/bin/python $out/bin/nzbhydra2 \ --add-flags "$out/lib/nzbhydra2/nzbhydra2wrapperPy3.py" \ --prefix PATH ":" ${jre}/bin + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix b/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix index 7c2bcbe474..fe4335a741 100644 --- a/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix @@ -20,6 +20,6 @@ buildGoModule rec { description = "A reverse proxy that provides authentication with Google, Github, or other providers"; homepage = "https://github.com/oauth2-proxy/oauth2-proxy/"; license = licenses.mit; - maintainers = with maintainers; [ yorickvp knl ]; + maintainers = with maintainers; teams.serokell.members ++ [ knl ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index 68168618c5..6f29d336da 100644 --- a/third_party/nixpkgs/pkgs/servers/plex/raw.nix +++ b/third_party/nixpkgs/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.22.2.4282-a97b03fad"; + version = "1.23.0.4482-62106842a"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "01krx6vhk24wm2hikxkfv8m53y8b4yqnkii4j9zf48f1a9hlj2zp"; + sha256 = "0i4cfnzlzxh3vwd8kivy0dy6wg102j96v7p3mpivkwj15kjrl01v"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "04wzv15pnd4sn6cy62m8prvsxpxj4sg3q9ahwsrn2cj31vgayg0i"; + sha256 = "0yh30712m23hmpqc4b83pbmadgslq72z8lc4prx2kp01n3p5hfkq"; }; outputs = [ "out" "basedb" ]; diff --git a/third_party/nixpkgs/pkgs/servers/radarr/default.nix b/third_party/nixpkgs/pkgs/servers/radarr/default.nix index 47edb29723..fb5792c6e4 100644 --- a/third_party/nixpkgs/pkgs/servers/radarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/radarr/default.nix @@ -9,14 +9,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-bTh+Z5w5ZkL2iPteStqVcoFDGZIbpVjuXn20TZsfgtY="; - arm64-linux_hash = "sha256-aIzVSIRuGNiIFJPToXCQwYsbICKuPtwKATnQhkxvJuA="; - x64-osx_hash = "sha256-FxRSAJvRQya2x1kei6yRceGcyQ2mCaFveyeMGw0Jqw4="; + x64-linux_hash = "sha256-5W4X1E7794hFVPo4+s826CNIrw6Z/n0cDjj6pmsj2Dk="; + arm64-linux_hash = "sha256-gqCgToAVIS+IEulFY4mo2Mtcb3nyFpzDBqVEewREQcs="; + x64-osx_hash = "sha256-MFpIzSYAvAWVHMdEd+aP67s3po+yb3qWzSd/Ko++5Jc="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "3.0.2.4552"; + version = "3.1.1.4954"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/servers/reproxy/default.nix b/third_party/nixpkgs/pkgs/servers/reproxy/default.nix new file mode 100644 index 0000000000..0a9095857e --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/reproxy/default.nix @@ -0,0 +1,36 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "reproxy"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "umputun"; + repo = pname; + rev = "v${version}"; + hash = "sha256-8veGMiRT59oLcMUxERI+2uRQVvbiuXTbrBi1GqoPe0M="; + }; + + postPatch = '' + # Requires network access + substituteInPlace app/main_test.go \ + --replace "Test_Main" "Skip_Main" + ''; + + vendorSha256 = null; + + buildFlagsArray = [ + "-ldflags=-s -w -X main.revision=${version}" + ]; + + installPhase = '' + install -Dm755 $GOPATH/bin/app $out/bin/reproxy + ''; + + meta = with lib; { + description = "Simple edge server / reverse proxy"; + homepage = "https://reproxy.io/"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/rt/default.nix b/third_party/nixpkgs/pkgs/servers/rt/default.nix index cc192a18a6..ff0bbd6b97 100644 --- a/third_party/nixpkgs/pkgs/servers/rt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rt/default.nix @@ -1,46 +1,24 @@ -{ lib, stdenv, buildEnv, fetchurl, perl, perlPackages, makeWrapper }: +{ lib, stdenv, autoreconfHook, buildEnv, fetchFromGitHub, perl, perlPackages, makeWrapper, gnupg, openssl }: -# This package isn't extremely useful as it is, but is getting close. -# After running: -# -# nix-build . -A rt -# -# I created a config file named myconfig.pm with: -# -# use utf8; -# Set($rtname, '127.0.0.1'); -# # These dirs need to be pre-created: -# Set($MasonSessionDir, '/home/grahamc/foo/sessiondir/'); -# Set($MasonDataDir, '/home/grahamc/foo/localstate/'); -# Set($WebPort, 8080); -# -# Set($DatabaseType, "SQLite"); -# Set( $DatabaseName, '/home/grahamc/projects/foo/my.db' ); -# -# 1; -# -# and ran -# -# RT_SITE_CONFIG=$(pwd)/myconfig.pm ./result/bin/rt-setup-database --action init -# -# Then: -# -# RT_SITE_CONFIG=$(pwd)/myconfig.pm ./result/bin/rt-server -# -# Make sure to check out result/etc/RT_Config.pm -# -# Good luck. stdenv.mkDerivation rec { pname = "rt"; + version = "5.0.1"; - version = "4.4.4"; - - src = fetchurl { - url = "https://download.bestpractical.com/pub/rt/release/${pname}-${version}.tar.gz"; - sha256 = "1108jhz1gvalcfnbzgpbk7fkxzxkkc7m74a3bnwyjzldlyj1dhrl"; + src = fetchFromGitHub { + repo = pname; + rev = "${pname}-${version}"; + owner = "bestpractical"; + sha256 = "1qqh6w094x7dljz001va802v4s6mixs9lkhs2cs47lf5ph3vwq2q"; }; - patches = [ ./override-generated.patch ]; + patches = [ + ./dont-check-users_groups.patch # needed for "make testdeps" to work in the build + ./override-generated.patch + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; buildInputs = [ makeWrapper @@ -48,28 +26,102 @@ stdenv.mkDerivation rec { (buildEnv { name = "rt-perl-deps"; paths = with perlPackages; (requiredPerlModules [ - ApacheSession BusinessHours CGIEmulatePSGI CGIPSGI - CSSMinifierXS CSSSquish ConvertColor CryptEksblowfish - CryptSSLeay DBDSQLite DBDmysql DBIxSearchBuilder DataGUID - DataICal DataPagePageset DateExtract DateManip - DateTimeFormatNatural DevelGlobalDestruction EmailAddress - EmailAddressList FCGI FCGIProcManager FileShareDir FileWhich - GD GDGraph GnuPGInterface GraphViz HTMLFormatTextWithLinks - HTMLFormatTextWithLinksAndTables HTMLMason - HTMLMasonPSGIHandler HTMLQuoted HTMLRewriteAttributes - HTMLScrubber IPCRun IPCRun3 JSON JavaScriptMinifierXS LWP - LWPProtocolHttps LocaleMaketextFuzzy LocaleMaketextLexicon - LogDispatch MIMETools MIMETypes MailTools ModuleRefresh - ModuleVersionsReport MozillaCA NetCIDR NetIP PerlIOeol Plack - RegexpCommon RegexpCommonnetCIDR RegexpIPv6 RoleBasic - ScopeUpper Starlet SymbolGlobalName TermReadKey - TextPasswordPronounceable TextQuoted TextTemplate - TextWikiFormat TextWrapper TimeParseDate TreeSimple - UNIVERSALrequire XMLRSS + ApacheSession + BusinessHours + CGIEmulatePSGI + CGIPSGI + CSSMinifierXS + CSSSquish + ConvertColor + CryptEksblowfish + CryptSSLeay + CryptX509 + DBDPg + DBIxSearchBuilder + DataGUID + DataICal + DataPage + DataPagePageset + DateExtract + DateManip + DateTimeFormatNatural + DevelGlobalDestruction + EmailAddress + EmailAddressList + EncodeDetect + EncodeHanExtra + FCGI + FCGIProcManager + FileShareDir + FileWhich + GD + GDGraph + GnuPGInterface + GraphViz + HTMLFormatExternal + HTMLFormatTextWithLinks + HTMLFormatTextWithLinksAndTables + HTMLGumbo + HTMLMason + HTMLMasonPSGIHandler + HTMLQuoted + HTMLRewriteAttributes + HTMLScrubber + IPCRun + IPCRun3 + JSON + JavaScriptMinifierXS + LWP + LWPProtocolHttps + LocaleMaketextFuzzy + LocaleMaketextLexicon + LogDispatch + MIMETools + MIMETypes + MailTools + ModulePath + ModuleRefresh + ModuleVersionsReport + Moose + MooseXNonMoose + MooseXRoleParameterized + MozillaCA + NetCIDR + NetIP + PathDispatcher + PerlIOeol + Plack + PodParser + RegexpCommon + RegexpCommonnetCIDR + RegexpIPv6 + RoleBasic + ScopeUpper + Starlet + Starman + StringShellQuote + SymbolGlobalName + TermReadKey + TextPasswordPronounceable + TextQuoted + TextTemplate + TextWikiFormat + TextWordDiff + TextWrapper + TimeParseDate + TreeSimple + UNIVERSALrequire + WebMachine + XMLRSS + perlldap ]); }) ]; + preAutoreconf = '' + substituteInPlace configure.ac \ + --replace "rt-3.9.EXPORTED" "rt-${version}" + ''; preConfigure = '' configureFlags="$configureFlags --with-web-user=$UID" configureFlags="$configureFlags --with-web-group=$(id -g)" @@ -82,18 +134,27 @@ stdenv.mkDerivation rec { "--enable-graphviz" "--enable-gd" "--enable-gpg" - "--with-db-type=SQLite" + "--enable-smime" + "--with-db-type=Pg" ]; buildPhase = '' - make testdeps | grep -i missing | sort + make testdeps ''; - preFixup = '' - for i in $(find $out/bin -type f; find $out/sbin -type f); do - wrapProgram $i \ - --prefix PERL5LIB ':' $PERL5LIB + postFixup = '' + for i in $(find $out/bin -type f); do + wrapProgram $i --prefix PERL5LIB ':' $PERL5LIB \ + --prefix PATH ":" "${lib.makeBinPath [ openssl gnupg ]}" done + + rm -r $out/var + mkdir -p $out/var/data + ln -s /var/log/rt $out/var/log + ln -s /run/rt/mason_data $out/var/mason_data + ln -s /var/lib/rt/shredder $out/var/data/RT-Shredder + ln -s /var/lib/rt/smime $out/var/data/smime + ln -s /var/lib/rt/gpg $out/var/data/gpg ''; meta = { diff --git a/third_party/nixpkgs/pkgs/servers/rt/dont-check-users_groups.patch b/third_party/nixpkgs/pkgs/servers/rt/dont-check-users_groups.patch new file mode 100644 index 0000000000..43e40e8f17 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/rt/dont-check-users_groups.patch @@ -0,0 +1,12 @@ +diff --git a/sbin/rt-test-dependencies.in b/sbin/rt-test-dependencies.in +index e51feb197..d75b1bc4e 100644 +--- a/sbin/rt-test-dependencies.in ++++ b/sbin/rt-test-dependencies.in +@@ -423,6 +423,7 @@ sub check_perl_version { + } + + sub check_users_groups { ++ return 0; + section("users / groups"); + + my $fails = 0; diff --git a/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix b/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix index 6ba221f8ba..07ea1960a7 100644 --- a/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "11.0.1"; + version = "11.0.2"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "sha256-Ap5DdOf3PVctMAYCP0Xr4VjqO5yEWqrKX6FbId8/FMQ="; + sha256 = "sha256-3inLVkjjwphz00N0fWJqXvyzAjV9x72C3E33duLeVYw="; }; buildInputs = with lib; diff --git a/third_party/nixpkgs/pkgs/servers/shishi/default.nix b/third_party/nixpkgs/pkgs/servers/shishi/default.nix index c81c7f30b3..6737119d88 100644 --- a/third_party/nixpkgs/pkgs/servers/shishi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/shishi/default.nix @@ -14,7 +14,7 @@ let mkWith = mkFlag "with-" "without-"; mkOther = mkFlag "" "" true; - shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; optPam = shouldUsePkg pam; optLibidn = shouldUsePkg libidn; diff --git a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix index 85ed2808d7..f713ab39cb 100644 --- a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix +++ b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.23.15"; + version = "0.23.16"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-xZ2SgYSEamh+Z64VKvIemqJLH/WjJHFji5qIameF5hM="; + sha256 = "sha256-Kx3vTbwYfILxn7n4upyVZo0V6S2lTStlezku9bfwGVw="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix b/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix index d93b466401..1ecb44aed8 100644 --- a/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "simple-http-server"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ]; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_1.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_1.nix index fb6835775f..477d6113b7 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_1.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_1.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./. (args // { - version = "3.1.8"; - sha256 = "0yrzhsxmjiwkhchagx8dymzhvxl3k5h40wn9wpicqjvgjb9k8523"; + version = "3.1.12"; + sha256 = "0qzyahr8x9l1xz0l79wz3iahxz7648n1azc5yr7kx0dl113y2nig"; }) diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix index 22110f3b4f..0767828461 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace mariadb_config/mariadb_config.c.in \ - --replace '@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@' "$dev/include" \ - --replace '@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@' "$out/lib/mariadb" + --replace '-I%s/@INSTALL_INCLUDEDIR@' "-I$dev/include" \ + --replace '-L%s/@INSTALL_LIBDIR@' "-L$out/lib/mariadb" ''; # The cmake setup-hook uses $out/lib by default, this is not the case here. diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix index e70d43a150..db588b3abe 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix @@ -22,14 +22,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.5.8"; + version = "10.5.10"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "1s3vfm73911cddjhgpcbkya6nz7ag2zygg56qqzwscn5ybv28j7b"; + sha256 = "1fxsq2xgcb8j81z043bifpmxblj6nb3wqjm9rgsnpwmazkwk5zx5"; name = "mariadb-${version}.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix index 3c13388c46..2b387db66c 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix @@ -1,59 +1,37 @@ { lib, stdenv, fetchFromGitHub, buildEnv -, asio, boost, check, openssl, scons +, asio, boost, check, openssl, cmake }: -let - galeraLibs = buildEnv { - name = "galera-lib-inputs-united"; - paths = [ openssl.out boost check ]; - }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "mariadb-galera"; - version = "26.4.7"; + version = "26.4.8"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - sha256 = "0h7s670pcasq8wzprhyxqfca2cghi62b8xz2kikb2a86wd453qil"; + sha256 = "0rx710dfijiykpi41rhxx8vafk07bffv2nbl3d4ggc32rzv88369"; fetchSubmodules = true; }; - buildInputs = [ asio boost check openssl scons ]; - - postPatch = '' - substituteInPlace SConstruct \ - --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'" - ''; + buildInputs = [ asio boost check openssl cmake ]; preConfigure = '' - export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include" - export LIBPATH="${galeraLibs}/lib" + # make sure bundled asio cannot be used, but leave behind license, because it gets installed + rm -r asio/{asio,asio.hpp} ''; - sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0"; - - enableParallelBuilding = true; - - installPhase = '' - # copied with modifications from scripts/packages/freebsd.sh - GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}" - install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR} - install -m 555 "garb/garbd" "$out/bin/garbd" - install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so" - install -m 444 "scripts/packages/README" "$out/share/doc/galera/" - install -m 444 "scripts/packages/README-MySQL" "$out/share/doc/galera/" - install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR" - install -m 444 "LICENSE" "$out/$GALERA_LICENSE_DIR/GPLv2" - install -m 444 "asio/LICENSE_1_0.txt" "$out/$GALERA_LICENSE_DIR/LICENSE.asio" + postInstall = '' + # for backwards compatibility + mkdir $out/lib/galera + ln -s $out/lib/libgalera_smm.so $out/lib/galera/libgalera_smm.so ''; meta = with lib; { description = "Galera 3 wsrep provider library"; homepage = "https://galeracluster.com/"; - license = licenses.lgpl2; - maintainers = with maintainers; [ izorkin ]; + license = licenses.lgpl2Only; + maintainers = with maintainers; [ ajs124 izorkin ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix index 35b46c673f..63446a684b 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix @@ -8,6 +8,8 @@ let # This is important to obtain a version of `libpq` that does not depend on systemd. , enableSystemd ? (lib.versionAtLeast version "9.6" && !stdenv.isDarwin) + , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic, libkrb5 + # for postgreql.pkgs , this, self, newScope, buildEnv @@ -38,6 +40,7 @@ let [ zlib readline openssl libxml2 ] ++ lib.optionals icuEnabled [ icu ] ++ lib.optionals enableSystemd [ systemd ] + ++ lib.optionals gssSupport [ libkrb5 ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; nativeBuildInputs = [ makeWrapper ] ++ lib.optionals icuEnabled [ pkg-config ]; @@ -62,7 +65,8 @@ let "--enable-debug" (lib.optionalString enableSystemd "--with-systemd") (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") - ] ++ lib.optionals icuEnabled [ "--with-icu" ]; + ] ++ lib.optionals icuEnabled [ "--with-icu" ] + ++ lib.optionals gssSupport [ "--with-gssapi" ]; patches = [ (if atLeast "9.4" then ./patches/disable-resolve_symlinks-94.patch else ./patches/disable-resolve_symlinks.patch) diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix index a93c400069..623bc8c42f 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.1.2"; + version = "0.1.4"; src = fetchFromGitHub { owner = "ankane"; repo = pname; rev = "v${version}"; - sha256 = "1vq672ghhv0azpzgfb7azb36kbjyz9ypcly7r16lrryvjgp5lcjs"; + sha256 = "022f56rhvzq5f6clihxg5c8kyvjp1byjipha1ni6yiqzh3wvqccq"; }; buildInputs = [ postgresql ]; installPhase = '' install -D -t $out/lib vector.so - install -D -t $out/share/postgresql/extension vector-*.sql + install -D -t $out/share/postgresql/extension sql/vector-*.sql install -D -t $out/share/postgresql/extension vector.control ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pipelinedb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pipelinedb.nix index d909761cb5..06c36a4ff6 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pipelinedb.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pipelinedb.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, zeromq, openssl }: +{ lib, stdenv, fetchFromGitHub, postgresql, zeromq, openssl, libsodium, libkrb5 }: stdenv.mkDerivation rec { pname = "pipelinedb"; @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1mnqpvx6g1r2n4kjrrx01vbdx7kvndfsbmm7zbzizjnjlyixz75f"; }; - buildInputs = [ postgresql openssl zeromq ]; + buildInputs = [ postgresql openssl zeromq libsodium libkrb5 ]; makeFlags = [ "USE_PGXS=1" ]; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lsodium"; + preConfigure = '' substituteInPlace Makefile \ --replace "/usr/lib/libzmq.a" "${zeromq}/lib/libzmq.a" diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 3d0cbcf5ac..7d90bdbcc7 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5 }: # # To enable on NixOS: # config.services.postgresql = { @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.2.0"; + version = "2.2.1"; nativeBuildInputs = [ cmake ]; - buildInputs = [ postgresql openssl ]; + buildInputs = [ postgresql openssl libkrb5 ]; src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0gl2jjk9k0s5h7s4yq1qb60lvcqvhp88rh1fhlpyx1vm1hifhhik"; + sha256 = "1hk3yyiddhz9lxls981101malzs9b5vnw9wiiw2cxzcslkmg2gv9"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ] diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix index e2d655bdb3..0c8f0e642a 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix @@ -6,12 +6,7 @@ self: super: { periods = super.callPackage ./ext/periods.nix { }; - postgis = super.callPackage ./ext/postgis.nix { - gdal = self.gdal.override { - postgresql = self.postgresql; - poppler = self.poppler_0_61; - }; - }; + postgis = super.callPackage ./ext/postgis.nix { }; pg_auto_failover = super.callPackage ./ext/pg_auto_failover.nix { }; diff --git a/third_party/nixpkgs/pkgs/servers/squid/default.nix b/third_party/nixpkgs/pkgs/servers/squid/default.nix index 5c980f7e40..dd3405d353 100644 --- a/third_party/nixpkgs/pkgs/servers/squid/default.nix +++ b/third_party/nixpkgs/pkgs/servers/squid/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squid"; - version = "4.14"; + version = "4.15"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz"; - sha256 = "sha256-8Ql9qmQ0iXwVm8EAl4tRNHwDOQQWEIRdCvoSgVFyn/w="; + sha256 = "sha256-tpOk5asoEaioVPYN4KYq+786lSux0EeVLJrgEyH4SiU="; }; nativeBuildInputs = [ pkg-config ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; homepage = "http://www.squid-cache.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ fpletz raskin ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix index d051395027..b71d0eb3d5 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "tailscale"; - version = "1.6.0"; + version = "1.8.3"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "07dzcqd98nsrdv72wp93q6f23mn3pfmpyyi61dx6c26w0j5n4r0p"; + sha256 = "0q0nk0ychb00xhycq3kda57dzrswl8yhci7fzv8yiqzrv3ygpvyd"; }; nativeBuildInputs = [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "0wbw9pc0cv05bw2gsps3099zipwjj3r23vyf87qy6g21r08xrrm8"; + vendorSha256 = "0cppblz1mnyb3c8xcry5mnf566s6l9409vf9572n1rs1bg91dvgn"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/ttyd/default.nix b/third_party/nixpkgs/pkgs/servers/ttyd/default.nix index 3ef571bc82..8ef8c7a7c0 100644 --- a/third_party/nixpkgs/pkgs/servers/ttyd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ttyd/default.nix @@ -7,12 +7,12 @@ with builtins; stdenv.mkDerivation rec { pname = "ttyd"; - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "tsl0922"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "1ifgw93g8jaaa6fgfqjnn83n5ccr6l72ynwwwa97hfwjk90r14fg"; + sha256 = "ErWd99js2EldkRNWFdgZw/X3DIz266kM3lLlC34Deno="; }; nativeBuildInputs = [ pkg-config cmake xxd ]; diff --git a/third_party/nixpkgs/pkgs/servers/unfs3/default.nix b/third_party/nixpkgs/pkgs/servers/unfs3/default.nix index 257bb21b42..4e1e25f19e 100644 --- a/third_party/nixpkgs/pkgs/servers/unfs3/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unfs3/default.nix @@ -29,5 +29,8 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = [ ]; + + # https://github.com/unfs3/unfs3/issues/13 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix b/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix new file mode 100644 index 0000000000..2e024010d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, buildGoModule, Cocoa, WebKit }: + +buildGoModule rec { + pname = "unpackerr"; + version = "0.9.4"; + + src = fetchFromGitHub { + owner = "davidnewhall"; + repo = "unpackerr"; + rev = "v${version}"; + sha256 = "0ss12i8bclz1q9jgr54shvs8zgcs6jrwdm1vj9gvycyd5sx4717s"; + }; + + vendorSha256 = "1j79vmf0mkwkqrg5j6fm2b8y3a23y039kbiqkiwb56724bmd27dd"; + + buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; + + meta = with lib; { + description = "Extracts downloads for Radarr, Sonarr, Lidarr - Deletes extracted files after import"; + homepage = "https://github.com/davidnewhall/unpackerr"; + maintainers = with maintainers; [ nullx76 ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix index 761738ca85..14ccf4eb43 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix @@ -15,13 +15,13 @@ let in package.override rec { name = "bookstack"; - version = "21.04.3"; + version = "21.04.5"; src = fetchFromGitHub { owner = "bookstackapp"; repo = name; rev = "v${version}"; - sha256 = "1vkl0v3c5q0734xvvqinq4zikhy37wjys6nj1h9qdbbka0h39592"; + sha256 = "0gwpa4g2xna4s3lnd970wjpr32i9cwyaixfqxhb8zbz1i9gyxjaa"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/php-packages.nix b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/php-packages.nix index 8791a4293e..b2ea52df87 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -5,10 +5,10 @@ let "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-0aa83b522d5ffa794c02e7411af87a0e241a3082"; + name = "aws-aws-sdk-php-948a4defbe2a571cc4460725015b8e98b7060f2d"; src = fetchurl { - url = https://api.github.com/repos/aws/aws-sdk-php/zipball/0aa83b522d5ffa794c02e7411af87a0e241a3082; - sha256 = "03qahdj01bz76aar21limham7xnv5r0d61gfk1fph8ljf2gbg33i"; + url = https://api.github.com/repos/aws/aws-sdk-php/zipball/948a4defbe2a571cc4460725015b8e98b7060f2d; + sha256 = "06vv6h5j909gbn2d8ih1yr2vf19jnw2va1kghj9qykvll6jzx1cq"; }; }; }; @@ -35,10 +35,10 @@ let "doctrine/cache" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-cache-13e3381b25847283a91948d04640543941309727"; + name = "doctrine-cache-a9c1b59eba5a08ca2770a76eddb88922f504e8e0"; src = fetchurl { - url = https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727; - sha256 = "088fxbpjssp8x95qr3ip2iynxrimimrby03xlsvp2254vcyx94c5"; + url = https://api.github.com/repos/doctrine/cache/zipball/a9c1b59eba5a08ca2770a76eddb88922f504e8e0; + sha256 = "0r1rdfs7k0zl6fqm35qjwbfiqmf3r3nbvfyxzig1379xsgvdd84y"; }; }; }; @@ -125,10 +125,10 @@ let "facade/flare-client-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "facade-flare-client-php-6bf380035890cb0a09b9628c491ae3866b858522"; + name = "facade-flare-client-php-69742118c037f34ee1ef86dc605be4a105d9e984"; src = fetchurl { - url = https://api.github.com/repos/facade/flare-client-php/zipball/6bf380035890cb0a09b9628c491ae3866b858522; - sha256 = "1y0rjlpd71jkl0zzl3q4flv5s9gbk87947xgfi8w62sg5g7jjgl2"; + url = https://api.github.com/repos/facade/flare-client-php/zipball/69742118c037f34ee1ef86dc605be4a105d9e984; + sha256 = "1if56r0g9ymwankz40l5xhw5vch1qkjjy9914lz1vgbkj7ln9pvz"; }; }; }; @@ -165,10 +165,10 @@ let "filp/whoops" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "filp-whoops-d501fd2658d55491a2295ff600ae5978eaad7403"; + name = "filp-whoops-c13c0be93cff50f88bbd70827d993026821914dd"; src = fetchurl { - url = https://api.github.com/repos/filp/whoops/zipball/d501fd2658d55491a2295ff600ae5978eaad7403; - sha256 = "1mpgkl7yzw9j4pxkw404fvykapr42347lyz7jgrl1ks61pk6s9v5"; + url = https://api.github.com/repos/filp/whoops/zipball/c13c0be93cff50f88bbd70827d993026821914dd; + sha256 = "0janbd93xvr5hy2bms05q1l31gmwbqrgjfvbzkmv3bfw4gcksq0i"; }; }; }; @@ -195,10 +195,10 @@ let "guzzlehttp/psr7" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-psr7-35ea11d335fd638b5882ff1725228b3d35496ab1"; + name = "guzzlehttp-psr7-dc960a912984efb74d0a90222870c72c87f10c91"; src = fetchurl { - url = https://api.github.com/repos/guzzle/psr7/zipball/35ea11d335fd638b5882ff1725228b3d35496ab1; - sha256 = "1nsd7sla2jpx9kzg0lzk4kvc66d30bnkf2yfzdp7gghb67wvajfa"; + url = https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91; + sha256 = "06nc60wf8k6kcl89kprk04khsrrik5lnis615mx4a0m0pjn8bliz"; }; }; }; @@ -225,10 +225,10 @@ let "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-d94c07d72c14f07e7d2027458e7f0a76f9ceb0d9"; + name = "laravel-framework-0117d797dc1ab64b1f88d4f6b966380ea7def091"; src = fetchurl { - url = https://api.github.com/repos/laravel/framework/zipball/d94c07d72c14f07e7d2027458e7f0a76f9ceb0d9; - sha256 = "02cml6rg3qxnr8gynnd8iqwdyzflqwnyivxw034dzbm60xpg6w93"; + url = https://api.github.com/repos/laravel/framework/zipball/0117d797dc1ab64b1f88d4f6b966380ea7def091; + sha256 = "11aw7smg042g8kyyhdzawmkwgbv5hkn6l6k2m27lc34v84r6kdqm"; }; }; }; @@ -245,10 +245,10 @@ let "league/commonmark" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-commonmark-08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf"; + name = "league-commonmark-2651c497f005de305c7ba3f232cbd87b8c00ee8c"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/commonmark/zipball/08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf; - sha256 = "10bs8r0qiq9bybypnascvk7a7181699cnwl27yq4m108cj1i223h"; + url = https://api.github.com/repos/thephpleague/commonmark/zipball/2651c497f005de305c7ba3f232cbd87b8c00ee8c; + sha256 = "0mf2avlnn0c9p4fi1jz5m85k6y7xg2p0dm1n4r7cpg25vngswmfs"; }; }; }; @@ -315,10 +315,10 @@ let "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4"; + name = "nesbot-carbon-606262fd8888b75317ba9461825a24fc34001e1e"; src = fetchurl { - url = https://api.github.com/repos/briannesbitt/Carbon/zipball/2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4; - sha256 = "0riizvfqxvvbkhhfadcqr8717s0q12p00qmffv26664h5kckl58r"; + url = https://api.github.com/repos/briannesbitt/Carbon/zipball/606262fd8888b75317ba9461825a24fc34001e1e; + sha256 = "0iqhb3gfmray8jkwki19pwm15vmf96vfj4m12nk7lmn74470lf2x"; }; }; }; @@ -455,10 +455,10 @@ let "psr/log" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psr-log-0f73288fd15629204f9d42b7055f72dacbe811fc"; + name = "psr-log-d49695b909c3b7628b6289db5479a1c204601f11"; src = fetchurl { - url = https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc; - sha256 = "1npi9ggl4qll4sdxz1xgp8779ia73gwlpjxbb1f1cpl1wn4s42r4"; + url = https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11; + sha256 = "0sb0mq30dvmzdgsnqvw3xh4fb4bqjncx72kf8n622f94dd48amln"; }; }; }; @@ -615,30 +615,30 @@ let "symfony/console" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-console-1ba4560dbbb9fcf5ae28b61f71f49c678086cf23"; + name = "symfony-console-36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625"; src = fetchurl { - url = https://api.github.com/repos/symfony/console/zipball/1ba4560dbbb9fcf5ae28b61f71f49c678086cf23; - sha256 = "1zsmv0p0xxdp44301yd3n1w9j79g631bvvfp04zniqk4h5q6kvg9"; + url = https://api.github.com/repos/symfony/console/zipball/36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625; + sha256 = "0n5caxf7vgx0x6izsxfkkjdl9jw96qi7h9h0k4s8fccqqmwb61cc"; }; }; }; "symfony/css-selector" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-css-selector-f907d3e53ecb2a5fad8609eb2f30525287a734c8"; + name = "symfony-css-selector-01c77324d1d47efbfd7891f62a7c256c69330115"; src = fetchurl { - url = https://api.github.com/repos/symfony/css-selector/zipball/f907d3e53ecb2a5fad8609eb2f30525287a734c8; - sha256 = "19yqy81psz2wh8gy2j3phywsgrw9sbcw83l8lbnxbk5khg8hw3nm"; + url = https://api.github.com/repos/symfony/css-selector/zipball/01c77324d1d47efbfd7891f62a7c256c69330115; + sha256 = "12hd9vga35w8g4bwmlkr87pxlwdx71sp2bkxs8j854hf28yam75w"; }; }; }; "symfony/debug" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-debug-157bbec4fd773bae53c5483c50951a5530a2cc16"; + name = "symfony-debug-45b2136377cca5f10af858968d6079a482bca473"; src = fetchurl { - url = https://api.github.com/repos/symfony/debug/zipball/157bbec4fd773bae53c5483c50951a5530a2cc16; - sha256 = "0v7l7081fw2wr96xv472nhi1d0xzw6lnl8hnjgi9g3gnksfagwq8"; + url = https://api.github.com/repos/symfony/debug/zipball/45b2136377cca5f10af858968d6079a482bca473; + sha256 = "0p7g2mwrvg8x264kl9kn7a23adnqxh66jy1kjczq5c5xlpw2rxdb"; }; }; }; @@ -655,10 +655,10 @@ let "symfony/error-handler" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-error-handler-48e81a375525872e788c2418430f54150d935810"; + name = "symfony-error-handler-76603a8df8e001436df80758eb03a8baa5324175"; src = fetchurl { - url = https://api.github.com/repos/symfony/error-handler/zipball/48e81a375525872e788c2418430f54150d935810; - sha256 = "17hpwx8arv3h4cw4fwzkm7a39lsa92vwxsinyqmx723v1nr5z1d2"; + url = https://api.github.com/repos/symfony/error-handler/zipball/76603a8df8e001436df80758eb03a8baa5324175; + sha256 = "15s46vjwzny821qq93qsnd9ig14d72rakbavgb3sd43gipyjld8g"; }; }; }; @@ -705,30 +705,30 @@ let "symfony/http-foundation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-02d968647fe61b2f419a8dc70c468a9d30a48d3a"; + name = "symfony-http-foundation-1a6f87ef99d05b1bf5c865b4ef7992263e1cb081"; src = fetchurl { - url = https://api.github.com/repos/symfony/http-foundation/zipball/02d968647fe61b2f419a8dc70c468a9d30a48d3a; - sha256 = "1bq4why2v8p7wy8801bdml43xh7kb5fli16cv74bvqpwlp4cdv9f"; + url = https://api.github.com/repos/symfony/http-foundation/zipball/1a6f87ef99d05b1bf5c865b4ef7992263e1cb081; + sha256 = "0da13w35j7hrkv87p8rrfxdxpksbf1dvji0ag7chwzhfg63516l6"; }; }; }; "symfony/http-kernel" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-0248214120d00c5f44f1cd5d9ad65f0b38459333"; + name = "symfony-http-kernel-cd2e325fc34a4a5bbec91eecf69dda8ee8c5ea4f"; src = fetchurl { - url = https://api.github.com/repos/symfony/http-kernel/zipball/0248214120d00c5f44f1cd5d9ad65f0b38459333; - sha256 = "032ljl732x0bs3my26wjfmxrxplz8vlxs0xzlqsxrh18lnyv6z3h"; + url = https://api.github.com/repos/symfony/http-kernel/zipball/cd2e325fc34a4a5bbec91eecf69dda8ee8c5ea4f; + sha256 = "0wk4nivw1w4kl7gziazvvzxzjhs7lalc2gc1pnscxj6k3gkfq6fl"; }; }; }; "symfony/mime" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mime-1b2092244374cbe48ae733673f2ca0818b37197b"; + name = "symfony-mime-7af452bf51c46f18da00feb32e1ad36db9426515"; src = fetchurl { - url = https://api.github.com/repos/symfony/mime/zipball/1b2092244374cbe48ae733673f2ca0818b37197b; - sha256 = "0d2vhmd25d7yvh9xzl2vazx2bfsb8qyvd2kgvl9cry1va4vrpkj3"; + url = https://api.github.com/repos/symfony/mime/zipball/7af452bf51c46f18da00feb32e1ad36db9426515; + sha256 = "1rkm66zr6sfp8jw80h4vjrbpx40sqhhlpbc126x990mbzzapjlay"; }; }; }; @@ -815,20 +815,20 @@ let "symfony/process" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-process-7e950b6366d4da90292c2e7fa820b3c1842b965a"; + name = "symfony-process-f5481b22729d465acb1cea3455fc04ce84b0148b"; src = fetchurl { - url = https://api.github.com/repos/symfony/process/zipball/7e950b6366d4da90292c2e7fa820b3c1842b965a; - sha256 = "07ykgz5bjd45izf5n6jm2n27wcaa7aih2wlsiln1ffj9vqd6l1s4"; + url = https://api.github.com/repos/symfony/process/zipball/f5481b22729d465acb1cea3455fc04ce84b0148b; + sha256 = "1cz0gd7lkp07dlylf8c32fjpfsm9z3d66iwx45i7b5wh5gc96ns0"; }; }; }; "symfony/routing" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-routing-69919991c845b34626664ddc9b3aef9d09d2a5df"; + name = "symfony-routing-049e7c5c41f98511959668791b4adc0898a821b3"; src = fetchurl { - url = https://api.github.com/repos/symfony/routing/zipball/69919991c845b34626664ddc9b3aef9d09d2a5df; - sha256 = "0ghynrw6d9dpskhgyf3ljlz4pfmi68r3bzhr45lygadx21yacddw"; + url = https://api.github.com/repos/symfony/routing/zipball/049e7c5c41f98511959668791b4adc0898a821b3; + sha256 = "1557bvcmxpa7hmcvwl9qf94l7n9x0y7xw2k3s8v85ys35fi54clw"; }; }; }; @@ -865,10 +865,10 @@ let "symfony/var-dumper" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-0da0e174f728996f5d5072d6a9f0a42259dbc806"; + name = "symfony-var-dumper-c194bcedde6295f3ec3e9eba1f5d484ea97c41a7"; src = fetchurl { - url = https://api.github.com/repos/symfony/var-dumper/zipball/0da0e174f728996f5d5072d6a9f0a42259dbc806; - sha256 = "1qmv99bvq10siy8bbszqmn488cjcm70vip4xs8vxwm6x6x5cw1ia"; + url = https://api.github.com/repos/symfony/var-dumper/zipball/c194bcedde6295f3ec3e9eba1f5d484ea97c41a7; + sha256 = "0wccbr4l03asdar89bss3fhy486wjjqgjsk5iypmxaiga12ac01b"; }; }; }; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix index ae56fed52b..c24857d9dc 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "galene"; - version = "0.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - sha256 = "1pl3mnkmfqykhq55q36kvvnvn9fgsk72pfa7nii3hywzad0bj0ar"; + sha256 = "sha256-yb+gEex4WEvIAEMuSTkw25rsBTL9tlfhf9qQtISWUd0="; }; - vendorSha256 = "0jrc6y5chkj25bnpzn6blvfb0vd09h6fdcz75g54605z8nqd397p"; + vendorSha256 = "sha256-Vm7tTTQJyZZVbORl5ziy4GJ34kHh5dh0ojX/ZuTpshA="; outputs = [ "out" "static" ]; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix index b1a11db0fb..0e1d933ab5 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix @@ -1,19 +1,46 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper -, which, nodejs, mkYarnPackage, python2, nixosTests }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, makeWrapper +, which +, nodejs +, mkYarnPackage +, python2 +, nixosTests +, buildGoModule +}: + +let + # we need a different version than the one already available in nixpkgs + esbuild-hedgedoc = buildGoModule rec { + pname = "esbuild"; + version = "0.11.20"; + + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + sha256 = "009f2mfgzkzgxjh3034mzdkcvm5vz17sgy1cs604f0425i22z8qm"; + }; + + vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q"; + }; +in mkYarnPackage rec { name = "hedgedoc"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "hedgedoc"; repo = "hedgedoc"; rev = version; - sha256 = "1xi4gi1yjwggdsnz5hljx9xl4qhnm9r3c24q7i6d5y8yv6lh6lsr"; + sha256 = "1h2wyhap264iqm2jh0i05w0hb2j86jsq1plyl7k3an90w7wngyg1"; }; nativeBuildInputs = [ which makeWrapper ]; - extraBuildInputs = [ python2 ]; + extraBuildInputs = [ python2 esbuild-hedgedoc ]; yarnNix = ./yarn.nix; yarnLock = ./yarn.lock; @@ -35,6 +62,11 @@ mkYarnPackage rec { npm run install --build-from-source --nodedir=${nodejs}/include/node popd + pushd node_modules/esbuild + rm bin/esbuild + ln -s ${lib.getBin esbuild-hedgedoc}/bin/esbuild bin/ + popd + npm run build patchShebangs bin/* diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/package.json b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/package.json index 63dfc6cb59..c7fb794a1b 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/package.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/package.json @@ -1,6 +1,6 @@ { "name": "HedgeDoc", - "version": "1.8.0", + "version": "1.8.2", "description": "The best platform to write and share markdown.", "main": "app.js", "license": "AGPL-3.0", @@ -25,11 +25,8 @@ "azure-storage": "^2.7.0", "base64url": "^3.0.0", "body-parser": "^1.15.2", - "bootstrap": "^3.4.0", - "bootstrap-validator": "^0.11.8", "chance": "^1.0.4", "cheerio": "^0.22.0", - "codemirror": "git+https://github.com/hedgedoc/CodeMirror.git", "compression": "^1.6.2", "connect-flash": "^0.1.1", "connect-session-sequelize": "^7.0.0", @@ -38,32 +35,16 @@ "deep-freeze": "^0.0.1", "diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git", "ejs": "^3.0.0", - "emojify.js": "^1.1.0", - "escape-html": "^1.0.3", "express": ">=4.14", "express-session": "^1.14.2", - "file-saver": "^2.0.0", "file-type": "^16.1.0", - "flowchart.js": "^1.6.4", - "fork-awesome": "^1.1.3", "formidable": "^1.0.17", - "gist-embed": "^2.6.0", "graceful-fs": "^4.1.11", "handlebars": "^4.5.2", "helmet": "^4.5.0", - "highlight.js": "^10.0.0", "i18n": "^0.13.0", - "ionicons": "^2.0.1", "is-svg": "^4.3.1", - "jquery": "^3.5.1", - "jquery-mousewheel": "^3.1.13", - "jquery-ui": "^1.12.1", - "js-cookie": "^2.1.3", - "js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git", - "js-yaml": "^3.13.1", "jsdom-nogyp": "^0.8.3", - "keymaster": "^1.6.2", - "list.js": "^2.0.0", "lodash": "^4.17.20", "lutim": "^1.0.2", "lz-string": "git+https://github.com/hackmdio/lz-string.git", @@ -81,9 +62,7 @@ "markdown-it-regexp": "^0.4.0", "markdown-it-sub": "^1.0.0", "markdown-it-sup": "^1.0.0", - "mathjax": "^2.7.6", "mattermost": "^3.4.0", - "mermaid": "^8.5.1", "meta-marked": "git+https://github.com/hedgedoc/meta-marked", "method-override": "^3.0.0", "minimist": "^1.2.0", @@ -107,36 +86,25 @@ "pdfobject": "^2.0.201604172", "pg": "^8.2.1", "pg-hstore": "^2.3.3", - "prismjs": "^1.21.0", "prom-client": "^13.1.0", "prometheus-api-metrics": "^3.2.0", "randomcolor": "^0.6.0", - "raphael": "^2.3.0", "readline-sync": "^1.4.7", - "reveal.js": "^3.9.2", "rimraf": "^3.0.2", "scrypt-kdf": "^2.0.1", - "select2": "^3.5.2-browserify", "sequelize": "^5.21.1", "shortid": "2.2.16", "socket.io": "^2.1.1", - "socket.io-client": "^2.1.1", - "spin.js": "^4.0.0", "sqlite3": "^5.0.0", "store": "^2.0.12", "string": "^3.3.3", "tedious": "^6.6.0", "toobusy-js": "^0.5.1", - "turndown": "^7.0.0", "umzug": "^2.3.0", "uuid": "^8.0.0", "validator": "^13.0.0", - "velocity-animate": "^1.4.0", - "visibilityjs": "^2.0.0", - "viz.js": "^1.7.0", "winston": "^3.1.0", "ws": "^7.4.4", - "wurl": "^2.5.3", "xss": "^1.0.3" }, "resolutions": { @@ -163,6 +131,10 @@ "name": "Christoph (Sheogorath) Kern", "email": "codimd@sheogorath.shivering-isles.com", "url": "https://shivering-isles.com" + }, + { + "name":"David Mehren", + "email": "hedgedoc@herrmehren.de" } ], "repository": { @@ -177,9 +149,15 @@ "babel-polyfill": "6.26.0", "babel-preset-env": "1.7.0", "babel-runtime": "6.26.0", + "bootstrap": "3.4.1", + "bootstrap-validator": "0.11.9", + "codemirror": "git+https://github.com/hedgedoc/CodeMirror.git", "copy-webpack-plugin": "6.4.1", "css-loader": "5.2.4", - "eslint": "7.25.0", + "emojify.js": "1.1.0", + "esbuild-loader": "2.13.0", + "escape-html": "1.0.3", + "eslint": "7.26.0", "eslint-config-standard": "16.0.2", "eslint-plugin-import": "2.22.1", "eslint-plugin-node": "11.1.0", @@ -187,23 +165,50 @@ "eslint-plugin-standard": "4.1.0", "expose-loader": "1.0.3", "file-loader": "6.2.0", + "file-saver": "2.0.5", + "flowchart.js": "1.15.0", + "fork-awesome": "1.1.7", + "gist-embed": "2.6.0", + "highlight.js": "10.7.2", "html-webpack-plugin": "4.5.2", "imports-loader": "1.2.0", + "ionicons": "2.0.1", + "jquery": "3.6.0", + "jquery-mousewheel": "3.1.13", + "jquery-ui": "1.12.1", + "js-cookie": "2.2.1", + "js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git", + "js-yaml": "3.14.1", "jsonlint": "1.6.3", + "keymaster": "1.6.2", "less": "4.1.1", "less-loader": "7.3.0", + "list.js": "2.3.1", + "mathjax": "2.7.9", + "mermaid": "8.10.1", "mini-css-extract-plugin": "1.6.0", - "mocha": "8.3.2", + "mocha": "8.4.0", "mock-require": "3.0.3", "optimize-css-assets-webpack-plugin": "5.0.4", + "prismjs": "1.23.0", + "raphael": "2.3.0", "remark-cli": "9.0.0", "remark-preset-lint-markdown-style-guide": "4.0.0", + "reveal.js": "3.9.2", "script-loader": "0.7.2", + "select2": "3.5.2-browserify", + "socket.io-client": "2.4.0", + "spin.js": "4.1.0", "string-loader": "0.0.1", + "turndown": "7.0.0", "url-loader": "4.1.1", + "velocity-animate": "1.5.2", + "visibilityjs": "2.0.2", + "viz.js": "1.8.2", "webpack": "4.46.0", - "webpack-cli": "4.6.0", - "webpack-merge": "5.7.3" + "webpack-cli": "4.7.0", + "webpack-merge": "5.7.3", + "wurl": "2.5.4" }, "optionalDependencies": { "bufferutil": "^4.0.0", diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock index e7c464b5b8..a404d95d8f 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock +++ b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock @@ -92,10 +92,10 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752" integrity sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg== -"@eslint/eslintrc@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547" - integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog== +"@eslint/eslintrc@^0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz#442763b88cecbe3ee0ec7ca6d6dd6168550cbf14" + integrity sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ== dependencies: ajv "^6.12.4" debug "^4.1.1" @@ -296,19 +296,19 @@ integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== "@types/node@*": - version "15.0.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a" - integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA== + version "15.0.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67" + integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA== "@types/node@^12.12.17": - version "12.20.11" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.11.tgz#980832cd56efafff8c18aa148c4085eb02a483f4" - integrity sha512-gema+apZ6qLQK7k7F0dGkGCWQYsL0qqKORWOQO6tq46q+x+1C0vbOiOqOwRVlh4RAdbQwV/j/ryr3u5NOG1fPQ== + version "12.20.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.12.tgz#fd9c1c2cfab536a2383ed1ef70f94adea743a226" + integrity sha512-KQZ1al2hKOONAs2MFv+yTQP1LkDWMrRJ9YCVRalXltOfXsBmH5IownLxQaiq0lnAHwAViLnh2aTYqrPcRGEbgg== "@types/node@^14.14.28": - version "14.14.43" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz#26bcbb0595b305400e8ceaf9a127a7f905ae49c8" - integrity sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ== + version "14.14.44" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz#df7503e6002847b834371c004b372529f3f85215" + integrity sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA== "@types/node@^8.0.47": version "8.10.66" @@ -378,9 +378,9 @@ source-map "^0.7.3" "@types/webpack@^4.41.8": - version "4.41.27" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.27.tgz#f47da488c8037e7f1b2dbf2714fbbacb61ec0ffc" - integrity sha512-wK/oi5gcHi72VMTbOaQ70VcDxSQ1uX8S2tukBK9ARuGXrYM/+u4ou73roc7trXDNmCxCoerE8zruQqX/wuHszA== + version "4.41.28" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.28.tgz#0069a2159b7ad4d83d0b5801942c17d54133897b" + integrity sha512-Nn84RAiJjKRfPFFCVR8LC4ueTtTdfWAMZ03THIzZWRJB+rX24BD3LqPSFnbMscWauEsT4segAsylPDIaZyZyLQ== dependencies: "@types/anymatch" "*" "@types/node" "*" @@ -539,22 +539,22 @@ "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.2.tgz#2a20812bfb3a2ebb0b27ee26a52eeb3e3f000836" - integrity sha512-3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA== +"@webpack-cli/configtest@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.3.tgz#204bcff87cda3ea4810881f7ea96e5f5321b87b9" + integrity sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw== -"@webpack-cli/info@^1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.3.tgz#ef819d10ace2976b6d134c7c823a3e79ee31a92c" - integrity sha512-lLek3/T7u40lTqzCGpC6CAbY6+vXhdhmwFRxZLMnRm6/sIF/7qMpT8MocXCRQfz0JAh63wpbXLMnsQ5162WS7Q== +"@webpack-cli/info@^1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.4.tgz#7381fd41c9577b2d8f6c2594fad397ef49ad5573" + integrity sha512-ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g== dependencies: envinfo "^7.7.3" -"@webpack-cli/serve@^1.3.1": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.1.tgz#911d1b3ff4a843304b9c3bacf67bb34672418441" - integrity sha512-0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw== +"@webpack-cli/serve@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz#f84fd07bcacefe56ce762925798871092f0f228e" + integrity sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg== "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -658,9 +658,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ajv@^8.0.1: - version "8.2.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602" - integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA== + version "8.3.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.3.0.tgz#25ee7348e32cdc4a1dbb38256bf6bdc451dd577c" + integrity sha512-RYE7B5An83d7eWnDR8kbdaIFqmKCNsP16ay1hDbJEU+sa0e3H9SebskCt0Uufem6cfAVu7Col6ubcn/W+Sm8/Q== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -949,9 +949,9 @@ available-typed-arrays@^1.0.2: array-filter "^1.0.0" aws-sdk@^2.888.0: - version "2.898.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.898.0.tgz#fd07b9748d302fccc2d1e069ae313e911b526578" - integrity sha512-6XxsKEDgDEQlLAVrPDNO01UgflCaKJlp6bYTSxv2z50ApTktadwSr/uJgpaBdAiZ8EKVlWN4UgM7vgOmrI/MPg== + version "2.904.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.904.0.tgz#45a53e918698e451f762e44005dfce177a50b7e6" + integrity sha512-BnlMgxiQ0as0LSigm/QVgdh8CoIVY29DItmnFOnL6ahJ5W/m1Xzpge2jJoj+gqwZ+QQvOO31dDYw9PtteiR/IQ== dependencies: buffer "4.9.2" events "1.1.1" @@ -1727,12 +1727,12 @@ boolbase@^1.0.0, boolbase@~1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= -bootstrap-validator@^0.11.8: +bootstrap-validator@0.11.9: version "0.11.9" resolved "https://registry.yarnpkg.com/bootstrap-validator/-/bootstrap-validator-0.11.9.tgz#fb7058eef53623e78f5aa7967026f98f875a9404" integrity sha1-+3BY7vU2I+ePWqeWcCb5j4dalAQ= -bootstrap@^3.4.0: +bootstrap@3.4.1: version "3.4.1" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72" integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA== @@ -2064,9 +2064,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001219: - version "1.0.30001220" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001220.tgz#c080e1c8eefb99f6cc9685da6313840bdbaf4c36" - integrity sha512-pjC2T4DIDyGAKTL4dMvGUQaMUHRmhvPpAgNNTa14jaBWHu+bLQgvpFqElxh9L4829Fdx0PlKiMp3wnYldRtECA== + version "1.0.30001228" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa" + integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A== caseless@~0.12.0: version "0.12.0" @@ -3505,9 +3505,9 @@ ejs@^3.0.0: jake "^10.6.1" electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.723: - version "1.3.725" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.725.tgz#04fc83f9189169aff50f0a00c6b4090b910cba85" - integrity sha512-2BbeAESz7kc6KBzs7WVrMc1BY5waUphk4D4DX5dSQXJhsc3tP5ZFaiyuL0AB7vUKzDYpIeYwTYlEfxyjsGUrhw== + version "1.3.727" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf" + integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg== elliptic@^6.5.3: version "6.5.4" @@ -3527,7 +3527,7 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -emojify.js@^1.1.0: +emojify.js@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/emojify.js/-/emojify.js-1.1.0.tgz#079fff223307c9007f570785e8e4935d5c398beb" integrity sha1-B5//IjMHyQB/VweF6OSTXVw5i+s= @@ -3555,9 +3555,9 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: once "^1.4.0" engine.io-client@~3.5.0: - version "3.5.1" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.1.tgz#b500458a39c0cd197a921e0e759721a746d0bdb9" - integrity sha512-oVu9kBkGbcggulyVF0kz6BV3ganqUeqXvD79WOFKa+11oK692w1NyFkuEj4xrkFRpZhn92QOqTk4RQq5LiBXbQ== + version "3.5.2" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.2.tgz#0ef473621294004e9ceebe73cef0af9e36f2f5fa" + integrity sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA== dependencies: component-emitter "~1.3.0" component-inherit "0.0.3" @@ -3568,7 +3568,7 @@ engine.io-client@~3.5.0: parseqs "0.0.6" parseuri "0.0.6" ws "~7.4.2" - xmlhttprequest-ssl "~1.5.4" + xmlhttprequest-ssl "~1.6.2" yeast "0.1.2" engine.io-parser@~2.2.0: @@ -3603,7 +3603,7 @@ enhanced-resolve@^4.5.0: memory-fs "^0.5.0" tapable "^1.0.0" -enquirer@^2.3.5, enquirer@^2.3.6: +enquirer@^2.3.5: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== @@ -3701,12 +3701,29 @@ es6-error@^4.1.1: resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== +esbuild-loader@2.13.0: + version "2.13.0" + resolved "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-2.13.0.tgz#f5a3602a89a3b728506ae3e1887304fffeef9270" + integrity sha512-gC9lML8RGkTSWG2pJVEOZRLMoIluq1Jd7OzzVkOZKMzbMDMWDhXEwXLs60n+aglnAYa9GVrD/UXjTHkM51nBsg== + dependencies: + esbuild "^0.11.19" + joycon "^3.0.1" + json5 "^2.2.0" + loader-utils "^2.0.0" + type-fest "^1.0.1" + webpack-sources "^2.2.0" + +esbuild@^0.11.19: + version "0.11.20" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.11.20.tgz#7cefa1aee8b372c184e42457885f7ce5d3e62a1e" + integrity sha512-QOZrVpN/Yz74xfat0H6euSgn3RnwLevY1mJTEXneukz1ln9qB+ieaerRMzSeETpz/UJWsBMzRVR/andBht5WKw== + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== -escape-html@^1.0.3, escape-html@~1.0.3: +escape-html@1.0.3, escape-html@^1.0.3, escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= @@ -3820,17 +3837,17 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== eslint-visitor-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" - integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint@7.25.0: - version "7.25.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67" - integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw== +eslint@7.26.0: + version "7.26.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.26.0.tgz#d416fdcdcb3236cd8f282065312813f8c13982f6" + integrity sha512-4R1ieRf52/izcZE7AlLy56uIHHDLT74Yzz2Iv2l6kDaYvEu9x+wMB5dZArVL8SYGXSYV2YAg70FcW5Y5nGGNIg== dependencies: "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.0" + "@eslint/eslintrc" "^0.4.1" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -4192,15 +4209,15 @@ file-loader@6.2.0: loader-utils "^2.0.0" schema-utils "^3.0.0" -file-saver@^2.0.0: +file-saver@2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38" integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA== file-type@^16.1.0: - version "16.3.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.3.0.tgz#f03af91db30f92cc9a0b335c0644c46101522f6d" - integrity sha512-ZA0hV64611vJT42ltw0T9IDwHApQuxRdrmQZWTeDmeAUtZBBVSQW3nSQqhhW1cAgpXgqcJvm410BYHXJQ9AymA== + version "16.4.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.4.0.tgz#464197e44bd94a452d77b09085d977ae0dad2df4" + integrity sha512-MDAkwha3wHg11Lp++2T3Gu347eC/DB4r7nYj6iZaf1l7UhGBh2746QKxg0BWC8w2dJsxUEmH8KvLueX+GthN2w== dependencies: readable-web-to-node-stream "^3.0.0" strtok3 "^6.0.3" @@ -4340,7 +4357,7 @@ flatted@^3.1.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== -flowchart.js@^1.6.4: +flowchart.js@1.15.0: version "1.15.0" resolved "https://registry.yarnpkg.com/flowchart.js/-/flowchart.js-1.15.0.tgz#132ba2df14af0a65e67280026ef05a1ffd16569f" integrity sha512-IyCVUFfHPLPgKLynw3NCkZ7CvKJdc/bAu0aHm+2AxKhtSBCiUC1kcTX1KautC3HOp1A2JS1IOcYxDTmcMkx5nQ== @@ -4361,9 +4378,9 @@ fn.name@1.x.x: integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== follow-redirects@^1.10.0: - version "1.14.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz#f5d260f95c5f8c105894491feee5dc8993b402fe" - integrity sha512-0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg== + version "1.14.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43" + integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg== for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" @@ -4387,7 +4404,7 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= -fork-awesome@^1.1.3: +fork-awesome@1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/fork-awesome/-/fork-awesome-1.1.7.tgz#1427da1cac3d1713046ee88427e5fcecb9501d21" integrity sha512-IHI7XCSXrKfUIWslse8c/PaaVDT1oBaYge+ju40ihL2ooiQeBpTr4wvIXhgTd2NuhntlvX+M5jYHAPTzNlmv0g== @@ -4588,7 +4605,7 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -gist-embed@^2.6.0: +gist-embed@2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/gist-embed/-/gist-embed-2.6.0.tgz#1ea95703fa1fc2a1255419f6f06c67e9920649ab" integrity sha1-HqlXA/ofwqElVBn28Gxn6ZIGSas= @@ -4623,7 +4640,7 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0: dependencies: is-glob "^4.0.1" -glob@7.1.6, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: +glob@7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -4635,6 +4652,18 @@ glob@7.1.6, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + globals@^12.1.0: version "12.4.0" resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" @@ -4834,7 +4863,7 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== -highlight.js@^10.0.0: +highlight.js@10.7.2: version "10.7.2" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.2.tgz#89319b861edc66c48854ed1e6da21ea89f847360" integrity sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg== @@ -4966,9 +4995,9 @@ human-signals@^2.1.0: integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== i18n@^0.13.0: - version "0.13.2" - resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.13.2.tgz#3886678fe7cbbed45bac2ce53b8144c788a1c1b5" - integrity sha512-PB65bHhQESMBIl/xVNChEAzoxZ5W6FrZ1H9Ma/YcPeSfE7VS9b0sqwBPusa0CfzSKUPSl+uMhRIgyv3jkE7XNw== + version "0.13.3" + resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.13.3.tgz#5820f48d87a77cf14e064719bee9bc682ed550eb" + integrity sha512-QDmY2joBdKxj3wvk2LKyvZkjwGHta882kYHwEvx1WbwiPAet49kEU7cxzGfnrtWrfh4+7I07kBc0ZSjSlhnKyQ== dependencies: debug "^4.1.1" make-plural "^6.2.2" @@ -5019,9 +5048,9 @@ iferr@^0.1.5: integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== + version "3.0.4" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335" + integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ== dependencies: minimatch "^3.0.4" @@ -5144,7 +5173,7 @@ invariant@^2.2.2: dependencies: loose-envify "^1.0.0" -ionicons@^2.0.1: +ionicons@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-2.0.1.tgz#ca398113293ea870244f538f0aabbd4b5b209a3e" integrity sha1-yjmBEyk+qHAkT1OPCqu9S1sgmj4= @@ -5204,9 +5233,9 @@ is-arrayish@^0.3.1: integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== is-bigint@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2" - integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg== + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a" + integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA== is-binary-path@^1.0.0: version "1.0.1" @@ -5228,11 +5257,11 @@ is-bluebird@^1.0.2: integrity sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI= is-boolean-object@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0" - integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA== + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8" + integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" is-buffer@^1.1.5: version "1.1.6" @@ -5262,9 +5291,9 @@ is-color-stop@^1.0.0: rgba-regex "^1.0.0" is-core-module@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887" - integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw== + version "2.4.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1" + integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A== dependencies: has "^1.0.3" @@ -5283,9 +5312,9 @@ is-data-descriptor@^1.0.0: kind-of "^6.0.0" is-date-object@^1.0.1, is-date-object@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" - integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5" + integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A== is-decimal@^1.0.0: version "1.0.4" @@ -5413,9 +5442,9 @@ is-negative-zero@^2.0.1: integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== is-number-object@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197" - integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw== + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb" + integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw== is-number@^2.1.0: version "2.1.0" @@ -5474,12 +5503,12 @@ is-property@^1.0.2: integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ= is-regex@^1.1.1, is-regex@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251" - integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg== + version "1.1.3" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f" + integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ== dependencies: call-bind "^1.0.2" - has-symbols "^1.0.1" + has-symbols "^1.0.2" is-resolvable@^1.0.0: version "1.1.0" @@ -5497,9 +5526,9 @@ is-stream@^2.0.0: integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== is-string@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" - integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f" + integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w== is-svg@^4.3.1: version "4.3.1" @@ -5509,11 +5538,11 @@ is-svg@^4.3.1: fast-xml-parser "^3.19.0" is-symbol@^1.0.2, is-symbol@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" - integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== dependencies: - has-symbols "^1.0.1" + has-symbols "^1.0.2" is-typed-array@^1.1.3: version "1.1.5" @@ -5613,22 +5642,27 @@ jmespath@0.15.0: resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217" integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc= -jquery-mousewheel@^3.1.13: +joycon@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.0.1.tgz#9074c9b08ccf37a6726ff74a18485f85efcaddaf" + integrity sha512-SJcJNBg32dGgxhPtM0wQqxqV0ax9k/9TaUskGDSJkSFSQOEWWvQ3zzWdGQRIUry2j1zA5+ReH13t0Mf3StuVZA== + +jquery-mousewheel@3.1.13: version "3.1.13" resolved "https://registry.yarnpkg.com/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz#06f0335f16e353a695e7206bf50503cb523a6ee5" integrity sha1-BvAzXxbjU6aV5yBr9QUDy1I6buU= -jquery-ui@^1.12.1: +jquery-ui@1.12.1: version "1.12.1" resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51" integrity sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE= -jquery@^3.5.1: +jquery@3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw== -js-cookie@^2.1.3: +js-cookie@2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== @@ -5654,14 +5688,7 @@ js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" - integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q== - dependencies: - argparse "^2.0.1" - -js-yaml@^3.13.1, js-yaml@^3.6.1: +js-yaml@3.14.1, js-yaml@^3.13.1, js-yaml@^3.6.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -5669,6 +5696,13 @@ js-yaml@^3.13.1, js-yaml@^3.6.1: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" + integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q== + dependencies: + argparse "^2.0.1" + js-yaml@~4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" @@ -5767,7 +5801,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.0.0, json5@^2.1.2: +json5@^2.0.0, json5@^2.1.2, json5@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== @@ -5814,7 +5848,7 @@ jws@3.x.x: jwa "^1.4.1" safe-buffer "^5.0.1" -keymaster@^1.6.2: +keymaster@1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/keymaster/-/keymaster-1.6.2.tgz#e1ae54d0ea9488f9f60b66b668f02e9a1946c6eb" integrity sha1-4a5U0OqUiPn2C2a2aPAumhlGxus= @@ -5959,7 +5993,7 @@ linkify-it@^3.0.1: dependencies: uc.micro "^1.0.1" -list.js@^2.0.0: +list.js@2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/list.js/-/list.js-2.3.1.tgz#48961989ffe52b0505e352f7a521f819f51df7e7" integrity sha512-jnmm7DYpKtH3DxtO1E2VNCC9Gp7Wrp/FWA2JxQrZUhVJ2RCQBd57pCN6W5w6jpsfWZV0PCAbTX2NOPgyFeeZZg== @@ -6374,7 +6408,7 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== -mathjax@^2.7.6: +mathjax@2.7.9: version "2.7.9" resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.9.tgz#d6b67955c173e7d719fcb2fc0288662884eb7d3d" integrity sha512-NOGEDTIM9+MrsqnjPEjVGNx4q0GQxqm61yQwSK+/5S59i26wId5IC5gNu9/bu8+CCVl5p9G2IHcAl/wJa+5+BQ== @@ -6497,10 +6531,10 @@ merge2@^1.3.0: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -mermaid@^8.5.1: - version "8.9.3" - resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.9.3.tgz#24f682d26f757ed4cb5812b0a798eddcedcc9658" - integrity sha512-RH8B4+HEKmdpwDieh3hpKS4oUcpfcu8q4hr3nub7Y7okxOLhF9ynEvKKQ7Dx6H1ymNjTLYUHei5/4gTnaPyimA== +mermaid@8.10.1: + version "8.10.1" + resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.10.1.tgz#9573f702024e2173f4aa07d9b207d750507cf838" + integrity sha512-KxwKEJDKy303TQdz5TQMFb/4u+gUL21CefUMGOfuigDh9powcYaNmuJ5BkHmO0jB3Y1z2zlsuKvHZ2CusWH5+A== dependencies: "@braintree/sanitize-url" "^3.1.0" d3 "^5.7.0" @@ -6794,10 +6828,10 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mocha@8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.3.2.tgz#53406f195fa86fbdebe71f8b1c6fb23221d69fcc" - integrity sha512-UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg== +mocha@8.4.0: + version "8.4.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.4.0.tgz#677be88bf15980a3cae03a73e10a0fc3997f0cff" + integrity sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ== dependencies: "@ungap/promise-all-settled" "1.1.2" ansi-colors "4.1.1" @@ -6934,10 +6968,10 @@ nanoid@^2.1.0: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== -nanoid@^3.1.22: - version "3.1.22" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz#b35f8fb7d151990a8aebd5aa5015c03cf726f844" - integrity sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ== +nanoid@^3.1.23: + version "3.1.23" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81" + integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw== nanomatch@^1.2.9: version "1.2.13" @@ -7218,9 +7252,9 @@ object-copy@^0.1.0: kind-of "^3.0.3" object-inspect@^1.9.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz#b6385a3e2b7cae0b5eafcf90cddf85d128767f30" - integrity sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA== + version "1.10.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369" + integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw== object-is@^1.1.4: version "1.1.5" @@ -8171,9 +8205,9 @@ postcss-selector-parser@^3.0.0: uniq "^1.0.1" postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: - version "6.0.5" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz#042d74e137db83e6f294712096cb413f5aa612c4" - integrity sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg== + version "6.0.6" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" + integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -8216,12 +8250,12 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27: supports-color "^6.1.0" postcss@^8.2.10: - version "8.2.13" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.13.tgz#dbe043e26e3c068e45113b1ed6375d2d37e2129f" - integrity sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ== + version "8.2.15" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65" + integrity sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q== dependencies: colorette "^1.2.2" - nanoid "^3.1.22" + nanoid "^3.1.23" source-map "^0.6.1" postgres-array@~2.0.0: @@ -8274,7 +8308,7 @@ printj@~1.1.0: resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ== -prismjs@^1.21.0: +prismjs@1.23.0: version "1.23.0" resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz#d3b3967f7d72440690497652a9d40ff046067f33" integrity sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA== @@ -8479,7 +8513,7 @@ range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raphael@2.3.0, raphael@2.3.x, raphael@^2.3.0: +raphael@2.3.0, raphael@2.3.x: version "2.3.0" resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.3.0.tgz#eabeb09dba861a1d4cee077eaafb8c53f3131f89" integrity sha512-w2yIenZAQnp257XUWGni4bLMVxpUpcIl7qgxEgDIXtmSypYtlNxfXWpOBxs7LBTps5sDwhRnrToJrMUrivqNTQ== @@ -9346,7 +9380,7 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -reveal.js@^3.9.2: +reveal.js@3.9.2: version "3.9.2" resolved "https://registry.yarnpkg.com/reveal.js/-/reveal.js-3.9.2.tgz#7f63d3dfec338b6c313dcabdf006e8cf80e0b358" integrity sha512-Dvv2oA9FrtOHE2DWj5js8pMRfwq++Wmvsn1EyAdYLC80lBjTphns+tPsB652Bnvep9AVviuVS/b4XoVY9rXHLA== @@ -9474,7 +9508,7 @@ scrypt-kdf@^2.0.1: resolved "https://registry.yarnpkg.com/scrypt-kdf/-/scrypt-kdf-2.0.1.tgz#3355224c52d398331b2cbf2b70a7be26b52c53e6" integrity sha512-dMhpgBVJPDWZP5erOCwTjI6oAO9hKhFAjZsdSQ0spaWJYHuA/wFNF2weQQfsyCIk8eNKoLfEDxr3zAtM+gZo0Q== -select2@^3.5.2-browserify: +select2@3.5.2-browserify: version "3.5.2-browserify" resolved "https://registry.yarnpkg.com/select2/-/select2-3.5.2-browserify.tgz#dc4dafda38d67a734e8a97a46f0d3529ae05391d" integrity sha1-3E2v2jjWenNOipekbw01Ka4FOR0= @@ -9736,7 +9770,7 @@ socket.io-adapter@~1.1.0: resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9" integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g== -socket.io-client@2.4.0, socket.io-client@^2.1.1: +socket.io-client@2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35" integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ== @@ -9783,7 +9817,7 @@ socket.io@^2.1.1: socket.io-client "2.4.0" socket.io-parser "~3.4.0" -source-list-map@^2.0.0: +source-list-map@^2.0.0, source-list-map@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== @@ -9860,7 +9894,7 @@ spdx-license-ids@^3.0.0: resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65" integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ== -spin.js@^4.0.0: +spin.js@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/spin.js/-/spin.js-4.1.0.tgz#afcf12738fafd5f6aa0a385a5b4cec45c86a3555" integrity sha512-WI8O1OdJlKjialIhB9Z5RfFFM4pI7Hohik76bB3N4Ep3N/vTDPZiRU8QeefyLbmpI5n2bFQXgticl2g+/KiKYA== @@ -10213,13 +10247,12 @@ svgo@^1.0.0: util.promisify "~1.0.0" table@^6.0.4: - version "6.6.0" - resolved "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz#905654b79df98d9e9a973de1dd58682532c40e8e" - integrity sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg== + version "6.7.0" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.0.tgz#26274751f0ee099c547f6cb91d3eff0d61d155b2" + integrity sha512-SAM+5p6V99gYiiy2gT5ArdzgM1dLDed0nkrWmG6Fry/bUS/m9x83BwpJUOf1Qj/x2qJd+thL6IkIx7qPGRxqBw== dependencies: ajv "^8.0.1" lodash.clonedeep "^4.5.0" - lodash.flatten "^4.4.0" lodash.truncate "^4.4.2" slice-ansi "^4.0.0" string-width "^4.2.0" @@ -10514,7 +10547,7 @@ tunnel@0.0.6: resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== -turndown@^7.0.0: +turndown@7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/turndown/-/turndown-7.0.0.tgz#19b2a6a2d1d700387a1e07665414e4af4fec5225" integrity sha512-G1FfxfR0mUNMeGjszLYl3kxtopC4O9DRRiMlMDDVHvU1jaBkGFg4qxIyjIk2aiKLHyDyZvZyu4qBO2guuYBy3Q== @@ -10543,6 +10576,11 @@ type-fest@^0.8.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== +type-fest@^1.0.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.1.1.tgz#210251e7f57357a1457269e6b34837fed067ac2c" + integrity sha512-RPDKc5KrIyKTP7Fk75LruUagqG6b+OTgXlCR2Z0aQDJFeIvL4/mhahSEtHmmVzXu4gmA0srkF/8FCH3WOWxTWA== + type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -10569,9 +10607,9 @@ uc.micro@^1.0.1, uc.micro@^1.0.5: integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== uglify-js@^3.1.4, uglify-js@^3.5.1: - version "3.13.5" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.5.tgz#5d71d6dbba64cf441f32929b1efce7365bb4f113" - integrity sha512-xtB8yEqIkn7zmOyS2zUNBsYCBRhDkvlNxMMY2smuJ/qA8NCHeQvKCF3i9Z4k8FJH4+PJvZRtMrPynfZ75+CSZw== + version "3.13.6" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.6.tgz#6815ac7fdd155d03c83e2362bb717e5b39b74013" + integrity sha512-rRprLwl8RVaS+Qvx3Wh5hPfPBn9++G6xkGlUupya0s5aDmNjI7z3lnRLB3u7sN4OmbB0pWgzhM9BEJyiWAwtAA== uid-safe@~2.1.5: version "2.1.5" @@ -10957,7 +10995,7 @@ vasync@^2.2.0: dependencies: verror "1.10.0" -velocity-animate@^1.4.0: +velocity-animate@1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-1.5.2.tgz#5a351d75fca2a92756f5c3867548b873f6c32105" integrity sha512-m6EXlCAMetKztO1ppBhGU1/1MR3IiEevO6ESq6rcrSQ3Q77xYSW13jkfXW88o4xMrkXJhy/U7j4wFR/twMB0Eg== @@ -11021,12 +11059,12 @@ vfile@^4.0.0: unist-util-stringify-position "^2.0.0" vfile-message "^2.0.0" -visibilityjs@^2.0.0: +visibilityjs@2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/visibilityjs/-/visibilityjs-2.0.2.tgz#d7c466e922024bb6c413d2136d5567e71f5fdc2f" integrity sha512-y5sN5oGvuXXcK6s8WupOymRcqEss7kusojpScRqkT+cTCIFjul+06uSMDPMByN9DIBv/sUUnvV8BplKjqelAfw== -viz.js@^1.7.0: +viz.js@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/viz.js/-/viz.js-1.8.2.tgz#d9cc04cd99f98ec986bf9054db76a6cbcdc5d97a" integrity sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ== @@ -11059,18 +11097,17 @@ webfontloader@~1.6.x: resolved "https://registry.yarnpkg.com/webfontloader/-/webfontloader-1.6.28.tgz#db786129253cb6e8eae54c2fb05f870af6675bae" integrity sha1-23hhKSU8tujq5UwvsF+HCvZnW64= -webpack-cli@4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.6.0.tgz#27ae86bfaec0cf393fcfd58abdc5a229ad32fd16" - integrity sha512-9YV+qTcGMjQFiY7Nb1kmnupvb1x40lfpj8pwdO/bom+sQiP4OBMKjHq29YQrlDWDPZO9r/qWaRRywKaRDKqBTA== +webpack-cli@4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.0.tgz#3195a777f1f802ecda732f6c95d24c0004bc5a35" + integrity sha512-7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.0.2" - "@webpack-cli/info" "^1.2.3" - "@webpack-cli/serve" "^1.3.1" + "@webpack-cli/configtest" "^1.0.3" + "@webpack-cli/info" "^1.2.4" + "@webpack-cli/serve" "^1.4.0" colorette "^1.2.1" commander "^7.0.0" - enquirer "^2.3.6" execa "^5.0.0" fastest-levenshtein "^1.0.12" import-local "^3.0.2" @@ -11095,6 +11132,14 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack- source-list-map "^2.0.0" source-map "~0.6.1" +webpack-sources@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac" + integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w== + dependencies: + source-list-map "^2.0.1" + source-map "^0.6.1" + webpack@4.46.0: version "4.46.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542" @@ -11263,7 +11308,7 @@ ws@^7.4.4, ws@~7.4.2: resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== -wurl@^2.5.3: +wurl@2.5.4: version "2.5.4" resolved "https://registry.yarnpkg.com/wurl/-/wurl-2.5.4.tgz#6af35a6c623296c4a0c607c4651d01b8f4e3fdec" integrity sha512-Vuo550m5YbqRcM/69zz3jVNsCUvFTWLRYQcYvnqNWQ4d0Bjg7aoaofbcsPTe4rM9A2/4xjd8uIf9viIUV9EMXQ== @@ -11344,10 +11389,10 @@ xmldom@0.5.x: resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f" integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg== -xmlhttprequest-ssl@~1.5.4: - version "1.5.5" - resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e" - integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4= +xmlhttprequest-ssl@~1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.2.tgz#dd6899bfbcf684b554e393c30b13b9f3b001a7ee" + integrity sha512-tYOaldF/0BLfKuoA39QMwD4j2m8lq4DIncqj1yuNELX4vz9+z/ieG/vwmctjJce+boFHXstqhWnHSxc4W8f4qg== xmlhttprequest@>=1.5.0: version "1.8.0" @@ -11365,9 +11410,9 @@ xpath@0.0.32: integrity sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw== xss@^1.0.3: - version "1.0.8" - resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.8.tgz#32feb87feb74b3dcd3d404b7a68ababf10700535" - integrity sha512-3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw== + version "1.0.9" + resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.9.tgz#3ffd565571ff60d2e40db7f3b80b4677bec770d2" + integrity sha512-2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ== dependencies: commander "^2.20.3" cssfilter "0.0.10" diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix index 4024310c6a..d18891f619 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix @@ -98,11 +98,11 @@ }; } { - name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; + name = "_eslint_eslintrc___eslintrc_0.4.1.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; - sha1 = "99cc0a0584d72f1df38b900fb062ba995f395547"; + name = "_eslint_eslintrc___eslintrc_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz"; + sha1 = "442763b88cecbe3ee0ec7ca6d6dd6168550cbf14"; }; } { @@ -330,27 +330,27 @@ }; } { - name = "_types_node___node_15.0.1.tgz"; + name = "_types_node___node_15.0.2.tgz"; path = fetchurl { - name = "_types_node___node_15.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz"; - sha1 = "ef34dea0881028d11398be5bf4e856743e3dc35a"; + name = "_types_node___node_15.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz"; + sha1 = "51e9c0920d1b45936ea04341aa3e2e58d339fb67"; }; } { - name = "_types_node___node_12.20.11.tgz"; + name = "_types_node___node_12.20.12.tgz"; path = fetchurl { - name = "_types_node___node_12.20.11.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.20.11.tgz"; - sha1 = "980832cd56efafff8c18aa148c4085eb02a483f4"; + name = "_types_node___node_12.20.12.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-12.20.12.tgz"; + sha1 = "fd9c1c2cfab536a2383ed1ef70f94adea743a226"; }; } { - name = "_types_node___node_14.14.43.tgz"; + name = "_types_node___node_14.14.44.tgz"; path = fetchurl { - name = "_types_node___node_14.14.43.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz"; - sha1 = "26bcbb0595b305400e8ceaf9a127a7f905ae49c8"; + name = "_types_node___node_14.14.44.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz"; + sha1 = "df7503e6002847b834371c004b372529f3f85215"; }; } { @@ -442,11 +442,11 @@ }; } { - name = "_types_webpack___webpack_4.41.27.tgz"; + name = "_types_webpack___webpack_4.41.28.tgz"; path = fetchurl { - name = "_types_webpack___webpack_4.41.27.tgz"; - url = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.27.tgz"; - sha1 = "f47da488c8037e7f1b2dbf2714fbbacb61ec0ffc"; + name = "_types_webpack___webpack_4.41.28.tgz"; + url = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.28.tgz"; + sha1 = "0069a2159b7ad4d83d0b5801942c17d54133897b"; }; } { @@ -602,27 +602,27 @@ }; } { - name = "_webpack_cli_configtest___configtest_1.0.2.tgz"; + name = "_webpack_cli_configtest___configtest_1.0.3.tgz"; path = fetchurl { - name = "_webpack_cli_configtest___configtest_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.2.tgz"; - sha1 = "2a20812bfb3a2ebb0b27ee26a52eeb3e3f000836"; + name = "_webpack_cli_configtest___configtest_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.3.tgz"; + sha1 = "204bcff87cda3ea4810881f7ea96e5f5321b87b9"; }; } { - name = "_webpack_cli_info___info_1.2.3.tgz"; + name = "_webpack_cli_info___info_1.2.4.tgz"; path = fetchurl { - name = "_webpack_cli_info___info_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.3.tgz"; - sha1 = "ef819d10ace2976b6d134c7c823a3e79ee31a92c"; + name = "_webpack_cli_info___info_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.4.tgz"; + sha1 = "7381fd41c9577b2d8f6c2594fad397ef49ad5573"; }; } { - name = "_webpack_cli_serve___serve_1.3.1.tgz"; + name = "_webpack_cli_serve___serve_1.4.0.tgz"; path = fetchurl { - name = "_webpack_cli_serve___serve_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.1.tgz"; - sha1 = "911d1b3ff4a843304b9c3bacf67bb34672418441"; + name = "_webpack_cli_serve___serve_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz"; + sha1 = "f84fd07bcacefe56ce762925798871092f0f228e"; }; } { @@ -762,11 +762,11 @@ }; } { - name = "ajv___ajv_8.2.0.tgz"; + name = "ajv___ajv_8.3.0.tgz"; path = fetchurl { - name = "ajv___ajv_8.2.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz"; - sha1 = "c89d3380a784ce81b2085f48811c4c101df4c602"; + name = "ajv___ajv_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.3.0.tgz"; + sha1 = "25ee7348e32cdc4a1dbb38256bf6bdc451dd577c"; }; } { @@ -1122,11 +1122,11 @@ }; } { - name = "aws_sdk___aws_sdk_2.898.0.tgz"; + name = "aws_sdk___aws_sdk_2.904.0.tgz"; path = fetchurl { - name = "aws_sdk___aws_sdk_2.898.0.tgz"; - url = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.898.0.tgz"; - sha1 = "fd07b9748d302fccc2d1e069ae313e911b526578"; + name = "aws_sdk___aws_sdk_2.904.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.904.0.tgz"; + sha1 = "45a53e918698e451f762e44005dfce177a50b7e6"; }; } { @@ -2162,11 +2162,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001220.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001220.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001220.tgz"; - sha1 = "c080e1c8eefb99f6cc9685da6313840bdbaf4c36"; + name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz"; + sha1 = "bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"; }; } { @@ -3722,11 +3722,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.725.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.727.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.725.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.725.tgz"; - sha1 = "04fc83f9189169aff50f0a00c6b4090b910cba85"; + name = "electron_to_chromium___electron_to_chromium_1.3.727.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz"; + sha1 = "857e310ca00f0b75da4e1db6ff0e073cc4a91ddf"; }; } { @@ -3786,11 +3786,11 @@ }; } { - name = "engine.io_client___engine.io_client_3.5.1.tgz"; + name = "engine.io_client___engine.io_client_3.5.2.tgz"; path = fetchurl { - name = "engine.io_client___engine.io_client_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.1.tgz"; - sha1 = "b500458a39c0cd197a921e0e759721a746d0bdb9"; + name = "engine.io_client___engine.io_client_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.2.tgz"; + sha1 = "0ef473621294004e9ceebe73cef0af9e36f2f5fa"; }; } { @@ -3913,6 +3913,22 @@ sha1 = "9e3af407459deed47e9a91f9b885a84eb05c561d"; }; } + { + name = "esbuild_loader___esbuild_loader_2.13.0.tgz"; + path = fetchurl { + name = "esbuild_loader___esbuild_loader_2.13.0.tgz"; + url = "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-2.13.0.tgz"; + sha1 = "f5a3602a89a3b728506ae3e1887304fffeef9270"; + }; + } + { + name = "esbuild___esbuild_0.11.20.tgz"; + path = fetchurl { + name = "esbuild___esbuild_0.11.20.tgz"; + url = "https://registry.yarnpkg.com/esbuild/-/esbuild-0.11.20.tgz"; + sha1 = "7cefa1aee8b372c184e42457885f7ce5d3e62a1e"; + }; + } { name = "escalade___escalade_3.1.1.tgz"; path = fetchurl { @@ -4042,19 +4058,19 @@ }; } { - name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; - sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303"; }; } { - name = "eslint___eslint_7.25.0.tgz"; + name = "eslint___eslint_7.26.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.25.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz"; - sha1 = "1309e4404d94e676e3e831b3a3ad2b050031eb67"; + name = "eslint___eslint_7.26.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.26.0.tgz"; + sha1 = "d416fdcdcb3236cd8f282065312813f8c13982f6"; }; } { @@ -4410,11 +4426,11 @@ }; } { - name = "file_type___file_type_16.3.0.tgz"; + name = "file_type___file_type_16.4.0.tgz"; path = fetchurl { - name = "file_type___file_type_16.3.0.tgz"; - url = "https://registry.yarnpkg.com/file-type/-/file-type-16.3.0.tgz"; - sha1 = "f03af91db30f92cc9a0b335c0644c46101522f6d"; + name = "file_type___file_type_16.4.0.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-16.4.0.tgz"; + sha1 = "464197e44bd94a452d77b09085d977ae0dad2df4"; }; } { @@ -4578,11 +4594,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.14.0.tgz"; + name = "follow_redirects___follow_redirects_1.14.1.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.14.0.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz"; - sha1 = "f5d260f95c5f8c105894491feee5dc8993b402fe"; + name = "follow_redirects___follow_redirects_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz"; + sha1 = "d9114ded0a1cfdd334e164e6662ad02bfd91ff43"; }; } { @@ -4905,6 +4921,14 @@ sha1 = "141f33b81a7c2492e125594307480c46679278a6"; }; } + { + name = "glob___glob_7.1.7.tgz"; + path = fetchurl { + name = "glob___glob_7.1.7.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; + sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; + }; + } { name = "globals___globals_12.4.0.tgz"; path = fetchurl { @@ -5266,11 +5290,11 @@ }; } { - name = "i18n___i18n_0.13.2.tgz"; + name = "i18n___i18n_0.13.3.tgz"; path = fetchurl { - name = "i18n___i18n_0.13.2.tgz"; - url = "https://registry.yarnpkg.com/i18n/-/i18n-0.13.2.tgz"; - sha1 = "3886678fe7cbbed45bac2ce53b8144c788a1c1b5"; + name = "i18n___i18n_0.13.3.tgz"; + url = "https://registry.yarnpkg.com/i18n/-/i18n-0.13.3.tgz"; + sha1 = "5820f48d87a77cf14e064719bee9bc682ed550eb"; }; } { @@ -5330,11 +5354,11 @@ }; } { - name = "ignore_walk___ignore_walk_3.0.3.tgz"; + name = "ignore_walk___ignore_walk_3.0.4.tgz"; path = fetchurl { - name = "ignore_walk___ignore_walk_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz"; - sha1 = "017e2447184bfeade7c238e4aefdd1e8f95b1e37"; + name = "ignore_walk___ignore_walk_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz"; + sha1 = "c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"; }; } { @@ -5578,11 +5602,11 @@ }; } { - name = "is_bigint___is_bigint_1.0.1.tgz"; + name = "is_bigint___is_bigint_1.0.2.tgz"; path = fetchurl { - name = "is_bigint___is_bigint_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz"; - sha1 = "6923051dfcbc764278540b9ce0e6b3213aa5ebc2"; + name = "is_bigint___is_bigint_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz"; + sha1 = "ffb381442503235ad245ea89e45b3dbff040ee5a"; }; } { @@ -5610,11 +5634,11 @@ }; } { - name = "is_boolean_object___is_boolean_object_1.1.0.tgz"; + name = "is_boolean_object___is_boolean_object_1.1.1.tgz"; path = fetchurl { - name = "is_boolean_object___is_boolean_object_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz"; - sha1 = "e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"; + name = "is_boolean_object___is_boolean_object_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz"; + sha1 = "3c0878f035cb821228d350d2e1e36719716a3de8"; }; } { @@ -5650,11 +5674,11 @@ }; } { - name = "is_core_module___is_core_module_2.3.0.tgz"; + name = "is_core_module___is_core_module_2.4.0.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz"; - sha1 = "d341652e3408bca69c4671b79a0954a3d349f887"; + name = "is_core_module___is_core_module_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz"; + sha1 = "8e9fc8e15027b011418026e98f0e6f4d86305cc1"; }; } { @@ -5674,11 +5698,11 @@ }; } { - name = "is_date_object___is_date_object_1.0.2.tgz"; + name = "is_date_object___is_date_object_1.0.4.tgz"; path = fetchurl { - name = "is_date_object___is_date_object_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz"; - sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"; + name = "is_date_object___is_date_object_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz"; + sha1 = "550cfcc03afada05eea3dd30981c7b09551f73e5"; }; } { @@ -5850,11 +5874,11 @@ }; } { - name = "is_number_object___is_number_object_1.0.4.tgz"; + name = "is_number_object___is_number_object_1.0.5.tgz"; path = fetchurl { - name = "is_number_object___is_number_object_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz"; - sha1 = "36ac95e741cf18b283fc1ddf5e83da798e3ec197"; + name = "is_number_object___is_number_object_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz"; + sha1 = "6edfaeed7950cff19afedce9fbfca9ee6dd289eb"; }; } { @@ -5938,11 +5962,11 @@ }; } { - name = "is_regex___is_regex_1.1.2.tgz"; + name = "is_regex___is_regex_1.1.3.tgz"; path = fetchurl { - name = "is_regex___is_regex_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz"; - sha1 = "81c8ebde4db142f2cf1c53fc86d6a45788266251"; + name = "is_regex___is_regex_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz"; + sha1 = "d029f9aff6448b93ebbe3f33dac71511fdcbef9f"; }; } { @@ -5970,11 +5994,11 @@ }; } { - name = "is_string___is_string_1.0.5.tgz"; + name = "is_string___is_string_1.0.6.tgz"; path = fetchurl { - name = "is_string___is_string_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz"; - sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"; + name = "is_string___is_string_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz"; + sha1 = "3fe5d5992fb0d93404f32584d4b0179a71b54a5f"; }; } { @@ -5986,11 +6010,11 @@ }; } { - name = "is_symbol___is_symbol_1.0.3.tgz"; + name = "is_symbol___is_symbol_1.0.4.tgz"; path = fetchurl { - name = "is_symbol___is_symbol_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; - sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; + name = "is_symbol___is_symbol_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz"; + sha1 = "a6dac93b635b063ca6872236de88910a57af139c"; }; } { @@ -6129,6 +6153,14 @@ sha1 = "a3f222a9aae9f966f5d27c796510e28091764217"; }; } + { + name = "joycon___joycon_3.0.1.tgz"; + path = fetchurl { + name = "joycon___joycon_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/joycon/-/joycon-3.0.1.tgz"; + sha1 = "9074c9b08ccf37a6726ff74a18485f85efcaddaf"; + }; + } { name = "jquery_mousewheel___jquery_mousewheel_3.1.13.tgz"; path = fetchurl { @@ -6193,14 +6225,6 @@ sha1 = "9866df395102130e38f7f996bceb65443209c25b"; }; } - { - name = "js_yaml___js_yaml_4.0.0.tgz"; - path = fetchurl { - name = "js_yaml___js_yaml_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz"; - sha1 = "f426bc0ff4b4051926cd588c71113183409a121f"; - }; - } { name = "js_yaml___js_yaml_3.14.1.tgz"; path = fetchurl { @@ -6209,6 +6233,14 @@ sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; }; } + { + name = "js_yaml___js_yaml_4.0.0.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz"; + sha1 = "f426bc0ff4b4051926cd588c71113183409a121f"; + }; + } { name = "js_yaml___js_yaml_4.1.0.tgz"; path = fetchurl { @@ -7250,11 +7282,11 @@ }; } { - name = "mermaid___mermaid_8.9.3.tgz"; + name = "mermaid___mermaid_8.10.1.tgz"; path = fetchurl { - name = "mermaid___mermaid_8.9.3.tgz"; - url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.9.3.tgz"; - sha1 = "24f682d26f757ed4cb5812b0a798eddcedcc9658"; + name = "mermaid___mermaid_8.10.1.tgz"; + url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.10.1.tgz"; + sha1 = "9573f702024e2173f4aa07d9b207d750507cf838"; }; } { @@ -7538,11 +7570,11 @@ }; } { - name = "mocha___mocha_8.3.2.tgz"; + name = "mocha___mocha_8.4.0.tgz"; path = fetchurl { - name = "mocha___mocha_8.3.2.tgz"; - url = "https://registry.yarnpkg.com/mocha/-/mocha-8.3.2.tgz"; - sha1 = "53406f195fa86fbdebe71f8b1c6fb23221d69fcc"; + name = "mocha___mocha_8.4.0.tgz"; + url = "https://registry.yarnpkg.com/mocha/-/mocha-8.4.0.tgz"; + sha1 = "677be88bf15980a3cae03a73e10a0fc3997f0cff"; }; } { @@ -7674,11 +7706,11 @@ }; } { - name = "nanoid___nanoid_3.1.22.tgz"; + name = "nanoid___nanoid_3.1.23.tgz"; path = fetchurl { - name = "nanoid___nanoid_3.1.22.tgz"; - url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz"; - sha1 = "b35f8fb7d151990a8aebd5aa5015c03cf726f844"; + name = "nanoid___nanoid_3.1.23.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz"; + sha1 = "f744086ce7c2bc47ee0a8472574d5c78e4183a81"; }; } { @@ -7962,11 +7994,11 @@ }; } { - name = "object_inspect___object_inspect_1.10.2.tgz"; + name = "object_inspect___object_inspect_1.10.3.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.10.2.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz"; - sha1 = "b6385a3e2b7cae0b5eafcf90cddf85d128767f30"; + name = "object_inspect___object_inspect_1.10.3.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz"; + sha1 = "c2aa7d2d09f50c99375704f7a0adf24c5782d369"; }; } { @@ -9002,11 +9034,11 @@ }; } { - name = "postcss_selector_parser___postcss_selector_parser_6.0.5.tgz"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz"; - sha1 = "042d74e137db83e6f294712096cb413f5aa612c4"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"; + sha1 = "2c5bba8174ac2f6981ab631a42ab0ee54af332ea"; }; } { @@ -9050,11 +9082,11 @@ }; } { - name = "postcss___postcss_8.2.13.tgz"; + name = "postcss___postcss_8.2.15.tgz"; path = fetchurl { - name = "postcss___postcss_8.2.13.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-8.2.13.tgz"; - sha1 = "dbe043e26e3c068e45113b1ed6375d2d37e2129f"; + name = "postcss___postcss_8.2.15.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz"; + sha1 = "9e66ccf07292817d226fc315cbbf9bc148fbca65"; }; } { @@ -11146,11 +11178,11 @@ }; } { - name = "table___table_6.6.0.tgz"; + name = "table___table_6.7.0.tgz"; path = fetchurl { - name = "table___table_6.6.0.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz"; - sha1 = "905654b79df98d9e9a973de1dd58682532c40e8e"; + name = "table___table_6.7.0.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.7.0.tgz"; + sha1 = "26274751f0ee099c547f6cb91d3eff0d61d155b2"; }; } { @@ -11513,6 +11545,14 @@ sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; }; } + { + name = "type_fest___type_fest_1.1.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-1.1.1.tgz"; + sha1 = "210251e7f57357a1457269e6b34837fed067ac2c"; + }; + } { name = "type_is___type_is_1.6.18.tgz"; path = fetchurl { @@ -11546,11 +11586,11 @@ }; } { - name = "uglify_js___uglify_js_3.13.5.tgz"; + name = "uglify_js___uglify_js_3.13.6.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.13.5.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.5.tgz"; - sha1 = "5d71d6dbba64cf441f32929b1efce7365bb4f113"; + name = "uglify_js___uglify_js_3.13.6.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.6.tgz"; + sha1 = "6815ac7fdd155d03c83e2362bb717e5b39b74013"; }; } { @@ -12122,11 +12162,11 @@ }; } { - name = "webpack_cli___webpack_cli_4.6.0.tgz"; + name = "webpack_cli___webpack_cli_4.7.0.tgz"; path = fetchurl { - name = "webpack_cli___webpack_cli_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.6.0.tgz"; - sha1 = "27ae86bfaec0cf393fcfd58abdc5a229ad32fd16"; + name = "webpack_cli___webpack_cli_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.0.tgz"; + sha1 = "3195a777f1f802ecda732f6c95d24c0004bc5a35"; }; } { @@ -12145,6 +12185,14 @@ sha1 = "eedd8ec0b928fbf1cbfe994e22d2d890f330a933"; }; } + { + name = "webpack_sources___webpack_sources_2.2.0.tgz"; + path = fetchurl { + name = "webpack_sources___webpack_sources_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz"; + sha1 = "058926f39e3d443193b6c31547229806ffd02bac"; + }; + } { name = "webpack___webpack_4.46.0.tgz"; path = fetchurl { @@ -12402,11 +12450,11 @@ }; } { - name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.5.5.tgz"; + name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.6.2.tgz"; path = fetchurl { - name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.5.5.tgz"; - url = "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz"; - sha1 = "c2876b06168aadc40e57d97e81191ac8f4398b3e"; + name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.2.tgz"; + sha1 = "dd6899bfbcf684b554e393c30b13b9f3b001a7ee"; }; } { @@ -12434,11 +12482,11 @@ }; } { - name = "xss___xss_1.0.8.tgz"; + name = "xss___xss_1.0.9.tgz"; path = fetchurl { - name = "xss___xss_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/xss/-/xss-1.0.8.tgz"; - sha1 = "32feb87feb74b3dcd3d404b7a68ababf10700535"; + name = "xss___xss_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/xss/-/xss-1.0.9.tgz"; + sha1 = "3ffd565571ff60d2e40db7f3b80b4677bec770d2"; }; } { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix index 13ad9d69ad..649b76f871 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix @@ -1,17 +1,17 @@ -{ config, lib, pkgs, fetchFromGitHub, stdenv, ... }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "rss-bridge"; - version = "2020-11-10"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "RSS-Bridge"; repo = "rss-bridge"; rev = version; - sha256 = "00cp61lqvhi7b7j0rglsqg3l7cg8s9b8vq098bgvg5dygyi44hyv"; + sha256 = "0dkw8xq710q0wclyr003357gk0vgb5pmpcx75k13pv56c3mrg9vm"; }; - patchPhase = '' + postPatch = '' substituteInPlace lib/rssbridge.php \ --replace "define('PATH_CACHE', PATH_ROOT . 'cache/');" "define('PATH_CACHE', getenv('RSSBRIDGE_DATA') . '/cache/');" \ --replace "define('FILE_CONFIG', PATH_ROOT . 'config.ini.php');" "define('FILE_CONFIG', getenv('RSSBRIDGE_DATA') . '/config.ini.php');" \ diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix index 44f207e3b8..c3c0eb5078 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wallabag"; - version = "2.4.1"; + version = "2.4.2"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - sha256 = "1dqf5ia66kjsnfad2xkm8w6jgs976mf9x0dcd73jybqfgs4j09kj"; + sha256 = "1n39flqqqjih0lc86vxdzbp44x4rqj5292if2fsa8y1xxlvyqmns"; }; outputs = [ "out" ]; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix index 6ab9f8ed8d..1e6b9888ba 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix @@ -833,6 +833,12 @@ self: super: ''; }); + xorgdocs = super.xorgdocs.overrideAttrs (attrs: { + # This makes the man pages discoverable by the default man, + # since it looks for packages in $PATH + postInstall = "mkdir $out/bin"; + }); + xwd = super.xwd.overrideAttrs (attrs: { buildInputs = with self; attrs.buildInputs ++ [libXt]; }); diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix b/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix index a83da56812..190f396009 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 lib; stdenv.mkDerivation rec { - version = "0.11.8"; # also update communityModules + version = "0.11.9"; # 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 = "1y38a33wab2vv9pz04blmn6m66wg4pixilh8x60jsx6mk0xih3w3"; + sha256 = "02gzvsaq0l5lx608sfh7hfz14s6yfsr4sr4kzcsqd1cxljp35h6c"; }; # 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 = "f210f242cf17"; - sha256 = "0ls45zfhhv8k1aywq3fvrh4ab7g4g1z1ma9mbcf2ch73m6aqhbyl"; + rev = "c149edb37349"; + sha256 = "1njw17k0nhf15hc20l28v0xzcc7jha85lqy3j97nspv9zdxmshk1"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix b/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix index c4e9e91538..2ea162b0d6 100644 --- a/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix +++ b/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkg-config -, curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mariadb, pcre, perl, perlPackages +, curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mariadb, pcre, perl, perlPackages , polkit, util-linuxMinimal, x264, zlib , coreutils, procps, psmisc, nixosTests }: @@ -138,7 +138,7 @@ in stdenv.mkDerivation rec { for f in includes/Event.php views/image.php ; do substituteInPlace web/$f \ - --replace "'ffmpeg " "'${ffmpeg_3}/bin/ffmpeg " + --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg " done substituteInPlace web/includes/functions.php \ @@ -147,7 +147,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ - curl ffmpeg_3 glib libjpeg libselinux libsepol mp4v2 libmysqlclient mariadb.client pcre perl polkit x264 zlib + curl ffmpeg glib libjpeg libselinux libsepol mp4v2 libmysqlclient mariadb.client pcre perl polkit x264 zlib util-linuxMinimal # for libmount ] ++ (with perlPackages; [ # build-time dependencies diff --git a/third_party/nixpkgs/pkgs/shells/bash/5.1.nix b/third_party/nixpkgs/pkgs/shells/bash/5.1.nix index d234b18e6c..ddf2edfd1d 100644 --- a/third_party/nixpkgs/pkgs/shells/bash/5.1.nix +++ b/third_party/nixpkgs/pkgs/shells/bash/5.1.nix @@ -7,14 +7,14 @@ # patch for cygwin requires readline support , interactive ? stdenv.isCygwin -, readline80 ? null +, readline81 ? null , withDocs ? false , texinfo ? null }: with lib; -assert interactive -> readline80 != null; +assert interactive -> readline81 != null; assert withDocs -> texinfo != null; assert stdenv.hostPlatform.isDarwin -> binutils != null; let @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ++ optional withDocs texinfo ++ optional stdenv.hostPlatform.isDarwin binutils; - buildInputs = optional interactive readline80; + buildInputs = optional interactive readline81; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/shells/fish/default.nix b/third_party/nixpkgs/pkgs/shells/fish/default.nix index b2677715d5..a575429042 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/default.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/default.nix @@ -19,6 +19,9 @@ , fishPlugins , procps +# used to generate autocompletions from manpages and for configuration editing in the browser +, usePython ? true + , runCommand , writeText , nixosTests @@ -200,12 +203,10 @@ let ''; # Required binaries during execution - # Python: Autocompletion generated from manpages and config editing propagatedBuildInputs = [ coreutils gnugrep gnused - python3 groff gettext ] ++ lib.optional (!stdenv.isDarwin) man-db; @@ -233,18 +234,17 @@ let sed -e "s|sed |${gnused}/bin/sed |" \ -i "$out/share/fish/functions/alias.fish" \ "$out/share/fish/functions/prompt_pwd.fish" - sed -i "s|nroff |${groff}/bin/nroff |" \ + sed -i "s|nroff|${groff}/bin/nroff|" \ "$out/share/fish/functions/__fish_print_help.fish" sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \ -i "$out/share/fish/functions/fish_default_key_bindings.fish" - sed -e "s|python3|${getBin python3}/bin/python3|" \ - -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish} sed -i "s|/usr/local/sbin /sbin /usr/sbin||" \ $out/share/fish/completions/{sudo.fish,doas.fish} sed -e "s| awk | ${gawk}/bin/awk |" \ -i $out/share/fish/functions/{__fish_print_packages.fish,__fish_print_addresses.fish,__fish_describe_command.fish,__fish_complete_man.fish,__fish_complete_convert_options.fish} \ $out/share/fish/completions/{cwebp,adb,ezjail-admin,grunt,helm,heroku,lsusb,make,p4,psql,rmmod,vim-addons}.fish + '' + optionalString usePython '' cat > $out/share/fish/functions/__fish_anypython.fish < /dev/null + # May need a writable home, seen on Darwin. + HOME=$TMP $out/bin/pwsh --help > /dev/null ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix index bcf091f8e7..d5c197d5da 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "The fastest shell plugin manager"; homepage = "https://github.com/getantibody/antibody"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne worldofpeace ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix index 227f53b02c..c2db758bbe 100644 --- a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix @@ -73,7 +73,7 @@ in rec { mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc}/lib/clang/${cc.version}/include" "$rsrc" + ln -s "${cc.lib or cc}/lib/clang/${cc.version}/include" "$rsrc" ln -s "${last.pkgs.llvmPackages_7.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; @@ -176,13 +176,13 @@ in rec { ''; }; - darwin = super.darwin // { + darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { Libsystem = stdenv.mkDerivation { name = "bootstrap-stage0-Libsystem"; buildCommand = '' mkdir -p $out - cp -r ${self.darwin.darwin-stubs}/usr/lib $out/lib + cp -r ${selfDarwin.darwin-stubs}/usr/lib $out/lib chmod -R +w $out/lib substituteInPlace $out/lib/libSystem.B.tbd --replace /usr/lib/system $out/lib/system @@ -201,7 +201,7 @@ in rec { ''; }; - darwin-stubs = super.darwin.darwin-stubs.override { inherit (self) stdenv fetchurl; }; + darwin-stubs = superDarwin.darwin-stubs.override { inherit (self) stdenv fetchurl; }; dyld = { name = "bootstrap-stage0-dyld"; @@ -220,10 +220,10 @@ in rec { nativeTools = false; nativeLibc = false; inherit (self) buildPackages coreutils gnugrep; - libc = self.pkgs.darwin.Libsystem; + libc = selfDarwin.Libsystem; bintools = { name = "bootstrap-stage0-binutils"; outPath = bootstrapTools; }; }; - }; + }); llvmPackages_7 = { clang-unwrapped = stdenv.mkDerivation { @@ -291,12 +291,12 @@ in rec { }); in { inherit tools libraries; } // tools // libraries); - darwin = super.darwin // { + darwin = super.darwin.overrideScope (selfDarwin: _: { binutils = darwin.binutils.override { coreutils = self.coreutils; - libc = self.darwin.Libsystem; + libc = selfDarwin.Libsystem; }; - }; + }); }; in with prevStage; stageFun 1 prevStage { extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\""; @@ -337,11 +337,11 @@ in rec { }); in { inherit tools libraries; } // tools // libraries); - darwin = super.darwin // { + darwin = super.darwin.overrideScope (_: _: { inherit (darwin) binutils dyld Libsystem xnu configd ICU libdispatch libclosure launchd CF darwin-stubs; - }; + }); }; in with prevStage; stageFun 2 prevStage { extraPreHook = '' @@ -382,11 +382,11 @@ in rec { }); in { inherit libraries; } // libraries); - darwin = super.darwin // { + darwin = super.darwin.overrideScope (_: _: { inherit (darwin) dyld Libsystem xnu configd libdispatch libclosure launchd libiconv locale darwin-stubs; - }; + }); }; in with prevStage; stageFun 3 prevStage { shell = "${pkgs.bash}/bin/bash"; @@ -407,7 +407,7 @@ in rec { allowedRequisites = [ bootstrapTools ] ++ (with pkgs; [ - xz.bin xz.out bash libcxx libcxxabi llvmPackages_7.compiler-rt + xz.bin xz.out bash libcxx libcxx.dev libcxxabi libcxxabi.dev llvmPackages_7.compiler-rt llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out brotli.lib openssl.out libssh2.out nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv ]) ++ @@ -434,22 +434,22 @@ in rec { llvmPackages_7 = super.llvmPackages_7 // (let tools = super.llvmPackages_7.tools.extend (llvmSelf: _: { - clang-unwrapped = llvmPackages_7.clang-unwrapped.override { llvm = llvmSelf.llvm; }; - llvm = llvmPackages_7.llvm.override { inherit libxml2; }; + clang-unwrapped-all-outputs = llvmPackages_7.clang-unwrapped-all-outputs.override { llvm = llvmSelf.llvm; }; + libllvm = llvmPackages_7.libllvm.override { inherit libxml2; }; }); libraries = super.llvmPackages_7.libraries.extend (llvmSelf: _: { inherit (llvmPackages_7) libcxx libcxxabi compiler-rt; }); in { inherit tools libraries; } // tools // libraries); - darwin = super.darwin // rec { + darwin = super.darwin.overrideScope (_: superDarwin: { inherit (darwin) dyld Libsystem libiconv locale darwin-stubs; - CF = super.darwin.CF.override { + CF = superDarwin.CF.override { inherit libxml2; python3 = prevStage.python3; }; - }; + }); }; in with prevStage; stageFun 4 prevStage { shell = "${pkgs.bash}/bin/bash"; @@ -480,11 +480,11 @@ in rec { }); in { inherit tools libraries; } // tools // libraries); - darwin = super.darwin // { + darwin = super.darwin.overrideScope (_: _: { inherit (darwin) dyld ICU Libsystem libiconv; } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { inherit (darwin) binutils binutils-unwrapped cctools; - }; + }); } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { # Need to get rid of these when cross-compiling. inherit binutils binutils-unwrapped; @@ -524,11 +524,13 @@ in rec { }; allowedRequisites = (with pkgs; [ - xz.out xz.bin libcxx libcxxabi gmp.out gnumake findutils bzip2.out + xz.out xz.bin libcxx libcxx.dev libcxxabi libcxxabi.dev gmp.out gnumake findutils bzip2.out bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib llvmPackages.compiler-rt llvmPackages.compiler-rt.dev zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk - gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.lib patch pcre.out gettext + gnugrep llvmPackages.clang-unwrapped + llvmPackages.libclang.dev llvmPackages.libclang.lib + patch pcre.out gettext binutils.bintools darwin.binutils darwin.binutils.bintools curl.out brotli.lib openssl.out libssh2.out nghttp2.lib libkrb5 cc.expand-response-params libxml2.out @@ -537,14 +539,14 @@ in rec { ]); overrides = lib.composeExtensions persistent (self: super: { + darwin = super.darwin.overrideScope (_: superDarwin: { + inherit (prevStage.darwin) CF darwin-stubs; + xnu = superDarwin.xnu.override { inherit (prevStage) python3; }; + }); + } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { clang = cc; llvmPackages = super.llvmPackages // { clang = cc; }; inherit cc; - - darwin = super.darwin // { - inherit (prevStage.darwin) CF darwin-stubs; - xnu = super.darwin.xnu.override { inherit (prevStage) python3; }; - }; }); }; diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 7b68c877a6..4b6562a205 100644 --- a/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -77,7 +77,7 @@ in rec { # Copy what we need of clang cp -d ${llvmPackages.clang-unwrapped}/bin/clang* $out/bin - cp -rL ${llvmPackages.clang-unwrapped}/lib/clang $out/lib + cp -rL ${llvmPackages.clang-unwrapped.lib}/lib/clang $out/lib cp -d ${llvmPackages.libcxx}/lib/libc++*.dylib $out/lib cp -d ${llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib @@ -85,7 +85,7 @@ in rec { cp -d ${libffi}/lib/libffi*.dylib $out/lib mkdir $out/include - cp -rd ${llvmPackages.libcxx}/include/c++ $out/include + cp -rd ${llvmPackages.libcxx.dev}/include/c++ $out/include cp -d ${darwin.ICU}/lib/libicu*.dylib $out/lib cp -d ${zlib.out}/lib/libz.* $out/lib diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix index 730c90c227..4536024c51 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix @@ -108,7 +108,7 @@ in rec { ++ depsHostHost ++ depsHostHostPropagated ++ buildInputs ++ propagatedBuildInputs ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0; - dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || (stdenv.noCC or false); + dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || !stdenv.hasCC; supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; # Musl-based platforms will keep "pie", other platforms will not. defaultHardeningFlags = if stdenv.hostPlatform.isMusl && diff --git a/third_party/nixpkgs/pkgs/stdenv/linux/default.nix b/third_party/nixpkgs/pkgs/stdenv/linux/default.nix index 6d6d0384a7..816f0865fa 100644 --- a/third_party/nixpkgs/pkgs/stdenv/linux/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/linux/default.nix @@ -283,6 +283,10 @@ in isl_0_20 = super.isl_0_20.override { stdenv = self.makeStaticLibraries self.stdenv; }; gcc-unwrapped = super.gcc-unwrapped.override { isl = isl_0_20; + # Use a deterministically built compiler + # see https://github.com/NixOS/nixpkgs/issues/108475 for context + reproducibleBuild = true; + profiledCompiler = false; }; }; extraNativeBuildInputs = [ prevStage.patchelf ] ++ diff --git a/third_party/nixpkgs/pkgs/test/default.nix b/third_party/nixpkgs/pkgs/test/default.nix index b24fc539c9..b9f05bdff8 100644 --- a/third_party/nixpkgs/pkgs/test/default.nix +++ b/third_party/nixpkgs/pkgs/test/default.nix @@ -22,8 +22,7 @@ with pkgs; cc-wrapper-libcxx-9 = callPackage ./cc-wrapper { stdenv = llvmPackages_9.libcxxStdenv; }; stdenv-inputs = callPackage ./stdenv-inputs { }; - haskell-shellFor = callPackage ./haskell-shellFor { }; - haskell-documentationTarball = callPackage ./haskell-documentationTarball { }; + haskell = callPackage ./haskell { }; cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; @@ -51,5 +50,7 @@ with pkgs; cuda = callPackage ./cuda { }; + trivial = callPackage ../build-support/trivial-builders/test.nix {}; + writers = callPackage ../build-support/writers/test.nix {}; } diff --git a/third_party/nixpkgs/pkgs/test/haskell/default.nix b/third_party/nixpkgs/pkgs/test/haskell/default.nix new file mode 100644 index 0000000000..eb389f4051 --- /dev/null +++ b/third_party/nixpkgs/pkgs/test/haskell/default.nix @@ -0,0 +1,7 @@ +{ lib, callPackage }: + +lib.recurseIntoAttrs { + shellFor = callPackage ./shellFor { }; + documentationTarball = callPackage ./documentationTarball { }; + setBuildTarget = callPackage ./setBuildTarget { }; +} diff --git a/third_party/nixpkgs/pkgs/test/haskell-documentationTarball/default.nix b/third_party/nixpkgs/pkgs/test/haskell/documentationTarball/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/test/haskell-documentationTarball/default.nix rename to third_party/nixpkgs/pkgs/test/haskell/documentationTarball/default.nix diff --git a/third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/Bar.hs b/third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/Bar.hs new file mode 100644 index 0000000000..010014082c --- /dev/null +++ b/third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/Bar.hs @@ -0,0 +1,4 @@ +module Main where + +main :: IO () +main = putStrLn "Hello, Bar!" diff --git a/third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/Foo.hs b/third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/Foo.hs new file mode 100644 index 0000000000..fec7bb11fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/Foo.hs @@ -0,0 +1,4 @@ +module Main where + +main :: IO () +main = putStrLn "Hello, Foo!" diff --git a/third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/Setup.hs b/third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/Setup.hs new file mode 100644 index 0000000000..9a994af677 --- /dev/null +++ b/third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/default.nix b/third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/default.nix new file mode 100644 index 0000000000..b1335e2a74 --- /dev/null +++ b/third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/default.nix @@ -0,0 +1,38 @@ +{ pkgs, haskellPackages }: + +let + # This can be regenerated by running `cabal2nix .` in the current directory. + pkgDef = + { mkDerivation, base, lib }: + mkDerivation { + pname = "haskell-setBuildTarget"; + version = "0.1.0.0"; + src = ./.; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + license = lib.licenses.bsd3; + }; + + drv = haskellPackages.callPackage pkgDef {}; + + test = target: excluded: + let only = pkgs.haskell.lib.setBuildTarget drv target; + in '' + if [[ ! -f "${only}/bin/${target}" ]]; then + echo "${target} was not built" + exit 1 + fi + + if [[ -f "${only}/bin/${excluded}" ]]; then + echo "${excluded} was built, when it should not have been" + exit 1 + fi + ''; + +in pkgs.runCommand "test haskell.lib.setBuildTarget" {} '' + ${test "foo" "bar"} + ${test "bar" "foo"} + touch "$out" +'' + diff --git a/third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal b/third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal new file mode 100644 index 0000000000..7395e13945 --- /dev/null +++ b/third_party/nixpkgs/pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal @@ -0,0 +1,16 @@ +cabal-version: >=1.10 +name: haskell-setBuildTarget +version: 0.1.0.0 +author: Isaac Shapira +maintainer: fresheyeball@protonmail.com +build-type: Simple + +executable foo + main-is: Foo.hs + build-depends: base + default-language: Haskell2010 + +executable bar + main-is: Bar.hs + build-depends: base + default-language: Haskell2010 diff --git a/third_party/nixpkgs/pkgs/test/haskell-shellFor/default.nix b/third_party/nixpkgs/pkgs/test/haskell/shellFor/default.nix similarity index 67% rename from third_party/nixpkgs/pkgs/test/haskell-shellFor/default.nix rename to third_party/nixpkgs/pkgs/test/haskell/shellFor/default.nix index 9d13e1112c..37ad2e90d8 100644 --- a/third_party/nixpkgs/pkgs/test/haskell-shellFor/default.nix +++ b/third_party/nixpkgs/pkgs/test/haskell/shellFor/default.nix @@ -1,22 +1,22 @@ -{ lib, haskellPackages, cabal-install }: +{ lib, writeText, haskellPackages, cabal-install }: (haskellPackages.shellFor { - packages = p: [ p.database-id-class p.constraints ]; + packages = p: [ p.constraints p.linear ]; nativeBuildInputs = [ cabal-install ]; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; unpackPhase = '' sourceRoot=$(pwd)/scratch mkdir -p "$sourceRoot" cd "$sourceRoot" - tar -xf ${haskellPackages.database-id-class.src} tar -xf ${haskellPackages.constraints.src} - cp ${builtins.toFile "cabal.project" "packages: database-id-class* constraints*"} cabal.project + tar -xf ${haskellPackages.linear.src} + cp ${writeText "cabal.project" "packages: constraints* linear*"} cabal.project ''; buildPhase = '' export HOME=$(mktemp -d) mkdir -p $HOME/.cabal touch $HOME/.cabal/config - cabal v2-build --offline --verbose database-id-class constraints --ghc-options="-O0 -j$NIX_BUILD_CORES" + cabal v2-build --offline --verbose constraints linear --ghc-options="-O0 -j$NIX_BUILD_CORES" ''; installPhase = '' touch $out diff --git a/third_party/nixpkgs/pkgs/tools/X11/find-cursor/default.nix b/third_party/nixpkgs/pkgs/tools/X11/find-cursor/default.nix index 9e3b779d68..3f330c63b0 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/find-cursor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/find-cursor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "find-cursor"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "arp242"; repo = "find-cursor"; rev = "v${version}"; - sha256 = "13lpcxklv9ayqapyk9pmwxkinhxah5hkr6n0jc2m5hm68nh220w1"; + sha256 = "sha256-cFvhoEPDFLw6rsPYUF9gqAFzINewnszJEzxRK064NEU="; }; nativeBuildInputs = [ installShellFiles git ]; diff --git a/third_party/nixpkgs/pkgs/tools/X11/hsetroot/default.nix b/third_party/nixpkgs/pkgs/tools/X11/hsetroot/default.nix index 69842a7bd5..95ccd9586d 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/hsetroot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/hsetroot/default.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { libXinerama ]; + postPatch = lib.optionalString (!stdenv.cc.isGNU) '' + sed -i -e '/--no-as-needed/d' Makefile + ''; + makeFlags = [ "PREFIX=$(out)" ]; preInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix index 0ab7be8374..5128e4d30c 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix @@ -23,18 +23,18 @@ stdenv.mkDerivation rec { pname = "OpenTabletDriver"; - version = "0.5.1"; + version = "0.5.3.1"; src = fetchFromGitHub { owner = "InfinityGhost"; repo = "OpenTabletDriver"; rev = "v${version}"; - sha256 = "1if2mkj193yzf5si9pwaynrm6wkhqy7ihk4k1lklzcryk5675w36"; + sha256 = "OT8/c+6wNpZyq/q7uMxIqmyJKNAq0B4ynEAqFF0GWyo="; }; debPkg = fetchurl { url = "https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb"; - sha256 = "16a1rr0yxra1dhwysbbfgsxpigh2jhjlsl7r28dgp8qcxncck7wg"; + sha256 = "0nm0v1xhphl6g6rz3li4rbdp7408g6sf9l4nh3mbbif5042xa0qh"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/deps.nix b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/deps.nix index ccb7097153..041795596b 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/deps.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/deps.nix @@ -41,8 +41,8 @@ }) (fetchNuGet { name = "HidSharpCore"; - version = "1.2.1"; - sha256 = "0vcw38skr9g691gxbzv3cf6y9rk11vh5pvcyjshdgii2z1z8a4g2"; + version = "1.2.1.1"; + sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) (fetchNuGet { name = "MessagePack.Annotations"; @@ -121,8 +121,8 @@ }) (fetchNuGet { name = "Octokit"; - version = "0.48.0"; - sha256 = "17ria1shx04rb6knbaswpqndmwam6v3r3lsfsd486q584798ccn8"; + version = "0.50.0"; + sha256 = "1ignj5i6a1c19qqrw00wlr9fdjmwrxkxz7gdxj0x653w84gbv7qq"; }) (fetchNuGet { name = "PangoSharp"; diff --git a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/shell.nix b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/shell.nix index 526fa4a443..4367d22e9d 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/shell.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/shell.nix @@ -1,9 +1,9 @@ -{ pkgs ? import ../../../../. {} }: +{ pkgs ? import ../../../../. { } }: with pkgs; mkShell { - buildInputs = [ + packages = [ common-updater-scripts curl dotnetCorePackages.sdk_5_0 diff --git a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/update.sh b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/update.sh index 715857cf8f..9944bb0b6d 100755 --- a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/update.sh +++ b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/update.sh @@ -7,7 +7,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")" deps_file="$(realpath "./deps.nix")" -new_version="$(curl -s "https://api.github.com/repos/InfinityGhost/OpenTabletDriver/releases" | jq -r '.[0].tag_name' | sed 's|[^0-9.]||g')" +new_version="$(curl -s "https://api.github.com/repos/OpenTabletDriver/OpenTabletDriver/releases" | jq -r '.[0].tag_name' | sed 's|[^0-9.]||g')" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" if [[ "$new_version" == "$old_version" ]]; then echo "Up to date" @@ -15,8 +15,8 @@ if [[ "$new_version" == "$old_version" ]]; then fi # Updating the hash of deb package manually since there seems to be no way to do it automatically -oldDebPkgUrl="https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${old_version}/OpenTabletDriver.deb"; -newDebPkgUrl="https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${new_version}/OpenTabletDriver.deb"; +oldDebPkgUrl="https://github.com/OpenTabletDriver/OpenTabletDriver/releases/download/v${old_version}/OpenTabletDriver.deb"; +newDebPkgUrl="https://github.com/OpenTabletDriver/OpenTabletDriver/releases/download/v${new_version}/OpenTabletDriver.deb"; oldDebSha256=$(nix-prefetch-url "$oldDebPkgUrl") newDebSha256=$(nix-prefetch-url "$newDebPkgUrl") echo "oldDebSha256: $oldDebSha256 newDebSha256: $newDebSha256" diff --git a/third_party/nixpkgs/pkgs/tools/X11/wpgtk/default.nix b/third_party/nixpkgs/pkgs/tools/X11/wpgtk/default.nix index cf9bbd9bb9..66464ae0b5 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/wpgtk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/wpgtk/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, libxslt, - gobject-introspection, gtk3, wrapGAppsHook, gnome3 }: + gobject-introspection, gtk3, wrapGAppsHook, gnome }: python3Packages.buildPythonApplication rec { pname = "wpgtk"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook gtk3 gobject-introspection - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libxslt ]; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix index 207c052686..991b9be223 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = "http://freedesktop.org/wiki/Software/xdg-user-dirs"; description = "A tool to help manage well known user directories like the desktop folder and the music folder"; license = licenses.gpl2; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix index 0dffdf7bbf..be1a6080a2 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix @@ -1,5 +1,5 @@ -{ lib, fetchurl, callPackage, substituteAll, python3, pkg-config, writeText -, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk +{ lib, fetchurl, substituteAll, python3, pkg-config, writeText +, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk, pandoc , wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which , ffmpeg, x264, libvpx, libwebp, x265 , libfakeXinerama @@ -13,8 +13,11 @@ let xf86videodummy = xorg.xf86videodummy.overrideDerivation (p: { patches = [ + # patch provided by Xpra upstream ./0002-Constant-DPI.patch + # https://github.com/Xpra-org/xpra/issues/349 ./0003-fix-pointer-limits.patch + # patch provided by Xpra upstream ./0005-support-for-30-bit-depth-in-dummy-driver.patch ]; }); @@ -30,27 +33,27 @@ let in buildPythonApplication rec { pname = "xpra"; - version = "4.0.6"; + version = "4.1.3"; src = fetchurl { - url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "nGcvbZFGYd2nQ75LL4YN+xcWb7UsViA3OAqpcrTwieg="; + url = "https://xpra.org/src/${pname}-${version}.tar.gz"; + sha256 = "TesmPRmfWy+IqqxoNFd04oX/b2ryGreZPeh2r4sL8JQ="; }; patches = [ - (substituteAll { + (substituteAll { # correct hardcoded paths src = ./fix-paths.patch; inherit (xorg) xkeyboardconfig; inherit libfakeXinerama; }) - ./fix-41106.patch + ./fix-41106.patch # https://github.com/NixOS/nixpkgs/issues/41106 ]; postPatch = '' substituteInPlace setup.py --replace '/usr/include/security' '${pam}/include/security' ''; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook pandoc ]; buildInputs = with xorg; [ libX11 xorgproto libXrender libXi libXtst libXfixes libXcomposite libXdamage diff --git a/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix b/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix index 63ca45452e..a7e1d02cb3 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2, unixtools, dnsutils }: stdenv.mkDerivation rec { pname = "acme.sh"; - version = "2.8.8"; + version = "2.8.9"; src = fetchFromGitHub { owner = "Neilpang"; repo = "acme.sh"; rev = version; - sha256 = "1iqwzqgg26vsg7lwmgmga9y3ap9q8r5xyx799bj8kawnr8n6s4jd"; + sha256 = "sha256-xiLAvxly4WbMb6DAXPsXJgQqVmTlX9cbqFECJQ+r0Jk="; }; nativeBuildInputs = [ makeWrapper ]; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "A pure Unix shell script implementing ACME client protocol"; homepage = "https://acme.sh/"; license = licenses.gpl3; - maintainers = [ maintainers.yorickvp ]; + maintainers = teams.serokell.members; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/ansible/default.nix b/third_party/nixpkgs/pkgs/tools/admin/ansible/default.nix index 58b2852bac..63ef764695 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/ansible/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/ansible/default.nix @@ -3,30 +3,10 @@ rec { ansible = ansible_2_10; - # The python module stays at v2.9.x until the related package set has caught up. Therefore v2.10 gets an override - # for now. - ansible_2_10 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { - pname = "ansible"; - version = "2.10.0"; - - # TODO: migrate to fetchurl, when release becomes available on releases.ansible.com - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "0k9rs5ajx0chaq0xr1cj4x7fr5n8kd4y856miss6k01iv2m7yx42"; - }; - })); + ansible_2_10 = python3Packages.toPythonApplication python3Packages.ansible-base; + # End of support 2021/10/02, End of life 2021/12/31 ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible; - ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { - pname = "ansible"; - version = "2.8.14"; - - src = fetchurl { - url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "19ga0c9qs2b216qjg5k2yknz8ksjn8qskicqspg2d4b8x2nr1294"; - }; - })); + ansible_2_8 = throw "Ansible 2.8 went end of life on 2021/01/03 and has subsequently been dropped"; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix index a2ea7bb35d..0824a26855 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -3,12 +3,12 @@ let py = python3.override { packageOverrides = self: super: { botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev103"; + version = "2.0.0dev112"; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - rev = "e30d580042687a79776fdf93264e80746e08d21f"; - sha256 = "sha256-+cTQQO6dPctvf3WZOk8Mgo1eQUdqRdGCcz7jcVhEvNo="; + rev = "221c0aa5dbad42f096e00fed45d2e2071561b1da"; + sha256 = "sha256-uJCP3bUK/xACQVG4kMBDIIP+zPjre+uWbqWEC/gBTD4="; }; }); prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { @@ -18,19 +18,26 @@ let sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi"; }; }); + s3transfer = super.s3transfer.overridePythonAttrs (oldAttrs: rec { + version = "0.4.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI="; + }; + }); }; }; in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.1.35"; # N.B: if you change this, change botocore to a matching version too + version = "2.2.4"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-YgzagbbVLlGSPIhck0YaJg3gQGEdoqXtLapN04Q6hLw="; + sha256 = "sha256-MctW31X012DXY16qS6AP6nLiaAt/cuA8iMwGm0oXi6M="; }; postPatch = '' @@ -41,10 +48,10 @@ with py.pkgs; buildPythonApplication rec { substituteInPlace setup.py --replace "wcwidth<0.2.0" "wcwidth" ''; - # No tests included - doCheck = false; + checkInputs = [ jsonschema mock nose ]; propagatedBuildInputs = [ + awscrt bcdoc botocore colorama @@ -62,6 +69,15 @@ with py.pkgs; buildPythonApplication rec { wcwidth ]; + checkPhase = '' + export PATH=$PATH:$out/bin + + # https://github.com/NixOS/nixpkgs/issues/16144#issuecomment-225422439 + export HOME=$TMP + + AWS_TEST_COMMAND=$out/bin/aws python scripts/ci/run-tests + ''; + postInstall = '' mkdir -p $out/${python3.sitePackages}/awscli/data ${python3.interpreter} scripts/gen-ac-index --index-location $out/${python3.sitePackages}/awscli/data/ac.index 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 925ed7699a..c037f661e6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.20.0"; + version = "2.23.0"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-unG17oiqZZJNGg8QCg7xY0GzuMu2gaAIIgGF8TlMBQQ="; + sha256 = "sha256-uIM1U9hub1A1YT6CzwQHmefNBuU4tDapu7VC6EP5kuM="; }; # put packages that needs to be overriden in the py package scope @@ -50,6 +50,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-datalake-store azure-functions-devops-build azure-graphrbac + azure-identity azure-keyvault azure-keyvault-administration azure-loganalytics @@ -110,6 +111,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-security azure-mgmt-servicebus azure-mgmt-servicefabric + azure-mgmt-servicefabricmanagedclusters azure-mgmt-signalr azure-mgmt-sql azure-mgmt-sqlvirtualmachine 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 5c33823929..421aa3da4a 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 @@ -144,8 +144,8 @@ let azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip" "1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd"; - azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "3.1.0rc1" "zip" - "0jg242pjbxvcqskgrmw0q17mhafkip1d8p40hls0w0wn77cnic65"; + azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "8.1.0b4" "zip" + "sha256-39msNYlZeZdn8cJ4LjZw9oxzy0YrNSPVEIN21wnkMKs="; azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip" "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1"; @@ -153,8 +153,8 @@ let azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.11.0" "zip" "f2b85d1d7d7db2af106000910ea5f8b95639874176a5de2f7ab37a2caa67af6b"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "12.0.0" "zip" - "sha256-h3nif64OgekSh4mjOSTbom8qDXVrIVNksbQ3LwILnx8="; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "12.1.0" "zip" + "sha256-XPnO6OiwjTbfxz9Q3JkuCPnfTtmdU2cqP14w9ZVIcBE="; azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "1.0.1" "zip" "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f"; @@ -162,8 +162,8 @@ let azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip" "059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx"; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "19.0.0" "zip" - "34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879a"; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "20.0.0" "zip" + "7920bea2e11d78fa616992813aea470a8fb50eab2e646e032e138f93d53b70e8"; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; @@ -171,20 +171,23 @@ let azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "1.4.0" "zip" "1qw6228bia5pimcijr755npli2l33jyfka1s2bzgl1w4h3prsji7"; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "9.4.0" "zip" - "1jfs2v0bblpn8lg98zgll6f7k7247r6vwrr0p1898xvhdh8881nr"; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "11.1.0" "zip" + "sha256-7d9UlMudNd4hMcaNxJ+slL/tFyaI6BmBR6DlI3Blzq4="; azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.2.0" "zip" "8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998"; - azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "3.0.0" "zip" - "sha256-/WV5vxXOg9CUT+NAnhpOG7f+QBGfUlTNVO26LTtuIoM="; + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "6.2.0" "zip" + "116b5bf9433ad89078c743b617c5b1c51f9ce1a1f128fb2e4bbafb5efb2d2c74"; + + azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "0.2.0" "zip" + "sha256-g8BtUpIGOse8Jrws48gQ/o7sgymlgX0XIxl1ThHS3XA="; azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6"; - azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "3.0.0rc7" "zip" - "1m5905mn362pn03sf89zsnylkrbgs4p1lkafrw3nxa2gnwcfpyb8"; + azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "3.0.0rc9" "zip" + "sha256-txWYthg9QI5OSW6yE5lY+Gpb+/E6x3jb/obfSQuaAcg="; azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.4.0" "zip" "0cqpjnkpid6a34ifd4vk4fn1h57pa1bg3r756wv082xl2szr34jc"; @@ -201,20 +204,26 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.15.0" "zip" - "sha256-XpjDYGCad7RDsv5DHgM35ctwW08C0CBHkfmYX3zmiDY="; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "2.0.0" "zip" + "ff3b663e36c961e86fc0cdbd6f9fb9fb863d3e7db9035fe713af7299e809ee5e"; - azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" - "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; + azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip" + "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8"; azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "8.0.0" "zip" "3e7a93186594c328a6f34f0e0d9209a05021228baa85aa4c1c4ffdbf8005a45f"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "17.1.0" "zip" - "f47852836a5960447ab534784a9285696969f007744ba030828da2eab92621ab"; + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "18.0.0" "zip" + "85fdeb7a1a8d89be9b585396796b218b31b681590d57d82d3ea14cf1f2d20b4a"; - azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "0.1.0" "zip" - "sha256-baEkJcurDMYvJG5yZrTWev9r3QMey+UMdULC8rJECtQ="; + azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "0.1.0" "zip" + "sha256-wSDiELthdo2ineJNKLgvjUKuJOUjlutlabSZcJ4i8AY="; + + azure-mgmt-managedservices = overrideAzureMgmtPackage super.azure-mgmt-managedservices "1.0.0" "zip" + "sha256-/tg5n8Z3Oq2jfB0ElqRvWUENd8lJTQyllnxTHDN2rRk="; + + azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "1.1.0" "zip" + "68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8"; azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "3.0.0" "zip" "sha256-iUR3VyXFJTYU0ldXbYQe5or6NPVwsFwJJKf3Px2yiiQ="; @@ -222,8 +231,11 @@ let azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip" "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6"; - azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.48.0" "zip" - "1v41k9rsflbm9g06mhi6jsygv9542da53qwjpjkp532jawxrw3ys"; + azure-mgmt-privatedns = overrideAzureMgmtPackage super.azure-mgmt-privatedns "0.1.0" "zip" + "sha256-0pz9jOyAbgZnPZOC0/V2b8Zdmp3nW0JHBQlKNKfbjSM="; + + azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "2.0.0" "zip" + "0040e1c9c795f7bebe43647ff30b62cb0db7175175df5cbfa1e554a6a277b81e"; azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "0.1.0" "zip" "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn"; @@ -261,14 +273,14 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.1.0" "zip" "186g70slb259ybrr69zr2ibbmqgplnpncwxzg0nxp6rd7pml7d85"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "8.0.0" "zip" - "2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d"; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "9.0.0" "zip" + "2890c489289b8a0bf833852014f2f494eb96873834896910ddfa58cfa97b90da"; - azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "7.0.0" "zip" - "sha256-6abJoZs5cbodve75bApaLDWUYzp1R6YOa/y4Azhk7jg="; + azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "11.0.0" "zip" + "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907"; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc16" "zip" - "eT5gH0K4q2Qr1lEpuqjxQhOUrA6bEsAktj+PKsfMXTo="; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc17" "zip" + "sha256-M6lenj1rVEJZ+EJyBXkqokFfr1e5sqRgcAbUc0W0svo="; azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "2.0.0" "zip" "e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82"; @@ -282,8 +294,8 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip" "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "17.0.0" "zip" - "c0e3fd99028d98c80dddabe1c22dfeb3d694e5c1393c6de80766eb240739e4bc"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "17.1.0" "zip" + "01acb8e988c8082174fa952e1638d700146185644fbe4b126e65843e63d44600"; azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "0.6.0" "zip" "1c88pj8diijciizw4c6g1g6liz54cp3xmlm4xnmz97hizfw202gj"; @@ -294,8 +306,8 @@ let azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "2.2.0" "zip" "sha256-Myxg3G0+OAk/bh4k5TOEGGJuyEBtYA2edNlbIXnWE4M="; - azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.6.0" "tar.gz" - "sha256-2AWpGyle31IFf/qya3FBYJBUBr3V16Gj+T9s3D7ehBI="; + azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.6.2" "tar.gz" + "74061f99730fa82c54d9b8ab3c7d6e219da3f30912740ecf0456b20cb3555ebc"; azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { version = "0.60.0"; @@ -327,21 +339,21 @@ let }); azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs(oldAttrs: rec { - version = "0.3.0"; + version = "0.6.0"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "0p43zmw96fh3wp75phf3fcqdfb36adqvxfc945yfda6fi555nw1a"; + sha256 = "ec113d37386b8787862baaf9da0318364a008004a377d20fdfca31cfe8d16210"; extension = "zip"; }; }); azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs(oldAttrs: rec { - version = "0.2.0"; + version = "0.5.0"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "1rsdqrhrgy09kbw6c7krb4hlaxs1ldb6lilwrbxgp3zqybxxnh5b"; + sha256 = "sha256-g14ySiByqPgkJGRH8EnIRJO9Q6H2usS5FOeMCQiUuwQ="; extension = "zip"; }; }); @@ -417,6 +429,16 @@ let ''; }); + adal = super.adal.overridePythonAttrs(oldAttrs: rec { + version = "1.2.7"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-109FuBMXRU2W6YL9HFDm+1yZrCIjcorqh2RDOjn1ZvE="; + }; + }); + semver = super.semver.overridePythonAttrs(oldAttrs: rec { version = "2.13.0"; @@ -435,15 +457,19 @@ let inherit version; sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd"; }; + + # new cryptography returns slightly different values than what's expected + # this gets tested in azure-cli-core, so not absolutely necessary to run tests here + doCheck = false; }); knack = super.knack.overridePythonAttrs(oldAttrs: rec { - version = "0.8.0rc2"; + version = "0.8.1"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-4pzgVwOVcT5UsjbyGkE30xashMASUzoQe2OGHSnK5do="; + sha256 = "sha256-5h2a5OJxmaLXTCYfgen4L1NTpdHC4a0lYAp9UQkXTuA="; }; }); diff --git a/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix b/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix index c2126181f3..8396540cd2 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix @@ -1,30 +1,21 @@ -{ buildGoModule, lib, fetchFromGitHub, fetchpatch }: +{ buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "chamber"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "eOMY9P/fCYvnl6KGNb6wohykLA0Sj9Ti0L18gx5dqUk="; + sha256 = "4G/QGoztpcLIspHxD5G+obG5h05SZek4keOJ5qS3/zg="; }; - patches = [ - (fetchpatch { - url = "https://github.com/segmentio/chamber/commit/3aeb416cdf4c232552b653262e37047fc13b1f02.patch"; - sha256 = "cyxNF9ZP4oG+1sfX9yWZCyntpAvwYUh5BzTirZQGejc="; - }) - ]; + CGO_ENABLED = 0; - vendorSha256 = null; + vendorSha256 = "XpLLolxWu9aMp1cyG4dUQk4YtknbIRMmBUdSeyY4PNk="; - # set the version. see: chamber's Makefile - buildFlagsArray = '' - -ldflags= - -X main.Version=v${version} - ''; + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=v${version}" ]; meta = with lib; { description = diff --git a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix index e9e039cfbd..46989bc24f 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clair"; - version = "4.0.5"; + version = "4.1.0"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tpk5Avx2bRQlhOnHpmpDG14X9nk3x68TST+VtIW8rL8="; + sha256 = "sha256-Ns02Yi0FJPOCpjr1P5c1KOkRZ8saxQzXg/Zn5vYLztU="; }; - vendorSha256 = "sha256-O9SEVyBFnmyrQCmccXLyeOqlTwWHzICTLVKGO7rerjI="; + vendorSha256 = "sha256-aFaeRhg+aLOmS7VFbgdxaEtZcBKn9zCVINad6ahpDCo="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 83f62a2f1c..57bc14ba90 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.46.0"; + version = "0.48.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-fPs9xB27fxUnsXndqpcifmMPGA8hEyeYC7tq+W9eBKI="; + sha256 = "sha256-jhf+FIhKkROyNUYh96zFrzxE5hVFnxF6xrTwvivj9B8="; }; - vendorSha256 = "sha256-ZC5Rk5HcnxU9X5o/t+oz8qx36WjOVYVEXxxa875UrZk="; + vendorSha256 = "sha256-U5NAhhum+VsSlhB3pHMmnkaqjWvZJw4BDHVIo4YIkrY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix index 3f0aca33d6..d717c249fe 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-YbWh4ZIlcxAD/8F/fsYIWjv5hKaHNNi+sNrD7Ax/xDw="; + sha256 = "sha256-yTsmgRs3H5do1lG28RU/OY5QJFcwvkrsV/HGuVzD+3M="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix index bd8b74f8bc..c27b18ac6d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fioctl"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "0gmh32h9j6wpkdxxg7vj158lsaxq30x7hjsc9gwpip3bff278hw4"; + sha256 = "1mm62piih7x2886wpgqd8ks22vpmrjgxs4alskiqz61bgshks9vw"; }; vendorSha256 = "170z5a1iwwcpz890nficqnz7rr7yzdxr5jx9pa7s31z17lr8kbz9"; 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 f89e02c859..c945ae5557 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 = "0fb0bw16idj810si32fxqx1nl057bdsjk3pvkgzpf7j96v2lkw71"; + sha256 = "1ag8h8gj3cld2qxqdrrqdwrz3d9d5m4c2wkx7b78vjpimv76qx5d"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "0gnnp8whcx6ada8a4xs8kxrbza97zivk57r9qzv0q5arg4xslagr"; + sha256 = "1mm9lvbgszr5d6gs1qqn63012mgxq94xxkcc400fgfx3apzpkbpj"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "336.0.0"; + version = "340.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix b/third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix index 3d662a456a..5e00e487e2 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, fetchpatch , meson , ninja , gobject-introspection @@ -15,30 +15,22 @@ , vala , gettext , perl -, gnome3 +, gnome , gdk-pixbuf , zlib }: stdenv.mkDerivation rec { pname = "gtk-vnc"; - version = "1.0.0"; + version = "1.2.0"; outputs = [ "out" "bin" "man" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1060ws037v556rx1qhfrcg02859rscksrzr8fq11himdg4d1y6m8"; + sha256 = "0jmr6igyzcj2wmx5v5ywaazvdz3hx6a6rys26yb4l4s71l281bvs"; }; - patches = [ - # Fix undeclared gio-unix-2.0 in example program. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk-vnc/commit/8588bc1c8321152ddc5086ca9b2c03a7f511e0d0.patch"; - sha256 = "0i1iapsbngl1mhnz22dd73mnzk68qc4n51pqdhnm18zqc8pawvh4"; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -62,7 +54,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix index 417e01a325..f0deb99c44 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.13"; + version = "4.14"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { - url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0w2r80wf86jijgfxbkv06lgfhz4p2aaidsqd96bx3q1382nrbzcf"; + url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"; + sha256 = "1x9gv70j333w254jgg1n0kvxpwv6vww0v0i862pglq48xhdaa7hy"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/oci-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/oci-cli/default.nix index 16ecff07b7..8996ef5069 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/oci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/oci-cli/default.nix @@ -46,7 +46,8 @@ python3Packages.buildPythonApplication rec { --replace "cryptography==3.2.1" "cryptography" \ --replace "pyOpenSSL==19.1.0" "pyOpenSSL" \ --replace "PyYAML==5.3.1" "PyYAML" \ - --replace "six==1.14.0" "six" + --replace "six==1.14.0" "six" \ + --replace "arrow==0.17.0" "arrow" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/admin/pebble/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pebble/default.nix index 4813f86ea6..1fb902a8c8 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pebble/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pebble/default.nix @@ -1,6 +1,7 @@ { buildGoPackage , fetchFromGitHub , lib +, nixosTests }: let @@ -17,6 +18,10 @@ in buildGoPackage { sha256 = "1piwzzfqsdx6s2niczzp4mf4r3qn9nfdgpn7882g52cmmm0vzks2"; }; + passthru.tests = { + smoke-test = nixosTests.acme; + }; + meta = { homepage = "https://github.com/letsencrypt/pebble"; description = "A miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix index f91b0487bb..0295ed000c 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.17.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5TOKYxH1Tnsd1t2yoUflFUSW0QGS9l5+0JtS2Fo6vL0="; + sha256 = "sha256-5Ub78Js4KM1meXN5e1cwO8gb065cyGGNlsj4CGBIhTU="; }; - vendorSha256 = "sha256-zVe1bTTLOHxfdbb6VcztOCWMbCbzT6igNpvPytktMWs="; + vendorSha256 = "sha256-R1FX6BrzXP5HkqoYtY3f/oACAFLxIvcjiOyfq6YZezk="; excludedPackages = "misc"; @@ -19,6 +19,14 @@ buildGoModule rec { buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}") ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/trivy --help + $out/bin/trivy --version | grep "v${version}" + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://github.com/aquasecurity/trivy"; changelog = "https://github.com/aquasecurity/trivy/releases/tag/v${version}"; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/add-missing-import.patch b/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/add-missing-import.patch new file mode 100644 index 0000000000..d0ed0bb5b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/add-missing-import.patch @@ -0,0 +1,22 @@ +From 29c0b393283395c69ecdd747e960301e95c93bcf Mon Sep 17 00:00:00 2001 +From: Felix Rath +Date: Sat, 15 May 2021 13:07:38 +0200 +Subject: [PATCH] add missing import + +`std::logic_error` is used in this file, which resides in ``, but was not imported before. This caused the build to fail, see, e.g., https://hydra.nixos.org/build/141997371/log. +--- + src/algo/crypt/lcg.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/algo/crypt/lcg.cc b/src/algo/crypt/lcg.cc +index 6c2a7945..66630a08 100644 +--- a/src/algo/crypt/lcg.cc ++++ b/src/algo/crypt/lcg.cc +@@ -17,6 +17,7 @@ + + #include "algo/crypt/lcg.h" + #include ++#include + + using namespace au; + using namespace au::algo::crypt; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix index dcd5243d71..c6259cf11b 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix @@ -18,22 +18,37 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper catch ]; buildInputs = [ boost libpng libjpeg zlib openssl libwebp ]; + patches = [ + # Add a missing `` import that caused the build to fail. + # Failure: https://hydra.nixos.org/build/141997371/log + # Also submitted as an upstream PR: https://github.com/vn-tools/arc_unpacker/pull/194 + ./add-missing-import.patch + ]; + postPatch = '' cp ${catch}/include/catch/catch.hpp tests/test_support/catch.h ''; checkPhase = '' + runHook preCheck + pushd .. ./build/run_tests popd + + runHook postCheck ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/doc/arc_unpacker $out/libexec/arc_unpacker cp arc_unpacker $out/libexec/arc_unpacker/arc_unpacker cp ../GAMELIST.{htm,js} $out/share/doc/arc_unpacker cp -r ../etc $out/libexec/arc_unpacker makeWrapper $out/libexec/arc_unpacker/arc_unpacker $out/bin/arc_unpacker + + runHook postInstall ''; doCheck = true; @@ -41,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool to extract files from visual novel archives"; homepage = "https://github.com/vn-tools/arc_unpacker"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ midchildan ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/archivers/bomutils/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/bomutils/default.nix index 9ace81a5ec..c4ff957135 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/bomutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/bomutils/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { sha256 = "1i7nhbq1fcbrjwfg64znz8p4l7662f7qz2l6xcvwd5z93dnmgmdr"; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "PREFIX=$(out)" + "CXX=${stdenv.cc.targetPrefix}c++" + ]; meta = with lib; { homepage = "https://github.com/hogliux/bomutils"; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/quickbms/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/quickbms/default.nix new file mode 100644 index 0000000000..7846f18a17 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/archivers/quickbms/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchzip, bzip2, lzo, openssl, zlib }: + +stdenv.mkDerivation rec { + version = "0.11.0"; + pname = "quickbms"; + + src = fetchzip { + url = "https://aluigi.altervista.org/papers/quickbms-src-${version}.zip"; + hash = "sha256-uQKTE36pLO8uhrX794utqaDGUeyqRz6zLCQFA7DYkNc="; + }; + + buildInputs = [ bzip2 lzo openssl zlib ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Universal script based file extractor and reimporter"; + homepage = "https://aluigi.altervista.org/quickbms.htm"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ samuelgrf ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix index 815bf823d5..e940922106 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix @@ -2,18 +2,18 @@ coreutils, zip, unzip, p7zip, unrar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: stdenv.mkDerivation rec { - version = "0.5.4.14"; + version = "0.5.4.17"; pname = "xarchiver"; src = fetchFromGitHub { owner = "ib"; repo = "xarchiver"; rev = version; - sha256 = "1iklwgykgymrwcc5p1cdbh91v0ih1m58s3w9ndl5kyd44bwlb7px"; + sha256 = "00adrjpxqlaccrwjf65w3vhxfswdj0as8aj263c6f9b85llypc5v"; }; - nativeBuildInputs = [ pkg-config makeWrapper wrapGAppsHook ]; - buildInputs = [ gtk3 intltool libxslt ]; + nativeBuildInputs = [ intltool pkg-config makeWrapper wrapGAppsHook ]; + buildInputs = [ gtk3 libxslt ]; postFixup = '' wrapProgram $out/bin/xarchiver \ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; homepage = "https://github.com/ib/xarchiver"; maintainers = [ lib.maintainers.domenkozar ]; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/archivers/zpaq/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/zpaq/default.nix index a7663bbd23..08d98716f1 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/zpaq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/zpaq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perl, unzip }: +{ lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { pname = "zpaq"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0v44rlg9gvwc4ggr2lhcqll8ppal3dk7zsg5bqwcc5lg3ynk2pz4"; }; - nativeBuildInputs = [ perl /* for pod2man */ unzip ]; + nativeBuildInputs = [ perl /* for pod2man */ ]; preBuild = let CPPFLAGS = with stdenv; "" diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index e1c2844813..25c8d28191 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.03.30"; + version = "2021.05.19"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "sha256-eOQbvs/mtFn7AmvSezO/jRm8+cO5tF7ggcF9DwwfqVc="; + sha256 = "sha256-QdzP9CJrENLVYnWFTvRqn6Jz95zD6JWIMpnCa34QGas="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/third_party/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/default.nix index 5703ca77bd..4fc3d957e1 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -17,10 +17,15 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { + name = "fix-build-with-libav-10.patch"; + url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/2c778334a9fc2f0ccf9b1d7635c116bce6509748/raw"; + sha256 = "1smyp3x5n6jwxpgw60xsijq2fn6g1gl759h1lm5agaxhcyyqn0i0"; + }) + (fetchpatch { + name = "fix-build-failure-on-gcc-6.patch"; url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/632e87969c3a5562a5d4842b03613267ba6236b2/raw"; sha256 = "15hm9knrpqn3yqrwyjz4zh2aypwbcycd0c5svrsy1fb2h2rh05jk"; }) - ./ffmpeg.patch ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch b/third_party/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch deleted file mode 100644 index f3eacae26f..0000000000 --- a/third_party/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/decoder.h b/decoder.h -index 028f58f..4428ac1 100644 ---- a/decoder.h -+++ b/decoder.h -@@ -39,6 +39,8 @@ extern "C" { - #define AV_SAMPLE_FMT_S16 SAMPLE_FMT_S16 - #endif - -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 -+ - class Decoder - { - public: -diff --git a/ffmpeg/audioconvert.h b/ffmpeg/audioconvert.h -index 2b28e2e..a699986 100644 ---- a/ffmpeg/audioconvert.h -+++ b/ffmpeg/audioconvert.h -@@ -79,7 +79,7 @@ int avcodec_channel_layout_num_channels(int64_t channel_layout); - * @param fmt_name Format name, or NULL if unknown - * @return Channel layout mask - */ --uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name); -+uint64_t avcodec_guess_channel_layout(int nb_channels, enum AVCodecID codec_id, const char *fmt_name); - - struct AVAudioConvert; - typedef struct AVAudioConvert AVAudioConvert; diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix index b9ed3eca91..c218aa7e4e 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix @@ -105,13 +105,13 @@ in pythonPackages.buildPythonApplication rec { # unstable does not require bs1770gain[2]. # [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639 # [2]: https://github.com/NixOS/nixpkgs/pull/90504 - version = "unstable-2021-04-17"; + version = "unstable-2021-05-13"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "50163b373f527d1b1f8b2442240ca547e846744e"; - sha256 = "sha256-l7drav4Qx2JCF+F5OA0s641idcKM3S4Yx2lM2evJQWE="; + rev = "1faa41f8c558d3f4415e5e48cf4513d50b466d34"; + sha256 = "sha256-P0bV7WNqCYe9+3lqnFmAoRlb2asdsBUjzRMc24RngpU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/audio/gvolicon/default.nix b/third_party/nixpkgs/pkgs/tools/audio/gvolicon/default.nix index 312dc62d57..03ea3302d2 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/gvolicon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/gvolicon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, alsaLib, pkg-config, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }: +{ lib, stdenv, makeWrapper, alsaLib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }: stdenv.mkDerivation { name = "gvolicon-2014-04-28"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - makeWrapper alsaLib gtk3 gdk-pixbuf gnome3.adwaita-icon-theme + makeWrapper alsaLib gtk3 gdk-pixbuf gnome.adwaita-icon-theme librsvg wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix b/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix index a4411b6e0f..8115290845 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix @@ -2,7 +2,7 @@ , ocamlPackages , libao, portaudio, alsaLib, libpulseaudio, libjack2 , libsamplerate, libmad, taglib, lame, libogg -, libvorbis, speex, libtheora, libopus +, libvorbis, speex, libtheora, libopus, zlib , faad2, flac, ladspaH, ffmpeg, frei0r, dssi }: @@ -54,7 +54,7 @@ stdenv.mkDerivation { [ which ocamlPackages.ocaml ocamlPackages.findlib libao portaudio alsaLib libpulseaudio libjack2 libsamplerate libmad taglib lame libogg - libvorbis speex libtheora libopus + libvorbis speex libtheora libopus zlib faad2 flac ladspaH ffmpeg frei0r dssi ocamlPackages.xmlm ocamlPackages.ocaml_pcre ocamlPackages.camomile diff --git a/third_party/nixpkgs/pkgs/tools/audio/mididings/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mididings/default.nix index d5f78ada91..186f67f350 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/mididings/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/mididings/default.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication { description = "A MIDI router and processor based on Python, supporting ALSA and JACK MIDI"; homepage = "http://das.nasophon.de/mididings"; license = licenses.gpl2; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/audio/opl3bankeditor/default.nix b/third_party/nixpkgs/pkgs/tools/audio/opl3bankeditor/default.nix index 48f553d960..0c82d09f99 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/opl3bankeditor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/opl3bankeditor/default.nix @@ -22,6 +22,6 @@ mkDerivation rec { homepage = src.meta.homepage; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/audio/pasystray/default.nix b/third_party/nixpkgs/pkgs/tools/audio/pasystray/default.nix index 4a2030d744..2bedd2abac 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/pasystray/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook -, gnome3, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio +, gnome, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio , xlibsWrapper, gsettings-desktop-schemas }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; buildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper gsettings-desktop-schemas ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix b/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix index 80480c91ca..9306c516af 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix @@ -35,6 +35,9 @@ python3.pkgs.buildPythonApplication rec { pytest-subprocess ]; + # requires networking + doCheck = false; + makeWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath [ ffmpeg ]) ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix b/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix index 3a10881b60..51976a2d6a 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix @@ -12,62 +12,44 @@ # # If you upgrade from an old version you may have to delete old models from ~/.local/share/tts # Also note that your tts version might not support all available models so check: -# https://github.com/coqui-ai/TTS/releases/tag/v0.0.12 +# https://github.com/coqui-ai/TTS/releases/tag/v0.0.14 # # For now, for deployment check the systemd unit in the pull request: # https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136 python3Packages.buildPythonApplication rec { pname = "tts"; - version = "0.0.12"; + version = "0.0.14"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "sha256-0M9wcdBmuTK+NvEGsXEdoYiVFjw8G2MRUwmi1PJgmzI="; + sha256 = "0cl0ri90mx0y19fmqww73lp5nv6qkpc45rm4157i7p6q6llajdhp"; }; - patches = [ - # https://github.com/coqui-ai/TTS/pull/435 - (fetchpatch { - url = "https://github.com/coqui-ai/TTS/commit/97f98e4c4584ef14ed2f4885aa02c162d9364a00.patch"; - sha256 = "sha256-DAZYOOAe+6TYBF5ukFq5HRwm49askEvNEivuwb/oCWM="; - }) - ]; - - preBuild = '' - # numba jit tries to write to its cache directory - export HOME=$TMPDIR - # we only support pytorch models right now - sed -i -e '/tensorflow/d' requirements.txt - - sed -i -e 's!librosa==[^"]*!librosa!' requirements.txt setup.py - sed -i -e 's!unidecode==[^"]*!unidecode!' requirements.txt setup.py - sed -i -e 's!bokeh==[^"]*!bokeh!' requirements.txt setup.py - sed -i -e 's!numba==[^"]*!numba!' requirements.txt setup.py - sed -i -e 's!numpy==[^"]*!numpy!' requirements.txt setup.py - sed -i -e 's!umap-learn==[^"]*!umap-learn!' requirements.txt setup.py - # Not required for building/installation but for their development/ci workflow - sed -i -e '/black/d' requirements.txt - sed -i -e '/isor/d' requirements.txt - sed -i -e '/pylint/d' requirements.txt - sed -i -e '/cardboardlint/d' requirements.txt setup.py + postPatch = '' + sed -i -e 's!librosa==[^"]*!librosa!' requirements.txt + sed -i -e 's!unidecode==[^"]*!unidecode!' requirements.txt + sed -i -e 's!numba==[^"]*!numba!' requirements.txt + sed -i -e 's!numpy==[^"]*!numpy!' requirements.txt + sed -i -e 's!umap-learn==[^"]*!umap-learn!' requirements.txt ''; - nativeBuildInputs = [ python3Packages.cython ]; + nativeBuildInputs = with python3Packages; [ + cython + ]; propagatedBuildInputs = with python3Packages; [ - attrdict - bokeh + coqpit flask - fuzzywuzzy gdown inflect jieba librosa matplotlib - phonemizer + numba + pandas pypinyin pysbd pytorch @@ -88,29 +70,46 @@ python3Packages.buildPythonApplication rec { ) ''; - checkInputs = with python3Packages; [ pytestCheckHook ]; + checkInputs = with python3Packages; [ + pytest-sugar + pytestCheckHook + ]; disabledTests = [ # RuntimeError: fft: ATen not compiled with MKL support "test_torch_stft" "test_stft_loss" "test_multiscale_stft_loss" - # AssertionErrors that I feel incapable of debugging - "test_phoneme_to_sequence" - "test_text2phone" - "test_parametrized_gan_dataset" + # Requires network acccess to download models + "test_synthesize" ]; preCheck = '' # use the installed TTS in $PYTHONPATH instead of the one from source to also have cython modules. mv TTS{,.old} + export PATH=$out/bin:$PATH + + # numba tries to write to HOME directory + export HOME=$TMPDIR + + for file in $(grep -rl 'python TTS/bin' tests); do + substituteInPlace "$file" \ + --replace "python TTS/bin" "${python3.interpreter} $out/lib/${python3.libPrefix}/site-packages/TTS/bin" + done ''; disabledTestPaths = [ # requires tensorflow "tests/test_tacotron2_tf_model.py" - "tests/test_vocoder_tf_melgan_generator.py" - "tests/test_vocoder_tf_pqmf.py" + "tests/vocoder_tests/test_vocoder_tf_pqmf.py" + "tests/vocoder_tests/test_vocoder_tf_melgan_generator.py" + # RuntimeError: fft: ATen not compiled with MKL support + "tests/vocoder_tests/test_fullband_melgan_train.py" + "tests/vocoder_tests/test_hifigan_train.py" + "tests/vocoder_tests/test_melgan_train.py" + "tests/vocoder_tests/test_multiband_melgan_train.py" + "tests/vocoder_tests/test_parallel_wavegan_train.py" + ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/audio/video2midi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/video2midi/default.nix index 4eafd7f52e..e8f5af70c8 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/video2midi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/video2midi/default.nix @@ -29,7 +29,7 @@ in pythonPackages.buildPythonApplication rec { description = "Youtube synthesia video to midi conversion tool"; homepage = src.meta.homepage; license = licenses.gpl3; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/audio/volctl/default.nix b/third_party/nixpkgs/pkgs/tools/audio/volctl/default.nix index d05257f1d0..d764644bab 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/volctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/volctl/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "volctl"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "buzz"; repo = pname; rev = "v${version}"; - sha256 = "02scfscf4mdrphzrd7cbwbhpig9bhvaws8qk4zc81z8vvf3mcfv2"; + sha256 = "1cx27j83pz2qffnzb85fbl1x6pp3irv1kbw7g1hri7kaw6ky4xiz"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix b/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix index c2ed788233..cb4f5874ba 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bacula"; - version = "11.0.1"; + version = "11.0.2"; src = fetchurl { url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz"; - sha256 = "sha256-Lr2c24hZU8A/Cd8xGA7rfqga67ghz0XJ/cs/z/hSlPU="; + sha256 = "sha256-ooaKsNhUIxubAlGt6fUAkbD+PDMfkq+6lnK4G9lp4C8="; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] diff --git a/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix b/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix index efb81a58ad..067c013660 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix @@ -8,12 +8,12 @@ with lib; stdenv.mkDerivation rec { - version = "2.7.0"; + version = "2.7.1"; pname = "dar"; src = fetchurl { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "sha256-aJqNi2jZJgQmq0IObbAXZcmK2vvWePvHEUtw8O2nBwo="; + sha256 = "sha256-dtreitvrgX/8eL9ZLIIASHq1ZQI0z1OVOanLxdNGvu8="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/gamerbackup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/gamerbackup/default.nix index f236a80547..5512ce2b7b 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/gamerbackup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/gamerbackup/default.nix @@ -1,24 +1,30 @@ -{ lib, buildGoModule, fetchFromGitHub, lepton }: +{ lib, makeWrapper, buildGoModule, fetchFromGitHub, lepton }: buildGoModule { pname = "gb-backup"; - version = "unstable-2021-03-06"; + version = "unstable-2021-04-07"; src = fetchFromGitHub { owner = "leijurv"; repo = "gb"; - rev = "5a94e60148628fc7796d15c53d0ed87184322053"; - sha256 = "07skhwnxvm6yngb2665gkh5qbiyp7hb7av8dkckzypmd4k8z93cm"; + rev = "904813bf0bbce048af5795618d58c0b1953f9ff8"; + sha256 = "111jrcv4x38sc19xha5q3pd2297s13qh1maa7sa1k09hgypvgsxf"; }; vendorSha256 = "0m2aa6p04b4fs7zncar1mlykc94pp527phv71cdsbx58jgsm1jnx"; - buildInputs = [ lepton ]; + nativeBuildInputs = [ makeWrapper ]; + + checkInputs = [ lepton ]; + + postFixup = '' + wrapProgram $out/bin/gb --prefix PATH : ${lib.makeBinPath [ lepton ]} + ''; meta = with lib; { description = "Gamer Backup, a super opinionated cloud backup system"; license = licenses.agpl3Only; maintainers = with maintainers; [ babbaj ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix b/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix index 01722fa907..ff27054164 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pkg-config , openssl +, libiconv , Security }: @@ -21,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; checkFlagsArray = [ "--skip=tests::cli" ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/rdedup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/rdedup/default.nix index 3d908dd24a..a0727286c4 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/rdedup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/rdedup/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { ++ (lib.optional stdenv.isDarwin Security); configurePhase = '' - export LIBCLANG_PATH="${llvmPackages.libclang}/lib" + export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix b/third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix index 70394afb50..f67b546707 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix @@ -2,19 +2,19 @@ python3Packages.buildPythonApplication rec { pname = "s3ql"; - version = "3.3.2"; + version = "3.7.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "release-${version}"; - sha256 = "1x0xj8clfs8fdczn8skc2wag5i4z47bsvlczn22iaf20hll1bb2w"; + sha256 = "11f8k5vzfq69slzv17vddj135mzlcpmcj3cj3bigq717qb8vd6wl"; }; - checkInputs = [ which ] ++ (with python3Packages; [ cython pytest ]); + checkInputs = [ which ] ++ (with python3Packages; [ cython pytest pytest-trio ]); propagatedBuildInputs = with python3Packages; [ - sqlite apsw pycrypto requests defusedxml dugong llfuse - cython pytest pytest-catchlog google-auth google-auth-oauthlib + sqlite apsw pycrypto requests defusedxml dugong + google-auth google-auth-oauthlib trio pyfuse3 ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix index 71ce9060b2..b932b8e66c 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , bluez-tools , cinnamon -, gnome3 +, gnome , gobject-introspection , intltool , pavucontrol @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez-tools cinnamon.xapps - gnome3.gnome-bluetooth + gnome.gnome-bluetooth python3Packages.python util-linux ]; diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix index b30a876370..7b3aa397fc 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 , obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute2 -, gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook +, gnome, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }: let @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ bluez gtk3 pythonPackages.python librsvg - gnome3.adwaita-icon-theme iproute2 libappindicator networkmanager ] + gnome.adwaita-icon-theme iproute2 libappindicator networkmanager ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix index 8ab82b6722..a28499f773 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, attr, libuuid, libscrypt, libsodium, keyutils -, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages +, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages, nixosTests , fuseSupport ? false, fuse3 ? null }: assert fuseSupport -> fuse3 != null; @@ -39,6 +39,10 @@ stdenv.mkDerivation { installFlags = [ "PREFIX=${placeholder "out"}" ]; + passthru.tests = { + smoke-test = nixosTests.bcachefs; + }; + meta = with lib; { description = "Tool for managing bcachefs filesystems"; homepage = "https://bcachefs.org/"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bees/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bees/default.nix index bbad83f017..7ba27208fe 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bees/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bees/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, util-linux }: +{ lib, stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils +, python3Packages, util-linux, nixosTests }: let @@ -55,7 +56,7 @@ let in -runCommand "bees-service" { +(runCommand "bees-service" { inherit bash bees coreutils; utillinux = util-linux; # needs to be a valid shell variable name btrfsProgs = btrfs-progs; # needs to be a valid shell variable name @@ -64,4 +65,8 @@ runCommand "bees-service" { substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper chmod +x "$out"/bin/bees-service-wrapper ln -s ${bees}/bin/beesd "$out"/bin/beesd -'' +'').overrideAttrs (old: { + passthru.tests = { + smoke-test = nixosTests.bees; + }; +}) diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix index 651e93f421..a620a07d47 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix @@ -1,19 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, curl, gnutls, libgcrypt, libuuid, fuse }: - -stdenv.mkDerivation rec { - pname = "blobfuse"; - version = "1.0.2"; +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, curl, gnutls, libgcrypt, libuuid, fuse, boost }: +let + version = "1.3.7"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-fuse"; - rev = "v${version}"; - sha256 = "1qh04z1fsj1l6l12sz9yl2sy9hwlrnzac54hwrr7wvsgv90n9gbp"; + rev = "blobfuse-${version}-Linux"; + sha256 = "sha256-yihIuS4AG489U7eBi/p7H6S7Cg54kkQeNVCexxQZ60A="; }; + cpplite = stdenv.mkDerivation rec { + pname = "cpplite"; + inherit version src; + + sourceRoot = "source/cpplite"; + patches = [ ./install-adls.patch ]; + + cmakeFlags = [ "-DBUILD_ADLS=ON" "-DUSE_OPENSSL=OFF" ]; + + buildInputs = [ curl libuuid gnutls ]; + nativeBuildInputs = [ cmake pkg-config ]; + }; +in stdenv.mkDerivation rec { + pname = "blobfuse"; + inherit version src; NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; - buildInputs = [ curl gnutls libgcrypt libuuid fuse ]; + buildInputs = [ curl gnutls libgcrypt libuuid fuse boost cpplite ]; nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/install-adls.patch b/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/install-adls.patch new file mode 100644 index 0000000000..e48f4d592f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/install-adls.patch @@ -0,0 +1,14 @@ +diff --git a/adls/CMakeLists.txt b/adls/CMakeLists.txt +index 1fb7146..22e663a 100644 +--- a/adls/CMakeLists.txt ++++ b/adls/CMakeLists.txt +@@ -50,3 +50,9 @@ if(BUILD_TESTS) + string(REGEX REPLACE "([^;]+)" "${CMAKE_CURRENT_SOURCE_DIR}/\\1" AZURE_STORAGE_ADLS_TEST_SOURCES "${AZURE_STORAGE_ADLS_TEST_SOURCES}") + set(AZURE_STORAGE_ADLS_TEST_SOURCES ${AZURE_STORAGE_ADLS_TEST_SOURCES} PARENT_SCOPE) + endif() ++ ++install(TARGETS azure-storage-adls ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin) ++ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix index 0e135d41a4..9a05a0d67f 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.11"; + version = "5.11.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-1BlhsKkhYMgPiUrZoYgoIoicLh0ITL8+CLjCFKXPATc="; + sha256 = "sha256-46rMxHVuxOVQLLKp+Ftn1SiWZE9MPA+IprxZjHC96/4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix new file mode 100644 index 0000000000..5d91e8d0dc --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv, fetchpatch, fetchFromGitHub, btrfs-progs, python3 }: + +let + btrfsProgsPatched = btrfs-progs.overrideAttrs (oldAttrs: { + patches = [ + (fetchpatch { + name = "0001-Print-csum-for-a-given-file-on-stdout.patch"; + url = "https://raw.githubusercontent.com/Lakshmipathi/dduper/8fab08e0f1901bf54411d25f1767b48c978074cb/patch/btrfs-progs-v5.9/0001-Print-csum-for-a-given-file-on-stdout.patch"; + sha256 = "1li9lslrap70ibad8sij3bgpxn5lqs0j10l60bmy3c36y866q3g1"; + }) + ]; + }); + py3 = python3.withPackages (ps: with ps; [ + prettytable + numpy + ]); +in +stdenv.mkDerivation rec { + pname = "dduper"; + version = "0.04"; + + src = fetchFromGitHub { + owner = "lakshmipathi"; + repo = "dduper"; + rev = "v${version}"; + sha256 = "09ncdawxkffldadqhfblqlkdl05q2qmywxyg6p61fv3dr2f2v5wm"; + }; + + buildInputs = [ + btrfsProgsPatched + py3 + ]; + + patchPhase = '' + substituteInPlace ./dduper --replace "/usr/sbin/btrfs.static" "${btrfsProgsPatched}/bin/btrfs" + ''; + + installPhase = '' + mkdir -p $out/bin + install -m755 ./dduper $out/bin + ''; + + meta = with lib; { + description = "Fast block-level out-of-band BTRFS deduplication tool."; + homepage = "https://github.com/Lakshmipathi/dduper"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ thesola10 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix index b145d1802a..ee7f867607 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "gcsfuse"; - version = "0.34.1"; + version = "0.35.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "16ns04g4cvp6lfhkifgib5rxpbcxy8ghhavi3mv1cvxawpmdrxnq"; + sha256 = "sha256-GJ21Cqd/W/PocmN1p4OeeUdswhH7fSmAMiNTs0X3564="; }; goPackagePath = "github.com/googlecloudplatform/gcsfuse"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix b/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix index 77c05a6166..87bb2b9051 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix @@ -19,7 +19,7 @@ "-DIRODS_LINUX_DISTRIBUTION_NAME=nix" "-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=${builtins.nixVersion}" "-DCPACK_GENERATOR=TGZ" - "-DCMAKE_CXX_FLAGS=-I${libcxx}/include/c++/v1" + "-DCMAKE_CXX_FLAGS=-I${lib.getDev libcxx}/include/c++/v1" ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 265495389b..d0ad7803c7 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -1,18 +1,20 @@ { stdenv, lib, fetchurl, doxygen, graphviz, perl, pkg-config -, lz4, lzo, xz, zlib, zstd +, bzip2, lz4, lzo, xz, zlib, zstd }: stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "1swsw5j8rrjxdxsfyd446f6g8f0k3mwg15baivi953i69c9981qi"; + sha256 = "07c8vpzgwvqr9ycww1769ya40cf077c6igdg1b4akwszz2nw0bxq"; }; nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; - buildInputs = [ zlib xz lz4 lzo zstd ]; + buildInputs = [ bzip2 zlib xz lz4 lzo zstd ]; + + enableParallelBuilding = true; meta = with lib; { homepage = "https://github.com/AgentD/squashfs-tools-ng"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/supertag/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/supertag/default.nix index 3602f8e31f..2e333b5b05 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/supertag/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/supertag/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1mzmp1jcxgn2swp52r9y7k09fk0z67i1qafzkkzlfxxd10vfr70v"; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; nativeBuildInputs = [ clang pkg-config ]; buildInputs = [ dbus fuse sqlite ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix index 4cab99d69f..cc0d9dce52 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "1.1.0-dev-20210430"; + version = "1.1.0-dev-20210517"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-Sb2N3GPS+A55O39/kqua7M18O1F76zz6sNFghSFRBmk="; + sha256 = "sha256-O3U/aDGEhXQltM70DHhnDCgothF8HHZMJ102EjiaINU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/cfdg/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/cfdg/default.nix index 9295bbe28d..44a1e0d1d2 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/cfdg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/cfdg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libpng, bison, flex, ffmpeg_3, icu }: +{ lib, stdenv, fetchFromGitHub, libpng, bison, flex, ffmpeg, icu }: stdenv.mkDerivation rec { pname = "cfdg"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "13m8npccacmgxbs4il45zw53dskjh53ngv2nxahwqw8shjrws4mh"; }; - buildInputs = [ libpng bison flex ffmpeg_3 icu ]; + buildInputs = [ libpng bison flex ffmpeg icu ]; postPatch = '' sed -e "/YY_NO_UNISTD/a#include " -i src-common/cfdg.l diff --git a/third_party/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.nix index 4ab54593ed..f4cc746a24 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.nix @@ -5,6 +5,7 @@ , pkg-config , libdmtx , imagemagick +, Foundation }: stdenv.mkDerivation rec { @@ -20,7 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libdmtx imagemagick ]; + buildInputs = [ libdmtx imagemagick ] + ++ lib.optional stdenv.isDarwin Foundation; meta = { description = "Data matrix command-line utilities"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/fbv/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/fbv/default.nix index 6f6e0aeca2..5b46d5d226 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/fbv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/fbv/default.nix @@ -1,14 +1,25 @@ -{ lib, stdenv, fetchurl, getopt, libjpeg, libpng12, libungif }: +{ lib, stdenv, fetchurl, fetchpatch, getopt, libjpeg, libpng12, giflib }: stdenv.mkDerivation rec { - name = "fbv-1.0b"; + pname = "fbv"; + version = "1.0b"; src = fetchurl { - url = "http://s-tech.elsat.net.pl/fbv/${name}.tar.gz"; + url = "http://s-tech.elsat.net.pl/fbv/fbv-${version}.tar.gz"; sha256 = "0g5b550vk11l639y8p5sx1v1i6ihgqk0x1hd0ri1bc2yzpdbjmcv"; }; - buildInputs = [ getopt libjpeg libpng12 libungif ]; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/void-linux/void-packages/4a5bfe522ea5afd8203e804dc6a642d0871cd6dd/srcpkgs/fbv/patches/giflib-5.1.patch"; + sha256 = "00q1zcn92yvvyij68bnq0m1sr3a411w914f4nyp6mpz0j5xc6dc7"; + }) + ]; + + patchFlags = [ "-p0" ]; + + buildInputs = [ getopt libjpeg libpng12 giflib ]; + makeFlags = [ "LDFLAGS=-lgif" ]; enableParallelBuilding = true; @@ -19,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "View pictures on a linux framebuffer device"; homepage = "http://s-tech.elsat.net.pl/fbv/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/flam3/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/flam3/default.nix index 2015de607d..bd959e3227 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/flam3/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/flam3/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cosmic recursive fractal flames"; homepage = "https://flam3.com/"; - maintainers = [ maintainers.nand0p ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/glee/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/glee/default.nix index 136e805e79..aeec2ffb49 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/glee/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/glee/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GL Easy Extension Library"; homepage = "https://sourceforge.net/p/glee/glee/"; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix index b50716188e..37b398ef1c 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.9.6"; + version = "2.9.7"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "sha256-0i/oUVrxbc0FDQmgvHEn7Cn0eVznMqDGw+r4OTVrwRo="; + sha256 = "sha256-lCU3SH6nIhQSMFeds81DMTaEKcDjPLOP7hsXqulVfxY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/mangohud/combined.nix b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/combined.nix deleted file mode 100644 index 4947cd66e3..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/mangohud/combined.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv, pkgs, lib -, libXNVCtrl -}: -let - mangohud_64 = pkgs.callPackage ./default.nix { inherit libXNVCtrl; }; - mangohud_32 = pkgs.pkgsi686Linux.callPackage ./default.nix { inherit libXNVCtrl; }; -in -pkgs.buildEnv rec { - name = "mangohud-${mangohud_64.version}"; - - paths = [ mangohud_32 ] ++ lib.optionals stdenv.is64bit [ mangohud_64 ]; - - meta = mangohud_64.meta; -} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix index 26260af50f..0d3b8ed6f8 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix @@ -1,72 +1,118 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub , fetchpatch +, substituteAll +, coreutils +, curl +, gawk +, glxinfo +, gnugrep +, gnused +, pciutils +, xdg-utils +, dbus +, hwdata +, libX11 +, mangohud32 +, vulkan-headers +, glslang +, makeWrapper , meson , ninja , pkg-config , python3Packages -, dbus -, glslang -, libglvnd -, libXNVCtrl -, mesa -, vulkan-headers , vulkan-loader -, xorg +, libXNVCtrl }: - stdenv.mkDerivation rec { - pname = "mangohud${lib.optionalString stdenv.is32bit "_32"}"; - version = "0.4.1"; + pname = "mangohud"; + version = "0.6.1"; src = fetchFromGitHub { owner = "flightlessmango"; repo = "MangoHud"; rev = "v${version}"; - sha256 = "04v2ps8n15ph2smjgnssax5hq88bszw2kbcff37cnd5c8yysvfi6"; + sha256 = "1bzfp37qrx9kk5zaq7sfisgkyccwnxd7i3b1l0blfcy2lrxgx0n6"; fetchSubmodules = true; }; patches = [ + # Adds option to specify Vulkan's datadir when it's not the same as MangoHud's + # See https://github.com/flightlessmango/MangoHud/pull/522 (fetchpatch { - # FIXME obsolete in >=0.5.0 - url = "https://patch-diff.githubusercontent.com/raw/flightlessmango/MangoHud/pull/208.patch"; - sha256 = "1i6x6sr4az1zv0p6vpw99n947c7awgbbv087fghjlczhry676nmh"; + url = "https://github.com/flightlessmango/MangoHud/commit/56682985d8cec711af7ad0841888a44099249b1b.patch"; + sha256 = "0l5vb374lfgfh54jiy4097bzsccpv4zsl1fdhn55sxggklymcad8"; + }) + + # Hard code dependencies. Can't use makeWrapper since the Vulkan + # layer can be used without the mangohud executable by setting MANGOHUD=1. + (substituteAll { + src = ./hardcode-dependencies.patch; + + path = lib.makeBinPath [ + coreutils + curl + gawk + glxinfo + gnugrep + gnused + pciutils + xdg-utils + ]; + + libdbus = dbus.lib; + inherit hwdata libX11; + }) + ] ++ lib.optional (stdenv.hostPlatform.system == "x86_64-linux") [ + # Support 32bit OpenGL applications by appending the mangohud32 + # lib path to LD_LIBRARY_PATH. + # + # This workaround is necessary since on Nix's build of ld.so, $LIB + # always expands to lib even when running an 32bit application. + # + # See https://github.com/NixOS/nixpkgs/issues/101597. + (substituteAll { + src = ./opengl32-nix-workaround.patch; + inherit mangohud32; }) ]; mesonFlags = [ - "-Dappend_libdir_mangohud=false" "-Duse_system_vulkan=enabled" - "--libdir=lib${lib.optionalString stdenv.is32bit "32"}" - ]; - - buildInputs = [ - dbus - glslang - libglvnd - libXNVCtrl - mesa - python3Packages.Mako - vulkan-headers - vulkan-loader - xorg.libX11 + "-Dvulkan_datadir=${vulkan-headers}/share" ]; nativeBuildInputs = [ + glslang + makeWrapper meson ninja pkg-config python3Packages.Mako python3Packages.python + vulkan-loader ]; - preConfigure = '' - mkdir -p "$out/share/vulkan/" - ln -sf "${vulkan-headers}/share/vulkan/registry/" $out/share/vulkan/ - ln -sf "${vulkan-headers}/include" $out + buildInputs = [ + dbus + libX11 + libXNVCtrl + ]; + + # Support 32bit Vulkan applications by linking in 32bit Vulkan layer + # This is needed for the same reason the 32bit OpenGL workaround is needed. + postInstall = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' + ln -s ${mangohud32}/share/vulkan/implicit_layer.d/MangoHud.json \ + "$out/share/vulkan/implicit_layer.d/MangoHud.x86.json" + ''; + + # Support overlaying Vulkan applications without requiring mangohud to be installed + postFixup = '' + wrapProgram "$out/bin/mangohud" \ + --prefix VK_LAYER_PATH : "$out/share/vulkan/implicit_layer.d" \ + --prefix VK_INSTANCE_LAYERS : VK_LAYER_MANGOHUD_overlay ''; meta = with lib; { @@ -74,6 +120,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/flightlessmango/MangoHud"; platforms = platforms.linux; license = licenses.mit; - maintainers = with maintainers; [ zeratax ]; + maintainers = with maintainers; [ metadark zeratax ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch new file mode 100644 index 0000000000..bdebcdca98 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch @@ -0,0 +1,57 @@ +diff --git a/src/dbus.cpp b/src/dbus.cpp +index 0acccc3..7dd7c49 100644 +--- a/src/dbus.cpp ++++ b/src/dbus.cpp +@@ -157,7 +157,7 @@ bool dbus_manager::init(const std::string& requested_player) { + m_requested_player = "org.mpris.MediaPlayer2." + requested_player; + } + +- if (!m_dbus_ldr.IsLoaded() && !m_dbus_ldr.Load("libdbus-1.so.3")) { ++ if (!m_dbus_ldr.IsLoaded() && !m_dbus_ldr.Load("@libdbus@/lib/libdbus-1.so.3")) { + std::cerr << "MANGOHUD: Could not load libdbus-1.so.3\n"; + return false; + } +diff --git a/src/loaders/loader_x11.cpp b/src/loaders/loader_x11.cpp +index 25c65bf..87488d5 100644 +--- a/src/loaders/loader_x11.cpp ++++ b/src/loaders/loader_x11.cpp +@@ -88,4 +88,4 @@ void libx11_loader::CleanUp(bool unload) { + + } + +-std::shared_ptr g_x11(new libx11_loader("libX11.so.6")); ++std::shared_ptr g_x11(new libx11_loader("@libX11@/lib/libX11.so.6")); +diff --git a/src/logging.cpp b/src/logging.cpp +index f2c4271..d33e793 100644 +--- a/src/logging.cpp ++++ b/src/logging.cpp +@@ -17,7 +17,10 @@ string exec(string command) { + string result = ""; + + // Open pipe to file ++ char* originalPath = getenv("PATH"); ++ setenv("PATH", "@path@", 1); + FILE* pipe = popen(command.c_str(), "r"); ++ setenv("PATH", originalPath, 1); + if (!pipe) { + return "popen failed!"; + } +diff --git a/src/pci_ids.cpp b/src/pci_ids.cpp +index 4e2a6d2..9490869 100644 +--- a/src/pci_ids.cpp ++++ b/src/pci_ids.cpp +@@ -22,12 +22,9 @@ std::istream& get_uncommented_line(std::istream& is, std::string &line) + + void parse_pciids() + { +- std::ifstream file("/usr/share/hwdata/pci.ids"); ++ std::ifstream file("@hwdata@/share/hwdata/pci.ids"); + if(file.fail()){ +- std::ifstream file("/usr/share/misc/pci.ids"); +- if (file.fail()) +- printf("MANGOHUD: can't find file pci.ids\n"); +- ++ printf("MANGOHUD: can't find file pci.ids\n"); + } + + std::string line; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch new file mode 100644 index 0000000000..3c0f690861 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch @@ -0,0 +1,12 @@ +diff --git a/bin/mangohud.in b/bin/mangohud.in +index eadce2d..e7b1aa4 100755 +--- a/bin/mangohud.in ++++ b/bin/mangohud.in +@@ -23,6 +23,6 @@ fi + # figure out whether the 32 or 64 bit version should be used, and will search + # for it in the correct directory + LD_PRELOAD="${LD_PRELOAD}:${MANGOHUD_LIB_NAME}" +-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@ld_libdir_mangohud@" ++LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@ld_libdir_mangohud@:@mangohud32@/lib/mangohud" + + exec env MANGOHUD=1 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" LD_PRELOAD="${LD_PRELOAD}" "$@" diff --git a/third_party/nixpkgs/pkgs/tools/graphics/perceptualdiff/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/perceptualdiff/default.nix index 2227ff4029..454352986e 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/perceptualdiff/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/perceptualdiff/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A program that compares two images using a perceptually based image metric"; homepage = "https://github.com/myint/perceptualdiff"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ uri-canva ]; platforms = platforms.x86; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix index 9b06d06291..432c70231d 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace open "test -f" ''; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + installPhase = '' install -Dm755 pikchr $out/bin/pikchr install -Dm755 pikchr.out $out/lib/pikchr.o diff --git a/third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix new file mode 100644 index 0000000000..02a9618481 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix @@ -0,0 +1,91 @@ +{ lib +, stdenv +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, icoutils +, mono +, jre +, androidenv +, gtk-sharp-2_0 +, gtk2 +, libcxx +, libcxxabi +, coreutils +, requireFile +, archive ? requireFile { + name = "snapdragonprofiler_external_linux.tar.gz"; + message = '' + This nix expression requires that "snapdragonprofiler_external_linux.tar.gz" is + already part of the store. To get this archive, you need to download it from: + https://developer.qualcomm.com/software/snapdragon-profiler + and add it to the nix store with nix-store --add-fixed sha256 . + ''; + sha256 = "c6731c417ca39fa9b0f190bd80c99b1603cf97d23becab9e47db6beafd6206b7"; + } +}: + +stdenv.mkDerivation rec { + pname = "snapdragon-profiler"; + version = "v2021.2"; + + src = archive; + + nativeBuildInputs = [ + makeWrapper + icoutils + copyDesktopItems + ]; + + buildInputs = [ + mono + gtk-sharp-2_0 + gtk2 + libcxx + libcxxabi + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,lib/snapdragon-profiler} + mkdir -p $out/share/icons/hicolor/{16x16,32x32,48x48}/apps + + mv *.so $out/lib + cp -r * $out/lib/snapdragon-profiler + makeWrapper "${mono}/bin/mono" $out/bin/snapdragon-profiler \ + --add-flags "$out/lib/snapdragon-profiler/SnapdragonProfiler.exe" \ + --suffix PATH : ${lib.makeBinPath [ jre androidenv.androidPkgs_9_0.platform-tools coreutils ]} \ + --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ + --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //') \ + --run "cd $out/lib/snapdragon-profiler" # Fixes themes not loading correctly + + wrestool -x -t 14 SnapdragonProfiler.exe > snapdragon-profiler.ico + icotool -x -i 1 -o $out/share/icons/hicolor/16x16/apps/snapdragon-profiler.png snapdragon-profiler.ico + icotool -x -i 2 -o $out/share/icons/hicolor/32x32/apps/snapdragon-profiler.png snapdragon-profiler.ico + icotool -x -i 3 -o $out/share/icons/hicolor/48x48/apps/snapdragon-profiler.png snapdragon-profiler.ico + + runHook postInstall + ''; + + desktopItems = [(makeDesktopItem { + name = pname; + desktopName = "Snapdragon Profiler"; + exec = "$out/bin/snapdragon-profiler"; + icon = "snapdragon-profiler"; + type = "Application"; + comment = meta.description; + categories = "Development;Debugger;Graphics;3DGraphics"; + terminal = "false"; + })]; + + dontStrip = true; # Always needed on Mono + dontPatchELF = true; # Certain libraries are to be deployed to the remote device, they should not be patched + + meta = with lib; { + homepage = "https://developer.qualcomm.com/software/snapdragon-profiler"; + description = "An profiler for Android devices running Snapdragon chips"; + license = licenses.unfree; + maintainers = [ maintainers.ivar ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/timg/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/timg/default.nix index 5acbaa7ffd..7c2d004144 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/timg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/timg/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "timg"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "hzeller"; repo = "timg"; rev = "v${version}"; - sha256 = "10qhjfkbazncmj07y0a6cpmi7ki0l10qzpvi2zh8369yycqqxr8y"; + sha256 = "1zjcaxnik8imkn22g5kz6zly3yxpknrzd093sfxpgqnfw4sq8149"; }; buildInputs = [ graphicsmagick ffmpeg libexif libjpeg zlib ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/twilight/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/twilight/default.nix index 2716c5e7c6..7c43063fb8 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/twilight/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/twilight/default.nix @@ -25,6 +25,6 @@ in stdenv.mkDerivation rec { homepage = src.meta.homepage; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix index 9319fa9b61..18025f92e3 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -15,6 +15,7 @@ , libheif , librsvg , ApplicationServices +, Foundation , python27 , libpng , fetchFromGitHub @@ -68,7 +69,7 @@ stdenv.mkDerivation rec { python27 libpng expat - ] ++ lib.optional stdenv.isDarwin ApplicationServices; + ] ++ lib.optionals stdenv.isDarwin [ApplicationServices Foundation]; # Required by .pc file propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix index 3fe5a59175..74553dcebb 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fcitx-anthy"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-anthy/${pname}-${version}.tar.xz"; - sha256 = "01jx7wwq0mifqrzkswfglqhwkszbfcl4jinxgdgqx9kc6mb4k6zd"; + sha256 = "sha256-Hxhs2RXuFf/bhczcQ3+Zj+gI3+Z4BEfIzMIfUOUNX7M="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index 6e0c48d061..3d34dcbac1 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome3 }: +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome }: stdenv.mkDerivation rec { name = "fcitx-configtool-0.4.10"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; - buildInputs = [ fcitx isocodes gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ fcitx isocodes gtk3 gnome.adwaita-icon-theme ]; # Patch paths to `fcitx-remote` prePatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix index 9e367d7079..9a90ab3ca7 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-m17n"; - version = "5.0.4"; + version = "5.0.5"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-yI6Svr1KEdHqAX3qd7t7GvD0EcWg0A2vZpuJw1U9oKQ="; + sha256 = "sha256-duL9FgXPCr4/rMuguw8cf3EIdK6MW/alUNeh1yduY68="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index b24dac6886..40465d55e4 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "fcitx5-qt"; - version = "5.0.4"; + version = "5.0.6"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-qt"; rev = version; - sha256 = "sha256-PZbnxt30Tv7i+Q6G9UpGgWDs65rn0MZVe1ybhz4vN9I="; + sha256 = "sha256-Y7X4pkBSf5FMpf1mdyLvr1QWhqz3yC4iOGXDvvvV9Yw="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 8fbd925448..acb2d41e04 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-kPTysHTC+j8BMnzsddRa4Tg54idejApTqmLrP20pu5M="; + sha256 = "sha256-atsfaoA0V9PPwhPTpHI7b7A5JsDiYHfA+0NlNOKYIPg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/kime/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/kime/default.nix index 33df3f53e6..8566143f68 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/kime/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/kime/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { ]; RUST_BACKTRACE = 1; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; meta = with lib; { homepage = "https://github.com/Riey/kime"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/apparix/default.nix b/third_party/nixpkgs/pkgs/tools/misc/apparix/default.nix index d446a2cf0a..8e682aefcc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/apparix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/apparix/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://micans.org/apparix"; description = "Add directory bookmarks, distant listing, and distant editing to the command line"; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/atuin/default.nix b/third_party/nixpkgs/pkgs/tools/misc/atuin/default.nix new file mode 100644 index 0000000000..3157fc51b5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/atuin/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, libiconv +, Security +, SystemConfiguration +}: + +rustPlatform.buildRustPackage rec { + pname = "atuin"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "ellie"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-jjGP8YeHnEr0f9RONwA6wZT872C0jXTvSRdt9zAu6KE="; + }; + + cargoSha256 = "0vy6q3hjp374lyg00zxim8aplh83iq3f4rrmpz5vnpwbag1fdql3"; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ]; + + meta = with lib; { + description = "Replacement for a shell history which records additional commands context with optional encrypted synchronization between machines"; + homepage = "https://github.com/ellie/atuin"; + license = licenses.mit; + maintainers = [ maintainers.onsails ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix index 4fb09f4d8d..cb483567f2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, bash, makeWrapper, bat # batdiff, batgrep, and batwatch , coreutils +, getconf , less # batgrep , ripgrep @@ -48,6 +49,7 @@ let # Run the library tests as they don't have external dependencies doCheck = true; + checkInputs = lib.optionals stdenv.isDarwin [ getconf ]; checkPhase = '' runHook preCheck # test list repeats suites. Unique them @@ -104,6 +106,7 @@ let dontBuild = true; # we've already built doCheck = true; + checkInputs = lib.optionals stdenv.isDarwin [ getconf ]; checkPhase = '' runHook preCheck bash ./test.sh --compiled --suite ${name} diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix index d72b0fdef1..8bc82547ee 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "113i11sgna82i4c4zk66qmbypmnmzh0lzp4kkgqnxxcdvyj00rb8"; + sha256 = "sha256-kyl+clL/4uxVaDH/9zPDGQTir4/JVgtHo9kNQ31gXTo="; }; - cargoSha256 = "12z7y303fmga91daf2w356qiqdqa7b8dz6nrrpnjdf0slyz0w3x4"; + cargoSha256 = "sha256-j9HbOXiwN4CWv9wMBrNxY3jehh+KRkXlwmDqChNy1Dk="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bibutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bibutils/default.nix index cf42e56b57..03b35811bc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bibutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bibutils/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, static ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "bibutils"; @@ -9,11 +13,23 @@ stdenv.mkDerivation rec { sha256 = "15p4av74ihsg03j854dkdqihpspwnp58p9g1lhx48w8kz91c0ml6"; }; - configureFlags = [ "--dynamic" "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ]; + preConfigure = lib.optionalString stdenv.isDarwin '' + substituteInPlace lib/Makefile.dynamic \ + --replace '-Wl,-soname,$(SONAME)' "" + ''; + + configureFlags = [ + (if static then "--static" else "--dynamic") + "--install-dir" "$(out)/bin" + "--install-lib" "$(out)/lib" + ]; dontAddPrefix = true; doCheck = true; checkTarget = "test"; + preCheck = lib.optionalString stdenv.isDarwin '' + export DYLD_LIBRARY_PATH=`pwd`/lib + ''; meta = with lib; { description = "Bibliography format interconversion"; @@ -21,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/p/bibutils/home/Bibutils/"; license = licenses.gpl2; maintainers = [ maintainers.garrison ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix b/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix index 609899bbe3..1b1fefc0a7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix @@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "birdfont"; - version = "2.29.1"; + version = "2.29.4"; src = fetchurl { url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0620bppcbm9pb8l0d4sc56gfwkr97gw4zjirjz5ikk5lj0m801yi"; + sha256 = "sha256-caNY6PrsqBrYwC61MxNsf8B9E8it1Ls1d+hdbf8u+o8="; }; nativeBuildInputs = [ python3 pkg-config vala_0_44 gobject-introspection wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/cargo-lock.patch b/third_party/nixpkgs/pkgs/tools/misc/bottom-rs/cargo-lock.patch similarity index 53% rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/cargo-lock.patch rename to third_party/nixpkgs/pkgs/tools/misc/bottom-rs/cargo-lock.patch index 96f7d9ffb6..9b736f763c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/cargo-lock.patch +++ b/third_party/nixpkgs/pkgs/tools/misc/bottom-rs/cargo-lock.patch @@ -1,33 +1,12 @@ ---- a/Cargo.lock +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..edc9428 +--- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,777 @@ +@@ -0,0 +1,785 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] -+name = "addr2line" -+version = "0.12.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a49806b9dadc843c61e7c97e72490ad7f7220ae249012fbda9ad0609457c0543" -+dependencies = [ -+ "gimli", -+] -+ -+[[package]] -+name = "adler32" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" -+ -+[[package]] -+name = "aho-corasick" -+version = "0.7.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -37,6 +16,12 @@ +] + +[[package]] ++name = "anyhow" ++version = "1.0.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" ++ ++[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -49,32 +34,9 @@ + +[[package]] +name = "autocfg" -+version = "1.0.0" ++version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" -+ -+[[package]] -+name = "backtrace" -+version = "0.3.49" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c" -+dependencies = [ -+ "addr2line", -+ "cfg-if", -+ "libc", -+ "miniz_oxide", -+ "object", -+ "rustc-demangle", -+] -+ -+[[package]] -+name = "base64" -+version = "0.10.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -+dependencies = [ -+ "byteorder", -+] ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "bitflags" @@ -83,75 +45,67 @@ +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] -+name = "block-buffer" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" ++name = "bottom-bench" ++version = "0.1.0" +dependencies = [ -+ "block-padding", -+ "byte-tools", -+ "byteorder", -+ "generic-array", ++ "bottomify", ++ "criterion", +] + +[[package]] -+name = "block-padding" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" ++name = "bottomify" ++version = "1.2.0" +dependencies = [ -+ "byte-tools", ++ "anyhow", ++ "clap", ++ "phf", ++ "phf_codegen", +] + +[[package]] +name = "bstr" -+version = "0.2.13" ++version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931" ++checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" +dependencies = [ ++ "lazy_static", + "memchr", ++ "regex-automata", ++ "serde", +] + +[[package]] -+name = "byte-tools" -+version = "0.3.1" ++name = "bumpalo" ++version = "3.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" ++checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" + +[[package]] +name = "byteorder" -+version = "1.3.4" ++version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" ++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] -+name = "cargo-insta" -+version = "0.16.0" ++name = "cast" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cc38c385bfd7e444464011bb24820f40dd1c76bcdfa1b78611cb7c2e5cafab75" +dependencies = [ -+ "clap", -+ "console", -+ "difference", -+ "glob", -+ "insta", -+ "proc-macro2", -+ "serde", -+ "serde_json", -+ "structopt", -+ "syn", -+ "walkdir", ++ "rustc_version", +] + +[[package]] +name = "cfg-if" -+version = "0.1.10" ++version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" -+version = "2.33.1" ++version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" ++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +dependencies = [ + "ansi_term", + "atty", @@ -163,39 +117,80 @@ +] + +[[package]] -+name = "clicolors-control" -+version = "1.0.1" ++name = "criterion" ++version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" ++checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" +dependencies = [ + "atty", ++ "cast", ++ "clap", ++ "criterion-plot", ++ "csv", ++ "itertools 0.10.0", + "lazy_static", -+ "libc", -+ "winapi", ++ "num-traits", ++ "oorandom", ++ "plotters", ++ "rayon", ++ "regex", ++ "serde", ++ "serde_cbor", ++ "serde_derive", ++ "serde_json", ++ "tinytemplate", ++ "walkdir", +] + +[[package]] -+name = "console" -+version = "0.10.3" ++name = "criterion-plot" ++version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2586208b33573b7f76ccfbe5adb076394c88deaf81b84d7213969805b0a952a7" ++checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" +dependencies = [ -+ "clicolors-control", -+ "encode_unicode", ++ "cast", ++ "itertools 0.9.0", ++] ++ ++[[package]] ++name = "crossbeam-channel" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" ++dependencies = [ ++ "cfg-if", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" ++dependencies = [ ++ "cfg-if", ++ "crossbeam-epoch", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" ++dependencies = [ ++ "cfg-if", ++ "crossbeam-utils", + "lazy_static", -+ "libc", -+ "regex", -+ "terminal_size", -+ "termios", -+ "unicode-width", -+ "winapi", ++ "memoffset", ++ "scopeguard", +] + +[[package]] +name = "crossbeam-utils" -+version = "0.7.2" ++version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" ++checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" +dependencies = [ + "autocfg", + "cfg-if", @@ -203,147 +198,91 @@ +] + +[[package]] -+name = "difference" -+version = "2.0.0" ++name = "csv" ++version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" -+ -+[[package]] -+name = "digest" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" ++checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +dependencies = [ -+ "generic-array", -+] -+ -+[[package]] -+name = "dtoa" -+version = "0.4.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" -+ -+[[package]] -+name = "encode_unicode" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" -+ -+[[package]] -+name = "fake-simd" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" -+ -+[[package]] -+name = "fnv" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -+ -+[[package]] -+name = "generic-array" -+version = "0.12.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" -+dependencies = [ -+ "typenum", -+] -+ -+[[package]] -+name = "gimli" -+version = "0.21.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" -+ -+[[package]] -+name = "glob" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -+ -+[[package]] -+name = "globset" -+version = "0.4.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ad1da430bd7281dde2576f44c84cc3f0f7b475e7202cd503042dff01a8c8120" -+dependencies = [ -+ "aho-corasick", + "bstr", -+ "fnv", -+ "log", -+ "regex", ++ "csv-core", ++ "itoa", ++ "ryu", ++ "serde", +] + +[[package]] -+name = "globwalk" -+version = "0.8.0" ++name = "csv-core" ++version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "178270263374052c40502e9f607134947de75302c1348d1a0e31db67c1691446" ++checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +dependencies = [ -+ "bitflags", -+ "ignore", -+ "walkdir", ++ "memchr", +] + +[[package]] -+name = "heck" -+version = "0.3.1" ++name = "either" ++version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" ++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++ ++[[package]] ++name = "getrandom" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ -+ "unicode-segmentation", ++ "cfg-if", ++ "libc", ++ "wasi", +] + +[[package]] ++name = "half" ++version = "1.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3" ++ ++[[package]] +name = "hermit-abi" -+version = "0.1.14" ++version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" ++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +dependencies = [ + "libc", +] + +[[package]] -+name = "ignore" -+version = "0.4.16" ++name = "itertools" ++version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "22dcbf2a4a289528dbef21686354904e1c694ac642610a9bff9e7df730d9ec72" ++checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +dependencies = [ -+ "crossbeam-utils", -+ "globset", -+ "lazy_static", -+ "log", -+ "memchr", -+ "regex", -+ "same-file", -+ "thread_local", -+ "walkdir", -+ "winapi-util", ++ "either", +] + +[[package]] -+name = "insta" -+version = "0.16.0" ++name = "itertools" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319" +dependencies = [ -+ "backtrace", -+ "console", -+ "difference", -+ "globwalk", -+ "lazy_static", -+ "pest", -+ "pest_derive", -+ "ron", -+ "serde", -+ "serde_json", -+ "serde_yaml", ++ "either", +] + +[[package]] +name = "itoa" -+version = "0.4.6" ++version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" ++checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" ++ ++[[package]] ++name = "js-sys" ++version = "0.3.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" ++dependencies = [ ++ "wasm-bindgen", ++] + +[[package]] +name = "lazy_static" @@ -353,181 +292,259 @@ + +[[package]] +name = "libc" -+version = "0.2.71" ++version = "0.2.94" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" -+ -+[[package]] -+name = "linked-hash-map" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" ++checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" + +[[package]] +name = "log" -+version = "0.4.8" ++version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if", +] + +[[package]] -+name = "maplit" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" -+ -+[[package]] +name = "memchr" -+version = "2.3.3" ++version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" ++checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" + +[[package]] -+name = "miniz_oxide" -+version = "0.3.7" ++name = "memoffset" ++version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" ++checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d" +dependencies = [ -+ "adler32", ++ "autocfg", +] + +[[package]] -+name = "object" -+version = "0.20.0" ++name = "num-traits" ++version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" -+ -+[[package]] -+name = "opaque-debug" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" -+ -+[[package]] -+name = "pest" -+version = "2.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" ++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ -+ "ucd-trie", ++ "autocfg", +] + +[[package]] -+name = "pest_derive" -+version = "2.1.0" ++name = "num_cpus" ++version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ -+ "pest", -+ "pest_generator", ++ "hermit-abi", ++ "libc", +] + +[[package]] -+name = "pest_generator" -+version = "2.1.3" ++name = "oorandom" ++version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" ++checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" ++ ++[[package]] ++name = "phf" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ -+ "pest", -+ "pest_meta", -+ "proc-macro2", -+ "quote", -+ "syn", ++ "phf_shared", +] + +[[package]] -+name = "pest_meta" -+version = "2.1.3" ++name = "phf_codegen" ++version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" ++checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ -+ "maplit", -+ "pest", -+ "sha-1", ++ "phf_generator", ++ "phf_shared", +] + +[[package]] -+name = "proc-macro-error" -+version = "1.0.2" ++name = "phf_generator" ++version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678" ++checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ -+ "proc-macro-error-attr", -+ "proc-macro2", -+ "quote", -+ "syn", -+ "version_check", ++ "phf_shared", ++ "rand", +] + +[[package]] -+name = "proc-macro-error-attr" -+version = "1.0.2" ++name = "phf_shared" ++version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53" ++checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "syn-mid", -+ "version_check", ++ "siphasher", +] + +[[package]] ++name = "plotters" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a" ++dependencies = [ ++ "num-traits", ++ "plotters-backend", ++ "plotters-svg", ++ "wasm-bindgen", ++ "web-sys", ++] ++ ++[[package]] ++name = "plotters-backend" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590" ++ ++[[package]] ++name = "plotters-svg" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211" ++dependencies = [ ++ "plotters-backend", ++] ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++ ++[[package]] +name = "proc-macro2" -+version = "1.0.18" ++version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" ++checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" -+version = "1.0.7" ++version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" ++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ + "proc-macro2", +] + +[[package]] -+name = "regex" -+version = "1.3.9" ++name = "rand" ++version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++dependencies = [ ++ "getrandom", ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", ++ "rand_pcg", ++] ++ ++[[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 = "rand_pcg" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" ++dependencies = [ ++ "rand_core", ++] ++ ++[[package]] ++name = "rayon" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" ++dependencies = [ ++ "autocfg", ++ "crossbeam-deque", ++ "either", ++ "rayon-core", ++] ++ ++[[package]] ++name = "rayon-core" ++version = "1.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" ++dependencies = [ ++ "crossbeam-channel", ++ "crossbeam-deque", ++ "crossbeam-utils", ++ "lazy_static", ++ "num_cpus", ++] ++ ++[[package]] ++name = "regex" ++version = "1.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759" +dependencies = [ -+ "aho-corasick", -+ "memchr", + "regex-syntax", -+ "thread_local", ++] ++ ++[[package]] ++name = "regex-automata" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4" ++dependencies = [ ++ "byteorder", +] + +[[package]] +name = "regex-syntax" -+version = "0.6.18" ++version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" ++checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" + +[[package]] -+name = "ron" -+version = "0.5.1" ++name = "rustc_version" ++version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5" ++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ -+ "base64", -+ "bitflags", -+ "serde", ++ "semver", +] + +[[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" @@ -543,19 +560,47 @@ +] + +[[package]] -+name = "serde" -+version = "1.0.112" ++name = "scopeguard" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "736aac72d1eafe8e5962d1d1c3d99b0df526015ba40915cb3c49d042e92ec243" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ -+ "serde_derive", ++ "semver-parser", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++ ++[[package]] ++name = "serde" ++version = "1.0.125" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" ++ ++[[package]] ++name = "serde_cbor" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622" ++dependencies = [ ++ "half", ++ "serde", +] + +[[package]] +name = "serde_derive" -+version = "1.0.112" ++version = "1.0.125" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bf0343ce212ac0d3d6afd9391ac8e9c9efe06b533c8d33f660f6390cc4093f57" ++checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" +dependencies = [ + "proc-macro2", + "quote", @@ -564,9 +609,9 @@ + +[[package]] +name = "serde_json" -+version = "1.0.55" ++version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec2c5d7e739bc07a3e73381a39d61fdb5f671c60c1df26a130690665803d8226" ++checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +dependencies = [ + "itoa", + "ryu", @@ -574,28 +619,10 @@ +] + +[[package]] -+name = "serde_yaml" -+version = "0.8.13" ++name = "siphasher" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5" -+dependencies = [ -+ "dtoa", -+ "linked-hash-map", -+ "serde", -+ "yaml-rust", -+] -+ -+[[package]] -+name = "sha-1" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" -+dependencies = [ -+ "block-buffer", -+ "digest", -+ "fake-simd", -+ "opaque-debug", -+] ++checksum = "cbce6d4507c7e4a3962091436e56e95290cb71fa302d0d270e32130b75fbff27" + +[[package]] +name = "strsim" @@ -604,34 +631,10 @@ +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] -+name = "structopt" -+version = "0.3.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c" -+dependencies = [ -+ "clap", -+ "lazy_static", -+ "structopt-derive", -+] -+ -+[[package]] -+name = "structopt-derive" -+version = "0.4.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118" -+dependencies = [ -+ "heck", -+ "proc-macro-error", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] +name = "syn" -+version = "1.0.31" ++version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6" ++checksum = "b9505f307c872bab8eb46f77ae357c8eba1fdacead58ee5a850116b1d7f82883" +dependencies = [ + "proc-macro2", + "quote", @@ -639,36 +642,6 @@ +] + +[[package]] -+name = "syn-mid" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "terminal_size" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8038f95fc7a6f351163f4b964af631bd26c9e828f7db085f2a84aca56f70d13b" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "termios" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6f0fcee7b24a25675de40d5bb4de6e41b0df07bc9856295e7e2b3a3600c400c2" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -678,43 +651,26 @@ +] + +[[package]] -+name = "thread_local" -+version = "1.0.1" ++name = "tinytemplate" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" ++checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ -+ "lazy_static", ++ "serde", ++ "serde_json", +] + +[[package]] -+name = "typenum" -+version = "1.12.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" -+ -+[[package]] -+name = "ucd-trie" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" -+ -+[[package]] -+name = "unicode-segmentation" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" -+ -+[[package]] +name = "unicode-width" -+version = "0.1.7" ++version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "unicode-xid" -+version = "0.2.0" ++version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + +[[package]] +name = "vec_map" @@ -723,16 +679,10 @@ +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] -+name = "version_check" -+version = "0.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" -+ -+[[package]] +name = "walkdir" -+version = "2.3.1" ++version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" ++checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", @@ -740,10 +690,80 @@ +] + +[[package]] -+name = "winapi" -+version = "0.3.8" ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" ++dependencies = [ ++ "cfg-if", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" ++dependencies = [ ++ "bumpalo", ++ "lazy_static", ++ "log", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" ++ ++[[package]] ++name = "web-sys" ++version = "0.3.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" ++dependencies = [ ++ "js-sys", ++ "wasm-bindgen", ++] ++ ++[[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", @@ -769,12 +789,3 @@ +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+ -+[[package]] -+name = "yaml-rust" -+version = "0.4.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d" -+dependencies = [ -+ "linked-hash-map", -+] diff --git a/third_party/nixpkgs/pkgs/tools/misc/bottom-rs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bottom-rs/default.nix new file mode 100644 index 0000000000..ab5763c207 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/bottom-rs/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "bottom-rs"; + version = "unstable-2021-04-27"; + + src = fetchFromGitHub { + owner = "bottom-software-foundation"; + repo = pname; + rev = "3451cdadd7c4e64fe8e7f43e986a18628a741dec"; + sha256 = "0kr18q80021s1n9zzzff6w6yvbbjnk6zbbabi5b42b0rfv6fnfn2"; + }; + + cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "0nyzg6pg69bf9vvc3r5lnhmkb9s1508c1gqcra3y43zffdlwml1y"; + + meta = with lib; { + description = "Fantastic (maybe) CLI for translating between bottom and human-readable text"; + homepage = "https://github.com/bottom-software-foundation/bottom-rs"; + license = licenses.mit; + maintainers = with maintainers; [ winterqt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/brltty/default.nix b/third_party/nixpkgs/pkgs/tools/misc/brltty/default.nix index b71740c325..c3bdbca7a5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/brltty/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/brltty/default.nix @@ -1,19 +1,19 @@ { lib, stdenv, fetchurl, pkg-config, python3, bluez -, alsaSupport ? stdenv.isLinux, alsaLib ? null -, systemdSupport ? stdenv.isLinux, systemd ? null }: - -assert alsaSupport -> alsaLib != null; -assert systemdSupport -> systemd != null; +, tcl, acl, kmod, coreutils, shadow, util-linux, udev +, alsaSupport ? stdenv.isLinux, alsaLib +, systemdSupport ? stdenv.isLinux, systemd +}: stdenv.mkDerivation rec { - name = "brltty-6.1"; + pname = "brltty"; + version = "6.3"; src = fetchurl { - url = "http://brltty.com/archive/${name}.tar.gz"; - sha256 = "0nk54chr7z2w579vyiak9xk2avhnvrx7x2l5sk8nyw2zplchkx9q"; + url = "https://brltty.app/archive/${pname}-${version}.tar.gz"; + sha256 = "14psxwlvgyi2fj1zh8rfykyjcjaya8xa7yg574bxd8y8n49n8hvb"; }; - nativeBuildInputs = [ pkg-config python3.pkgs.cython ]; + nativeBuildInputs = [ pkg-config python3.pkgs.cython tcl ]; buildInputs = [ bluez ] ++ lib.optional alsaSupport alsaLib ++ lib.optional systemdSupport systemd; @@ -26,17 +26,70 @@ stdenv.mkDerivation rec { It drives the braille display, and provides complete screen review functionality. Some speech capability has also been incorporated. ''; - homepage = "http://www.brltty.com/"; - license = lib.licenses.gpl2; + homepage = "https://brltty.app"; + license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.bramd ]; platforms = lib.platforms.all; }; - makeFlags = [ "PYTHON_PREFIX=$(out)" ]; - - preConfigurePhases = [ "preConfigure" ]; + makeFlags = [ + "PYTHON_PREFIX=$(out)" + "SYSTEMD_UNITS_DIRECTORY=$(out)/lib/systemd/system" + "SYSTEMD_USERS_DIRECTORY=$(out)/lib/sysusers.d" + "SYSTEMD_FILES_DIRECTORY=$(out)/lib/tmpfiles.d" + "UDEV_LIBRARY_DIRECTORY=$(out)/lib/udev" + "UDEV_RULES_TYPE=all" + "POLKIT_POLICY_DIR=$(out)/share/polkit-1/actions" + "POLKIT_RULE_DIR=$(out)/share/polkit-1/rules.d" + ]; + configureFlags = [ + "--with-writable-directory=/run/brltty" + "--with-updatable-directory=/var/lib/brltty" + "--with-api-socket-path=/var/lib/BrlAPI" + ]; + installFlags = [ "install-systemd" "install-udev" "install-polkit" ]; preConfigure = '' substituteInPlace configure --replace /sbin/ldconfig ldconfig + + # Some script needs a working tclsh shebang + patchShebangs . + + # Skip impure operations + substituteInPlace Programs/Makefile.in \ + --replace install-writable-directory "" \ + --replace install-apisoc-directory "" \ + --replace install-api-key "" + ''; + + postInstall = '' + # Rewrite absolute paths + substituteInPlace $out/bin/brltty-mkuser \ + --replace '/sbin/nologin' '${shadow}/bin/nologin' + ( + cd $out/lib + substituteInPlace systemd/system/brltty@.service \ + --replace '/usr/lib' "$out/lib" \ + --replace '/sbin/modprobe' '${kmod}/bin/modprobe' + # Ensure the systemd-wrapper script uses the correct path to the brltty binary + sed "/^Environment=\"BRLTTY_EXECUTABLE_ARGUMENTS.*/a Environment=\"BRLTTY_EXECUTABLE_PATH=$out/bin/brltty\"" -i systemd/system/brltty@.service + substituteInPlace systemd/system/brltty-device@.service \ + --replace '/usr/bin/true' '${coreutils}/bin/true' + substituteInPlace udev/rules.d/90-brltty-uinput.rules \ + --replace '/usr/bin/setfacl' '${acl}/bin/setfacl' + substituteInPlace tmpfiles.d/brltty.conf \ + --replace "$out/etc" '/etc' + + # Remove unused commands from udev rules + sed '/initctl/d' -i udev/rules.d/90-brltty-device.rules + # Remove pulse-access group from systemd unit and sysusers + substituteInPlace systemd/system/brltty@.service \ + --replace 'SupplementaryGroups=pulse-access' '# SupplementaryGroups=pulse-access' + substituteInPlace sysusers.d/brltty.conf \ + --replace 'm brltty pulse-access' '# m brltty pulse-access' + ) + substituteInPlace $out/libexec/brltty/systemd-wrapper \ + --replace 'logger' "${util-linux}/bin/logger" \ + --replace 'udevadm' "${udev}/bin/udevadm" ''; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix index 0fa7841074..0aeef02f32 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -4,33 +4,39 @@ , fetchCrate , installShellFiles , makeWrapper +, pkg-config +, libgit2 +, oniguruma , libiconv -, zlib , Security +, zlib }: rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.3.1"; + version = "1.4.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Iz9pXvgPIGUnfbnvk5kYAqlrMlz3I2kLszPe8GwwHVk="; + sha256 = "sha256-6UveXa0rMWt5FbmhB0CsYRMGMXxL8FB/XivB4Ec93PY="; }; - cargoHash = "sha256-eECAaTUgqasuDhLSk8p/CWSQmV8yV30UoMy3GZCRbGE="; + cargoHash = "sha256-c6U1ZOaXZ7RnKD7q0WTkam9gL8SL/naSeHGbB5I82lk="; nativeBuildInputs = [ - makeWrapper installShellFiles + makeWrapper + pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = [ libgit2 oniguruma ] ++ lib.optionals stdenv.isDarwin [ libiconv Security zlib ]; + RUSTONIG_SYSTEM_LIBONIG = true; + postPatch = '' # Fill the version stub in the man page. We can't fill the date # stub reproducibly. diff --git a/third_party/nixpkgs/pkgs/tools/misc/castty/default.nix b/third_party/nixpkgs/pkgs/tools/misc/castty/default.nix index ddda737c8b..075c6d739b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/castty/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/castty/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation { buildInputs = [ libsoundio lame ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "PREFIX=$(out)" + ]; meta = with lib; { description = "CLI tool to record audio-enabled screencasts of your terminal, for the web"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix index 51fbba8d70..d830b8d81f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }: - +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, which +, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick +, Foundation +}: stdenv.mkDerivation rec { version = "1.6.0"; @@ -23,7 +25,8 @@ stdenv.mkDerivation rec { docbook_xsl ]; - buildInputs = [ glib imagemagick ] ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ]; + buildInputs = [ glib imagemagick ] + ++ lib.optional stdenv.isDarwin Foundation; patches = [ ./xmlcatalog_patch.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index cec900189c..b4fa271ff5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.0.10"; + version = "2.0.12"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-WVG4rww9Wd1H6zw5lRBErX9VwnA21dhvith9BQFYqxw="; + sha256 = "sha256-CF/Ers/w1ZGBSvRVxyNf1R4CwwidK9ItiFBCIjToYg0="; }; - vendorSha256 = "sha256-khYcNP3xAXeQR9vaghkGq8x6KB1k5hLEcE7Zx8H+CfA="; + vendorSha256 = "sha256-tdd3uUxN+ZJ0hX4IqSM/xPZzcawtOa5xgjPhRrns5yM="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix index dfc79e208a..72721020e1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cicero-tui"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "eyeplum"; repo = "cicero-tui"; rev = "v${version}"; - sha256 = "sha256-TNNPTKLO5qjSeCxWb7bB4yV1J4Seu+tBKNs0Oav/pPE="; + sha256 = "sha256-FwjD+BdRc8y/g5MQLmBB/qkUj33cywbH2wjTp0y0s8A="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { freetype ]; - cargoSha256 = "sha256-kzU+i5DLmZULdJPURz10URE5sMUG6eQg0pCoEiyfgco="; + cargoSha256 = "sha256-JygEE7K8swbFvJ2aDXs+INhfoLuhy+LY7T8AUr4lgJY="; meta = with lib; { description = "Unicode tool with a terminal user interface"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cloc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cloc/default.nix index 3e18d3f4b5..939c9f744f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cloc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cloc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cloc"; - version = "1.88"; + version = "1.90"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; - rev = version; - sha256 = "1ixgswzbzv63bl50gb2kgaqr0jcicjz6w610hi9fal1i7744zraw"; + rev = "v${version}"; + sha256 = "0ic9q6qqw5f1wafp9lpmhr0miasbdb9zr59c0jlymnzffdmnliyc"; }; setSourceRoot = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix b/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix index 6a253a493f..560ad46047 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix @@ -1,20 +1,24 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub +, libiconv }: rustPlatform.buildRustPackage rec { pname = "code-minimap"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5YNY0MRlKKX6u32Id6J7bIPSHRi44TISoKqpAS9T8ow="; + sha256 = "sha256-nWfvRrKkUrr2owv9sLgORVPYp68/Ibdu/P1VddMb61s="; }; - cargoSha256 = "sha256-87aRZC4OE3UTVToHi5XDBxVqEH4oFeFR4REf69OBkIw="; + cargoSha256 = "sha256-OmWn6Z/r/gXMD4gp/TDo0Hokliq8Qgb354q8ZFpVG2s="; + + buildInputs = lib.optional stdenv.isDarwin libiconv; meta = with lib; { description = "A high performance code minimap render"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cpulimit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cpulimit/default.nix index 27e661e269..7fdaa31961 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cpulimit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cpulimit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cpulimit"; - version = "2.6"; + version = "2.7"; src = fetchurl { url = "mirror://sourceforge/limitcpu/${pname}-${version}.tar.gz"; - sha256 = "0xf0r6zxaqan1drz61nqf95p2pkiiihpvrjhrr9dx9j3vswyx31g"; + sha256 = "sha256-HeBApPikDf6MegJf6YB1ZzRo+8P8zMvCMbx0AvYuxKA="; }; buildFlags = with stdenv; [ ( diff --git a/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix b/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix index 29748f781b..8bca39c2ad 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "czkawka"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "qarmin"; repo = pname; rev = version; - sha256 = "1g5a9ns5lkiyk6hjsh08hgs41538dzj0a4lgn2c5cbad5psl0xa6"; + sha256 = "sha256-LtGgpfToQUNKM1hmMPW7UrS/n7iyI+dz2vbSo+GOcRg="; }; - cargoSha256 = "11ym2d7crp12w91111s3rv0gklkg2bzlq9g24cws4h7ipi0zfx5h"; + cargoSha256 = "sha256-ZbyoCo1n4GRBkb5SClby5V51rLN1PnvCHD30TiJU2gY="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/misc/dateutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dateutils/default.nix index 9ef68a590c..e6793813b2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dateutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dateutils/default.nix @@ -1,21 +1,14 @@ { lib, stdenv, fetchurl, autoreconfHook, tzdata, fetchpatch }: stdenv.mkDerivation rec { - version = "0.4.7"; + version = "0.4.8"; pname = "dateutils"; src = fetchurl { url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz"; - sha256 = "16jr9yjk8wgzfh22hr3z6mp4jm3fkacyibds4jj5xx5yymbm8wj9"; + sha256 = "0061f36axskm7yq9cp64x5a5phil8d3zgcd668nfmqzk9ji58w1z"; }; - patches = [ - (fetchpatch { - url = "https://bitbucket.org/hroptatyr/dateutils/commits/6813ed94534f2311fbe9164748919e39d60b0190/raw"; - sha256 = "1zs3iizb172ha56g03rr8kzd8zx6qypiqsc11jw758mliwxk5rgc"; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ tzdata ]; # needed for datezone enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix index 41f2bede99..b7d0f2c3aa 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; - rev = "0.5.1"; - sha256 = "sha256-e6Rzzz5S+Um2ZBuUkfAJQA4V+zqCqsUHB0f1t/dTU2w="; + rev = "0.5.2"; + sha256 = "sha256-kul0sjbwbCwadvrccG3KwL/fKWACFUg74QGvgfWE4FQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix b/third_party/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix index b2e753342d..858c114f68 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, unzip, xz, dpkg +{lib, stdenv, fetchurl, xz, dpkg , libxslt, docbook_xsl, makeWrapper , python3Packages , perlPackages, curl, gnupg, diffutils @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1"; }; - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils ] ++ (with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]); diff --git a/third_party/nixpkgs/pkgs/tools/misc/debootstrap/default.nix b/third_party/nixpkgs/pkgs/tools/misc/debootstrap/default.nix index ea60887ebf..b75f31c617 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/debootstrap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/debootstrap/default.nix @@ -15,13 +15,13 @@ let binPath = lib.makeBinPath [ ]; in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.123"; + version = "1.0.124"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.gz"; - sha256 = "0a53dhfwa74vdhqd6kbl7zlm7iic37c6wkdclppf0syxxi3q2njy"; + sha256 = "sha256-dwDphksp8WaybFQVPtjCdbRvS5pgRou2B+AZpkwWzY8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 27da490028..ce0d920ca4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -2,7 +2,7 @@ , abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R -, sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd +, radare2, sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd , enableBloat ? false }: @@ -16,11 +16,11 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "172"; + version = "175"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "1j162jh5lkiixpb5ym3smyrkvjldm8m8vnx25cgwb7cxkk701w5x"; + sha256 = "sha256-ofRu5bD+kymdXdViPxfGD/2cf7lUvnEQfYAqog5GIIk="; }; outputs = [ "out" "man" ]; @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec { ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ] ++ lib.optionals enableBloat ([ abootimg apksigner apktool cbfstool colord ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric - hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt + hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt radare2 ] ++ (with python3Packages; [ binwalk guestfs h5py ])); checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; diff --git a/third_party/nixpkgs/pkgs/tools/misc/discocss/default.nix b/third_party/nixpkgs/pkgs/tools/misc/discocss/default.nix index 43214c8663..2e0506bf42 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/discocss/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/discocss/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "discocss"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "mlvzk"; repo = pname; rev = "v${version}"; - sha256 = "1818jca3sw2ngw1n488q82w5rakx4cxgknnkmsaa0sz4h8gldfy8"; + sha256 = "sha256-EdkcTVDFQppBeAoyM5hMMIK0d4B87JyVlmCW7zlGfDs="; }; dontBuild = true; @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec { description = "A tiny Discord css-injector"; homepage = "https://github.com/mlvzk/discocss"; license = licenses.mpl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ mlvzk ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix index d4ad2dffd8..52038c8efa 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix @@ -1,13 +1,13 @@ { lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "dpt-rp1-py"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "janten"; repo = pname; rev = "v${version}"; - sha256 = "0xw853s5bx2lr57w6ldfjzi1ppc6px66zd7hzk8y2kg82q6bnasq"; + sha256 = "1jgkfn5kfnx98xs0dmym1h9mv1mrzlglk7x0fzs2jlc56c18w9dk"; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix index f0bb6905b4..f69d13d045 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -1,14 +1,16 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }: rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.11.1"; + version = "2.11.3"; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-pjFApZQJqw0fJmJteO7VZWRLogV3rO5XDagZd1MliZg="; + sha256 = "sha256-rwbeWjYhAgZhQDg1/Pux08Kw+7NQG7dJlhZnwlaEjJ4="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-xsTScRAu0SF1xtjUwBtNJUNIItoR0jjEd2CuSmmeh9c="; + cargoSha256 = "sha256-ta5mHTfSs72HUz3ezZhVvU61ECvyWY3Sba7/UoJGc8U="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/duc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/duc/default.nix index 570535f80e..b5fe5074d7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/duc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/duc/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.all; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix index 12953e2795..fe02fe0d52 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -1,36 +1,60 @@ -{ lib, python3, platformio, esptool, git, protobuf3_12, fetchpatch }: +{ lib +, python3 +, fetchFromGitHub +, platformio +, esptool +, git +}: -let - python = python3.override { - packageOverrides = self: super: { - protobuf = super.protobuf.override { - protobuf = protobuf3_12; - }; - }; - }; - -in python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "1.16.0"; + version = "1.18.0"; - src = python.pkgs.fetchPypi { - inherit pname version; - sha256 = "0pvwzkdcpjqdf7lh1k3xv1la5v60lhjixzykapl7f2xh71fbm144"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1vz3d59wfqssfv1kvd4minlxibr0id06xfyg8956w9s3b22jc5vq"; }; + postPatch = '' + # remove all version pinning (E.g tornado==5.1.1 -> tornado) + sed -i -e "s/==[0-9.]*//" requirements.txt + + # drop coverage testing + sed -i '/--cov/d' pytest.ini + + # migrate use of hypothesis internals to be compatible with hypothesis>=5.32.1 + # https://github.com/esphome/issues/issues/2021 + substituteInPlace tests/unit_tests/strategies.py --replace \ + "@st.defines_strategy_with_reusable_values" \ + "@st.defines_strategy(force_reusable_values=True)" + ''; + + # Remove esptool and platformio from requirements ESPHOME_USE_SUBPROCESS = ""; - propagatedBuildInputs = with python.pkgs; [ - voluptuous pyyaml paho-mqtt colorlog colorama - tornado protobuf tzlocal pyserial ifaddr - protobuf click + # esphome has optional dependencies it does not declare, they are + # loaded when certain config blocks are used, like `font`, `image` + # or `animation`. + # They have validation functions like: + # - validate_cryptography_installed + # - validate_pillow_installed + propagatedBuildInputs = with python3.pkgs; [ + click + colorama + cryptography + ifaddr + paho-mqtt + pillow + protobuf + pyserial + pyyaml + tornado + tzlocal + voluptuous ]; - # remove all version pinning (E.g tornado==5.1.1 -> tornado) - postPatch = '' - sed -i -e "s/==[0-9.]*//" requirements.txt - ''; - makeWrapperArgs = [ # platformio is used in esphomeyaml/platformio_api.py # esptool is used in esphomeyaml/__main__.py @@ -39,16 +63,25 @@ in python.pkgs.buildPythonApplication rec { "--set ESPHOME_USE_SUBPROCESS ''" ]; - # Platformio will try to access the network - # Instead, run the executable - checkPhase = '' + checkInputs = with python3.pkgs; [ + hypothesis + mock + pytest-mock + pytest-sugar + pytestCheckHook + ]; + + postCheck = '' $out/bin/esphome --help > /dev/null ''; meta = with lib; { description = "Make creating custom firmwares for ESP32/ESP8266 super easy"; homepage = "https://esphome.io/"; - license = licenses.mit; + license = with licenses; [ + mit # The C++/runtime codebase of the ESPHome project (file extensions .c, .cpp, .h, .hpp, .tcc, .ino) + gpl3Only # The python codebase and all other parts of this codebase + ]; maintainers = with maintainers; [ globin elseym hexa ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix b/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix index 0f68137066..9bda86db9b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix @@ -2,18 +2,16 @@ , fetchurl , gcc-unwrapped , dpkg -, polkit , util-linux , bash -, nodePackages , makeWrapper -, electron_7 +, electron_12 }: let sha256 = { - "x86_64-linux" = "1yvqi86bw0kym401zwknhwq9041fxg047sbj3aydnfcqf11vrrmk"; - "i686-linux" = "12lghzhsl16h3jvzm3vw4hrly32fz99z6rdmybl8viralrxy8mb8"; + "x86_64-linux" = "sha256-nGIUOS4LzfeXamcT0uigbQsVkULH2R3bli0DDEpg3ns="; + "i686-linux" = "0z6y45sz086njpywg7f0jn6n02qynb1qbi889g2kcgwbfjvmcpm1"; }."${stdenv.system}"; arch = { @@ -21,39 +19,36 @@ let "i686-linux" = "i386"; }."${stdenv.system}"; - electron = electron_7; + electron = electron_12; in stdenv.mkDerivation rec { pname = "etcher"; - version = "1.5.86"; + version = "1.5.120"; src = fetchurl { url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb"; inherit sha256; }; - dontBuild = true; - dontConfigure = true; - nativeBuildInputs = [ makeWrapper ]; + dontConfigure = true; + dontBuild = true; + unpackPhase = '' ${dpkg}/bin/dpkg-deb -x $src . ''; # sudo-prompt has hardcoded binary paths on Linux and we patch them here # along with some other paths - patchPhase = '' - ${nodePackages.asar}/bin/asar extract opt/balenaEtcher/resources/app.asar tmp + postPatch = '' # use Nix(OS) paths - sed -i "s|/usr/bin/pkexec|/usr/bin/pkexec', '/run/wrappers/bin/pkexec|" tmp/node_modules/sudo-prompt/index.js - sed -i 's|/bin/bash|${bash}/bin/bash|' tmp/node_modules/sudo-prompt/index.js - sed -i "s|'lsblk'|'${util-linux}/bin/lsblk'|" tmp/node_modules/drivelist/js/lsblk/index.js - sed -i "s|process.resourcesPath|'$out/share/${pname}/resources/'|" tmp/generated/gui.js - ${nodePackages.asar}/bin/asar pack tmp opt/balenaEtcher/resources/app.asar - rm -rf tmp + substituteInPlace opt/balenaEtcher/resources/app/generated/gui.js \ + --replace '/usr/bin/pkexec' '/usr/bin/pkexec", "/run/wrappers/bin/pkexec' \ + --replace '/bin/bash' '${bash}/bin/bash' \ + --replace '"lsblk"' '"${util-linux}/bin/lsblk"' ''; installPhase = '' @@ -64,15 +59,12 @@ stdenv.mkDerivation rec { cp -a usr/share/* $out/share cp -a opt/balenaEtcher/{locales,resources} $out/share/${pname} - substituteInPlace $out/share/applications/balena-etcher-electron.desktop \ - --replace 'Exec=/opt/balenaEtcher/balena-etcher-electron' 'Exec=${pname}' - runHook postInstall ''; postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/resources/app.asar \ + --add-flags $out/share/${pname}/resources/app \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}" ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ethminer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ethminer/default.nix index 22278cb9a4..3a8169c6b3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ethminer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ethminer/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { description = "Ethereum miner with OpenCL${lib.optionalString cudaSupport ", CUDA"} and stratum support"; homepage = "https://github.com/ethereum-mining/ethminer"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ nand0p atemu ]; + maintainers = with maintainers; [ atemu ]; license = licenses.gpl3Only; broken = cudaSupport; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix index 75e1084e0b..aea480ac04 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix @@ -17,16 +17,16 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.71"; + version = "0.2.72"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "sha256-dXFnM8085XVzUwk1e3SoO+O+z9lJ40htJzHBGRQ95XY="; + sha256 = "sha256-YEmEaf0ob2ulmQghwDYi0RtGuTdRHCoLdPnuVjxvlxE="; }; - cargoSha256 = "sha256-VwxIH/n1DjZsMOLAREclqanb4q7QEOZ35KWWciyrnyQ="; + cargoSha256 = "sha256-mcWQzfMc2cJjp0EFcfG7SAM70ItwEC/N13UDiRiI3ys="; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; buildInputs = 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 d51676f4a5..89435e7698 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.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "sha256-xOrEPZ+AUihVVaxrqCCeO6n3XFkVahCzHOuX947LRFs="; + sha256 = "sha256-n7X6VlNZVsL+Tn9t3L4mTblVjPTKgTMmcRdkDGPXI8U="; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/foma/default.nix b/third_party/nixpkgs/pkgs/tools/misc/foma/default.nix index 2bde606adb..e75aaca50f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/foma/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/foma/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, zlib, flex, bison, readline }: +{ lib, stdenv, fetchFromGitHub, zlib, flex, bison, readline, darwin }: stdenv.mkDerivation rec { pname = "foma"; @@ -13,9 +13,14 @@ stdenv.mkDerivation rec { sourceRoot = "source/foma"; - nativeBuildInputs = [ flex bison ]; + nativeBuildInputs = [ flex bison ] + ++ lib.optional stdenv.isDarwin darwin.cctools; buildInputs = [ zlib readline ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + patchPhase = '' substituteInPlace Makefile \ --replace '-ltermcap' ' ' \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/fontforge/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fontforge/default.nix index 89bd0f0491..5f64057c46 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fontforge/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fontforge/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchpatch, fetchFromGitHub, lib , cmake, perl, uthash, pkg-config, gettext -, python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango +, python, freetype, zlib, glib, giflib, libpng, libjpeg, libtiff, libxml2, cairo, pango , readline, woff2, zeromq, libuninameslist , withSpiro ? false, libspiro , withGTK ? false, gtk3 @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ readline uthash woff2 zeromq libuninameslist - python freetype zlib glib libungif libpng libjpeg libtiff libxml2 + python freetype zlib glib giflib libpng libjpeg libtiff libxml2 ] ++ lib.optionals withSpiro [libspiro] ++ lib.optionals withGUI [ gtk3 cairo pango ] diff --git a/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix index d60e68a0e3..eaddc8790e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "sha256-gwFX5c5y4bL+KhPDnvCbDco1ORYyqZYFsetMrmOATZU="; + sha256 = "sha256-6/mcGq6qKYmcBcNndYYJB3rnHr6ZVpEcVjJBz7NEJEw="; }; - cargoSha256 = "sha256-gWCiaAgb7hBenbp1kogCoB6vctYfDZccRW9li2yxJaU="; + cargoSha256 = "sha256-W6YmFsTlU3LD3tvhLuA/3k/269gR2RLLOo86BQC5x98="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fx_cast/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fx_cast/default.nix index 4fcb5a6557..e3458ccfe5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fx_cast/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fx_cast/default.nix @@ -1,85 +1,64 @@ -{ lib, stdenv, fetchurl, dpkg }: - +# How to generate a new version: +# +# Update version and hash as usual. +# +# ``` +# cd fx_cast/app +# # Add `"name": "fx_cast_bridge", "version": "...",` to package.json and package-lock.json +# nix run nixpkgs.nodePackages.node2nix -c node2nix -l package-lock.json -d +# cp -v node-*.nix package*.json ~/p/nixpkgs/pkgs/tools/misc/fx_cast/app +# ``` +{ pkgs, stdenv, system }: let + nodeEnv = import ./node-env.nix { + inherit (pkgs) nodejs stdenv lib python2 runCommand writeTextFile; + inherit pkgs; + libtool = if stdenv.isDarwin then pkgs.darwin.cctools else null; + }; + nodePackages = import ./node-packages.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit nodeEnv; + globalBuildInputs = [pkgs.avahi-compat]; + }; +in stdenv.mkDerivation rec { - pname = "fx_cast_bridge"; - version = "0.0.7"; + name = "fx_cast_bridge-${version}"; + version = "0.1.2"; - src = fetchurl { - url = "https://github.com/hensm/fx_cast/releases/download/v${version}/${pname}-${version}-x64.deb"; - sha256 = "0kd58vzsq1qzl7qsh1qv25ylxvr5y37li03gjb48x4vhd85slzz5"; + src = pkgs.fetchFromGitHub { + owner = "hensm"; + repo = "fx_cast"; + rev = "v${version}"; + hash = "sha256:1prgk9669xgwkdl39clq0l75n0gnkkpn27gp9rbgl4bafrhvmg9a"; }; - nativeBuildInputs = [ dpkg ]; + buildInputs = with pkgs; [ + nodejs + ]; - unpackPhase = '' - runHook preUnpack - dpkg-deb -xv $src ./ - runHook postUnpack + buildPhase = '' + ln -vs ${nodePackages.nodeDependencies}/lib/node_modules app/node_modules + npm run build:app ''; - dontBuild = true; - dontPatchELF = true; - installPhase = '' - install -DT {opt/fx_cast,$out/bin}/${pname} - install -DT {usr,$out}/lib/mozilla/native-messaging-hosts/${pname}.json + mkdir -p $out/bin $out/lib/mozilla/native-messaging-hosts $out/opt - substituteInPlace $out/lib/mozilla/native-messaging-hosts/${pname}.json \ - --replace {/opt/fx_cast,$out/bin}/${pname} + substituteInPlace dist/app/fx_cast_bridge.json \ + --replace "$(realpath dist/app/fx_cast_bridge.sh)" "$out/bin/fx_cast_bridge" + mv dist/app/fx_cast_bridge.json $out/lib/mozilla/native-messaging-hosts + + echo "#! /bin/sh + NODE_PATH=${nodePackages.nodeDependencies}/lib/node_modules exec ${pkgs.nodejs}/bin/node $out/opt/fx_cast_bridge/src/main.js --_name fx_cast_bridge \"\$@\" + " >$out/bin/fx_cast_bridge + chmod +x $out/bin/fx_cast_bridge + + mv dist/app $out/opt/fx_cast_bridge ''; - # See now-cli/default.nix - dontStrip = true; - preFixup = let - libPath = lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc]; - bin = "$out/bin/${pname}"; - in '' - - orig_size=$(stat --printf=%s ${bin}) - - patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ${bin} - patchelf --set-rpath ${libPath} ${bin} - chmod +x ${bin} - - new_size=$(stat --printf=%s ${bin}) - - ###### zeit-pkg fixing starts here. - # we're replacing plaintext js code that looks like - # PAYLOAD_POSITION = '1234 ' | 0 - # [...] - # PRELUDE_POSITION = '1234 ' | 0 - # ^-----20-chars-----^^------22-chars------^ - # ^-- grep points here - # - # var_* are as described above - # shift_by seems to be safe so long as all patchelf adjustments occur - # before any locations pointed to by hardcoded offsets - - var_skip=20 - var_select=22 - shift_by=$(expr $new_size - $orig_size) - - function fix_offset { - # $1 = name of variable to adjust - location=$(grep -obUam1 "$1" ${bin} | cut -d: -f1) - location=$(expr $location + $var_skip) - - value=$(dd if=${bin} iflag=count_bytes,skip_bytes skip=$location \ - bs=1 count=$var_select status=none) - value=$(expr $shift_by + $value) - - echo -n $value | dd of=${bin} bs=1 seek=$location conv=notrunc - } - - fix_offset PAYLOAD_POSITION - fix_offset PRELUDE_POSITION - - ''; - - meta = with lib; { + meta = with pkgs.lib; { description = "Implementation of the Chrome Sender API (Chromecast) within Firefox"; homepage = "https://hensm.github.io/fx_cast/"; license = licenses.mit; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ dtzWill kevincox ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/fx_cast/node-env.nix b/third_party/nixpkgs/pkgs/tools/misc/fx_cast/node-env.nix new file mode 100644 index 0000000000..c2b723195b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/fx_cast/node-env.nix @@ -0,0 +1,567 @@ +# This file originates from node2nix + +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: + +let + # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master + utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; + + python = if nodejs ? python then nodejs.python else python2; + + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise + tarWrapper = runCommand "tarWrapper" {} '' + mkdir -p $out/bin + + cat > $out/bin/tar <> $out/nix-support/hydra-build-products + ''; + }; + + includeDependencies = {dependencies}: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: + '' + # Bundle the dependencies of the package + mkdir -p node_modules + cd node_modules + + # Only include dependencies if they don't exist. They may also be bundled in the package. + if [ ! -e "${dependency.name}" ] + then + ${composePackage dependency} + fi + + cd .. + '' + ) dependencies); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + DIR=$(pwd) + cd $TMPDIR + + unpackFile ${src} + + # Make the base dir in which the target dependency resides first + mkdir -p "$(dirname "$DIR/${packageName}")" + + if [ -f "${src}" ] + then + # Figure out what directory has been unpacked + packageDir="$(find . -maxdepth 1 -type d | tail -1)" + + # Restore write permissions to make building work + find "$packageDir" -type d -exec chmod u+x {} \; + chmod -R u+w "$packageDir" + + # Move the extracted tarball into the output folder + mv "$packageDir" "$DIR/${packageName}" + elif [ -d "${src}" ] + then + # Get a stripped name (without hash) of the source directory. + # On old nixpkgs it's already set internally. + if [ -z "$strippedName" ] + then + strippedName="$(stripHash ${src})" + fi + + # Restore write permissions to make building work + chmod -R u+w "$strippedName" + + # Move the extracted directory into the output folder + mv "$strippedName" "$DIR/${packageName}" + fi + + # Unset the stripped name to not confuse the next unpack step + unset strippedName + + # Include the dependencies of the package + cd "$DIR/${packageName}" + ${includeDependencies { inherit dependencies; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ''; + + pinpointDependencies = {dependencies, production}: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(![1, 2].includes(packageLock.lockfileVersion)) { + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild + + if [ "''${dontNpmInstall-}" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install + fi + ''; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = + { name + , packageName + , version + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + in + stdenv.mkDerivation ({ + name = "node_${name}-${version}"; + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit nodejs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; + + compositionScript = composePackage args; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; + + installPhase = '' + # Create and enter a root node_modules/ folder + mkdir -p $out/lib/node_modules + cd $out/lib/node_modules + + # Compose the package and all its dependencies + source $compositionScriptPath + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Create symlink to the deployed executable folder, if applicable + if [ -d "$out/lib/node_modules/.bin" ] + then + ln -s $out/lib/node_modules/.bin $out/bin + fi + + # Create symlinks to the deployed manual page folders, if applicable + if [ -d "$out/lib/node_modules/${packageName}/man" ] + then + mkdir -p $out/share + for dir in "$out/lib/node_modules/${packageName}/man/"* + do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/* + do + ln -s $page $out/share/man/$(basename "$dir") + done + done + fi + + # Run post install hook, if provided + runHook postInstall + ''; + } // extraArgs); + + # Builds a node environment (a node_modules folder and a set of binaries) + buildNodeDependencies = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + in + stdenv.mkDerivation ({ + name = "node-dependencies-${name}-${version}"; + + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; + + includeScript = includeDependencies { inherit dependencies; }; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; + + installPhase = '' + mkdir -p $out/${packageName} + cd $out/${packageName} + + source $includeScriptPath + + # Create fake package.json to make the npm commands work properly + cp ${src}/package.json . + chmod 644 package.json + ${lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + fi + ''} + + # Go to the parent folder to make sure that all packages are pinpointed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Expose the executables that were installed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + mv ${packageName} lib + ln -s $out/lib/node_modules/.bin $out/bin + ''; + } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + nodeDependencies = buildNodeDependencies args; + in + stdenv.mkDerivation { + name = "node-shell-${name}-${version}"; + + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/shell <=2.24.0' 'requests~=2.23' \ --replace 'beautifulsoup4==4.9.1' 'beautifulsoup4~=4.9' \ - --replace 'colorama==0.4.3' 'colorama~=0.4' + --replace 'colorama==0.4.3' 'colorama~=0.4' \ + --replace 'unidecode==1.1.1' 'unidecode~=1.2' ''; preBuild = "export HOME=$NIX_BUILD_TOP"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix index b39f631f95..a615330a4a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix @@ -88,7 +88,7 @@ systemd util-linux ] ++ lib.optional enableRDW networkmanager - ++ lib.optional (lib.any (lib.meta.platformMatch stdenv.hostPlatform) x86_energy_perf_policy.meta.platforms) x86_energy_perf_policy + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform x86_energy_perf_policy) x86_energy_perf_policy ); in '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix index ff0661de46..42624df8a0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "6.8.0"; + version = "6.9.1"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PPOsb9bne0q/WGAL3W2RGo/0yxyz/XXU3xYXKcCIqX0="; + sha256 = "sha256-FaN1/S/VzHnaQp+UOmvNGaWDEFijVEI7GWkAmnln3jE="; }; - cargoSha256 = "sha256-IirU/4hE+jo5A9pB7RnePhqcbCZXBCe0Ki6i7eEWIbk="; + cargoSha256 = "sha256-Vq2gorQJbLfxKWKbYYOVaHPN0uITbGs1CgkwBtPwSrk="; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/third_party/nixpkgs/pkgs/tools/misc/trash-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/trash-cli/default.nix index dcb9e056e9..cc6d5f8c45 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/trash-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/trash-cli/default.nix @@ -2,27 +2,24 @@ python3Packages.buildPythonApplication rec { pname = "trash-cli"; - version = "0.21.4.18"; + version = "0.21.5.11"; src = fetchFromGitHub { owner = "andreafrancia"; repo = "trash-cli"; rev = version; - sha256 = "16xmg2d9rfmm5l1dxj3dydijpv3kwswrqsbj1sihyyka4s915g61"; + sha256 = "0ifv717ywq2y0s6m9rkry1fnsr3mg9n2b2zcwaf9r5cxpw90bmym"; }; propagatedBuildInputs = [ python3Packages.psutil ]; checkInputs = with python3Packages; [ mock - pytest + pytestCheckHook ]; - # Run tests, skipping `test_user_specified` since its result depends on the - # mount path. - checkPhase = '' - pytest -k 'not test_user_specified' - ''; + # Skip `test_user_specified` since its result depends on the mount path. + disabledTests = [ "test_user_specified" ]; meta = with lib; { homepage = "https://github.com/andreafrancia/trash-cli"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix index 73640de76b..472a707219 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix @@ -1,5 +1,5 @@ { lib, rustPlatform, pkg-config, cmake, llvmPackages, openssl, fetchFromGitHub -, installShellFiles }: +, installShellFiles, stdenv, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "tremor"; @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config installShellFiles ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ]; # TODO export TREMOR_PATH($out/lib) variable postInstall = '' @@ -29,7 +30,7 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/tremor completions zsh) ''; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; # OPENSSL_NO_VENDOR - If set, always find OpenSSL in the system, even if the vendored feature is enabled. OPENSSL_NO_VENDOR = 1; @@ -40,7 +41,7 @@ rustPlatform.buildRustPackage rec { description = "Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation"; homepage = "https://www.tremor.rs/"; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; + platforms = platforms.x86_64; maintainers = with maintainers; [ humancalico ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix index 6cc13e6f87..7aebfeab2c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, libogg, libvorbis }: +{ lib, stdenv, fetchurl, libogg, libvorbis }: stdenv.mkDerivation rec { name = "vorbisgain-0.37"; @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ unzip ]; buildInputs = [ libogg libvorbis ]; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/wagyu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wagyu/default.nix index 8ed952a82c..981d59e3aa 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wagyu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wagyu/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "wagyu"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "16d1b3pamkg29nq80n6cbzc4zl9z3cgfvdxjkr2z4xrnzmkn1ysi"; + buildInputs = lib.optional stdenv.isDarwin Security; + meta = with lib; { description = "Rust library for generating cryptocurrency wallets"; homepage = "https://github.com/ArgusHQ/wagyu"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/websocat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/websocat/default.nix index 821c059a45..7ba2accc67 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/websocat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/websocat/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, openssl, rustPlatform, Security, makeWrapper, bash }: +{ lib, stdenv, fetchFromGitHub, pkg-config, openssl, rustPlatform, libiconv +, Security, makeWrapper, bash }: rustPlatform.buildRustPackage rec { pname = "websocat"; @@ -15,7 +16,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-+3SG1maarY4DJ4+QiYGwltGLksOoOhKtcqstRwgzi2k="; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR=1; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wlc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wlc/default.nix new file mode 100644 index 0000000000..874e31ca6e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/wlc/default.nix @@ -0,0 +1,36 @@ +{ lib +, python3 +}: + +with python3.pkgs; + +buildPythonPackage rec { + pname = "wlc"; + version = "1.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256:0ysx250v2qycy1m3jj0wxmyf2f5n8fxf6br69vcbyq2cnqw609nx"; + }; + + propagatedBuildInputs = [ + argcomplete + python-dateutil + requests + pyxdg + pre-commit + responses + twine + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "wlc is a Weblate commandline client using Weblate's REST API."; + homepage = "https://github.com/WeblateOrg/wlc"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ paperdigits ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/woeusb/default.nix b/third_party/nixpkgs/pkgs/tools/misc/woeusb/default.nix index 8cbd1ad069..a728afc388 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/woeusb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/woeusb/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { description = "Create bootable USB disks from Windows ISO images"; homepage = "https://github.com/slacka/WoeUSB"; license = licenses.gpl3; - maintainers = with maintainers; [ bjornfor gnidorah ]; + maintainers = with maintainers; [ bjornfor ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/xcd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xcd/default.nix new file mode 100644 index 0000000000..7e34021041 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/xcd/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + pname = "xcd"; + version = "1.2"; + + src = fetchurl { + url = "https://www.muppetlabs.com/~breadbox/pub/software/${pname}-${version}.tar.gz"; + sha256 = "1cgwspy08q05rhxbp7m1yrrix252i9jzfcfbzmhdvlgf5bfpl25g"; + }; + + buildInputs = [ ncurses ]; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + + installPhase = '' + runHook preInstall + install -D $pname $out/bin/$pname + runHook postInstall + ''; + + meta = with lib; { + description = "Colorized hexdump tool"; + homepage = "https://www.muppetlabs.com/~breadbox/software/xcd.html"; + maintainers = [ maintainers.xfnw ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix index 05750b962f..2e50637685 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, makeWrapper, xorgserver, getopt , xauth, util-linux, which, fontsConf, gawk, coreutils }: let - xvfb_run = fetchurl { + xvfb-run = fetchurl { name = "xvfb-run"; # https://git.archlinux.org/svntogit/packages.git/?h=packages/xorg-server url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server&id=9cb733cefa92af3fca608fb051d5251160c9bbff"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p $out/bin - cp ${xvfb_run} $out/bin/xvfb-run + cp ${xvfb-run} $out/bin/xvfb-run chmod a+x $out/bin/xvfb-run patchShebangs $out/bin/xvfb-run @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - platforms = platforms.unix; + platforms = platforms.linux; license = licenses.gpl2; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/yafetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yafetch/default.nix new file mode 100644 index 0000000000..cfdc0219ee --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/yafetch/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitLab }: + +stdenv.mkDerivation rec { + pname = "yafetch"; + version = "unstable-2021-05-13"; + + src = fetchFromGitLab { + owner = "cyberkitty"; + repo = pname; + rev = "627465e6bf0192a9bc10f9c9385cde544766486f"; + sha256 = "1r8jnzfyjs5ardq697crwysclfm3k8aiqvfbsyhsl251a08yls5c"; + }; + + # Use the provided NixOS logo automatically + prePatch = '' + echo "#include \"ascii/nixos.h\"" > config.h + ''; + + # Fixes installation path + DESTDIR = placeholder "out"; + + meta = with lib; { + homepage = "https://gitlab.com/cyberkitty/yafetch"; + description = "Yet another fetch clone written in C++"; + license = licenses.gpl2Only; + maintainers = [ maintainers.ivar ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix index 68218592bb..cd04e2020b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yle-dl"; - version = "20210212"; + version = "20210502"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "sha256-0JnigYmslQ/7KsQAFg3AaWPAU/tD1lS7lF6OCcv/ze4="; + sha256 = "sha256-HkhyxsiOMOfTHTj+qmY8l2z2sMtO4eMZmJUU/WvV4wY="; }; propagatedBuildInputs = with python3Packages; [ @@ -22,6 +22,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; homepage = "https://aajanki.github.io/yle-dl/"; + changelog = "https://github.com/aajanki/yle-dl/blob/${version}/ChangeLog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dezgeg SuperSandro2000 ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix index 3baad9f939..e5b8d79eeb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.04.26"; + version = "2021.05.16"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0jpa65jr5djn9175p6a8j9i1zgarshfwfsgmprc0vvnsl3s23ksc"; + sha256 = "1z8sdzvkxhscnzy7cnjag308glif0k8jylr11biqwzypm1f2l0fl"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix index 02982f9cc4..00e3ec1fbd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -1,53 +1,61 @@ { lib -, stdenv +, mkDerivation , fetchurl -, wrapQtAppsHook , pcsclite , pyotherside -, pythonPackages , python3 , qmake , qtbase , qtgraphicaleffects -, qtquickcontrols , qtquickcontrols2 , yubikey-manager , yubikey-personalization }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "yubikey-manager-qt"; - version = "1.1.5"; + version = "1.2.2"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "1yimlaqvhq34gw6wkqgil0qq8x9zbfzh4psqihjr2d9jaa2wygwy"; + sha256 = "1jqibv7na9h2r8nxgzp40j9qpyiwx97c65krivkcqjwdjk5lrahl"; }; - nativeBuildInputs = [ wrapQtAppsHook python3.pkgs.wrapPython qmake ]; + nativeBuildInputs = [ + python3.pkgs.wrapPython + qmake + ]; postPatch = '' substituteInPlace ykman-gui/deployment.pri --replace '/usr/bin' "$out/bin" ''; - buildInputs = [ pythonPackages.python qtbase qtgraphicaleffects qtquickcontrols qtquickcontrols2 pyotherside ]; + buildInputs = [ + pyotherside + python3 + qtbase + qtgraphicaleffects + qtquickcontrols2 + ]; - pythonPath = [ yubikey-manager ]; + pythonPath = [ + (yubikey-manager.override { python3Packages = python3.pkgs; }) + ]; - dontWrapQtApps = true; postInstall = '' - buildPythonPath "$pythonPath" - - wrapQtApp $out/bin/ykman-gui \ - --prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \ - --prefix PYTHONPATH : "$program_PYTHONPATH" - - mkdir -p $out/share/applications - cp resources/ykman-gui.desktop $out/share/applications/ykman-gui.desktop - mkdir -p $out/share/ykman-gui/icons - cp resources/icons/*.{icns,ico,png,xpm} $out/share/ykman-gui/icons + install -Dt $out/share/applications resources/ykman-gui.desktop + install -Dt $out/share/ykman-gui/icons resources/icons/*.{icns,ico,png,xpm} substituteInPlace $out/share/applications/ykman-gui.desktop \ - --replace 'Exec=ykman-gui' "Exec=$out/bin/ykman-gui" \ + --replace 'Exec=ykman-gui' "Exec=$out/bin/ykman-gui" + ''; + + qtWrapperArgs = [ + "--prefix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ pcsclite yubikey-personalization ]) + ]; + + preFixup = '' + buildPythonPath "$pythonPath" + qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix index f0b6a8ba98..920f4aff43 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.6.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = pname; rev = "v${version}"; - sha256 = "sha256-spESDjX7scihVQrr/f6KMCI9VfdTxxPWP7FcJ965FYk="; + sha256 = "sha256-aqiJPYoG1Yi5bK0gos+2OoycrrqdIY2GjpQGE1PK1bw="; }; - cargoSha256 = "0rm31sfcj2d85w1l4hhfmva3j828dfhiv5br1mnpaqaa01zzs1q1"; + cargoSha256 = "sha256-j9eZ2kHK9Mxxcv/yuriJ55xs2waCaWT5XQOSlA+WZXE="; nativeBuildInputs = [ installShellFiles ]; @@ -23,9 +23,9 @@ rustPlatform.buildRustPackage rec { postInstall = '' installShellCompletion --cmd $pname \ - --bash <($out/bin/zellij generate-completion bash) \ - --fish <($out/bin/zellij generate-completion fish) \ - --zsh <($out/bin/zellij generate-completion zsh) + --bash <($out/bin/zellij setup --generate-completion bash) \ + --fish <($out/bin/zellij setup --generate-completion fish) \ + --zsh <($out/bin/zellij setup --generate-completion zsh) ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/networking/anevicon/default.nix b/third_party/nixpkgs/pkgs/tools/networking/anevicon/default.nix index 95a4bbe9fb..cff22fa71e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/anevicon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/anevicon/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchpatch , rustPlatform +, libiconv , Security }: @@ -19,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1g15v13ysx09fy0b8qddw5fwql2pvwzc2g2h1ndhzpxvfy7fzpr1"; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; cargoPatches = [ # Add Cargo.lock file, https://github.com/rozgo/anevicon/pull/1 @@ -30,6 +31,9 @@ rustPlatform.buildRustPackage rec { }) ]; + # Tries to send large UDP packets that Darwin rejects. + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "UDP-based load generator"; homepage = "https://github.com/rozgo/anevicon"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/atinout/default.nix b/third_party/nixpkgs/pkgs/tools/networking/atinout/default.nix index bc2af5c5ee..93535531d9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/atinout/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/atinout/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { name = "atinout-${version}"; version = "0.9.2-alpha"; - NIX_CFLAGS_COMPILE = "-Werror=implicit-fallthrough=0"; - LANG = "C.UTF-8"; + NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.cc.isClang) "-Werror=implicit-fallthrough=0"; + LANG = if stdenv.isDarwin then "en_US.UTF-8" else "C.UTF-8"; nativeBuildInputs = [ ronn mount ]; src = fetchgit { @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0bninv2bklz7ly140cxx8iyaqjlq809jjx6xqpimn34ghwsaxbpv"; }; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + installPhase = '' make PREFIX=$out install ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix index 1eb445cfd3..31fd2e70d4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix @@ -2,25 +2,26 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.2.0"; + version = "0.2.2"; src = let inherit (stdenv.hostPlatform) system; - suffix = { + selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}"); + suffix = selectSystem { x86_64-linux = "linux_amd64"; aarch64-linux = "linux_arm64"; x86_64-darwin = "darwin_amd64"; - }.${system} or (throw "Unsupported system: ${system}"); - fetchsrc = version: sha256: fetchzip { - url = "https://releases.hashicorp.com/boundary/${version}/boundary_${version}_${suffix}.zip"; - sha256 = sha256.${system}; + }; + sha256 = selectSystem { + x86_64-linux = "sha256-K9WlOS9pRhBcoGaSZ3AhbGoTfKUrn4SDq50x6wnIib8="; + aarch64-linux = "sha256-BRm0Hy9vuxZSYINrPIMwl2UGZdWTSixLT8EJ1OzCGMg="; + x86_64-darwin = "sha256-pinmzz6GbQWAj3Ut/IB2o75w8X+CS2tXhE6nekYO4vc="; }; in - fetchsrc version { - x86_64-linux = "sha256-4h1Lx+Et1AfX75Cn0YUhV4MkEtzP6ICqAHVKex3PBpg="; - aarch64-linux = "sha256-i7gzv8GdDgikPT1tMia4xltEYiIZ/VNRbAiGF2o8oKA="; - x86_64-darwin = "sha256-tleIY1loPE61n59Qc9CJeropRUvTBbcIA8xmB1SaMt8="; + fetchzip { + url = "https://releases.hashicorp.com/boundary/${version}/boundary_${version}_${suffix}.zip"; + inherit sha256; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix b/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix index 55bd591005..4100720729 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix @@ -2,12 +2,15 @@ stdenv.mkDerivation rec { pname = "burpsuite"; - version = "2020.12.1"; + version = "2021.4.2"; src = fetchurl { name = "burpsuite.jar"; - url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"; - sha256 = "AcoPyVXUf2YGfX2/GbtGZeQ4P7zSsYFb9L57trXive0="; + urls = [ + "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" + "https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" + ]; + sha256 = "034c9d0a7e0b5e7b1b286949c6b31b475ff2a15e75f1230ccc07e236fc61d2aa"; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/calendar-cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/calendar-cli/default.nix new file mode 100644 index 0000000000..497b77b57a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/calendar-cli/default.nix @@ -0,0 +1,34 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "calendar-cli"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "tobixen"; + repo = "calendar-cli"; + rev = "v${version}"; + sha256 = "0qjld2m7hl3dx90491pqbjcja82c1f5gwx274kss4lkb8aw0kmlv"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + icalendar + caldav + pytz + tzlocal + six + ]; + + # tests require networking + doCheck = false; + + meta = with lib; { + description = "Simple command-line CalDav client"; + homepage = "https://github.com/tobixen/calendar-cli"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/chrony/default.nix b/third_party/nixpkgs/pkgs/tools/networking/chrony/default.nix index 333a28dd39..24968c64a0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/chrony/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/chrony/default.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { pname = "chrony"; - version = "4.0"; + version = "4.1"; src = fetchurl { url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz"; - sha256 = "09f6w2x5h5kamb4rhcbaz911q1f730qdalgsn8s48yjyqlafl9xy"; + sha256 = "sha256-7Xby0/k0esYiGpGtS9VT3QVlrBiM10kNCAHQj3FxFkw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix b/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix index 9cad36c68a..61e529dc87 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I4qpcHsN8WGt7YLNXO08BJypilhMSVmZjqECDjlEqXU="; + sha256 = "sha256-XG/nci8Sj0vfa/SFPpJwl1Zmt/23LfKxocejplZtS0E="; }; - vendorSha256 = "sha256-Nfzk7p52msGxTPDbs4g9KuRPFxp4Npt0QXkdVOZvipc="; + vendorSha256 = "sha256-WR1CpjEMHRkpd0/iqrOm0oVXvyQO+r6GyeP0L0zx8aA="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix index 09edbaf751..66c5598d02 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.1.1"; + version = "9.1.4"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MiTc8uT4FUHqEgE37kZ0pc7y1aK6u+4LqYQ8l1j2jA4="; + sha256 = "16HmRluhqCr6Gt+x8PSCU4W9pUJp89l4GO29uI+ZzkI="; }; - vendorSha256 = "sha256-UGFFzpbBeL4YS3VSjCa31E2fiqND8j3E4FjRflg1NFc="; + vendorSha256 = "sha256-f0KiXHspGX96k5ViCwI62Qs+rHowpqm+gLy7/iqdnE4="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/7.74.0-CVE-2021-22876.patch b/third_party/nixpkgs/pkgs/tools/networking/curl/7.74.0-CVE-2021-22876.patch deleted file mode 100644 index f915f298a4..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/curl/7.74.0-CVE-2021-22876.patch +++ /dev/null @@ -1,139 +0,0 @@ -Based on upstream 7214288898f5625a6cc196e22a74232eada7861c, adapted by ris to -compensate for lack of 95cbcec8f986492766c4be3922af1e7644e1e7c5 - ---- - lib/transfer.c | 25 ++++++++++++++-- - tests/data/Makefile.inc | 2 +- - tests/data/test2081 | 66 +++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 90 insertions(+), 3 deletions(-) - create mode 100644 tests/data/test2081 - -diff --git a/lib/transfer.c b/lib/transfer.c -index 1976bc0338bc..a68c021c84d6 100644 ---- a/lib/transfer.c -+++ b/lib/transfer.c -@@ -1581,6 +1581,9 @@ CURLcode Curl_follow(struct Curl_easy *data, - data->set.followlocation++; /* count location-followers */ - - if(data->set.http_auto_referer) { -+ CURLU *u; -+ char *referer; -+ - /* We are asked to automatically set the previous URL as the referer - when we get the next URL. We pick the ->url field, which may or may - not be 100% correct */ -@@ -1590,9 +1593,27 @@ CURLcode Curl_follow(struct Curl_easy *data, - data->change.referer_alloc = FALSE; - } - -- data->change.referer = strdup(data->change.url); -- if(!data->change.referer) -+ /* Make a copy of the URL without crenditals and fragment */ -+ u = curl_url(); -+ if(!u) -+ return CURLE_OUT_OF_MEMORY; -+ -+ uc = curl_url_set(u, CURLUPART_URL, data->change.url, 0); -+ if(!uc) -+ uc = curl_url_set(u, CURLUPART_FRAGMENT, NULL, 0); -+ if(!uc) -+ uc = curl_url_set(u, CURLUPART_USER, NULL, 0); -+ if(!uc) -+ uc = curl_url_set(u, CURLUPART_PASSWORD, NULL, 0); -+ if(!uc) -+ uc = curl_url_get(u, CURLUPART_URL, &referer, 0); -+ -+ curl_url_cleanup(u); -+ -+ if(uc || referer == NULL) - return CURLE_OUT_OF_MEMORY; -+ -+ data->change.referer = referer; - data->change.referer_alloc = TRUE; /* yes, free this later */ - } - } -diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc -index 2c7a0ca89fd8..ea52683d2254 100644 ---- a/tests/data/Makefile.inc -+++ b/tests/data/Makefile.inc -@@ -225,7 +225,7 @@ test2064 test2065 test2066 test2067 test2068 test2069 \ - test2064 test2065 test2066 test2067 test2068 test2069 test2070 \ - test2071 test2072 test2073 test2074 test2075 test2076 test2077 \ - test2078 \ --test2080 \ -+test2080 test2081 \ - test2100 \ - \ - test3000 test3001 test3002 test3003 test3004 test3005 test3006 test3007 \ -diff --git a/tests/data/test2081 b/tests/data/test2081 -new file mode 100644 -index 000000000000..a6733e737beb ---- /dev/null -+++ b/tests/data/test2081 -@@ -0,0 +1,66 @@ -+ -+ -+ -+HTTP -+HTTP GET -+referer -+followlocation -+--write-out -+ -+ -+ -+# Server-side -+ -+ -+HTTP/1.1 301 This is a weirdo text message swsclose -+Location: data/%TESTNUMBER0002.txt?coolsite=yes -+Content-Length: 62 -+Connection: close -+ -+This server reply is for testing a simple Location: following -+ -+ -+ -+# Client-side -+ -+ -+http -+ -+ -+Automatic referrer credential and anchor stripping check -+ -+ -+http://user:pass@%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER#anchor --location --referer ';auto' --write-out '%{referer}\n' -+ -+ -+ -+# Verify data after the test has been "shot" -+ -+ -+52 -+ -+ -+GET /we/want/our/%TESTNUMBER HTTP/1.1 -+Host: %HOSTIP:%HTTPPORT -+Authorization: Basic dXNlcjpwYXNz -+User-Agent: curl/%VERSION -+Accept: */* -+ -+GET /we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1 -+Host: %HOSTIP:%HTTPPORT -+Authorization: Basic dXNlcjpwYXNz -+User-Agent: curl/%VERSION -+Accept: */* -+Referer: http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -+ -+ -+ -+HTTP/1.1 301 This is a weirdo text message swsclose -+Location: data/%TESTNUMBER0002.txt?coolsite=yes -+Content-Length: 62 -+Connection: close -+ -+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -+ -+ -+ diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/7.74.0-CVE-2021-22890.patch b/third_party/nixpkgs/pkgs/tools/networking/curl/7.74.0-CVE-2021-22890.patch deleted file mode 100644 index 06cc3842e3..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/curl/7.74.0-CVE-2021-22890.patch +++ /dev/null @@ -1,473 +0,0 @@ -Based on upstream b09c8ee15771c614c4bf3ddac893cdb12187c844, adapted by ris mostly to -compensate for lack of bbe3aa9f881fa27fe828e3c9a36d6831f254a3ee - -diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c -index 36c32d8d55be..39fc1a29209c 100644 ---- a/lib/vtls/bearssl.c -+++ b/lib/vtls/bearssl.c -@@ -375,7 +375,8 @@ static CURLcode bearssl_connect_step1(struct Curl_easy *data, - void *session; - - Curl_ssl_sessionid_lock(conn); -- if(!Curl_ssl_getsessionid(conn, &session, NULL, sockindex)) { -+ if(!Curl_ssl_getsessionid(conn, SSL_IS_PROXY() ? TRUE : FALSE, -+ &session, NULL, sockindex)) { - br_ssl_engine_set_session_parameters(&backend->ctx.eng, session); - infof(data, "BearSSL: re-using session ID\n"); - } -@@ -571,9 +572,13 @@ static CURLcode bearssl_connect_step3(struct Curl_easy *data, - br_ssl_engine_get_session_parameters(&backend->ctx.eng, session); - Curl_ssl_sessionid_lock(conn); -- incache = !(Curl_ssl_getsessionid(conn, &oldsession, NULL, sockindex)); -+ incache = !(Curl_ssl_getsessionid(conn, -+ SSL_IS_PROXY() ? TRUE : FALSE, -+ &oldsession, NULL, sockindex)); - if(incache) - Curl_ssl_delsessionid(conn, oldsession); -- ret = Curl_ssl_addsessionid(conn, session, 0, sockindex); -+ ret = Curl_ssl_addsessionid(conn, -+ SSL_IS_PROXY() ? TRUE : FALSE, -+ session, 0, sockindex); - Curl_ssl_sessionid_unlock(conn); - if(ret) { - free(session); -diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c -index a75937b4646c..3b0d940a60e1 100644 ---- a/lib/vtls/gtls.c -+++ b/lib/vtls/gtls.c -@@ -727,5 +727,7 @@ gtls_connect_step1(struct Curl_easy *data, - - Curl_ssl_sessionid_lock(conn); -- if(!Curl_ssl_getsessionid(conn, &ssl_sessionid, &ssl_idsize, sockindex)) { -+ if(!Curl_ssl_getsessionid(conn, -+ SSL_IS_PROXY() ? TRUE : FALSE, -+ &ssl_sessionid, &ssl_idsize, sockindex)) { - /* we got a session id, use it! */ - gnutls_session_set_data(session, ssl_sessionid, ssl_idsize); -@@ -1286,8 +1287,9 @@ gtls_connect_step3(struct Curl_easy *data, - gnutls_session_get_data(session, connect_sessionid, &connect_idsize); - - Curl_ssl_sessionid_lock(conn); -- incache = !(Curl_ssl_getsessionid(conn, &ssl_sessionid, NULL, -- sockindex)); -+ incache = !(Curl_ssl_getsessionid(conn, -+ SSL_IS_PROXY() ? TRUE : FALSE, -+ &ssl_sessionid, NULL, sockindex)); - if(incache) { - /* there was one before in the cache, so instead of risking that the - previous one was rejected, we just kill that and store the new */ -@@ -1295,8 +1297,10 @@ gtls_connect_step3(struct Curl_easy *data, - } - - /* store this session id */ -- result = Curl_ssl_addsessionid(conn, connect_sessionid, connect_idsize, -- sockindex); -+ result = Curl_ssl_addsessionid(conn, -+ SSL_IS_PROXY() ? TRUE : FALSE, -+ connect_sessionid, connect_idsize, -+ sockindex); - Curl_ssl_sessionid_unlock(conn); - if(result) { - free(connect_sessionid); -diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c -index 95cd4d99b665..93a7ac1fd87d 100644 ---- a/lib/vtls/mbedtls.c -+++ b/lib/vtls/mbedtls.c -@@ -463,7 +463,9 @@ mbed_connect_step1(struct Curl_easy *data, struct connectdata *conn, - void *old_session = NULL; - - Curl_ssl_sessionid_lock(conn); -- if(!Curl_ssl_getsessionid(conn, &old_session, NULL, sockindex)) { -+ if(!Curl_ssl_getsessionid(conn, -+ SSL_IS_PROXY() ? TRUE : FALSE, -+ &old_session, NULL, sockindex)) { - ret = mbedtls_ssl_set_session(&backend->ssl, old_session); - if(ret) { - Curl_ssl_sessionid_unlock(conn); -@@ -724,6 +726,7 @@ mbed_connect_step3(struct Curl_easy *data, struct connectdata *conn, - int ret; - mbedtls_ssl_session *our_ssl_sessionid; - void *old_ssl_sessionid = NULL; -+ bool isproxy = SSL_IS_PROXY() ? TRUE : FALSE; - - our_ssl_sessionid = malloc(sizeof(mbedtls_ssl_session)); - if(!our_ssl_sessionid) -@@ -742,10 +745,12 @@ mbed_connect_step3(struct Curl_easy *data, struct connectdata *conn, - - /* If there's already a matching session in the cache, delete it */ - Curl_ssl_sessionid_lock(conn); -- if(!Curl_ssl_getsessionid(conn, &old_ssl_sessionid, NULL, sockindex)) -+ if(!Curl_ssl_getsessionid(conn, isproxy, &old_ssl_sessionid, NULL, -+ sockindex)) - Curl_ssl_delsessionid(conn, old_ssl_sessionid); - -- retcode = Curl_ssl_addsessionid(conn, our_ssl_sessionid, 0, sockindex); -+ retcode = Curl_ssl_addsessionid(conn, isproxy, our_ssl_sessionid, -+ 0, sockindex); - Curl_ssl_sessionid_unlock(conn); - if(retcode) { - mbedtls_ssl_session_free(our_ssl_sessionid); -diff --git a/lib/vtls/mesalink.c b/lib/vtls/mesalink.c -index 4f1ab8627f49..5d6a1495d790 100644 ---- a/lib/vtls/mesalink.c -+++ b/lib/vtls/mesalink.c -@@ -261,7 +261,9 @@ mesalink_connect_step1(struct Curl_easy *data, - void *ssl_sessionid = NULL; - - Curl_ssl_sessionid_lock(conn); -- if(!Curl_ssl_getsessionid(conn, &ssl_sessionid, NULL, sockindex)) { -+ if(!Curl_ssl_getsessionid(conn, -+ SSL_IS_PROXY() ? TRUE : FALSE, -+ &ssl_sessionid, NULL, sockindex)) { - /* we got a session id, use it! */ - if(!SSL_set_session(BACKEND->handle, ssl_sessionid)) { - Curl_ssl_sessionid_unlock(conn); -@@ -345,12 +347,14 @@ mesalink_connect_step3(struct connectdata *conn, int sockindex) - bool incache; - SSL_SESSION *our_ssl_sessionid; - void *old_ssl_sessionid = NULL; -+ bool isproxy = SSL_IS_PROXY() ? TRUE : FALSE; - - our_ssl_sessionid = SSL_get_session(BACKEND->handle); - - Curl_ssl_sessionid_lock(conn); - incache = -- !(Curl_ssl_getsessionid(conn, &old_ssl_sessionid, NULL, sockindex)); -+ !(Curl_ssl_getsessionid(conn, isproxy, &old_ssl_sessionid, NULL, -+ sockindex)); - if(incache) { - if(old_ssl_sessionid != our_ssl_sessionid) { - infof(data, "old SSL session ID is stale, removing\n"); -@@ -361,8 +364,9 @@ mesalink_connect_step3(struct connectdata *conn, int sockindex) - } - - if(!incache) { -- result = Curl_ssl_addsessionid( -- conn, our_ssl_sessionid, 0 /* unknown size */, sockindex); -+ result = -+ Curl_ssl_addsessionid(conn, isproxy, our_ssl_sessionid, 0, -+ sockindex); - if(result) { - Curl_ssl_sessionid_unlock(conn); - failf(data, "failed to store ssl session"); -diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c -index 498f8b9d1d08..68b98984b460 100644 ---- a/lib/vtls/openssl.c -+++ b/lib/vtls/openssl.c -@@ -393,12 +393,23 @@ static int ossl_get_ssl_conn_index(void) - */ - static int ossl_get_ssl_sockindex_index(void) - { -- static int ssl_ex_data_sockindex_index = -1; -- if(ssl_ex_data_sockindex_index < 0) { -- ssl_ex_data_sockindex_index = SSL_get_ex_new_index(0, NULL, NULL, NULL, -- NULL); -+ static int sockindex_index = -1; -+ if(sockindex_index < 0) { -+ sockindex_index = SSL_get_ex_new_index(0, NULL, NULL, NULL, NULL); - } -- return ssl_ex_data_sockindex_index; -+ return sockindex_index; -+} -+ -+/* Return an extra data index for proxy boolean. -+ * This index can be used with SSL_get_ex_data() and SSL_set_ex_data(). -+ */ -+static int ossl_get_proxy_index(void) -+{ -+ static int proxy_index = -1; -+ if(proxy_index < 0) { -+ proxy_index = SSL_get_ex_new_index(0, NULL, NULL, NULL, NULL); -+ } -+ return proxy_index; - } - - static int passwd_callback(char *buf, int num, int encrypting, -@@ -1174,6 +1185,7 @@ static int ossl_init(void) - - /* Initialize the extra data indexes */ -- if(ossl_get_ssl_conn_index() < 0 || ossl_get_ssl_sockindex_index() < 0) -+ if(ossl_get_ssl_conn_index() < 0 || -+ ossl_get_ssl_sockindex_index() < 0 || ossl_get_proxy_index() < 0) - return 0; - - return 1; -@@ -2432,8 +2443,10 @@ static int ossl_new_session_cb(SSL *ssl, SSL_SESSION *ssl_sessionid) - curl_socket_t *sockindex_ptr; - int connectdata_idx = ossl_get_ssl_conn_index(); - int sockindex_idx = ossl_get_ssl_sockindex_index(); -+ int proxy_idx = ossl_get_proxy_index(); -+ bool isproxy; - -- if(connectdata_idx < 0 || sockindex_idx < 0) -+ if(connectdata_idx < 0 || sockindex_idx < 0 || proxy_idx < 0) - return 0; - - conn = (struct connectdata*) SSL_get_ex_data(ssl, connectdata_idx); -@@ -2446,13 +2459,18 @@ static int ossl_new_session_cb(SSL *ssl, SSL_SESSION *ssl_sessionid) - sockindex_ptr = (curl_socket_t*) SSL_get_ex_data(ssl, sockindex_idx); - sockindex = (int)(sockindex_ptr - conn->sock); - -+ isproxy = SSL_get_ex_data(ssl, proxy_idx) ? TRUE : FALSE; -+ - if(SSL_SET_OPTION(primary.sessionid)) { - bool incache; - void *old_ssl_sessionid = NULL; - - Curl_ssl_sessionid_lock(conn); -- incache = !(Curl_ssl_getsessionid(conn, &old_ssl_sessionid, NULL, -- sockindex)); -+ if(isproxy) -+ incache = FALSE; -+ else -+ incache = !(Curl_ssl_getsessionid(conn, isproxy, -+ &old_ssl_sessionid, NULL, sockindex)); - if(incache) { - if(old_ssl_sessionid != ssl_sessionid) { - infof(data, "old SSL session ID is stale, removing\n"); -@@ -2462,8 +2480,8 @@ static int ossl_new_session_cb(SSL *ssl, SSL_SESSION *ssl_sessionid) - } - - if(!incache) { -- if(!Curl_ssl_addsessionid(conn, ssl_sessionid, -- 0 /* unknown size */, sockindex)) { -+ if(!Curl_ssl_addsessionid(conn, isproxy, ssl_sessionid, -+ 0 /* unknown size */, sockindex)) { - /* the session has been put into the session cache */ - res = 1; - } -@@ -3193,16 +3211,26 @@ static CURLcode ossl_connect_step1(struct Curl_easy *data, - void *ssl_sessionid = NULL; - int connectdata_idx = ossl_get_ssl_conn_index(); - int sockindex_idx = ossl_get_ssl_sockindex_index(); -+ int proxy_idx = ossl_get_proxy_index(); - -- if(connectdata_idx >= 0 && sockindex_idx >= 0) { -+ if(connectdata_idx >= 0 && sockindex_idx >= 0 && -+ proxy_idx >= 0) { - /* Store the data needed for the "new session" callback. - * The sockindex is stored as a pointer to an array element. */ - SSL_set_ex_data(backend->handle, connectdata_idx, conn); - SSL_set_ex_data(backend->handle, sockindex_idx, conn->sock + sockindex); -+#ifndef CURL_DISABLE_PROXY -+ SSL_set_ex_data(backend->handle, proxy_idx, SSL_IS_PROXY() ? (void *) 1: -+ NULL); -+#else -+ SSL_set_ex_data(backend->handle, proxy_idx, NULL); -+#endif -+ - } - - Curl_ssl_sessionid_lock(conn); -- if(!Curl_ssl_getsessionid(conn, &ssl_sessionid, NULL, sockindex)) { -+ if(!Curl_ssl_getsessionid(conn, SSL_IS_PROXY() ? TRUE : FALSE, -+ &ssl_sessionid, NULL, sockindex)) { - /* we got a session id, use it! */ - if(!SSL_set_session(backend->handle, ssl_sessionid)) { - Curl_ssl_sessionid_unlock(conn); -diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c -index d7b89d43f892..931bd853eb8e 100644 ---- a/lib/vtls/schannel.c -+++ b/lib/vtls/schannel.c -@@ -496,5 +496,7 @@ schannel_connect_step1(struct Curl_easy *data, struct connectdata *conn, - if(SSL_SET_OPTION(primary.sessionid)) { - Curl_ssl_sessionid_lock(conn); -- if(!Curl_ssl_getsessionid(conn, (void **)&old_cred, NULL, sockindex)) { -+ if(!Curl_ssl_getsessionid(conn, -+ SSL_IS_PROXY() ? TRUE : FALSE, -+ (void **)&old_cred, NULL, sockindex)) { - BACKEND->cred = old_cred; - DEBUGF(infof(data, "schannel: re-using existing credential handle\n")); -@@ -1337,8 +1338,9 @@ schannel_connect_step3(struct Curl_easy *data, struct connectdata *conn, - struct ssl_connect_data *connssl = &conn->ssl[sockindex]; - SECURITY_STATUS sspi_status = SEC_E_OK; - CERT_CONTEXT *ccert_context = NULL; -+ bool isproxy = SSL_IS_PROXY(); - #ifdef DEBUGBUILD -- const char * const hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name : -+ const char * const hostname = isproxy ? conn->http_proxy.host.name : - conn->host.name; - #endif - #ifdef HAS_ALPN -@@ -1414,8 +1416,8 @@ schannel_connect_step3(struct Curl_easy *data, struct connectdata *conn, - struct Curl_schannel_cred *old_cred = NULL; - - Curl_ssl_sessionid_lock(conn); -- incache = !(Curl_ssl_getsessionid(conn, (void **)&old_cred, NULL, -- sockindex)); -+ incache = !(Curl_ssl_getsessionid(conn, isproxy, (void **)&old_cred, -+ NULL, sockindex)); - if(incache) { - if(old_cred != BACKEND->cred) { - DEBUGF(infof(data, -@@ -1426,7 +1428,7 @@ schannel_connect_step3(struct Curl_easy *data, struct connectdata *conn, - } - } - if(!incache) { -- result = Curl_ssl_addsessionid(conn, (void *)BACKEND->cred, -+ result = Curl_ssl_addsessionid(conn, isproxy, BACKEND->cred, - sizeof(struct Curl_schannel_cred), - sockindex); - if(result) { -diff --git a/lib/vtls/sectransp.c b/lib/vtls/sectransp.c -index 05b57dfaad91..e69b99b72cd6 100644 ---- a/lib/vtls/sectransp.c -+++ b/lib/vtls/sectransp.c -@@ -1400,10 +1400,12 @@ static CURLcode sectransp_connect_step1(struct Curl_easy *data, - char * const ssl_cert = SSL_SET_OPTION(primary.clientcert); - const struct curl_blob *ssl_cert_blob = SSL_SET_OPTION(primary.cert_blob); - #ifndef CURL_DISABLE_PROXY -- const char * const hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name : -+ bool isproxy = SSL_IS_PROXY(); -+ const char * const hostname = isproxy ? conn->http_proxy.host.name : - conn->host.name; - const long int port = SSL_IS_PROXY() ? conn->port : conn->remote_port; - #else -+ const isproxy = FALSE; - const char * const hostname = conn->host.name; - const long int port = conn->remote_port; - #endif -@@ -1613,7 +1615,7 @@ static CURLcode sectransp_connect_step1(struct Curl_easy *data, - #ifdef USE_NGHTTP2 - if(data->state.httpversion >= CURL_HTTP_VERSION_2 - #ifndef CURL_DISABLE_PROXY -- && (!SSL_IS_PROXY() || !conn->bits.tunnel_proxy) -+ && (!isproxy || !conn->bits.tunnel_proxy) - #endif - ) { - CFArrayAppendValue(alpnArr, CFSTR(NGHTTP2_PROTO_VERSION_ID)); -@@ -1953,7 +1955,7 @@ static CURLcode sectransp_connect_step1(struct Curl_easy *data, - size_t ssl_sessionid_len; - - Curl_ssl_sessionid_lock(conn); -- if(!Curl_ssl_getsessionid(conn, (void **)&ssl_sessionid, -+ if(!Curl_ssl_getsessionid(conn, isproxy, (void **)&ssl_sessionid, - &ssl_sessionid_len, sockindex)) { - /* we got a session id, use it! */ - err = SSLSetPeerID(backend->ssl_ctx, ssl_sessionid, ssl_sessionid_len); -@@ -1981,7 +1983,7 @@ static CURLcode sectransp_connect_step1(struct Curl_easy *data, - return CURLE_SSL_CONNECT_ERROR; - } - -- result = Curl_ssl_addsessionid(conn, ssl_sessionid, ssl_sessionid_len, -+ result = Curl_ssl_addsessionid(conn, isproxy, ssl_sessionid, ssl_sessionid_len, - sockindex); - Curl_ssl_sessionid_unlock(conn); - if(result) { -diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c -index 6a0069237fdb..95fd6356285f 100644 ---- a/lib/vtls/vtls.c -+++ b/lib/vtls/vtls.c -@@ -367,5 +367,6 @@ void Curl_ssl_sessionid_unlock(struct Curl_easy *data) - */ - bool Curl_ssl_getsessionid(struct connectdata *conn, -+ const bool isProxy, - void **ssl_sessionid, - size_t *idsize, /* set 0 if unknown */ - int sockindex) -@@ -377,7 +378,6 @@ bool Curl_ssl_getsessionid(struct Curl_easy *data, - bool no_match = TRUE; - - #ifndef CURL_DISABLE_PROXY -- const bool isProxy = CONNECT_PROXY_SSL(); - struct ssl_primary_config * const ssl_config = isProxy ? - &conn->proxy_ssl_config : - &conn->ssl_config; -@@ -389,10 +389,15 @@ bool Curl_ssl_getsessionid(struct Curl_easy *data, - struct ssl_primary_config * const ssl_config = &conn->ssl_config; - const char * const name = conn->host.name; - int port = conn->remote_port; -- (void)sockindex; - #endif -+ (void)sockindex; - *ssl_sessionid = NULL; - -+#ifdef CURL_DISABLE_PROXY -+ if(isProxy) -+ return TRUE; -+#endif -+ - DEBUGASSERT(SSL_SET_OPTION(primary.sessionid)); - - if(!SSL_SET_OPTION(primary.sessionid)) -@@ -480,5 +485,6 @@ void Curl_ssl_delsessionid(struct Curl_easy *data, void *ssl_sessionid) - */ - CURLcode Curl_ssl_addsessionid(struct connectdata *conn, -+ bool isProxy, - void *ssl_sessionid, - size_t idsize, - int sockindex) -@@ -492,7 +498,6 @@ CURLcode Curl_ssl_addsessionid(struct Curl_easy *data, - int conn_to_port; - long *general_age; - #ifndef CURL_DISABLE_PROXY -- const bool isProxy = CONNECT_PROXY_SSL(); - struct ssl_primary_config * const ssl_config = isProxy ? - &conn->proxy_ssl_config : - &conn->ssl_config; -@@ -505,6 +510,7 @@ CURLcode Curl_ssl_addsessionid(struct Curl_easy *data, - const char *hostname = conn->host.name; - (void)sockindex; - #endif -+ (void)sockindex; - DEBUGASSERT(SSL_SET_OPTION(primary.sessionid)); - - clone_host = strdup(hostname); -diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h -index 273184f1894a..2b43e7744b19 100644 ---- a/lib/vtls/vtls.h -+++ b/lib/vtls/vtls.h -@@ -235,5 +235,6 @@ void Curl_ssl_sessionid_unlock(struct Curl_easy *data); - */ - bool Curl_ssl_getsessionid(struct connectdata *conn, -+ const bool isproxy, - void **ssl_sessionid, - size_t *idsize, /* set 0 if unknown */ - int sockindex); -@@ -245,5 +246,6 @@ bool Curl_ssl_getsessionid(struct Curl_easy *data, - */ - CURLcode Curl_ssl_addsessionid(struct connectdata *conn, -+ const bool isProxy, - void *ssl_sessionid, - size_t idsize, - int sockindex); -diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c -index 7159ac9d5e64..8fb2ea7acf31 100644 ---- a/lib/vtls/wolfssl.c -+++ b/lib/vtls/wolfssl.c -@@ -516,7 +516,9 @@ wolfssl_connect_step1(struct Curl_easy *data, struct connectdata *conn, - void *ssl_sessionid = NULL; - - Curl_ssl_sessionid_lock(conn); -- if(!Curl_ssl_getsessionid(conn, &ssl_sessionid, NULL, sockindex)) { -+ if(!Curl_ssl_getsessionid(conn, -+ SSL_IS_PROXY() ? TRUE : FALSE, -+ &ssl_sessionid, NULL, sockindex)) { - /* we got a session id, use it! */ - if(!SSL_set_session(backend->handle, ssl_sessionid)) { - char error_buffer[WOLFSSL_MAX_ERROR_SZ]; -@@ -772,10 +774,11 @@ wolfssl_connect_step3(struct Curl_easy *data, struct connectdata *conn, - void *old_ssl_sessionid = NULL; - - our_ssl_sessionid = SSL_get_session(backend->handle); -+ bool isproxy = SSL_IS_PROXY() ? TRUE : FALSE; - - Curl_ssl_sessionid_lock(conn); -- incache = !(Curl_ssl_getsessionid(conn, &old_ssl_sessionid, NULL, -- sockindex)); -+ incache = !(Curl_ssl_getsessionid(conn, isproxy, -+ &old_ssl_sessionid, NULL, sockindex)); - if(incache) { - if(old_ssl_sessionid != our_ssl_sessionid) { - infof(data, "old SSL session ID is stale, removing\n"); -@@ -786,8 +789,8 @@ wolfssl_connect_step3(struct Curl_easy *data, struct connectdata *conn, - } - - if(!incache) { -- result = Curl_ssl_addsessionid(conn, our_ssl_sessionid, -- 0 /* unknown size */, sockindex); -+ result = Curl_ssl_addsessionid(conn, isproxy, our_ssl_sessionid, -+ 0, sockindex); - if(result) { - Curl_ssl_sessionid_unlock(conn); - failf(data, "failed to store ssl session"); diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix index 7c24be7aea..f73ab77387 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix @@ -35,21 +35,16 @@ assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.74.0"; + version = "7.76.1"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "19bp3d91xq9vqwlbzq261j23mk9lz4lyka4gr2fm6dhnd3k66k8g"; + sha256 = "1scmfrp0c27pkd7yva9k50miprjpsyfbb33apx72qc9igm6ii3ks"; }; - patches = [ - ./7.74.0-CVE-2021-22876.patch - ./7.74.0-CVE-2021-22890.patch - ]; - outputs = [ "bin" "dev" "out" "man" "devdoc" ]; separateDebugInfo = stdenv.isLinux; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix index a9e4b1390a..131a645d83 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "dnsmasq"; - version = "2.84"; + version = "2.85"; src = fetchurl { - url = "http://www.thekelleys.org.uk/dnsmasq/${pname}-${version}.tar.xz"; - sha256 = "sha256-YDGVxktzE3YJsH4QJK4LN/ZSsvX+Rn3OZphbPRhQBQw="; + url = "https://www.thekelleys.org.uk/dnsmasq/${pname}-${version}.tar.xz"; + sha256 = "sha256-rZjTgD32h+W5OAgPPSXGKP5ByHh1LQP7xhmXh/7jEvo="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = { description = "An integrated DNS, DHCP and TFTP server for small networks"; - homepage = "http://www.thekelleys.org.uk/dnsmasq/doc.html"; + homepage = "https://www.thekelleys.org.uk/dnsmasq/doc.html"; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ eelco fpletz globin ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index a6e767c6bf..d48f47e638 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.37.2"; + version = "0.37.4"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pzE0nhL6Dqa9AfB2EGxETOo+BnTzzPnu8ANfbu1vfyI="; + sha256 = "sha256-EV/+m7Uzf7s6+J0jdsim3UP84iK/tXlPNfkyrtrx5NQ="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix b/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix index a32e98ca18..018a210e4a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix @@ -4,24 +4,25 @@ , rustPlatform , installShellFiles , perl +, libiconv , Security }: rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "4.0.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-uv1boI9iaBeobo/58Di4oslh1eGLuK9HR5EwQQeWn+0="; + sha256 = "sha256-UC70XmhAVf2a2QO9bkIRE5vEsWyIA0DudZfKraNffGY="; }; - cargoSha256 = "sha256-31OD/sv4br9cdBNqNGr4McypSGkBbKs7b7H1u7mFt3o="; + cargoSha256 = "sha256-Cdfh3smX6UjiG29L9hG22bOQQIjaNrv+okl153mIiso="; nativeBuildInputs = [ installShellFiles perl ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; postInstall = '' installManPage ${pname}.1 diff --git a/third_party/nixpkgs/pkgs/tools/networking/getmail6/default.nix b/third_party/nixpkgs/pkgs/tools/networking/getmail6/default.nix index e6f3a2f108..673ff7f83a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/getmail6/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/getmail6/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "getmail6"; - version = "6.15"; + version = "6.16"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0cvwvlhilrqlcvza06lsrm5l1yazzvym3s5kcjxcm9cminfaf4qb"; + sha256 = "1y373nzbffjjjs43441cn3wrb0yq1mw2vqixhizbzdacrs45xbfa"; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ghostunnel/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ghostunnel/default.nix new file mode 100644 index 0000000000..5d00b493bc --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/ghostunnel/default.nix @@ -0,0 +1,29 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, + nixosTests, +}: + +buildGoModule rec { + pname = "ghostunnel"; + version = "1.5.3"; + + src = fetchFromGitHub { + owner = "ghostunnel"; + repo = "ghostunnel"; + rev = "v${version}"; + sha256 = "15rmd89j7sfpznzznss899smizbyshprsrvsdmrbhb617myd9fpy"; + }; + + vendorSha256 = "1i95fx4a0fh6id6iy6afbva4pazr7ym6sbwi9r7la6gxzyncd023"; + + meta = with lib; { + description = "A simple TLS proxy with mutual authentication support for securing non-TLS backend applications"; + homepage = "https://github.com/ghostunnel/ghostunnel#readme"; + license = licenses.asl20; + maintainers = with maintainers; [ roberth ]; + }; + + passthru.tests.nixos = nixosTests.ghostunnel; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix index d48234f8dc..942df983fc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "2.26.0"; + version = "2.27.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-sQmTIjBvCzd8ZXAayhPdRSRwBovH8BFRwazusSE52IE="; + sha256 = "sha256-Ofg+z8wUttqM1THatPFi0cuyLSEryhTmg3JC1o+16eA="; }; vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix index 33ea36da38..6b7e0e0b4e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix @@ -1,6 +1,8 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub +, libiconv }: rustPlatform.buildRustPackage rec { @@ -16,6 +18,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-2PxhtAqROgufVGGH7VtEJJU6Sa2OrGbbMVRUWYbAD0Q="; + buildInputs = lib.optional stdenv.isDarwin libiconv; + meta = with lib; { description = "Ping, but with a graph"; homepage = "https://github.com/orf/gping"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix index 655cf11830..c1861e33c0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix @@ -10,7 +10,7 @@ , gettext , gupnp-av , gtksourceview4 -, gnome3 +, gnome , wrapGAppsHook }: @@ -38,12 +38,13 @@ stdenv.mkDerivation rec { gtk3 gupnp-av gtksourceview4 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix index eefa49acb9..bb79ad956a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { "USE_PCRE_JIT=yes" ] ++ lib.optionals useLua [ "USE_LUA=yes" + "LUA_LIB_NAME=lua" "LUA_LIB=${lua5_3}/lib" "LUA_INC=${lua5_3}/include" ] ++ lib.optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/httperf/default.nix b/third_party/nixpkgs/pkgs/tools/networking/httperf/default.nix index ea567f10d4..975b050de7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/httperf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/httperf/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The httperf HTTP load generator"; homepage = "https://github.com/httperf/httperf"; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix index 7f27efc873..48ebf33c41 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.37.0"; + version = "2.38.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-//ootg0RZR2vzO702jGXuJ5qGMO49GSG0Lw6dKzGGt8="; + sha256 = "sha256-8wy6Zdnw0JgnHFLa1U3qlzjpDIqi2gykbkkV7lh+Zag="; }; buildInputs = with lib; [ boost zlib openssl ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix b/third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix index 1290ec2bdb..285031aaca 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, ncurses, perl, help2man }: +{ stdenv, lib, fetchurl, ncurses, perl, help2man +, apparmorRulesFromClosure +}: stdenv.mkDerivation rec { name = "inetutils-1.9.4"; @@ -8,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy"; }; + outputs = ["out" "apparmor"]; + patches = [ ./whois-Update-Canadian-TLD-server.patch ./service-name.patch @@ -41,6 +45,23 @@ stdenv.mkDerivation rec { installFlags = [ "SUIDMODE=" ]; + postInstall = '' + mkdir $apparmor + cat >$apparmor/bin.ping < + include + include + include "${apparmorRulesFromClosure { name = "ping"; } [stdenv.cc.libc]}" + include + capability net_raw, + network inet raw, + network inet6 raw, + mr $out/bin/ping, + } + EOF + ''; + meta = with lib; { description = "Collection of common network programs"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix b/third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix index af00339683..7a39c250cc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; postInstall = '' installManPage doc/innernet-server.8.gz diff --git a/third_party/nixpkgs/pkgs/tools/networking/ipinfo/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ipinfo/default.nix new file mode 100644 index 0000000000..03c54f1ac7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/ipinfo/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ipinfo"; + version = "1.1.4"; + + src = fetchFromGitHub { + owner = pname; + repo = "cli"; + rev = "${pname}-${version}"; + sha256 = "1j50bbq7skbh1pffkmrbs1cyz2x22bniwcdw27rjzmvjixs4wj6h"; + }; + + vendorSha256 = null; + + meta = with lib; { + description = "Command Line Interface for the IPinfo API"; + homepage = "https://github.com/ipinfo/cli"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix b/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix index ac8c515642..dafc25b3a2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "1.9.6"; + version = "1.9.7"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-sEFE5OfYt1mcAnGZCWqYFzIepzKNZZcd2rVhdxv/3sw="; + sha256 = "sha256-3/A0cG9AiyiWMk0GUjeUAHm0uRw5Q9PsEA2S6WZ8clo="; }; patches = [ ./dont-create-var.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix index 1059baf13e..24b7176e82 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix @@ -1,71 +1,114 @@ -{ lib, stdenv, fetchurl, makeWrapper, - pkg-config, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr, - bash, iproute2, iptables, procps, coreutils, gnused, gawk, nss, which, python3, - docs ? false, xmlto, libselinux, ldns - }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, nixosTests +, pkg-config +, systemd +, gmp +, unbound +, bison +, flex +, pam +, libevent +, libcap_ng +, curl +, nspr +, bash +, iproute2 +, iptables +, procps +, coreutils +, gnused +, gawk +, nss +, which +, python3 +, libselinux +, ldns +, xmlto +, docbook_xml_dtd_412 +, docbook_xsl +, findXMLCatalogs +}: let + # Tools needed by ipsec scripts binPath = lib.makeBinPath [ - bash iproute2 iptables procps coreutils gnused gawk nss.tools which python3 + iproute2 iptables procps + coreutils gnused gawk + nss.tools which ]; in -assert docs -> xmlto != null; -assert stdenv.isLinux -> libselinux != null; - stdenv.mkDerivation rec { pname = "libreswan"; - version = "3.32"; + version = "4.4"; src = fetchurl { url = "https://download.libreswan.org/${pname}-${version}.tar.gz"; - sha256 = "0bj3g6qwd3ir3gk6hdl9npy3k44shf56vcgjahn30qpmx3z5fsr3"; + sha256 = "0xj974yc0y1r7235zl4jhvxqz3bpb8js2fy9ic820zq9swh0lgsz"; }; strictDeps = true; - # These flags were added to compile v3.18. Try to lift them when updating. - NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral" - # these flags were added to build with gcc7 - "-Wno-error=implicit-fallthrough" - "-Wno-error=format-truncation" - "-Wno-error=pointer-compare" - "-Wno-error=stringop-truncation" - # The following flag allows libreswan v3.32 to work with NSS 3.22, see - # https://github.com/libreswan/libreswan/issues/334. - # This flag should not be needed for libreswan v3.33 (which is not yet released). - "-DNSS_PKCS11_2_0_COMPAT=1" - ]; - nativeBuildInputs = [ bison flex - makeWrapper pkg-config + xmlto + docbook_xml_dtd_412 + docbook_xsl + findXMLCatalogs ]; - buildInputs = [ bash iproute2 iptables systemd coreutils gnused gawk gmp unbound pam libevent - libcap_ng curl nspr nss python3 ldns ] - ++ lib.optional docs xmlto - ++ lib.optional stdenv.isLinux libselinux; + buildInputs = [ + systemd coreutils + gnused gawk gmp unbound pam libevent + libcap_ng curl nspr nss ldns + # needed to patch shebangs + python3 bash + ] ++ lib.optional stdenv.isLinux libselinux; + + patches = [ + # Fix compilation on aarch64, remove on next update + (fetchpatch { + url = "https://github.com/libreswan/libreswan/commit/ea50d36d2886e44317ba5ba841de1d1bf91aee6c.patch"; + sha256 = "1jp89rm9jp55zmiyimyhg7yadj0fwwxaw7i5gyclrs38w3y1aacj"; + }) + ]; prePatch = '' - # Correct bash path - sed -i -e 's|/bin/bash|/usr/bin/env bash|' mk/config.mk + # Correct iproute2 path + sed -e 's|"/sbin/ip"|"${iproute2}/bin/ip"|' \ + -e 's|"/sbin/iptables"|"${iptables}/bin/iptables"|' \ + -i initsystems/systemd/ipsec.service.in \ + programs/verify/verify.in - # Fix systemd unit directory, and prevent the makefile from trying to reload the - # systemd daemon or create tmpfiles - sed -i -e 's|UNITDIR=.*$|UNITDIR=$\{out}/etc/systemd/system/|g' \ - -e 's|TMPFILESDIR=.*$|TMPFILESDIR=$\{out}/tmpfiles.d/|g' \ - -e 's|systemctl|true|g' \ - -e 's|systemd-tmpfiles|true|g' \ - initsystems/systemd/Makefile + # Prevent the makefile from trying to + # reload the systemd daemon or create tmpfiles + sed -e 's|systemctl|true|g' \ + -e 's|systemd-tmpfiles|true|g' \ + -i initsystems/systemd/Makefile # Fix the ipsec program from crushing the PATH - sed -i -e 's|\(PATH=".*"\):.*$|\1:$PATH|' programs/ipsec/ipsec.in + sed -e 's|\(PATH=".*"\):.*$|\1:$PATH|' -i programs/ipsec/ipsec.in # Fix python script to use the correct python - sed -i -e 's|#!/usr/bin/python|#!/usr/bin/env python|' -e 's/^\(\W*\)installstartcheck()/\1sscmd = "ss"\n\0/' programs/verify/verify.in + sed -e 's/^\(\W*\)installstartcheck()/\1sscmd = "ss"\n\0/' \ + -i programs/verify/verify.in + + # Replace wget with curl to save a dependency + curlArgs='-s --remote-name-all --output-dir' + sed -e "s|wget -q -P|${curl}/bin/curl $curlArgs|g" \ + -i programs/letsencrypt/letsencrypt.in + + # Patch the Makefile: + # 1. correct the pam.d directory install path + # 2. do not create the /var/lib/ directory + sed -e 's|$(DESTDIR)/etc/pam.d|$(out)/etc/pam.d|' \ + -e '/test ! -d $(NSSDIR)/,+3d' \ + -i configs/Makefile ''; # Set appropriate paths for build @@ -73,10 +116,10 @@ stdenv.mkDerivation rec { makeFlags = [ "INITSYSTEM=systemd" - (if docs then "all" else "base") + "UNITDIR=$(out)/etc/systemd/system/" + "TMPFILESDIR=$(out)/lib/tmpfiles.d/" ]; - installTargets = [ (if docs then "install" else "install-base") ]; # Hack to make install work installFlags = [ "FINALVARDIR=\${out}/var" @@ -84,18 +127,23 @@ stdenv.mkDerivation rec { ]; postInstall = '' - for i in $out/bin/* $out/libexec/ipsec/*; do - wrapProgram "$i" --prefix PATH ':' "$out/bin:${binPath}" - done + # Install examples directory (needed for letsencrypt) + cp -r docs/examples $out/share/doc/libreswan/examples ''; - enableParallelBuilding = true; + postFixup = '' + # Add a PATH to the main "ipsec" script + sed -e '0,/^$/{s||export PATH=${binPath}:$PATH|}' \ + -i $out/bin/ipsec + ''; + + passthru.tests.libreswan = nixosTests.libreswan; meta = with lib; { homepage = "https://libreswan.org"; description = "A free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange"; platforms = platforms.linux ++ platforms.freebsd; - license = licenses.gpl2; - maintainers = [ maintainers.afranchuk ]; + license = with licenses; [ gpl2Plus mpl20 ] ; + maintainers = with maintainers; [ afranchuk rnhmjoj ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/lldpd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/lldpd/default.nix index f2641235a1..a4e5d56575 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/lldpd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "sha256-RFstdgN+8+vQPUDh/B8p7wgQL6o6Cf6Ea5Unl8i8dyI="; + sha256 = "sha256-tR0VcA+678t/uFw1BrSdMxc6DxXXAPkz7wRAZ7QtRuQ="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix index 05b04cf948..aea0faddf5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, iptables, libuuid, pkg-config , which, iproute2, gnused, coreutils, gawk, makeWrapper +, nixosTests }: let @@ -30,6 +31,10 @@ stdenv.mkDerivation rec { done ''; + passthru.tests = { + bittorrent-integration = nixosTests.bittorrent; + }; + meta = with lib; { homepage = "http://miniupnp.free.fr/"; description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/modem-manager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/modem-manager/default.nix index 06102ac2d9..71ea50ea17 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/modem-manager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/modem-manager/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "modem-manager"; - version = "1.14.10"; + version = "1.14.12"; package = "ModemManager"; src = fetchurl { url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "sha256-TqYLN1p2HhfnuwlbyolFee0OjjOyc9xpi1y+A5R/NX8="; + sha256 = "sha256-0QqXEZndwl3N8VbFasCOkWEsCVOdVlIueu1G1G5IO7E="; }; nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix index f6c45fc074..5f83ffae05 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix @@ -5,7 +5,7 @@ , gettext , pkg-config , networkmanager -, gnome3 +, gnome , libnotify , libsecret , polkit @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "network-manager-applet"; - version = "1.20.0"; + version = "1.22.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0lsjkbv66hn7acl2pg9h6hz4b700zzv4cjwrwjvy7043blw0bcla"; + sha256 = "sha256-xw2AtI1AqcuZ7JZ8xDifZ+fwMBUopp1IFXIEEzGmRr4="; }; mesonFlags = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { glib glib-networking libappindicator-gtk3 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ @@ -72,9 +72,10 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanagerapplet"; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix index c2de2ed8ad..11c5462ab2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll, intltool, pkg-config, fetchpatch, dbus -, gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala +, gnome, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala , libgcrypt, dnsmasq, bluez5, readline, libselinux, audit , gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup , ethtool, gnused, iputils, kmod, jansson, gtk-doc, libxslt @@ -10,11 +10,11 @@ let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.30.2"; + version = "1.30.4"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-DI6A53h3hg5KTmq0oPfNwRhuNWtlsEKnUYlxiLiJRNI="; + sha256 = "sha256-YFC3JCEuo85zhhEzWb6pr6H2eaVPYNmZpZmYkuZywZA="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager"; }; @@ -106,7 +106,7 @@ in stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/NetworkManager"; description = "Network configuration and management tool"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ phreedom domenkozar obadz worldofpeace ]; + maintainers = teams.freedesktop.members ++ (with maintainers; [ phreedom domenkozar obadz ]); platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix index 20388f242e..f97bac13cf 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix @@ -11,7 +11,7 @@ , ppp , libsecret , withGnome ? true -, gnome3 +, gnome , fetchpatch , libnma }: @@ -69,9 +69,10 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-fortisslvpn"; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/iodine/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/iodine/default.nix index 87069d3c3c..e56d9411b3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/iodine/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/iodine/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkg-config, networkmanager, libsecret, gtk3 -, withGnome ? true, gnome3, fetchpatch, libnma, glib }: +, withGnome ? true, gnome, fetchpatch, libnma, glib }: let pname = "NetworkManager-iodine"; @@ -44,7 +44,7 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-iodine"; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix index 3d97493322..50fc66a8d6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -7,7 +7,7 @@ , pkg-config , vala , networkmanager -, gnome3 +, gnome , isocodes , libxml2 , docbook_xsl @@ -75,8 +75,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openconnect/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openconnect/default.nix index 462eb3793d..c03a698514 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openconnect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openconnect/default.nix @@ -13,7 +13,7 @@ , file , gtk3 , withGnome ? true -, gnome3 +, gnome , kmod , fetchpatch }: @@ -66,9 +66,10 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-openconnect"; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix index 4a9e508fcd..06df79e470 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkg-config, file, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, kmod, libnma }: +, gtk3, withGnome ? true, gnome, kmod, libnma }: let pname = "NetworkManager-openvpn"; @@ -31,9 +31,10 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-openvpn"; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/sstp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/sstp/default.nix index d00c0e3e55..f486623443 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/sstp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/sstp/default.nix @@ -4,7 +4,7 @@ , fetchpatch , file , glib -, gnome3 +, gnome , gtk3 , intltool , libnma @@ -50,7 +50,7 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-sstp"; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/strongswan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/strongswan/default.nix index c4cb79b4c8..cebcec35a3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/strongswan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/strongswan/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, intltool, pkg-config, networkmanager, strongswanNM -, gtk3, gnome3, libsecret, libnma }: +, gtk3, gnome, libsecret, libnma }: stdenv.mkDerivation rec { pname = "NetworkManager-strongswan"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/vpnc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/vpnc/default.nix index 6ac71efc26..70e7104696 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/vpnc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/vpnc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll, vpnc, intltool, pkg-config, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, glib, kmod, file, fetchpatch, libnma }: +, gtk3, withGnome ? true, gnome, glib, kmod, file, fetchpatch, libnma }: let pname = "NetworkManager-vpnc"; version = "1.2.6"; @@ -35,9 +35,10 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-vpnc"; + versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/nfstrace/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nfstrace/default.nix index a1bf83726d..ca75e50fa5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nfstrace/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nfstrace/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/nfstrace/raw/debian/0.4.3.1-3/debian/patches/reproducible_build.patch"; sha256 = "0fd96r8xi142kjwibqkd46s6jwsg5kfc5v28bqsj9rdlc2aqmay5"; }) + # Fixes build failure with gcc-10 + # Related PR https://github.com/epam/nfstrace/pull/42/commits/4562a895ed3ac0e811bdd489068ad3ebe4d7b501 + (fetchpatch { + url = "https://github.com/epam/nfstrace/commit/4562a895ed3ac0e811bdd489068ad3ebe4d7b501.patch"; + sha256 = "1fbicbllyykjknik7asa81x0ixxmbwqwkiz74cnznagv10jlkj3p"; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/ofono/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ofono/default.nix index 8113f84243..93e1415b91 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ofono/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ofono/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "ofono"; - version = "1.31"; + version = "1.32"; outputs = [ "out" "dev" ]; src = fetchgit { url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git"; rev = version; - sha256 = "033y3vggjxn1c7mw75j452idp7arrdv51axs727f7l3c5lnxqdjy"; + sha256 = "sha256-bJ7Qgau5soPiptrhcMZ8rWxfprRCTeR7OjQ5HZQ9hbc="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix index 787067881a..b195c655c9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper }: +{ callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: -stdenv.mkDerivation rec { - version = "5.0.0"; +let this = stdenv.mkDerivation rec { + version = "5.1.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,16 +12,20 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "13kgc84kyrypr0xy4xifrzqcy4qlvcxc7f0jy3n1xkjl3vhav7w3"; + sha256 = "06dvy4pwgpyf209n0b27qwkjj7zlgadg2czwxapy94fd1wpq9yb2"; }; phases = [ "installPhase" ]; installPhase = '' + runHook preInstall + install -D "$src" "$out/share/java/${jarfilename}" makeWrapper ${jre}/bin/java $out/bin/${pname} \ --add-flags "-jar $out/share/java/${jarfilename}" + + runHook postInstall ''; meta = with lib; { @@ -30,4 +34,9 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = [ maintainers.shou ]; }; -} + + passthru.tests.example = callPackage ./example.nix { + openapi-generator-cli = this; + }; +}; +in this diff --git a/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/example.nix b/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/example.nix new file mode 100644 index 0000000000..f59173b974 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/example.nix @@ -0,0 +1,31 @@ +{ openapi-generator-cli, fetchurl, runCommand }: + +runCommand "openapi-generator-cli-test" { + nativeBuildInputs = [ openapi-generator-cli ]; + petstore = fetchurl { + url = "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/14c0908becbccd78252be49bd92be8c53cd2b9e3/examples/v3.0/petstore.yaml"; + sha256 = "sha256:1mgdbzv42alv0b1a18dqbabqyvyhrg3brynr5hqsrm3qljfzaq5b"; + }; + config = builtins.toJSON { + elmVersion = "0.19"; + elmPrefixCustomTypeVariants = false; + }; + passAsFile = [ "config" ]; +} '' + openapi-generator-cli generate \ + --input-spec $petstore \ + --enable-post-process-file \ + --generator-name elm \ + --config "$config" \ + --additional-properties elmEnableCustomBasePaths=true \ + --output "$out" \ + ; + find $out + echo >&2 'Looking for some keywords' + set -x + grep 'module Api.Request.Pets' $out/src/Api/Request/Pets.elm + grep 'createPets' $out/src/Api/Request/Pets.elm + grep '"limit"' $out/src/Api/Request/Pets.elm + set +x + echo "Looks OK!" +'' diff --git a/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/unstable.nix index 1384f35a3f..306654f05d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/unstable.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/unstable.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper }: +{ callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: -stdenv.mkDerivation rec { +let this = stdenv.mkDerivation rec { version = "6.0.0-2021-01-18"; # Also update the fetchurl link pname = "openapi-generator-cli"; @@ -18,10 +18,14 @@ stdenv.mkDerivation rec { phases = [ "installPhase" ]; installPhase = '' + runHook preInstall + install -D "$src" "$out/share/java/${jarfilename}" makeWrapper ${jre}/bin/java $out/bin/${pname} \ --add-flags "-jar $out/share/java/${jarfilename}" + + runHook postInstall ''; meta = with lib; { @@ -30,5 +34,9 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = [ maintainers.shou ]; }; -} + passthru.tests.example = callPackage ./example.nix { + openapi-generator-cli = this; + }; +}; +in this diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix index 55babb4ca2..21ad012f3f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix @@ -22,6 +22,7 @@ , withKerberos ? true , libkrb5 , libfido2 +, nixosTests , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl , linkOpenssl ? true }: @@ -111,6 +112,10 @@ stdenv.mkDerivation rec { "sysconfdir=\${out}/etc/ssh" ]; + passthru.tests = { + borgbackup-integration = nixosTests.borgbackup; + }; + meta = { description = "An implementation of the SSH protocol${extraDesc}"; homepage = "https://www.openssh.com/"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix index 3ea35daaeb..4cc943fc75 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix @@ -5,11 +5,11 @@ in { openssh = common rec { pname = "openssh"; - version = "8.5p1"; + version = "8.6p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - sha256 = "09gc8rv7728chxraab85dzkdikaw4aph1wlcwcc9kai9si0kybzm"; + sha256 = "1bnpivgk98h2f9afpp88jv6g9ps83vnpxd031n2jqxi12vdf9rn3"; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix b/third_party/nixpkgs/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix new file mode 100644 index 0000000000..3858d87e7e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, cmake, gtest, openssl, zlib }: + +stdenv.mkDerivation rec { + pname = "libtorrent-jesec"; + version = "0.13.8-r1"; + + src = fetchFromGitHub { + owner = "jesec"; + repo = "libtorrent"; + rev = "v${version}"; + sha256 = "sha256-Eh5pMkSe9uO0dPRWDg2BbbRxxuvX9FM2/OReq/61ojc="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl zlib ]; + + # https://github.com/jesec/libtorrent/issues/1 + doCheck = false; + checkInputs = [ gtest ]; + + meta = with lib; { + description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code (jesec's fork)"; + homepage = "https://github.com/jesec/libtorrent"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ winterqt ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix b/third_party/nixpkgs/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix new file mode 100644 index 0000000000..5b973a84eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtest +, libtorrent-jesec +, curl +, ncurses +, xmlrpc_c +, nlohmann_json +, xmlRpcSupport ? true +, jsonRpcSupport ? true +}: +let + inherit (lib) optional; +in +stdenv.mkDerivation rec { + pname = "rtorrent-jesec"; + version = "0.9.8-r13"; + + src = fetchFromGitHub { + owner = "jesec"; + repo = "rtorrent"; + rev = "v${version}"; + sha256 = "1srn1ms7dvsn994zvb8i4m6gc144ygc7wc2a23bma79cqpl7drlw"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libtorrent-jesec curl ncurses ] + ++ optional xmlRpcSupport xmlrpc_c + ++ optional jsonRpcSupport nlohmann_json; + + cmakeFlags = [ "-DUSE_RUNTIME_CA_DETECTION=NO" ] + ++ optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO" + ++ optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO"; + + doCheck = true; + checkInputs = [ gtest ]; + + prePatch = '' + substituteInPlace src/main.cc \ + --replace "/etc/rtorrent/rtorrent.rc" "${placeholder "out"}/etc/rtorrent/rtorrent.rc" + ''; + + postFixup = '' + mkdir -p $out/etc/rtorrent + cp $src/doc/rtorrent.rc $out/etc/rtorrent/rtorrent.rc + ''; + + meta = with lib; { + description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach (jesec's fork)"; + homepage = "https://github.com/jesec/rtorrent"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ winterqt ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix b/third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix index dfaad9c1e9..9b1c3d005b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { description = "WebDav server implementation and library using libsoup"; homepage = "https://wiki.gnome.org/phodav"; license = licenses.lgpl21; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/polygraph/default.nix b/third_party/nixpkgs/pkgs/tools/networking/polygraph/default.nix index addb723592..74347ff839 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/polygraph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/polygraph/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Performance testing tool for caching proxies, origin server accelerators, L4/7 switches, content filters, and other Web intermediaries"; platforms = platforms.linux; license = licenses.asl20; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix index fd6b79ecb2..f417bb496f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "qrcp"; - version = "0.8.1"; + version = "0.8.4"; src = fetchFromGitHub { owner = "claudiodangelis"; repo = "qrcp"; rev = version; - sha256 = "001w15hj5xb7p9gpvw1216lp26g5018qdi8mq6i84akb7zfd2q01"; + sha256 = "1m1xbb3x526j2v8m5m46km9zzj3dk9fvm5wckyqb8kxm4md12y50"; }; vendorSha256 = "1hn8c72fvih6ws1y2c4963pww3ld64m0yh3pmx62hwcy83bhb0v4"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix b/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix index beddd11e90..3a7e64623a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "siege"; - version = "4.0.8"; + version = "4.0.9"; src = fetchurl { url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz"; - sha256 = "01qhw52kyqwidp5bckw4xmz4ldqdwkjci7k421qm68kk0mx9l48g"; + sha256 = "0xzjfljhv9wcf58qw2c1sbpa5nqz1pb6rjpgvz7bxrv90n31bghx"; }; NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; @@ -32,8 +32,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "HTTP load tester"; + homepage = "https://www.joedog.org/siege-home/"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; - license = licenses.gpl2Plus; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix index 4a0b3c1339..c24b9a860e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , autoreconfHook , pkg-config @@ -11,13 +12,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.1.9"; + version = "1.1.10"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "sha256-jUxAkC9nMiDiHKyKtmdtOEyb9jqOEiy5D3NqymluX28="; + sha256 = "sha256-Qk5a8h9IkLwYRmPL8pFlyVsQ/xMZ2/wkq8zZ7yfrLEQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/sniffglue/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sniffglue/default.nix index 68b4859a5f..13efa6e999 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/sniffglue/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/sniffglue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sniffglue"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bvLkeC5Hm1enaWJtYmnnINgpSO3tlg1SsEzeMSF9OXk="; + sha256 = "sha256-2LyCiW1MrAahpbzyxot0INPMzo0Vl/JToMZTinCQdgs="; }; - cargoSha256 = "sha256-BUo3Y2tLvhOrk2w2GzYeWKpXH7TAOEdBI6vVtW2/cCs="; + cargoSha256 = "sha256-AGwiyC7Zf8KHQIHfHByL06sdbS4vEXUyj1wGw7Q1N9I="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix index a33bb48656..ed83e4d455 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpreplay"; - version = "4.3.3"; + version = "4.3.4"; src = fetchurl { url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; - sha256 = "1plgjm3dr9rr5q71s7paqk2wgrvkihbk2yrf9g3zaks3m750497d"; + sha256 = "sha256-7gZTEIBsIuL9NvAU4euzMbmKfsTblY6Rw9nL2gZA2Sw="; }; buildInputs = [ libpcap ] @@ -27,13 +27,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A suite of utilities for editing and replaying network traffic"; - homepage = "http://tcpreplay.appneta.com/"; - license = with licenses; [ bsd3 gpl3 ]; + homepage = "https://tcpreplay.appneta.com/"; + license = with licenses; [ bsdOriginalUC gpl3Only ]; maintainers = with maintainers; [ eleanor ]; platforms = platforms.unix; - knownVulnerabilities = [ - "CVE-2020-24265" # https://github.com/appneta/tcpreplay/issues/616 - "CVE-2020-24266" # https://github.com/appneta/tcpreplay/issues/617 - ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix new file mode 100644 index 0000000000..97c758e19b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "telepresence2"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "telepresenceio"; + repo = "telepresence"; + rev = "v${version}"; + sha256 = "0pr6vm68jr5ld7hy2b4dwmjziir59vg137c74rdn1wlhq3n8vr41"; + }; + + vendorSha256 = "0d0p879zchhrzrf6f5zc3vdcd5zi1ind7ibvb46y6wx6lp0f1nrp"; + + buildFlagsArray = '' + -ldflags=-s -w -X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev} + ''; + + subPackages = [ "cmd/telepresence" ]; + + meta = with lib; { + description = "Local development against a remote Kubernetes or OpenShift cluster"; + homepage = "https://www.getambassador.io/docs/telepresence/2.1/quick-start/"; + license = licenses.asl20; + maintainers = with maintainers; [ mausch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix index 2c6315b37c..6aa0573849 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix @@ -1,55 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, asciidoc, libxml2, - libxslt, docbook_xsl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, perl, withDebug ? false }: stdenv.mkDerivation rec { pname = "tinyproxy"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { - sha256 = "0gzapnllzyc005l3rs6iarjk1p5fc8mf9ysbck1mbzbd8xg6w35s"; + sha256 = "13fhkmmrwzl657dq04x2wagkpjwdrzhkl141qvzr7y7sli8j0w1n"; rev = version; repo = "tinyproxy"; owner = "tinyproxy"; }; - nativeBuildInputs = [ autoreconfHook asciidoc libxml2 libxslt docbook_xsl ]; + # perl is needed for man page generation. + nativeBuildInputs = [ autoreconfHook perl ]; - # -z flag is not supported in darwin - preAutoreconf = lib.optionalString stdenv.isDarwin '' - substituteInPlace configure.ac --replace \ - 'LDFLAGS="-Wl,-z,defs $LDFLAGS"' \ - 'LDFLAGS="-Wl, $LDFLAGS"' - ''; - - # See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=154624 - postConfigure = '' - substituteInPlace docs/man5/Makefile --replace \ - "-f manpage" \ - "--xsltproc-opts=--nonet \\ - -f manpage \\ - -L" - substituteInPlace docs/man8/Makefile --replace \ - "-f manpage" \ - "--xsltproc-opts=--nonet \\ - -f manpage \\ - -L" - ''; - - configureFlags = [ - "--disable-debug" # Turn off debugging - "--enable-xtinyproxy" # Compile in support for the XTinyproxy header, which is sent to any web server in your domain. - "--enable-filter" # Allows Tinyproxy to filter out certain domains and URLs. - "--enable-upstream" # Enable support for proxying connections through another proxy server. - "--enable-transparent" # Allow Tinyproxy to be used as a transparent proxy daemon. - "--enable-reverse" # Enable reverse proxying. - ] ++ - # See: https://github.com/tinyproxy/tinyproxy/issues/1 - lib.optional stdenv.isDarwin "--disable-regexcheck"; + configureFlags = lib.optionals withDebug [ "--enable-debug" ]; # Enable debugging support code and methods. meta = with lib; { homepage = "https://tinyproxy.github.io/"; description = "A light-weight HTTP/HTTPS proxy daemon for POSIX operating systems"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; maintainers = [ maintainers.carlosdagos ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tnat64/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tnat64/default.nix new file mode 100644 index 0000000000..9b1c2c3aec --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/tnat64/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "tnat64"; + version = "0.05"; + + src = fetchFromGitHub { + owner = "andrewshadura"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "07lmzidbrd3aahk2jvv93cic9gf36pwmgfd63gmy6hjkxf9a6fw9"; + }; + + postPatch = '' + # Fix usage of deprecated sys_errlist + substituteInPlace tnat64.c --replace 'sys_errlist[errno]' 'strerror(errno)' + ''; + + configureFlags = [ "--libdir=$(out)/lib" ]; + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "IPv4 to IPv6 interceptor"; + homepage = "https://github.com/andrewshadura/tnat64"; + license = licenses.gpl2Plus; + longDescription = '' + TNAT64 is an interceptor which redirects outgoing TCPv4 connections + through NAT64, thus enabling an application running on an IPv6-only host + to communicate with the IPv4 world, even if that application does not + support IPv6 at all. + ''; + platforms = platforms.unix; + badPlatforms = platforms.darwin; + maintainers = [ maintainers.rnhmjoj ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/tracebox/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tracebox/default.nix index a5486252a8..3d50b11f8e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tracebox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tracebox/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "http://www.tracebox.org/"; description = "A middlebox detection tool"; license = lib.licenses.gpl2; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix b/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix index 3c28133a2d..a0c774fb73 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -7,6 +7,7 @@ , libevent , dns-root-data , pkg-config +, makeWrapper # # By default unbound will not be built with systemd support. Unbound is a very # commmon dependency. The transitive dependency closure of systemd also @@ -34,6 +35,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ openssl nettle expat libevent ] ++ lib.optionals withSystemd [ pkg-config systemd ] ++ lib.optionals withDoH [ libnghttp2 ]; @@ -60,6 +63,8 @@ stdenv.mkDerivation rec { postInstall = '' make unbound-event-install + wrapProgram $out/bin/unbound-control-setup \ + --prefix PATH : ${lib.makeBinPath [ openssl ]} ''; preFixup = lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix b/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix index b525f78c42..89e2f0f320 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix @@ -3,22 +3,22 @@ }: let - version = "4.37.3"; + version = "4.38.3"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "0gbkjlrx4ddaxb5f21m3sxbb55ilvm5kqlrys6ckrx0xyz9hj38y"; + sha256 = "1vsq98h6zbm3wz1mgphl7dqlabgfg53fhkyn47vfbhhkbx6nwl7c"; }; - vendorSha256 = "sha256-hPzIAXImAEJux1VRqCgslgn8giTf9BgZBcEZyF4Ut9Y="; + vendorSha256 = "sha256-jXpGlJ30xBttysbUekMdw8fH0KVfPufWq0t7AXZrDEQ="; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202104150006"; - geoipSha256 = "0ppm5r4bycjm7q0vnxj62q8639kp06sfkkkrkk5gibyrwisr4vrp"; + geoipRev = "202104300531"; + geoipSha256 = "0srskpp0pmw4fzp4lgachjjvig4fy96523r7aj2bwig0ipfgr401"; in fetchurl { url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -26,8 +26,8 @@ let # MIT licensed "geosite.dat" = let - geositeRev = "20210415054336"; - geositeSha256 = "0vs9fjbw45ipi7minh0r8zgh3pbwxqlrhwahpwyc6s0hyxgdi40w"; + geositeRev = "20210430100800"; + geositeSha256 = "0wp111iip3lhkgpbrzzivl5flj44vj7slx9w7k307sls6hmjzlcb"; in fetchurl { url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix index 8bdcd8708d..5972d781bd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20210315"; + version = "1.0.20210424"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "sha256-aCqgjriqhBInK7C7KapoKVfgj+zreGQzacMKwbMF1Og="; + sha256 = "sha256-0aGaE4EBb4wb5g32Wugakt7w41sb97Hqqkac7qE641M="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix new file mode 100644 index 0000000000..a129fb3452 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix @@ -0,0 +1,67 @@ +{ + buildEnv, + lib, + man, + nixos, + # TODO: replace indirect self-reference by proper self-reference + # https://github.com/NixOS/nixpkgs/pull/119942 + nixos-install-tools, + runCommand, +}: +let + inherit (nixos {}) config; + version = config.system.nixos.version; +in +(buildEnv { + name = "nixos-install-tools-${version}"; + paths = lib.attrValues { + # See nixos/modules/installer/tools/tools.nix + inherit (config.system.build) + nixos-install nixos-generate-config nixos-enter; + + # Required for --help. + inherit (config.system.build.manual) manpages; + }; + + extraOutputsToInstall = ["man"]; + + meta = { + description = "The essential commands from the NixOS installer as a package"; + longDescription = '' + With this package, you get the commands like nixos-generate-config and + nixos-install that you would otherwise only find on a NixOS system, such + as an installer image. + + This way, you can install NixOS using a machine that only has Nix. + ''; + license = lib.licenses.mit; + homepage = "https://nixos.org"; + platforms = lib.platforms.linux; + }; + + passthru.tests = { + nixos-install-help = runCommand "test-nixos-install-help" { + nativeBuildInputs = [ + man + nixos-install-tools + ]; + meta.description = '' + Make sure that --help works. It's somewhat non-trivial because it + requires man. + ''; + } '' + nixos-install --help | grep -F 'NixOS Reference Pages' + nixos-install --help | grep -F 'configuration.nix' + nixos-generate-config --help | grep -F 'NixOS Reference Pages' + nixos-generate-config --help | grep -F 'hardware-configuration.nix' + + # FIXME: Tries to call unshare, which it must not do for --help + # nixos-enter --help | grep -F 'NixOS Reference Pages' + + touch $out + ''; + }; +}).overrideAttrs (o: { + inherit version; + pname = "nixos-install-tools"; +}) diff --git a/third_party/nixpkgs/pkgs/tools/package-management/auditwheel/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/auditwheel/default.nix new file mode 100644 index 0000000000..7c633698e3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/auditwheel/default.nix @@ -0,0 +1,56 @@ +{ lib +, bzip2 +, patchelf +, python3 +, gnutar +, unzip +}: + +python3.pkgs.buildPythonApplication rec { + pname = "auditwheel"; + version = "4.0.0"; + + disabled = python3.pkgs.pythonOlder "3.6"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "03a079fe273f42336acdb5953ff5ce7578f93ca6a832b16c835fe337a1e2bd4a"; + }; + + nativeBuildInputs = with python3.pkgs; [ + pbr + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pyelftools + setuptools + ]; + + # integration tests require docker and networking + disabledTestPaths = [ "tests/integration" ]; + + checkInputs = with python3.pkgs; [ + pretend + pytestCheckHook + ]; + + # ensure that there are no undeclared deps + postCheck = '' + PATH= PYTHONPATH= $out/bin/auditwheel --version > /dev/null + ''; + + makeWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ bzip2 gnutar patchelf unzip ]) + ]; + + meta = with lib; { + description = "Auditing and relabeling cross-distribution Linux wheels"; + homepage = "https://github.com/pypa/auditwheel"; + license = with licenses; [ + mit # auditwheel and nibabel + bsd2 # from https://github.com/matthew-brett/delocate + bsd3 # from https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-projects/pax-utils/lddtree.py + ]; + maintainers = with maintainers; [ davhau ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix index 3cb5340d1d..3632dc58f1 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-about"; version = "0.3.0"; @@ -12,6 +12,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-NdzgIB6uXMtGiLwOACEIeAb4iv7mYLnwRte3M/TkSMA="; + buildInputs = lib.optional stdenv.isDarwin libiconv; + meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; homepage = "https://github.com/EmbarkStudios/cargo-about"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix index 6a71189314..4ed3b21b64 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , rustPlatform , rust +, libiconv , Security }: @@ -17,7 +18,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-2eOWhxKZ+YPj5oKTe5g7PyeakiSNnPz27dK150GAcVQ="; }; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; cargoSha256 = "sha256-QmchuY+4R7w0zMOdReH1m8idl9RI1hHE9VtbwT2K9YM="; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix index 7a90086011..da57ae3471 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.13.10"; + version = "0.13.11"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-WWU+aNMNOOstHiGRE5nj2biWCL3uwyqJKgt0xCAfS0s="; + sha256 = "sha256-v0XKLwxUIxBt9hIUzprz+VsxCRifH1/SbNcI0sH2ENM="; }; - cargoSha256 = "sha256-G3UgcFW0WxvCYRvHCTuRpSCOT3XdvdZCN53HhpWQxS4="; + cargoSha256 = "sha256-zbET6UsV29hAL83rw3XRgrcM5FABFNI3w3Kbd61FS7E="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/default.nix index ed181d2484..fc0628e090 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/default.nix @@ -1,18 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, expat, glib, curl, libxml2, python3, rpm +, openssl, sqlite, file, xz, pcre, bash-completion, zstd, zchunk, libmodulemd +}: stdenv.mkDerivation rec { pname = "createrepo_c"; - version = "0.11.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "createrepo_c"; rev = version; - sha256 = "0cmysc7gdd2czagl4drfh9gin6aa2847vgi30a3p0cfqvczf9cm6"; + sha256 = "sha256-rcrJjcWj+cTAE3k11Ynr7CQCOWD+rb60lcar0G2w06A="; }; patches = [ + # Use the output directory to install the bash completions. ./fix-bash-completion-path.patch + # Use the output directory to install the python modules. ./fix-python-install-path.patch ]; @@ -23,15 +27,15 @@ stdenv.mkDerivation rec { --replace "@PYTHON_INSTALL_DIR@" "$out/${python3.sitePackages}" ''; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config rpm ]; - buildInputs = [ bzip2 expat glib curl libxml2 python3 rpm openssl sqlite file xz pcre bash-completion ]; + buildInputs = [ bzip2 expat glib curl libxml2 python3 openssl sqlite file xz pcre bash-completion zstd zchunk libmodulemd ]; meta = with lib; { description = "C implementation of createrepo"; - homepage = "http://rpm-software-management.github.io/createrepo_c/"; - license = licenses.gpl2; - platforms = platforms.linux; + homepage = "https://rpm-software-management.github.io/createrepo_c/"; + license = licenses.gpl2Plus; + platforms = platforms.unix; maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch b/third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch index e184cc8fac..2539ec5d33 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch +++ b/third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch @@ -1,11 +1,11 @@ ---- createrepo_c-0.10.0-src.orig/CMakeLists.txt 2017-03-19 11:01:02.703173617 +0100 -+++ createrepo_c-0.10.0-src/CMakeLists.txt 2017-03-19 11:02:38.617448248 +0100 -@@ -100,7 +100,7 @@ - - pkg_check_modules(BASHCOMP bash-completion) - if (BASHCOMP_FOUND) -- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) -+ SET(BASHCOMP_DIR "@BASHCOMP_DIR@") - message("Bash completion directory: ${BASHCOMP_DIR}") - INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c) - INSTALL(CODE " +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -117,7 +117,7 @@ OPTION(ENABLE_BASHCOMP "Install Bash autocompletions?" ON) + IF (ENABLE_BASHCOMP) + pkg_check_modules(BASHCOMP bash-completion) + IF (BASHCOMP_FOUND) +- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) ++ SET(BASHCOMP_DIR "@BASHCOMP_DIR@") + message("Bash completion directory: ${BASHCOMP_DIR}") + INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c) + INSTALL(CODE " diff --git a/third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch b/third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch index a247c6d9fe..b8739622e3 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch +++ b/third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch @@ -1,11 +1,11 @@ ---- createrepo_c-0.10.0-src.orig/src/python/CMakeLists.txt 2017-03-19 10:50:33.796342953 +0100 -+++ createrepo_c-0.10.0-src/src/python/CMakeLists.txt 2017-03-19 10:53:51.207580073 +0100 -@@ -19,7 +19,7 @@ - FIND_PACKAGE(PythonInterp 3.0 REQUIRED) - endif() - +--- a/src/python/CMakeLists.txt ++++ b/src/python/CMakeLists.txt +@@ -14,7 +14,7 @@ if (NOT SKBUILD) + FIND_PACKAGE(PythonLibs 3 REQUIRED) + endif (NOT SKBUILD) + -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) +SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@") INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) - + MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index ba3c51822e..8a4d5d44b8 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,10 +1,10 @@ {lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: stdenv.mkDerivation { - name = "DisnixWebService-0.10"; + name = "DisnixWebService-0.10.1"; src = fetchurl { - url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10/DisnixWebService-0.10.tar.gz"; - sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114"; + url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10.1/DisnixWebService-0.10.1.tar.gz"; + sha256 = "02jxbgn9a0c9cr6knzp78bp9wiywzczy89wav7yxhg79vff8a1gr"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = "\${env.out}"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/disnix/default.nix index 14be0924f2..c7b3b72e2e 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/disnix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/disnix/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }: +{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, dysnomia, libintl, libiconv }: stdenv.mkDerivation { - name = "disnix-0.10"; + name = "disnix-0.10.1"; src = fetchurl { - url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10/disnix-0.10.tar.gz"; - sha256 = "0mciqbc2h60nc0i6pd36w0m2yr96v97ybrzrqzh5f67ac1f0gqwg"; + url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10.1/disnix-0.10.1.tar.gz"; + sha256 = "13rjw1va7l8w7ir73xqxq4zb3ig2iwhiwxhp5dbfv0z3gnqizghq"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ]; + buildInputs = [ glib libxml2 libxslt getopt libintl libiconv dysnomia ]; meta = { description = "A Nix-based distributed service deployment tool"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix index 1b9d2eaefc..f9a8221e5f 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, dysnomia, disnix, socat, pkg-config, getopt }: stdenv.mkDerivation { - name = "disnixos-0.9"; + name = "disnixos-0.9.1"; src = fetchurl { - url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9/disnixos-0.9.tar.gz"; - sha256 = "0vllm5a8d9dvz5cjiq1mmkc4r4vnljabq42ng0ml85sjn0w7xvm7"; + url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9.1/disnixos-0.9.1.tar.gz"; + sha256 = "1n2psq1b8bg340i2i0yf5xy2rf78fwqd3wj342wcmq09cv2v8d1b"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix index b4c3851a50..924ed82528 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix @@ -1,25 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkg-config, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib +, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix +}: stdenv.mkDerivation rec { - version="2020-07-04"; + version = "unstable-2020-11-02"; name = "dydisnix-${version}"; src = fetchFromGitHub { owner = "svanderburg"; repo = "dydisnix"; - rev = "e99091f1c2329d562097e35faedee80622d387f0"; - sha256 = "sha256-XKab2hNGtWDkIEMxE1vMvqQBTP9BvHTabBVfzpH57h0="; + rev = "12ca1516bc1e5d161ac68f5d8252a0a2f353c8cf"; + sha256 = "00f341274hwwil8mlgcgq331vfca9sscvpdbgkxsjvbhcqd8qa52"; }; nativeBuildInputs = [ pkg-config autoconf automake libtool ]; - buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext libnixxml ]; + buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext ]; + preConfigure = '' ./bootstrap ''; meta = { description = "A toolset enabling self-adaptive redeployment on top of Disnix"; - longDescription = "Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems."; + longDescription = '' + Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems. + ''; license = lib.licenses.lgpl21Plus; maintainers = [ lib.maintainers.tomberek ]; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix index 56ba16afb4..d75683a874 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -1,5 +1,11 @@ { lib, stdenv, fetchurl, netcat -, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null + +# Optional packages +, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null +, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null +, nginx ? null, s6-rc ? null, xinetd ? null + +# Configuration flags , enableApacheWebApplication ? false , enableAxis2WebService ? false , enableEjabberdDump ? false @@ -10,7 +16,10 @@ , enableMongoDatabase ? false , enableInfluxDatabase ? false , enableSupervisordProgram ? false -, enableDockerContainer ? true +, enableDockerContainer ? false +, enableNginxWebApplication ? false +, enableXinetdService ? false +, enableS6RCService ? false , enableLegacy ? false , catalinaBaseDir ? "/var/tomcat" , jobTemplate ? "systemd" @@ -25,16 +34,17 @@ assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); assert enableInfluxDatabase -> influxdb != null; assert enableSupervisordProgram -> supervisor != null; assert enableDockerContainer -> docker != null; +assert enableNginxWebApplication -> nginx != null; +assert enableS6RCService -> s6-rc != null; +assert enableXinetdService -> xinetd != null; stdenv.mkDerivation { - name = "dysnomia-0.10"; + name = "dysnomia-0.10.1"; src = fetchurl { - url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10/dysnomia-0.10.tar.gz"; - sha256 = "19zg4nhn0f9v4i7c9hhan1i4xv3ljfpl2d0s84ph8byiscvhyrna"; + url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10.1/dysnomia-0.10.1.tar.gz"; + sha256 = "0w9601g8zpaxrmynx6mh8zz85ldpb8psp7cc6ls8v3srjpj1l5n3"; }; - preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; - configureFlags = [ (if enableApacheWebApplication then "--with-apache" else "--without-apache") (if enableAxis2WebService then "--with-axis2" else "--without-axis2") @@ -47,6 +57,10 @@ stdenv.mkDerivation { (if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb") (if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord") (if enableDockerContainer then "--with-docker" else "--without-docker") + (if enableNginxWebApplication then "--with-nginx" else "--without-nginx") + (if enableXinetdService then "--with-xinetd" else "--without-xinetd") + (if enableS6RCService then "--with-s6-rc" else "--without-s6-rc") + (if stdenv.isDarwin then "--with-launchd" else "--without-launchd") "--with-job-template=${jobTemplate}" ] ++ lib.optional enableLegacy "--enable-legacy"; @@ -56,11 +70,13 @@ stdenv.mkDerivation { ++ lib.optional enableMySQLDatabase mysql.out ++ lib.optional enablePostgreSQLDatabase postgresql ++ lib.optional enableSubversionRepository subversion - ++ lib.optional enableMongoDatabase mongodb - ++ lib.optional enableMongoDatabase mongodb-tools + ++ lib.optionals enableMongoDatabase [ mongodb mongodb-tools ] ++ lib.optional enableInfluxDatabase influxdb ++ lib.optional enableSupervisordProgram supervisor - ++ lib.optional enableDockerContainer docker; + ++ lib.optional enableDockerContainer docker + ++ lib.optional enableNginxWebApplication nginx + ++ lib.optional enableS6RCService s6-rc + ++ lib.optional enableXinetdService xinetd; meta = { description = "Automated deployment of mutable components and services for Disnix"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/dpkg/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/dpkg/default.nix index 0026dd37ca..a4e9ef41fc 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/dpkg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dpkg"; - version = "1.20.7.1"; + version = "1.20.9"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "sha256-Cq0t5of3l++OvavHuv0W3BSX8c4jvZFG+apz85alY28="; + sha256 = "sha256-XOJCgw8hO1Yg8I5sQYOtse9Nydoo0xmIonyHxx/lNM4="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix index 446761cca1..ae9a8714b8 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix @@ -3,13 +3,13 @@ gcc9Stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.61.1"; + version = "0.62.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-ad0Q/8FEaSqsuA6tVC5SB4bTrGJY/8Xb8S8zrsDIyVc="; + sha256 = "sha256-Se15VmBbzt/NASjrA25RdpHDVIG/GOSqn6ibpBe752g="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix index ac61a64180..ec5099c5f6 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -21,7 +21,7 @@ common = , storeDir , stateDir , confDir - , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp + , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , enableStatic ? stdenv.hostPlatform.isStatic , pname, version, suffix ? "", src @@ -196,19 +196,12 @@ in rec { nixStable = callPackage common (rec { pname = "nix"; - version = "2.3.10"; + version = "2.3.11"; src = fetchurl { url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab"; + sha256 = "89a8d7995305a78b1561e6670bbf1879c791fc4904eb094bc4f180775a61c128"; }; - patches = [( - fetchpatch { - url = "https://github.com/NixOS/nix/pull/4316.patch"; - sha256 = "0bqlm4n9sac9prgr9xlfng92arisp1hiqvc9pfh4fibsppkgdfc5"; - } - )]; - inherit storeDir stateDir confDir boehmgc; }); @@ -225,8 +218,21 @@ in rec { }; inherit storeDir stateDir confDir boehmgc; + + patches = [ + (fetchpatch { + url = "https://github.com/NixOS/nix/commit/8c7e043de2f673bc355d83f1e873baa93f30be62.patch"; + sha256 = "sha256-aTcUnZXheewnyCT7yQKnTqQDKS2uDoN9plMQgxJH8Ag="; + }) + ]; }); - nixFlakes = nixUnstable; + nixExperimental = nixUnstable.overrideAttrs (prev: { + patches = (prev.patches or []) ++ [ ./enable-all-experimental.patch ]; + }); + + nixFlakes = nixUnstable.overrideAttrs (prev: { + patches = (prev.patches or []) ++ [ ./enable-flakes.patch ]; + }); } diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/enable-all-experimental.patch b/third_party/nixpkgs/pkgs/tools/package-management/nix/enable-all-experimental.patch new file mode 100644 index 0000000000..1712b7295a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/enable-all-experimental.patch @@ -0,0 +1,14 @@ +diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc +index d3b27d7be..e7d002e1d 100644 +--- a/src/libstore/globals.cc ++++ b/src/libstore/globals.cc +@@ -172,8 +172,7 @@ MissingExperimentalFeature::MissingExperimentalFeature(std::string feature) + + void Settings::requireExperimentalFeature(const std::string & name) + { +- if (!isExperimentalFeatureEnabled(name)) +- throw MissingExperimentalFeature(name); ++ return; + } + + bool Settings::isWSL1() diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/enable-flakes.patch b/third_party/nixpkgs/pkgs/tools/package-management/nix/enable-flakes.patch new file mode 100644 index 0000000000..998067449b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/enable-flakes.patch @@ -0,0 +1,14 @@ +diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh +index 3e4ead76c..81d407236 100644 +--- a/src/libstore/globals.hh ++++ b/src/libstore/globals.hh +@@ -923,7 +923,8 @@ public: + value. + )"}; + +- Setting experimentalFeatures{this, {}, "experimental-features", ++ Setting experimentalFeatures{ ++ this, {"flakes", "nix-command"}, "experimental-features", + "Experimental Nix features to enable."}; + + bool isExperimentalFeatureEnabled(const std::string & name); diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nvd/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nvd/default.nix new file mode 100644 index 0000000000..1218ac01f9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/nvd/default.nix @@ -0,0 +1,32 @@ +{ fetchFromGitLab, installShellFiles, lib, python3, stdenv }: + +stdenv.mkDerivation rec { + pname = "nvd"; + version = "0.1.1"; + + src = fetchFromGitLab { + owner = "khumba"; + repo = pname; + rev = "v${version}"; + sha256 = "0accq0cw6qsxin1fb2bp2ijgjf9akb9qlivkykpfsgnk5qjafv2n"; + }; + + buildInputs = [ python3 ]; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + runHook preInstall + install -m555 -Dt $out/bin src/nvd + installManPage src/nvd.1 + runHook postInstall + ''; + + meta = with lib; { + description = "Nix/NixOS package version diff tool"; + homepage = "https://gitlab.com/khumba/nvd"; + license = licenses.asl20; + maintainers = with maintainers; [ khumba ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/protontricks/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/protontricks/default.nix index bc161f38f2..0934ef1028 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/protontricks/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/protontricks/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - hash = "sha256-IHgoi5VUN3ORbufkruPb6wR7pTekJFQHhhDrnjOWzWM="; + hash = "sha256-SrBPqGRIsP0+ZWDe96sqjqCpJoY3Sn3VoPpMw7ellC0="; }; patches = [ @@ -26,10 +26,7 @@ buildPythonApplication rec { ./steam-run.patch ]; - preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" - ''; - + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ vdf ]; @@ -52,7 +49,7 @@ buildPythonApplication rec { meta = with lib; { description = "A simple wrapper for running Winetricks commands for Proton-enabled games"; homepage = "https://github.com/Matoking/protontricks"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ metadark ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch b/third_party/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch index 5e91de58db..76b7b7f603 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch +++ b/third_party/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch @@ -1,5 +1,5 @@ diff --git a/src/protontricks/cli.py b/src/protontricks/cli.py -index 9641970..6a2b268 100755 +index cc65a03..5c3fc7a 100755 --- a/src/protontricks/cli.py +++ b/src/protontricks/cli.py @@ -15,8 +15,8 @@ import sys @@ -10,10 +10,10 @@ index 9641970..6a2b268 100755 - find_steam_path, get_steam_apps, get_steam_lib_paths) +from .steam import (find_proton_app, find_steam_path, get_steam_apps, + get_steam_lib_paths) - from .util import run_command + from .util import run_command, is_flatpak_sandbox from .winetricks import get_winetricks_path -@@ -75,8 +75,7 @@ def main(args=None): +@@ -77,8 +77,7 @@ def main(args=None): "WINE: path to a custom 'wine' executable\n" "WINESERVER: path to a custom 'wineserver' executable\n" "STEAM_RUNTIME: 1 = enable Steam Runtime, 0 = disable Steam " @@ -23,7 +23,7 @@ index 9641970..6a2b268 100755 ), formatter_class=argparse.RawTextHelpFormatter ) -@@ -138,18 +137,9 @@ def main(args=None): +@@ -148,18 +147,9 @@ def main(args=None): ) sys.exit(-1) @@ -44,7 +44,7 @@ index 9641970..6a2b268 100755 else: use_steam_runtime = False logger.info("Steam Runtime disabled.") -@@ -212,7 +202,6 @@ def main(args=None): +@@ -222,7 +212,6 @@ def main(args=None): proton_app=proton_app, steam_app=steam_app, use_steam_runtime=use_steam_runtime, @@ -52,7 +52,7 @@ index 9641970..6a2b268 100755 command=[winetricks_path, "--gui"], use_bwrap=use_bwrap ) -@@ -282,7 +271,6 @@ def main(args=None): +@@ -292,7 +281,6 @@ def main(args=None): proton_app=proton_app, steam_app=steam_app, use_steam_runtime=use_steam_runtime, @@ -60,7 +60,7 @@ index 9641970..6a2b268 100755 use_bwrap=use_bwrap, command=[winetricks_path] + args.winetricks_command) elif args.command: -@@ -292,7 +280,6 @@ def main(args=None): +@@ -302,7 +290,6 @@ def main(args=None): steam_app=steam_app, command=args.command, use_steam_runtime=use_steam_runtime, @@ -69,21 +69,21 @@ index 9641970..6a2b268 100755 # Pass the command directly into the shell *without* # escaping it diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py -index 8554e24..509afb6 100644 +index f9fb9ec..e1e588a 100644 --- a/src/protontricks/steam.py +++ b/src/protontricks/steam.py -@@ -13,8 +13,8 @@ from .util import lower_dict +@@ -12,8 +12,8 @@ from .util import lower_dict + __all__ = ( "COMMON_STEAM_DIRS", "SteamApp", "find_steam_path", - "find_steam_proton_app", "find_proton_app", -- "find_legacy_steam_runtime_path", "find_appid_proton_prefix", -- "get_steam_lib_paths", "get_steam_apps", "get_custom_proton_installations" -+ "find_appid_proton_prefix", "get_steam_lib_paths", -+ "get_steam_apps", "get_custom_proton_installations" - ) - - COMMON_STEAM_DIRS = [ -@@ -283,37 +283,6 @@ def find_steam_path(): +- "find_legacy_steam_runtime_path", "get_appinfo_sections", +- "get_proton_appid", "find_steam_proton_app", "find_appid_proton_prefix", ++ "get_appinfo_sections", "get_proton_appid", ++ "find_steam_proton_app", "find_appid_proton_prefix", + "find_proton_app", "get_steam_lib_paths", "get_compat_tool_dirs", + "get_proton_installations", "get_custom_proton_installations", + "find_current_steamid3", "get_appid_from_shortcut", +@@ -286,37 +286,6 @@ def find_steam_path(): return None, None @@ -122,10 +122,31 @@ index 8554e24..509afb6 100644 APPINFO_STRUCT_SECTION = " 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -23,6 +23,7 @@ GIT faye-websocket filesize hrr_rb_ssh (= 0.3.0.pre2) + http-cookie irb jsobfu json @@ -30,7 +31,7 @@ GIT metasploit-concern (~> 3.0.0) metasploit-credential (~> 4.0.0) metasploit-model (~> 3.1.0) - metasploit-payloads (= 2.0.44) + metasploit-payloads (= 2.0.45) metasploit_data_models (~> 4.1.0) metasploit_payloads-mettle (= 1.0.9) mqtt @@ -79,6 +80,7 @@ GIT sinatra sqlite3 sshkey + swagger-blocks thin tzinfo tzinfo-data @@ -92,26 +94,26 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (5.2.5) - actionview (= 5.2.5) - activesupport (= 5.2.5) + actionpack (5.2.6) + actionview (= 5.2.6) + activesupport (= 5.2.6) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.5) - activesupport (= 5.2.5) + actionview (5.2.6) + activesupport (= 5.2.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activemodel (5.2.5) - activesupport (= 5.2.5) - activerecord (5.2.5) - activemodel (= 5.2.5) - activesupport (= 5.2.5) + activemodel (5.2.6) + activesupport (= 5.2.6) + activerecord (5.2.6) + activemodel (= 5.2.6) + activesupport (= 5.2.6) arel (>= 9.0) - activesupport (5.2.5) + activesupport (5.2.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -123,13 +125,13 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.449.0) + aws-partitions (1.455.0) aws-sdk-core (3.114.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.235.0) + aws-sdk-ec2 (1.236.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.52.0) @@ -138,7 +140,7 @@ GEM aws-sdk-kms (1.43.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.94.0) + aws-sdk-s3 (1.94.1) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -152,9 +154,11 @@ GEM concurrent-ruby (1.0.5) cookiejar (0.3.3) crass (1.0.6) - daemons (1.3.1) + daemons (1.4.0) dnsruby (1.61.5) simpleidn (~> 0.1) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) ed25519 (1.2.4) em-http-request (1.1.7) addressable (>= 2.3.4) @@ -184,6 +188,8 @@ GEM hashery (2.1.2) hrr_rb_ssh (0.3.0.pre2) ed25519 (~> 1.2) + http-cookie (1.0.3) + domain_name (~> 0.5) http_parser.rb (0.6.0) i18n (1.8.10) concurrent-ruby (~> 1.0) @@ -216,7 +222,7 @@ GEM activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.44) + metasploit-payloads (2.0.45) metasploit_data_models (4.1.4) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -263,7 +269,7 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) - puma (5.2.2) + puma (5.3.1) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -276,15 +282,15 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.2.5) - actionpack (= 5.2.5) - activesupport (= 5.2.5) + railties (5.2.6) + actionpack (= 5.2.6) + activesupport (= 5.2.6) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rake (13.0.3) rb-readline (0.5.5) - recog (2.3.19) + recog (2.3.20) nokogiri redcarpet (3.5.1) reline (0.2.5) @@ -362,6 +368,7 @@ GEM tilt (~> 2.0) sqlite3 (1.4.2) sshkey (2.0.0) + swagger-blocks (3.0.0) thin (1.8.0) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index fcd37ad4bb..49bf102709 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.42"; + version = "6.0.44"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-L4P6QUERoH0JnaTpzrA0UWUYqRepBS97fSexKa8JZQU="; + sha256 = "sha256-6uhqAJ7nlBROdhda9yU2IlAHZrnpKo0kpKoixXJeJYY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index 2aa5d4fa83..8a00874313 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m9wdcnkls8cs31gfic5hffnrz0l1iyk0dldwx2q2z58qhh3sw0m"; + sha256 = "0b2xl458f2ygnjbvv0hacc8bk9qxbx64m2g7vw6f9y7k8q85930y"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xlcfcbmwlmcp6vi9ay5xw9lqnj70bl1gn19hafygv9w65sw0n2i"; + sha256 = "06f8212kplqhap9jpi49dvqlhwkfxxxm9nh8al6qjvl7mfh9qbzg"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bb600bsxd0gf4vwqq2qiklg7wd37b0as6ll3k5hjy9v6izj006b"; + sha256 = "1r28kcnzr8dm6idirndd8pvbmg5c678ijxk845g84ykq1l69czs6"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03zijqm7xdmmylzp68hadvq5rps67lsq10hnq6kpmhq496pp7wlj"; + sha256 = "05qqnichgxml6z3d1dpgjy2fi62dppnqxgg37hr9a35hwhn05fzc"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bizrvn05d59l1qzwkhqvwmzicamq4p66z2ziap5ks9y6hqgqmzj"; + sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; addressable = { groups = ["default"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18d990l9mraf8j1akfn1f4l3y6n7shhnr9x5naj6pzv5z3y3dzf4"; + sha256 = "01i0qysphs0fl7gxg23bbsyn8iwgnaif6lvbfg6rdn6gp6qc8qgx"; type = "gem"; }; - version = "1.449.0"; + version = "1.455.0"; }; aws-sdk-core = { groups = ["default"]; @@ -134,10 +134,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kcnfr5rw80d46hwp185jniqvbrxcdjy7srh24x7gjm2gpxmm234"; + sha256 = "1x4gq4s5d9834n2p5gm1qchm8jvin1ipirc20z1j5lszjxxpy3c2"; type = "gem"; }; - version = "1.235.0"; + version = "1.236.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "119f1nf2q1k7xg7h2agm7g8i87abfdkad0l78hhk6y4f3v02niv9"; + sha256 = "0803g2c1hhdk6fbliww12in4czsxj47fip9dpl35hbqsnrpjc4y9"; type = "gem"; }; - version = "1.94.0"; + version = "1.94.1"; }; aws-sigv4 = { groups = ["default"]; @@ -264,10 +264,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w"; + sha256 = "1fki1aipqafqlg8xy25ykk0ql1dciy9kk6lcp5gzgkh9ccmaxzf3"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; dnsruby = { groups = ["default"]; @@ -279,6 +279,16 @@ }; version = "1.61.5"; }; + domain_name = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + type = "gem"; + }; + version = "0.5.20190701"; + }; ed25519 = { groups = ["default"]; platforms = []; @@ -419,6 +429,16 @@ }; version = "0.3.0.pre2"; }; + http-cookie = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; "http_parser.rb" = { groups = ["default"]; platforms = []; @@ -534,12 +554,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "57fda58cdde0909e975394b34a8daa39c97f7e1c"; - sha256 = "01b516pjkc97gmxjy1d92ylihrai6jqcxsd4kl4pv80i850zm0rg"; + rev = "dbc17d32977b2e36ead8dafff4f41c607a8bec88"; + sha256 = "11i5brrca8malhj8sap9p5k0fl126qjzfnhpfr719577kq06ms7a"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.42"; + version = "6.0.44"; }; metasploit-model = { groups = ["default"]; @@ -556,10 +576,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z0cgg4fghcpj3pvjyqnnzll5zvhwpv68dvpz2y0zgij14cvfg7y"; + sha256 = "09w5r7g19n845h9ii66h8cx9ikgv69d59ry67183h7c76mhzvm9c"; type = "gem"; }; - version = "2.0.44"; + version = "2.0.45"; }; metasploit_data_models = { groups = ["default"]; @@ -826,10 +846,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wiprd0v4mjqv5p1vqaidr9ci2xm08lcxdz1k50mb1b6nrw6r74k"; + sha256 = "00839fhvcq73h9a4crbrk87y6bi2z4vp1zazxihn6w0mrwr51c3i"; type = "gem"; }; - version = "5.2.2"; + version = "5.3.1"; }; racc = { groups = ["default"]; @@ -896,10 +916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "072spzdpc8bv35nflr43i67njlriavqkrz6cgyd42adz6bqyval9"; + sha256 = "0rs97fxv13hgpbmyhk8ag8qzgkh25css0797h90k9w1vg9djl84k"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; rake = { groups = ["default"]; @@ -926,10 +946,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00czf392immsaff10snjxky2vpnfck1bgszpckx15y2kydag5k9i"; + sha256 = "11hc55mdl2d4kb8vrbazydxdnzr5l7dd4v5spqrrgnmp2d7rq3az"; type = "gem"; }; - version = "2.3.19"; + version = "2.3.20"; }; redcarpet = { groups = ["default"]; @@ -1261,6 +1281,16 @@ }; version = "2.0.0"; }; + swagger-blocks = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bycg5si4pr69b0qqiqzhwcich90mvmn0v0gs39slvxg5nv3h28k"; + type = "gem"; + }; + version = "3.0.0"; + }; thin = { groups = ["default"]; platforms = []; diff --git a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix index da654e74f9..2e32940657 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.3.4"; + version = "2.3.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qjbr3kTgIFdxyzRwSvWyh5krrlzD8i1nMeoLZYSbr6g="; + sha256 = "sha256-loViPW84KdAOJbL8oUJeiON1f6vrZTcYXRP2VBMNkGk="; }; - vendorSha256 = "sha256-qmuua7HXnwuy24CSqHKALqNDmXBvSIXYTVu3kaGVoeU="; + vendorSha256 = "sha256-HBpKaRI7gcWp13GVxTlnZvvTyRncfLmu0NmwAUyQ4hQ="; modRoot = "./v2"; subPackages = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/onioncircuits/default.nix b/third_party/nixpkgs/pkgs/tools/security/onioncircuits/default.nix index 8c5083ee8a..f5d9185dc9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/onioncircuits/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/onioncircuits/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }: +{ lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome }: python3.pkgs.buildPythonApplication rec { pname = "onioncircuits"; @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { postFixup = '' wrapProgram "$out/bin/onioncircuits" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:${gnome3.adwaita-icon-theme}/share" + --prefix XDG_DATA_DIRS : "$out/share:${gnome.adwaita-icon-theme}/share" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix index b0172ff1d5..a40e2ce33c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix @@ -25,23 +25,23 @@ rustPlatform.buildRustPackage rec { pname = "sequoia"; # Upstream has separate version numbering for the library and the CLI frontend. # This derivation provides the CLI frontend, and thus uses its version number. - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia"; rev = "sq/v${version}"; - sha256 = "0zavkf0grkqljyiywcprsiv8igidk8vc3yfj3fzqvbhm43vnnbdw"; + sha256 = "13f582g10vba0cpbdmqkkfzgd5jgagb640jaz1w425wf5nbh6q50"; }; - cargoSha256 = "172f0gsy5hssrqv0l1np3c0qd1ayp6nqbpqmgwrkc4l37y5fn232"; + cargoSha256 = "sha256-qIGP48uj2iQ6MVgy5anKI9QrX9vnuKh46Fmmcczda4w="; nativeBuildInputs = [ pkg-config cargo rustc git - llvmPackages_10.libclang + llvmPackages_10.libclang.lib llvmPackages_10.clang ensureNewerSourcesForZipFilesHook capnproto @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { "build-release" ]; - LIBCLANG_PATH = "${llvmPackages_10.libclang}/lib"; + LIBCLANG_PATH = "${llvmPackages_10.libclang.lib}/lib"; # Sometimes, tests fail on CI (ofborg) & hydra without this CARGO_TEST_ARGS = "--workspace --exclude sequoia-store"; diff --git a/third_party/nixpkgs/pkgs/tools/security/sheesy-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/sheesy-cli/default.nix new file mode 100644 index 0000000000..3929dbc8ad --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/sheesy-cli/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, rustPlatform, fetchCrate, installShellFiles +, libgpgerror, gpgme, gettext, openssl, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "sheesy-cli"; + version = "4.0.11"; + + src = fetchCrate { + inherit version pname; + sha256 = "1l21ji9zqy8x1g2gvqwdhya505max07ibx1hh88s36k0jbvdb7xc"; + }; + + cargoSha256 = "159a5ph1gxwcgahyr8885lq3c1w76nxzfrfdpyqixqrr7jzx2rd3"; + cargoDepsName = pname; + + cargoBuildFlags = [ "--bin sy" "--features" "vault,extract,completions,substitute,process" ]; + + nativeBuildInputs = [ libgpgerror gpgme gettext installShellFiles ]; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + + postInstall = '' + installShellCompletion --cmd sy \ + --bash <($out/bin/sy completions bash) \ + --fish <($out/bin/sy completions fish) \ + --zsh <($out/bin/sy completions zsh) + ''; + + meta = with lib; { + description = "The 'share-secrets-safely' CLI to interact with GPG/pass-like vaults"; + homepage = "https://share-secrets-safely.github.io/cli/"; + changelog = "https://github.com/share-secrets-safely/cli/releases/tag/${version}"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ devhell ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix b/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix index d8b99c51de..5e308fd25c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.6p1"; + version = "1.9.7"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - sha256 = "sha256-qenNwFj6/rnNPr+4ZMgXVeUk2YqgIhUnY/JbzoyjypA="; + sha256 = "sha256-K758LWaZuE2VDvmkPwnU2We4vCRLc7wJXEICBo3b5Uk="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix index 0d7c3d2863..e8d080a132 100644 --- a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YUrvdleH332fWDgq8AwUdXkFC7m9ap+OVuQhKlxZfII="; + sha256 = "sha256-pQuCVDXO9sXqCayoSAuxnzUBURJN+W2MZlzC/nV0wUc="; }; - vendorSha256 = "sha256-CzJ83MsBetrzbBT+fmz8F8MjdrManJAd4xpykh/2938="; + vendorSha256 = "sha256-W3RXjjR90nfidkUldKNK0QAmI78SvtgHrZTWMzpqtMs="; # tests want to download a vulnerable Terraform project doCheck = false; 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 40ce05331f..44755db2d3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix @@ -49,6 +49,6 @@ in stdenv.mkDerivation { description = "A tool for managing secrets, this binary includes the UI"; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; license = licenses.mpl20; - maintainers = with maintainers; [ offline psyanticy mkaito Chili-Man ]; + maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix b/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix index 29c1d6376f..26dc89d935 100644 --- a/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix @@ -1,14 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, installShellFiles }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, DiskArbitration +, Foundation +, IOKit +, installShellFiles +, libiconv +}: rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.5.7"; + version = "0.6.1"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "sha256-9L7FtYIaWSOwNQ8zOLvxjt51o8A5MqqfF/iIyJs2TJA="; + sha256 = "sha256-/O/VXBpVBgjzYuv1AghzmOBUu0MQXhuF65QswgNwa0k="; }; prePatch = '' @@ -17,9 +26,14 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + DiskArbitration + Foundation + IOKit + libiconv + ]; - cargoSha256 = "sha256-4oH1A88Qn0c6hkE/1b6mTrEIph8xT98j+DkP9/5JALs="; + cargoSha256 = "sha256-5AZgOzRg7jEyv/4+IiQplrwt2yQO9yNi6BosdSzh5v8="; doCheck = false; @@ -33,5 +47,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ berbiche ]; platforms = platforms.unix; + mainProgram = "btm"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix b/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix index 57a986e3da..0e4f51c7ea 100644 --- a/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix @@ -37,6 +37,18 @@ stdenv.mkDerivation rec { sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${pname}-${version}/scripts/fakeroot.in ''; + postConfigure = let + # additional patch from brew, but needs to be applied to a generated file + patch-wraptmpf = fetchpatch { + name = "fakeroot-patch-wraptmpf-h.patch"; + url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=3;bug=766649;filename=fakeroot-patch-wraptmpf-h.patch;msg=20"; + sha256 = "1jhsi4bv6nnnjb4vmmmbhndqg719ckg860hgw98bli8m05zwbx6a"; + }; + in lib.optional stdenv.isDarwin '' + make wraptmpf.h + patch -p1 < ${patch-wraptmpf} + ''; + meta = { homepage = "https://salsa.debian.org/clint/fakeroot"; description = "Give a fake root environment through LD_PRELOAD"; diff --git a/third_party/nixpkgs/pkgs/tools/system/fancy-motd/default.nix b/third_party/nixpkgs/pkgs/tools/system/fancy-motd/default.nix new file mode 100644 index 0000000000..982dbcd2f5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/fancy-motd/default.nix @@ -0,0 +1,47 @@ +{ stdenv, lib, fetchFromGitHub, bc, curl, figlet, fortune, gawk, iproute2, procps }: + +stdenv.mkDerivation rec { + pname = "fancy-motd"; + version = "unstable-2021-05-15"; + + src = fetchFromGitHub { + owner = "bcyran"; + repo = pname; + rev = "b25c1e7d76927d7f947a048d844dad4400de3598"; + sha256 = "05jazmijk3im1wl4nprkwmrq6bxhb3ah8syyqym109blajy72841"; + }; + + buildInputs = [ bc curl figlet fortune gawk iproute2 ]; + + postPatch = '' + substituteInPlace motd.sh \ + --replace 'BASE_DIR="$(dirname "$(readlink -f "$0")")"' "BASE_DIR=\"$out/lib\"" + + substituteInPlace modules/20-uptime \ + --replace "uptime -p" "${procps}/bin/uptime -p" + + # does not work on nixos + rm modules/41-updates + ''; + + installPhase = '' + runHook preInstall + + install -D motd.sh $out/bin/motd + + install -D framework.sh $out/lib/framework.sh + install -D config.sh.example $out/lib/config.sh + find modules -type f -exec install -D {} $out/lib/{} \; + + runHook postInstall + ''; + + meta = with lib; { + description = "Fancy, colorful MOTD written in bash. Server status at a glance."; + homepage = "https://github.com/bcyran/fancy-motd"; + license = licenses.mit; + maintainers = with maintainers; [ rhoriguchi ]; + platforms = platforms.linux; + mainProgram = "motd"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix index 03d52c100a..6e8bdc60ed 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles @@ -6,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "4.11.1"; + version = "4.11.2"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e9TYArmNWnK8XXcniAQCegrfWAUfTKKuClgdSTQep0U="; + sha256 = "sha256-IrlyHYAcoRvF5CA0LMKHTb8aYSawvEcU7s+a03QYI1c="; }; vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias="; @@ -27,21 +28,14 @@ buildGoModule rec { ]; postPatch = '' - substituteInPlace cmd/app/app_test.go --replace "development" "${version}" + substituteInPlace cmd/gdu/app/app_test.go --replace "development" "${version}" ''; postInstall = '' installManPage gdu.1 ''; - # tests fail with: - # dir_test.go:76: - # Error Trace: dir_test.go:76 - # Error: Not equal: - # expected: 0 - # actual : 512 - # Test: TestFlags - doCheck = false; + doCheck = !(stdenv.isAarch64 || stdenv.isDarwin); meta = with lib; { description = "Disk usage analyzer with console interface"; diff --git a/third_party/nixpkgs/pkgs/tools/system/gptman/default.nix b/third_party/nixpkgs/pkgs/tools/system/gptman/default.nix index 5209856ede..648b68bcbc 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gptman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gptman/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }: rustPlatform.buildRustPackage rec { pname = "gptman"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1cp8cyrd7ab8r2j28b69c2p3ysix5b9hpsqk07cmzgqwwml0qj12"; + buildInputs = lib.optional stdenv.isDarwin libiconv; + meta = with lib; { description = "A CLI tool for Linux to copy a partition from one disk to another and more."; homepage = "https://github.com/cecton/gptman"; diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix index bd360a2426..4dc0d80b3b 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -8,6 +8,7 @@ , withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct , withSsl ? true, openssl , withDebug ? false +, fetchpatch }: with lib; @@ -15,14 +16,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.29.3"; + version = "1.30.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-GWIQZEC5agJ+Zw7l58IIAJhXP6dxirCmWVBJulzBO5Q="; + sha256 = "0cp6gbn38f1cr0jkr64vvwz005cvnwj3hgfxs147wap9w228k46r"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -39,6 +40,11 @@ in stdenv.mkDerivation rec { # required to prevent plugins from relying on /etc # and /var ./no-files-in-etc-and-var.patch + # cgroups: fix network interfaces detection when using virsh + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/netdata/netdata/pull/11096.patch"; + sha256 = "0f2rd7kgbwbyq9wyn085d213ifvivnpl3qlx1gjrg42rkbi4n8jj"; + }) ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; @@ -50,6 +56,8 @@ in stdenv.mkDerivation rec { # rename this plugin so netdata will look for setuid wrapper mv $out/libexec/netdata/plugins.d/apps.plugin \ $out/libexec/netdata/plugins.d/apps.plugin.org + mv $out/libexec/netdata/plugins.d/cgroup-network \ + $out/libexec/netdata/plugins.d/cgroup-network.org mv $out/libexec/netdata/plugins.d/perf.plugin \ $out/libexec/netdata/plugins.d/perf.plugin.org mv $out/libexec/netdata/plugins.d/slabinfo.plugin \ @@ -81,6 +89,6 @@ in stdenv.mkDerivation rec { homepage = "https://www.netdata.cloud/"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix b/third_party/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix index 3b97747f87..be6e8f2676 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "netdata-go.d.plugin"; - version = "0.26.2"; + version = "0.28.1"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - sha256 = "1jy5pc1ihyrg6sqyw0d48bsqa7kr7kqz10k3845g958vgfmfig59"; + sha256 = "0i77nvqi3dcby0gr3b06bai170q2ibp5390qfjijrk1yqz6x6sd5"; }; - vendorSha256 = "16b6i9cpk8j7292qgjvida70rg7nixi6g94wayzikx01vmdbis5r"; + vendorSha256 = "1q8z4smaxzqd5iwvbnkkr33c3b94rjwa3xjirwlr595g0wn93wc7"; doCheck = false; @@ -26,6 +26,6 @@ buildGoModule rec { description = "Netdata orchestrator for data collection modules written in go"; homepage = "https://github.com/netdata/go.d.plugin"; license = licenses.gpl3; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/third_party/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch index 594805fdf1..1d0c5cfba5 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch @@ -1,28 +1,8 @@ -From 4ecc1475be94a384c122594b5f7d455beb64a2f0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Sat, 22 Feb 2020 06:42:14 +0000 -Subject: [PATCH] no files in etc and var -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - collectors/Makefile.am | 2 +- - collectors/charts.d.plugin/Makefile.am | 2 +- - collectors/node.d.plugin/Makefile.am | 2 +- - collectors/python.d.plugin/Makefile.am | 2 +- - collectors/statsd.plugin/Makefile.am | 2 +- - health/Makefile.am | 2 +- - system/Makefile.am | 3 +-- - web/Makefile.am | 2 +- - 8 files changed, 8 insertions(+), 9 deletions(-) - diff --git a/collectors/Makefile.am b/collectors/Makefile.am -index 9bb52958..c9799165 100644 +index 021e2ff23..115b88277 100644 --- a/collectors/Makefile.am +++ b/collectors/Makefile.am -@@ -32,7 +32,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d +@@ -33,7 +33,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d usergoconfigdir=$(configdir)/go.d # Explicitly install directories to avoid permission issues due to umask @@ -32,7 +12,7 @@ index 9bb52958..c9799165 100644 $(INSTALL) -d $(DESTDIR)$(usergoconfigdir) diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am -index 03c7f0a9..01985db0 100644 +index 03c7f0a94..01985db01 100644 --- a/collectors/charts.d.plugin/Makefile.am +++ b/collectors/charts.d.plugin/Makefile.am @@ -34,7 +34,7 @@ dist_userchartsconfig_DATA = \ @@ -44,8 +24,21 @@ index 03c7f0a9..01985db0 100644 $(INSTALL) -d $(DESTDIR)$(userchartsconfigdir) chartsconfigdir=$(libconfigdir)/charts.d +diff --git a/collectors/ebpf.plugin/Makefile.am b/collectors/ebpf.plugin/Makefile.am +index 18b1fc6c8..b4b0c7852 100644 +--- a/collectors/ebpf.plugin/Makefile.am ++++ b/collectors/ebpf.plugin/Makefile.am +@@ -13,7 +13,7 @@ SUFFIXES = .in + userebpfconfigdir=$(configdir)/ebpf.d + + # Explicitly install directories to avoid permission issues due to umask +-install-exec-local: ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(userebpfconfigdir) + + dist_plugins_SCRIPTS = \ diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am -index c3142d43..95e32445 100644 +index c3142d433..95e324455 100644 --- a/collectors/node.d.plugin/Makefile.am +++ b/collectors/node.d.plugin/Makefile.am @@ -26,7 +26,7 @@ dist_usernodeconfig_DATA = \ @@ -58,7 +51,7 @@ index c3142d43..95e32445 100644 nodeconfigdir=$(libconfigdir)/node.d diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am -index e678f86a..29a319da 100644 +index 38eb90f79..ce7079441 100644 --- a/collectors/python.d.plugin/Makefile.am +++ b/collectors/python.d.plugin/Makefile.am @@ -32,7 +32,7 @@ dist_userpythonconfig_DATA = \ @@ -71,10 +64,10 @@ index e678f86a..29a319da 100644 pythonconfigdir=$(libconfigdir)/python.d diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am -index b01302d1..f5b77da4 100644 +index 71f2d468d..2c9ced2bf 100644 --- a/collectors/statsd.plugin/Makefile.am +++ b/collectors/statsd.plugin/Makefile.am -@@ -17,5 +17,5 @@ dist_userstatsdconfig_DATA = \ +@@ -18,5 +18,5 @@ dist_userstatsdconfig_DATA = \ $(NULL) # Explicitly install directories to avoid permission issues due to umask @@ -82,7 +75,7 @@ index b01302d1..f5b77da4 100644 +no-install-exec-local: $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir) diff --git a/health/Makefile.am b/health/Makefile.am -index 853ed0d7..210330a6 100644 +index b963ea0cd..6979e69bf 100644 --- a/health/Makefile.am +++ b/health/Makefile.am @@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \ @@ -95,10 +88,10 @@ index 853ed0d7..210330a6 100644 healthconfigdir=$(libconfigdir)/health.d diff --git a/system/Makefile.am b/system/Makefile.am -index ad68c655..74f032f9 100644 +index 5323738c9..06e1b6a73 100644 --- a/system/Makefile.am +++ b/system/Makefile.am -@@ -17,11 +17,10 @@ include $(top_srcdir)/build/subst.inc +@@ -20,11 +20,10 @@ include $(top_srcdir)/build/subst.inc SUFFIXES = .in dist_config_SCRIPTS = \ @@ -112,7 +105,7 @@ index ad68c655..74f032f9 100644 nodist_noinst_DATA = \ diff --git a/web/Makefile.am b/web/Makefile.am -index ccaccd76..16a2977e 100644 +index ccaccd764..16a2977e5 100644 --- a/web/Makefile.am +++ b/web/Makefile.am @@ -12,7 +12,7 @@ SUBDIRS = \ @@ -124,6 +117,3 @@ index ccaccd76..16a2977e 100644 $(INSTALL) -d $(DESTDIR)$(usersslconfigdir) dist_noinst_DATA = \ --- -2.25.0 - diff --git a/third_party/nixpkgs/pkgs/tools/system/ps_mem/default.nix b/third_party/nixpkgs/pkgs/tools/system/ps_mem/default.nix index 152bb1150e..1752aba240 100644 --- a/third_party/nixpkgs/pkgs/tools/system/ps_mem/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/ps_mem/default.nix @@ -17,7 +17,7 @@ in pythonPackages.buildPythonApplication { description = "A utility to accurately report the in core memory usage for a program"; homepage = "https://github.com/pixelb/ps_mem"; license = licenses.lgpl21; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix b/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix index 388d9b9227..6511d2dcdb 100644 --- a/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "alecthomas"; repo = pname; rev = "v${version}"; - sha256 = "0zzk4wcjgxa9lsx8kwpmxvcw67f2fr7ai37jxmdahnws0ai2c2f7"; + sha256 = "sha256-+4UaQrJh3PBf68rlW1lOEyEVw3vWxfc+Casa5+H8F9A="; leaveDotGit = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/dcs/default.nix b/third_party/nixpkgs/pkgs/tools/text/dcs/default.nix index 610b494439..511931f038 100644 --- a/third_party/nixpkgs/pkgs/tools/text/dcs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/dcs/default.nix @@ -1,8 +1,7 @@ { lib , buildGoModule , fetchFromGitHub -, python3Packages -, perl +, yuicompressor , zopfli , stdenv }: @@ -23,8 +22,7 @@ buildGoModule { doCheck = false; nativeBuildInputs = [ - python3Packages.slimit - (perl.withPackages (p: [ p.CSSMinifier ])) + yuicompressor zopfli ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/diffutils/default.nix b/third_party/nixpkgs/pkgs/tools/text/diffutils/default.nix index bcb7fad58d..d95e7ae399 100644 --- a/third_party/nixpkgs/pkgs/tools/text/diffutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/diffutils/default.nix @@ -6,10 +6,11 @@ # files. stdenv.mkDerivation rec { - name = "diffutils-3.7"; + pname = "diffutils"; + version = "3.7"; src = fetchurl { - url = "mirror://gnu/diffutils/${name}.tar.xz"; + url = "mirror://gnu/diffutils/diffutils-${version}.tar.xz"; sha256 = "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk"; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/fastmod/default.nix b/third_party/nixpkgs/pkgs/tools/text/fastmod/default.nix index e838e2931c..d6e2dc4dd1 100644 --- a/third_party/nixpkgs/pkgs/tools/text/fastmod/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/fastmod/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchFromGitHub , rustPlatform +, libiconv , Security }: @@ -17,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-L1MKoVacVKcpEG2IfS+eENxFZNiSaTDTxfFbFlvzYl8="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; meta = with lib; { description = "A utility that makes sweeping changes to large, shared code bases"; diff --git a/third_party/nixpkgs/pkgs/tools/text/gtranslator/default.nix b/third_party/nixpkgs/pkgs/tools/text/gtranslator/default.nix index bf825a5505..5bc99724e3 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gtranslator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gtranslator/default.nix @@ -9,6 +9,7 @@ , wrapGAppsHook , libxml2 , libgda +, libhandy , libsoup , json-glib , gspell @@ -16,17 +17,17 @@ , libdazzle , gtk3 , gtksourceview4 -, gnome3 +, gnome , gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gtranslator"; - version = "3.38.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "282puBoi2SM74Y6Z/VxEj2qwV1nR6UwQWAu4McotdjU="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0d48nc11z0m91scy21ah56ysxns82zvswx8lglvlkig1vqvblgpc"; }; nativeBuildInputs = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { libdazzle gtksourceview4 libgda + libhandy libsoup json-glib gettext @@ -59,7 +61,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/highlight/default.nix b/third_party/nixpkgs/pkgs/tools/text/highlight/default.nix index 657dc548f8..f44ddc9d0e 100644 --- a/third_party/nixpkgs/pkgs/tools/text/highlight/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/highlight/default.nix @@ -5,13 +5,13 @@ with lib; let self = stdenv.mkDerivation rec { pname = "highlight"; - version = "4.0"; + version = "4.1"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "sha256-WWbT0CfrbHgpU5HQycRhU7Ymey1LKd/ruoF91F3mHdE="; + sha256 = "sha256-KktwbnL13Tcc2iWAjgqQSMSenUN6nYBEGbFrpB1kkr0="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/text/jumanpp/default.nix b/third_party/nixpkgs/pkgs/tools/text/jumanpp/default.nix index f002e228ac..5578ed417a 100644 --- a/third_party/nixpkgs/pkgs/tools/text/jumanpp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/jumanpp/default.nix @@ -1,15 +1,17 @@ -{ lib, stdenv, fetchurl, cmake, protobuf }: +{ lib, stdenv, fetchurl, cmake, protobuf, libiconv }: stdenv.mkDerivation rec { pname = "jumanpp"; - version = "2.0.0-rc2"; + version = "2.0.0-rc3"; src = fetchurl { url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp"; + sha256 = "sha256-ASdr6qbkSe71M7QmuuwidCa4xQhDVoXBJ2XqvSY53pQ="; }; + nativeBuildInputs = [ cmake ]; - buildInputs = [ protobuf ]; + buildInputs = [ protobuf ] + ++ lib.optional stdenv.isDarwin libiconv; meta = with lib; { description = "A Japanese morphological analyser using a recurrent neural network language model (RNNLM)"; diff --git a/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix b/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix index 185b2a41c4..9a5226d98b 100644 --- a/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3, boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml, nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "poedit"; - version = "2.4.2"; + version = "2.4.3"; - src = fetchurl { - url = "https://github.com/vslavik/poedit/archive/v${version}-oss.tar.gz"; - sha256 = "1kry3xphrdccx8znfm9pw5872c5w0ri7cknlad4qcps54b25nnzk"; + src = fetchFromGitHub { + owner = "vslavik"; + repo = "poedit"; + rev = "v${version}-oss"; + sha256 = "02xf2w3d2lnr3vqmil9vvg9pir7d21x4zrj9xwpgb7dhs0gimj0x"; }; nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook @@ -41,6 +43,6 @@ stdenv.mkDerivation rec { homepage = "https://www.poedit.net/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dasj19 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix b/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix index c6ab5ff9c7..29a5a157a6 100644 --- a/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "shfmt"; - version = "3.2.4"; + version = "3.3.0"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "sha256-BkvsCIcm3qnfECNhY3DIPnBRih6D7rOHOQu9oc0YDZA="; + sha256 = "sha256-pD1nkbBw5NBCyuhn2DYop2AR+1T8p6/zTa6FeWiya7Q="; }; - vendorSha256 = "1ma7nvyn6ylbi8bd7x900i94pzs877kfy9xh0nf1bbify1vcpd29"; + vendorSha256 = "sha256-euJYStN21xFYosouWYXpHN3MWCKR4NT8z6OSonM0HW8="; subPackages = [ "cmd/shfmt" ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/wrap/default.nix b/third_party/nixpkgs/pkgs/tools/text/wrap/default.nix new file mode 100644 index 0000000000..e228f946a8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/wrap/default.nix @@ -0,0 +1,36 @@ +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, makeWrapper, courier-prime }: + +buildGoModule rec { + pname = "wrap"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "Wraparound"; + repo = "wrap"; + rev = "v${version}"; + sha256 = "0scf7v83p40r9k7k5v41rwiy9yyanfv3jm6jxs9bspxpywgjrk77"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + vendorSha256 = "03q5a5lm8zj1523gxkbc0y6a3mjj1z2h7nrr2qcz8nlghvp4cfaz"; + + patches = [ + (fetchpatch { + name = "courier-prime-variants.patch"; + url = "https://github.com/Wraparound/wrap/commit/b72c280b6eddba9ec7b3507c1f143eb28a85c9c1.patch"; + sha256 = "1d9v0agfd7mgd17k4a8l6vr2kyswyfsyq3933dz56pgs5d3jric5"; + }) + ]; + + postInstall = '' + wrapProgram $out/bin/wrap --prefix XDG_DATA_DIRS : ${courier-prime}/share/ + ''; + + meta = with lib; { + description = "A Fountain export tool with some extras"; + homepage = "https://github.com/Wraparound/wrap"; + license = licenses.gpl3Only; + maintainers = [ maintainers.austinbutler ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix b/third_party/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix index 5dab3d642a..96aa01abe6 100644 --- a/third_party/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "html-xml-utils"; - version = "7.9"; + version = "8.0"; src = fetchurl { url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz"; - sha256 = "0gs3xvdbzhk5k12i95p5d4fgkkaldnlv45sch7pnncb0lrpcjsnq"; + sha256 = "sha256-dJBZkGwzHCx/us7uAkZiRaI3uRvUCN/485bQc0oGCuI="; }; buildInputs = [curl libiconv]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/pdf2djvu/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/pdf2djvu/default.nix index 370d54adde..47256f9f7e 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , autoreconfHook , gettext , libtool @@ -25,6 +26,15 @@ stdenv.mkDerivation rec { sha256 = "1igabfy3fd7qndihmkfk9incc15pjxpxh2cn5pfw5fxfwrpjrarn"; }; + patches = [ + # Not included in 0.9.17.1, but will be in the next version. + (fetchpatch { + name = "no-poppler-splash.patch"; + url = "https://github.com/jwilk/pdf2djvu/commit/2ec7eee57a47bbfd296badaa03dc20bf71b50201.patch"; + sha256 = "03kap7k2j29r16qgl781cxpswzg3r2yn513cqycgl0vax2xj3gly"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix index 755909f2b3..e80c432665 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix @@ -1,64 +1,75 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, pkg-config , gettext -, guile -, guile-reader -, guile-lib -, ploticus -, imagemagick , ghostscript -, transfig -, enableEmacs ? false, emacs ? null -, enableLout ? true, lout ? null -, enableTex ? true, tex ? null +, guile +, guile-lib +, guile-reader +, imagemagick , makeWrapper +, pkg-config +, ploticus +, transfig +, enableEmacs ? false, emacs +, enableLout ? true, lout +, enableTex ? true, tex }: let + inherit (lib) optional; +in stdenv.mkDerivation rec{ pname = "skribilo"; version = "0.9.5"; - inherit (lib) optional; -in stdenv.mkDerivation { - inherit pname version; src = fetchurl { url = "http://download.savannah.nongnu.org/releases/skribilo/${pname}-${version}.tar.gz"; sha256 = "sha256-AIJqIcRjT7C0EO6J60gGjERdgAglh0ZU49U9XKPwvwk="; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; - - buildInputs = [ gettext guile ploticus imagemagick ghostscript transfig ] + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + buildInputs = [ + gettext + ghostscript + guile + guile-lib + guile-reader + imagemagick + ploticus + transfig + ] ++ optional enableEmacs emacs ++ optional enableLout lout ++ optional enableTex tex; - propagatedBuildInputs = [ guile-reader guile-lib ]; + postInstall = + let + guileVersion = lib.versions.majorMinor guile.version; + in + '' + wrapProgram $out/bin/skribilo \ + --prefix GUILE_LOAD_PATH : "$out/share/guile/site/${guileVersion}:$GUILE_LOAD_PATH" \ + --prefix GUILE_LOAD_COMPILED_PATH : "$out/lib/guile/${guileVersion}/site-ccache:$GUILE_LOAD_COMPILED_PATH" + ''; - postInstall = '' - wrapProgram $out/bin/skribilo \ - --prefix GUILE_LOAD_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" \ - --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" - ''; - - meta = with lib;{ + meta = with lib; { + homepage = "https://www.nongnu.org/skribilo/"; description = "The Ultimate Document Programming Framework"; longDescription = '' - Skribilo is a free document production tool that takes a - structured document representation as its input and renders that - document in a variety of output formats: HTML and Info for - on-line browsing, and Lout and LaTeX for high-quality hard - copies. + Skribilo is a free document production tool that takes a structured + document representation as its input and renders that document in a + variety of output formats: HTML and Info for on-line browsing, and Lout + and LaTeX for high-quality hard copies. The input document can use Skribilo's markup language to provide - information about the document's structure, which is similar to - HTML or LaTeX and does not require expertise. Alternatively, it - can use a simpler, "markup-less" format that borrows from Emacs' - outline mode and from other conventions used in emails, Usenet - and text. + information about the document's structure, which is similar to HTML or + LaTeX and does not require expertise. Alternatively, it can use a simpler, + "markup-less" format that borrows from Emacs' outline mode and from other + conventions used in emails, Usenet and text. ''; - homepage = "https://www.nongnu.org/skribilo/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/ted/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/ted/default.nix index 07e89f9f8e..bd21ad4c43 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/ted/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/ted/default.nix @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ pkg-config zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ]; meta = with lib; { description = "An easy rich text processor"; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix index 6a9a2cb464..f19ddaebdf 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix @@ -1,22 +1,24 @@ { lib, stdenv, fetchurl, emacs, texlive, ghostscript }: let auctex = stdenv.mkDerivation ( rec { - version = "12.3"; - # Make this a valid tex(live-new) package; # the pkgs attribute is provided with a hack below. pname = "auctex"; + version = "12.3"; tlType = "run"; - outputs = [ "out" "tex" ]; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1pd99hbhci3l1n0lmzn803svqwl47kld6172gwkwjmwlnqqgxm1g"; + hash = "sha256-L9T+MLaUV8knf+IE0+g8hHK89QDI/kqBDXREBhdMqd0="; }; - buildInputs = [ emacs texlive.combined.scheme-basic ghostscript ]; + buildInputs = [ + emacs + ghostscript + texlive.combined.scheme-basic + ]; preConfigure = '' mkdir -p "$tex" @@ -27,11 +29,11 @@ let auctex = stdenv.mkDerivation ( rec { "--with-texmf-dir=\${tex}" ]; - meta = { - description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs"; + meta = with lib; { homepage = "https://www.gnu.org/software/auctex"; - platforms = lib.platforms.unix; - license = lib.licenses.gpl3; + description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs"; + license = licenses.gpl3Plus; + platforms = platforms.unix; }; }); 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 1c3d592963..32fba9a8e1 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -143,7 +143,7 @@ core = stdenv.mkDerivation rec { description = "Basic binaries for TeX Live"; homepage = "http://www.tug.org/texlive"; license = lib.licenses.gpl2; - maintainers = with maintainers; [ vcunat veprbl lovek323 raskin jwiegley ]; + maintainers = with maintainers; [ veprbl lovek323 raskin jwiegley ]; platforms = platforms.all; }; }; @@ -185,6 +185,12 @@ core-big = stdenv.mkDerivation { #TODO: upmendex mkdir -p "$path" && cd "$path" "../../../$path/configure" $configureFlags $extraConfig + + if [[ "$path" =~ "libs/pplib" ]]; then + # TODO: revert for texlive 2022 + # ../../../texk/web2c/luatexdir/luamd5/md5lib.c:197:10: fatal error: 'utilsha.h' file not found + make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} + fi ) done ''; diff --git a/third_party/nixpkgs/pkgs/tools/video/gopro/default.nix b/third_party/nixpkgs/pkgs/tools/video/gopro/default.nix index 71b85b845e..a1991772bf 100644 --- a/third_party/nixpkgs/pkgs/tools/video/gopro/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/gopro/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, ffmpeg_3 +, ffmpeg , imagemagick , makeWrapper , mplayer @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { install -Dm755 gopro -t $out/bin wrapProgram $out/bin/gopro \ - --prefix PATH ":" "${lib.makeBinPath [ ffmpeg_3 imagemagick mplayer ]}" + --prefix PATH ":" "${lib.makeBinPath [ ffmpeg imagemagick mplayer ]}" runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix b/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix index 16699e15ba..b53938e36a 100644 --- a/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix @@ -49,6 +49,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/xiph/rav1e"; changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}"; license = licenses.bsd2; - maintainers = [ maintainers.primeos ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/video/swftools/default.nix b/third_party/nixpkgs/pkgs/tools/video/swftools/default.nix index cd3af66184..6867869a0a 100644 --- a/third_party/nixpkgs/pkgs/tools/video/swftools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/swftools/default.nix @@ -1,6 +1,5 @@ -{ lib, stdenv, fetchurl, freetype, libjpeg, libungif, zlib }: +{ lib, stdenv, fetchurl, freetype, libjpeg, zlib }: -with lib; stdenv.mkDerivation rec { pname = "swftools"; version = "0.9.2"; @@ -12,13 +11,30 @@ stdenv.mkDerivation rec { patches = [ ./swftools.patch ]; - buildInputs = [ freetype libjpeg libungif zlib ]; + buildInputs = [ freetype libjpeg zlib ]; - meta = { + meta = with lib; { description = "Collection of SWF manipulation and creation utilities"; homepage = "http://www.swftools.org/about.html"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.koral ]; platforms = lib.platforms.unix; + broken = true; + knownVulnerabilities = [ + "CVE-2017-10976" + "CVE-2017-11096" + "CVE-2017-11097" + "CVE-2017-11098" + "CVE-2017-11099" + "CVE-2017-11100" + "CVE-2017-11101" + "CVE-2017-16711" + "CVE-2017-16793" + "CVE-2017-16794" + "CVE-2017-16796" + "CVE-2017-16797" + "CVE-2017-16868" + "CVE-2017-16890" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index 4d34cd50b1..0718e437b0 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "google-compute-engine-oslogin"; - version = "20200507.00"; + version = "20210429.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "guest-oslogin"; rev = version; - sha256 = "1np8c96sm29pwnxykc0id8kkgalhw576g43fgi1y936sr2hfvx3v"; + sha256 = "eHAg9K5oxcygEzqaac81jSFHF+zsW6uB7q2Kfo9hSrA="; }; postPatch = '' @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { buildInputs = [ curl.dev pam ]; - NIX_CFLAGS_COMPILE="-I${json_c.dev}/include/json-c"; - NIX_CFLAGS_LINK="-L${json_c}/lib"; + NIX_CFLAGS_COMPILE = "-I${json_c.dev}/include/json-c"; + NIX_CFLAGS_LINK = "-L${json_c}/lib"; makeFlags = [ "VERSION=${version}" diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index ab74727b9d..a275fbd805 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -63,6 +63,7 @@ mapAliases ({ at_spi2_core = at-spi2-core; # added 2018-02-25 aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # added 2020-12-26 avldrums-lv2 = x42-avldrums; # added 2020-03-29 + avxsynth = throw "avxsynth was removed because it was broken"; # added 2021-05-18 bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 @@ -121,6 +122,8 @@ mapAliases ({ conntrack_tools = conntrack-tools; # added 2018-05 cool-old-term = cool-retro-term; # added 2015-01-31 coprthr = throw "coprthr has been removed."; # added 2019-12-08 + couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03 + couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03 corebird = throw "corebird was deprecated 2019-10-02: See https://www.patreon.com/posts/corebirds-future-18921328. Please use Cawbird as replacement."; coredumper = throw "coredumper has been removed: abandoned by upstream."; # added 2019-11-16 cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30 @@ -195,6 +198,7 @@ mapAliases ({ exfat-utils = exfat; # 2015-09-11 facette = throw "facette has been removed."; # added 2020-01-06 fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28 + fastnlo = fastnlo_toolkit; # added 2021-04-24 fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # added 2021-04-13 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H."; ffadoFull = ffado; # added 2018-05-01 @@ -241,6 +245,7 @@ mapAliases ({ gdb-multitarget = gdb; # added 2017-11-13 gdk_pixbuf = gdk-pixbuf; # added 2019-05-22 gettextWithExpat = gettext; # 2016-02-19 + giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # 2020-02-12 gitAndTools = self // { # added 2021-01-14 darcsToGit = darcs-to-git; gitAnnex = git-annex; @@ -297,6 +302,7 @@ mapAliases ({ gtk_doc = gtk-doc; # added 2018-02-25 guileCairo = guile-cairo; # added 2017-09-24 guileGnome = guile-gnome; # added 2017-09-24 + gnome3 = gnome; # added 2021-05-07 guileLint = guile-lint; # added 2017-09-27 guile_lib = guile-lib; # added 2017-09-24 guile_ncurses = guile-ncurses; # added 2017-09-24 @@ -342,6 +348,7 @@ mapAliases ({ julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # added 2021-03-13 julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # added 2020-09-15 julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # added 2021-03-13 + kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # added 2021-04-11 kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28 kdiff3-qt5 = kdiff3; # added 2017-02-18 keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 @@ -352,6 +359,7 @@ mapAliases ({ kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28 kicad-with-packages3d = kicad; # added 2019-11-25 kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download."; # 2021-03-09 + kino = throw "kino has been removed because it was broken and abandoned"; # added 2021-04-25 krename-qt5 = krename; # added 2017-02-18 kerberos = libkrb5; # moved from top-level 2021-03-14 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 @@ -393,6 +401,7 @@ mapAliases ({ libtxc_dxtn = throw "libtxc_dxtn was removed 2020-03-16, now integrated in Mesa"; libtxc_dxtn_s2tc = throw "libtxc_dxtn_s2tc was removed 2020-03-16, now integrated in Mesa"; libudev = udev; # added 2018-04-25 + libungif = giflib; # added 2020-02-12 libusb = libusb1; # added 2020-04-28 libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22 @@ -432,6 +441,7 @@ mapAliases ({ mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 matrique = spectral; # added 2020-01-27 mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 + meme = meme-image-generator; # added 2021-04-21 mess = mame; # added 2019-10-30 mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23 mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25 @@ -598,6 +608,7 @@ mapAliases ({ postgis = postgresqlPackages.postgis; # end ppl-address-book = throw "ppl-address-book deprecated on 2019-05-02: abandoned by upstream."; + privateer = throw "privateer was removed because it was broken"; # added 2021-05-18 processing3 = processing; # added 2019-08-16 procps-ng = procps; # added 2018-06-08 proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead."; # added 2021-04-12 @@ -611,6 +622,7 @@ mapAliases ({ phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 + pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # added 2021-05-14 pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24 python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08 quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22 @@ -629,6 +641,8 @@ mapAliases ({ rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 + readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # added 2021-04-22 + retroshare = throw "retroshare was removed because it was broken"; # added 2021-05-17 rhc = throw "rhc was deprecated on 2019-04-09: abandoned by upstream."; rng_tools = rng-tools; # added 2018-10-24 robomongo = robo3t; #added 2017-09-28 @@ -665,6 +679,8 @@ mapAliases ({ rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02 rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02 subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # added 2021-03-31 + thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25 and was therefore removed from nixpkgs"; + thunderbird-bin-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25 and was therefore removed from nixpkgs"; togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02 urxvt_perl = rxvt-unicode-plugins.perl; # added 2020-02-02 @@ -744,6 +760,7 @@ mapAliases ({ speedtest_cli = speedtest-cli; # added 2015-02-17 spice_gtk = spice-gtk; # added 2018-02-25 spice_protocol = spice-protocol; # added 2018-02-25 + spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011."; # added 2021-05-03 spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21 spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # added 2019-10-16 spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21 @@ -753,6 +770,7 @@ mapAliases ({ squid4 = squid; # added 2019-08-22 sshfsFuse = sshfs-fuse; # added 2016-09 stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 + stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # added 2021-05-09 surf-webkit2 = surf; # added 2017-04-02 sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream"; swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 @@ -862,6 +880,7 @@ mapAliases ({ xlibs = xorg; # added 2015-09 xpraGtk3 = xpra; # added 2018-09-13 xv = xxv; # added 2020-02-22 + xvfb_run = xvfb-run; # added 2021-05-07 yacc = bison; # moved from top-level 2021-03-14 youtubeDL = youtube-dl; # added 2014-10-26 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; @@ -966,6 +985,12 @@ mapAliases ({ posix_man_pages = man-pages-posix; # Added 2021-04-15 + /* Cleanup before 21.11, Added 2021-05-07 */ + avian = throw '' + The package doesn't compile anymore on NixOS and both development + & maintenance is abandoned by upstream. + ''; + /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: https://github.com/NixOS/nixpkgs/pull/101369 */ diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 99b3c2098c..d5b4c1104e 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -30,7 +30,7 @@ in # just the plain stdenv. stdenv_32bit = lowPrio (if stdenv.hostPlatform.is32bit then stdenv else multiStdenv); - stdenvNoCC = stdenv.override { cc = null; extraAttrs.noCC = true; }; + stdenvNoCC = stdenv.override { cc = null; hasCC = false; }; mkStdenvNoLibs = stdenv: let bintools = stdenv.cc.bintools.override { @@ -156,6 +156,10 @@ in antsimulator = callPackage ../games/antsimulator { }; + atuin = callPackage ../tools/misc/atuin { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; + fiche = callPackage ../servers/fiche { }; fishnet = callPackage ../servers/fishnet { }; @@ -197,7 +201,7 @@ in castget = callPackage ../applications/networking/feedreaders/castget { }; castxml = callPackage ../development/tools/castxml { - inherit (llvmPackages) clang-unwrapped libclang llvm; + inherit (llvmPackages) libclang llvm; inherit (python3Packages) sphinx; }; @@ -251,6 +255,8 @@ in eclipse-mat = callPackage ../development/tools/eclipse-mat { }; + evans = callPackage ../development/tools/evans { }; + frugal = callPackage ../development/tools/frugal { }; glade = callPackage ../development/tools/glade { }; @@ -259,7 +265,11 @@ in html5validator = python3Packages.callPackage ../applications/misc/html5validator { }; - probe-run = callPackage ../development/tools/rust/probe-run {}; + probe-run = callPackage ../development/tools/rust/probe-run { + inherit (darwin.apple_sdk.frameworks) AppKit IOKit; + }; + + mix2nix = callPackage ../development/tools/mix2nix/default.nix { }; proto-contrib = callPackage ../development/tools/proto-contrib {}; @@ -451,60 +461,60 @@ in # `fetchurl' downloads a file from the network. fetchurl = if stdenv.buildPlatform != stdenv.hostPlatform - then buildPackages.fetchurl # No need to do special overrides twice, - else makeOverridable (import ../build-support/fetchurl) { - inherit lib stdenvNoCC buildPackages; - inherit cacert; - curl = buildPackages.curlMinimal.override (old: rec { - # break dependency cycles - fetchurl = stdenv.fetchurlBoot; - zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; - pkg-config = buildPackages.pkg-config.override (old: { - pkg-config = old.pkg-config.override { - fetchurl = stdenv.fetchurlBoot; - }; - }); - perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; - openssl = buildPackages.openssl.override { + then buildPackages.fetchurl # No need to do special overrides twice, + else makeOverridable (import ../build-support/fetchurl) { + inherit lib stdenvNoCC buildPackages; + inherit cacert; + curl = buildPackages.curlMinimal.override (old: rec { + # break dependency cycles fetchurl = stdenv.fetchurlBoot; - buildPackages = { - coreutils = buildPackages.coreutils.override { + zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; + pkg-config = buildPackages.pkg-config.override (old: { + pkg-config = old.pkg-config.override { fetchurl = stdenv.fetchurlBoot; + }; + }); + perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; + openssl = buildPackages.openssl.override { + fetchurl = stdenv.fetchurlBoot; + buildPackages = { + coreutils = buildPackages.coreutils.override { + fetchurl = stdenv.fetchurlBoot; + inherit perl; + xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; }; + gmp = null; + aclSupport = false; + attrSupport = false; + }; inherit perl; - xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; }; - gmp = null; - aclSupport = false; - attrSupport = false; }; inherit perl; }; - inherit perl; - }; - libssh2 = buildPackages.libssh2.override { - fetchurl = stdenv.fetchurlBoot; - inherit zlib openssl; - }; - # On darwin, libkrb5 needs bootstrap_cmds which would require - # converting many packages to fetchurl_boot to avoid evaluation cycles. - # So turn gssSupport off there, and on Windows. - # On other platforms, keep the previous value. - gssSupport = - if stdenv.isDarwin || stdenv.hostPlatform.isWindows - then false - else old.gssSupport or true; # `? true` is the default - libkrb5 = buildPackages.libkrb5.override { - fetchurl = stdenv.fetchurlBoot; - inherit pkg-config perl openssl; - keyutils = buildPackages.keyutils.override { fetchurl = stdenv.fetchurlBoot; }; - }; - nghttp2 = buildPackages.nghttp2.override { - fetchurl = stdenv.fetchurlBoot; - inherit zlib pkg-config openssl; - c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; - libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; - }; - }); - }; + libssh2 = buildPackages.libssh2.override { + fetchurl = stdenv.fetchurlBoot; + inherit zlib openssl; + }; + # On darwin, libkrb5 needs bootstrap_cmds which would require + # converting many packages to fetchurl_boot to avoid evaluation cycles. + # So turn gssSupport off there, and on Windows. + # On other platforms, keep the previous value. + gssSupport = + if stdenv.isDarwin || stdenv.hostPlatform.isWindows + then false + else old.gssSupport or true; # `? true` is the default + libkrb5 = buildPackages.libkrb5.override { + fetchurl = stdenv.fetchurlBoot; + inherit pkg-config perl openssl; + keyutils = buildPackages.keyutils.override { fetchurl = stdenv.fetchurlBoot; }; + }; + nghttp2 = buildPackages.nghttp2.override { + fetchurl = stdenv.fetchurlBoot; + inherit zlib pkg-config openssl; + c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; + libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; + }; + }); + }; fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; @@ -637,6 +647,8 @@ in wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { }; + wrapGAppsHook4 = wrapGAppsHook.override { gtk3 = gtk4; }; + wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; }; separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; @@ -693,9 +705,7 @@ in acousticbrainz-client = callPackage ../tools/audio/acousticbrainz-client { }; - acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { - ffmpeg = ffmpeg_2; - }; + acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { }; alsaequal = callPackage ../tools/audio/alsaequal { }; @@ -794,12 +804,14 @@ in aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; ajour = callPackage ../tools/games/ajour { - inherit (gnome3) zenity; + inherit (gnome) zenity; inherit (plasma5Packages) kdialog; }; albert = libsForQt5.callPackage ../applications/misc/albert {}; + auditwheel = callPackage ../tools/package-management/auditwheel { }; + gobgp = callPackage ../tools/networking/gobgp { }; metapixel = callPackage ../tools/graphics/metapixel { }; @@ -808,6 +820,10 @@ in tfk8s = callPackage ../tools/misc/tfk8s { }; + tnat64 = callPackage ../tools/networking/tnat64 { }; + + xcd = callPackage ../tools/misc/xcd { }; + xtrt = callPackage ../tools/archivers/xtrt { }; yabridge = callPackage ../tools/audio/yabridge { @@ -818,6 +834,10 @@ in wine = wineWowPackages.staging; }; + yafetch = callPackage ../tools/misc/yafetch { + stdenv = clangStdenv; + }; + ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { @@ -1458,10 +1478,12 @@ in grc = python3Packages.callPackage ../tools/misc/grc { }; green-pdfviewer = callPackage ../applications/misc/green-pdfviewer { - SDL = SDL_sixel; + SDL = SDL_sixel; }; - gremlin-console = callPackage ../applications/misc/gremlin-console { }; + gremlin-console = callPackage ../applications/misc/gremlin-console { + openjdk = openjdk11; + }; grex = callPackage ../tools/misc/grex { inherit (darwin.apple_sdk.frameworks) Security; @@ -1479,6 +1501,8 @@ in harvid = callPackage ../tools/video/harvid { }; + hilbish = callPackage ../shells/hilbish { }; + hime = callPackage ../tools/inputmethods/hime {}; hinit = haskell.lib.justStaticExecutables haskellPackages.hinit; @@ -1928,6 +1952,8 @@ in buildpack = callPackage ../development/tools/buildpack { }; + bottom-rs = callPackage ../tools/misc/bottom-rs { }; + buildtorrent = callPackage ../tools/misc/buildtorrent { }; bustle = haskellPackages.bustle; @@ -1996,6 +2022,8 @@ in boost = pkgs.boost.override { python = python3; }; }; + calendar-cli = callPackage ../tools/networking/calendar-cli { }; + candle = libsForQt5.callPackage ../applications/misc/candle { }; capstone = callPackage ../development/libraries/capstone { }; @@ -2268,6 +2296,8 @@ in ddate = callPackage ../tools/misc/ddate { }; + dduper = callPackage ../tools/filesystems/dduper { }; + dedup = callPackage ../tools/backup/dedup { }; dehydrated = callPackage ../tools/admin/dehydrated { }; @@ -2321,13 +2351,9 @@ in discount = callPackage ../tools/text/discount { }; - discourse = callPackage ../servers/web-apps/discourse { - ruby = ruby_2_7; - }; + discourse = callPackage ../servers/web-apps/discourse { }; - discourse-mail-receiver = callPackage ../servers/web-apps/discourse/mail_receiver { - ruby = ruby_2_7; - }; + discourse-mail-receiver = callPackage ../servers/web-apps/discourse/mail_receiver { }; discocss = callPackage ../tools/misc/discocss { }; @@ -2405,6 +2431,8 @@ in dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { }; + earthly = callPackage ../development/tools/earthly { }; + earlybird = callPackage ../tools/security/earlybird { }; earlyoom = callPackage ../os-specific/linux/earlyoom { }; @@ -2642,6 +2670,8 @@ in godu = callPackage ../tools/misc/godu { }; + goss = callPackage ../tools/misc/goss { }; + gosu = callPackage ../tools/misc/gosu { }; gotify-cli = callPackage ../tools/misc/gotify-cli { }; @@ -2720,6 +2750,8 @@ in jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; + jellyfin-web = callPackage ../servers/jellyfin/web.nix { }; + jiten = callPackage ../applications/misc/jiten { }; jotta-cli = callPackage ../applications/misc/jotta-cli { }; @@ -3017,6 +3049,10 @@ in shellhub-agent = callPackage ../applications/networking/shellhub-agent { }; + sheesy-cli = callPackage ../tools/security/sheesy-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; + simdjson = callPackage ../development/libraries/simdjson { }; shipyard = callPackage ../tools/virtualization/shipyard { }; @@ -3031,6 +3067,8 @@ in socklog = callPackage ../tools/system/socklog { }; + soju = callPackage ../applications/networking/soju { }; + spacevim = callPackage ../applications/editors/spacevim { }; ssmsh = callPackage ../tools/admin/ssmsh { }; @@ -3206,6 +3244,10 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; + bacon = callPackage ../development/tools/bacon { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + bareos = callPackage ../tools/backup/bareos { }; bats = callPackage ../development/interpreters/bats { }; @@ -3214,7 +3256,14 @@ in bdsync = callPackage ../tools/backup/bdsync { }; - beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter { }; + beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter { + # developed for a compiler with C++20 support + stdenv = + if stdenv.isDarwin then + overrideCC stdenv clang_10 + else + stdenv; + }; beanstalkd = callPackage ../servers/beanstalkd { }; @@ -3538,7 +3587,7 @@ in libpinyin = callPackage ../development/libraries/libpinyin { }; libskk = callPackage ../development/libraries/libskk { - inherit (gnome3) gnome-common; + inherit (gnome) gnome-common; }; m17n_db = callPackage ../tools/inputmethods/m17n-db { }; @@ -3635,7 +3684,9 @@ in cfssl = callPackage ../tools/security/cfssl { }; - chafa = callPackage ../tools/misc/chafa { }; + chafa = callPackage ../tools/misc/chafa { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; @@ -3834,7 +3885,8 @@ in deno = callPackage ../development/web/deno { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Security CoreServices Metal Foundation; + inherit (darwin.apple_sdk.frameworks) + Security CoreServices Metal Foundation QuartzCore; }; detox = callPackage ../tools/misc/detox { }; @@ -4159,6 +4211,8 @@ in inherit (darwin.apple_sdk.frameworks) AppKit Security; }; + timeline = callPackage ../applications/office/timeline/default.nix { }; + tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; @@ -4200,7 +4254,7 @@ in wallutils = callPackage ../tools/graphics/wallutils { }; wrangler = callPackage ../development/tools/wrangler { - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; }; wsl-open = callPackage ../tools/misc/wsl-open { }; @@ -4388,6 +4442,8 @@ in fakechroot = callPackage ../tools/system/fakechroot { }; + fancy-motd = callPackage ../tools/system/fancy-motd { }; + fastpbkdf2 = callPackage ../development/libraries/fastpbkdf2 { }; fanficfare = callPackage ../tools/text/fanficfare { }; @@ -4803,6 +4859,8 @@ in ghorg = callPackage ../applications/version-management/git-and-tools/ghorg { }; + ghostunnel = callPackage ../tools/networking/ghostunnel { }; + ghq = callPackage ../applications/version-management/git-and-tools/ghq { }; ghr = callPackage ../applications/version-management/git-and-tools/ghr { }; @@ -4998,19 +5056,14 @@ in gitkraken = callPackage ../applications/version-management/gitkraken { }; - gitlab = callPackage ../applications/version-management/gitlab { - ruby = ruby_2_7; - }; + gitlab = callPackage ../applications/version-management/gitlab { }; gitlab-ee = callPackage ../applications/version-management/gitlab { - ruby = ruby_2_7; gitlabEnterprise = true; }; gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; - gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { - ruby = ruby_2_7; - }; + gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { }; gitlab-triage = callPackage ../applications/version-management/gitlab-triage { }; @@ -5018,9 +5071,7 @@ in gitleaks = callPackage ../tools/security/gitleaks { }; - gitaly = callPackage ../applications/version-management/gitlab/gitaly { - ruby = ruby_2_7; - }; + gitaly = callPackage ../applications/version-management/gitlab/gitaly { }; gitstats = callPackage ../applications/version-management/gitstats { }; @@ -5112,10 +5163,9 @@ in gnu-pw-mgr = callPackage ../tools/security/gnu-pw-mgr { }; - gnused = if !stdenv.hostPlatform.isWindows then - callPackage ../tools/text/gnused { } # broken on Windows - else - gnused_422; + gnused = if !stdenv.hostPlatform.isWindows + then callPackage ../tools/text/gnused { } # broken on Windows + else gnused_422; # This is an easy work-around for [:space:] problems. gnused_422 = callPackage ../tools/text/gnused/422.nix { }; @@ -5330,6 +5380,8 @@ in gtkperf = callPackage ../development/tools/misc/gtkperf { }; + gtk-frdp = callPackage ../development/libraries/gtk-frdp {}; + gtk-vnc = callPackage ../tools/admin/gtk-vnc {}; gtmess = callPackage ../applications/networking/instant-messengers/gtmess { @@ -5474,7 +5526,9 @@ in hdf5-blosc = callPackage ../development/libraries/hdf5-blosc { }; - hdfview = callPackage ../tools/misc/hdfview { }; + hdfview = callPackage ../tools/misc/hdfview { + hdf5 = hdf5_1_10; + }; hecate = callPackage ../applications/editors/hecate { }; @@ -5723,6 +5777,8 @@ in netifd = callPackage ../tools/networking/netifd {}; + ipinfo = callPackage ../tools/networking/ipinfo {}; + ipscan = callPackage ../tools/security/ipscan { }; ipv6calc = callPackage ../tools/networking/ipv6calc {}; @@ -5830,6 +5886,8 @@ in jq = callPackage ../development/tools/jq { }; + jiq = callPackage ../development/tools/misc/jiq { }; + jql = callPackage ../development/tools/jql { }; jo = callPackage ../development/tools/jo { }; @@ -5955,6 +6013,8 @@ in kpcli = callPackage ../tools/security/kpcli { }; + kratos = callPackage ../applications/misc/kratos { }; + krename = libsForQt5.callPackage ../applications/misc/krename { }; krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; @@ -6113,8 +6173,6 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - matrix-dendrite = callPackage ../servers/matrix-dendrite { }; - /* Python 3.8 is currently broken with matrix-synapse since `python38Packages.bleach` fails (https://github.com/NixOS/nixpkgs/issues/76093) */ matrix-synapse = callPackage ../servers/matrix-synapse { /*python3 = python38;*/ }; @@ -6180,6 +6238,8 @@ in minidlna = callPackage ../tools/networking/minidlna { }; + minipro = callPackage ../tools/misc/minipro { }; + minisign = callPackage ../tools/security/minisign { }; ministat = callPackage ../tools/misc/ministat { }; @@ -6265,10 +6325,6 @@ in nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix { enableNpm = false; }; - nodejs-15_x = callPackage ../development/web/nodejs/v15.nix { }; - nodejs-slim-15_x = callPackage ../development/web/nodejs/v15.nix { - enableNpm = false; - }; nodejs-16_x = callPackage ../development/web/nodejs/v16.nix { }; nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix { enableNpm = false; @@ -6376,7 +6432,7 @@ in libite = callPackage ../development/libraries/libite { }; liblangtag = callPackage ../development/libraries/liblangtag { - inherit (gnome3) gnome-common; + inherit (gnome) gnome-common; }; liblouis = callPackage ../development/libraries/liblouis { }; @@ -6433,6 +6489,8 @@ in libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; + libtorrent-jesec = callPackage ../tools/networking/p2p/libtorrent-jesec { }; + libmpack = callPackage ../development/libraries/libmpack { }; libiberty = callPackage ../development/libraries/libiberty { }; @@ -6536,7 +6594,9 @@ in macchanger = callPackage ../os-specific/linux/macchanger { }; - macchina = callPackage ../tools/misc/macchina { }; + macchina = callPackage ../tools/misc/macchina { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; madlang = haskell.lib.justStaticExecutables haskellPackages.madlang; @@ -6586,8 +6646,9 @@ in mandoc = callPackage ../tools/misc/mandoc { }; - mangohud = callPackage ../tools/graphics/mangohud/combined.nix { + mangohud = callPackage ../tools/graphics/mangohud { libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + mangohud32 = pkgsi686Linux.mangohud; }; manix = callPackage ../tools/nix/manix { @@ -7004,6 +7065,8 @@ in ntlmrecon = callPackage ../tools/security/ntlmrecon { }; + numberstation = callPackage ../applications/misc/numberstation { }; + nvchecker = with python3Packages; toPythonApplication nvchecker; miller = callPackage ../tools/text/miller { }; @@ -7129,11 +7192,18 @@ in nylon = callPackage ../tools/networking/nylon { }; - nym = callPackage ../applications/networking/nym { }; + nym = callPackage ../applications/networking/nym { + inherit (darwin.apple_sdk.frameworks) Security; + }; nzbget = callPackage ../tools/networking/nzbget { }; - nzbhydra2 = callPackage ../servers/nzbhydra2 { }; + nzbhydra2 = callPackage ../servers/nzbhydra2 { + # You need Java (at least 8, at most 15) + # https://github.com/theotherp/nzbhydra2/issues/697 + # https://github.com/theotherp/nzbhydra2/#how-to-run + jre = openjdk11; + }; oapi-codegen = callPackage ../tools/networking/oapi-codegen { }; @@ -7204,8 +7274,8 @@ in onlykey-cli = callPackage ../tools/security/onlykey-cli { }; - openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { }; - openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { }; + openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; }; + openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; }; openbazaar = callPackage ../applications/networking/openbazaar { }; openbazaar-client = callPackage ../applications/networking/openbazaar/client.nix { }; @@ -7451,6 +7521,8 @@ in pitivi = callPackage ../applications/video/pitivi { }; + prism = callPackage ../applications/video/prism { }; + pulumi-bin = callPackage ../tools/admin/pulumi { }; p0f = callPackage ../tools/security/p0f { }; @@ -7796,6 +7868,8 @@ in pycangjie = pythonPackages.pycangjie; + pycflow2dot = with python.pkgs; toPythonApplication pycflow2dot; + pydb = callPackage ../development/tools/pydb { }; pydf = callPackage ../applications/misc/pydf { }; @@ -7856,6 +7930,8 @@ in qnial = callPackage ../development/interpreters/qnial { }; + quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { }; + ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { }; q-text-as-data = callPackage ../tools/misc/q-text-as-data { }; @@ -8137,6 +8213,8 @@ in rtorrent = callPackage ../tools/networking/p2p/rtorrent { }; + rtorrent-jesec = callPackage ../tools/networking/p2p/rtorrent-jesec { }; + rubber = callPackage ../tools/typesetting/rubber { }; rubocop = callPackage ../development/tools/rubocop { }; @@ -8458,6 +8536,8 @@ in snapcast = callPackage ../applications/audio/snapcast { }; + snapdragon-profiler = callPackage ../tools/graphics/snapdragon-profiler { }; + sng = callPackage ../tools/graphics/sng { libpng = libpng12; }; @@ -8553,7 +8633,7 @@ in spacebar = callPackage ../os-specific/darwin/spacebar { inherit (darwin.apple_sdk.frameworks) - Carbon Cocoa ScriptingBridge; + Carbon Cocoa ScriptingBridge SkyLight; }; spaceFM = callPackage ../applications/misc/spacefm { }; @@ -8667,9 +8747,7 @@ in stunnel = callPackage ../tools/networking/stunnel { }; - stutter = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.stutter) (drv: { - preCheck = "export PATH=dist/build/stutter:$PATH"; - }); + stutter = haskell.lib.justStaticExecutables haskellPackages.stutter; strongswan = callPackage ../tools/networking/strongswan { }; strongswanTNC = strongswan.override { enableTNC = true; }; @@ -8806,6 +8884,8 @@ in pythonPackages = python3Packages; }; + telepresence2 = callPackage ../tools/networking/telepresence2 { }; + teler = callPackage ../tools/security/teler { }; termius = callPackage ../applications/networking/termius { }; @@ -8990,10 +9070,14 @@ in trezor-suite = callPackage ../applications/blockchains/trezor-suite { }; - trunk = callPackage ../development/tools/trunk { }; + trunk = callPackage ../development/tools/trunk { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; tthsum = callPackage ../applications/misc/tthsum { }; + ttp = with python3.pkgs; toPythonApplication ttp; + chaps = callPackage ../tools/security/chaps { }; trace-cmd = callPackage ../os-specific/linux/trace-cmd { }; @@ -9441,7 +9525,9 @@ in tre = callPackage ../development/libraries/tre { }; - tremor-rs = callPackage ../tools/misc/tremor-rs { }; + tremor-rs = callPackage ../tools/misc/tremor-rs { + inherit (darwin.apple_sdk.frameworks) Security; + }; ts = callPackage ../tools/system/ts { }; @@ -9591,7 +9677,9 @@ in waf = callPackage ../development/tools/build-managers/waf { python = python3; }; wafHook = callPackage ../development/tools/build-managers/wafHook { }; - wagyu = callPackage ../tools/misc/wagyu { }; + wagyu = callPackage ../tools/misc/wagyu { + inherit (darwin.apple_sdk.frameworks) Security; + }; wakelan = callPackage ../tools/networking/wakelan { }; @@ -9629,7 +9717,10 @@ in whsniff = callPackage ../applications/networking/sniffers/whsniff { }; - wiiuse = callPackage ../development/libraries/wiiuse { }; + wiiuse = callPackage ../development/libraries/wiiuse { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth; + }; woeusb = callPackage ../tools/misc/woeusb { }; @@ -9655,6 +9746,8 @@ in wpgtk = callPackage ../tools/X11/wpgtk { }; + wrap = callPackage ../tools/text/wrap { }; + wring = nodePackages.wring; wrk = callPackage ../tools/networking/wrk { }; @@ -9760,7 +9853,7 @@ in xxv = callPackage ../tools/misc/xxv {}; - xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; + xvfb-run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; xvkbd = callPackage ../tools/X11/xvkbd {}; @@ -10131,12 +10224,9 @@ in ats = callPackage ../development/compilers/ats { }; ats2 = callPackage ../development/compilers/ats2 { }; - avra = callPackage ../development/compilers/avra { }; + ats-acc = callPackage ../development/tools/ats-acc { }; - avian = callPackage ../development/compilers/avian { - inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + avra = callPackage ../development/compilers/avra { }; bigloo = callPackage ../development/compilers/bigloo { }; @@ -10188,6 +10278,7 @@ in chez-matchable = callPackage ../development/chez-modules/chez-matchable { }; clang = llvmPackages.clang; + libclang = llvmPackages.libclang; clang-manpages = llvmPackages.clang-manpages; clang-sierraHack = clang.override { @@ -10330,13 +10421,24 @@ in if stdenv.targetPlatform.isAarch64 then gcc9 else gcc10; gcc-unwrapped = gcc.cc; - gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { - allowedRequisites = null; - cc = gcc; - # Remove libcxx/libcxxabi, and add clang for AS if on darwin (it uses - # clang's internal assembler). - extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc; - }; + wrapNonDeterministicGcc = stdenv: ccWrapper: + if ccWrapper.isGNU then ccWrapper.overrideAttrs(old: { + cc = old.cc.override { + reproducibleBuild = false; + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + }; + }) else ccWrapper; + + gccStdenv = + if stdenv.cc.isGNU + then stdenv + else stdenv.override { + cc = buildPackages.gcc; + allowedRequisites = null; + # Remove libcxx/libcxxabi, and add clang for AS if on darwin (it uses + # clang's internal assembler). + extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc; + }; gcc49Stdenv = overrideCC gccStdenv buildPackages.gcc49; gcc6Stdenv = overrideCC gccStdenv buildPackages.gcc6; @@ -10346,6 +10448,11 @@ in gcc10Stdenv = overrideCC gccStdenv buildPackages.gcc10; gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11; + # This is not intended for use in nixpkgs but for providing a faster-running + # compiler to nixpkgs users by building gcc with reproducibility-breaking + # profile-guided optimizations + fastStdenv = overrideCC gccStdenv (wrapNonDeterministicGcc gccStdenv buildPackages.gcc10); + wrapCCMulti = cc: if stdenv.targetPlatform.system == "x86_64-linux" then let # Binutils with glibc multi @@ -10389,39 +10496,35 @@ in stripped = false; })); - crossLibcStdenv = overrideCC stdenv - (if stdenv.hostPlatform.useLLVM or false - then buildPackages.llvmPackages_8.lldClangNoLibc - else buildPackages.gccCrossStageStatic); + gccCrossLibcStdenv = overrideCC stdenv buildPackages.gccCrossStageStatic; + + crossLibcStdenv = + if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildPackages.llvmPackages_8.lldClangNoLibc + else gccCrossLibcStdenv; # The GCC used to build libc for the target platform. Normal gccs will be # built with, and use, that cross-compiled libc. gccCrossStageStatic = assert stdenv.targetPlatform != stdenv.hostPlatform; let - libcCross1 = - if stdenv.targetPlatform.libc == "msvcrt" then targetPackages.windows.mingw_w64_headers - else if stdenv.targetPlatform.libc == "libSystem" then darwin.xcode - else if stdenv.targetPlatform.libc == "nblibc" then netbsd.headers - else null; - binutils1 = wrapBintoolsWith { - bintools = binutils-unwrapped; - libc = libcCross1; - }; + libcCross1 = binutilsNoLibc.libc; in wrapCCWith { cc = gccFun { # copy-pasted inherit noSysDirs; - # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion - profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + + reproducibleBuild = true; + profiledCompiler = false; + isl = if !stdenv.isDarwin then isl_0_20 else null; # just for stage static crossStageStatic = true; langCC = false; libcCross = libcCross1; - targetPackages.stdenv.cc.bintools = binutils1; + targetPackages.stdenv.cc.bintools = binutilsNoLibc; enableShared = false; }; - bintools = binutils1; + bintools = binutilsNoLibc; libc = libcCross1; extraPackages = []; }; @@ -10429,8 +10532,8 @@ in gcc48 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 { inherit noSysDirs; - # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion - profiledCompiler = with stdenv; (!isSunOS && !isDarwin && (isi686 || isx86_64)); + reproducibleBuild = true; + profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; @@ -10443,8 +10546,8 @@ in gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 { inherit noSysDirs; - # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion - profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + reproducibleBuild = true; + profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; @@ -10457,8 +10560,8 @@ in gcc6 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/6 { inherit noSysDirs; - # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion - profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + reproducibleBuild = true; + profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; @@ -10476,8 +10579,8 @@ in gcc7 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/7 { inherit noSysDirs; - # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion - profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + reproducibleBuild = true; + profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; @@ -10491,8 +10594,8 @@ in gcc8 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/8 { inherit noSysDirs; - # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion - profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + reproducibleBuild = true; + profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; @@ -10506,8 +10609,8 @@ in gcc9 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/9 { inherit noSysDirs; - # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion - profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + reproducibleBuild = true; + profiledCompiler = false; enableLTO = !stdenv.isi686; @@ -10520,8 +10623,8 @@ in gcc10 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/10 { inherit noSysDirs; - # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion - profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + reproducibleBuild = true; + profiledCompiler = false; enableLTO = !stdenv.isi686; @@ -10605,6 +10708,14 @@ in profiledCompiler = false; }); + gfortran11 = wrapCC (gcc11.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + libgccjit = gcc.cc.override { name = "libgccjit"; langFortran = false; @@ -10656,6 +10767,15 @@ in gnatboot = gnat6; }); + gnat11 = wrapCC (gcc11.cc.override { + name = "gnat"; + langC = true; + langCC = false; + langAda = true; + profiledCompiler = false; + gnatboot = gnat6; + }); + gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { }); gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; @@ -10777,7 +10897,7 @@ in fsharp = callPackage ../development/compilers/fsharp { }; - fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono6; }; + fsharp41 = callPackage ../development/compilers/fsharp41 { }; fstar = callPackage ../development/compilers/fstar { ocamlPackages = ocaml-ng.ocamlPackages_4_07; @@ -11045,6 +11165,13 @@ in julia-stable = julia_15; julia = julia-lts; + julia_10-bin = callPackage ../development/compilers/julia/1.0-bin.nix { }; + julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; + + julia-lts-bin = julia_10-bin; + julia-stable-bin = julia_16-bin; + julia-bin = julia-lts-bin; + jwasm = callPackage ../development/compilers/jwasm { }; knightos-genkfs = callPackage ../development/tools/knightos/genkfs { }; @@ -11111,6 +11238,7 @@ in lldb_12 = llvmPackages_12.lldb; llvm = llvmPackages.llvm; + libllvm = llvmPackages.libllvm; llvm-manpages = llvmPackages.llvm-manpages; llvm_12 = llvmPackages_12.llvm; @@ -11167,7 +11295,7 @@ in llvmPackages_10 = recurseIntoAttrs (callPackage ../development/compilers/llvm/10 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_10.tools; - targetLlvmLibraries = targetPackages.llvmPackages_10.libraries; + targetLlvmLibraries = targetPackages.llvmPackages_10.libraries or llvmPackages_10.libraries; }); llvmPackages_11 = recurseIntoAttrs (callPackage ../development/compilers/llvm/11 ({ @@ -11205,15 +11333,15 @@ in mint = callPackage ../development/compilers/mint { }; mitscheme = callPackage ../development/compilers/mit-scheme { - texLive = texlive.combine { inherit (texlive) scheme-small; }; - texinfo = texinfo5; - xlibsWrapper = null; + texLive = texlive.combine { inherit (texlive) scheme-small; }; + texinfo = texinfo5; + xlibsWrapper = null; }; mitschemeX11 = mitscheme.override { - texLive = texlive.combine { inherit (texlive) scheme-small; }; - texinfo = texinfo5; - enableX11 = true; + texLive = texlive.combine { inherit (texlive) scheme-small; }; + texinfo = texinfo5; + enableX11 = true; }; miranda = callPackage ../development/compilers/miranda {}; @@ -11230,7 +11358,7 @@ in mlton = mlton20180207; - mono = mono5; + mono = mono6; mono4 = lowPrio (callPackage ../development/compilers/mono/4.nix { inherit (darwin) libobjc; @@ -11249,9 +11377,9 @@ in monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; - roslyn = callPackage ../development/compilers/roslyn { mono = mono6; }; + roslyn = callPackage ../development/compilers/roslyn { }; - msbuild = callPackage ../development/tools/build-managers/msbuild { mono = mono6; }; + msbuild = callPackage ../development/tools/build-managers/msbuild { }; mosml = callPackage ../development/compilers/mosml { }; @@ -11394,9 +11522,11 @@ in # So this commit doesn't remove the 1.45.2 release. rust_1_45 = callPackage ../development/compilers/rust/1_45.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + llvm_10 = llvmPackages_10.libllvm; }; rust_1_51 = callPackage ../development/compilers/rust/1_51.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + llvm_11 = llvmPackages_11.libllvm; }; rust = rust_1_51; @@ -11476,7 +11606,9 @@ in cargo-embed = callPackage ../development/tools/rust/cargo-embed { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-feature = callPackage ../development/tools/rust/cargo-feature { }; - cargo-flash = callPackage ../development/tools/rust/cargo-flash { }; + cargo-flash = callPackage ../development/tools/rust/cargo-flash { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -11493,7 +11625,9 @@ in cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { }; + cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-play = callPackage ../development/tools/rust/cargo-play { }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; @@ -11547,6 +11681,9 @@ in rustup = callPackage ../development/tools/rust/rustup { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; + rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master { + inherit (darwin.apple_sdk.frameworks) Security; + }; sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {}; @@ -11591,9 +11728,7 @@ in smlpkg = callPackage ../tools/package-management/smlpkg { }; - solc = solc_0_8; - solc_0_8 = callPackage ../development/compilers/solc { }; - solc_0_7 = callPackage ../development/compilers/solc/0.7.nix { }; + solc = callPackage ../development/compilers/solc { }; souffle = callPackage ../development/compilers/souffle { autoreconfHook = buildPackages.autoreconfHook269; @@ -11663,7 +11798,9 @@ in urn = callPackage ../development/compilers/urn { }; - urweb = callPackage ../development/compilers/urweb { }; + urweb = callPackage ../development/compilers/urweb { + icu = icu67; + }; vlang = callPackage ../development/compilers/vlang { }; @@ -11676,6 +11813,7 @@ in vala_0_46 vala_0_48 vala_0_50 + vala_0_52 vala; vyper = with python3Packages; toPythonApplication vyper; @@ -11805,14 +11943,14 @@ in duktape = callPackage ../development/interpreters/duktape { }; evcxr = callPackage ../development/interpreters/evcxr { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; beam = callPackage ./beam-packages.nix { }; beam_nox = callPackage ./beam-packages.nix { wxSupport = false; }; inherit (beam.interpreters) - erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 + erlang erlangR24 erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02 elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_ls; @@ -11820,7 +11958,8 @@ in erlang_nox = beam_nox.interpreters.erlang; inherit (beam.packages.erlang) - rebar rebar3 + erlang-ls + rebar rebar3 rebar3WithPlugins fetchHex beamPackages relxExe; @@ -12185,8 +12324,8 @@ in ruby_2_7 ruby_3_0; - ruby = ruby_2_6; - rubyPackages = rubyPackages_2_6; + ruby = ruby_2_7; + rubyPackages = rubyPackages_2_7; rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems; rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems; @@ -12204,7 +12343,6 @@ in sparkleshare = callPackage ../applications/version-management/sparkleshare { }; - spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { }; spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { }; @@ -12310,6 +12448,9 @@ in newlib = newlibCross; }; + mspds = callPackage ../development/misc/msp430/mspds { }; + mspds-bin = callPackage ../development/misc/msp430/mspds/binary.nix { }; + mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {}; @@ -12354,6 +12495,8 @@ in alloy5 alloy; + altair = callPackage ../development/tools/altair-graphql-client { }; + ameba = callPackage ../development/tools/ameba { }; augeas = callPackage ../tools/system/augeas { }; @@ -12534,6 +12677,14 @@ in gold = false; }; }); + binutilsNoLibc = wrapBintoolsWith { + bintools = binutils-unwrapped; + libc = + /**/ if stdenv.targetPlatform.libc == "msvcrt" then targetPackages.windows.mingw_w64_headers + else if stdenv.targetPlatform.libc == "libSystem" then darwin.xcode + else if stdenv.targetPlatform.libc == "nblibc" then targetPackages.netbsdCross.headers + else null; + }; bison = callPackage ../development/tools/parsing/bison { }; @@ -12625,12 +12776,12 @@ in inherit (stdenv) cc; }; - ccacheStdenv = lowPrio (makeOverridable ({ extraConfig, stdenv }: - overrideCC stdenv (buildPackages.ccacheWrapper.override { - inherit extraConfig; + ccacheStdenv = lowPrio (makeOverridable ({ stdenv, ... } @ extraArgs: + overrideCC stdenv (buildPackages.ccacheWrapper.override ({ inherit (stdenv) cc; - })) { - extraConfig = ""; + } // lib.optionalAttrs (builtins.hasAttr "extraConfig" extraArgs) { + extraConfig = extraArgs.extraConfig; + }))) { inherit stdenv; }); @@ -12739,7 +12890,7 @@ in credstash = with python3Packages; toPythonApplication credstash; creduce = callPackage ../development/tools/misc/creduce { - inherit (llvmPackages_7) llvm clang-unwrapped; + inherit (llvmPackages_7) llvm libclang; }; cscope = callPackage ../development/tools/misc/cscope { }; @@ -12751,7 +12902,7 @@ in css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify; cvise = python3Packages.callPackage ../development/tools/misc/cvise { - inherit (llvmPackages_11) llvm clang-unwrapped; + inherit (llvmPackages_11) llvm libclang; }; libcxx = llvmPackages.libcxx; @@ -12829,7 +12980,7 @@ in # }; # distccWrapper = makeOverridable ({ extraConfig ? "" }: - wrapCC (distcc.links extraConfig)) {}; + wrapCC (distcc.links extraConfig)) {}; distccStdenv = lowPrio (overrideCC stdenv buildPackages.distccWrapper); distccMasquerade = if stdenv.isDarwin @@ -12986,6 +13137,8 @@ in gnome-usage = callPackage ../applications/misc/gnome-usage {}; + gnome-inform7 = callPackage ../applications/editors/gnome-inform7/default.nix { }; + gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { }; gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { }; @@ -13214,7 +13367,10 @@ in lttv = callPackage ../development/tools/misc/lttv { }; - luaformatter = callPackage ../development/tools/luaformatter { }; + luaformatter = callPackage ../development/tools/luaformatter + (lib.optionalAttrs stdenv.isDarwin { + stdenv = overrideCC stdenv llvmPackages_latest.clang; + }); massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; @@ -13271,6 +13427,8 @@ in ninja = callPackage ../development/tools/build-managers/ninja { }; + nimbo = with python3Packages; callPackage ../applications/misc/nimbo { }; + gn = callPackage ../development/tools/build-managers/gn { }; nixbang = callPackage ../development/tools/misc/nixbang { @@ -13318,7 +13476,9 @@ in libiberty_static = libiberty.override { staticBuild = true; }; }; - pactorio = callPackage ../development/tools/pactorio { }; + pactorio = callPackage ../development/tools/pactorio { + inherit (darwin.apple_sdk.frameworks) Security; + }; pahole = callPackage ../development/tools/misc/pahole {}; @@ -13447,6 +13607,8 @@ in remake = callPackage ../development/tools/build-managers/remake { }; + replace-secret = callPackage ../build-support/replace-secret/replace-secret.nix { }; + replacement = callPackage ../development/tools/misc/replacement { }; retdec = callPackage ../development/tools/analysis/retdec { @@ -13652,7 +13814,7 @@ in texi2mdoc = callPackage ../tools/misc/texi2mdoc { }; texlab = callPackage ../development/tools/misc/texlab { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; tflint = callPackage ../development/tools/analysis/tflint { }; @@ -13708,7 +13870,7 @@ in gdb = callPackage ../development/tools/misc/gdb { guile = null; - readline = readline80; + readline = readline81; }; jhiccup = callPackage ../development/tools/java/jhiccup { }; @@ -13958,7 +14120,7 @@ in belr = callPackage ../development/libraries/belr { }; beignet = callPackage ../development/libraries/beignet { - inherit (llvmPackages_6) llvm clang-unwrapped; + inherit (llvmPackages_6) libllvm libclang; }; belle-sip = callPackage ../development/libraries/belle-sip { }; @@ -14367,6 +14529,8 @@ in fcgi = callPackage ../development/libraries/fcgi { }; + fcl = callPackage ../development/libraries/fcl { }; + ffcast = callPackage ../tools/X11/ffcast { }; fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { }; @@ -14589,6 +14753,8 @@ in givaro_3 = callPackage ../development/libraries/givaro/3.nix {}; givaro_3_7 = callPackage ../development/libraries/givaro/3.7.nix {}; + ghc_filesystem = callPackage ../development/libraries/ghc_filesystem {}; + ghp-import = with python3Packages; toPythonApplication ghp-import; ghcid = haskellPackages.ghcid.bin; @@ -14638,7 +14804,9 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa Kernel; }; - glibc = callPackage ../development/libraries/glibc { }; + glibc = callPackage ../development/libraries/glibc { + stdenv = gccStdenv; # doesn't compile without gcc + }; # Provided by libc on Operating Systems that use the Extensible Linker Format. elf-header = @@ -14654,7 +14822,7 @@ in # Being redundant to avoid cycles on boot. TODO: find a better way glibcCross = callPackage ../development/libraries/glibc { - stdenv = crossLibcStdenv; + stdenv = gccCrossLibcStdenv; # doesn't compile without gcc }; muslCross = musl.override { @@ -14677,7 +14845,7 @@ in else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries else if name == "libSystem" then targetPackages.darwin.xcode - else if name == "nblibc" then targetPackages.netbsdCross.libc + else if name == "nblibc" then targetPackages.netbsdCross.libc or netbsdCross.libc else if name == "wasilibc" then targetPackages.wasilibc or wasilibc else if name == "relibc" then targetPackages.relibc or relibc else if stdenv.targetPlatform.isGhcjs then null @@ -14719,7 +14887,6 @@ in glsurf = callPackage ../applications/science/math/glsurf { libpng = libpng12; - giflib = giflib_4_1; ocamlPackages = ocaml-ng.ocamlPackages_4_01_0; }; @@ -14854,6 +15021,10 @@ in glibmm = callPackage ../development/libraries/glibmm { }; + glibmm_2_68 = callPackage ../development/libraries/glibmm/2.68.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + glib-networking = callPackage ../development/libraries/glib-networking {}; glib-testing = callPackage ../development/libraries/glib-testing { }; @@ -14874,6 +15045,10 @@ in cairomm = callPackage ../development/libraries/cairomm { }; + cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; + pango = callPackage ../development/libraries/pango { harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; }; @@ -14886,6 +15061,10 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; + pangomm_2_48 = callPackage ../development/libraries/pangomm/2.48.nix { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; + gdata-sharp = callPackage ../development/libraries/gdata-sharp { }; gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; @@ -14926,6 +15105,7 @@ in gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; + gtkmm4 = callPackage ../development/libraries/gtkmm/4.x.nix { }; gtk_engines = callPackage ../development/libraries/gtk-engines { }; @@ -14965,6 +15145,8 @@ in gtksourceview4 = callPackage ../development/libraries/gtksourceview/4.x.nix { }; + gtksourceview5 = callPackage ../development/libraries/gtksourceview/5.x.nix { }; + gtksourceviewmm = callPackage ../development/libraries/gtksourceviewmm { }; gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { }; @@ -15125,8 +15307,13 @@ in } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); + icu69 = callPackage ../development/libraries/icu/69.nix ({ + nativeBuildRoot = buildPackages.icu69.override { buildRootOnly = true; }; + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + })); - icu = icu68; + icu = icu69; id3lib = callPackage ../development/libraries/id3lib { }; @@ -15321,7 +15508,9 @@ in libaccounts-glib = callPackage ../development/libraries/libaccounts-glib { }; - libacr38u = callPackage ../tools/security/libacr38u { }; + libacr38u = callPackage ../tools/security/libacr38u { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; libadwaita = callPackage ../development/libraries/libadwaita { }; @@ -15434,6 +15623,8 @@ in libcbor = callPackage ../development/libraries/libcbor { }; + libccd = callPackage ../development/libraries/libccd { }; + libcec = callPackage ../development/libraries/libcec { libraspberrypi = null; }; @@ -15539,6 +15730,8 @@ in libdeflate = callPackage ../development/libraries/libdeflate { }; + libdeltachat = callPackage ../development/libraries/libdeltachat { }; + libdevil = callPackage ../development/libraries/libdevil { inherit (darwin.apple_sdk.frameworks) OpenGL; }; @@ -15659,7 +15852,7 @@ in libgig = callPackage ../development/libraries/libgig { }; libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; - libgnome-keyring3 = gnome3.libgnome-keyring; + libgnome-keyring3 = gnome.libgnome-keyring; libgnomekbd = callPackage ../development/libraries/libgnomekbd { }; @@ -15956,8 +16149,8 @@ in libiconv = if lib.elem stdenv.hostPlatform.libc ["glibc" "musl" "wasilibc"] then glibcIconv (if stdenv.hostPlatform != stdenv.buildPlatform - then libcCross - else stdenv.cc.libc) + then libcCross + else stdenv.cc.libc) else if stdenv.hostPlatform.isDarwin then darwin.libiconv else libiconvReal; @@ -16161,7 +16354,7 @@ in libopusenc = callPackage ../development/libraries/libopusenc { }; libosinfo = callPackage ../development/libraries/libosinfo { - inherit (gnome3) libsoup; + inherit (gnome) libsoup; }; libosip = callPackage ../development/libraries/osip {}; @@ -16225,14 +16418,17 @@ in libpwquality = callPackage ../development/libraries/libpwquality { }; libqalculate = callPackage ../development/libraries/libqalculate { - readline = readline80; + readline = readline81; }; libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { }; libroxml = callPackage ../development/libraries/libroxml { }; - librsvg = callPackage ../development/libraries/librsvg { }; + librsvg = callPackage ../development/libraries/librsvg { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; + }; librsync = callPackage ../development/libraries/librsync { }; @@ -16250,6 +16446,8 @@ in libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { }; + libsigcxx30 = callPackage ../development/libraries/libsigcxx/3.0.nix { }; + libsigsegv = callPackage ../development/libraries/libsigsegv { }; libslirp = callPackage ../development/libraries/libslirp { }; @@ -16370,13 +16568,10 @@ in libwhereami = callPackage ../development/libraries/libwhereami { }; - giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; giflib = callPackage ../development/libraries/giflib { }; libunarr = callPackage ../development/libraries/libunarr { }; - libungif = callPackage ../development/libraries/giflib/libungif.nix { }; - libunibreak = callPackage ../development/libraries/libunibreak { }; libuninameslist = callPackage ../development/libraries/libuninameslist { }; @@ -16439,7 +16634,9 @@ in libvmaf = callPackage ../development/libraries/libvmaf { }; - libvncserver = callPackage ../development/libraries/libvncserver {}; + libvncserver = callPackage ../development/libraries/libvncserver { + inherit (darwin.apple_sdk.frameworks) Carbon; + }; libviper = callPackage ../development/libraries/libviper { }; @@ -16709,7 +16906,9 @@ in libmpc = callPackage ../development/libraries/libmpc { }; - mpich = callPackage ../development/libraries/mpich { }; + mpich = callPackage ../development/libraries/mpich { + ch4backend = libfabric; + }; mstpd = callPackage ../os-specific/linux/mstpd { }; @@ -16762,7 +16961,7 @@ in notify-sharp = callPackage ../development/libraries/notify-sharp { }; notcurses = callPackage ../development/libraries/notcurses { - readline = readline80; + readline = readline81; }; ncurses5 = ncurses.override { @@ -16816,7 +17015,6 @@ in }; nss = lowPrio (callPackage ../development/libraries/nss { }); - nss_3_44 = lowPrio (callPackage ../development/libraries/nss/3.44.nix { }); nssTools = nss.tools; # required for stable thunderbird and firefox-esr-78 @@ -16975,6 +17173,8 @@ in inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Foundation; }; + openslide = callPackage ../development/libraries/openslide { }; + openslp = callPackage ../development/libraries/openslp {}; openvdb = callPackage ../development/libraries/openvdb {}; @@ -17047,7 +17247,9 @@ in pe-parse = callPackage ../development/libraries/pe-parse { }; - inherit (callPackage ../development/libraries/physfs { }) + inherit (callPackage ../development/libraries/physfs { + inherit (darwin.apple_sdk.frameworks) Foundation Carbon; + }) physfs_2 physfs; @@ -17102,6 +17304,8 @@ in portmidi = callPackage ../development/libraries/portmidi {}; + presage = callPackage ../development/libraries/presage { }; + prime-server = callPackage ../development/libraries/prime-server { }; primesieve = callPackage ../development/libraries/science/math/primesieve { }; @@ -17121,8 +17325,9 @@ in python = python37; }; - protobuf = protobuf3_15; + protobuf = protobuf3_16; + protobuf3_16 = callPackage ../development/libraries/protobuf/3.16.nix { }; protobuf3_15 = callPackage ../development/libraries/protobuf/3.15.nix { }; protobuf3_14 = callPackage ../development/libraries/protobuf/3.14.nix { }; protobuf3_13 = callPackage ../development/libraries/protobuf/3.13.nix { }; @@ -17155,8 +17360,6 @@ in pugixml = callPackage ../development/libraries/pugixml { }; - pybind11 = pythonPackages.pybind11; - pylode = callPackage ../misc/pylode {}; python-qt = callPackage ../development/libraries/python-qt { @@ -17329,7 +17532,7 @@ in readline70 = callPackage ../development/libraries/readline/7.0.nix { }; - readline80 = callPackage ../development/libraries/readline/8.0.nix { }; + readline81 = callPackage ../development/libraries/readline/8.1.nix { }; readosm = callPackage ../development/libraries/readosm { }; @@ -17406,13 +17609,13 @@ in s2geometry = callPackage ../development/libraries/s2geometry { }; - /* This package references ghc844, which we no longer have. Unfortunately, I - have been unable to mark it as "broken" in a way that the ofBorg bot - recognizes. Since I don't want to merge code into master that generates - evaluation errors, I have no other idea but to comment it out entirely. + /* This package references ghc844, which we no longer have. Unfortunately, I + have been unable to mark it as "broken" in a way that the ofBorg bot + recognizes. Since I don't want to merge code into master that generates + evaluation errors, I have no other idea but to comment it out entirely. sad = callPackage ../applications/science/logic/sad { }; - */ + */ safefile = callPackage ../development/libraries/safefile {}; @@ -17591,7 +17794,9 @@ in socket_wrapper = callPackage ../development/libraries/socket_wrapper { }; - sofia_sip = callPackage ../development/libraries/sofia-sip { }; + sofia_sip = callPackage ../development/libraries/sofia-sip { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + }; soil = callPackage ../development/libraries/soil { inherit (darwin.apple_sdk.frameworks) Carbon; @@ -17630,6 +17835,8 @@ in sphinx = with python3Packages; toPythonApplication sphinx; + sphinx-autobuild = with python3Packages; toPythonApplication sphinx-autobuild; + sphinx-serve = with python3Packages; toPythonApplication sphinx-serve; sphinxbase = callPackage ../development/libraries/sphinxbase { }; @@ -17889,6 +18096,8 @@ in ustr = callPackage ../development/libraries/ustr { }; + usrsctp = callPackage ../development/libraries/usrsctp { }; + usbredir = callPackage ../development/libraries/usbredir { }; uthash = callPackage ../development/libraries/uthash { }; @@ -18172,9 +18381,7 @@ in yubikey-manager = callPackage ../tools/misc/yubikey-manager { }; - yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { - pythonPackages = python3Packages; - }; + yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { }; yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { }; @@ -18567,21 +18774,14 @@ in clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli; - couchdb = callPackage ../servers/http/couchdb { - sphinx = python27Packages.sphinx; - erlang = erlangR19; - }; - - couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix { - erlang = erlangR21; - }; - couchdb3 = callPackage ../servers/http/couchdb/3.nix { erlang = erlangR22; }; couchpotato = callPackage ../servers/couchpotato {}; + dendrite = callPackage ../servers/dendrite { }; + dex-oidc = callPackage ../servers/dex { }; dex2jar = callPackage ../development/tools/java/dex2jar { }; @@ -18665,8 +18865,8 @@ in fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { }; - firebird = callPackage ../servers/firebird { icu = null; /*stdenv = gcc5Stdenv;*/ }; - firebirdSuper = firebird.override { icu = icu58; superServer = true; /*stdenv = gcc5Stdenv;*/ }; + inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5; + firebird = firebird_3; freeradius = callPackage ../servers/freeradius { }; @@ -18943,6 +19143,7 @@ in opensmtpd = callPackage ../servers/mail/opensmtpd { }; opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { }; + opensmtpd-filter-rspamd = callPackage ../servers/mail/opensmtpd/filter-rspamd.nix { }; openxpki = callPackage ../servers/openxpki { }; @@ -19124,10 +19325,19 @@ in miniflux = callPackage ../servers/miniflux { }; - nagios = callPackage ../servers/monitoring/nagios { }; + icinga2 = callPackage ../servers/monitoring/icinga2 { }; + + icinga2-agent = callPackage ../servers/monitoring/icinga2 { + nameSuffix = "-agent"; + withMysql = false; + withNotification = false; + withIcingadb = false; + }; munin = callPackage ../servers/monitoring/munin { }; + nagios = callPackage ../servers/monitoring/nagios { }; + monitoring-plugins = callPackage ../servers/monitoring/plugins { }; inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { }) @@ -19207,9 +19417,7 @@ in postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = callPackage ../servers/monitoring/prometheus { - buildGoPackage = buildGo115Package; - }; + prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-artifactory-exporter = callPackage ../servers/monitoring/prometheus/artifactory-exporter.nix { }; @@ -19229,6 +19437,7 @@ in prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; + prometheus-kea-exporter = callPackage ../servers/monitoring/prometheus/kea-exporter.nix { }; prometheus-keylight-exporter = callPackage ../servers/monitoring/prometheus/keylight-exporter.nix { }; prometheus-knot-exporter = callPackage ../servers/monitoring/prometheus/knot-exporter.nix { }; prometheus-lnd-exporter = callPackage ../servers/monitoring/prometheus/lnd-exporter.nix { }; @@ -19258,16 +19467,16 @@ in prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; - prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix { }; + prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { inherit (darwin.apple_sdk.frameworks) Security; }; - prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix { - pythonPackages = python3Packages; - }; + prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix { }; prometheus-cpp = callPackage ../development/libraries/prometheus-cpp { }; @@ -19306,6 +19515,8 @@ in redstore = callPackage ../servers/http/redstore { }; + reproxy = callPackage ../servers/reproxy { }; + restic = callPackage ../tools/backup/restic { }; restic-rest-server = callPackage ../tools/backup/restic/rest-server.nix { }; @@ -19473,6 +19684,10 @@ in unifi6; unifi = unifi6; + unpackerr = callPackage ../servers/unpackerr { + inherit (darwin.apple_sdk.frameworks) Cocoa WebKit; + }; + urserver = callPackage ../servers/urserver { }; victoriametrics = callPackage ../servers/nosql/victoriametrics { }; @@ -19620,7 +19835,7 @@ in inherit (callPackages ../os-specific/linux/apparmor { python = python3; }) libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam - apparmor-profiles apparmor-kernel-patches; + apparmor-profiles apparmor-kernel-patches apparmorRulesFromClosure; aseq2json = callPackage ../os-specific/linux/aseq2json {}; @@ -19896,8 +20111,6 @@ in kbd = callPackage ../os-specific/linux/kbd { }; - kbdKeymaps = callPackage ../os-specific/linux/kbd/keymaps.nix { }; - kbdlight = callPackage ../os-specific/linux/kbdlight { }; kmscon = callPackage ../os-specific/linux/kmscon { }; @@ -20068,6 +20281,13 @@ in ]; }; + linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -20127,11 +20347,11 @@ in ]; }; - /* Linux kernel modules are inherently tied to a specific kernel. So - rather than provide specific instances of those packages for a - specific kernel, we have a function that builds those packages - for a specific kernel. This function can then be called for - whatever kernel you're using. */ + /* Linux kernel modules are inherently tied to a specific kernel. So + rather than provide specific instances of those packages for a + specific kernel, we have a function that builds those packages + for a specific kernel. This function can then be called for + whatever kernel you're using. */ linuxPackagesFor = kernel_: lib.makeExtensible (self: with self; { callPackage = newScope self; @@ -20166,7 +20386,7 @@ in bbswitch = callPackage ../os-specific/linux/bbswitch {}; - ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { }; + ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18 chipsec = callPackage ../tools/security/chipsec { inherit kernel; @@ -20191,6 +20411,8 @@ in gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { }; + hid-nintendo = callPackage ../os-specific/linux/hid-nintendo { }; + hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; e1000e = if lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; @@ -20219,7 +20441,6 @@ in nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); - nvidia_x11_legacy304 = nvidiaPackages.legacy_304; nvidia_x11_legacy340 = nvidiaPackages.legacy_340; nvidia_x11_legacy390 = nvidiaPackages.legacy_390; nvidia_x11_beta = nvidiaPackages.beta; @@ -20262,7 +20483,7 @@ in facetimehd = callPackage ../os-specific/linux/facetimehd { }; - tuxedo-keyboard = callPackage ../os-specific/linux/tuxedo-keyboard { }; + tuxedo-keyboard = if lib.versionAtLeast kernel.version "4.14" then callPackage ../os-specific/linux/tuxedo-keyboard { } else null; jool = callPackage ../os-specific/linux/jool { }; @@ -20272,9 +20493,8 @@ in mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { }; - /* compiles but has to be integrated into the kernel somehow - Let's have it uncommented and finish it.. - */ + # compiles but has to be integrated into the kernel somehow + # Let's have it uncommented and finish it.. ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { }; netatop = callPackage ../os-specific/linux/netatop { }; @@ -20333,13 +20553,12 @@ in zenpower = callPackage ../os-specific/linux/zenpower { }; inherit (callPackages ../os-specific/linux/zfs { - configFile = "kernel"; - inherit kernel; - }) zfsStable zfsUnstable; + configFile = "kernel"; + inherit kernel; + }) zfsStable zfsUnstable; + zfs = zfsStable; - zfs = zfsStable; - - can-isotp = callPackage ../os-specific/linux/can-isotp { }; + can-isotp = callPackage ../os-specific/linux/can-isotp { }; }); # The current default kernel / kernel modules. @@ -20373,6 +20592,7 @@ in linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); linuxPackages_5_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_11); + linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12); # When adding to the list above: # - Update linuxPackages_latest to the latest version @@ -20583,8 +20803,9 @@ in inherit (darwin.apple_sdk.frameworks) AppKit Security; }; - nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { } - else unixtools.nettools; + nettools = if stdenv.isLinux + then callPackage ../os-specific/linux/net-tools { } + else unixtools.nettools; nettools_mptcp = callPackage ../os-specific/linux/net-tools/mptcp.nix { }; @@ -20703,6 +20924,8 @@ in nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; + octomap = callPackage ../development/libraries/octomap { }; + odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { }; @@ -20783,15 +21006,16 @@ in prayer = callPackage ../servers/prayer { }; - procps = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { } - else unixtools.procps; + procps = if stdenv.isLinux + then callPackage ../os-specific/linux/procps-ng { } + else unixtools.procps; procdump = callPackage ../os-specific/linux/procdump { }; prototool = callPackage ../development/tools/prototool { }; qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); - qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; }); + qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; glusterfsSupport = true; }); # See `xenPackages` source for explanations. # Building with `xen` instead of `xen-slim` is possible, but makes no sense. @@ -21080,6 +21304,10 @@ in wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; + wpa_supplicant_ro_ssids = wpa_supplicant.override { + readOnlyModeSSIDs = true; + }; + wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; xf86_input_cmt = callPackage ../os-specific/linux/xf86-input-cmt { }; @@ -21463,7 +21691,7 @@ in kopia = callPackage ../tools/backup/kopia { }; kora-icon-theme = callPackage ../data/icons/kora-icon-theme { - inherit (gnome3) adwaita-icon-theme; + inherit (gnome) adwaita-icon-theme; inherit (libsForQt5.kdeFrameworks) breeze-icons; }; @@ -21930,7 +22158,6 @@ in ucs-fonts = callPackage ../data/fonts/ucs-fonts { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; - ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { }; ultralist = callPackage ../applications/misc/ultralist { }; @@ -21938,7 +22165,7 @@ in undefined-medium = callPackage ../data/fonts/undefined-medium { }; uni-vga = callPackage ../data/fonts/uni-vga - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; unicode-character-database = callPackage ../data/misc/unicode-character-database { }; @@ -21947,7 +22174,7 @@ in unihan-database = callPackage ../data/misc/unihan-database { }; unifont = callPackage ../data/fonts/unifont - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; unifont_upper = callPackage ../data/fonts/unifont_upper { }; @@ -22160,7 +22387,9 @@ in audacious = libsForQt5.callPackage ../applications/audio/audacious { }; audaciousQt5 = audacious; - audacity = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; }; + audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; }; + audacity-gtk3 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk3; }; + audacity = audacity-gtk2; audio-recorder = callPackage ../applications/audio/audio-recorder { }; @@ -22214,10 +22443,6 @@ in avrdudess = callPackage ../applications/misc/avrdudess { }; - avxsynth = callPackage ../applications/video/avxsynth { - libjpeg = libjpeg_original; # error: 'JCOPYRIGHT_SHORT' was not declared in this scope - }; - awesome-4-0 = callPackage ../applications/window-managers/awesome { cairo = cairo.override { xcbSupport = true; }; inherit (texFunctions) fontsConf; @@ -22226,7 +22451,7 @@ in awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { }; - inherit (gnome3) baobab; + inherit (gnome) baobab; backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; @@ -22287,7 +22512,7 @@ in (callPackage ../applications/science/electronics/bitscope/packages.nix { }); bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix { - inherit (gnome3) zenity; + inherit (gnome) zenity; libxkbcommon = libxkbcommon_7; }; bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { @@ -22371,6 +22596,8 @@ in caerbannog = callPackage ../applications/misc/caerbannog { }; + cardboard = callPackage ../applications/window-managers/cardboard { }; + cage = callPackage ../applications/window-managers/cage { }; calf = callPackage ../applications/audio/calf { @@ -22498,7 +22725,6 @@ in cmus = callPackage ../applications/audio/cmus { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio; libjack = libjack2; - ffmpeg = ffmpeg_2; }; cmusfm = callPackage ../applications/audio/cmusfm { }; @@ -22666,7 +22892,8 @@ in dmrconfig = callPackage ../applications/radio/dmrconfig { }; - dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { + dmtx-utils = callPackage ../tools/graphics/dmtx-utils { + inherit (darwin.apple_sdk.frameworks) Foundation; }; inherit (callPackage ../applications/virtualization/docker {}) @@ -22768,7 +22995,9 @@ in jdk = jdk11; }); - ecpdap = callPackage ../development/tools/ecpdap { }; + ecpdap = callPackage ../development/tools/ecpdap { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; ecs-agent = callPackage ../applications/virtualization/ecs-agent { }; @@ -22832,7 +23061,7 @@ in pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set }; - inherit (gnome3) empathy; + inherit (gnome) empathy; enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; @@ -22846,7 +23075,7 @@ in epgstation = callPackage ../applications/video/epgstation { }; - inherit (gnome3) epiphany; + inherit (gnome) epiphany; ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; @@ -22901,8 +23130,8 @@ in keeweb = callPackage ../applications/misc/keeweb { }; - inherit (gnome3) evince; - evolution-data-server = gnome3.evolution-data-server; + inherit (gnome) evince; + evolution-data-server = gnome.evolution-data-server; evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { }; evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; }; @@ -22972,7 +23201,7 @@ in flwrap = callPackage ../applications/radio/flwrap { }; fluidsynth = callPackage ../applications/audio/fluidsynth { - inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices; + inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices; }; fluidsynth_1 = fluidsynth.override { version = "1"; }; @@ -23046,7 +23275,7 @@ in # A build without gui components and other utilites not needed for end user # libraries gnuradioMinimal = gnuradio.override { - wrap = false; + doWrap = false; unwrapped = gnuradio.unwrapped.override { volk = volk.override { # So it will not reference python @@ -23076,7 +23305,7 @@ in # A build without gui components and other utilites not needed if gnuradio is # used as a c++ library. gnuradio3_8Minimal = gnuradio3_8.override { - wrap = false; + doWrap = false; unwrapped = gnuradio3_8.unwrapped.override { volk = volk.override { enableModTool = false; @@ -23105,7 +23334,7 @@ in # A build without gui components and other utilites not needed if gnuradio is # used as a c++ library. gnuradio3_7Minimal = gnuradio3_7.override { - wrap = false; + doWrap = false; unwrapped = gnuradio3_7.unwrapped.override { volk = volk.override { enableModTool = false; @@ -23180,7 +23409,7 @@ in gtimelog = with python3Packages; toPythonApplication gtimelog; - inherit (gnome3) gucharmap; + inherit (gnome) gucharmap; guitarix = callPackage ../applications/audio/guitarix { fftw = fftwSinglePrec; @@ -23456,7 +23685,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - inherit (gnome3) gitg; + inherit (gnome) gitg; gmrun = callPackage ../applications/misc/gmrun {}; @@ -23589,7 +23818,7 @@ in celluloid = callPackage ../applications/video/celluloid { }; gnome-recipes = callPackage ../applications/misc/gnome-recipes { - inherit (gnome3) gnome-autoar; + inherit (gnome) gnome-autoar; }; gollum = callPackage ../applications/misc/gollum { }; @@ -23797,14 +24026,7 @@ in pinboard = with python3Packages; toPythonApplication pinboard; - pinboard-notes-backup = haskell.lib.overrideCabal - (haskell.lib.generateOptparseApplicativeCompletion "pnbackup" - haskellPackages.pinboard-notes-backup) - (drv: { - postInstall = '' - install -D man/pnbackup.1 $out/share/man/man1/pnbackup.1 - '' + (drv.postInstall or ""); - }); + pinboard-notes-backup = haskell.lib.justStaticExecutables haskellPackages.pinboard-notes-backup; pixelnuke = callPackage ../applications/graphics/pixelnuke { }; @@ -23924,9 +24146,7 @@ in i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; - waybox = callPackage ../applications/window-managers/waybox { - wlroots = wlroots_0_12; - }; + waybox = callPackage ../applications/window-managers/waybox { }; workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { }; @@ -23989,7 +24209,7 @@ in }; imagemagick6 = callPackage ../applications/graphics/ImageMagick/6.x.nix { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; ghostscript = null; }; @@ -24022,7 +24242,7 @@ in }); imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; }); inherit (nodePackages) imapnotify; @@ -24169,6 +24389,8 @@ in kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { }; + kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { }; + kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { @@ -24212,11 +24434,6 @@ in kile = libsForQt5.callPackage ../applications/editors/kile { }; - kino = callPackage ../applications/video/kino { - inherit (gnome2) libglade; - ffmpeg = ffmpeg_2; - }; - kitsas = libsForQt5.callPackage ../applications/office/kitsas { }; kiwix = libsForQt5.callPackage ../applications/misc/kiwix { }; @@ -24504,7 +24721,7 @@ in luppp = callPackage ../applications/audio/luppp { }; lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { - inherit (gnome3) gnome-desktop; + inherit (gnome) gnome-desktop; wine = wineWowPackages.staging; }; lutris = callPackage ../applications/misc/lutris/fhsenv.nix { @@ -24613,7 +24830,7 @@ in melonDS = libsForQt5.callPackage ../misc/emulators/melonDS { }; - meme = callPackage ../applications/graphics/meme { }; + meme-image-generator = callPackage ../applications/graphics/meme-image-generator { }; meme-suite = callPackage ../applications/science/biology/meme-suite { }; @@ -24654,6 +24871,8 @@ in mikmod = callPackage ../applications/audio/mikmod { }; + miniaudicle = callPackage ../applications/audio/miniaudicle { }; + minicom = callPackage ../tools/misc/minicom { }; minimodem = callPackage ../applications/radio/minimodem { }; @@ -24717,7 +24936,6 @@ in monotone = callPackage ../applications/version-management/monotone { lua = lua5; - botan = botan.override (x: { openssl = null; }); }; monotoneViz = callPackage ../applications/version-management/monotone-viz { @@ -24913,9 +25131,7 @@ in newsflash = callPackage ../applications/networking/feedreaders/newsflash { }; - nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { - geoip = geoipWithDatabase; - }; + nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { }; nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { }; @@ -24980,9 +25196,8 @@ in plank = callPackage ../applications/misc/plank { }; - playonlinux = callPackage ../applications/misc/playonlinux { - stdenv = stdenv_32bit; - }; + playonlinux = callPackage ../applications/misc/playonlinux + { stdenv = stdenv_32bit; }; pleroma-bot = python3Packages.callPackage ../development/python-modules/pleroma-bot { }; @@ -25013,6 +25228,8 @@ in ptex = callPackage ../development/libraries/ptex {}; + pyright = nodePackages.pyright; + qbec = callPackage ../applications/networking/cluster/qbec { }; qemacs = callPackage ../applications/editors/qemacs { }; @@ -25110,7 +25327,9 @@ in mupdf = callPackage ../applications/misc/mupdf { }; mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17.nix { }; - muso = callPackage ../applications/audio/muso { }; + muso = callPackage ../applications/audio/muso { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; mystem = callPackage ../applications/misc/mystem { }; @@ -25294,7 +25513,7 @@ in owamp = callPackage ../applications/networking/owamp { }; vieb = callPackage ../applications/networking/browsers/vieb { - electron = electron_11; + electron = electron_12; }; vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; @@ -25388,6 +25607,8 @@ in pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; pdfpc = callPackage ../applications/misc/pdfpc { + # https://github.com/pdfpc/pdfpc/issues/594 + vala = vala_0_50; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav; }; @@ -25802,6 +26023,8 @@ in reaper = callPackage ../applications/audio/reaper { }; + recapp = callPackage ../applications/video/recapp { }; + recode = callPackage ../tools/text/recode { }; reddsaver = callPackage ../applications/misc/reddsaver { @@ -25812,10 +26035,6 @@ in remotebox = callPackage ../applications/virtualization/remotebox { }; - # This package is currently broken with libupnp - # But when unbroken, it should work with the stable Qt5 - retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; - rgp = libsForQt5.callPackage ../development/tools/rgp { }; ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { }; @@ -25845,7 +26064,7 @@ in rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; - rpcs3 = libsForQt514.callPackage ../misc/emulators/rpcs3 { }; + rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; rsclock = callPackage ../applications/misc/rsclock { }; @@ -25930,7 +26149,7 @@ in shutter = callPackage ../applications/graphics/shutter { }; - simple-scan = gnome3.simple-scan; + simple-scan = gnome.simple-scan; siproxd = callPackage ../applications/networking/siproxd { }; @@ -26164,14 +26383,7 @@ in stumpish = callPackage ../applications/window-managers/stumpish {}; - stumpwm = callPackage ../applications/window-managers/stumpwm { - version = "latest"; - }; - - stumpwm-git = stumpwm.override { - version = "git"; - inherit sbcl lispPackages; - }; + stumpwm = lispPackages.stumpwm; sublime = callPackage ../applications/editors/sublime/2 { }; @@ -26203,7 +26415,7 @@ in surf-display = callPackage ../desktops/surf-display { }; surge = callPackage ../applications/audio/surge { - inherit (gnome3) zenity; + inherit (gnome) zenity; git = gitMinimal; }; @@ -26258,7 +26470,7 @@ in }; taffybar = callPackage ../applications/window-managers/taffybar { - inherit (haskellPackages) ghcWithPackages; + inherit (haskellPackages) ghcWithPackages taffybar; }; tagainijisho = callPackage ../applications/office/tagainijisho {}; @@ -26363,20 +26575,11 @@ in gtk3Support = true; }; - thunderbird-68 = callPackage ../applications/networking/mailreaders/thunderbird/68.nix { - inherit (rustPackages) cargo rustc; - libpng = libpng_apng; - nss = nss_3_44; - gtk3Support = true; - }; - thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; thunderbird-bin = thunderbird-bin-78; thunderbird-bin-78 = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; - thunderbird-bin-68 = callPackage ../applications/networking/mailreaders/thunderbird-bin/68.nix { }; - ticpp = callPackage ../development/libraries/ticpp { }; ticker = callPackage ../applications/misc/ticker { }; @@ -26393,6 +26596,8 @@ in timewarrior = callPackage ../applications/misc/timewarrior { }; + timew-sync-server = callPackage ../applications/misc/timew-sync-server { }; + timg = callPackage ../tools/graphics/timg { }; timidity = callPackage ../tools/misc/timidity { }; @@ -26513,6 +26718,10 @@ in lavalauncher = callPackage ../applications/misc/lavalauncher { }; + t-rec = callPackage ../misc/t-rec { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; + ulauncher = callPackage ../applications/misc/ulauncher { }; twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; @@ -26564,7 +26773,7 @@ in utox = callPackage ../applications/networking/instant-messengers/utox { }; - valentina = libsForQt514.callPackage ../applications/misc/valentina { }; + valentina = libsForQt512.callPackage ../applications/misc/valentina { }; vbindiff = callPackage ../applications/editors/vbindiff { }; @@ -26655,6 +26864,8 @@ in gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; + neovide = callPackage ../applications/editors/neovim/neovide { }; + neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { }; vis = callPackage ../applications/editors/vis { @@ -26866,6 +27077,8 @@ in webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; + webssh = with python3Packages; toPythonApplication webssh; + webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { }; @@ -26895,9 +27108,7 @@ in weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; }; - wio = callPackage ../applications/window-managers/wio { - wlroots = wlroots_0_12; - }; + wio = callPackage ../applications/window-managers/wio { }; whitebox-tools = callPackage ../applications/gis/whitebox-tools { inherit (darwin.apple_sdk.frameworks) Security; @@ -26916,6 +27127,8 @@ in write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { }; + wlc = callPackage ../tools/misc/wlc { }; + wllvm = callPackage ../development/tools/wllvm { }; wmname = callPackage ../applications/misc/wmname { }; @@ -27139,6 +27352,8 @@ in picom = callPackage ../applications/window-managers/picom {}; + xd = callPackage ../applications/networking/p2p/xd {}; + xdaliclock = callPackage ../tools/misc/xdaliclock {}; xdg-dbus-proxy = callPackage ../development/libraries/xdg-dbus-proxy { }; @@ -27336,7 +27551,7 @@ in yeetgif = callPackage ../applications/graphics/yeetgif { }; - inherit (gnome3) yelp; + inherit (gnome) yelp; yelp-tools = callPackage ../development/misc/yelp-tools { }; @@ -27387,10 +27602,10 @@ in zgrviewer = callPackage ../applications/graphics/zgrviewer { }; zgv = callPackage ../applications/graphics/zgv { - # Enable the below line for terminal display. Note - # that it requires sixel graphics compatible terminals like mlterm - # or xterm -ti 340 - SDL = SDL_sixel; + # Enable the below line for terminal display. Note + # that it requires sixel graphics compatible terminals like mlterm + # or xterm -ti 340 + SDL = SDL_sixel; }; zim = callPackage ../applications/office/zim { }; @@ -27442,6 +27657,8 @@ in cgminer = callPackage ../applications/blockchains/cgminer { }; + chia = callPackage ../applications/blockchains/chia { }; + clightning = callPackage ../applications/blockchains/clightning.nix { }; bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; }; @@ -27533,7 +27750,7 @@ in autoreconfHook = buildPackages.autoreconfHook269; }; - ethabi = callPackage ../applications/blockchains/ethabi.nix { }; + ethabi = callPackage ../applications/blockchains/ethabi { }; pycoin = with python3Packages; toPythonApplication pycoin; @@ -27556,7 +27773,7 @@ in zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; }; - openethereum = callPackage ../applications/blockchains/openethereum { }; + openethereum = callPackage ../applications/blockchains/openethereum { stdenv = llvmPackages_12.stdenv; }; parity-ui = callPackage ../applications/blockchains/parity-ui { }; @@ -27586,7 +27803,7 @@ in airstrike = callPackage ../games/airstrike { }; - alephone = callPackage ../games/alephone { ffmpeg = ffmpeg_2; }; + alephone = callPackage ../games/alephone { }; alephone-durandal = callPackage ../games/alephone/durandal { }; alephone-eternal = callPackage ../games/alephone/eternal { }; alephone-evil = callPackage ../games/alephone/evil { }; @@ -28180,8 +28397,6 @@ in prboom = callPackage ../games/prboom { }; - privateer = callPackage ../games/privateer { }; - pysolfc = python3Packages.callPackage ../games/pysolfc { }; qqwing = callPackage ../games/qqwing { }; @@ -28345,12 +28560,14 @@ in nativeOnly = true; }).run; + steam-tui = callPackage ../games/steam-tui { }; + steamcmd = steamPackages.steamcmd; protontricks = python3Packages.callPackage ../tools/package-management/protontricks { inherit steam-run; inherit winetricks; - inherit (gnome3) zenity; + inherit (gnome) zenity; }; sdlpop = callPackage ../games/sdlpop { }; @@ -28370,7 +28587,9 @@ in superTux = callPackage ../games/supertux { }; - superTuxKart = callPackage ../games/super-tux-kart { }; + superTuxKart = callPackage ../games/super-tux-kart { + inherit (darwin.apple_sdk.frameworks) Cocoa IOKit OpenAL; + }; synthv1 = libsForQt5.callPackage ../applications/audio/synthv1 { }; @@ -28452,9 +28671,7 @@ in ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { }; - ultrastardx = callPackage ../games/ultrastardx { - ffmpeg = ffmpeg_2; - }; + ultrastardx = callPackage ../games/ultrastardx { }; unciv = callPackage ../games/unciv { }; @@ -28624,45 +28841,46 @@ in gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { }); - gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { }); + gnome = recurseIntoAttrs (callPackage ../desktops/gnome { }); gnomeExtensions = recurseIntoAttrs { - appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { }; - arcmenu = callPackage ../desktops/gnome-3/extensions/arcmenu { }; - caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; - clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { }; - clock-override = callPackage ../desktops/gnome-3/extensions/clock-override { }; - dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; - dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; - disable-unredirect = callPackage ../desktops/gnome-3/extensions/disable-unredirect { }; - draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { }; - drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { }; - dynamic-panel-transparency = callPackage ../desktops/gnome-3/extensions/dynamic-panel-transparency { }; - easyScreenCast = callPackage ../desktops/gnome-3/extensions/EasyScreenCast { }; - emoji-selector = callPackage ../desktops/gnome-3/extensions/emoji-selector { }; - freon = callPackage ../desktops/gnome-3/extensions/freon { }; - fuzzy-app-search = callPackage ../desktops/gnome-3/extensions/fuzzy-app-search { }; - 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 { }; - noannoyance = callPackage ../desktops/gnome-3/extensions/noannoyance { }; - paperwm = callPackage ../desktops/gnome-3/extensions/paperwm { }; - pidgin-im-integration = callPackage ../desktops/gnome-3/extensions/pidgin-im-integration { }; - remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { }; - sound-output-device-chooser = callPackage ../desktops/gnome-3/extensions/sound-output-device-chooser { }; - system-monitor = callPackage ../desktops/gnome-3/extensions/system-monitor { }; - taskwhisperer = callPackage ../desktops/gnome-3/extensions/taskwhisperer { }; - tilingnome = callPackage ../desktops/gnome-3/extensions/tilingnome { }; - timepp = callPackage ../desktops/gnome-3/extensions/timepp { }; - topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; - unite = callPackage ../desktops/gnome-3/extensions/unite { }; - window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { }; - window-is-ready-remover = callPackage ../desktops/gnome-3/extensions/window-is-ready-remover { }; - workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { }; + appindicator = callPackage ../desktops/gnome/extensions/appindicator { }; + arcmenu = callPackage ../desktops/gnome/extensions/arcmenu { }; + caffeine = callPackage ../desktops/gnome/extensions/caffeine { }; + clipboard-indicator = callPackage ../desktops/gnome/extensions/clipboard-indicator { }; + clock-override = callPackage ../desktops/gnome/extensions/clock-override { }; + dash-to-dock = callPackage ../desktops/gnome/extensions/dash-to-dock { }; + dash-to-panel = callPackage ../desktops/gnome/extensions/dash-to-panel { }; + disable-unredirect = callPackage ../desktops/gnome/extensions/disable-unredirect { }; + draw-on-your-screen = callPackage ../desktops/gnome/extensions/draw-on-your-screen { }; + drop-down-terminal = callPackage ../desktops/gnome/extensions/drop-down-terminal { }; + dynamic-panel-transparency = callPackage ../desktops/gnome/extensions/dynamic-panel-transparency { }; + easyScreenCast = callPackage ../desktops/gnome/extensions/EasyScreenCast { }; + emoji-selector = callPackage ../desktops/gnome/extensions/emoji-selector { }; + freon = callPackage ../desktops/gnome/extensions/freon { }; + fuzzy-app-search = callPackage ../desktops/gnome/extensions/fuzzy-app-search { }; + gsconnect = callPackage ../desktops/gnome/extensions/gsconnect { }; + hot-edge = callPackage ../desktops/gnome/extensions/hot-edge { }; + icon-hider = callPackage ../desktops/gnome/extensions/icon-hider { }; + impatience = callPackage ../desktops/gnome/extensions/impatience { }; + material-shell = callPackage ../desktops/gnome/extensions/material-shell { }; + mpris-indicator-button = callPackage ../desktops/gnome/extensions/mpris-indicator-button { }; + night-theme-switcher = callPackage ../desktops/gnome/extensions/night-theme-switcher { }; + no-title-bar = callPackage ../desktops/gnome/extensions/no-title-bar { }; + noannoyance = callPackage ../desktops/gnome/extensions/noannoyance { }; + paperwm = callPackage ../desktops/gnome/extensions/paperwm { }; + pidgin-im-integration = callPackage ../desktops/gnome/extensions/pidgin-im-integration { }; + remove-dropdown-arrows = callPackage ../desktops/gnome/extensions/remove-dropdown-arrows { }; + sound-output-device-chooser = callPackage ../desktops/gnome/extensions/sound-output-device-chooser { }; + system-monitor = callPackage ../desktops/gnome/extensions/system-monitor { }; + taskwhisperer = callPackage ../desktops/gnome/extensions/taskwhisperer { }; + tilingnome = callPackage ../desktops/gnome/extensions/tilingnome { }; + timepp = callPackage ../desktops/gnome/extensions/timepp { }; + topicons-plus = callPackage ../desktops/gnome/extensions/topicons-plus { }; + unite = callPackage ../desktops/gnome/extensions/unite { }; + window-corner-preview = callPackage ../desktops/gnome/extensions/window-corner-preview { }; + window-is-ready-remover = callPackage ../desktops/gnome/extensions/window-is-ready-remover { }; + workspace-matrix = callPackage ../desktops/gnome/extensions/workspace-matrix { }; nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; @@ -28671,9 +28889,9 @@ in arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 }; - gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { }; + gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { }; - gnome-tour = callPackage ../desktops/gnome-3/core/gnome-tour { }; + gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { }; hhexen = callPackage ../games/hhexen { }; @@ -28709,7 +28927,7 @@ in latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; - gnome-themes-extra = gnome3.gnome-themes-extra; + gnome-themes-extra = gnome.gnome-themes-extra; rox-filer = callPackage ../desktops/rox/rox-filer { gtk = gtk2; @@ -28818,7 +29036,9 @@ in bppsuite = callPackage ../applications/science/biology/bppsuite { }; - cd-hit = callPackage ../applications/science/biology/cd-hit { }; + cd-hit = callPackage ../applications/science/biology/cd-hit { + inherit (llvmPackages) openmp; + }; cmtk = callPackage ../applications/science/biology/cmtk { }; @@ -29318,8 +29538,8 @@ in elan = callPackage ../applications/science/logic/elan {}; mathlibtools = with python3Packages; toPythonApplication mathlibtools; - leo2 = callPackage ../applications/science/logic/leo2 { - ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml;}; + leo2 = callPackage ../applications/science/logic/leo2 + { ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml; }; leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix {}; @@ -29643,7 +29863,9 @@ in stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else gcc8Stdenv; }); - rink = callPackage ../applications/science/misc/rink { }; + rink = callPackage ../applications/science/misc/rink { + inherit (darwin.apple_sdk.frameworks) Security; + }; simgrid = callPackage ../applications/science/misc/simgrid { }; @@ -29682,7 +29904,7 @@ in fastjet-contrib = callPackage ../development/libraries/physics/fastjet-contrib { }; - fastnlo = callPackage ../development/libraries/physics/fastnlo { }; + fastnlo_toolkit = callPackage ../development/libraries/physics/fastnlo_toolkit { }; geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { }; @@ -30045,8 +30267,9 @@ in kops_1_16 kops_1_17 kops_1_18 + kops_1_19 ; - kops = kops_1_18; + kops = kops_1_19; lguf-brightness = callPackage ../misc/lguf-brightness { }; @@ -30103,7 +30326,8 @@ in nix nixStable nixUnstable - nixFlakes; + nixFlakes + nixExperimental; nixStatic = pkgsStatic.nix; @@ -30113,57 +30337,58 @@ in nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { }; - /* Evaluate a NixOS configuration using this evaluation of Nixpkgs. + /* + Evaluate a NixOS configuration using this evaluation of Nixpkgs. - With this function you can write, for example, a package that - depends on a custom virtual machine image. + With this function you can write, for example, a package that + depends on a custom virtual machine image. - Parameter: A module, path or list of those that represent the + Parameter: A module, path or list of those that represent the configuration of the NixOS system to be constructed. - Result: An attribute set containing packages produced by this - evaluation of NixOS, such as toplevel, kernel and - initialRamdisk. - The result can be extended in the modules by defining - extra attributes in system.build. - Alternatively, you may use the result's config and - options attributes to query any option. + Result: An attribute set containing packages produced by this + evaluation of NixOS, such as toplevel, kernel and + initialRamdisk. + The result can be extended in the modules by defining + extra attributes in system.build. + Alternatively, you may use the result's config and + options attributes to query any option. - Example: + Example: - let - myOS = pkgs.nixos ({ lib, pkgs, config, ... }: { + let + myOS = pkgs.nixos ({ lib, pkgs, config, ... }: { - config.services.nginx = { - enable = true; - # ... - }; + config.services.nginx = { + enable = true; + # ... + }; - # Use config.system.build to exports relevant parts of a - # configuration. The runner attribute should not be - # considered a fully general replacement for systemd - # functionality. - config.system.build.run-nginx = config.systemd.services.nginx.runner; - }); - in - myOS.run-nginx + # Use config.system.build to exports relevant parts of a + # configuration. The runner attribute should not be + # considered a fully general replacement for systemd + # functionality. + config.system.build.run-nginx = config.systemd.services.nginx.runner; + }); + in + myOS.run-nginx - Unlike in plain NixOS, the nixpkgs.config and - nixpkgs.system options will be ignored by default. Instead, - nixpkgs.pkgs will have the default value of pkgs as it was - constructed right after invoking the nixpkgs function (e.g. the - value of import { overlays = [./my-overlay.nix]; } - but not the value of (import {} // { extra = ...; }). + Unlike in plain NixOS, the nixpkgs.config and + nixpkgs.system options will be ignored by default. Instead, + nixpkgs.pkgs will have the default value of pkgs as it was + constructed right after invoking the nixpkgs function (e.g. the + value of import { overlays = [./my-overlay.nix]; } + but not the value of (import {} // { extra = ...; }). - If you do want to use the config.nixpkgs options, you are - probably better off by calling nixos/lib/eval-config.nix - directly, even though it is possible to set config.nixpkgs.pkgs. + If you do want to use the config.nixpkgs options, you are + probably better off by calling nixos/lib/eval-config.nix + directly, even though it is possible to set config.nixpkgs.pkgs. - For more information about writing NixOS modules, see - https://nixos.org/nixos/manual/index.html#sec-writing-modules + For more information about writing NixOS modules, see + https://nixos.org/nixos/manual/index.html#sec-writing-modules - Note that you will need to have called Nixpkgs with the system - parameter set to the right value for your deployment target. + Note that you will need to have called Nixpkgs with the system + parameter set to the right value for your deployment target. */ nixos = configuration: @@ -30231,11 +30456,11 @@ in test: let loadedTest = if builtins.typeOf test == "path" - then import test - else test; + then import test + else test; calledTest = if pkgs.lib.isFunction loadedTest - then callPackage loadedTest {} - else loadedTest; + then callPackage loadedTest {} + else loadedTest; in nixosTesting.makeTest calledTest; @@ -30243,6 +30468,8 @@ in (import ../../nixos/lib/make-options-doc/default.nix) ({ inherit pkgs lib; } // attrs); + nixos-install-tools = callPackage ../tools/nix/nixos-install-tools { }; + nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; nixdoc = callPackage ../tools/nix/nixdoc {}; @@ -30335,6 +30562,8 @@ in nut = callPackage ../applications/misc/nut { }; + nvd = callPackage ../tools/package-management/nvd { }; + solfege = python3Packages.callPackage ../misc/solfege { }; disnix = callPackage ../tools/package-management/disnix { }; @@ -30602,7 +30831,9 @@ in hasktags = haskellPackages.hasktags; }; - spacenavd = callPackage ../misc/drivers/spacenavd { }; + spacenavd = callPackage ../misc/drivers/spacenavd { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; spacenav-cube-example = callPackage ../applications/misc/spacenav-cube-example { }; @@ -30737,9 +30968,7 @@ in vbam = callPackage ../misc/emulators/vbam { }; - vice = callPackage ../misc/emulators/vice { - giflib = giflib_4_1; - }; + vice = callPackage ../misc/emulators/vice { }; ViennaRNA = callPackage ../applications/science/molecular-dynamics/viennarna { }; @@ -30755,7 +30984,7 @@ in vimb = wrapFirefox vimb-unwrapped { }; vips = callPackage ../tools/graphics/vips { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; }; nip2 = callPackage ../tools/graphics/nip2 { }; @@ -30818,7 +31047,7 @@ in }); winetricks = callPackage ../misc/emulators/wine/winetricks.nix { - inherit (gnome3) zenity; + inherit (gnome) zenity; }; wishbone-tool = callPackage ../development/tools/misc/wishbone-tool { }; @@ -30895,10 +31124,10 @@ in }; xsw = callPackage ../applications/misc/xsw { - # Enable the next line to use this in terminal. - # Note that it requires sixel capable terminals such as mlterm - # or xterm -ti 340 - SDL = SDL_sixel; + # Enable the next line to use this in terminal. + # Note that it requires sixel capable terminals such as mlterm + # or xterm -ti 340 + SDL = SDL_sixel; }; xteddy = callPackage ../applications/misc/xteddy { }; @@ -31083,7 +31312,7 @@ in chrome-export = callPackage ../tools/misc/chrome-export {}; - chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {}; + chrome-gnome-shell = callPackage ../desktops/gnome/extensions/chrome-gnome-shell {}; chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing {}; @@ -31133,7 +31362,9 @@ in simplehttp2server = callPackage ../servers/simplehttp2server { }; - simple-http-server = callPackage ../servers/simple-http-server { }; + simple-http-server = callPackage ../servers/simple-http-server { + inherit (darwin.apple_sdk.frameworks) Security; + }; diceware = with python3Packages; toPythonApplication diceware; @@ -31157,8 +31388,12 @@ in fts = if stdenv.hostPlatform.isMusl then netbsd.fts else null; - netbsd = callPackages ../os-specific/bsd/netbsd {}; - netbsdCross = callPackages ../os-specific/bsd/netbsd { + bsdSetupHook = makeSetupHook { + name = "bsd-setup-hook"; + } ../os-specific/bsd/setup-hook.sh; + + netbsd = callPackage ../os-specific/bsd/netbsd {}; + netbsdCross = callPackage ../os-specific/bsd/netbsd { stdenv = crossLibcStdenv; }; @@ -31277,7 +31512,9 @@ in treefmt = callPackage ../development/tools/treefmt { }; - bottom = callPackage ../tools/system/bottom {}; + bottom = callPackage ../tools/system/bottom { + inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit; + }; cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { }; diff --git a/third_party/nixpkgs/pkgs/top-level/beam-packages.nix b/third_party/nixpkgs/pkgs/top-level/beam-packages.nix index ac9d4ab524..688d160724 100644 --- a/third_party/nixpkgs/pkgs/top-level/beam-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/beam-packages.nix @@ -14,6 +14,21 @@ rec { # Standard Erlang versions, using the generic builder. + # R24 + erlangR24 = lib.callErlang ../development/interpreters/erlang/R24.nix { + wxGTK = wxGTK30; + # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 + parallelBuild = true; + autoconf = buildPackages.autoconf269; + inherit wxSupport; + }; + erlangR24_odbc = erlangR24.override { odbcSupport = true; }; + erlangR24_javac = erlangR24.override { javacSupport = true; }; + erlangR24_odbc_javac = erlangR24.override { + javacSupport = true; + odbcSupport = true; + }; + # R23 erlangR23 = lib.callErlang ../development/interpreters/erlang/R23.nix { wxGTK = wxGTK30; @@ -126,6 +141,7 @@ rec { # Packages built with default Erlang version. erlang = packagesWith interpreters.erlang; + erlangR24 = packagesWith interpreters.erlangR24; erlangR23 = packagesWith interpreters.erlangR23; erlangR22 = packagesWith interpreters.erlangR22; erlangR21 = packagesWith interpreters.erlangR21; diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix index 2cd2965fc6..e89f1a57c9 100644 --- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix @@ -13,6 +13,7 @@ let contribs = recurseIntoAttrs (callPackage ../development/coq-modules/contribs {}); + aac-tactics = callPackage ../development/coq-modules/aac-tactics {}; autosubst = callPackage ../development/coq-modules/autosubst {}; bignums = if lib.versionAtLeast coq.coq-version "8.6" then callPackage ../development/coq-modules/bignums {} @@ -36,9 +37,11 @@ let flocq = callPackage ../development/coq-modules/flocq {}; fourcolor = callPackage ../development/coq-modules/fourcolor {}; gappalib = callPackage ../development/coq-modules/gappalib {}; + goedel = callPackage ../development/coq-modules/goedel {}; heq = callPackage ../development/coq-modules/heq {}; hierarchy-builder = callPackage ../development/coq-modules/hierarchy-builder {}; HoTT = callPackage ../development/coq-modules/HoTT {}; + hydra-battles = callPackage ../development/coq-modules/hydra-battles {}; interval = callPackage ../development/coq-modules/interval {}; InfSeqExt = callPackage ../development/coq-modules/InfSeqExt {}; iris = callPackage ../development/coq-modules/iris {}; @@ -58,21 +61,26 @@ let mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap {}; mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {}; mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {}; + mathcomp-zify = callPackage ../development/coq-modules/mathcomp-zify {}; metalib = callPackage ../development/coq-modules/metalib { }; multinomials = callPackage ../development/coq-modules/multinomials {}; odd-order = callPackage ../development/coq-modules/odd-order { }; paco = callPackage ../development/coq-modules/paco {}; paramcoq = callPackage ../development/coq-modules/paramcoq {}; + pocklington = callPackage ../development/coq-modules/pocklington {}; QuickChick = callPackage ../development/coq-modules/QuickChick {}; + relation-algebra = callPackage ../development/coq-modules/relation-algebra {}; simple-io = callPackage ../development/coq-modules/simple-io { }; stdpp = callPackage ../development/coq-modules/stdpp { }; StructTact = callPackage ../development/coq-modules/StructTact {}; tlc = callPackage ../development/coq-modules/tlc {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; - VST = callPackage ../development/coq-modules/VST { - compcert = compcert.override { version = "3.7"; }; - }; + VST = callPackage ../development/coq-modules/VST (with lib.versions; + lib.switch coq.coq-version [ + { case = "8.11"; out = { compcert = compcert.override { coqPackages = self; version = "3.7"; }; }; } + { case = range "8.12" "8.13"; out = { compcert = compcert.override { coqPackages = self; }; }; } + ] {}); filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self; }; @@ -122,7 +130,7 @@ in rec { coqPackages_8_11 = mkCoqPackages coq_8_11; coqPackages_8_12 = mkCoqPackages coq_8_12; coqPackages_8_13 = mkCoqPackages coq_8_13; - coqPackages = recurseIntoAttrs coqPackages_8_11; + coqPackages = recurseIntoAttrs coqPackages_8_13; coq = coqPackages.coq; } diff --git a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix index 3ece95c584..5275a6f312 100644 --- a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix @@ -1,27 +1,44 @@ -{ buildPackages, pkgs, targetPackages -, darwin, stdenv, callPackage, callPackages, newScope +{ lib +, buildPackages, pkgs, targetPackages +, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget +, stdenv, splicePackages, newScope }: let - apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { }; + otherSplices = { + selfBuildBuild = pkgsBuildBuild.darwin; + selfBuildHost = pkgsBuildHost.darwin; + selfBuildTarget = pkgsBuildTarget.darwin; + selfHostHost = pkgsHostHost.darwin; + selfTargetTarget = pkgsTargetTarget.darwin or {}; # might be missing + }; - impure-cmds = callPackage ../os-specific/darwin/impure-cmds { }; in -(impure-cmds // apple-source-releases // { +lib.makeScopeWithSplicing splicePackages newScope otherSplices (_: {}) (spliced: spliced.apple_sdk.frameworks) (self: let + inherit (self) mkDerivation callPackage; - callPackage = newScope (darwin.apple_sdk.frameworks // darwin); + # Must use pkgs.callPackage to avoid infinite recursion. + + apple-source-releases = pkgs.callPackage ../os-specific/darwin/apple-source-releases { } self; + + impure-cmds = pkgs.callPackage ../os-specific/darwin/impure-cmds { }; + + apple_sdk = pkgs.callPackage ../os-specific/darwin/apple-sdk { + inherit (buildPackages.darwin) print-reexports; + inherit (self) darwin-stubs; + }; +in + +impure-cmds // apple-source-releases // { + + inherit apple_sdk; stdenvNoCF = stdenv.override { extraBuildInputs = []; }; - apple_sdk = callPackage ../os-specific/darwin/apple-sdk { - inherit (darwin) darwin-stubs print-reexports; - }; - binutils-unwrapped = callPackage ../os-specific/darwin/binutils { - inherit (darwin) cctools; inherit (pkgs) binutils-unwrapped; inherit (pkgs.llvmPackages_7) llvm clang-unwrapped; }; @@ -31,17 +48,21 @@ in if stdenv.targetPlatform != stdenv.hostPlatform then pkgs.libcCross else pkgs.stdenv.cc.libc; - bintools = darwin.binutils-unwrapped; + bintools = self.binutils-unwrapped; + }; + + binutilsNoLibc = pkgs.wrapBintoolsWith { + libc = null; + bintools = self.binutils-unwrapped; }; cctools = callPackage ../os-specific/darwin/cctools/port.nix { - inherit (darwin) libobjc maloader libtapi; stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv; libcxxabi = pkgs.libcxxabi; }; # TODO: remove alias. - cf-private = darwin.apple_sdk.frameworks.CoreFoundation; + cf-private = self.apple_sdk.frameworks.CoreFoundation; DarwinTools = callPackage ../os-specific/darwin/DarwinTools { }; @@ -50,15 +71,13 @@ in print-reexports = callPackage ../os-specific/darwin/apple-sdk/print-reexports { }; maloader = callPackage ../os-specific/darwin/maloader { - inherit (darwin) opencflite; }; insert_dylib = callPackage ../os-specific/darwin/insert_dylib { }; - iosSdkPkgs = darwin.callPackage ../os-specific/darwin/xcode/sdk-pkgs.nix { + iosSdkPkgs = callPackage ../os-specific/darwin/xcode/sdk-pkgs.nix { buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk; targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs; - xcode = darwin.xcode; inherit (pkgs.llvmPackages) clang-unwrapped; }; @@ -70,13 +89,13 @@ in opencflite = callPackage ../os-specific/darwin/opencflite { }; - stubs = callPackages ../os-specific/darwin/stubs { }; + stubs = pkgs.callPackages ../os-specific/darwin/stubs { }; - trash = darwin.callPackage ../os-specific/darwin/trash { }; + trash = callPackage ../os-specific/darwin/trash { }; usr-include = callPackage ../os-specific/darwin/usr-include { }; - inherit (callPackages ../os-specific/darwin/xcode { }) + inherit (pkgs.callPackages ../os-specific/darwin/xcode { }) xcode_8_1 xcode_8_2 xcode_9_1 xcode_9_2 xcode_9_4 xcode_9_4_1 xcode_10_2 xcode_10_2_1 xcode_10_3 @@ -85,10 +104,10 @@ in CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; - CF = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { inherit (darwin) objc4 ICU; }; + CF = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { }; # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in - # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { inherit (darwin) apple_sdk_sierra xnu; }; + # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { }; darling = callPackage ../os-specific/darwin/darling/default.nix { }; @@ -96,8 +115,6 @@ in ios-deploy = callPackage ../os-specific/darwin/ios-deploy {}; - discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll { }; }) diff --git a/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix b/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix index 660ba01bcd..f1eaff5ec8 100644 --- a/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix @@ -9,7 +9,6 @@ , pkg-config , mono , fsharp -, unzip , overrides ? {} }: @@ -897,8 +896,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz"; }; - nativeBuildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; outputFiles = [ "*" ]; diff --git a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix index da70103ad6..8bea40efe6 100644 --- a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -76,13 +76,17 @@ in { llvmPackages = pkgs.llvmPackages_9; }; ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { - bootPkgs = packages.ghc8102Binary; + # aarch64 ghc8102Binary exceeds max output size on hydra + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then + packages.ghc8102BinaryMinimal + else + packages.ghc8102Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = packages.ghc884; # no binary yet + bootPkgs = packages.ghc901; # no binary yet inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 71da1aa5c0..b58fe1f429 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -53,7 +53,7 @@ let base64 = callPackage ../development/ocaml-modules/base64 { }; bap = callPackage ../development/ocaml-modules/bap { - llvm = pkgs.llvm_8; + inherit (pkgs.llvmPackages_8) llvm; }; batteries = callPackage ../development/ocaml-modules/batteries { }; @@ -82,6 +82,8 @@ let ca-certs = callPackage ../development/ocaml-modules/ca-certs { }; + ca-certs-nss = callPackage ../development/ocaml-modules/ca-certs-nss { }; + carton = callPackage ../development/ocaml-modules/carton { }; carton-git = callPackage ../development/ocaml-modules/carton/git.nix { }; @@ -114,12 +116,11 @@ let then callPackage ../development/ocaml-modules/camomile { } else callPackage ../development/ocaml-modules/camomile/0.8.5.nix { }; - camlimages_4_0 = + camlimages_4_1_2 = if lib.versionOlder "4.02" ocaml.version then null - else callPackage ../development/ocaml-modules/camlimages/4.0.nix { + else callPackage ../development/ocaml-modules/camlimages/4.1.2.nix { libpng = pkgs.libpng12; - giflib = pkgs.giflib_4_1; }; camlimages = callPackage ../development/ocaml-modules/camlimages { }; @@ -457,7 +458,7 @@ let git-cohttp-unix = callPackage ../development/ocaml-modules/git/cohttp-unix.nix { }; - git-cohttp-mirage = callPackage ../development/ocaml-modules/git/cohttp-mirage.nix { }; + git-paf = callPackage ../development/ocaml-modules/git/paf.nix { }; git-unix = callPackage ../development/ocaml-modules/git/unix.nix { git-binary = pkgs.git; @@ -585,7 +586,7 @@ let linenoise = callPackage ../development/ocaml-modules/linenoise { }; llvm = callPackage ../development/ocaml-modules/llvm { - llvm = pkgs.llvm_8; + libllvm = pkgs.llvmPackages_8.libllvm; }; logs = callPackage ../development/ocaml-modules/logs { }; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index e7c8301832..7bcdf6190c 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -174,6 +174,22 @@ let propagatedBuildInputs = [ AlgorithmDiff ]; }; + AlienBaseModuleBuild = buildPerlModule { + pname = "Alien-Base-ModuleBuild"; + version = "1.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Base-ModuleBuild-1.15.tar.gz"; + sha256 = "13c9432cf41b34cb14df2454a03e540e2bd5dc9eb9c82824b6ad0f4c67793afd"; + }; + buildInputs = [ Test2Suite ]; + propagatedBuildInputs = [ AlienBuild ArchiveExtract CaptureTiny Filechdir PathTiny ShellConfigGenerate ShellGuess SortVersions URI ]; + meta = { + homepage = https://metacpan.org/pod/Alien::Base::ModuleBuild; + description = "A Module::Build subclass for building Alien:: modules and their libraries"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AlienBuild = buildPerlPackage { pname = "Alien-Build"; version = "2.37"; @@ -204,6 +220,21 @@ let }; }; + AlienLibGumbo = buildPerlModule { + pname = "Alien-LibGumbo"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RU/RUZ/Alien-LibGumbo-0.05.tar.gz"; + sha256 = "0fbe916ab11f680e5c28cd1ac800372323e2a0e06affc6c8b36279fc64d76517"; + }; + buildInputs = [ AlienBaseModuleBuild ]; + propagatedBuildInputs = [ AlienBuild FileShareDir PathClass ]; + meta = { + description = "Gumbo parser library"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AlienLibxml2 = buildPerlPackage { pname = "Alien-Libxml2"; version = "0.17"; @@ -4606,6 +4637,19 @@ let }; }; + CryptX509 = buildPerlPackage { + pname = "Crypt-X509"; + version = "0.53"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-X509-0.53.tar.gz"; + sha256 = "d2ff614f9457dc87ab277b81bced3532c3ed309b73b9a61aaefbe9488c9e660f"; + }; + propagatedBuildInputs = [ ConvertASN1 ]; + meta = { + description = "Parse a X.509 certificate"; + }; + }; + CwdGuard = buildPerlModule { pname = "Cwd-Guard"; version = "0.05"; @@ -9204,7 +9248,7 @@ let propagatedBuildInputs = [ Readonly Gtk3 ]; checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ]; checkPhase = '' - ${pkgs.xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \ + ${pkgs.xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \ make test ''; meta = { @@ -9471,6 +9515,21 @@ let }; }; + HTMLFormatExternal = buildPerlPackage { + pname = "HTML-FormatExternal"; + version = "26"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KR/KRYDE/HTML-FormatExternal-26.tar.gz"; + sha256 = "3c59f233d0b10686a85aed0c994011cec68626da0128dea90b5c4fdc1746cfc3"; + }; + propagatedBuildInputs = [ IPCRun URI constant-defer ]; + meta = { + homepage = http://user42.tuxfamily.org/html-formatexternal/index.html; + description = "HTML to text formatting using external programs"; + license = lib.licenses.gpl3Plus; + }; + }; + HTMLFormatTextWithLinks = buildPerlModule { pname = "HTML-FormatText-WithLinks"; version = "0.15"; @@ -9546,6 +9605,20 @@ let }; }; + HTMLGumbo = buildPerlModule { + pname = "HTML-Gumbo"; + version = "0.18"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RU/RUZ/HTML-Gumbo-0.18.tar.gz"; + sha256 = "bf50b61c24656cc3fc958602d80a9c7d017247af38d8dbfa0e9dec5b75425d5f"; + }; + propagatedBuildInputs = [ AlienLibGumbo ]; + meta = { + description = "HTML5 parser based on gumbo C library"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HTMLMason = buildPerlPackage { pname = "HTML-Mason"; version = "1.59"; @@ -9909,6 +9982,21 @@ let propagatedBuildInputs = [ XMLDOM ]; }; + HTTPHeadersActionPack = buildPerlPackage { + pname = "HTTP-Headers-ActionPack"; + version = "0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTTP-Headers-ActionPack-0.09.tar.gz"; + sha256 = "c78111ab857e48c69824903d4b6ce8293feffc6b5d670db550a767f853acc7da"; + }; + buildInputs = [ TestFatal TestWarnings ]; + propagatedBuildInputs = [ HTTPDate HTTPMessage ModuleRuntime SubExporter URI ]; + meta = { + description = "HTTP Action, Adventure and Excitement"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HTTPHeaderParserXS = buildPerlPackage { pname = "HTTP-HeaderParser-XS"; version = "0.20"; @@ -13681,6 +13769,22 @@ let }; }; + MojoliciousPluginSyslog = buildPerlPackage { + pname = "Mojolicious-Plugin-Syslog"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Syslog-0.04.tar.gz"; + sha256 = "807d06b88304675a2bb9181bab123a0e16d3cf2f6a5753a168090ed88085a492"; + }; + propagatedBuildInputs = [ Mojolicious ]; + meta = { + homepage = "https://github.com/jhthorsen/mojolicious-plugin-syslog"; + description = "A plugin for enabling a Mojolicious app to log to syslog"; + license = lib.licenses.artistic2; + maintainers = [ maintainers.sgo ]; + }; + }; + MojoliciousPluginTextExceptions = buildPerlPackage { pname = "Mojolicious-Plugin-TextExceptions"; version = "0.02"; @@ -14049,6 +14153,21 @@ let }; }; + MooXTypeTiny = buildPerlPackage { + pname = "MooX-TypeTiny"; + version = "0.002003"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HA/HAARG/MooX-TypeTiny-0.002003.tar.gz"; + sha256 = "d81e26ff6f8db10261f0087f96dc54367dcb49a9f3de8d53238f834ece19624b"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ Moo TypeTiny ]; + meta = { + description = "Optimized type checks for Moo + Type::Tiny"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MooseAutobox = buildPerlModule { pname = "Moose-Autobox"; version = "0.16"; @@ -16485,6 +16604,22 @@ let }; }; + PathDispatcher = buildPerlPackage { + pname = "Path-Dispatcher"; + version = "1.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETHER/Path-Dispatcher-1.08.tar.gz"; + sha256 = "79a9f61c27408b4fd1ed234dac246974ddeafa7fe635a18fe41ec7783130ae2a"; + }; + buildInputs = [ ModuleBuildTiny TestFatal ]; + propagatedBuildInputs = [ Moo MooXTypeTiny TryTiny TypeTiny ]; + meta = { + homepage = https://github.com/karenetheridge/Path-Dispatcher; + description = "Flexible and extensible dispatch"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PathIteratorRule = buildPerlPackage { pname = "Path-Iterator-Rule"; version = "1.014"; @@ -16586,10 +16721,10 @@ let PDFBuilder = buildPerlPackage { pname = "PDF-Builder"; - version = "3.021"; + version = "3.022"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMPERRY/PDF-Builder-3.021.tar.gz"; - sha256 = "1hc22s5gdspr5nyfmix3cwdzcw7z66pcqxy422ksmbninbzv4z93"; + url = "mirror://cpan/authors/id/P/PM/PMPERRY/PDF-Builder-3.022.tar.gz"; + sha256 = "0cfafyci5xar567z82w0vcjrwa6inf1a9ydszgkz51bi1ilj8as8"; }; checkInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; @@ -19064,6 +19199,36 @@ let }; }; + ShellConfigGenerate = buildPerlPackage { + pname = "Shell-Config-Generate"; + version = "0.34"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Shell-Config-Generate-0.34.tar.gz"; + sha256 = "84f451f22215dd68e9c18aa3f7ddb03a82007d166cfada003d0f166f571e0562"; + }; + buildInputs = [ Test2Suite ]; + propagatedBuildInputs = [ ShellGuess ]; + meta = { + homepage = https://metacpan.org/pod/Shell::Config::Generate; + description = "Portably generate config for any shell"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + ShellGuess = buildPerlPackage { + pname = "Shell-Guess"; + version = "0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Shell-Guess-0.09.tar.gz"; + sha256 = "4069fa2637e443118ed956d710231d166823d23b2a64eb87b8a46872e865a12b"; + }; + meta = { + homepage = https://metacpan.org/pod/Shell::Guess; + description = "Make an educated guess about the shell in use"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + StringToIdentifierEN = buildPerlPackage { pname = "String-ToIdentifier-EN"; version = "0.12"; @@ -21622,6 +21787,8 @@ let url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.88.tar.gz"; sha256 = "0b7lmjvfmypps1nw6nsdikgaakm0n0g4186glaqazg5xd1p5h55h"; }; + # libbtparse.so: cannot open shared object file (aarch64 only) + patches = [ ../development/perl-modules/TextBibTeX-use-lib-on-aarch64.patch ]; perlPreHook = "export LD=$CC"; perlPostHook = lib.optionalString stdenv.isDarwin '' oldPath="$(pwd)/btparse/src/libbtparse.dylib" @@ -22215,6 +22382,21 @@ let propagatedBuildInputs = [ URI ]; }; + TextWordDiff = buildPerlPackage { + pname = "Text-WordDiff"; + version = "0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TI/TIMK/Text-WordDiff-0.09.tar.gz"; + sha256 = "fee699ca763adca2f4e18f4a8a836fd2102bc2820af708f8eb43356d5ae0d50e"; + }; + propagatedBuildInputs = [ AlgorithmDiff HTMLParser ]; + meta = { + homepage = https://metacpan.org/release/Text-WordDiff; + description = "Track changes between documents"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TextWrapI18N = buildPerlPackage { pname = "Text-WrapI18N"; version = "0.06"; @@ -23851,6 +24033,22 @@ let }; }; + WebMachine = buildPerlPackage { + pname = "Web-Machine"; + version = "0.17"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Web-Machine-0.17.tar.gz"; + sha256 = "f139d2b3114c549e91847daaab8b75cb699e57daf5bbf0dbd13293f33fe5e22a"; + }; + buildInputs = [ NetHTTP TestFailWarnings TestFatal ]; + propagatedBuildInputs = [ HTTPHeadersActionPack HTTPMessage HashMultiValue IOHandleUtil ModuleRuntime Plack SubExporter TryTiny ]; + meta = { + homepage = http://metacpan.org/release/Web-Machine; + description = "A Perl port of Webmachine"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + WebServiceLinode = buildPerlModule { pname = "WebService-Linode"; version = "0.29"; diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix index 3bbcb453a3..6aa23a2271 100644 --- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix @@ -31,6 +31,8 @@ lib.makeScope pkgs.newScope (self: with self; { composer1 = callPackage ../development/php-packages/composer/1.x.nix { }; + deployer = callPackage ../development/php-packages/deployer { }; + php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { }; php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 19d2a40dce..f331e80124 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -311,10 +311,14 @@ in { aionotion = callPackage ../development/python-modules/aionotion { }; + aiopg = callPackage ../development/python-modules/aiopg { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; aiopulse = callPackage ../development/python-modules/aiopulse { }; + aiopvpc = callPackage ../development/python-modules/aiopvpc { }; + aiopylgtv = callPackage ../development/python-modules/aiopylgtv { }; aiorecollect = callPackage ../development/python-modules/aiorecollect { }; @@ -347,6 +351,8 @@ in { aiowinreg = callPackage ../development/python-modules/aiowinreg { }; + aioymaps = callPackage ../development/python-modules/aioymaps { }; + aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; airly = callPackage ../development/python-modules/airly { }; @@ -383,6 +389,8 @@ in { amqplib = callPackage ../development/python-modules/amqplib { }; + amqtt = callPackage ../development/python-modules/amqtt { }; + android-backup = callPackage ../development/python-modules/android-backup { }; androidtv = callPackage ../development/python-modules/androidtv { }; @@ -403,7 +411,11 @@ in { ansi2html = callPackage ../development/python-modules/ansi2html { }; - ansible = callPackage ../development/python-modules/ansible { }; + ansible = callPackage ../development/python-modules/ansible/legacy.nix { }; + + ansible-base = callPackage ../development/python-modules/ansible/base.nix { }; + + ansible-collections = callPackage ../development/python-modules/ansible/collections.nix { }; ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; @@ -555,6 +567,8 @@ in { asyncssh = callPackage ../development/python-modules/asyncssh { }; + asyncstdlib = callPackage ../development/python-modules/asyncstdlib { }; + async_stagger = callPackage ../development/python-modules/async_stagger { }; asynctest = callPackage ../development/python-modules/asynctest { }; @@ -657,6 +671,8 @@ in { aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; + awscrt = callPackage ../development/python-modules/awscrt { }; + awsiotpythonsdk = callPackage ../development/python-modules/awsiotpythonsdk { }; awslambdaric = callPackage ../development/python-modules/awslambdaric { }; @@ -845,6 +861,8 @@ in { azure-mgmt-servicefabric = callPackage ../development/python-modules/azure-mgmt-servicefabric { }; + azure-mgmt-servicefabricmanagedclusters = callPackage ../development/python-modules/azure-mgmt-servicefabricmanagedclusters { }; + azure-mgmt-signalr = callPackage ../development/python-modules/azure-mgmt-signalr { }; azure-mgmt-sql = callPackage ../development/python-modules/azure-mgmt-sql { }; @@ -925,6 +943,8 @@ in { backports_weakref = callPackage ../development/python-modules/backports_weakref { }; + backports-zoneinfo = callPackage ../development/python-modules/backports-zoneinfo { }; + bacpypes = callPackage ../development/python-modules/bacpypes { }; banal = callPackage ../development/python-modules/banal { }; @@ -1071,6 +1091,8 @@ in { block-io = callPackage ../development/python-modules/block-io { }; + blspy = callPackage ../development/python-modules/blspy { }; + bluepy = callPackage ../development/python-modules/bluepy { }; bluepy-devices = callPackage ../development/python-modules/bluepy-devices { }; @@ -1233,6 +1255,8 @@ in { cassandra-driver = callPackage ../development/python-modules/cassandra-driver { }; + castepxbin = callPackage ../development/python-modules/castepxbin { }; + casttube = callPackage ../development/python-modules/casttube { }; catalogue = callPackage ../development/python-modules/catalogue { }; @@ -1259,6 +1283,8 @@ in { connect-box = callPackage ../development/python-modules/connect_box { }; + coqpit = callPackage ../development/python-modules/coqpit { }; + cerberus = callPackage ../development/python-modules/cerberus { }; cert-chain-resolver = callPackage ../development/python-modules/cert-chain-resolver { }; @@ -1323,6 +1349,12 @@ in { chevron = callPackage ../development/python-modules/chevron { }; + chiabip158 = callPackage ../development/python-modules/chiabip158 { }; + + chiapos = callPackage ../development/python-modules/chiapos { }; + + chiavdf = callPackage ../development/python-modules/chiavdf { }; + chirpstack-api = callPackage ../development/python-modules/chirpstack-api { }; ci-info = callPackage ../development/python-modules/ci-info { }; @@ -1331,6 +1363,10 @@ in { cirq = callPackage ../development/python-modules/cirq { }; + cirq-core = callPackage ../development/python-modules/cirq-core { }; + + cirq-google = callPackage ../development/python-modules/cirq-google { }; + ciscomobilityexpress = callPackage ../development/python-modules/ciscomobilityexpress { }; ciso8601 = callPackage ../development/python-modules/ciso8601 { }; @@ -1417,6 +1453,12 @@ in { clustershell = callPackage ../development/python-modules/clustershell { }; + clvm = callPackage ../development/python-modules/clvm { }; + + clvm-rs = callPackage ../development/python-modules/clvm-rs { }; + + clvm-tools = callPackage ../development/python-modules/clvm-tools { }; + cma = callPackage ../development/python-modules/cma { }; cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; @@ -1459,6 +1501,8 @@ in { colored = callPackage ../development/python-modules/colored { }; + colored-traceback = callPackage ../development/python-modules/colored-traceback { }; + coloredlogs = callPackage ../development/python-modules/coloredlogs { }; colorful = callPackage ../development/python-modules/colorful { }; @@ -1481,6 +1525,8 @@ in { compiledb = callPackage ../development/python-modules/compiledb { }; + concurrent-log-handler = callPackage ../development/python-modules/concurrent-log-handler { }; + conda = callPackage ../development/python-modules/conda { }; ConfigArgParse = self.configargparse; # added 2021-03-18 @@ -1617,6 +1663,8 @@ in { cvxpy = callPackage ../development/python-modules/cvxpy { }; + cwcwidth = callPackage ../development/python-modules/cwcwidth { }; + cx_Freeze = callPackage ../development/python-modules/cx_freeze { }; cx_oracle = callPackage ../development/python-modules/cx_oracle { }; @@ -1703,6 +1751,8 @@ in { datrie = callPackage ../development/python-modules/datrie { }; + dawg-python = callPackage ../development/python-modules/dawg-python { }; + dbf = callPackage ../development/python-modules/dbf { }; dbfread = callPackage ../development/python-modules/dbfread { }; @@ -1729,10 +1779,10 @@ in { debugpy = callPackage ../development/python-modules/debugpy { }; - debut = callPackage ../development/python-modules/debut { }; - decorator = callPackage ../development/python-modules/decorator { }; + decopatch = callPackage ../development/python-modules/decopatch { }; + deep_merge = callPackage ../development/python-modules/deep_merge { }; deepdiff = callPackage ../development/python-modules/deepdiff { }; @@ -1751,6 +1801,8 @@ in { delegator-py = callPackage ../development/python-modules/delegator-py { }; + deltachat = callPackage ../development/python-modules/deltachat { }; + deluge-client = callPackage ../development/python-modules/deluge-client { }; demjson = callPackage ../development/python-modules/demjson { }; @@ -1908,8 +1960,6 @@ in { django-picklefield = callPackage ../development/python-modules/django-picklefield { }; - django_pipeline = callPackage ../development/python-modules/django-pipeline { }; - django_polymorphic = callPackage ../development/python-modules/django-polymorphic { }; django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { }; @@ -2038,6 +2088,8 @@ in { inherit (pkgs) graphviz; }; + dotmap = callPackage ../development/python-modules/dotmap { }; + dparse = callPackage ../development/python-modules/dparse { }; dpath = callPackage ../development/python-modules/dpath { }; @@ -2297,6 +2349,11 @@ in { fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; + fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override { + withPython = true; + inherit python; + }); + fastpair = callPackage ../development/python-modules/fastpair { }; fastparquet = callPackage ../development/python-modules/fastparquet { }; @@ -2327,6 +2384,7 @@ in { fenics = callPackage ../development/libraries/science/math/fenics { pytest = self.pytest_4; + hdf5 = pkgs.hdf5_1_10; }; ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { }; @@ -2541,6 +2599,8 @@ in { fpylll = callPackage ../development/python-modules/fpylll { }; + fpyutils = callPackage ../development/python-modules/fpyutils { }; + freebox-api = callPackage ../development/python-modules/freebox-api { }; freetype-py = callPackage ../development/python-modules/freetype-py { }; @@ -2699,6 +2759,8 @@ in { glasgow = callPackage ../development/python-modules/glasgow { }; + glcontext = callPackage ../development/python-modules/glcontext { }; + glob2 = callPackage ../development/python-modules/glob2 { }; globre = callPackage ../development/python-modules/globre { }; @@ -2979,8 +3041,12 @@ in { hachoir = callPackage ../development/python-modules/hachoir { }; + hdate = callPackage ../development/python-modules/hdate { }; + ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; + ha-philipsjs = callPackage ../development/python-modules/ha-philipsjs{ }; + halo = callPackage ../development/python-modules/halo { }; handout = callPackage ../development/python-modules/handout { }; @@ -3075,6 +3141,8 @@ in { hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { }; + hsluv = callPackage ../development/python-modules/hsluv { }; + hstspreload = callPackage ../development/python-modules/hstspreload { }; html2text = callPackage ../development/python-modules/html2text { }; @@ -3125,6 +3193,8 @@ in { humanize = callPackage ../development/python-modules/humanize { }; + humblewx = callPackage ../development/python-modules/humblewx { }; + hupper = callPackage ../development/python-modules/hupper { }; hvac = callPackage ../development/python-modules/hvac { }; @@ -3162,6 +3232,10 @@ in { hyppo = callPackage ../development/python-modules/hyppo { }; + i2c-tools = callPackage ../development/python-modules/i2c-tools { + inherit (pkgs) i2c-tools; + }; + i3ipc = callPackage ../development/python-modules/i3ipc { }; i3-py = callPackage ../development/python-modules/i3-py { }; @@ -3262,8 +3336,6 @@ in { influxgraph = callPackage ../development/python-modules/influxgraph { }; - infoqscraper = callPackage ../development/python-modules/infoqscraper { }; - inform = callPackage ../development/python-modules/inform { }; iniconfig = callPackage ../development/python-modules/iniconfig { }; @@ -3547,6 +3619,8 @@ in { jwcrypto = callPackage ../development/python-modules/jwcrypto { }; + jxmlease = callPackage ../development/python-modules/jxmlease { }; + k5test = callPackage ../development/python-modules/k5test { inherit (pkgs) krb5Full findutils which; }; @@ -3603,6 +3677,8 @@ in { keyring = callPackage ../development/python-modules/keyring { }; + keyrings-cryptfile = callPackage ../development/python-modules/keyrings-cryptfile { }; + keyrings-alt = callPackage ../development/python-modules/keyrings-alt { }; keystone-engine = callPackage ../development/python-modules/keystone-engine { }; @@ -3871,6 +3947,8 @@ in { line_profiler = callPackage ../development/python-modules/line_profiler { }; + linkify-it-py = callPackage ../development/python-modules/linkify-it-py { }; + linode-api = callPackage ../development/python-modules/linode-api { }; linode = callPackage ../development/python-modules/linode { }; @@ -3913,6 +3991,8 @@ in { localzone = callPackage ../development/python-modules/localzone { }; + locationsharinglib = callPackage ../development/python-modules/locationsharinglib { }; + locket = callPackage ../development/python-modules/locket { }; lockfile = callPackage ../development/python-modules/lockfile { }; @@ -4089,8 +4169,14 @@ in { mcstatus = callPackage ../development/python-modules/mcstatus { }; + md-toc = callPackage ../development/python-modules/md-toc { }; + md2gemini = callPackage ../development/python-modules/md2gemini { }; + mdformat = callPackage ../development/python-modules/mdformat { }; + + mdit-py-plugins = callPackage ../development/python-modules/mdit-py-plugins { }; + MDP = callPackage ../development/python-modules/mdp { }; measurement = callPackage ../development/python-modules/measurement { }; @@ -4125,6 +4211,8 @@ in { meshlabxml = callPackage ../development/python-modules/meshlabxml { }; + meshtastic = callPackage ../development/python-modules/meshtastic { }; + meson = toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs (oldAttrs: { # We do not want the setup hook in Python packages because the build is performed differently. setupHook = null; @@ -4237,6 +4325,8 @@ in { mortgage = callPackage ../development/python-modules/mortgage { }; + motioneye-client = callPackage ../development/python-modules/motioneye-client { }; + moto = callPackage ../development/python-modules/moto { }; moviepy = callPackage ../development/python-modules/moviepy { }; @@ -4311,6 +4401,8 @@ in { mutatormath = callPackage ../development/python-modules/mutatormath { }; + mutesync = callPackage ../development/python-modules/mutesync { }; + mwclient = callPackage ../development/python-modules/mwclient { }; mwdblib = callPackage ../development/python-modules/mwdblib { }; @@ -4329,6 +4421,10 @@ in { mypy = callPackage ../development/python-modules/mypy { }; + mypy-boto3-builder = callPackage ../development/python-modules/mypy-boto3-builder { }; + + mypy-boto3-s3 = callPackage ../development/python-modules/mypy-boto3-s3 { }; + mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { }; mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { }; @@ -4699,6 +4795,8 @@ in { ovh = callPackage ../development/python-modules/ovh { }; + ovoenergy = callPackage ../development/python-modules/ovoenergy { }; + owslib = callPackage ../development/python-modules/owslib { }; oyaml = callPackage ../development/python-modules/oyaml { }; @@ -4810,6 +4908,8 @@ in { pathvalidate = callPackage ../development/python-modules/pathvalidate { }; + pathy = callPackage ../development/python-modules/pathy/default.nix { }; + patiencediff = callPackage ../development/python-modules/patiencediff { }; patool = callPackage ../development/python-modules/patool { }; @@ -5123,6 +5223,8 @@ in { praw = callPackage ../development/python-modules/praw { }; + prayer-times-calculator = callPackage ../development/python-modules/prayer-times-calculator { }; + precis-i18n = callPackage ../development/python-modules/precis-i18n { }; pre-commit = callPackage ../development/python-modules/pre-commit { }; @@ -5145,7 +5247,9 @@ in { prison = callPackage ../development/python-modules/prison { }; - privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; + privacyidea = callPackage ../development/python-modules/privacyidea { }; + + pyjwt1 = callPackage ../development/python-modules/pyjwt/1.nix { }; proboscis = callPackage ../development/python-modules/proboscis { }; @@ -5256,6 +5360,10 @@ in { py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { }; + py-dmidecode = callPackage ../development/python-modules/py-dmidecode { }; + + py-ubjson = callPackage ../development/python-modules/py-ubjson { }; + py2bit = callPackage ../development/python-modules/py2bit { }; py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); @@ -5366,6 +5474,10 @@ in { pycfdns = callPackage ../development/python-modules/pycfdns { }; + pycflow2dot = callPackage ../development/python-modules/pycflow2dot { + inherit (pkgs) graphviz; + }; + pychannels = callPackage ../development/python-modules/pychannels { }; pychart = callPackage ../development/python-modules/pychart { }; @@ -5402,6 +5514,8 @@ in { pycparser = callPackage ../development/python-modules/pycparser { }; + py-canary = callPackage ../development/python-modules/py-canary { }; + py-cid = callPackage ../development/python-modules/py-cid { }; py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { }; @@ -5439,6 +5553,8 @@ in { pydeconz = callPackage ../development/python-modules/pydeconz { }; + pydelijn = callPackage ../development/python-modules/pydelijn { }; + pydenticon = callPackage ../development/python-modules/pydenticon { }; pydexcom = callPackage ../development/python-modules/pydexcom { }; @@ -5555,6 +5671,8 @@ in { pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; + pygatt = callPackage ../development/python-modules/pygatt { }; + pygbm = callPackage ../development/python-modules/pygbm { }; pygccxml = callPackage ../development/python-modules/pygccxml { }; @@ -5617,6 +5735,8 @@ in { pyi2cflash = callPackage ../development/python-modules/pyi2cflash { }; + pyialarm = callPackage ../development/python-modules/pyialarm { }; + pyicloud = callPackage ../development/python-modules/pyicloud { }; PyICU = callPackage ../development/python-modules/pyicu { }; @@ -5665,6 +5785,8 @@ in { pykodi = callPackage ../development/python-modules/pykodi { }; + pykoplenti = callPackage ../development/python-modules/pykoplenti { }; + pykwalify = callPackage ../development/python-modules/pykwalify { }; pylacrosse = callPackage ../development/python-modules/pylacrosse { }; @@ -5765,6 +5887,8 @@ in { pymetar = callPackage ../development/python-modules/pymetar { }; + pymeteireann = callPackage ../development/python-modules/pymeteireann { }; + pymetno = callPackage ../development/python-modules/pymetno { }; pymitv = callPackage ../development/python-modules/pymitv { }; @@ -5775,6 +5899,10 @@ in { pymongo = callPackage ../development/python-modules/pymongo { }; + pymorphy2 = callPackage ../development/python-modules/pymorphy2 { }; + + pymorphy2-dicts-ru = callPackage ../development/python-modules/pymorphy2/dicts-ru.nix { }; + pympler = callPackage ../development/python-modules/pympler { }; pymsgbox = callPackage ../development/python-modules/pymsgbox { }; @@ -5821,6 +5949,8 @@ in { pynest2d = callPackage ../development/python-modules/pynest2d { }; + pynetbox = callPackage ../development/python-modules/pynetbox { }; + pynetdicom = callPackage ../development/python-modules/pynetdicom { }; pynisher = callPackage ../development/python-modules/pynisher { }; @@ -5837,6 +5967,8 @@ in { pynzb = callPackage ../development/python-modules/pynzb { }; + pyobihai = callPackage ../development/python-modules/pyobihai { }; + pyocr = callPackage ../development/python-modules/pyocr { tesseract = pkgs.tesseract4; }; @@ -5849,7 +5981,9 @@ in { phonemizer = callPackage ../development/python-modules/phonemizer { }; - pyopencl = callPackage ../development/python-modules/pyopencl { }; + pyopencl = callPackage ../development/python-modules/pyopencl { + mesa_drivers = pkgs.mesa.drivers; + }; pyopengl = callPackage ../development/python-modules/pyopengl { }; @@ -6182,6 +6316,8 @@ in { py_stringmatching = callPackage ../development/python-modules/py_stringmatching { }; + pysvg-py3 = callPackage ../development/python-modules/pysvg-py3 { }; + pysvn = callPackage ../development/python-modules/pysvn { inherit (pkgs) bash subversion apr aprutil expat neon openssl; }; @@ -6265,6 +6401,8 @@ in { pytest-cache = self.pytestcache; # added 2021-01-04 pytestcache = callPackage ../development/python-modules/pytestcache { }; + pytest-cases = callPackage ../development/python-modules/pytest-cases{ }; + pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { }; pytest-celery = callPackage ../development/python-modules/pytest-celery { }; @@ -6368,6 +6506,8 @@ in { pytest-random-order = callPackage ../development/python-modules/pytest-random-order { }; + pytest-regressions = callPackage ../development/python-modules/pytest-regressions { }; + pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { }; pytest-remotedata = callPackage ../development/python-modules/pytest-remotedata { }; @@ -6560,8 +6700,8 @@ in { pythonnet = callPackage ../development/python-modules/pythonnet { - # `mono >= 4.6` required to prevent crashes encountered with earlier versions. - mono = pkgs.mono4; + # Using `mono > 5`, tests are failing.. + mono = pkgs.mono5; }; python-nmap = callPackage ../development/python-modules/python-nmap { }; @@ -6628,6 +6768,8 @@ in { python-socketio_4 = callPackage ../development/python-modules/python-socketio/4.nix { }; + python-socks = callPackage ../development/python-modules/python-socks { }; + python-sql = callPackage ../development/python-modules/python-sql { }; python-stdnum = callPackage ../development/python-modules/python-stdnum { }; @@ -6676,6 +6818,8 @@ in { pytoml = callPackage ../development/python-modules/pytoml { }; + pytomlpp = callPackage ../development/python-modules/pytomlpp { }; + pytools = callPackage ../development/python-modules/pytools { }; pytorch = callPackage ../development/python-modules/pytorch { @@ -6805,6 +6949,8 @@ in { pyx = callPackage ../development/python-modules/pyx { }; + pyxb = callPackage ../development/python-modules/pyxb { }; + pyxbe = callPackage ../development/python-modules/pyxbe { }; pyxdg = callPackage ../development/python-modules/pyxdg { }; @@ -7150,8 +7296,12 @@ in { rsa = callPackage ../development/python-modules/rsa { }; + rst2ansi = callPackage ../development/python-modules/rst2ansi { }; + rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; + rtoml = callPackage ../development/python-modules/rtoml { }; + Rtree = callPackage ../development/python-modules/Rtree { inherit (pkgs) libspatialindex; }; @@ -7258,10 +7408,12 @@ in { scikitimage = callPackage ../development/python-modules/scikit-image { }; - scikitlearn = callPackage ../development/python-modules/scikitlearn { + scikit-learn = callPackage ../development/python-modules/scikit-learn { inherit (pkgs) gfortran glibcLocales; }; + scikitlearn = self.scikit-learn; + scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; scikits-odes = callPackage ../development/python-modules/scikits-odes { }; @@ -7462,9 +7614,9 @@ in { signify = callPackage ../development/python-modules/signify { }; - sip = callPackage ../development/python-modules/sip { }; + sip = callPackage ../development/python-modules/sip/default.nix { }; - sip_5 = callPackage ../development/python-modules/sip/5.x.nix { }; + sip_4 = callPackage ../development/python-modules/sip/4.x.nix { }; six = callPackage ../development/python-modules/six { }; @@ -7494,8 +7646,6 @@ in { slicerator = callPackage ../development/python-modules/slicerator { }; - slimit = callPackage ../development/python-modules/slimit { }; - slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; slixmpp = callPackage ../development/python-modules/slixmpp { @@ -7592,8 +7742,16 @@ in { spacy = callPackage ../development/python-modules/spacy { }; + spacy-alignments = callPackage ../development/python-modules/spacy-alignments { }; + + spacy-legacy = callPackage ../development/python-modules/spacy/legacy.nix { }; + spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; + spacy-pkuseg = callPackage ../development/python-modules/spacy-pkuseg { }; + + spacy-transformers = callPackage ../development/python-modules/spacy-transformers { }; + spake2 = callPackage ../development/python-modules/spake2 { }; spark_parser = callPackage ../development/python-modules/spark_parser { }; @@ -7618,6 +7776,8 @@ in { spinners = callPackage ../development/python-modules/spinners { }; + sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { }; + sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { }; sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { }; @@ -7640,6 +7800,8 @@ in { sphinxcontrib-katex = callPackage ../development/python-modules/sphinxcontrib-katex { }; + sphinxcontrib-nwdiag = callPackage ../development/python-modules/sphinxcontrib-nwdiag { }; + sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { }; sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { }; @@ -7652,6 +7814,8 @@ in { sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml { }; + sphinxcontrib-seqdiag = callPackage ../development/python-modules/sphinxcontrib-seqdiag { }; + sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { }; sphinxcontrib-tikz = callPackage ../development/python-modules/sphinxcontrib-tikz { @@ -7886,6 +8050,8 @@ in { tailer = callPackage ../development/python-modules/tailer { }; + tappy = callPackage ../development/python-modules/tappy { }; + tasklib = callPackage ../development/python-modules/tasklib { }; taskw = callPackage ../development/python-modules/taskw { }; @@ -8059,6 +8225,8 @@ in { tilestache = callPackage ../development/python-modules/tilestache { }; + timeago = callPackage ../development/python-modules/timeago { }; + timelib = callPackage ../development/python-modules/timelib { }; timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; @@ -8115,6 +8283,8 @@ in { torchvision = callPackage ../development/python-modules/torchvision { }; + torchvision-bin = callPackage ../development/python-modules/torchvision/bin.nix { }; + tornado = callPackage ../development/python-modules/tornado { }; # Used by circus and grab-site, 2020-08-29 @@ -8181,6 +8351,8 @@ in { trytond = callPackage ../development/python-modules/trytond { }; + ttp = callPackage ../development/python-modules/ttp { }; + tunigo = callPackage ../development/python-modules/tunigo { }; tubeup = callPackage ../development/python-modules/tubeup { }; @@ -8279,6 +8451,8 @@ in { uarray = callPackage ../development/python-modules/uarray { }; + uc-micro-py = callPackage ../development/python-modules/uc-micro-py { }; + ueberzug = callPackage ../development/python-modules/ueberzug { inherit (pkgs.xorg) libX11 libXext; }; @@ -8571,6 +8745,8 @@ in { websockify = callPackage ../development/python-modules/websockify { }; + webssh = callPackage ../development/python-modules/webssh { }; + webtest = callPackage ../development/python-modules/webtest { }; webthing = callPackage ../development/python-modules/webthing { }; @@ -8772,6 +8948,8 @@ in { yanc = callPackage ../development/python-modules/yanc { }; + yangson = callPackage ../development/python-modules/yangson { }; + yapf = callPackage ../development/python-modules/yapf { }; yappi = callPackage ../development/python-modules/yappi { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python2-packages.nix b/third_party/nixpkgs/pkgs/top-level/python2-packages.nix index 81bdcdb93d..221da6daa9 100644 --- a/third_party/nixpkgs/pkgs/top-level/python2-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python2-packages.nix @@ -383,7 +383,9 @@ with self; with super; { prettytable = callPackage ../development/python-modules/prettytable/1.nix { }; - privacyidea = callPackage ../development/python-modules/privacyidea { }; + privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; + + ldaptor = callPackage ../development/python-modules/ldaptor/19.nix { }; progressbar231 = callPackage ../development/python-modules/progressbar231 { }; @@ -433,6 +435,8 @@ with self; with super; { pyhamcrest = callPackage ../development/python-modules/pyhamcrest/1.nix { }; + pyjwt = callPackage ../development/python-modules/pyjwt/1.nix { }; + pykickstart = callPackage ../development/python-modules/pykickstart { }; pylibacl = callPackage ../development/python-modules/pylibacl/0.5.nix { }; @@ -520,7 +524,7 @@ with self; with super; { scandir = callPackage ../development/python-modules/scandir { }; - scikitlearn = callPackage ../development/python-modules/scikitlearn/0.20.nix { + scikit-learn = callPackage ../development/python-modules/scikit-learn/0.20.nix { inherit (pkgs) gfortran glibcLocales; }; diff --git a/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix b/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix index bfc576e655..f5e11a0db8 100644 --- a/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix @@ -53,6 +53,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // alkimia = callPackage ../development/libraries/alkimia { }; + applet-window-buttons = callPackage ../development/libraries/applet-window-buttons { }; + appstream-qt = callPackage ../development/libraries/appstream/qt.nix { }; dxflib = callPackage ../development/libraries/dxflib {}; @@ -121,6 +123,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // mauikit = callPackage ../development/libraries/mauikit { }; + mauikit-filebrowsing = callPackage ../development/libraries/mauikit-filebrowsing { }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; openbr = callPackage ../development/libraries/openbr { }; diff --git a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix new file mode 100644 index 0000000000..38f5e2a415 --- /dev/null +++ b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix @@ -0,0 +1,279 @@ +/* + This is the Hydra jobset for the `haskell-updates` branch in Nixpkgs. + You can see the status of this jobset at + https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. + + To debug this expression you can use `hydra-eval-jobs` from + `pkgs.hydra-unstable` which prints the jobset description + to `stdout`: + + $ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix +*/ +{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] }: + +let + + releaseLib = import ./release-lib.nix { + inherit supportedSystems; + }; + + inherit (releaseLib) + pkgs + packagePlatforms + mapTestOn + aggregate + ; + + inherit (pkgs) lib; + + # helper function which traverses a (nested) set + # of derivations produced by mapTestOn and flattens + # it to a list of derivations suitable to be passed + # to `releaseTools.aggregate` as constituents. + accumulateDerivations = jobList: + lib.concatMap ( + attrs: + if lib.isDerivation attrs + then [ attrs ] + else if lib.isAttrs attrs + then accumulateDerivations (lib.attrValues attrs) + else [] + ) jobList; + + # names of all subsets of `pkgs.haskell.packages` + compilerNames = lib.mapAttrs (name: _: name) pkgs.haskell.packages; + + # list of all compilers to test specific packages on + all = with compilerNames; [ + ghc884 + ghc8104 + ghc901 + ]; + + # packagePlatforms applied to `haskell.packages.*` + compilerPlatforms = lib.mapAttrs + (_: v: packagePlatforms v) + pkgs.haskell.packages; + + # This function lets you specify specific packages + # which are to be tested on a list of specific GHC + # versions and returns a job set for all specified + # combinations. See `jobs` below for an example. + versionedCompilerJobs = config: mapTestOn { + haskell.packages = + (lib.mapAttrs ( + ghc: jobs: + lib.filterAttrs ( + jobName: platforms: + lib.elem ghc (config."${jobName}" or []) + ) jobs + ) compilerPlatforms); + }; + + # hydra jobs for `pkgs` of which we import a subset of + pkgsPlatforms = packagePlatforms pkgs; + + # names of packages in an attribute set that are maintained + maintainedPkgNames = set: builtins.attrNames + (lib.filterAttrs ( + _: v: builtins.length (v.meta.maintainers or []) > 0 + ) set); + + recursiveUpdateMany = builtins.foldl' lib.recursiveUpdate {}; + + jobs = recursiveUpdateMany [ + (mapTestOn { + haskellPackages = packagePlatforms pkgs.haskellPackages; + haskell.compiler = packagePlatforms pkgs.haskell.compiler; + + tests = let + testPlatforms = packagePlatforms pkgs.tests; + in { + haskell = testPlatforms.haskell; + writers = testPlatforms.writers; + }; + + # top-level packages that depend on haskellPackages + inherit (pkgsPlatforms) + agda + arion + bench + bustle + blucontrol + cabal-install + cabal2nix + cachix + carp + cedille + client-ip-echo + darcs + dconf2nix + dhall + dhall-bash + dhall-docs + dhall-lsp-server + dhall-json + dhall-nix + dhall-text + diagrams-builder + elm2nix + fffuu + futhark + ghcid + git-annex + git-brunch + gitit + glirc + hadolint + haskell-ci + haskell-language-server + hasura-graphql-engine + hci + hercules-ci-agent + hinit + hedgewars + hledger + hledger-iadd + hledger-interest + hledger-ui + hledger-web + hlint + hpack + hyper-haskell + hyper-haskell-server-with-packages + icepeak + idris + ihaskell + jl + koka + krank + lambdabot + madlang + matterhorn + mueval + neuron-notes + niv + nix-delegate + nix-deploy + nix-diff + nix-linter + nix-output-monitor + nix-script + nix-tree + nixfmt + nota + ormolu + pandoc + pakcs + petrinizer + place-cursor-at + pinboard-notes-backup + pretty-simple + shake + shellcheck + sourceAndTags + spacecookie + spago + splot + stack + stack2nix + stutter + stylish-haskell + taffybar + tamarin-prover + taskell + termonad-with-packages + tldr-hs + tweet-hs + update-nix-fetchgit + uqm + uuagc + vaultenv + wstunnel + xmobar + xmonad-with-packages + yi + zsh-git-prompt + ; + + elmPackages.elm = pkgsPlatforms.elmPackages.elm; + }) + (versionedCompilerJobs { + # Packages which should be checked on more than the + # default GHC version. This list can be used to test + # the state of the package set with newer compilers + # and to confirm that critical packages for the + # package sets (like Cabal, jailbreak-cabal) are + # working as expected. + cabal-install = all; + Cabal_3_4_0_0 = with compilerNames; [ ghc884 ghc8104 ]; + funcmp = all; + # Doesn't currently work on ghc-9.0: + # https://github.com/haskell/haskell-language-server/issues/297 + haskell-language-server = with compilerNames; [ ghc884 ghc8104 ]; + hoogle = all; + hsdns = all; + jailbreak-cabal = all; + language-nix = all; + nix-paths = all; + titlecase = all; + }) + { + mergeable = pkgs.releaseTools.aggregate { + name = "haskell-updates-mergeable"; + meta = { + description = '' + Critical haskell packages that should work at all times, + serves as minimum requirement for an update merge + ''; + maintainers = lib.teams.haskell.members; + }; + constituents = accumulateDerivations [ + # haskell specific tests + jobs.tests.haskell + # writeHaskell and writeHaskellBin + # TODO: writeHaskell currently fails on darwin + jobs.tests.writers.x86_64-linux + jobs.tests.writers.aarch64-linux + # important top-level packages + jobs.cabal-install + jobs.cabal2nix + jobs.cachix + jobs.darcs + jobs.haskell-language-server + jobs.hledger + jobs.hledger-ui + jobs.hpack + jobs.niv + jobs.pandoc + jobs.stack + jobs.stylish-haskell + # important haskell (library) packages + jobs.haskellPackages.cabal-plan + jobs.haskellPackages.distribution-nixpkgs + jobs.haskellPackages.hackage-db + jobs.haskellPackages.policeman + jobs.haskellPackages.xmonad + jobs.haskellPackages.xmonad-contrib + # haskell packages maintained by @peti + # imported from the old hydra jobset + jobs.haskellPackages.hopenssl + jobs.haskellPackages.hsemail + jobs.haskellPackages.hsyslog + ]; + }; + maintained = pkgs.releaseTools.aggregate { + name = "maintained-haskell-packages"; + meta = { + description = "Aggregate jobset of all haskell packages with a maintainer"; + maintainers = lib.teams.haskell.members; + }; + constituents = accumulateDerivations + (builtins.map + (name: jobs.haskellPackages."${name}") + (maintainedPkgNames pkgs.haskellPackages)); + }; + } + ]; + +in jobs diff --git a/third_party/nixpkgs/pkgs/top-level/static.nix b/third_party/nixpkgs/pkgs/top-level/static.nix index e73eba8e14..32559c0e79 100644 --- a/third_party/nixpkgs/pkgs/top-level/static.nix +++ b/third_party/nixpkgs/pkgs/top-level/static.nix @@ -25,7 +25,7 @@ self: super: let }; in stdenv // { mkDerivation = args: stdenv.mkDerivation (args // { NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") - + optionalString stdenv.cc.isGNU " -static-libgcc"; + + optionalString (stdenv_.cc.isGNU or false) " -static-libgcc"; nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ (makeSetupHook { substitutions = { libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib";